diff --git a/.collaboration b/.collaboration index ecd77f10..7323e189 100644 --- a/.collaboration +++ b/.collaboration @@ -918,17 +918,7 @@ }, { "ModuleName": "PCPage/个人中心-基本信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T20:10:07.7759356+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\个人中心\\个人中心-基本信息.json", - "Pages\\个人中心\\个人中心-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/个人中心-积分列表", @@ -2240,18 +2230,7 @@ }, { "ModuleName": "UserService", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T20:26:10.1313863+08:00", - "ModuleType": 11, - "ToRemoveFiles": [ - "UserServiceDB.sqlite3", - "CloudStorageProvider\\data.json", - "SecurityProviderV2\\data.json" - ] + "ModuleType": 11 }, { "ModuleName": "CustomLibrary", diff --git a/Pages/个人中心/个人中心-基本信息.json b/Pages/个人中心/个人中心-基本信息.json index 28b44378..90aa438a 100644 --- a/Pages/个人中心/个人中心-基本信息.json +++ b/Pages/个人中心/个人中心-基本信息.json @@ -31,6 +31,11 @@ "DesignLengthInPixel": 32.0 } }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, "7": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -90,11 +95,6 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 35.0 } - }, - "6": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 - } } }, "InLogicalVisibleIndexes": [ @@ -423,12 +423,12 @@ } } ], - "ID": "7848fda1-9ba3-4616-94a9-2d716f733132" + "ID": "fc01bfa4-1902-43f5-92eb-b5efea09aa90" } ] } ], - "ID": "3331072a-7101-467c-a0e8-e479bf63f5d5" + "ID": "461f2db1-5bef-4d2d-be7a-30f871c2736d" } ] } @@ -577,12 +577,12 @@ } } ], - "ID": "b5ad00e4-6ceb-4e46-9513-523c96a1d941" + "ID": "b04e5222-b85b-4ae0-bc61-ffd0073a2710" } ] } ], - "ID": "535084a4-94d3-48a1-b365-a3b957205300" + "ID": "0ce7083c-09eb-4963-9959-963c0b6de277" } ] } @@ -762,12 +762,12 @@ } } ], - "ID": "4509a6ab-836c-401f-a88a-aed5d8b5ee4e" + "ID": "3070ea10-6d0f-435a-b585-24abeda7b9f4" } ] } ], - "ID": "d2a0c772-e17a-465b-a5c6-6eb3dd4c2201" + "ID": "088549c0-abc3-41df-b642-4844c3c4f9e8" } ] } @@ -911,12 +911,12 @@ } } ], - "ID": "cc517078-3a58-4f19-b4ef-98ebd0059b71" + "ID": "fc711925-8186-4283-80ec-e142fab58625" } ] } ], - "ID": "d0657807-00ba-446f-84b4-65886681edb7" + "ID": "2d82c1db-3819-42f1-bafe-9591b3fb5d04" } ] } @@ -1150,7 +1150,7 @@ "ReloadData": true } ], - "ID": "df4ddbfe-061d-429c-b2f6-c7ecd6ec92c0" + "ID": "8de784aa-b26c-4cc6-9b3a-9f55437e121b" }, { "CommandList": [ @@ -1165,12 +1165,12 @@ "BtnText": "知道了" } ], - "ID": "066f83e9-60c8-48ab-ab47-b0e41c661678" + "ID": "d9fb5a1d-b595-4efd-b036-716b5b079bb4" } ] } ], - "ID": "ffc3be29-72a6-4f82-aeb3-982cac101cb4" + "ID": "54e58266-f0b9-4614-8bfc-a51973f98f82" }, { "CommandList": [ @@ -1182,7 +1182,7 @@ "BtnText": "知道了" } ], - "ID": "4d6b9019-4b53-4f62-a0b0-45b7e160f39c" + "ID": "3d140336-ca4a-4215-a7f9-305878cdc631" } ] } @@ -1200,6 +1200,7 @@ "20,6": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], "UIPermissions": [ { "Scope": 2, @@ -1247,10 +1248,6 @@ "value": "%Null%" }, "CommandList": [ - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "Title": "加载中" - }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", "ServerCommandName": "获取CorpId", @@ -1268,13 +1265,7 @@ } } ], - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Title": "加载中" + "CheckDataValidation": false }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -1293,6 +1284,10 @@ "value": "0" }, "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + }, { "$type": "DingTalkPlugin.RequestAuthCode, DingTalkPlugin", "CorpId": { @@ -1330,9 +1325,45 @@ ], "RefreshAfterFinish": true, "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "0", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!msg" + } + } + ], + "ID": "b2d7053a-5a69-4631-85a3-93f7e03d7872" + } + ] } ], - "ID": "cb5d5ff2-3ce0-464d-b72a-8c85766c24bf" + "ID": "99e43c9a-64b8-4d3b-be7a-7d42062784ed" }, { "CommandList": [ @@ -1345,12 +1376,12 @@ } } ], - "ID": "71b9f241-5e7b-4296-bf0d-287f4dfa0050" + "ID": "ad6071db-531f-4efc-91af-ff608409eb67" } ] } ], - "ID": "3d920720-90a5-470f-a415-38e0217f23f5" + "ID": "61c1ad16-fa7c-4ea4-b70f-447d932910e5" }, { "CommandList": [ @@ -1397,7 +1428,7 @@ } } ], - "ID": "9280645a-4a95-4eea-8d53-e6160e15b937" + "ID": "36e39d6b-e103-4596-b35e-752f50beb84a" }, { "CommandList": [ @@ -1410,12 +1441,12 @@ } } ], - "ID": "916e7cad-abe6-4066-a9c9-f2a08edb396f" + "ID": "56df9cc5-1964-44f2-bd21-93d3c1b83017" } ] } ], - "ID": "4780cd67-c7bd-4f1a-abc3-06f25b83e508" + "ID": "3eca7f93-f771-4831-a56c-470d6b4c391f" } ] } @@ -2350,4 +2381,4 @@ "Formula": "'个人中心-基本信息'!$G$13" } ] -}//42oH7s0431cQWHi2JDNC2c8DQgwmV5OB7ogSMRrmDz47U7ofWXmWKJ4OjSkY5CaeYO0Zu9Wnb2xQRezEKGEaUuRPHIgao1AGFr67KbuvwqWVBDTOLxjMSc9wr1I9kSpfySdcpzfVyiSRCsXyh45DW5SZTJ2nG64+HjmBVUV4AUb5ZsWYFBTRh9H5ocMIFDswyGQRuQU/itBOzkHD7StyiUB54EKOMUa/Ay6Vf9OL2QpZ40zoXUl3jKT0zvxdfGpHokSTBPhmKTJeCaOuczmI5ujQoPcHI2iJUzMZDqg22XzP2grz6D83tG2PTV50wIkS5enoLDFv4/W5erSm83qm3/5D0XflYHGHiiWCeaAXgIHF/L7SljnB6/05T6eU2M2Hy6I2F73W4MDsWLAh0Qw7TtIENj9j+1Lm9YsSXkvcKG2G4AtScfS5ayyo7ItCtMCn394OFKy9PZArfVFyR+8pEU0bUw5pph4pC4Hkil53Z/z25thjAtWWlRhqlmZ182sCtW5NteKT13iz2AK6kP3TGVf8YxZGj3uSqj39nOqT4eUNO111BJSl7unzwPMkuqlfGEZvcCRkCKRy5LsegozSOO7docX9Hb2AsCKWMhPTCB9w/BJjD7Y/YPlthXpU6tCImCghjv3m9Pbw3T5xqYKdcsH54xt/qU91Rz1eeXBVOZcKyoaCKx0it6v2+KYpd0wEFnRfBzGoevlaTFsI1v/oxPY/wm3U43j40Yp0h/w8bwU9toMaLd0euDZ+My7n+Fi6VUyedt/cKXUX48/JNAid4PXnLj6POfZp5N1jL5i9qfRYyIV6G6W+6dDnUfheeYyysX0+opoanp0i/p+GNu9qkbYM3N5Ftrc3oqEyMpyG8Dz3eN3Rifb7NieWZA/QfoGhrQQc6qw5CJBNgu8LImjB8w==|920 \ No newline at end of file +}//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 diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3 index 18805a71..8d81313c 100644 Binary files a/UserServiceDB.sqlite3 and b/UserServiceDB.sqlite3 differ