diff --git a/.collaboration b/.collaboration index 17db8ad5..d2b01ca2 100644 --- a/.collaboration +++ b/.collaboration @@ -398,17 +398,7 @@ }, { "ModuleName": "PCPage/FGC_登录", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-16T15:46:59.3768716+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\内建页面\\FGC_登录.json", - "Pages\\内建页面\\FGC_登录.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_维护中", diff --git a/Pages/内建页面/FGC_登录.json b/Pages/内建页面/FGC_登录.json index a1888179..1b41c82f 100644 --- a/Pages/内建页面/FGC_登录.json +++ b/Pages/内建页面/FGC_登录.json @@ -20,47 +20,42 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 52.0 - } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 36.0 + "DesignLengthInPixel": 37.0 } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 + "DesignLengthInPixel": 36.0 } }, - "6": { + "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 40.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 40.0 } }, - "9": { + "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 42.0 + "DesignLengthInPixel": 15.0 } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 + "DesignLengthInPixel": 42.0 } }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 37.0 + "DesignLengthInPixel": 40.0 } }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 37.0 } }, "13": { @@ -70,21 +65,26 @@ }, "14": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 20.0 } }, "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "16": { "GridRowColumnDefinition": { "DesignLengthInPixel": 71.0, "Mode": 1 } }, - "16": { + "17": { "GridRowColumnDefinition": { "DesignLengthInPixel": 43.0 } }, - "17": { + "18": { "GridRowColumnDefinition": { "DesignLengthInPixel": 165.0, "Mode": 2, @@ -96,19 +96,24 @@ } } }, - "18": { + "19": { "GridRowColumnDefinition": { "DesignLengthInPixel": 34.0, "Mode": 1 } }, - "19": { + "20": { "GridRowColumnDefinition": { "DesignLengthInPixel": 30.0 } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } } }, - "Count": 20 + "Count": 21 }, "Cols": { "RowColumnAttachedInfos": { @@ -173,13 +178,14 @@ "Values": { "0,0": "登录画面", "2,3": "欢迎登录Clue平台", - "4,3": "Administrator", - "6,3": "123456", - "8,5": "忘记密码?", - "10,3": "登录", - "12,4": "其他登录方式", - "15,3": "其他登录方式", - "18,0": "© 2024 GridStudio. All rights reserved.\r\n鄂ICP备2022016317号-1" + "3,3": "秩序 | 顺序 | 头绪", + "5,3": "Administrator", + "7,3": "123456", + "9,5": "忘记密码?", + "11,3": "登录", + "13,4": "其他登录方式", + "16,3": "其他登录方式", + "19,0": "© 2024 GridStudio. All rights reserved.\r\n鄂ICP备2022016317号-1" }, "AttachInfos": { "0,0": { @@ -188,7 +194,7 @@ "PageName": "登录画面" } }, - "4,3": { + "5,3": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [], @@ -219,7 +225,7 @@ "ForguncyAttribute": "LogIn_Username" } }, - "6,3": { + "7,3": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [], @@ -251,7 +257,7 @@ "ForguncyAttribute": "LogIn_Password" } }, - "8,3": { + "9,3": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": " 记住登录状态", @@ -260,7 +266,7 @@ "ForguncyAttribute": "LogIn_RememberMe" } }, - "8,5": { + "9,5": { "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", "CommandList": [ @@ -273,7 +279,7 @@ "TemplateKey": "_RS_Main" } }, - "10,3": { + "11,3": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "Text": "登录", @@ -282,7 +288,7 @@ "ForguncyAttribute": "LogIn_Button" } }, - "15,3": { + "16,3": { "CellType": { "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", "PageName": "其他登录方式", @@ -303,6 +309,13 @@ "Formatter": 3, "HorizontalAlignment": 4 }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 5, + "Formatter": 3, + "HorizontalAlignment": 4 + }, { "FontFamily": 0, "Foreground": 2, @@ -311,14 +324,14 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 5, + "Foreground": 6, "TextIndent": 0, - "HorizontalAlignment": 6 + "HorizontalAlignment": 7 }, { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 5 + "Foreground": 6 }, { "FontFamily": 0, @@ -328,7 +341,7 @@ { "FontFamily": 0, "FontSize": 12.0, - "Foreground": 7, + "Foreground": 5, "HorizontalAlignment": 8, "Underline": false }, @@ -336,13 +349,6 @@ "FontFamily": 0, "BorderBottom": 0 }, - { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "Foreground": 7, - "Formatter": 3, - "HorizontalAlignment": 4 - }, { "FontFamily": 0, "FontSize": 13.333333333333332, @@ -355,7 +361,7 @@ }, { "FontSize": 12.0, - "Foreground": 7, + "Foreground": 5, "HorizontalAlignment": 4 } ], @@ -366,9 +372,9 @@ "Text 1 25", "[AUTO]General", "Center", + "Text 1 50", "black", "Left", - "Text 1 50", "Right", "Background 1 -15", "Background 1 -50" @@ -392,8 +398,6 @@ "2,6": 0, "3,2": 0, "3,3": 2, - "3,4": 0, - "3,5": 0, "3,6": 0, "4,2": 0, "4,3": 3, @@ -401,29 +405,29 @@ "4,5": 0, "4,6": 0, "5,2": 0, - "5,3": 0, + "5,3": 4, "5,4": 0, "5,5": 0, "5,6": 0, "6,2": 0, - "6,3": 4, + "6,3": 0, "6,4": 0, "6,5": 0, "6,6": 0, "7,2": 0, - "7,3": 0, + "7,3": 5, "7,4": 0, "7,5": 0, "7,6": 0, "8,2": 0, - "8,3": 5, + "8,3": 0, "8,4": 0, - "8,5": 6, + "8,5": 0, "8,6": 0, "9,2": 0, - "9,3": 0, + "9,3": 6, "9,4": 0, - "9,5": 0, + "9,5": 7, "9,6": 0, "10,2": 0, "10,3": 0, @@ -436,23 +440,23 @@ "11,5": 0, "11,6": 0, "12,2": 0, - "12,3": 7, - "12,4": 8, - "12,5": 7, + "12,3": 0, + "12,4": 0, + "12,5": 0, "12,6": 0, "13,2": 0, - "13,3": 0, - "13,4": 0, - "13,5": 0, + "13,3": 8, + "13,4": 2, + "13,5": 8, "13,6": 0, "14,2": 0, "14,3": 0, - "14,4": 8, + "14,4": 0, "14,5": 0, "14,6": 0, - "15,2": 9, + "15,2": 0, "15,3": 0, - "15,4": 0, + "15,4": 2, "15,5": 0, "15,6": 0, "16,2": 9, @@ -460,10 +464,15 @@ "16,4": 0, "16,5": 0, "16,6": 0, - "18,0": 10 + "17,2": 9, + "17,3": 0, + "17,4": 0, + "17,5": 0, + "17,6": 0, + "19,0": 10 }, "RowStyles": { - "18": 11 + "19": 11 }, "SheetStyle": { "FontFamily": 0 @@ -471,14 +480,15 @@ }, "Spans": [ "2,3,1,3", - "4,3,1,3", - "6,3,1,3", - "8,3,1,2", - "10,3,1,3", - "12,4,2,1", - "15,3,1,3", - "0,0,18,1", - "18,0,1,8" + "5,3,1,3", + "7,3,1,3", + "9,3,1,2", + "11,3,1,3", + "13,4,2,1", + "16,3,1,3", + "0,0,19,1", + "19,0,1,8", + "3,3,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -505,7 +515,7 @@ "Fill": null }, "IsAutomaticFill": false, - "Size": "1541,878" + "Size": "1541,898" }, { "Name": "BackgroundPicture3", @@ -519,8 +529,8 @@ "IsAutomaticStroke": false, "IsAutomaticFill": false, "Location": "696,165", - "Size": "548,548", + "Size": "548,568", "BoxShadowString": "0 20 0 50 #0C1D2AA5" } ] -}//FkZQ3vaRkzprkWcehpzMxsSKBszdU6JhAPOh/1MYHWaJhW4+ZMlDSpsyic76ec+kisa7hCCOfRlvwu7M9yfCvQrfR5NzK9wM2/QM6CfprH5zuqyfLcRo4qSbb2s5zExg5UgM01x8Sc4BBZ7+vX023MBCpg4lVMhzwm8q5J5cOXPpQuSnm4I0yXP1e8OSJDlnr2RTKDUGuNhC8zh4nM3JECuV+bSBPiyIQWbUwkwmxhXbetMy/++PKzlp/lVVywnn05mCw3qRyQeCgWo0n1Wd/gdUdPZK2FWA9oMCubfdgBGhwB6wjTtfjjhHEmG6+lnaq7GP/6QiR45lNeWG/K86P5H+pJm4zP94t+Wnjv7b/iTOwKZVEzWE0XTUYAkBW3+6ZOrRbnCHkyqO/yQtH1LP7FKGMw4s/hGXwgIpT9dwW57TZCdk9nGGMzsRqyIMkzHmpVWkN35t8L1/Ov0kQfS7f46qIbAJlq0cbQpKFN71WvTkqKSvvZbqZbw1SYT1wZlClvE1H7iIQkIhBWczkeCr/xVuAA6XVazXMudmJweocJQI7WgHUrH4ul7oPVLtswRxviOu8fDHlZEc254UB33vu6z3iNFS0C2WwfwGTNN8dNU2zZtWG9s6Ehc8ctCfI9G+PN1maXrQTyQed8mXjubsALLVij0Bi4uDRq888E5buMZsqF1MtrDoX9/EYjPAX7YdRMvWzc0K5qE9ol/J7m9ECpJE9fdO6YqU9OQXO9CBVnTT0WvQ6HxobGwcNQmoWapc51CLZuLBIIkoih3n1wi4LAZ/NRxxhmY7M/8ePI1WjjkTcTRwD7veYWyWPls+zvtxAzXUouLH7ArOiIJvy8k+WjMET1SZyLqi+RmNPEYTE9J4Uo+F0W2husqGIFXMymf4/NHY6pVsZt+yh7LJnkdgsg==|920 \ No newline at end of file +}///QqqNOa3xO3jRau2k/C/lCP8SPsjavNeUchicveZZk4tonLX5WB6GA8NCzv28YUiMP1fuaMy7VyfpRrhp/Vv/P2ZcPKcPMbnEOuNjqtifM86JI4w3me78BHnZFpqtzV7u1LR2Cm/LqRnGqSwu3wj1CE5bjWwMjdX+PcTc//AmfH4VDeoTdjp9gBHpQ3hGnUui35pIzpFqnJ3lnI2NgEVyWFNa+m7mT8eFRxoNK7YGlBuYS3sBkdOhoxuKLtKBMQ605Y7KKVnN4+oODXaw+A8kq50odUxpKIccKbVzNaWmn8e2HMLLHQqxpLu1VaBK63BSKDf140X+qD21DeqzbiGeYo1WwZ2JcpPPk+W5I3hlvHJXMop3zdpg6yvGCq2rtE0Vi8YzmuhKkWfIQBCEikmKp/verae0hU1EDH0iEcyM4V1lVMxRPDzRnOR/eQSjYwKFLQRMSBC+Za7s76HvXvRsR5Mk0f7MWtTtXu/6E5Azac3/Kq7SvmsrO2StKrZ0rhKJ5DYOLwRslmhDqctWNglO8pym41soaIytz5DvcuCDUu1XE36NV6n1kjGoG7/JF8Ti75VdnU/25Ud2+nCTeQUUGagM3ryUw5b0f2iRJXBM5L14OUjFatBTlKpRxceIPbWOjcWohi/xuSjiNIHRTHEzvKsOFXyHuqalZbcemzHB/BQP4NA8SqRWOxmw0sDRqCauT7k+XyaxIXpnt4e7I8D/neM3np5ccFoRSHFo7Yt8CTSZ3wRNE2vWnaUYJSo5X522zCeAV14I2MbM5Nzu4fEQTwlg4Q36Jb8Wa8Wkqh2nA1UKOTy0DDCtCOWIt1sQa3tP8EOSZR3PzVTsOv39M4nIuNoOOVkIKV8GTqzjw2XmogGJ8iLWrrhLcaPhVzPkd+h1zwh2lg4tb1Iw6/JFlETjA==|920 \ No newline at end of file diff --git a/Pages/内建页面/FGC_登录.rd b/Pages/内建页面/FGC_登录.rd index 880881fd..342750ef 100644 --- a/Pages/内建页面/FGC_登录.rd +++ b/Pages/内建页面/FGC_登录.rd @@ -1,5 +1,5 @@ { "PageType": 0, "ColumnCount": 8, - "RowCount": 20 + "RowCount": 21 } \ No newline at end of file