From 1f3931949a165065c3246bb8ebd2ce281c495610 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Fri, 8 Nov 2024 23:33:55 +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=E5=8F=8D?= =?UTF-8?q?=E9=A6=88"},{"State":1,"Type":1,"Name":"PCPage/=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E6=B5=8B=E8=AF=95"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 24 +- Pages/系统/开发测试.json | 389 +++++++++--------- Pages/系统/开发测试.rd | 2 +- .../项目首页/项目首页-容器页面/项目反馈.json | 8 +- 4 files changed, 205 insertions(+), 218 deletions(-) diff --git a/.collaboration b/.collaboration index f1fabe9e..fce52a87 100644 --- a/.collaboration +++ b/.collaboration @@ -498,17 +498,7 @@ }, { "ModuleName": "PCPage/项目反馈", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-08T23:25:54.5159349+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目概况-关键数据", @@ -876,17 +866,7 @@ }, { "ModuleName": "PCPage/开发测试", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-08T23:26:56.2088062+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\系统\\开发测试.json", - "Pages\\系统\\开发测试.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/更新日志", diff --git a/Pages/系统/开发测试.json b/Pages/系统/开发测试.json index b3af9dd8..9b58bf66 100644 --- a/Pages/系统/开发测试.json +++ b/Pages/系统/开发测试.json @@ -111,13 +111,23 @@ "DesignLengthInPixel": 44.0 } }, - "22": { + "24": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 44.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 332.0 + } } }, - "Count": 23, + "Count": 25, "DefaultSize": 32.0 }, "Cols": { @@ -368,7 +378,8 @@ "2,16": "生成", "4,16": "创建项目审批待办", "6,1": "强制结束流程", - "6,42": "结束流程" + "6,42": "结束流程", + "22,42": "配置列属性" }, "AttachInfos": { "1,22": { @@ -969,256 +980,190 @@ { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "ID", + "allowRoles": [ + "FGC_Anonymous" + ], "label": "ID", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "showOverflowTooltip": false, - "key": "665d2e7d-fd13-48bd-a468-f83001c67249", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "colStyle": { + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "665d2e7d-fd13-48bd-a468-f83001c67249" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "创建时间", "sortable": true, + "allowRoles": [ + "FGC_Anonymous" + ], "label": "创建时间", - "formatStr": "yyyy/MM/dd hh:mm:ss", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", + "colStyle": { + "formatString": "yyyy/MM/dd hh:mm:ss", + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", "filter": true, - "showOverflowTooltip": false, - "key": "29df0b6e-d22b-4339-971c-b8766c80c4da", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "key": "29df0b6e-d22b-4339-971c-b8766c80c4da" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "名称", "sortable": true, + "allowRoles": [ + "FGC_Anonymous" + ], "label": "名称", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", + "colStyle": { + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", "filter": true, - "showOverflowTooltip": false, - "key": "4e4da726-f6e8-4f25-a72b-6faaf47cb6f7", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "key": "4e4da726-f6e8-4f25-a72b-6faaf47cb6f7" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "标题", + "allowRoles": [ + "FGC_Anonymous" + ], "label": "标题", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "showOverflowTooltip": false, - "key": "6cf729b8-310a-4cd6-b63a-8cb81d9d6a8e", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "colStyle": { + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "6cf729b8-310a-4cd6-b63a-8cb81d9d6a8e" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "描述", + "allowRoles": [ + "FGC_Anonymous" + ], "label": "描述", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "key": "ff1ccd6f-d2fd-4538-904b-3a3cd8e4c2e9", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "colStyle": { + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "ff1ccd6f-d2fd-4538-904b-3a3cd8e4c2e9" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "负责人", "sortable": true, + "allowRoles": [ + "FGC_Anonymous" + ], "label": "负责人", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", + "colStyle": { + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", "filter": true, - "key": "d5899c5b-b48f-403f-8ae7-24e26db5947b", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "key": "d5899c5b-b48f-403f-8ae7-24e26db5947b" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "挂起状态", + "allowRoles": [ + "FGC_Anonymous" + ], "label": "挂起状态", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "key": "c093ed2f-3180-4ec2-8011-7853536be667", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "colStyle": { + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "c093ed2f-3180-4ec2-8011-7853536be667" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "关联页面", + "allowRoles": [ + "FGC_Anonymous" + ], "label": "关联页面", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "key": "ae856f5d-cfaf-4729-bb80-dae6d2256cf0", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "colStyle": { + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "ae856f5d-cfaf-4729-bb80-dae6d2256cf0" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "类型", + "allowRoles": [ + "FGC_Anonymous" + ], "label": "类型", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "key": "b6638af1-087d-4f3d-8ca1-5bbc5f213a4d", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "colStyle": { + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "b6638af1-087d-4f3d-8ca1-5bbc5f213a4d" }, { "$type": "ElementUI.ColumnSetting, ElementUI", "dataColumnName": "阻塞类型", + "allowRoles": [ + "FGC_Anonymous" + ], "label": "阻塞类型", - "align": "center", - "headerAlign": "center", - "colfixed": "false", - "type": "Default", - "tagType": "info", - "imgType": "cover", - "key": "4c05e436-a6b2-4850-9eac-123fd1ff9a49", - "UIPermissions": [ - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ] + "colStyle": { + "horizontalAlignment": 1 + }, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "4c05e436-a6b2-4850-9eac-123fd1ff9a49" } ], "actionButtons": [ { "$type": "ElementUI.ActionButton, ElementUI", - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], "type": "button", "Name": "编辑", - "shape": "default" + "shape": "default", + "allowRoles": [ + "FGC_Anonymous" + ] }, { "$type": "ElementUI.ActionButton, ElementUI", - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], "type": "button", "Name": "删除", "styleType": "Accent 5", - "shape": "default" + "shape": "default", + "allowRoles": [ + "FGC_Anonymous" + ] } ], "sumText": "合计", @@ -1272,6 +1217,68 @@ } ] } + }, + "22,42": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=开发测试!B24" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetTableColumnSetting", + "ParameterValues": { + "dataColumnName": "ID", + "columnSetting": { + "$type": "ElementUI.ColumnSettingBase, ElementUI", + "label": "ID", + "colStyle": {}, + "colHeaderStyle": { + "horizontalAlignment": 1 + }, + "cellType": "default", + "key": "7746c8e3-3817-43c4-81fb-fe524df574e4" + } + }, + "BreakpointIdentity": "e8b160a2-7aa1-4bd3-b3b8-f02b57cadf03" + } + ], + "Text": "配置列属性", + "TemplateKey": "_RS_Main1" + } + }, + "23,1": { + "CellType": { + "$type": "ElementUI.TableCellType, ElementUI", + "ElTableName": "EL表格2", + "columns": [], + "actionButtons": [ + { + "$type": "ElementUI.ActionButton, ElementUI", + "type": "button", + "Name": "编辑", + "shape": "default", + "allowRoles": [ + "FGC_Anonymous" + ] + }, + { + "$type": "ElementUI.ActionButton, ElementUI", + "type": "button", + "Name": "删除", + "styleType": "Accent 5 0", + "shape": "default", + "allowRoles": [ + "FGC_Anonymous" + ] + } + ], + "sumText": "合计", + "size": "default" + } } }, "StyleDatas": { @@ -1346,7 +1353,9 @@ "3,22,2,12", "1,22,1,12", "1,35,1,3", - "1,39,1,4" + "1,39,1,4", + "23,1,1,45", + "22,42,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1372,4 +1381,4 @@ "PaperSize": {}, "Margin": {} } -}//jxvvWvTJUuZMoEe4FGoaXO80OvtEuZJQWXj79c7j2LosHdhNN+kOHQmtZqXJ/9ncNPC8sA3QKCD1adxfrSAgwly+ChEPoaQn4rNc/YtYvHSgHkXeMU8lZ+5BrNL77FzH3y6ZDllvbK0b0lCalpwIHl2hn0X4f9w3SqrojmNZPw1HFGyU3kQMseyqpzqCAhf5SLxCxCNSOiWrFz610UTEm5JW9WNG7osPChut5TSKqb5TF79TkmbDRY2UBT8LNCWdZ27LeIWJHmhwoN2L74mlr7s2fwe/znUtAy8IJVNZiZOwl/M5daPlyyWfmPZTy302+JnduYG2H9l3BylOQJZFnHphjMafMy+9jaUQ3d3P+rNvRIj5P67cyLrVG5R04nl2h3b93MPOrWfCALKnct/zDxND7EpqqjXO9kOkFam+Y/GYOPpckVEix88Eld+SAZyNfP0L9anzTW7jsiksqpRo+mVQyvelEsD9DouhvCwc1T4p81iznHoxxG9Ay/tH9c2op18puBMLqM2ThiVYZDPd4iOeJL4i/iyA4dNvi9CV2R7ANjD/fRhQelb+xb6beWSWQsmDppGlXBwsTBlpf7xJ8OWkPwF/vxMIAWD6vF2/SBanLKVBouASFtMjNFbQmEzVNcHG7ke+6gtZuNXmhS5LvRhcy3k4XFoh5GrAKaRFbDJVEdDP3fN7QDF3Z/QVELKSm8xvfGUvQuKougdOrBlJojSHoidW9o8eXUY97OfF8UlfV0wTgPHsI3sC5uGZkelS6172oOFdsYzVAD/AvE67PuWmR1Q37WUO8CFu+vsC4rBoMDkKXfNOc7jvK7TG85LmlL2VcK8Oja4v+f/PFw8Ie5KFCLiVZhBzU/vpGeFXtnpY+eoqcYEVC1nNuz9vA54EG4cWxsiAvKBJmm5pM8TOwg==|920 \ No newline at end of file +}//UzqIQiIncicA+EHkAI94GceK94IC6sbqcb2V/qUEPr+vtRQO27F33Eliid2bYgaL2nuugcXeJVT8DojYhomteQTR5xwynsNi/8KU00TXp0yKwTj7e4F1qJ+U3PXawtz2JlsOXA9lTcMLPqF6By9ND/e/+Uhean4sfcVr+AHT1FpWLYH4K2ZjbCLyv3BRMndplG/5sATxdFm2VFvQ0E5TvsYk6pUg1GhaEF59/duV51gQjVwjdfPavJnLhbDYNPDSCcDSK6y7CbpknGQZsMwfLBqOgBBxrrObch+Hzk4hN6/+jEjTC6uRsePlMWGyBC+blSa8HyHM5njcCHVzf+ca7WSe5pcl0VJQPRo/afv46AhsGCy7/tBP/rNxjsXymWtyHwBBUiwdbYtWDXGl7j8LcI0OloMzDSQQch3D7gmla5as1DzChUpBdKoO0Wt6SRZGnHIZThZSrIssqq4v1oxFwKalG1bLyOpGJo3h9d5V9VLMb/0LuieM3NbYbaO7aVYwMvc6gMaJ0vwF5oJzQS8DB5dSpaXZ8JcRfWukRr5CU+KKaa8OghX2noUOH0gkVhJL+UIhBhWZGknDdQkFd8F7XIkyjZWf9pAwqS6Tp0XBLHbUb68x9stinrgPBDtwpb28awz/6n3w55AEfBctMb5uROl8a2Osvqwhz98aYqaRDddygcoIpH2quhjlZJ+q6NoUmpzlRzebQltTKiIk4gNCher9TnboGCLxmDxvdm07KKQEBB/DNwjS1icHYlyqCrz9iGT0nqeTokSitUexeH7xIzYEtU3siZY2AtGi9MgClS+ofCBR8VorrNaBedH19HHEV2EzZXjbYiPaRk0WomOKrqCAauOZ/JiJDikZHMnrm3/uKaR5beeGQRTEQklrre+xzwClQVqdIy11yyg6rOHTwQ==|920 \ No newline at end of file diff --git a/Pages/系统/开发测试.rd b/Pages/系统/开发测试.rd index 560801c9..0f0ee1f0 100644 --- a/Pages/系统/开发测试.rd +++ b/Pages/系统/开发测试.rd @@ -1,5 +1,5 @@ { "PageType": 0, "ColumnCount": 47, - "RowCount": 23 + "RowCount": 25 } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json b/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json index 9c2b4cb1..1bed909b 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json @@ -1020,15 +1020,13 @@ ], "label": "流程实例ID", "width": 60, - "colStyle": { - "horizontalAlignment": 1 - }, + "colStyle": {}, "colHeaderStyle": { "horizontalAlignment": 1 }, "cellType": "default", "showOverflowTooltip": true, - "key": "356787c4-daa5-4fba-970f-89eeed0c3ec8" + "key": "03c784e5-8aa6-4509-bf8c-a7b931f01c27" } ], "showActionButtons": true, @@ -1270,4 +1268,4 @@ "PaperSize": {}, "Margin": {} } -}//dbLk804ioDz5oee8UOrYqRtFXuE9RzXQV7qAAv+0zvJe6Wz02WuLfElvUdAJ+5wQVO6pnG3DCKtzHc6QwkRkcfUF5/GxDq8aF1PS6PnDQKgUn4aYofgnJex9KNnXCerHT4RAYqmxB6J3tbEXUqipvPGlZRfszc829cBvsb4XawE4m9hV0y5fmDyij/m/2HePZjFktao5EaxjoPka2JzXLuN4PcGPCgUDF5hZglL26Sy1DRlzSDSE7UmPzy5qmOYC95HVcP6FWQfWcUFyq90OmdiaHV+ht/Umc98mFt7BR5x3623Bgm810S3i6TGy38s5xHXrpEJfRhyw9U81oTv7YtRvF6yvE0ZRq57aUtRqN23L6ZOpLlnVGPyNGGlWy8KBGkfBT8OB0CGLQZTgzdoTMLtKJFL1+Z2l4YfDxTy7kDgL37sh08ulK1xfN/yrpLmNajkqO+jD+YkZUdCZvIVcEPsb1Oj5rlxEUTQO/QZ6eNLYz7Mv6jyzEe7v/n4GPHC03f6Dy+0ZyeSBiEBRRCz6LaXX2aygrvI0PjciwCsKkqlX802XtkoawP2OVSauGij7Fg7R4X7ac5CIz7+jJPwvD5yqardfPRgHsuj9piT+r/Dn8URa1J2VPtFZyTXgC5kSEgcsjftXHi0EaYGZjj8acRI/mcQm6RHAGBn+38MmLqrKpi0g685V86wxPIRDJsjYcrzca5iNeIb67M5gwrnRJP9j/Ii5ZFzreQfDHstxrejiQ1pB1lMJanTDSqU6RR/83ybwIj4wl2wuz+Y1DhhwiZNB7YJIk1cLxNZb2EigfcS7cFsmHvHBEfJAo4FP5k0y7aqPAYfSkpYTRmACdF1gflTg/7wZmMflGt2aX1tbf0dPsGX83oZCqcXITJAzp9zHS6Luafs7gpjL4+tyFHCXog==|920 \ No newline at end of file +}//idx0310Ji7QnDwzxI5Pd53bhUbi1MZ15JqxTovEAAZqXetYDjNrNhE18Hy6dQPl92szCKLJgKUs9l3dTS4W4YsSo8o7dMx8AKxfRNFxtGoNvMKgAuhoF+6+7R1HcADXFHVd1qTqQq+eN8lIHYwEiG72glqeE3xCSo8owFkGLZe4rOsm//LQOg67ZbpWdYbxkl4KUrp11MDVK+VTlihUWkKLDUhivDyG9YjWZL+UwxIr8TvU8qPV0rP1vmWXyLhIH2mM833TWz8NiU87cL2NNgiIZXkncP0iQCoZE5FGYtCAYahHfYEYvD6y0yJpcuB4NUa0s+uCvY6+7au163jwJXgl+3NKYP6YTJ6czqS/v7zCvoVHITQadTw9YubjI/LO4kV/tJhEQOk2cCoUb1l2+SNCvmc+F/UKw3VTtWUfde858YEsLCPDI2A+PPhBERv1SIYl0AnMfp3AcQ+3kwrqW/otlyuHFBtoXI79PhDM6vusN0jI3hzqUKdyuJSObSfkYC6DwT6gSzo7mDaW+P0wpWugVOg+16l+lernsdv+HJ2/Ncb6T1+ewzP7SbxSUs8DwdSwU9dMIDEkSshPhuEyUMtfp7PQB6/j6SsQZvVtLcRYx0DYQuSShIQw4GGS4xEyMRlk3uGmclYB+s+vgNIRZgM/scFPV9mIMwi/rUHe90c2ESU97C9RbeTFHUAFHTwFzyAu/c4HRPqMi8B+FJKlaeaVF73we2GRDkwtEKIBIQKb8yDz9NEs5blRF1AFJ/gyanBRuhPDTpmv8VTCQt+cVTe6G6MaDbcFheH2hYRYSbb831sNG2WnBfhYLxJA0+Vpw6SgFi5LFs0+69o36XCakUJhs1xB5adAYn2xfRXX72YOpTHOLq4YBac43WdtExKx4SiIle3cgXr44z+W0B0cs+g==|920 \ No newline at end of file