From 681ec774adf8bb2d7bcd5e07864db1d20905a926 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Thu, 5 Sep 2024 15:37:30 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BF=AE=E6=94=B9=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E8=B4=A6=E5=8F=B7=E9=A1=B5=E9=9D=A2","MessageType":2,?= =?UTF-8?q?"Modules":[{"State":1,"Type":1,"Name":"PCPage/=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E8=B4=A6=E5=8F=B7"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 12 +---- Pages/内建页面/绑定账号.json | 89 ++++++++++++++++++------------------ 2 files changed, 45 insertions(+), 56 deletions(-) diff --git a/.collaboration b/.collaboration index 23d48b23..6031f7d9 100644 --- a/.collaboration +++ b/.collaboration @@ -2378,17 +2378,7 @@ }, { "ModuleName": "PCPage/绑定账号", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T15:36:09.5648529+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\内建页面\\绑定账号.json", - "Pages\\内建页面\\绑定账号.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/服务端命令2", diff --git a/Pages/内建页面/绑定账号.json b/Pages/内建页面/绑定账号.json index 4373d335..debefa07 100644 --- a/Pages/内建页面/绑定账号.json +++ b/Pages/内建页面/绑定账号.json @@ -13,7 +13,7 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 45.0 } }, "5": { @@ -43,7 +43,7 @@ }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 43.0 } }, "11": { @@ -93,7 +93,8 @@ }, "21": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "IsHidden": true } } }, @@ -314,12 +315,14 @@ "DefaultSize": 32.0 }, "Values": { - "5,13": "绑定账号", + "5,13": "绑定已有账号", + "7,13": "用户名", + "9,13": "密 码", "11,13": "绑定并登录", "13,13": "返回登录页" }, "AttachInfos": { - "7,13": { + "7,15": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [], @@ -344,8 +347,7 @@ } ], "type": "text", - "placeholder": "请输入", - "PrependText": "用户名", + "placeholder": "用户名", "resize": "none", "clearable": true }, @@ -353,7 +355,7 @@ "IgnoreBlank": false } }, - "9,13": { + "9,15": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [], @@ -378,8 +380,7 @@ } ], "type": "password", - "placeholder": "请输入", - "PrependText": "密码", + "placeholder": "密码", "resize": "none", "clearable": true, "showPassword": true @@ -424,7 +425,7 @@ "ParamName": "用户名", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=绑定账号!N8" + "SerializeProperty": "=绑定账号!P8" } }, { @@ -432,7 +433,7 @@ "ParamName": "密码", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=绑定账号!N10" + "SerializeProperty": "=绑定账号!P10" } }, { @@ -480,7 +481,7 @@ "PageName": "工作台首页" } ], - "ID": "1aefa758-01f7-4924-b30d-f578db855197" + "ID": "f8e0413b-da25-497e-ab1a-a53c9a00dbc9" }, { "CommandList": [ @@ -495,12 +496,12 @@ "BtnText": "知道了" } ], - "ID": "ef33fa40-d8a9-40e1-9618-31d2b180b8b3" + "ID": "7e16991c-6ffe-427e-a9dd-bc103fbb284a" } ] } ], - "ID": "d9ebbf6f-eeac-48e2-965e-69bb5be09cc9" + "ID": "9bb7e523-5273-4abe-9305-cec1037ae8f1" }, { "CommandList": [ @@ -510,7 +511,7 @@ "Message": "请先使用钉钉授权登录后再尝试绑定" } ], - "ID": "51ecec51-1920-4f80-a483-67d1bc441c93" + "ID": "1681557a-350f-403c-9e5c-5ebbdb0a151c" } ] } @@ -544,13 +545,24 @@ { "FontFamily": 0 }, + { + "FontSize": 13.333333333333332, + "Foreground": 2, + "HorizontalAlignment": 3 + }, { "FontFamily": 0, - "Formatter": 2 + "FontSize": 13.333333333333332, + "Foreground": 2, + "HorizontalAlignment": 3 + }, + { + "FontFamily": 0, + "Formatter": 4 }, { "FontSize": 13.333333333333332, - "Foreground": 3, + "Foreground": 2, "HorizontalAlignment": 1, "Underline": false } @@ -559,8 +571,9 @@ "Strs": [ "Body", "Center", - "[AUTO]General", - "Text 1 50" + "Text 1 50", + "Right", + "[AUTO]General" ] }, "CellStyles": { @@ -584,17 +597,10 @@ "6,20": 1, "6,21": 1, "6,22": 1, - "7,13": 1, + "7,13": 2, "7,14": 1, "7,15": 1, - "7,16": 1, - "7,17": 1, - "7,18": 1, - "7,19": 1, - "7,20": 1, - "7,21": 1, - "7,22": 1, - "8,13": 1, + "8,13": 3, "8,14": 1, "8,15": 1, "8,16": 1, @@ -604,16 +610,9 @@ "8,20": 1, "8,21": 1, "8,22": 1, - "9,13": 1, + "9,13": 2, "9,14": 1, "9,15": 1, - "9,16": 1, - "9,17": 1, - "9,18": 1, - "9,19": 1, - "9,20": 1, - "9,21": 1, - "9,22": 1, "10,13": 1, "10,14": 1, "10,15": 1, @@ -624,7 +623,7 @@ "10,20": 1, "10,21": 1, "10,22": 1, - "11,13": 2, + "11,13": 4, "11,14": 1, "11,15": 1, "11,16": 1, @@ -634,19 +633,19 @@ "11,20": 1, "11,21": 1, "11,22": 1, - "13,13": 3 + "13,13": 5 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "7,13,1,10", - "9,13,1,10", "5,13,1,10", "11,13,1,10", "21,1,1,6", - "13,13,1,10" + "13,13,1,10", + "7,15,1,8", + "9,15,1,8" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -685,7 +684,7 @@ "Fill": null }, "IsAutomaticFill": false, - "Size": "1216,711" + "Size": "1216,735" }, { "Name": "dce27f64-d790-4a87-a15d-5a87e6ae7455.png", @@ -700,7 +699,7 @@ "IsAutomaticStroke": false, "IsAutomaticFill": false, "Location": "352,128", - "Size": "448,359", + "Size": "448,383", "BoxShadowString": "2 6 0 12 #08000000" } ], @@ -710,4 +709,4 @@ "Formula": "绑定账号!$B$22" } ] -}//2HW3rAApJxfctmZ+k0+89pZGVb4fkWtHnGeRqUmNuCijSonIH/Yvk6p8wcq9CqmzI+NheaMZOU0qv1niO4P9zdIM1CPMQcSeE4XTxvEaS1ZQKPGkcAxzkZO7X4B2iDuLPcEkSkfMk5hebDhHQmLOBLs5znX4xQOvCO5oHe9YHBelBNxe8ZvB4bzIMuo++IC3wUyNz4xBpE/cUI4aS612kX7P/3darSfG1cVMMNkPGLdAQhm6bqlvsNbbkJZYsA+vwDk5aE3OcQGFBg9Y1LHuRhHcuLBBa5KI6S4YasLw4jkf/CwZWhLlsweDzl9qOpPGA+4MXUKQ+Z6hj9mREyboDGCpg2+FG+MzvbhzlCRjKJkJ9KSTMGPvYa4NTTmhHdj4pMidxPso8y+7DFvU6F4Wt7fK/Dc64LuxR5HmWFPQu7ormwn/DtXEEYkK+7JMC8FlIfywtGHRFN+YI9cKNjZr0rN87zmtTLa46diK0h77C2u751HQ+qDaf+ghKDOTc0tYAznfmPSIItkf7lup0NSGj6W5ZPRVRizu59deHiZdu4Pb7hheZKBMzbqpbFowFCNsmGfZDAXIbDl72K32YwfGNcYIH3yCeo95T7hfmJlnvseU7JkgQGUOt/Wrw8IF9Cy2Hj/ZnbxaCJP/JCfnjNcNfbE7t77APdqIZglU1y8OKe72/+5uxGO72FnmtKWIZoA6D8hdgUP4z+UAOZhXb1aHjWgqXn95Jn2aXZxrVvKQDhYXrSy8BxJzfrY0JOXLQ2BJO6ZTPDnEqZzlC1nU6elQF/OIvMWO36gf2Uer9SuJIlBv4xQK/ks6szOnIu9CTCalCCZ44+etga4+v2WuR2ISqhVNnmUHfVfZQytPSxsWGedj7h1Z8GjvBBE8J3S7z73bBOmqGpquBaSmTfEplzF40Q==|920 \ No newline at end of file +}//bj6fpLH52umgl8F4puvr7e14cqHmU2hw8nyMrG3OMcu3gz7YIZ0ZG7UdcVtOwT9B8VV7rvKqj7NN1/kNKbaIdnaUo8XDmESzkGJ88+js86Z7PWClDz8XGb7LyL1HW1bOwOfAoWXfro8kpTIPbOlOB+0CpsOCVVCfS5wHcZ+hfIjW/MWW4f+rErv8YNztsAsEkl0idF2PzI+kz2K4TuCP2n5gmzvnfhHbUD9GuebcLARJim49ZDAmDycW5kDKS/EJVzZ1xmHUr1QafBOtOpvh1A83gVwdQuKvTr/I9rBf/15Nu2br3WyikyQkrwoocmDbGtdFf0A4fs2gA+mvt3EKFq3IUyTBx6S48mX0x+ofcTWEPVdwDQMhIZtY7eXBx+qcTVR4Hr9k/zWBGus1n3HP4Iwa7tp5vm1WuPk832bwCItVPKQC0fjJ/kRYaFSGbGjSJ0Glk5c8LrUVLtuGV791xaAVehnGiOb24znT1G7SxtG2O+q+BnYfTvhCPLAONzUzMDciehWS1NlipwCmrmPP0Wtgkiu0S/j7YBeDE00gbvCHWWZorkGxN/MzrQILDYpj5wZLkq/iv0v65CTzmJWF/jB7x0uCKn5nGsjDG/3E1ZrFdgHoR6DRw4pEew1/Q2qO0XkO2yY0258lPxZ8sDnJ0bEn9hZCqX625CoXRE0USkiDi8DLAwDYzr3nAaqoSZBJz8TdqF4ndp+IPsjBXgeLXkP1mejj3bu/a/ZmsTlZsg2weAymBWymvr9Aycp5lFMPdAbdZ+vdPKT3eVGao0Zo8zXq5AQ/Fp1q+2DWw0vOatr3uZZKS7sb1Qk1qzWVg8755B0QkWmcwaO/Yj+oILPVJlt4cimvfzYPTR83t1b9aPilbZfdW5N42QMTvL3ELm5gY69JfTnCa8mvOvYb3Bya+g==|920 \ No newline at end of file