diff --git a/.collaboration b/.collaboration index eea16ed8..7323e189 100644 --- a/.collaboration +++ b/.collaboration @@ -918,17 +918,7 @@ }, { "ModuleName": "PCPage/个人中心-基本信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T21:08:24.9349591+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\个人中心\\个人中心-基本信息.json", - "Pages\\个人中心\\个人中心-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/个人中心-积分列表", diff --git a/Pages/个人中心/个人中心-基本信息.json b/Pages/个人中心/个人中心-基本信息.json index 90aa438a..df69045d 100644 --- a/Pages/个人中心/个人中心-基本信息.json +++ b/Pages/个人中心/个人中心-基本信息.json @@ -95,12 +95,17 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 35.0 } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } } }, "InLogicalVisibleIndexes": [ - 23 + 24 ], - "Count": 24, + "Count": 25, "DefaultSize": 32.0 }, "Cols": { @@ -298,13 +303,13 @@ "14,6": "保存Gitee信息", "18,2": "三方认证", "20,2": "钉钉", - "20,6": "%CurrentUser.DingTalkUnionID%", - "20,31": "未绑定", + "20,6": "未绑定", + "20,10": "%CurrentUser.DingTalkUnionID%", "22,2": "企业微信", "22,6": "暂不支持" }, "Formulas": { - "20,31": "IF(ISBLANK(G21),\"未绑定\",\"已绑定\")" + "20,6": "IF(ISBLANK(K21),\"未绑定\",\"已绑定\")" }, "AttachInfos": { "2,6": { @@ -423,12 +428,12 @@ } } ], - "ID": "fc01bfa4-1902-43f5-92eb-b5efea09aa90" + "ID": "c73a2f0e-8377-41c0-a815-130549f3fd09" } ] } ], - "ID": "461f2db1-5bef-4d2d-be7a-30f871c2736d" + "ID": "b9f6a56c-2df0-4122-95a0-08ca44482e60" } ] } @@ -577,12 +582,12 @@ } } ], - "ID": "b04e5222-b85b-4ae0-bc61-ffd0073a2710" + "ID": "fc95015e-8d83-484b-9fbf-b09f53d64563" } ] } ], - "ID": "0ce7083c-09eb-4963-9959-963c0b6de277" + "ID": "4a807fd1-8c3d-478c-9132-860911550de7" } ] } @@ -762,12 +767,12 @@ } } ], - "ID": "3070ea10-6d0f-435a-b585-24abeda7b9f4" + "ID": "12097600-2799-4b33-b103-63bd99685891" } ] } ], - "ID": "088549c0-abc3-41df-b642-4844c3c4f9e8" + "ID": "55fd70ab-540c-4b1c-ac35-6c6ce621d915" } ] } @@ -911,12 +916,12 @@ } } ], - "ID": "fc711925-8186-4283-80ec-e142fab58625" + "ID": "211cb0cc-50e7-4994-87ed-ea3daa55adef" } ] } ], - "ID": "2d82c1db-3819-42f1-bafe-9591b3fb5d04" + "ID": "f8811661-fe00-4ba8-ac16-abc64e79268d" } ] } @@ -1150,7 +1155,7 @@ "ReloadData": true } ], - "ID": "8de784aa-b26c-4cc6-9b3a-9f55437e121b" + "ID": "2222753f-d595-4a9e-ae8d-53fa49d84abc" }, { "CommandList": [ @@ -1165,12 +1170,12 @@ "BtnText": "知道了" } ], - "ID": "d9fb5a1d-b595-4efd-b036-716b5b079bb4" + "ID": "15daf080-7dd0-42ab-90a1-f0d001b20219" } ] } ], - "ID": "54e58266-f0b9-4614-8bfc-a51973f98f82" + "ID": "fa062b06-9eb4-4187-8bac-4e9e573775b8" }, { "CommandList": [ @@ -1182,7 +1187,7 @@ "BtnText": "知道了" } ], - "ID": "3d140336-ca4a-4215-a7f9-305878cdc631" + "ID": "c604c8f6-95f6-406e-96ce-a87f7b00ef2b" } ] } @@ -1198,37 +1203,6 @@ } }, "20,6": { - "CellType": { - "$type": "ElementUI.InputCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "DefaultValue": "%CurrentUser.DingTalkUnionID%", - "type": "text", - "resize": "none", - "ReadOnly": true, - "IsDisabled": true - } - }, - "20,31": { "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", "CommandList": [ @@ -1319,7 +1293,7 @@ { "ResultPropertyName": "UnionId", "ResultTo": { - "SerializeProperty": "='个人中心-基本信息'!G21" + "SerializeProperty": "='个人中心-基本信息'!K21" } } ], @@ -1358,12 +1332,12 @@ } } ], - "ID": "b2d7053a-5a69-4631-85a3-93f7e03d7872" + "ID": "2518e2f8-97e4-4689-bf94-67f6e97f6002" } ] } ], - "ID": "99e43c9a-64b8-4d3b-be7a-7d42062784ed" + "ID": "c1c5952d-bc92-4bd5-a782-c914328b2244" }, { "CommandList": [ @@ -1376,12 +1350,12 @@ } } ], - "ID": "ad6071db-531f-4efc-91af-ff608409eb67" + "ID": "621eb6c4-e7af-443b-8961-033db7fd635f" } ] } ], - "ID": "61c1ad16-fa7c-4ea4-b70f-447d932910e5" + "ID": "18534974-a720-491f-b2f2-10eadc063e04" }, { "CommandList": [ @@ -1428,7 +1402,7 @@ } } ], - "ID": "36e39d6b-e103-4596-b35e-752f50beb84a" + "ID": "e9a27280-4e41-485e-9588-7f0600c4ebce" }, { "CommandList": [ @@ -1441,18 +1415,17 @@ } } ], - "ID": "56df9cc5-1964-44f2-bd21-93d3c1b83017" + "ID": "6f912d74-36b0-40cc-a6ca-66d6bb69034a" } ] } ], - "ID": "3eca7f93-f771-4831-a56c-470d6b4c391f" + "ID": "6e90cb71-0950-419d-b78f-4293b03da70c" } ] } ], "Text": "未绑定", - "ClickMode": 1, "IsDisabled": true, "TemplateKey": "_RS_Main" }, @@ -1464,7 +1437,6 @@ "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", "Text": "暂不支持", - "ClickMode": 1, "IsDisabled": true, "TemplateKey": "_RS_Main" }, @@ -1538,6 +1510,26 @@ "Formatter": 5, "HorizontalAlignment": 4 }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Formatter": 5, + "TextIndent": 10, + "HorizontalAlignment": 3 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Foreground": 9, + "HorizontalAlignment": 6, + "Underline": false + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Foreground": 2, + "Formatter": 10 + }, { "FontFamily": 1, "FontSize": 13.333333333333332, @@ -1553,8 +1545,8 @@ { "FontFamily": 1, "FontSize": 13.333333333333332, - "Foreground": 2, - "HorizontalAlignment": 4, + "Foreground": 11, + "HorizontalAlignment": 6, "Underline": false }, { @@ -1564,10 +1556,14 @@ "Underline": false }, { - "FontSize": -1.0 + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Foreground": 2, + "HorizontalAlignment": 4, + "Underline": false }, { - "Background": 10 + "Background": 12 } ], "Types": { @@ -1582,6 +1578,8 @@ "0\"小时\"", " ¥#,##0.00_);[Red] ¥(#,##0.00)", "Accent 2 0", + "\"UnionId\"@", + "Background 1 -25", "Background 2 0" ] }, @@ -2085,37 +2083,11 @@ "19,34": 2, "19,35": 2, "20,1": 2, - "20,2": 4, - "20,3": 2, - "20,4": 2, - "20,5": 2, - "20,6": 11, + "20,2": 11, + "20,6": 12, "20,7": 2, "20,8": 2, - "20,9": 2, - "20,10": 2, - "20,11": 2, - "20,12": 2, - "20,13": 2, - "20,14": 2, - "20,15": 2, - "20,16": 2, - "20,17": 2, - "20,18": 2, - "20,19": 2, - "20,20": 2, - "20,21": 2, - "20,22": 2, - "20,23": 2, - "20,24": 2, - "20,25": 2, - "20,26": 2, - "20,27": 2, - "20,28": 2, - "20,29": 2, - "20,31": 12, - "20,32": 2, - "20,33": 2, + "20,10": 13, "20,34": 2, "20,35": 2, "21,1": 2, @@ -2123,33 +2095,33 @@ "21,3": 4, "21,4": 4, "21,5": 4, - "21,6": 11, - "21,7": 11, - "21,8": 11, - "21,9": 11, - "21,10": 11, - "21,11": 11, - "21,12": 11, - "21,13": 11, - "21,14": 11, - "21,15": 11, - "21,16": 11, - "21,17": 11, - "21,18": 11, - "21,19": 11, - "21,20": 11, - "21,21": 11, - "21,22": 11, - "21,23": 11, - "21,24": 11, - "21,25": 11, - "21,26": 11, - "21,27": 11, - "21,28": 11, - "21,29": 11, - "21,31": 12, - "21,32": 12, - "21,33": 12, + "21,6": 14, + "21,7": 14, + "21,8": 14, + "21,9": 14, + "21,10": 14, + "21,11": 14, + "21,12": 14, + "21,13": 14, + "21,14": 14, + "21,15": 14, + "21,16": 14, + "21,17": 14, + "21,18": 14, + "21,19": 14, + "21,20": 14, + "21,21": 14, + "21,22": 14, + "21,23": 14, + "21,24": 14, + "21,25": 14, + "21,26": 14, + "21,27": 14, + "21,28": 14, + "21,29": 14, + "21,31": 15, + "21,32": 15, + "21,33": 15, "21,34": 2, "21,35": 2, "22,1": 2, @@ -2157,73 +2129,103 @@ "22,3": 2, "22,4": 2, "22,5": 2, - "22,6": 13, + "22,6": 16, "22,7": 2, "22,8": 2, - "22,9": 2, - "22,10": 14, - "22,11": 14, - "22,12": 14, - "22,13": 14, - "22,14": 14, - "22,15": 14, - "22,16": 14, - "22,17": 14, - "22,18": 14, - "22,19": 14, - "22,20": 14, - "22,21": 14, - "22,22": 14, - "22,23": 14, - "22,24": 14, - "22,25": 14, - "22,26": 14, - "22,27": 14, - "22,28": 14, - "22,29": 14, - "22,30": 14, - "22,31": 14, - "22,32": 14, - "22,33": 14, + "22,10": 17, + "22,11": 17, + "22,12": 17, + "22,13": 17, + "22,14": 17, + "22,15": 17, + "22,16": 17, + "22,17": 17, + "22,18": 17, + "22,19": 17, + "22,20": 17, + "22,21": 17, + "22,22": 17, + "22,23": 17, + "22,24": 17, + "22,25": 17, + "22,26": 17, + "22,27": 17, + "22,28": 17, + "22,29": 17, + "22,30": 17, + "22,31": 17, + "22,32": 17, + "22,33": 17, "22,34": 2, "22,35": 2, + "23,1": 2, "23,2": 4, - "23,3": 15, - "23,4": 15, - "23,5": 15, - "23,6": 15, - "23,7": 15, - "23,8": 15, - "23,9": 15, - "23,10": 15, - "23,11": 15, - "23,12": 2, - "23,13": 4, - "23,14": 4, - "23,15": 4, - "23,16": 4, - "23,17": 8, - "23,18": 8, - "23,19": 8, - "23,20": 8, - "23,21": 8, - "23,22": 8, - "23,23": 2, - "23,24": 4, - "23,25": 4, - "23,26": 4, - "23,27": 4, - "23,28": 3, - "23,29": 3, - "23,30": 3, - "23,31": 3, - "23,32": 3, - "23,33": 3, - "23,34": 3 + "23,3": 4, + "23,4": 4, + "23,5": 4, + "23,6": 18, + "23,7": 18, + "23,8": 18, + "23,9": 2, + "23,10": 17, + "23,11": 17, + "23,12": 17, + "23,13": 17, + "23,14": 17, + "23,15": 17, + "23,16": 17, + "23,17": 17, + "23,18": 17, + "23,19": 17, + "23,20": 17, + "23,21": 17, + "23,22": 17, + "23,23": 17, + "23,24": 17, + "23,25": 17, + "23,26": 17, + "23,27": 17, + "23,28": 17, + "23,29": 17, + "23,30": 17, + "23,31": 17, + "23,32": 17, + "23,33": 17, + "23,34": 2, + "23,35": 2, + "24,1": 2, + "24,7": 2, + "24,8": 2, + "24,9": 2, + "24,10": 2, + "24,11": 2, + "24,12": 2, + "24,13": 2, + "24,14": 2, + "24,15": 2, + "24,16": 2, + "24,17": 2, + "24,18": 2, + "24,19": 2, + "24,20": 2, + "24,21": 2, + "24,22": 2, + "24,23": 2, + "24,24": 4, + "24,25": 4, + "24,26": 4, + "24,27": 4, + "24,28": 3, + "24,29": 3, + "24,30": 3, + "24,31": 3, + "24,32": 3, + "24,33": 3, + "24,34": 3 }, "RowStyles": { - "6": 16, - "16": 16 + "6": 19, + "16": 19 }, "SheetStyle": { "FontFamily": 1, @@ -2245,14 +2247,14 @@ "2,28,1,6", "10,2,1,4", "12,2,1,4", - "20,2,1,4", "22,2,1,4", - "22,6,1,3", - "20,6,1,24", - "20,31,1,3", "12,6,1,10", "10,6,1,10", - "14,6,1,10" + "14,6,1,10", + "20,6,1,3", + "22,6,1,3", + "20,10,1,24", + "20,2,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -2278,7 +2280,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ISBLANK('个人中心-基本信息'!$G$21)" + "SerializeProperty": "=ISBLANK('个人中心-基本信息'!$K$21)" }, "GUID": "17fd8ca6-62d2-4e2d-a85d-59d4979374ea", "StyleInfo": { @@ -2294,7 +2296,7 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ISBLANK('个人中心-基本信息'!$G$21)" + "SerializeProperty": "=ISBLANK('个人中心-基本信息'!$K$21)" }, "GUID": "0cf98f29-3c70-4382-91a3-d822c1c333cd", "StyleInfo": { @@ -2381,4 +2383,4 @@ "Formula": "'个人中心-基本信息'!$G$13" } ] -}//SnZaD+B+CoXucCPtAq1NGDChgVSvTsjQ+9NO7JqwzRb67fFy/WpUJDavM+4K3IZDocwbJpwOik6BfFghqwdSp09ybfbYOJ/0/RbXqhjx+OZkczWEkgXq6V2Ljna93KNSwpmAtBSf3prqapjh2g4wUNnpDoO7SYDpJJ34n8i0PJ4v9uEr7uX0E/nvNBRaSn4YJF8S6XLtMH6VfqN6OVsNJ/2sE7vGn/RMr/jjKs+CWrRt+N9dhyTUHm69VBlbkuBZHXr+KMuUNZdakAAdw0Rv0XYgYvxoBPLvn8SQsaEosqAWyXDsYIdmo0sHpsp7cpfo3SmTnl0fMjo/c/NHnqkvOct01x9v8Ato0ccd6xr/wMreEW6/35PzMbCzmb9S7Y3E8RQ/wy0bIcdJVH4obqy0hl3lbEXPDKOMhmsTNk2ornuN44M9WNj+xcHqU/2JJAuw3FHKmuyfIJHLlgT4gxHgSd3+37l/Mjt6tEjY2wbS86rQHysLHNST4jgMC/Wt34hWpdr2QYw5THBDPTVYagb4jW29GZZqNvZL+JOAq9KnvnF6fVqKmdu9Bii5YRmoBghQZ5cU02TS7bBOWzgPstRySAqPqx0jPZrHG5D8qWRnBh1B83TXeLkZ2RB9FhrcAa4TNVdTsTZizp7at8unABSxs4rAKvUwBZu2L9zdPA7ypME4/HUFZhCcOVKtPie6yOymvQ91IhlT3Ya2c37lnaCwvV6s/oGWO3cgj70zB74l+lrsMomqU2eHhuE6onNzjg6tgqzwzKc3vY6ZGXRxHuY4zpC3q8qx+mOYIf1ogwZQ6m3AeRfYuriCA9pUHmRw2akZSbaFgWO02O8ZeGPh2YMhU/VNs1kNm4gh9KgdDkOlpbLEhltYR0JEo5WWPMrC0Q0ejYqLbI4T3ph0VnABfvkllA==|920 \ No newline at end of file +}//sbGmmac+0sR+eVKmlWMCH7zg9u/MEfZzgpPZy89+PLfSzQB5ttZt6s7as4hmhsN+CRY3MagU8TUOv4rCh5EJ3U1wq4Nc8U/e+jyXdtnXWd1KmZbymZ7oo/+uIhpEsiLzfL9SGqyhXN4/B/7IwwVfSRNq3wxPTR2TvCsKD0YPYVzTPRoYf3BMjgtp3ki27itivgAYU3BuYKLbf2mRu3i/jRLmXrgEg6PPWglw25FtyvfkDn4pZ2IP7gh7E3/ekWtiJAkuaroa+UMasgYLXIXVj75LRJYgYrPET+DfJd8K37shkAuzN6ZfIRfKa0kASlJq2OM8C45QSCXc4Jqy8oNF7LRMnLehKvpHKD5Apgw3JdhLnueHUnDkQiJRxW8C7n7bjYLqNGQ0cYpjvVYI4pWL3TagG90b40SHQWO2c/PaakCzYfjwYdB28XCpxx97BJqjR0Wh7tn0kuwIGGZfMF0N4PzWAHQlRz6DJn7h5JJ9s+G24tPHn1oX6dCjbUFE91s6iQ+CfuhwC0JqNXikS1+oO/eDm2aA9P769LMUDwk1ehNLqZoollOllZW3tVtGHRtIzfmJo4MqZkY+RBIcoLl2vPftxj5oku2mK+uINScEQkyZwx80URsuG8M93e0iW+PTyQuBVDky8/u6gi2fC/nWnSCZXjYjPHH9gT3c0vRDp2XXTCbKcr+q6MylNcvDWIXeVWgEoozYvPRQjn2ezeIDw55RnkX7eznTiWYbR1g/wWHzfDse9e1/cTBSjPRbO/ivwsSpjYo8guyaMY6HDqRkchWlfXCNjotc3GHNsmEc1eUZ1oihzmX111YK/qeUIC38NDC6x+VaJvhxHjSDejZmmfdWBCgfEJxbPynZL3QTmfUyJYak2BdAviqBnLQPbQYJRtQGf2ZFh/ACEf0rxG/HDw==|920 \ No newline at end of file diff --git a/Pages/个人中心/个人中心-基本信息.rd b/Pages/个人中心/个人中心-基本信息.rd index c03cc64b..b0b9e2ca 100644 --- a/Pages/个人中心/个人中心-基本信息.rd +++ b/Pages/个人中心/个人中心-基本信息.rd @@ -1,9 +1,9 @@ { "PageType": 0, "ColumnCount": 36, - "RowCount": 24, + "RowCount": 25, "Formulas": { - "20,31": "IF(ISBLANK(G21),\"未绑定\",\"已绑定\")" + "20,6": "IF(ISBLANK(K21),\"未绑定\",\"已绑定\")" }, "CustomNames": [ {