diff --git a/.collaboration b/.collaboration index 7d64fb95..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:10:48.5049962+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\个人中心\\个人中心-基本信息.json", - "Pages\\个人中心\\个人中心-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/个人中心-积分列表", diff --git a/Pages/个人中心/个人中心-基本信息.json b/Pages/个人中心/个人中心-基本信息.json index df69045d..c8e7acc7 100644 --- a/Pages/个人中心/个人中心-基本信息.json +++ b/Pages/个人中心/个人中心-基本信息.json @@ -1332,12 +1332,12 @@ } } ], - "ID": "2518e2f8-97e4-4689-bf94-67f6e97f6002" + "ID": "e34fc2dc-2843-4eb8-a9da-97b7cf8bf05a" } ] } ], - "ID": "c1c5952d-bc92-4bd5-a782-c914328b2244" + "ID": "c1028568-9b1d-413f-a1a5-e72a372c593c" }, { "CommandList": [ @@ -1350,32 +1350,23 @@ } } ], - "ID": "621eb6c4-e7af-443b-8961-033db7fd635f" + "ID": "00524472-4eb9-455f-b12b-b6ecb05eb2c9" } ] } ], - "ID": "18534974-a720-491f-b2f2-10eadc063e04" + "ID": "e1ecdebd-279b-41d3-a0e6-230257f38980" }, { "CommandList": [ { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "解绑钉钉", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "用户名" - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true + "$type": "Notiflix_Forguncy.Confirm_Command, Notiflix_Forguncy", + "Title": "提示", + "Message": "确定要解绑钉钉吗?", + "Answer": "我已确认", + "OklButton": "确认", + "CancelButton": "取消", + "Result": "按钮结果" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -1387,40 +1378,84 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "='个人中心-基本信息'!code" + "SerializeProperty": "=按钮结果" } ] }, - "value": "0" + "value": "确认" }, "CommandList": [ { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!msg" - } - } - ], - "ID": "e9a27280-4e41-485e-9588-7f0600c4ebce" - }, - { - "CommandList": [ + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "解绑钉钉", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=FGC_母版页!母版_当前用户" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "warning", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!msg" - } + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='个人中心-基本信息'!code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!msg" + } + } + ], + "ID": "09f9b03b-f551-4667-8757-0f474b59afeb" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!msg" + } + } + ], + "ID": "57360e74-c732-4fa3-8a38-e0bd4f5b3bb1" + } + ] } ], - "ID": "6f912d74-36b0-40cc-a6ca-66d6bb69034a" + "ID": "aceec2d1-3746-41d1-94a9-e849c44741e0" } ] } ], - "ID": "6e90cb71-0950-419d-b78f-4293b03da70c" + "ID": "06bcdd9f-7ee0-4938-bb7c-c98436dd0fa6" } ] } @@ -2383,4 +2418,4 @@ "Formula": "'个人中心-基本信息'!$G$13" } ] -}//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 +}//y5DwZorxZ9v4R65sx8ZOP/GgXXk9ct6TC8GAhM+njG/9CwGOIrITNJ4QMdk57jNDg1Jpil7R0UgPGWusIVk3+EIxJ1d4H+6/Mgci6xe/XUMS72C19zgHAsHMso4LvXtle1U549cByxHgq3AAIetQvh/2A6m8KMnPmHidMy4aNUTK6OUq9j6YpDKholm0AhcXQ7nu9bQHyH+Lfajk2kGO+ZsAAmC+XMeoH1Jes/5RfalRi1YjP/0OU2fYJvvNe2TH1l0FEGqUQqrpsyxRy4/+MzeU/Y6QlRXdPacFJpN5w/bBF2y1YbmzpcemZI4IPSW/xHD0MRlaOGn7o0/ZlvmEgcJTi1tz8fPMR37RsOCQS2e0hFjJrKqTOjjWkUXAu0KGFk3Osw/z1cNeOl5B92zgIDqyZ8AgBoLwgFyFOHK4Y3fxj0u01eU3FAjRYdEnV5PUZNIwx44B76xH8debLlrBxKvEgeqTeU6MzS6mOqJIDWISwBQA2DAk++uLm4MxAMSQhVsV8zwvYNeYQXdLlX4bmBrAoTbIjrLu1FPtU104zEYE/IMLlrt+zj886ZBsLqUJP3d1iohik2MJk8AT+Q/IPJWXvTFPGN21ct9jyONDX/ytKC+U65s97nynSeRMMIXqM+LQhK0m46kh5AOGYD9iWUL+NGK68Zje+5I7LPEk+dh/bg3tati2Mg5LINDGN1rnJwXtYgA/4EzqxRJrRmid7hg2nl8r80Wk0bdZlRQpta0w5exF1zCMJLCEK7edhNnZF59dkcwjOyP/vaClW1tlwW4k553wXNH1rRcAP1i+ApVUNrCIdygmu1nU4crfbdI06bXTUo8k6sdD/UxtQYfTba4Jo0wfkclasEyiIopUUKo0Zy9nknx866PdLAgqwC7GOdibNqR5P0uP2wCsTIleoA==|920 \ No newline at end of file