From 17521c38e7efee98cb456289ef827fc6f48d7416 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Mon, 2 Sep 2024 12:05:56 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E6=88=90?= =?UTF-8?q?=E5=91=98"},{"State":1,"Type":1,"Name":"PCPage/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=B8=89=E7=BB=8F=E7=90=86=E6=88=90=E5=91=98"},{"Stat?= =?UTF-8?q?e":1,"Type":1,"Name":"PCPage/=E5=AE=8C=E5=96=84Gitee=E8=B5=84?= =?UTF-8?q?=E6=96=99"},{"State":1,"Type":1,"Name":"PCPage/=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83-=E5=9F=BA=E6=9C=AC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF"},{"State":3,"Type":1,"Name":"PCPage/=E4=B8=89?= =?UTF-8?q?=E7=BB=8F=E7=90=86=E8=AE=BE=E7=BD=AE"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 58 +- Pages/Git/完善Gitee资料.json | 8 +- Pages/个人中心/个人中心-基本信息.json | 676 +++++++++++------- Pages/个人中心/个人中心-基本信息.rd | 6 +- .../项目首页-容器页面/项目成员/三经理设置.json | 508 +++++++++++++ .../项目首页-容器页面/项目成员/三经理设置.rd | 5 + .../项目首页-容器页面/项目成员/项目成员.json | 209 +++--- .../项目首页-容器页面/项目成员/项目成员.rd | 6 +- 8 files changed, 1071 insertions(+), 405 deletions(-) create mode 100644 Pages/项目/项目首页/项目首页-容器页面/项目成员/三经理设置.json create mode 100644 Pages/项目/项目首页/项目首页-容器页面/项目成员/三经理设置.rd diff --git a/.collaboration b/.collaboration index 7024551a..d80e8133 100644 --- a/.collaboration +++ b/.collaboration @@ -654,35 +654,11 @@ }, { "ModuleName": "PCPage/项目成员", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-02T11:35:51.9884683+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员\\项目成员.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员\\项目成员.rd", - "Pages\\6899a8cead694b3ba00307b6756dbd7.json", - "Pages\\6899a8cead694b3ba00307b6756dbd7.rd", - "Pages\\007ea4aa4c7440478a9a092179dace8.json", - "Pages\\007ea4aa4c7440478a9a092179dace8.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目三经理成员", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-02T11:33:18.0425761+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员\\项目三经理成员.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员\\项目三经理成员.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员详情", @@ -882,17 +858,7 @@ }, { "ModuleName": "PCPage/完善Gitee资料", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-02T11:40:51.2544002+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\Git\\完善Gitee资料.json", - "Pages\\Git\\完善Gitee资料.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/汇报", @@ -952,17 +918,7 @@ }, { "ModuleName": "PCPage/个人中心-基本信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-02T11:39:44.3158006+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\个人中心\\个人中心-基本信息.json", - "Pages\\个人中心\\个人中心-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/个人中心-积分列表", @@ -2330,12 +2286,6 @@ }, { "ModuleName": "PCPage/三经理设置", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-02T11:33:45.4099159+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/Pages/Git/完善Gitee资料.json b/Pages/Git/完善Gitee资料.json index 23babd43..cb271723 100644 --- a/Pages/Git/完善Gitee资料.json +++ b/Pages/Git/完善Gitee资料.json @@ -167,7 +167,7 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "当前用户", "ParameterValue": "%CurrentUser%", - "ID": "326e16f6ab524ff18abef12510cc710a" + "ID": "3dc751e6ea0a429a8ab15e9f3f436071" }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", @@ -235,7 +235,7 @@ "ReloadData": true } ], - "ID": "e681728d-bb9b-45cb-96ec-fbbe8467de69" + "ID": "7ecc57d8-fb8b-4121-b1d8-6655d6ed1089" }, { "CommandList": [ @@ -250,7 +250,7 @@ "BtnText": "知道了" } ], - "ID": "2b10cd25-7faa-471f-9924-85737a94c9d7" + "ID": "27c6be83-c7f9-4d06-8e7e-d6be326bb65b" } ] } @@ -345,4 +345,4 @@ "PaperSize": {}, "Margin": {} } -}//THvtd5U5WbBWZNjaeI+wul2Djcmut2gY9RKR9+tonvX6d42ATvTSqEBLzWS9qtC822RC4jJpqkj965yGdIvQ9uwdiJ4JuABKeyMaeRtNqncIF7eMJn3wh5HxY5s0h4qRlvoN/FwlrRYkRPIX+tBmj21yg1aEVUnC3hBVACwB0jSUCvyU0pmu3zxkrfXmY0zNhafPzD/nnCngYnDylCoOIerA1ImWnYytFgEGqMxQzTH4W8kEwyFVMrEDHrrItz7ph2yn2gq4NuRBfNDj/8HDXcqtTK53mnp/ZeehWbSrytRcRhD59moTMN/SWUGU49L6Pj78dc1qxbA2Oi1/XqLbHGeUdFx1xlDYFveXssCg/2VS2QY8PmYkCgaDLyVxquFs+A8KGU/U502v7q6+OCN3XeCNBNhMrPVKJT0+1O3QKSw3RWRv+okNwC09u8rhPOxIwByt1chCo1LJc64qY6aCutDGDLHRSQgK2UXxlcWXH+u88aPOB0sbYQToe0f3WLmQqjRIPmVTTSEGDIgeXVGKN0QxkJGNZa8oojFrqjQr+1yNJxNFkE0cNmvjU4nMOhFCcVJVMeS1jHDR0zDcvemMWV6xJ2jdRZBFBFQ9oBRTHYRZBxya7A37L8PDGX0j/l5dpfRXlsJ0aSTgcvPWhcToesQ4+6bkTPOoCHYvs71Twpc+y+TIXhUrPRPei8bVjBBcFHTZE54VToybj9Ils0Rcqh0tu3q/zPRQN8FioOWb2jkpcpXDuc5yhPpt+KqbKFhnSfvsdXDLvZowj0aC3BVXY3eeNEKrDCsvhGAHXAffhxS2teAS/s4bxWqeSSO8FAg2oldZWd0zMxxawn0nzH8SIDgTwX+fkvcYLSsV6F4el+TVAeQZ0k5oQCCHYP1JAkJXc5xZjCoWi+PouSrJNL0bkw==|920 \ No newline at end of file +}//Z3VfbhxvIygQxzYVlXha+ogNWab28kWCP+TZrnfJ1LLq30luBI4M8nTuDTtJLBvmqSAPt0KFu9vbvAuJYhQbLpmqIL7gdOVRK9xtKHgGQK6Yzh+WkSPidVLjgWO0j75g65K4gOpscRzRJvKv6MBehswz+ebTiZS8i+aKXBrei9cPqc7J8O32MYLk3/XlevvYm7HyKYW/kYE1cunSNRvXC3vWHjrjkdwXPTCpmgcORkAEZkZBhV6HbyyYBcJ2CJKVcVtNXTtFSCMxhFsjZQYV2YQCSPpP4hB7i2EjcZDLV/BIUXzY6hLLt9OIOEsIHz5JLHewgShv29++ucXAL7Vz6V9pzFgRlSOtBdKRh0s/wqCkzp6QQCen+VHRu4kYCSCRPwh62qJyUH9t4SJG1m0wFAf5nYyLtvHLbbSR94UwVyYCIHlftVdQx69RJNs9qWSBufJoDTPQLz6v6QKGqFLN0iU8vwi89DDovq2fnWLOYRdjosKorhU7QzURaukdZzLsRplMe01N08eVR9UYJzgLfXgCvCUou6BEHZjJoHO0qTD4yiO2idZbd/BknIjCrk1fqyC1rsQhkDwMojyo8PYIeARSwFzIvB7mntuYRqi/IvQaRpCpUfJSoyr+2SZWk8oRPYjrPkCxcZ6E51W1TdEHMsi+jXQba1VqVodyPu9Ka3quFyedHMCd4YUiYQfeuRHJ8T6aAT9SpewF4yBHjB8ziUF7RkKfZ2VxLho4vObTh22jN4VNp8EtrzQMh/ozVMGPkYcXC9ewL1+fuGW7Za529C48je9rXCPb9cDCUSBxl/2HWNS4EUhobOoTugs+0rKWDd6PH8qLurOzWO1uEWbpL/C4NuuJl7PFVCyGusnJIbd38f4qiTlP957gE28EGZwJByCH637bgfX4+5JZAKZ7uw==|920 \ No newline at end of file diff --git a/Pages/个人中心/个人中心-基本信息.json b/Pages/个人中心/个人中心-基本信息.json index 22428ad6..acb9701d 100644 --- a/Pages/个人中心/个人中心-基本信息.json +++ b/Pages/个人中心/个人中心-基本信息.json @@ -32,15 +32,35 @@ } }, "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 30.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "8": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } } }, "InLogicalVisibleIndexes": [ - 7 + 14 ], - "Count": 8, + "Count": 15, "DefaultSize": 32.0 }, "Cols": { @@ -230,10 +250,12 @@ "4,16": "%CurrentUser.默认时薪%", "4,23": "小组", "4,27": "%CurrentUser.小组%", - "6,1": "Gitee用户名", - "6,5": "%CurrentUser.GIT用户名%", - "6,12": "Gitee密码", - "6,16": "%CurrentUser.GIT密码%" + "6,1": "Gitee信息", + "8,1": "Gitee用户名", + "8,5": "%CurrentUser.GIT用户名%", + "10,1": "Gitee密码", + "10,5": "%CurrentUser.GIT密码%", + "12,5": "保存Gitee信息" }, "AttachInfos": { "2,5": { @@ -352,12 +374,12 @@ } } ], - "ID": "93d5f449-e4b0-4e51-be81-b2083040c4da" + "ID": "940b3d50-837f-4043-99f5-4bb4a5c1c375" } ] } ], - "ID": "df27667a-375e-4695-ae67-2c4ffdff11ac" + "ID": "55023001-e584-404c-b7df-a7ef67185215" } ] } @@ -506,12 +528,12 @@ } } ], - "ID": "90a1dcff-0ca8-4b0c-97cd-c31f392d9614" + "ID": "87431b22-ad31-43b3-9532-2797525d2c20" } ] } ], - "ID": "58b4e461-46c7-4ef9-a02a-c1a929469e58" + "ID": "88f5af6a-0216-4a80-87dc-35b95cd56b2c" } ] } @@ -691,12 +713,12 @@ } } ], - "ID": "aea6a5c5-7885-40b0-adc9-f37da3a36e0a" + "ID": "e18f972b-7467-4ed3-ba47-12071b90b479" } ] } ], - "ID": "99ff5482-939b-4b2a-992a-1a4577001eb2" + "ID": "8c54a7c3-873c-4585-a4f9-8ef9139f9e63" } ] } @@ -840,12 +862,12 @@ } } ], - "ID": "5f81debf-3189-4214-b3e0-076c9dd20cf4" + "ID": "f90f4f5c-cedd-4fa3-8506-555db6fde73b" } ] } ], - "ID": "8a33d51f-8051-4fc6-84cb-76d81a2b56f1" + "ID": "f7d804fd-83b6-4f13-bab7-5f5f9d28b8b0" } ] } @@ -903,132 +925,9 @@ "IsDisabled": true } }, - "6,5": { + "8,5": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", - "contextProperty": { - "Display": "值变更原因" - } - }, - "value": "userInput" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "更新用户配置", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "用户名", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!母版_当前用户" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "姓名", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!姓名" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "邮箱", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!邮箱" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "负荷", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!负荷" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "默认时薪", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!时薪" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "Git用户名", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!Git用户名" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "Git密码", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!Git密码" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, - { - "$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": "10ad82d1-6921-4185-88a9-4e2a1e00cc90" - } - ] - } - ], - "ID": "b98e4565-fdce-4811-aaf9-921fff6e2171" - } - ] - } - ], "UIPermissions": [ { "Scope": 2, @@ -1054,67 +953,96 @@ "resize": "none" } }, - "6,16": { + "10,5": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "%CurrentUser.GIT密码%", + "type": "password", + "resize": "none", + "showPassword": true + } + }, + "12,5": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ { "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", - "contextProperty": { - "Display": "值变更原因" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='个人中心-基本信息'!Git用户名" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='个人中心-基本信息'!Git密码" + } + ] + }, + "value": "%Null%", + "compareType": 1 } - }, - "value": "userInput" + ] }, "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中", + "VBalidate": true + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "当前用户", + "ParameterValue": "%CurrentUser%", + "ID": "16312fd51fd346e0ab1dbbd488301797" + }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "更新用户配置", + "ServerCommandName": "更新GITEE信息", "Parameters": [ { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", "ParamName": "用户名", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!母版_当前用户" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "姓名", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!姓名" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "邮箱", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!邮箱" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "负荷", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!负荷" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "默认时薪", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='个人中心-基本信息'!时薪" + "SerializeProperty": "='个人中心-基本信息'!当前用户" } }, { @@ -1143,6 +1071,12 @@ "RefreshAfterFinish": true, "CheckDataValidation": true }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中", + "VBalidate": true + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -1157,53 +1091,59 @@ } ] }, - "value": "0", - "compareType": 1 + "value": "0" }, "CommandList": [ { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "warning", + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ReloadData": true + } + ], + "ID": "c77719bd-81e6-4f28-8ba5-1c0f3d27a3f6" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", "Message": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "='个人中心-基本信息'!msg" - } + }, + "BtnText": "知道了" } ], - "ID": "2c94e81e-8024-4fad-a91b-840aade04cb4" + "ID": "307ceb0b-4520-4245-b0e5-cc7b82d3c0a7" } ] } ], - "ID": "de70fc7a-9680-4551-aa28-26f2e68adb9d" + "ID": "ddbb2903-5484-4644-a959-99815986d24e" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "信息不全", + "Message": "请填写Gitee用户名及密码", + "BtnText": "知道了" + } + ], + "ID": "544a6289-7971-43d6-9af0-26c5477c660d" } ] } ], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "DefaultValue": "%CurrentUser.GIT密码%", - "type": "password", - "resize": "none", - "showPassword": true + "Text": "保存Gitee信息", + "TemplateKey": "Gitee按钮", + "Icon": { + "Name": "gitee.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 } } }, @@ -1264,6 +1204,22 @@ "Formatter": 9, "HorizontalAlignment": 5 }, + { + "FontFamily": 2, + "FontSize": 16.0, + "Foreground": 0 + }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332, + "Foreground": 1 + }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332, + "Formatter": 6, + "HorizontalAlignment": 5 + }, { "FontSize": -1.0 } @@ -1391,64 +1347,259 @@ "5,34": 3, "5,35": 3, "6,0": 3, - "6,1": 5, + "6,1": 10, "6,2": 3, "6,3": 3, "6,4": 3, - "6,5": 8, + "6,5": 3, + "6,6": 3, + "6,7": 3, + "6,8": 3, + "6,9": 3, + "6,10": 3, "6,11": 3, - "6,12": 5, + "6,12": 3, "6,13": 3, "6,14": 3, "6,15": 3, - "6,16": 9, + "6,16": 3, + "6,17": 3, + "6,18": 3, + "6,19": 3, + "6,20": 3, + "6,21": 3, "6,22": 3, - "6,23": 5, + "6,23": 3, "6,24": 3, "6,25": 3, "6,26": 3, - "6,27": 4, + "6,27": 3, "6,28": 3, "6,29": 3, "6,30": 3, "6,31": 3, "6,32": 3, - "6,33": 4, - "6,34": 3, + "6,33": 3, + "6,34": 11, "6,35": 3, - "7,1": 5, - "7,2": 10, - "7,3": 10, - "7,4": 10, - "7,5": 10, - "7,6": 10, - "7,7": 10, - "7,8": 10, - "7,9": 10, - "7,10": 10, + "7,0": 3, + "7,1": 3, + "7,2": 3, + "7,3": 3, + "7,4": 3, + "7,5": 3, + "7,6": 3, + "7,7": 3, + "7,8": 3, + "7,9": 3, + "7,10": 3, "7,11": 3, - "7,12": 5, - "7,13": 5, - "7,14": 5, - "7,15": 5, - "7,16": 9, - "7,17": 9, - "7,18": 9, - "7,19": 9, - "7,20": 9, - "7,21": 9, + "7,12": 3, + "7,13": 3, + "7,14": 3, + "7,15": 3, + "7,16": 3, + "7,17": 3, + "7,18": 3, + "7,19": 3, + "7,20": 3, + "7,21": 3, "7,22": 3, - "7,23": 5, - "7,24": 5, - "7,25": 5, - "7,26": 5, - "7,27": 4, - "7,28": 4, - "7,29": 4, - "7,30": 4, - "7,31": 4, - "7,32": 4, - "7,33": 4 + "7,23": 3, + "7,24": 3, + "7,25": 3, + "7,26": 3, + "7,27": 3, + "7,28": 3, + "7,29": 3, + "7,30": 3, + "7,31": 3, + "7,32": 3, + "7,33": 3, + "7,34": 3, + "7,35": 3, + "8,0": 3, + "8,1": 5, + "8,2": 3, + "8,3": 3, + "8,4": 3, + "8,5": 8, + "8,33": 4, + "8,34": 3, + "8,35": 3, + "9,0": 3, + "9,1": 5, + "9,2": 5, + "9,3": 5, + "9,4": 5, + "9,5": 8, + "9,6": 8, + "9,7": 8, + "9,8": 8, + "9,9": 8, + "9,10": 8, + "9,11": 8, + "9,12": 8, + "9,14": 5, + "9,15": 5, + "9,16": 5, + "9,17": 5, + "9,18": 9, + "9,19": 9, + "9,20": 9, + "9,21": 9, + "9,22": 9, + "9,23": 9, + "9,24": 9, + "9,25": 9, + "9,27": 4, + "9,28": 12, + "9,29": 12, + "9,30": 12, + "9,31": 12, + "9,32": 12, + "9,33": 4, + "9,34": 3, + "9,35": 3, + "10,0": 3, + "10,1": 5, + "10,2": 3, + "10,3": 3, + "10,4": 3, + "10,5": 9, + "10,33": 4, + "10,34": 3, + "10,35": 3, + "11,0": 3, + "11,1": 5, + "11,2": 5, + "11,3": 5, + "11,4": 5, + "11,5": 9, + "11,6": 9, + "11,7": 9, + "11,8": 9, + "11,9": 9, + "11,10": 9, + "11,11": 9, + "11,12": 9, + "11,14": 5, + "11,15": 5, + "11,16": 5, + "11,17": 5, + "11,18": 9, + "11,19": 9, + "11,20": 9, + "11,21": 9, + "11,22": 9, + "11,23": 9, + "11,24": 9, + "11,25": 9, + "11,27": 4, + "11,28": 12, + "11,29": 12, + "11,30": 12, + "11,31": 12, + "11,32": 12, + "11,33": 4, + "11,34": 3, + "11,35": 3, + "12,0": 3, + "12,1": 5, + "12,2": 5, + "12,3": 5, + "12,4": 5, + "12,5": 12, + "12,6": 3, + "12,7": 3, + "12,8": 3, + "12,9": 3, + "12,10": 9, + "12,11": 9, + "12,12": 9, + "12,14": 5, + "12,15": 5, + "12,16": 5, + "12,17": 5, + "12,18": 9, + "12,19": 9, + "12,20": 9, + "12,21": 9, + "12,22": 9, + "12,23": 9, + "12,24": 9, + "12,25": 9, + "12,27": 4, + "12,33": 4, + "12,34": 3, + "12,35": 3, + "13,0": 3, + "13,1": 5, + "13,2": 5, + "13,3": 5, + "13,4": 5, + "13,5": 8, + "13,6": 8, + "13,7": 8, + "13,8": 8, + "13,9": 8, + "13,10": 8, + "13,11": 8, + "13,12": 8, + "13,14": 5, + "13,15": 5, + "13,16": 5, + "13,17": 5, + "13,18": 9, + "13,19": 9, + "13,20": 9, + "13,21": 9, + "13,22": 9, + "13,23": 9, + "13,24": 9, + "13,25": 9, + "13,27": 4, + "13,28": 12, + "13,29": 12, + "13,30": 12, + "13,31": 12, + "13,32": 12, + "13,33": 4, + "13,34": 3, + "13,35": 3, + "14,1": 5, + "14,2": 13, + "14,3": 13, + "14,4": 13, + "14,5": 13, + "14,6": 13, + "14,7": 13, + "14,8": 13, + "14,9": 13, + "14,10": 13, + "14,11": 3, + "14,12": 5, + "14,13": 5, + "14,14": 5, + "14,15": 5, + "14,16": 9, + "14,17": 9, + "14,18": 9, + "14,19": 9, + "14,20": 9, + "14,21": 9, + "14,22": 3, + "14,23": 5, + "14,24": 5, + "14,25": 5, + "14,26": 5, + "14,27": 4, + "14,28": 4, + "14,29": 4, + "14,30": 4, + "14,31": 4, + "14,32": 4, + "14,33": 4 }, "SheetStyle": { "FontFamily": 2, @@ -1468,10 +1619,11 @@ "4,16,1,6", "4,27,1,6", "2,27,1,6", - "6,1,1,4", - "6,12,1,4", - "6,16,1,6", - "6,5,1,6" + "8,1,1,4", + "10,1,1,4", + "8,5,1,28", + "10,5,1,28", + "12,5,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1506,6 +1658,16 @@ "IsAutomaticFill": false, "Location": "3,6", "Size": "3,18" + }, + { + "Name": "BackgroundPicture1", + "DisplayName": "背景图2", + "StyleInfo": { + "Fill": "Accent 1 0" + }, + "IsAutomaticFill": false, + "Location": "3,135", + "Size": "3,18" } ], "CustomNames": [ @@ -1527,11 +1689,11 @@ }, { "Name": "Git用户名", - "Formula": "'个人中心-基本信息'!$F$7" + "Formula": "'个人中心-基本信息'!$F$9" }, { "Name": "Git密码", - "Formula": "'个人中心-基本信息'!$Q$7" + "Formula": "'个人中心-基本信息'!$F$11" } ] -}//boV04rroeVGaXmGhXjLcJuOskJYyl1KDH9DC9jhSStvCRckXhsK/MD/aZwq0npDqj+E4OSTfjJ1Z5uT4gsEDAsSWV7MkvlqLBTGyqXL4N2+9oEFbwfsveJeNWZHnTr5DQ4oxcQrxbkMNe2d+dYk8E7/VkEKdxXAvtmWDTMpTiRG9+rBhBpmDvUuFduE0GOEuFLfLVcPgOPsJs6Cf3zE5m690Ze/6PZ5NLq1ZKmwd9hkJBPLt3YmDqSYYB6itSlU0vynUbyS2JMDznEld6szrPeZqEa/ysHbhtNm/Zd3Jdwuon8txceHGX3+x7BTNRWUxlG4SyPUQBJtUqQe0HRMkQTsU/folyOCWuw2NHZtivKaMkgc+LWLgMv5NUqXKqZ/ai82LQrJmkNcPRna8RgQKUtQ7wNPVSK3m2pNVlOtrykMOQfPGtA4GamHBkL4K6eeyhdZ/fKodERsKyVqFlHte5kuzQulJjXf6g+bt3V8iu+T4Oor0g6yqAcfMwpFH/uYKoHZ0qOyIoJ1G0CG+RQSUaXoOV1RhqoNClE/Yuss2VrwkpmzHcUxyC96r/wbjeRcJApCA/Wzt/R3ME+bQeIeTTXpwEFRhfX2yiJL0X+INDC9Q3RMYNXSbQ8wpq4cd6gk76jAY0NwpZUhhJY3BQgGvHnD0/hmdFdhpnwDguo8KdmkMI4cVnmGierEF5CJuRMqINIRt1V0ASqpLMLKWZx2MZkNQNGzYBm6mgevB4NIPSJnfcSufy7yAizr3+BsJezehi0TjjAcDAr/hVnaUZIK1hyyYs6vcSk8IBE06hzHsWynPVRFfSM+cF/9AfEu/Ca2i+auOEdr4y3FRkQ7XU/gq3wA/ejbGiCuBa6CIAU1647B+Qmo4TowmPjEjSRWshpbyNlv/d7xlm/kQyILSfGA3vg==|920 \ No newline at end of file +}//zd2qQY+HsZIepb3ShWpEOi7wXFdxkueyNpaHeYLr1NAnqPKwGrqw+Njwhk/voCLhJ7sotpFDSzLxL3i4L4QJxyL0pk/0I0ml29AYpFlmtXABEZh5EVOvOSuldVySJYB6ypT0j9touWHhoDbw886iQXZRjYOHxxGg1KF3lOeDsZ8p6ArJIjByIe7Qk/gDKWI+Kv8qrb5nnpj+eEbaDbZf6/SouplaIx+LP0y5DQJ/zl9sJx8e0E0N0rEcMTwBdorRkD6nl6HhTtgmRJqdJIzA5HUVXgEB7G9hcCcRL9czupJcEpJMHGQNzOJgcBW0K1dA+TkIl/ucaowHy1XtEfzfLcd3SrkL21LrSCc6vZ17G7GHLkJqUAjd0fnSv1XR19uh4LCFGQztyY3LiiveJU3GyQHr6AlXhDeYlfHpcceOveJb98s8gGBAnb3ftCqE9flyMmeWVfolyTCFPmmN+Dh7bv45tG5ewqWHlfnufvAOtiqZvGhCk35H4N9Spl/d2DGLPNTHrf9w8QHfHm84m9NiIQ2pSGt7jtDr7L7T+7S60NY2wpVCQf2zo9fOBjGX97oiMVKuRQrjTs/W+brwDLbg2PcnHO+CotQujvP3/sE9x9CKRM2b0aLPQw5xKrWxti2fqjVQrtdREM5/XXNrLsmUCikVsxgsTr8OGKpaJiHzIvK6nnH+PJkJqc7HBvyr9KAqrkznz6xEHY1HKiIiQJlnYHNbK6NWnPPlgS64OURTG5+F1KHE7JWlB6QYKAy4REGgk9mE2zt0Eq7Ir8lNzB8ve/rLl1xt5SPc7nUKLJfSEtoJ156PB2No3f5nu9aweUEFS2EDKH8gzWxfcG8pSPzl5VUNA1nEEmpKJmgcGH0vNqZr/FBARC4qQXn1IV6MRRS3dDEEkaDR4vCro58FACtUog==|920 \ No newline at end of file diff --git a/Pages/个人中心/个人中心-基本信息.rd b/Pages/个人中心/个人中心-基本信息.rd index 0d0772cb..1500d5c9 100644 --- a/Pages/个人中心/个人中心-基本信息.rd +++ b/Pages/个人中心/个人中心-基本信息.rd @@ -1,7 +1,7 @@ { "PageType": 0, "ColumnCount": 36, - "RowCount": 8, + "RowCount": 15, "CustomNames": [ { "Name": "姓名", @@ -21,11 +21,11 @@ }, { "Name": "Git用户名", - "Formula": "'个人中心-基本信息'!$F$7" + "Formula": "'个人中心-基本信息'!$F$9" }, { "Name": "Git密码", - "Formula": "'个人中心-基本信息'!$Q$7" + "Formula": "'个人中心-基本信息'!$F$11" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员/三经理设置.json b/Pages/项目/项目首页/项目首页-容器页面/项目成员/三经理设置.json new file mode 100644 index 00000000..44ebd700 --- /dev/null +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员/三经理设置.json @@ -0,0 +1,508 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 40.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 12, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 12, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "项目经理", + "4,1": "商务经理", + "7,1": "客服经理", + "10,1": "确认" + }, + "AttachInfos": { + "2,1": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目经理", + "GUID": "31533a28-c982-49cc-bbda-fa9af48a2f49" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "3b2576d8-ed3d-4cf7-9f42-06e110e6f085", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "e0ae8008-dca8-4612-bfdd-a6871f72360d" + }, + "ColumnName": "value" + }, + { + "GUID": "e0bb4004-b10c-4252-b10e-02a8439c531f", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "6f918571-2f54-4907-99ca-9db241ed9e3b" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + } + }, + "5,1": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "商务经理", + "GUID": "a5731306-04ac-459f-9db6-499a4524a1d9" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "614ff091-5265-4dd2-a782-6498dabd1457", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "15c72997-b26c-4d67-8bf7-2b08d0288ca2" + }, + "ColumnName": "value" + }, + { + "GUID": "8bd98da3-918d-424d-81bd-6db0514c88c4", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "4c70cf32-7cc7-4fca-93ea-84c25b8adeae" + }, + "ColumnName": "label" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "角色", + "GUID": "0c1857b4-ea40-476e-8dab-037bf3514a86" + }, + "Value": "商务" + }, + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + } + }, + "8,1": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "客服经理", + "GUID": "37222fc6-46b9-4099-9c76-8280c515acbf" + }, + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "feb57a98-dd1f-4782-8be4-fc39c6d37526", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "4e3ae40f-d60e-4eb0-b7b0-f71f10e46bb5" + }, + "ColumnName": "value" + }, + { + "GUID": "2e953ba3-77c9-4c57-a9a1-54ce77f403ce", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "432f63ef-bfa0-4836-b0c1-b044301da9fe" + }, + "ColumnName": "label" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "角色", + "GUID": "894a22c5-4724-4a65-b9a2-aaac263500d6" + }, + "Value": "客服" + }, + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + } + }, + "10,1": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目表", + "ShowConfirm": false + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "保存完成" + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" + } + ], + "Text": "确认", + "TemplateKey": "_RS_Main1" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 0 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + } + ], + "Types": { + "Strs": [ + "Body" + ] + }, + "CellStyles": { + "1,1": 0, + "2,1": 0, + "4,0": 1, + "4,1": 2, + "4,2": 1, + "4,3": 1, + "4,4": 1, + "4,5": 1, + "4,6": 1, + "4,7": 1, + "4,8": 1, + "4,9": 1, + "4,10": 1, + "4,11": 1, + "5,0": 1, + "5,1": 2, + "5,11": 1, + "7,0": 1, + "7,1": 2, + "7,2": 1, + "7,3": 1, + "7,4": 1, + "7,5": 1, + "7,6": 1, + "7,7": 1, + "7,8": 1, + "7,9": 1, + "7,10": 1, + "7,11": 1, + "8,0": 1, + "8,1": 2, + "8,11": 1 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "Spans": [ + "8,1,1,10", + "5,1,1,10", + "2,1,1,10", + "10,1,1,10" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//B3wlBTF3Rg+zekU+Fw9gDCUbIaRhGRyn+p8MKq+wpd9Cbpt+MHgJbvRC02ZlSIPSFb9yFgx06GiTyZgTf1gI5AnpR/mTomRwiDb/Vo92fYPLCrSinYbqvagctoNVbiaBPc+MaYYf9N8F24BOwYgRmoYdTsuczA0hIsJWMlyXsdW70/wN0T0u4u0d/koCUcgJDyrMBGw5T42OTYNgB1CW7ZUOVAuV3xcs+cDa/KC0hbPLZMgRAImPXwuiXk2o1KKwLQXOAhvhVAL798OUWCTPGnbLUb/sxeZMg4F6Ko5/MGWlId5XLnRrhdoyJLpXVv49h61Jizu1J46Yi4KH3yHNRUhVvo7bgIMIeGMwzH4iIBSGkaybtiKS4K80a+85opg+ebKN2rOCW/vjEF2z79b3w0U81s89zKmIHTtWYwnpKAyGc9NFnatmbpSVqQsGsfsfnyhWCpnT+JRuE7jkDEAniEkPeJQpNpUSRCzA4xPoEkxpBEmu4QmvNojdPGlmXum12gDq+HkHkdcZsKF28e/moaOm7NBSzm9Q16nefPL3EkGnLMlqLkcCkW+wWwTWjVBkYlmLFJbL4L7uqGfxqvdIsm8LUILpogkT0pFG+r4WGq6LoDv/ss/ZufkDq/amq+Fjz4Fy0etPtyeQ79dGDfsas87flv4c2HJ7Pm6+xKIZDWsqrWbdIbQv78XaSfXfEO5TYVmkEqZEiCyQBYkMNTP4/1XXu4rOwfq6/ur4Vy6d07ihCQutv+udJVfJHxS3qs7tfLO2eHdvonmzxuOzJxwU8ybUdLDDz1X57P2iZoQOAJhCVrgAsF0z9CZgYSgHLlp7u/VFoFLAIKE09H78SlzDfrhwKdhrhbg+FJDJRrcgSwfNW9EjblQvxpitgGdF/Kc1Bx34jb45HEymyfhGgY++KQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员/三经理设置.rd b/Pages/项目/项目首页/项目首页-容器页面/项目成员/三经理设置.rd new file mode 100644 index 00000000..a8497d72 --- /dev/null +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员/三经理设置.rd @@ -0,0 +1,5 @@ +{ + "PageType": 0, + "ColumnCount": 12, + "RowCount": 12 +} \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.json b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.json index e8e8c9ef..986e01b0 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.json @@ -23,26 +23,36 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 + "DesignLengthInPixel": 26.0 } }, "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 170.0, "Mode": 1 } }, - "6": { + "7": { "GridRowColumnDefinition": { "DesignLengthInPixel": 16.0 } }, - "7": { + "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 + "DesignLengthInPixel": 26.0 } }, - "8": { + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "10": { "GridRowColumnDefinition": { "DesignLengthInPixel": 160.0, "Mode": 2, @@ -54,22 +64,22 @@ } } }, - "9": { + "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } }, - "10": { + "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 30.0 } }, - "11": { + "13": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 } }, - "12": { + "14": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -77,9 +87,9 @@ } }, "InLogicalVisibleIndexes": [ - 12 + 14 ], - "Count": 13, + "Count": 15, "DefaultSize": 24.0 }, "Cols": { @@ -299,9 +309,10 @@ "1,31": "岗位管理", "1,36": "添加成员", "4,12": "三经理", - "5,12": "项目三经理成员", - "7,12": "项目成员", - "10,1": "添加岗位" + "4,38": "修改", + "6,12": "项目三经理成员", + "8,12": "项目成员", + "12,1": "添加岗位" }, "AttachInfos": { "1,1": { @@ -609,14 +620,28 @@ } } }, - "5,12": { + "4,38": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "三经理设置", + "LoadBindingDataOption": 1 + } + ], + "Text": "修改", + "TemplateKey": "_RS_Main3" + } + }, + "6,12": { "CellType": { "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", "PageName": "项目三经理成员", "OverflowMode": 1 } }, - "8,12": { + "10,12": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "007ea4aa4c7440478a9a092179dace8", @@ -671,7 +696,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "df7f4002-2f51-4f98-834c-f3270d4d1624" + "ID": "2509f213-7057-4fea-9268-c0b944df1475" }, { "Condition": { @@ -734,17 +759,17 @@ "BtnText": "知道了" } ], - "ID": "34170835-0ee9-483d-a2b4-058abe04b627" + "ID": "3366fbd2-701d-4fc6-a3f8-b976e12796c9" } ] } ], - "ID": "5f7fe4b0-0c02-499c-a1d5-dfce213e3b7d" + "ID": "141ab55d-b667-4720-96de-355794559661" } ] } ], - "ID": "5eeb0074-d118-40e4-9db5-e5f0968c591b" + "ID": "1323dfc2-6e6b-4330-830f-9b52c0a68d3c" } ] } @@ -865,7 +890,7 @@ } } }, - "10,1": { + "12,1": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -922,14 +947,14 @@ "IconSize": 14.0 } }, - "12,1": { + "14,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目经理", "GUID": "92ddc900-e1f3-4049-b67b-cdc5c4c0dffd" } }, - "12,5": { + "14,5": { "BindingInfo": { "TableName": "项目岗位", "ColumnName": "ID", @@ -1000,6 +1025,11 @@ { "HorizontalAlignment": 5 }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 5 + }, { "FontFamily": 1, "HorizontalAlignment": 5 @@ -1077,72 +1107,40 @@ "2,36": 12, "2,37": 12, "2,38": 12, - "2,39": 5, + "2,39": 12, "3,11": 13, + "3,39": 4, "4,1": 14, "4,10": 14, "4,11": 13, "4,12": 5, + "4,38": 15, + "4,39": 4, "5,10": 14, "5,11": 13, + "5,12": 5, + "5,38": 15, + "5,39": 15, "6,10": 14, "6,11": 13, "7,10": 14, "7,11": 13, - "8,1": 14, - "8,2": 14, - "8,3": 14, - "8,4": 14, - "8,5": 14, - "8,6": 14, - "8,7": 14, - "8,8": 14, - "8,9": 14, "8,10": 14, "8,11": 13, - "8,12": 15, - "9,1": 14, - "9,2": 14, - "9,3": 14, - "9,4": 14, - "9,5": 14, - "9,6": 14, - "9,7": 14, - "9,8": 14, - "9,9": 14, "9,10": 14, "9,11": 13, - "10,1": 16, + "10,1": 14, + "10,2": 14, + "10,3": 14, + "10,4": 14, + "10,5": 14, + "10,6": 14, + "10,7": 14, + "10,8": 14, + "10,9": 14, "10,10": 14, "10,11": 13, - "10,12": 14, - "10,13": 14, - "10,14": 14, - "10,15": 14, - "10,16": 14, - "10,17": 14, - "10,18": 14, - "10,19": 14, - "10,20": 14, - "10,21": 14, - "10,22": 14, - "10,23": 14, - "10,24": 14, - "10,25": 14, - "10,26": 14, - "10,27": 14, - "10,28": 14, - "10,29": 14, - "10,30": 14, - "10,31": 14, - "10,32": 14, - "10,33": 14, - "10,34": 14, - "10,35": 14, - "10,36": 14, - "10,37": 14, - "10,38": 14, - "10,39": 14, + "10,12": 16, "11,1": 14, "11,2": 14, "11,3": 14, @@ -1154,8 +1152,50 @@ "11,9": 14, "11,10": 14, "11,11": 13, - "12,5": 2, - "12,10": 2 + "12,1": 17, + "12,10": 14, + "12,11": 13, + "12,12": 14, + "12,13": 14, + "12,14": 14, + "12,15": 14, + "12,16": 14, + "12,17": 14, + "12,18": 14, + "12,19": 14, + "12,20": 14, + "12,21": 14, + "12,22": 14, + "12,23": 14, + "12,24": 14, + "12,25": 14, + "12,26": 14, + "12,27": 14, + "12,28": 14, + "12,29": 14, + "12,30": 14, + "12,31": 14, + "12,32": 14, + "12,33": 14, + "12,34": 14, + "12,35": 14, + "12,36": 14, + "12,37": 14, + "12,38": 14, + "12,39": 14, + "13,1": 14, + "13,2": 14, + "13,3": 14, + "13,4": 14, + "13,5": 14, + "13,6": 14, + "13,7": 14, + "13,8": 14, + "13,9": 14, + "13,10": 14, + "13,11": 13, + "14,5": 2, + "14,10": 2 }, "SheetStyle": { "FontFamily": 1 @@ -1163,15 +1203,16 @@ }, "Spans": [ "1,1,1,9", - "12,5,1,5", + "14,5,1,5", "1,36,1,4", - "12,1,1,4", - "4,11,7,1", - "4,1,5,9", - "10,1,1,9", + "14,1,1,4", + "4,11,9,1", + "4,1,7,9", + "12,1,1,9", "1,31,1,4", - "8,12,1,28", - "5,12,1,28" + "10,12,1,28", + "6,12,1,28", + "4,38,1,2" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1227,11 +1268,11 @@ "CustomNames": [ { "Name": "当前岗位ID", - "Formula": "项目成员!$F$13" + "Formula": "项目成员!$F$15" }, { "Name": "项目经理", - "Formula": "项目成员!$B$13" + "Formula": "项目成员!$B$15" } ] -}//oX1R7OxNe1xLguxorWa1qBpHtdEAHZ9zBcqttk08MXs+nSj5r+meFR1W3DQ0yzqQm2eMx/ugx6NOJw5XkjieKp/mFANQuF44FzVMnOrtuCLLwT2VVMO0cg3nFwZhhz0iK4AY+O2GXGmBsCJEtAlfQWrP8nZuFHdxpIIlEMo02vukatu/pmsx7B9DzS/G0CgfYSJ1wyj7wuFiq0+zIWtw9Vv0VngqluThnlFfXOUF62TqQJpIPqtUSeRcmO5nsg4m1Lyygf5BFwHJ1FjpPyw4treGKFheJKcIh/krG6uazMpwFxd8yus5U7gc90xoPzf/MdYnIf+KGRMigRPFpdh7Ov5n4v99HP/UWV6HbU+YDHFnXWy6e34mV7mrMO7DFbbCR/yHWt0tJHaJ+LMRphmj0tfNEzZpx2tdNN0kksUO4KVgEQ1Qj4V0kUzrpDSRVWtjrFMO/JAeSUKTH/UQ9ftIj53Qda+azUqqjCceY2RlK5PAmbVIaMUysE818LIyNBD6HW6xoGrRpb8Nc7CDNkr5s6sRoWGcFUfujfwowoMazhN81/9R/uoLBp3kLTbijNv+Pg+kwJXom2zgpIJun+iotsLE8upmK/I+qWUOsYqAJYvjuGQJ83t0zgXah1BTUs3mufPvWfNUfgIqMod4c2R/jdMMHSyTW9lLRIie1onUQjNdXQeJD88z/gcP5Jia7XvTP1oXGI6brfxgp1rhjkyKsJYF8+lVR/YT9/gG3Rh/WFMuKC102JokCi80nzaG2HXyQj3/wetNUFv8ademRe89jIJxiXf3hnsS0i3nkQnkKHslTS3p6VycsM2VMA7qoxes3NPbUZJidaxX41D3Y5ghQrOh+RAHvOEYrL+p/VYjRS+4sce+ef7T14OYiOsrTrp5YUwPzF5LT6jIIU9kDBBs7g==|920 \ No newline at end of file +}//UmZYLJI6IHKsffBXS3A8yL1ipJVyN09lR3/DyvXbZq7Cenv/tqEMKH0j4sI2hd3gxYAFQRLvZ4vFAYdrWxCGVdCDmwt40X3oJzjGPUBV6ZjLsM1LnIGgaOUh0378PHPe/CzadQqT9pvYPD0CN4QjLPwpnIxUzRVZyChP73NVzv9VN7jJFGM8uoWRltEpdgB7VFVHUqxfEHnBxiNrX8ShZgUCgQjqaLqPK+kPebUYwqm/dzz+uM5PPMkGAxpYkqCDjmvz86QuENrfYgXHz441COtGaVMTSRvY0yK98GToAA5xzfV612Hv9JE3Xtn6qsmolxZ+op56lmRAZTAyIMGgUPMOyr5DrPdaL5f3oAUC9PlXrfB3JxmCE13oLyQCzmdz9S6r4v1a2xa8OBQVVvOODgrZbIUXHWBiPuC+bFUF5HYmkEEQ7VhN4p6drFi+GBtWHytbtgwj3zcEx2KjgfxAVrACCghMglZIiXE7TiTOp9QY0ewFslOfQJefppi3oDjMfdEjxwAjHdSPQN6POpPNQ5ftPT03em1bFtT5f5RglCNmVWcMCwYrxURMpBJ73obLdXOeRTkN1heE6KSy2u+vq3/nK7lDyuS3F9o72qRDiTDYhT6CRlB3GZ55pQ5zPUPnfjV7iE3kasAa4JRaqJ7TWznD1GkRTAL2xTv3T7a68jBEz0ZHqG5idD2B8aPs8mvedquSEetT4XVIxz58VE0klrQFv+J+bFNjUm9b7TvKpHKf0DtSvETzIUDgTPOnegv13fH0qaxxvJgiws1vfoyv5I+0Lx0JKQ+BiH8PXiClyQNbgvAqPJCEYBQkNj6p6py7rMUgJH4RtCvlhOWyAzMJxS3VllkSCAAjR4Je7cM9T1JxHDkyTne9aBPK098kkIDFK7sG8NgzAcsZ4GH9/gh6/g==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.rd b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.rd index dd71dc03..8c514f0c 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员.rd @@ -1,15 +1,15 @@ { "PageType": 0, "ColumnCount": 41, - "RowCount": 13, + "RowCount": 15, "CustomNames": [ { "Name": "当前岗位ID", - "Formula": "项目成员!$F$13" + "Formula": "项目成员!$F$15" }, { "Name": "项目经理", - "Formula": "项目成员!$B$13" + "Formula": "项目成员!$B$15" } ] } \ No newline at end of file