diff --git a/.collaboration b/.collaboration index 931a90fd..af416191 100644 --- a/.collaboration +++ b/.collaboration @@ -9,47 +9,17 @@ }, { "ModuleName": "Table/FGC_订单记录", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:41:39.6234734+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单记录.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_订单明细表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:41:39.6234882+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单明细表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_商品表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:41:39.6234899+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_商品表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -214,137 +184,47 @@ }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:41:39.6235002+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:41:39.6235026+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户角色关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:41:39.6235052+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户角色关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织信息视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:41:39.6235073+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织级别视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:41:39.6235088+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织级别视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色信息视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:41:39.6235106+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色分类关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:41:39.6235126+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色分类关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色拥有权限视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:41:39.6235142+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色拥有权限视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:41:39.6235163+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -381,17 +261,7 @@ }, { "ModuleName": "Table/message_test", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:41:39.6235193+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\message_test.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -644,17 +514,7 @@ }, { "ModuleName": "PCPage/项目成员详情", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:14:58.2480368+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目成员详情.json", - "Pages\\项目\\项目成员详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目岗位详情", @@ -802,35 +662,11 @@ }, { "ModuleName": "PCPage/任务-侧栏", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:09:57.1502744+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-侧栏.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-侧栏.rd", - "Pages\\9d9faa04d5a74f1dbf8dd3b2040b6f6.json", - "Pages\\9d9faa04d5a74f1dbf8dd3b2040b6f6.rd", - "Pages\\b522ad93131845cf87553eda79dfd25.json", - "Pages\\b522ad93131845cf87553eda79dfd25.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:23:27.5107183+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", @@ -870,19 +706,7 @@ }, { "ModuleName": "PCPage/参与成员管理", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:10:25.4841496+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务成员\\参与成员管理.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务成员\\参与成员管理.rd", - "Pages\\4efeb9a87d4e43c88bafd4aeae13e20.json", - "Pages\\4efeb9a87d4e43c88bafd4aeae13e20.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务助手-首页", @@ -1066,17 +890,7 @@ }, { "ModuleName": "MasterPCPage/FGC_母版页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T18:51:51.4689241+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\FGC_母版页.json", - "MasterPages\\FGC_母版页.rd" - ] + "ModuleType": 3 }, { "ModuleName": "MasterPages/流程母版页面文件夹", @@ -1092,17 +906,7 @@ }, { "ModuleName": "UserControlPage/评论组件", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:39:11.0695824+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\评论组件.json", - "UserControlPages\\评论组件.rd" - ] + "ModuleType": 31 }, { "ModuleName": "UserControlPage/发表评论组件", @@ -1622,37 +1426,7 @@ }, { "ModuleName": "Upload", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:41:39.6239491+08:00", - "ModuleType": 26, - "ToRemoveFiles": [ - "Upload\\3f4beb7f-df0f-40a0-8457-c833a332f924_新生成的图片.png", - "Upload\\443d5833-c737-4769-9a2e-104182d6e821_新生成的图片.png", - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.png", - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.small.png", - "Upload\\6955d4b4-16ef-4ec6-87cd-d021d48c27c4_新生成的图片.png", - "Upload\\6f34b1f7-5fa5-40fd-8cd1-103a63ff37b9_新生成的图片.png", - "Upload\\8131abcf-935a-4aa7-b774-45523e96717c_新生成的图片.png", - "Upload\\86eb9c3b-133d-4cb0-ba1b-06aa7189f6b7_Animation - 1718097457056.json", - "Upload\\88aea4ae-f850-4b94-b2ca-4fb74595161c_新生成的图片.png", - "Upload\\897e9d75-6bb0-4d81-937d-af672e7c9c49_新生成的图片.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.small.png", - "Upload\\ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.medium.png", - "Upload\\ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.png", - "Upload\\ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.small.png", - "Upload\\d5185fbc-ff70-4662-9ab0-6dd3c736ff39_新生成的图片.png", - "Upload\\e8bc81ba-c90b-4bf3-82dd-1ca73c73d426_新生成的图片.png", - "Upload\\ea205b17-51f0-4c25-8484-6026eeffc4fc_新生成的图片.png", - "Upload\\ec25d4da-d567-435d-ae65-6c2c5b062c1d_新生成的图片.png", - "Upload\\f1363a17-58ca-4373-8aea-72deeb26b1c2_深色LOGO 拷贝 3.png", - "Upload\\f1363a17-58ca-4373-8aea-72deeb26b1c2_深色LOGO 拷贝 3.small.png", - "Upload\\f5e49362-3d64-4cf5-b8ca-b3bb89bdd7fa_新生成的图片.png" - ] + "ModuleType": 26 }, { "ModuleName": "PublishConfiguration", @@ -1660,46 +1434,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:46:32.0779834+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Echarts图表-10_0_3_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip", - "Plugin\\JSON数据源-10_0_2_0.zip", - "Plugin\\Lottie动画插图-10_0_2_0.zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAI套件-10_0_3_0.zip", - "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_2_0.zip", - "Plugin\\UI操作工具箱-9_0_6_0.zip", - "Plugin\\Unlayer-9_0_103_0.zip", - "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip", - "Plugin\\发送HTTP请求命令-10_0_2_0.zip", - "Plugin\\取消当前行-9_0_103_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_2_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0.zip", - "Plugin\\异步运行命令-9_0_103_0.zip", - "Plugin\\支持预览的附件上传-10_0_2_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_2_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\裁剪并上传图片-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_2_0.zip", - "Plugin\\设置焦点命令-10_0_2_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -2059,19 +1794,7 @@ }, { "ModuleName": "PCPage/选择图标", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T18:52:23.306203+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\共用\\选择图标.json", - "Pages\\共用\\选择图标.rd", - "Pages\\724528b5f0ca4bf3b5886ccd98103fe.json", - "Pages\\724528b5f0ca4bf3b5886ccd98103fe.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/删除项目分组", @@ -2099,17 +1822,7 @@ }, { "ModuleName": "PCPage/模板编辑器", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T18:57:38.2571092+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\系统\\平台设置\\邮件模板\\模板编辑器.json", - "Pages\\系统\\平台设置\\邮件模板\\模板编辑器.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Table/邮件模板表", @@ -2313,17 +2026,7 @@ }, { "ModuleName": "UserControlPage/任务统计信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:27:35.5028369+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\任务统计信息.json", - "UserControlPages\\任务统计信息.rd" - ] + "ModuleType": 31 }, { "ModuleName": "Image/下载.svg", diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index 4078fda3..fc9ec095 100644 Binary files a/ForguncyDB.sqlite3 and b/ForguncyDB.sqlite3 differ diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json index 13c8a70f..f3b648a5 100644 --- a/MasterPages/FGC_母版页.json +++ b/MasterPages/FGC_母版页.json @@ -158,7 +158,7 @@ }, "Formulas": { "6,0": "ODATA(\"ACT_RU_TASK_View/$count?$filter=类型 ne '抄送'\")", - "1,7": "IFS(TODO数量=0,\"\",TODO数量<100,TODO数量,TODO数量>99,\"99+\")", + "1,7": "IFS(TODO数量=0,0,TODO数量<100,TODO数量,TODO数量>99,\"99+\")", "6,2": "ODATA(\"TODO/$count?$filter=用户 eq \"&IF(ISBLANK(母版_当前用户),\"null\",\"'\"&母版_当前用户&\"'\")&\" and 完成 ne 1\")" }, "AttachInfos": { @@ -1107,7 +1107,7 @@ "IsOpenInNewTab": true } ], - "ID": "aaacc036-bc51-43c6-9c62-99d0bb39ece8" + "ID": "9ab4a434-79ce-4d66-bf64-3c693ad1bed6" }, { "CommandList": [ @@ -1128,12 +1128,12 @@ ] } ], - "ID": "eb41c364-2009-4f40-bbbd-13bba9f3200a" + "ID": "8e996dda-d438-42de-b612-4441c4b03d14" } ] } ], - "ID": "d0928379-02ab-4492-8a65-8cc88d4ad7e0" + "ID": "8f7813d8-1c15-4bcc-8bda-e92c60eec311" }, { "Condition": { @@ -1183,7 +1183,7 @@ ] } ], - "ID": "b4698616-13da-4638-a7fa-bd0e042e3800" + "ID": "750f7cae-1d29-41c4-a421-d493fcc3db53" }, { "Condition": { @@ -1217,7 +1217,7 @@ ] } ], - "ID": "009253b2-56dc-4763-97a2-621b61e06611" + "ID": "0090fb70-246a-4ee5-8cc6-a898dacb6aa3" }, { "Condition": { @@ -1253,7 +1253,7 @@ ] } ], - "ID": "bf601108-d496-42c1-8fa0-d94c336ce2b7" + "ID": "4595306c-6db9-49d3-8473-f49b485f1ef1" }, { "Condition": { @@ -1288,17 +1288,17 @@ ] } ], - "ID": "e98aed3c-9d72-4532-a274-8b5ccaeb8ced" + "ID": "c1a20f99-7c6b-43ec-929a-01dcc4e44382" } ] } ], - "ID": "8923104d-176b-4242-a19e-5d02697e515c" + "ID": "a048bf88-2fc3-4624-93dc-49a611b6c32a" } ] } ], - "ID": "7ffe579e-5ce5-4516-ad22-61dd3f5dfa8b" + "ID": "679811e3-e75d-4cc2-a8d6-962936521976" } ] } @@ -1554,7 +1554,7 @@ "IsOpenInNewTab": true } ], - "ID": "faf2f570-3100-4dda-b3db-682bf06954d1" + "ID": "512a643d-08b0-4822-a98b-2850577887af" }, { "CommandList": [ @@ -1575,12 +1575,12 @@ ] } ], - "ID": "49ad54c1-9519-4703-b440-2cf6706426d3" + "ID": "c58be28e-396b-4a60-bcef-9d024ed34ed8" } ] } ], - "ID": "a706d6ed-26db-468e-8c81-9cb08a9eda04" + "ID": "d1f528fa-6f92-441c-9cf8-a626d52acb5e" }, { "Condition": { @@ -1630,7 +1630,7 @@ ] } ], - "ID": "c87a655a-ad81-4f91-8aba-0c7d8d4b88b7" + "ID": "a48673da-1558-4126-961b-ec76bb8ee109" }, { "Condition": { @@ -1664,7 +1664,7 @@ ] } ], - "ID": "15f13d6f-9809-4b27-8f83-aa8880cd5f4a" + "ID": "09c181e7-23f8-480f-8c11-cc52691e1253" }, { "Condition": { @@ -1700,7 +1700,7 @@ ] } ], - "ID": "f3e3a6d8-e005-48aa-95be-fb03486aad5a" + "ID": "06ad61a1-37b3-4b1f-bb01-c5162f7392b7" }, { "Condition": { @@ -1735,17 +1735,17 @@ ] } ], - "ID": "61e50c9f-8f2d-40a7-9c2a-a03f543558b7" + "ID": "862d0de4-d752-4e58-bd9d-9012b56ca5bf" } ] } ], - "ID": "bd3ce79d-248f-4cc2-9d2f-d99a11933a81" + "ID": "da14c785-6a57-4445-9579-8daa1db82efd" } ] } ], - "ID": "d7912cd6-bd6a-4f5b-9b85-0bd745be4195" + "ID": "2dce316c-c020-46e6-9375-8f25eeb4bde5" } ] } @@ -1757,7 +1757,7 @@ "Disabled": true } ], - "ID": "1d6351e6-dbc9-4fe3-9d48-9e837de0040f" + "ID": "fd7f967f-a9d5-4d65-a195-e0faca7aff26" }, { "Condition": { @@ -1864,7 +1864,7 @@ "IsOpenInNewTab": true } ], - "ID": "361ac1a5-8a56-485f-a8d2-b96aa6f99c70" + "ID": "cb849373-6e02-43b3-af73-8eee1eb27725" }, { "CommandList": [ @@ -1885,12 +1885,12 @@ ] } ], - "ID": "8b653ef8-34ea-409c-add8-ab0529d0c8a7" + "ID": "d2e79549-f3da-403c-92bc-cd767b51a550" } ] } ], - "ID": "265a59f0-ab42-47de-aa9f-176264c2f905" + "ID": "07def90a-ab73-472a-85a5-a09d693dcbfc" }, { "Condition": { @@ -1940,7 +1940,7 @@ ] } ], - "ID": "60b45293-a132-4cc9-a48a-47923ee63140" + "ID": "dbaafff2-b120-4ac2-9bea-7ff003ab34ed" }, { "Condition": { @@ -1974,7 +1974,7 @@ ] } ], - "ID": "257fc73f-975e-4b4d-aa4b-08a4dd8af4d7" + "ID": "83210b3e-deb4-4abf-9d5d-3ed0295bd684" }, { "Condition": { @@ -2010,7 +2010,7 @@ ] } ], - "ID": "9dbaeadd-f22d-4fdc-8627-0387d65d6a62" + "ID": "0676bc9f-558d-4e7b-9c2b-232f85f0ecac" }, { "Condition": { @@ -2045,17 +2045,17 @@ ] } ], - "ID": "241a27e7-6c53-4773-93b0-feddbb35ae74" + "ID": "6d3a87db-6e86-4463-95cd-049c6a3ded75" } ] } ], - "ID": "28be6c49-3a92-4c3d-b4d8-b42246143bf0" + "ID": "50f11da0-6d9f-4fbd-9bc4-87085ec1f184" } ] } ], - "ID": "d2496ad9-a00a-4897-9913-e6e25478ada7" + "ID": "59534472-9b59-49c7-975e-64e00a450b9a" } ] } @@ -2312,7 +2312,7 @@ "IsOpenInNewTab": true } ], - "ID": "a7a48be7-9126-44bc-bc4c-a34bb31745db" + "ID": "fe3b3c6b-3ed0-4288-827a-4721f21989f4" }, { "CommandList": [ @@ -2333,12 +2333,12 @@ ] } ], - "ID": "e2318d92-70bb-4457-952f-c1af915e0d9c" + "ID": "77e71dea-bdb6-4a29-9205-b349ee95ac4e" } ] } ], - "ID": "00851ff0-d435-4d91-9f3f-e0a8546b9bcb" + "ID": "fd5ae001-6ec2-4696-abf6-a98d4bd9bf8c" }, { "Condition": { @@ -2388,7 +2388,7 @@ ] } ], - "ID": "28b37ee9-8e4e-4087-b253-f626072dff5b" + "ID": "f84e1b49-d32f-4f5e-81d0-ff3bbab1bfda" }, { "Condition": { @@ -2422,7 +2422,7 @@ ] } ], - "ID": "a45a38b2-e52c-4684-b2a5-5c4215743332" + "ID": "9a78e47b-fe75-4675-8c0a-6f27a7bc5d9e" }, { "Condition": { @@ -2458,7 +2458,7 @@ ] } ], - "ID": "79ed9572-5ad4-4fc5-8a03-c0361054f176" + "ID": "1ec04152-d244-4c14-89cd-c1d9009a63b3" }, { "Condition": { @@ -2493,17 +2493,17 @@ ] } ], - "ID": "d63bdc22-ced4-464e-802a-3fd5a15f20ed" + "ID": "2d0ddbe9-5206-4042-a745-7c5276a28af2" } ] } ], - "ID": "b9e76f33-3d01-476f-ba76-ac1c71fba94a" + "ID": "3c8a6516-88b8-4143-8c35-e158cbdc26ce" } ] } ], - "ID": "479278e1-0731-43ec-8b24-b51c2ca11189" + "ID": "81b6c3d6-f376-474e-85b6-074a0009f720" } ] } @@ -2515,7 +2515,7 @@ "Disabled": true } ], - "ID": "d0d70988-716b-4429-9416-150e0f7e1601" + "ID": "edf95244-d4e5-46c4-9301-a86c95bd1633" }, { "Condition": { @@ -2622,7 +2622,7 @@ "IsOpenInNewTab": true } ], - "ID": "ad488c50-a9c1-48bf-8762-e147d73cc5fb" + "ID": "8c548fd9-75a6-41ab-a120-fdc89b4123e5" }, { "CommandList": [ @@ -2643,12 +2643,12 @@ ] } ], - "ID": "588d6b99-763c-4bc7-abb8-994f5b626aa4" + "ID": "5b505561-56fe-4b34-8564-9d9129153518" } ] } ], - "ID": "5247b0b1-5a24-4772-b29a-b1dac992619e" + "ID": "1405f91b-14be-4d96-97ca-982a48a94604" }, { "Condition": { @@ -2698,7 +2698,7 @@ ] } ], - "ID": "e5abaa0f-546a-4596-95aa-5814b470769f" + "ID": "8d879e9b-38e6-4eb0-8244-d35747016285" }, { "Condition": { @@ -2732,7 +2732,7 @@ ] } ], - "ID": "614bf1b6-6c76-4ed7-a02b-660ec24790d6" + "ID": "2713322f-9dd1-48f9-b6b7-377d00628b07" }, { "Condition": { @@ -2768,7 +2768,7 @@ ] } ], - "ID": "2ed52f09-b530-4887-a086-58a8939a820a" + "ID": "492f54b9-9e52-4659-9b44-2990be1d47b9" }, { "Condition": { @@ -2803,17 +2803,17 @@ ] } ], - "ID": "b7bf76e0-5ead-4790-abed-695232ca8d02" + "ID": "f902cd5c-74be-42a4-aba4-d2ca848366ef" } ] } ], - "ID": "e71f7900-787d-4718-94b0-fe56f257711e" + "ID": "fe51cf2e-21a9-4b6d-bf7b-490ea4917411" } ] } ], - "ID": "7c33301d-f882-48ae-aa5d-c53e363dae97" + "ID": "98e1a218-b39b-4a08-a076-2800dd8347dc" } ] } @@ -3070,7 +3070,7 @@ "IsOpenInNewTab": true } ], - "ID": "a7c214fd-16a8-4987-8621-537452034321" + "ID": "6cb4700e-5ffe-4df8-9fe6-7cc4ffe665e2" }, { "CommandList": [ @@ -3091,12 +3091,12 @@ ] } ], - "ID": "1874d424-28e2-462d-a236-793f00366983" + "ID": "8d47f228-fe3c-4c23-95d1-87f0d955d23b" } ] } ], - "ID": "2618a304-276c-4af8-aee8-6d3ccb7c13f5" + "ID": "f0e0f19d-810b-4528-80f7-2742a76b9a3a" }, { "Condition": { @@ -3146,7 +3146,7 @@ ] } ], - "ID": "657a304e-d008-4ade-b730-68abc878f0a6" + "ID": "1e9dc38b-25d6-48be-85df-c12ce74d0246" }, { "Condition": { @@ -3180,7 +3180,7 @@ ] } ], - "ID": "16263be6-30a3-435b-ab94-87dbda1f6919" + "ID": "976e4779-e3c8-4179-8c4c-893778ef72fc" }, { "Condition": { @@ -3216,7 +3216,7 @@ ] } ], - "ID": "8b57da85-18ac-4290-b609-d58e79f9a63f" + "ID": "f2678e81-34bb-4658-92aa-2796a5367a02" }, { "Condition": { @@ -3251,17 +3251,17 @@ ] } ], - "ID": "21228604-6f06-4341-a594-95bb65a861c6" + "ID": "2fa99029-9796-439b-b4fe-bfb09eb8c7b7" } ] } ], - "ID": "d620f479-33da-44a0-8160-f85edf030e09" + "ID": "a214b600-31ff-462e-8ad6-92f1cd31f9b6" } ] } ], - "ID": "37897511-f257-466f-955f-6da411b759b0" + "ID": "3fd43363-96b4-46f9-bfb9-a4adc84db0ff" } ] } @@ -3273,7 +3273,7 @@ "Disabled": true } ], - "ID": "c690f7d1-5456-4f41-8e47-577194a610d4" + "ID": "0dfe0fd5-c716-45e0-a3d1-44f58587cf2f" }, { "Condition": { @@ -3380,7 +3380,7 @@ "IsOpenInNewTab": true } ], - "ID": "6c0f9552-d0c5-4336-b8e9-bfefa220a3f2" + "ID": "efafe056-ee2c-45ab-8ad9-3cc3ba8fc4a9" }, { "CommandList": [ @@ -3401,12 +3401,12 @@ ] } ], - "ID": "0a87e13b-3ead-4dbf-9e62-28db19feceff" + "ID": "c0be7629-0915-4eba-baf0-c5b0be85ef74" } ] } ], - "ID": "72b4ccf4-ca6a-42ef-8425-daabf68f9556" + "ID": "088ff54c-ea08-4813-8743-e25a66a5ca39" }, { "Condition": { @@ -3456,7 +3456,7 @@ ] } ], - "ID": "3b34d567-5eaa-4ff7-9b6c-723192b71b83" + "ID": "ab1c4d6b-f385-4adf-b0fb-efd0fee66cbc" }, { "Condition": { @@ -3490,7 +3490,7 @@ ] } ], - "ID": "070c3b6a-cdc2-4dd4-9b45-cf26d05025ae" + "ID": "f53f8f98-65f5-4cdb-bd01-e2cc98aceae3" }, { "Condition": { @@ -3526,7 +3526,7 @@ ] } ], - "ID": "c9878cf1-3ff6-4b3b-b332-22811c5a7c9b" + "ID": "2d2cd69e-258e-47e2-acea-f29eb2cc8b2a" }, { "Condition": { @@ -3561,17 +3561,17 @@ ] } ], - "ID": "f2d32116-4795-4458-8840-be85574845c0" + "ID": "00c42c7f-5ed0-4450-bc9c-334c9c344f03" } ] } ], - "ID": "c93e66ab-1e3c-404a-8d4f-9ee66ba1919c" + "ID": "9a39d6e3-c680-4ab8-a279-1840a1961fdd" } ] } ], - "ID": "2dd1317b-b794-4ccf-8211-a658b9280c88" + "ID": "899db2f0-098c-4bb2-8360-7fdb7b91e474" } ] } @@ -3828,7 +3828,7 @@ "IsOpenInNewTab": true } ], - "ID": "7ecf1a33-29d1-4b6e-a5f2-e6fd189c3078" + "ID": "f208a30a-78d3-45ae-b186-32c49d9dd09e" }, { "CommandList": [ @@ -3849,12 +3849,12 @@ ] } ], - "ID": "bb0e2b46-ac15-4543-b9fc-eca60dd6b403" + "ID": "afc95d13-2997-4488-8b9b-979d238b8629" } ] } ], - "ID": "12ca2360-34b4-4e56-9399-d91354b60903" + "ID": "99dc76a5-df12-4b4c-b72d-9e95bd555092" }, { "Condition": { @@ -3904,7 +3904,7 @@ ] } ], - "ID": "79b44dd8-9825-4a29-8a2d-791cdd33f110" + "ID": "5af175b9-cc20-46b0-879b-2682a9d3e391" }, { "Condition": { @@ -3938,7 +3938,7 @@ ] } ], - "ID": "dca841a7-d5d2-4c79-8a16-5bb4a558ecd3" + "ID": "d93763f5-ef0d-4010-8fbf-fa55b4d23beb" }, { "Condition": { @@ -3974,7 +3974,7 @@ ] } ], - "ID": "40ab3479-23ce-4fdb-b515-987bc387f32a" + "ID": "1739bc86-ff03-4489-9002-78bc44efcd29" }, { "Condition": { @@ -4009,17 +4009,17 @@ ] } ], - "ID": "833a6035-57ed-4d4f-a194-65209c692957" + "ID": "14b48426-630b-4eec-b286-d62432f87881" } ] } ], - "ID": "b7deee22-fbae-46b8-81b0-0550104b1231" + "ID": "aca5ae1f-2781-4a89-83b3-db7b64ef8233" } ] } ], - "ID": "1d3af8ed-2a64-47f7-8aa5-b720007b7b25" + "ID": "f0e65619-464e-4e0e-98d4-d32d7d58a122" } ] } @@ -4031,12 +4031,12 @@ "Disabled": true } ], - "ID": "7447cfd9-4809-47ea-b4a1-75b34030706f" + "ID": "3c0ac165-85a7-4ba5-9781-af00c5b7c7bc" } ] } ], - "ID": "e4943edd-53d1-4824-8e69-3788b1f746c8" + "ID": "5c562e3c-3879-4a39-9b96-8a8b69797ff3" }, { "Condition": { @@ -4119,12 +4119,12 @@ } } ], - "ID": "831d5467-8479-432b-ac37-2769c6dbe1e3" + "ID": "a0fcc965-1f3a-4528-976f-c270a08173da" } ] } ], - "ID": "4edb6dd5-5739-4dc7-a152-7ffcecff0844" + "ID": "ade2a218-a6a6-486f-90dd-659d062e0cba" } ] } @@ -4211,4 +4211,4 @@ "Formula": "FGC_母版页!$C$7" } ] -}//pHHTX8V/IMJGwhPbnhLuZMbxzA/gTsPnYVtJSXn56nzX4cnt2ri/gbkww9SpbUqQT2KnxaNnzCnRSECiOOXlaNCMRmwTSXQijksTGuRYQs6pabUN+h9p3Niv22Q56det4+WpQvsqSFpCCs2I8t6dHxYLXqMjv2BxMjZIbDWtEgMaxurS8heNr4NSv0Uwtm07mUzgdjjLs2pRdM3F5NBxbyiPwAiUd04HEseGKIiGFWFQ2bNU2XA2xJTwd7ZcuaD2Zr754n/2EvWhLLSv4DYFCpbjyskgVO6qEPx0DeCKOgGvFSyeRgd95VNjEHmf5FaBiujrLPt9tyqu9izY/9mr/GfGkms0Mw6DI+u84zuJM2IsilYAH5W0/SfanNc/ImzdNSt+NIm5oEJJ7HWpCj/9rvM7tpXtMnxRjsdbQo2D7gM+UaXQsQJeMjVS19UqEu7kklrEkpZDPEI264d0aBlI/32VDBxMSTm+lnO9R38/3Urrm+XgdYu+OIyBVFx2DruC3W8M7lJ9LWZBV9IVkSA2krF5LjC1ToqojMCv3kjWiLOAJwcryDd+gUi3qv6s7TfqtKWAJ+Yi+O58AjPzJApmRc0EorQUkPjOUT8yCr/E0WlT3Xk5HW2c47UGk3tqT2Vu16gyx5NN1nzzobejj3M8t9yRw4TuPvDk8Q46eh/i0Tvlr4jovLjCzgcaZPjMU64RrYsgUUc3LkDXTPaqKQmIsD/g8TNq23v5TAPL7AKDK3VpdUEzsCIAE5wMlV7fj4yQXQPm60S8sjwLbiPV9ZGOkRpPdVBhVHiuyCciFCT5JDAP2IJm293vphDpMKoh49p2/HHQ9IlZfdVfgu9H14PFW+v4XIfkODW2Cd/9RNXJbG0RyQHo5loexfnsjGR9wbeg+CptbhGDRYcE6HnYv7J6Kg==|920 \ No newline at end of file +}///GPIxeovD9G3JSYJOuKXG9FunSNZDyy3LXHPK8Sc31EslKy8Elr8jk+5Q6oJlywsWpD0g5TaBYazs2fUtWL5VM0oIA01wcy6Nd8RAsGjv/E5pjrwiS392FfQWnaQIeFZdM/6LSmMDj8/BhrpVXUcxV0xABD35s+TNq5I4pLZxdJd0EnHUWcA1N9L1ciUjpUzqbcmJ72X9cpTaCPpSNVZnp4WejG6V5AdOQN1z6NAQbbkF43Id7eQtYxbFUjn23xPDxw3dPJ6ElFLA47KuBHUSfVn92x32DE+FmkB01l+ML9e2yjg0deiqStBqEiz4r+BJw41hzUYOkH3nr1W9vOHO2S7tKbh1jtP5uV0XvIRfvwfbi/bb47pikA0Cu7bJm71snI1g71hQl6usrE0vtSlLxgoLyn5q3EFGxwJrwG2fU+AEK7V1cL7WVicdixvP+jANqLhs5jiVglAasiGUr8NCFDk4g/aXHRyeedMcU2RnL1MVfOjTeVZ4AeMUn2qIJ6M3OgsgOqkSRYDyBIQF0SXORGMiZTcY7fLPUy3Fdy9dZkjSWbl+avy+GaMZ33Ad8s1It+1U+gJxyeys+ukCN8K8Fy+lM4SzTc3OZGiOKhzX8bFWD5+0bnfmZqUVjJ0NgYZC6+D4QzoxlCme0RiImdwmsapNxlm6xlBcSRYmWCai2HiTlQTrXAJYe2JUYXwL3rcPh/3MP/BQiXUXOUn6K/V71vI6+B6a8QpTrzD5OiiN9FJh3vgFMnbmnJZIWqthFoJ7Q+hZ6PyqmcQS64pdAml923AZJunaxMJPNBEBS0cjxhZC1MW1iYXKASMHTC2MmsgG59oI0cAarjUsWVbYnlM8gn9akeAw3mRpBhsxvP/zDhLaLxv96AU5WhrqcI5RQGZF/cmwD3mR2SKwPjkG9Iokw==|920 \ No newline at end of file diff --git a/MasterPages/FGC_母版页.rd b/MasterPages/FGC_母版页.rd index 0a97d501..122ce49d 100644 --- a/MasterPages/FGC_母版页.rd +++ b/MasterPages/FGC_母版页.rd @@ -4,7 +4,7 @@ "RowCount": 7, "Formulas": { "6,0": "ODATA(\"ACT_RU_TASK_View/$count?$filter=类型 ne '抄送'\")", - "1,7": "IFS(TODO数量=0,\"\",TODO数量<100,TODO数量,TODO数量>99,\"99+\")", + "1,7": "IFS(TODO数量=0,0,TODO数量<100,TODO数量,TODO数量>99,\"99+\")", "6,2": "ODATA(\"TODO/$count?$filter=用户 eq \"&IF(ISBLANK(母版_当前用户),\"null\",\"'\"&母版_当前用户&\"'\")&\" and 完成 ne 1\")" }, "CustomNames": [ diff --git a/Pages/4efeb9a87d4e43c88bafd4aeae13e20.json b/Pages/4efeb9a87d4e43c88bafd4aeae13e20.json index 745e3997..f75c4ffe 100644 --- a/Pages/4efeb9a87d4e43c88bafd4aeae13e20.json +++ b/Pages/4efeb9a87d4e43c88bafd4aeae13e20.json @@ -122,64 +122,148 @@ "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "移除任务成员", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "任务成员ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='4efeb9a87d4e43c88bafd4aeae13e20'!F6" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": false - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ { "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "='4efeb9a87d4e43c88bafd4aeae13e20'!code" - } - ] - }, - "value": "0" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "任务负责人", + "GUID": "dee7f9ad-8482-4307-aa5a-9adc66e5a60b" + } + }, + "value": "%CurrentUser.UserName%" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "父任务ID", + "GUID": "3c5d8a32-b30e-4d93-a658-13050ff48ba5", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "任务负责人" + } + } + }, + "value": "%CurrentUser.UserName%" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "f6e47bf0-c2d3-4f51-8e7a-ce132ffd58a8", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目经理" + } + } + }, + "value": "%CurrentUser.UserName%" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon", + "currentUserProperty": { + "UserProperty": "角色", + "PropertyType": 3 + } + }, + "value": "Administrator", + "compareType": 10 + } + ], + "RelationType": 1 }, "CommandList": [ { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": "操作完成" + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "移除任务成员", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务成员ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='4efeb9a87d4e43c88bafd4aeae13e20'!F6" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": false + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='4efeb9a87d4e43c88bafd4aeae13e20'!code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "操作完成" + } + ], + "ID": "669a9660-63cb-45ff-815d-a81cf0e6ccfe" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='4efeb9a87d4e43c88bafd4aeae13e20'!msg" + } + } + ], + "ID": "0c651f5c-304e-4b79-96c2-df2e8b710092" + } + ] } ], - "ID": "89415483-a65b-4d2f-9df9-0151a04aa257" + "ID": "a9a7189e-5bb5-4e6d-b953-0fa76c5149be" }, { "CommandList": [ { "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", "FourStandardStyle": "warning", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='4efeb9a87d4e43c88bafd4aeae13e20'!msg" - } + "Message": "您没有权限删除成员" } ], - "ID": "df5fc0a5-bbdd-440f-98f9-510a57f6cda2" + "ID": "f75f3fd0-6a3f-4d71-9389-457150300907" } ] } @@ -272,4 +356,4 @@ "PaperSize": {}, "Margin": {} } -}//s2+FQR0VzjQ5jf7G4YQrrdY+/1MlTX52vdTEt3t/FMuw4P8PR2RYFSHtycWytkgjjPI8WTjp1JZNmskzB8yfgya3UzMmwCohNbJMgiTDTBBPdjHq/sXM2a1YTGpMEYWWIZsFOXqylLyGqeIIB389ycpQ+zX1abMEYDkXiemdqpYOwE53AwfQAU4OOq6VGeGK9INKYICWcvTGfIK5khBYbRhvFXL2HOtJUjF6qxaOsUPRBXjtbpaYm+1cELPoJ86qcHJiZtrUT3GqbgNGCWBm1hf3XVYvrU1BDtVAKj7E92eh6ARu6vZeBLnWg6KTEnsS1dNM2/K3YcqoAbeqF3NQd9iypJ2mAeGUr3qOeh7z3tFansSLBuQbMtE5SSXT5MFc2no3vUPhkVrXMwpeJUzxtarojuTkHTUHGk7sEPGWc2ecn5duDfxuSs4fueIng1X7HKmgE9n8HJoj1RVM8Z//8CMsSGUR+5RWdxvQknDCD5AhMgrmZ8BtBZZ+0XQ3Zk1xFjSU3YRvQzyjuPiB79/5W1QFL14sBCTdZZFuOb5YEuZ63W6rCezVdF4YiLYX+yRa2+6Vi2FJv21BAITsuwfA2ty1uwATw+A2B+Wlad3WsmX1bPgC9avhQOt3+tV/IzRzN92OgxHRs9lzcezNwcozC5rzT86vFyBklDjTV13AxwNiUPwkaFCJbwin7apy2VxUMGHY9gYp8akKDedfq+DFMgtdHTIEaRW6j+rLw54yJ7yrFPuCdzjG0dHoNAwSHJLJJDI0hZGAbdVyS+vAGFFRd4ZGP01yMI+8Iz1lBxk9Tp614eqoDxW84sOoQrV6Fo9WKitgUMUNkeOucULBm6XifejREnqSgXqVJyhSAjiRyAVV74dlZ4rPuonVRDTxdyQoCVxMZOHE2ZWZRYLblAEiDA==|920 \ No newline at end of file +}//0OGBARmcKfPOCZCFRiYVtsHxBndd90LlU21cKyEg2uFSyjXdsOb7R3eNXQpYVRYwAbKCvmMJ77kTLmo6rJ2D55f8Sdel1mHzV+cYItUzoreQ6VHAS1bdPtZ4iQmbcZhYH5PJ7Trjy1RG3mJqqe2WjfonxkjBmYRJO2kjNraXP/bzTAgY7B0ab8MSxqLpNSCW3J06w7xcwx3NLjkKk8ZlWecbW3LTyXacwQ9rugN92USn/Ugho7Nzv1MN00ctCX8fdQgNkbZiIT6v8VeD2O7V/KRS6qOfsP7np5dgd/bqWb+5mvq4yai7Dn7x+nSXlAYS2YgA0JFOfiihB3s+xkQomZyM0xulNBjZAB5QJ0LTIUWNl+GXoDwoPNmHzMCWxCDLVs57QtbzpobfA+UY9Te6zBpIvNZyLnyWYXq5ppaXEKXcTztY1xIRe8c5u3FI7gaEttAWCD/sczOmj9Q5WH+JCLIfH7eSukIAjc10IZLcRgxltA4WljPsqNRziPXKa48C9QTZ6H0FxtF0GMsI7eCyusXYDNT7rpocOclW5Q+d6XEbkrzhuit5TZOCJc9PHih3b6mOcC2LYGRlgFJNAUHqQe6Y0+5N3a6NJDdilFsT1QfG9jNJEzIT+yXe5eSc2RrkIPZI/xkyeEpaw52omTCyg7gG2mYcRA6gqjK6msLbl0fVGruHx0MUCbjbu9wWU3hzPHDOerRz8tIpMATQAVXIRuAgZfw2GQmLlFSsaVsk5rriRYhf8xz6AAHo5fC6tcgMoSoXHxyK7qt5fov7fuVXiNdxea78FODRmJcUqsp3s2Aj6IyxPqoIMeBW0mJBn7xdIsMyIdFHTdJcdQK18BDzWK2Ds9S9mbg+cZvXpfA5EtgE/FKpOhD41j0g6mWHPbOgmjSCcQZBSl3SqCMwnMhgJw==|920 \ No newline at end of file diff --git a/Pages/b522ad93131845cf87553eda79dfd25.json b/Pages/b522ad93131845cf87553eda79dfd25.json index b172dac1..f174c8d9 100644 --- a/Pages/b522ad93131845cf87553eda79dfd25.json +++ b/Pages/b522ad93131845cf87553eda79dfd25.json @@ -80,6 +80,38 @@ "姓名": "姓名" } } + }, + { + "CommandName": "点击删除", + "Commands": { + "Commands": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务评论表", + "UpdateType": "delete", + "ShowConfirm": true, + "ConfirmText": "您确定要删除吗？", + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务评论表", + "ColumnName": "ID", + "GUID": "0a35ef10-5c21-4873-94eb-2843f7c9bed3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=b522ad93131845cf87553eda79dfd25!A2" + } + } + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "操作完成" + } + ], + "ParamProperties": {} + } } ], "PropertyValues": [ @@ -195,4 +227,4 @@ "PaperSize": {}, "Margin": {} } -}//jdtYvJYaXWys0F9RYvxkgHKBwabNIEr0WwU1KKyZgQJZxcu5nAtAdj1N6fgYRM3+5o6YTB5fkQFh4min2iP4uSLNTeM2NJy3HZ7Sy7EK1e74YaeB4mYd01GWGOMVmC37Y6Zf63AwERweXCWhHcw/YNLu5C1tVLjd8WXGUjwmho/mjVcmdvjUH8uzFpENUlgulzqaBbzWTUGwSUhcwm4TJ9KJxHKrPeBAa0GMiMelTp9qnhPNg11UZZSYg2XmLhPmZjmUJmwBkqAhTo/cAY1l3Oho7LauYFowlximaPGwPcUbENQqBTiHBHABqkGXHNRrjfnTDj7T1uuNFKa6lF+ub9vhElehcRm9oGqKQYEIqIQaI6hbmuYwokbr5Dq3meexjVBuFP9hsFlXAHuu5VZUoQAKhoSIru3SMUX4VY1PtqQsDVoDQHjwvlIY+cWOVe8x3Yzb0bl9UGi84tqxMtEeHMuYDoqMt/vKrx45fWvJvHVHZr3L8Otwmy7XbqKDBr9fNJ/+PlIkO/UX8blxrW6Y1baUP9LzbF3Li5ReTXVUjckZQ9aQTQw2a4VX2wPyD7nEBsEllq/9bROihmlIKA6JgznROUGesYgnboUMsBndGEad6JWDJfyTLs5FoRV4SrR/e0U3533vafiSFI1oVCa6BRMYDYGcMYZgzYMW9MG4V184Nbi/7K05cbUQpoJbU6LQPEdfNKFKquJZ829h/Fb4QhvVHiBHaqrj+DaCFxDwzG14YwtN0GynTak8rbQvW3H3qLiy+5cbHhDsMn9CgYCt5h7QLnFITYNvm5tCNE1N+m+vmVi1/LI76rBLm6lCvloIbtcY31Q9WUgjGT9twpkxZld2ey8tOmi9K54wmDM/iR3fsthuq0/OHBRGfqnK3+Qz7KlnGRfQ1MYN2evyEQpC3Q==|920 \ No newline at end of file +}//MWMRx611L+IQFGQ8yDvSt2QFHxSLD306rTN5h+QLJOtnWZd1gnDwJKdUPmMibtoOiBewGHzB0c6SvT5Fu2TiF918n05Pdiar3F3y3jcVk9rulH3HOOzPBFdy/tLs8Ls4OW4dirETa05M8I9jJlII5dqJqi08sSSn2soRde45Rir1MqHQeC6bA/QlIzctADPLl+78Wf6mLmW+MppYh+Tksw8PpHUPt96vOEvtCfSYiKlIQrp6YumfhqyIJILVzAfBTtfADKF1405YtCx1wBZ39sm/dF9NuY8/UWEejSi5x1siQq5MyffkYSncktixrQfSqv6aPoZOucbtU3fV+dEivpUu1viLaHA8fGL4C4qw84ZV67BCygBX5RbYcnJ7WtR4ZTkcLK0BF2IquewXZyYlKqlKLkYNFNN10I8lsTiLG0HYcxenEMgr4KZ7p4Z57Ay1y/Ktt7eBWLcpl1zALYlLLt4OnzVN3QUr/DNzAlH5QeK+dkY3h/nZ1XpYi98QnIwBK/gnIeSMk/GI0sD7bmcTo7WPgCkEJceU1Qtjb1CRXc6dXvhRedQ91lHwBH9t3uhPLvHIrdwY6zMyDFvBdPQKEhwfGRLrluFI22xBhSgMt/JMuxlbOs68P0ebwacyfaDqq1j58CIdUP5T8hElPnyYJ1DBA7K2v9WXMkNxomMBk+ge4x/f9kKtmmaphDWI98oKKuVKizCEDAQyzcNKgdcLaoFXbozrzUWEb+Rt1LPLxYuA18iQFeqSbbvOKIvIrXdpR8RpwNzIGBFm56tOHU2Ojqsob2jE2EmkVpP786hsULcUJiKNk5mpHpK1fZHl5HAa9Pb/wAx+6DTWVrHUmFOgLPlLkREJq4OVyMSegsjVTmHaPo2tI6AqBXBaLHiDHICjuttSDKu0TkO41WU8C9HpPw==|920 \ No newline at end of file diff --git a/Pages/共用/选择图标.json b/Pages/共用/选择图标.json index 20c40c99..4d6d7009 100644 --- a/Pages/共用/选择图标.json +++ b/Pages/共用/选择图标.json @@ -231,7 +231,7 @@ ] } ], - "ID": "599bd815-b23c-41b4-a896-47740da458db" + "ID": "02de28fb-9e94-42f1-bccd-1e59e0c216d3" } ] } @@ -324,7 +324,9 @@ "CustomColumns": [] }, "DataSourceListviewName": "图文列表表格2", + "TopCount": 70, "IsLoadOnDemand": true, + "LoadOnDemandCount": 70, "DisplayMode": 2, "TemplateKey": "幽灵按钮" } @@ -474,4 +476,4 @@ "PaperSize": {}, "Margin": {} } -}//2hMal8pKPW0Hc64v6VxWYoQXhXvk0i4w9JHEgYeq3I6WHCNYDkw6dCp8lZdsSuClfeMAxRWPUsRYRVXC9OhSUzKdxk/2/cdzi1vP/iWYwwvZJyPgdPyifLDiIugk+PnCexsTZlK5H+Gve+JfNMIkr0rrvEhpOnNQZPqalHIdRHbxFPQBWnb2tyaWEFTpUl8oRYtjud2O8icLbdhjSUZ8LRUpqRJzv+vUMH6r0iLgYjngrHNFN6ExH41BXGPMBz+7B7tEfNK/hMwXNwGqkvU+qts1QUkfj7rUKDWFJua7tjrC99948METTfbSF4KM8/8CpMrFYFOTXU7h62pVxk52hlpMENk7pydPqRpmQ6kU5cZpe8SoyBZJiPB+JJVbAOLzkytttVIZ4DPlYpBZMwuaePB7pqlLwZtfIU42CTShb291Nrfz8t1+VytBfHu9MEoCDyb6sWSihyFEzGoWGemisIyTkYSaSWdSvjAH+PnsFsPZlUGvw0a9PORDoYKYLzP4OvdnpSwKg+aRuj0dEFi5ewynyjpshlLXyf2TzgsXOhHoQOIpsJirdGifyWStbmS1TMpPaVFT/FwyNRGkOIMr0wCVFI9ZYacmVlWy6968JZqOl8KD2xRhBo6+jPhyLrzTQmLH9EyaeLJmArzfHZAbwctB6ZCQW51AsG+H9oCBGr3PUMImYFjuCev2dfwnCzeOMCkRvE7ZTHTXY8/Dbjdcrhn4s5d3ppCcWt/aKq5w2J9YdcxqwcwnaqIBDkkk34U2r58ZdlAvyToDoGnSNQ03zepUCDlzuk2zZWJY4buLyir/PpGSEuITVUjh4DnQ5otwNaWN/X8ZW9N6zU7+Xm4F5szx7HTJPHN0vEvF6mwtf5J/1uWPgUAgaVaXXc0G2/r3luHNLHxjlsxhNrcp6A+8JQ==|920 \ No newline at end of file +}//RuJAggcrPrTW0nqNke3QNjUKinX/+zkqhcB/6WErRPCHI0CG11MA/sKuLkxrn4J7JaKB/VhE/2qBqKgdZ3Hoos0/t1J8qQBLy7c1KzFTPXms3zYo2QsTsfAUIWXJI/e9y0gM+EB69l1ovDK2MhfNrxLawU7Ym4hxVLIWhykasDbW58aeQkDSGnyTPw84MOKBUC4jcRXSlEivlmyKe1qVfWjqZuqzdhmpSHm2pM64KogDhP+umYR+we5Ts6bf2SOC2YSbV0l7qBEAyI2uqIujAWZD0t+8EUNEC52yNzpsB5yAT8SkfWFS+Ddux15O7M8g9nQJTwdwtQf51FnBJ4AY+S1GOKY1xI0hqd0iFEHL4AI8VgJLrKpYbwqq5lYXcrX2mEsZhcy9tihbwijjDGwVkzlsdPmEFNxITF8Tgeg5KLTmYcuM6JzTjw7NI78s33ieFFuvx884jfxqVdDiq5BzIBPIZ+a1fbe8DwlpiIRAtmdFHzZunCviXrE9D25yo8gRkgLyI2q9KzuJehMJiQNxiFuonis/OkNojGhYFLiL8f6jSxpnfiODovXj+PtPwZKm5I7xuGoely5MCmIwQCpax711TDvYpzzVi8z5BTLd08D2wLbSB6qTz3CVdXqUnA+EhqgQvOW/mxDZhg3KAz+I4d7+zfM3OpVKh6WjrgmanuyMKcc4ae+5ZozBsj9XgdF+WDLbUOSvVhXAjnWXWspKRD5fk2Hjx2do/qEdpa+efVnyk74crEL2t8ycPAK2V5Gyes5tAMNAoKO/e9bnBneUVvHd2tqNpXY/iyW5A0YGW2bLkj0a7E8AOtnOmeV2gg0b4eDcv00X6j9Z6w+8LgwiuSuo0XfcaOIAe27/jFHjCOltrCLOPXsNdrA6KWBIX5j6GdlS2HPXTnuJk6iqSZ2w+g==|920 \ No newline at end of file diff --git a/Pages/系统/平台设置/邮件模板/模板编辑器.json b/Pages/系统/平台设置/邮件模板/模板编辑器.json index 0319f24b..f891a471 100644 --- a/Pages/系统/平台设置/邮件模板/模板编辑器.json +++ b/Pages/系统/平台设置/邮件模板/模板编辑器.json @@ -262,20 +262,6 @@ "TargetType": "UnlayerEditorPlugin.EmailEditorCelltype, UnlayerEditorPlugin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null", "MethodName": "Save" }, - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=模板编辑器!B4" - }, - "TargetType": "UnlayerEditorPlugin.EmailEditorCelltype, UnlayerEditorPlugin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null", - "MethodName": "ExportMergeTags", - "RetrunParamNames": { - "MergeTagsJsonString": { - "SerializeProperty": "导出标签" - } - } - }, { "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { @@ -310,6 +296,20 @@ "value": "%Null%" }, "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板编辑器!B4" + }, + "TargetType": "UnlayerEditorPlugin.EmailEditorCelltype, UnlayerEditorPlugin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null", + "MethodName": "ExportMergeTags", + "RetrunParamNames": { + "MergeTagsJsonString": { + "SerializeProperty": "导出标签" + } + } + }, { "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", "TableName": "邮件模板表", @@ -320,29 +320,18 @@ "BindingInfo": { "TableName": "邮件模板表", "ColumnName": "模板名称", - "GUID": "af0ecded-eb93-4a89-af9b-577819b1a8d9" + "GUID": "c409ff80-8753-4a44-8864-3ab46bfd831a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=模板编辑器!B2" } }, - { - "BindingInfo": { - "TableName": "邮件模板表", - "ColumnName": "设计模板", - "GUID": "59905ea1-a5d6-418e-9cb8-81ffd4d1e79e" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=模板编辑器!设计模板" - } - }, { "BindingInfo": { "TableName": "邮件模板表", "ColumnName": "HTML模板", - "GUID": "6171634f-4f3f-4ff3-98c0-42374405013e" + "GUID": "cfbd835f-e28b-4f05-ab0f-5ef38f9153b2" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -353,7 +342,7 @@ "BindingInfo": { "TableName": "邮件模板表", "ColumnName": "模板标签", - "GUID": "73d50364-cfb8-4b30-8dac-bf8d35af9ff5" + "GUID": "f0489f11-1f8e-4bd0-96d7-167eacc07130" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -363,7 +352,7 @@ ] } ], - "ID": "deca53d9-b551-4b90-9fa2-af2c4c688a53" + "ID": "b0bda5c7-3a6c-4e14-bec6-5d3c5a69c246" }, { "CommandList": [ @@ -376,7 +365,7 @@ "BindingInfo": { "TableName": "邮件模板表", "ColumnName": "模板名称", - "GUID": "c8972e9c-74f1-4c19-8981-b2d122865120" + "GUID": "2ca08486-22df-42cc-9605-e0da666193c0" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -387,7 +376,7 @@ "BindingInfo": { "TableName": "邮件模板表", "ColumnName": "设计模板", - "GUID": "cffc6aac-a4f2-45b4-a17d-e6be4afd2fc6" + "GUID": "c3740225-fc83-417e-a90a-ed6194cc9776" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -398,28 +387,17 @@ "BindingInfo": { "TableName": "邮件模板表", "ColumnName": "HTML模板", - "GUID": "243f7a37-f4d5-4563-b6e4-8ea1b26e707f" + "GUID": "250c471f-1877-4e13-a3db-9a2916a60615" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=模板编辑器!导出内容" } - }, - { - "BindingInfo": { - "TableName": "邮件模板表", - "ColumnName": "模板标签", - "GUID": "b85477c4-9008-4f24-819d-c694e4532cd8" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=模板编辑器!导出标签" - } } ] } ], - "ID": "8ac3f5d9-d437-4416-a30a-937c7cd6f7d3" + "ID": "69d27b4f-5dce-4e64-adc5-5406aaaa156e" } ] }, @@ -460,7 +438,7 @@ "CustomsTags": true, "MergeTageJson": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=模板编辑器!B4" + "SerializeProperty": "=模板编辑器!B6" } } }, @@ -530,4 +508,4 @@ "PaperSize": {}, "Margin": {} } -}//ETTHKSZliZfe5MW/1Qm2G/oDU+qQUDmjruk0Yn2T9JFfNgPFDkEusZuV/Qtz5k/PmQ4tkIQNgGfP9Gn9wnW44FbSJblyXTU6bJhwheY+PqoXVMSfWiEluqKPFaA2LKVBVz2Uxzdkbeiz5jKZOlh+3ZRqP+fVJccuMklSNDhFr82ToB4KUQZWb89oz/hmOM3HM+oETOU1rNQAs26sVRwHNhlSywq5KWC/7+sW1xXxNsPPw46x2rBj/fZMhyDRLgOWSWBuoS2nwL3aMoy00DxqRk2U2yGtJqh3s5z3+J7ndNeGnw+pHX89PtpHFFJahVQAZjTg8jkYPy46rcOJMMzpujPhplTSudVVEBLun/+O9o9V9zlUOEhk4sYV5ytMa5kM1+KlTnWLFTl3kevWtYveNkvJl4Bqn3YDqNUzHc7K6ReLfr55UUtG3NgAjy2pBaTX8BybuKNIhxN1sXVCvBWIHcpZEczn9lJeJhwb0VwZH3zsVcMWQ6NEMZ7BJohbM0bDEByHs5gFf+P0AmdxoGm9mC6LWCvFXgAJaBGvwPPtkdAKHgfR2o3XUeWfg/r5t8BnKAW6RKB+LrWGaKTEX4oOp5cl/GF1Z1EfsWCUyqfoiZRzHxuiCwcewsj9rD219/Hl1jCBfY7Z6ntlw/mT/Fv30c1WNgdDBDziFJYUqbtBHd+ST+hpYiuTuGYS7ku2UVAf8H/Uvq1Ewo8fyOiwKTUHmIjWAaOXZ0hSizJseWb9fjqkNRB2C6DJgiDETMC6SWVR7Cq4Cer3tVWkQLLEreK0hRHGmcTM2R0r+M8jWK8nwsisV31AYjxdO4xc5+1r8c+h+OBobM9+o+PfsE2mQA3vYhHVUzk9JbEWrwV4jAw73xVSXGrytycYCWKdjgxjEjCnd/GLXbaFERopfq3FhAMJag==|920 \ No newline at end of file +}//k2m+4VyOSf6QLgWTQkfKczjltmLR6efhU/tecscp9GxdKD89N2Tad+f38OJFq8oGVzoVxYiVwzvSKNx8IwRXHDev1EY5/04K/eBmpSbzyhCXoNxqxLoKjPJM28ykfDbJcUy6NfhxLtu4q0QFGh3IxF850J5q2Ov9o0hbzjMlH5qK2dy1kUMdy+Mhs+WIIWUAd+oeuXGSeBLRUlt86bQTbDlEEhK6RjpPni26ZK9sjUa47b3TX1hW+Jtui0GyHsGTtEp5Ikm0v+htPEgP0lEeaULqP5Fl92ai9483GDEBLNVaAOJ9iR2wa7xjR2o6HSAhaoocSaUjoNO0lffygYb2FPjDrSOBsrnE9lm2Pzibt/3CAGdglEtkJrdzZj9P3leRAsHlFbZm1nKGugXCpKDjpeCoKpTVGKlu8kArJLdVkDMtKFZebh5Drt80E5JxRzsJUu7oibnIOxlX3IxrBGZMrIfELbw2JykNUd6r+aA7TuEHIVZ8y423oaeazypbPf3QYMWctX5pauGE5A36anYCtz+ahwtKgcpe858LYEyoTHmQhR+q6XXJTvnxwm1g1FMOdUqt12wUeS8yb7LEzFZ7DCfroKa7cK3WYVzrtgiw1IYsIXETgxDoDPWToYbEM6XaHkUgegntZcISYIEI28VgC51Yt5dEerZv6tLNDkLBxnlZSa97JXrBANlbjs5tb69UBQz+03QtlRvT6CHO1CUNkzi4r78bEHzT1/xYWo6MheVoSxdXXxAr3jYJqPX0zoZaKgxolbdOFh/mjS0dWNMkt2G7gceBj3wDiJQd9Z4fzObQ2rSAAoOm6M+q2hNjl1/zAtLS1nm7W8S0oOCusDzlfTwntrgdGjxB4h34lj25CLV0d8uiUHhHQdYkVCkYFCxm0mNdGY+JmBsAD0o+tId+5g==|920 \ No newline at end of file diff --git a/Pages/项目/项目成员详情.json b/Pages/项目/项目成员详情.json index fcf20102..3f28c7a0 100644 --- a/Pages/项目/项目成员详情.json +++ b/Pages/项目/项目成员详情.json @@ -48,17 +48,20 @@ }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "IsHidden": true } }, "16": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "IsHidden": true } }, "17": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 + "DesignLengthInPixel": 35.0, + "IsHidden": true } }, "18": { @@ -74,6 +77,9 @@ } }, "InLogicalVisibleIndexes": [ + 15, + 16, + 17, 19 ], "Count": 20, @@ -445,17 +451,17 @@ ] } ], - "ID": "25ceb69a-0fb9-43cd-847f-b7d93b20da5d" + "ID": "60bdff02-82e4-4f11-8622-b8df64bd6456" } ] } ], - "ID": "66905bf4-6a2c-4925-96aa-ea370f213b05" + "ID": "dac3fb08-c653-4ac1-be6d-634fbc4b8972" } ] } ], - "ID": "eba607ee-1500-40d5-a367-c8898a8bdb62" + "ID": "778119be-62d2-40e6-8339-192915656969" } ] } @@ -705,7 +711,7 @@ ] } ], - "ID": "854b418a-1e74-42ad-89dd-4603b7dcd3a1" + "ID": "9264e547-af75-4f70-a16b-72fc4b6129e8" }, { "CommandList": [ @@ -715,12 +721,12 @@ "Message": "请不要重复添加成员" } ], - "ID": "e6ac2f48-b433-4467-8c06-3b9ffe84fbc4" + "ID": "50ae74af-78e5-4703-a13a-77744274fb8c" } ] } ], - "ID": "b7d96937-a9ca-4d12-8a09-d8ec2e245f87" + "ID": "9a5f7278-1412-4d53-a4ef-de7d2e487f48" }, { "CommandList": [ @@ -730,7 +736,7 @@ "ShowConfirm": false } ], - "ID": "5476c2a9-d728-4c92-a399-46a84caba3f7" + "ID": "bc7f96a9-2968-4fc0-9483-101513b84e04" } ] }, @@ -752,7 +758,7 @@ ] } ], - "ID": "5670df82-5883-4905-a81c-aba565c010a3" + "ID": "c2e6ec28-afdc-4d58-9fbb-3a7a0007b00a" }, { "CommandList": [ @@ -762,7 +768,7 @@ "Message": "请指定项目" } ], - "ID": "4ebfc3c1-ff9a-4c92-9052-e9600f956226" + "ID": "8b982f85-189a-44f3-ba08-724324d0cc35" } ] } @@ -1039,6 +1045,103 @@ ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "项目经理", + "GUID": "c261f021-4745-4382-befc-546e5564c0f0" + } + }, + "value": "%CurrentUser.UserName%" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon", + "currentUserProperty": { + "UserProperty": "角色", + "PropertyType": 3 + } + }, + "value": "Administrator", + "compareType": 10 + } + ], + "RelationType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!16:18" + }, + "Value": true + } + ] + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!B9,项目成员详情!B15" + }, + "PropertyType": 0, + "Value": true + } + ] + } + ], + "ID": "551b640a-35a1-4086-8170-704cdf0d0678" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!16:18" + }, + "Value": false + } + ] + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员详情!B9,项目成员详情!B15" + }, + "PropertyType": 0, + "Value": false + } + ] + } + ], + "ID": "4d8ef443-91cd-49a5-9034-ff3733b75bff" + } + ] + } + ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -1094,4 +1197,4 @@ "Formula": "项目成员详情!$E$20" } ] -}//JQHu/wAhwqt8gohbUpxSO8SF8ahDCfiLMIF/dXwUa8t3cGa4xmq9MRrBMFBicLtkgQPslhSkwuTk06YWSByDW6Bfsv3rH99GEasHMATkph6TLHJirmsrB6hp4wkmHm08l5412KJETMf7bLTQpjSzqOOegw7jpaIFdPrdaQaTJ1nt+ugPtsyv5A8vpoBbfvryoqh0baOYJfbjCDo+SrxJbDuReioLByKI5ME/xTI09CEGEKZR7fMt0NbPQLefqZrNebt9Rs872sKu1VHhV457mXl4G/SvnPAVKztK5bDWQfJ7nU8Hgeq1/t+glCNwmCkRATntaHNdDMKsHnJq1BvoKsS0VbdemtNvuM7RNeP7OaiZMx7O/oyiFrmQ64qJbH4va7bYLIaGRLJo9EHi4uiK8nja/7/C4khKxU7NcamJ7o4fGh92mVUvrhmMyyGkcIxTkIOzNMU2/o43noPxpx6hhCPvOf1RQ7zclEq7krGo7kC0ArmbCNnJglVKkZxt0UxzTzVa6nfXJbX4Mltni/fdGduNiqRO8jCQray0ZssNjJuRChSiu0LRrEe4Ikpxw/YzS7NNZwYip6atLYJiYQDsfkzvAL7/Fi85G6yvaWgyBeUnjHnIrwiNmLNpW3kDs3x5uRqf50K6BtRjtvDXijSotQljL6HIOMZhV9Vt7Aw0WKNeJV/S+C6wCqmCByIvwYDPhHJrFBkFL5as8+ZabejG2HmJZamHGFI+mFd6zbfoiL6BylHSXOb9TdIItiuQEtVbQ3jISqqhU24RIuXksFniQrSwpVNX4CQRy3M735s/sNHJ88ACG9Undg486JbQLXfEIZsGTtlFkw9VFReUJtiREnBQKEcdlYbyNjiGgYUjfXj3t4GU+Jz2jHNDnfuiDGuhAq6z2X4VRDplhESu4ihLAQ==|920 \ No newline at end of file +}//Zr6BSqgmSaV3QcFWGCDrDJM6mEP/Ho/LUGYpzGBkhMEKic/0VG7QcdCdxsaUvgbss9aWAxL/0iUnm0B59uGI3TRJo8NE1n+GNIOXDYfxhy8XxU1jQGIYiuU586pNduYXNe8iVxrwwul+ymoaEjQggOMfyjvDiHdMMNIK1Ff50aEJCZs4KCVn3u8VpdzDjWPP3zIl6so0YLejQiQ/XQGygrktPSoL6BRZJgSqjnEkqD5nBtSnqSTut59CSDthVs80rkzVZSSafssTKxifPGPSnd1k4+SZO2KFXMwNxNWU8Lji+8BOUq8bAagIZeWhO0zzux6xni6f1PxMceUI4n5l8YBb4h0m8X/mz7ZtuGMKy13i3v/vWLO3NRZzj/CoBtNWw09a47SsKmpLV0BD8kAPYJs2Ay+ltJvGIhpgoDjtnidIkwelElmYI4S2bP8sY7COsuSgbrFHy52KuU4KONFFXax+nk2A/dJmFD4t0+82hxXeA3gnYOApQPjxxUf+PlWqYIQxeVnKjj0ywUu1PcoRRTXE6GIufH5S2esHQop/xgkjdt0I4aINO/uu6IuzxdfIueBdk1e4koVVJN7FPQ9SxicZlv0XksRpkCFJYSLWLaoih0NJPC94EAEp0OXxIzp9v78+dn+4mNiZGBztgQm5mogdp6VJAnkTpBqD9IcGRGuk8Hmo1Ty8gHKs2Rj4OlAAQhyXoSPZv9z6WktixM3LoPm+lWvrYAvOTJ6HoxoY9hjJsqU82reQ6WSIGjMqicuG+pEnEAZJO6bGxlDIEGPrpxZbOEw7Rg5j0ukKuTwd+d3k4TIXKY3738sKFIqiHcLYhoFGYlB3ZSmhy6jP9rZhlnSMOltdxgO+//Um/wzV3ueJBOds7QQ5UY8R8vZM2AXDCDdwRJjca4WmiIkiDh3Ysw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-侧栏.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-侧栏.json index e88933ec..aa88041b 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-侧栏.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-侧栏.json @@ -64,9 +64,17 @@ "DesignLengthInPixel": 287.0, "Mode": 1 } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 48.0 + } } }, - "Count": 11, + "InLogicalVisibleIndexes": [ + 11 + ], + "Count": 12, "DefaultSize": 15.0 }, "Cols": { @@ -128,7 +136,8 @@ "DefaultSize": 32.0 }, "Values": { - "1,1": "参与者 1" + "1,1": "参与者 1", + "6,1": "所有" }, "Formulas": { "1,1": "\"参与者（\"&参与人数&\"）\"" @@ -146,13 +155,9 @@ ], "ToolTip": "管理成员", "Size": 18, - "IsInvisible": true, "ImagePath": "设置.svg", "UseCellForeColor": true - }, - "RulesGuidList": [ - "ab8e1569-c331-4349-bcaa-8a2610c13f2b" - ] + } }, "3,1": { "CellType": { @@ -226,18 +231,23 @@ "Style": 3, "PrimaryColor": "Background 2 0", "SecondaryColor": "Text 2 0", + "CellDefaultValue": "所有", "Items": [ { - "Value": "", + "Value": "所有", "DisplayValue": "所有" }, { - "Value": "仅评论", - "DisplayValue": "仅评论" + "Value": "我发起", + "DisplayValue": "我发起" }, { - "Value": "仅附件", - "DisplayValue": "仅附件" + "Value": "回复我", + "DisplayValue": "回复我" + }, + { + "Value": "有附件", + "DisplayValue": "有附件" } ], "CommandList": [ @@ -255,25 +265,16 @@ } ] }, - "value": "仅评论" + "value": "所有" }, "CommandList": [ { "$type": "Forguncy.Model.QueryCommand, ServerDesignerCommon", "TargetTableName": "任务评论表", - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务评论表", - "ColumnName": "附件", - "GUID": "e03e41e1-da94-4aea-940a-cccea40f5d98" - }, - "Value": "%Null%" - }, - "ID": "ead92b1c9df1498883eaa4adeefb5174" + "ID": "b4fe5c42a1754df69882c3d3543af8bf" } ], - "ID": "a471ca8c-47ae-4b5b-93ef-ed884a6c2534" + "ID": "4dc474d0-705e-462d-a37b-8b0748579971" }, { "Condition": { @@ -286,7 +287,74 @@ } ] }, - "value": "仅附件" + "value": "我发起" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.QueryCommand, ServerDesignerCommon", + "TargetTableName": "任务评论表", + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务评论表", + "ColumnName": "发表人", + "GUID": "7627ec2b-4a80-484d-b93e-e1079f106dce" + }, + "Value": "%CurrentUser.UserName%" + }, + "ID": "8603a74f5cf6488c920bba5ebda469f3" + } + ], + "ID": "a6ed248a-6304-4265-b203-83e834593c31" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='任务-侧栏'!B7" + } + ] + }, + "value": "回复我" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.QueryCommand, ServerDesignerCommon", + "TargetTableName": "任务评论表", + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务评论表", + "ColumnName": "回复对象", + "GUID": "d71041f9-fa51-4cd8-aa04-30f0a0080e8c", + "RelationBinding": { + "RelatedTable": "任务评论表", + "RelatedColumn": "ID", + "DisplayColumn": "发表人" + } + }, + "Value": "%CurrentUser.UserName%" + }, + "ID": "cdaaa3e3c09f4fa1b4db4bc6dbab6241" + } + ], + "ID": "d4e56c3b-95b4-43b5-90f9-e475e516b942" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='任务-侧栏'!B7" + } + ] + }, + "value": "有附件" }, "CommandList": [ { @@ -298,24 +366,14 @@ "ColumnBindingInfo": { "TableName": "任务评论表", "ColumnName": "附件", - "GUID": "e03e41e1-da94-4aea-940a-cccea40f5d98" + "GUID": "fbd77905-6721-43a5-8875-a10da23cc0dd" }, "Value": "%Null%" }, - "ID": "3b696050194144c7a51203d042e4e1cf" + "ID": "66436e5514bd4d689e6efb6c74a942d1" } ], - "ID": "853851a9-0bae-40f3-aed2-9b5b1a335f51" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.QueryCommand, ServerDesignerCommon", - "TargetTableName": "任务评论表", - "ID": "ebac52583bc449c5a4388b99e7f43d75" - } - ], - "ID": "6e016c96-163d-4074-adaa-b11f9bf166d8" + "ID": "57d0ba6e-a440-4b8b-bb4a-faef4317f47f" } ] } @@ -445,6 +503,7 @@ "ColumnName": "创建日期文本" } ], + "NullFormulaValueQueryPolicy": 1, "OrderBySqlCondition": { "OrderByColumns": [ { @@ -461,6 +520,9 @@ "CustomColumns": [] }, "DataSourceListviewName": "图文列表表格2", + "TopCount": 20, + "IsLoadOnDemand": true, + "LoadOnDemandCount": 20, "TemplateKey": "普通_悬浮变白_", "DetailTableSetting": { "$type": "Forguncy.Model.DetailListViewInfo, ServerDesignerCommon", @@ -604,7 +666,7 @@ } } ], - "ID": "e60faf61-6cbd-4e1a-a859-4ea83fdd3b54" + "ID": "8d0c2c4d-a7c7-4552-9d4c-7bb4e0bf2c1f" }, { "CommandList": [ @@ -617,7 +679,7 @@ } } ], - "ID": "265e80ef-73cb-410f-ac41-88592997199a" + "ID": "b374ea81-7e7c-4bc7-b3d3-bc7dcdd0f583" } ] } @@ -700,7 +762,10 @@ "9,7": 5, "9,8": 5, "9,9": 5, - "10,1": 5 + "10,1": 5, + "11,7": 5, + "11,8": 5, + "11,9": 5 }, "SheetStyle": { "FontFamily": 1 @@ -731,23 +796,7 @@ "RowBreakLines": [], "RepeatRangeSettings": [], "ConditionFormatRulesCollection": { - "Rules": [ - { - "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", - "Formula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=OR('任务-侧栏'!项目经理='任务-侧栏'!当前用户,'任务-侧栏'!父任务负责人='任务-侧栏'!当前用户,'任务-侧栏'!执行者='任务-侧栏'!当前用户)" - }, - "GUID": "ab8e1569-c331-4349-bcaa-8a2610c13f2b", - "StyleInfo": { - "Underline": null, - "Strikethrough": null - }, - "IsDisabled": false, - "IsInvisible": false, - "IsReadOnly": false - } - ] + "Rules": [] } }, "PrintInfo": { @@ -764,4 +813,4 @@ "Formula": "'任务-侧栏'!$B$9" } ] -}//3BZ2oIAVgHC4+pXT8fMfsM+8yVlFiCBa+qXR7bo/CrCo3kI+4BAT7llmwGXbJNQXZDnXBZ0z5RRRDrlWJeLZVKS9zsqLuDjjlO/4xlpHhzrRWo5RtPYg2SCENJbh7l1v6gCQn1RH+ygxVpHfOCVytjzwa37DHhL8ma6woxFctiDvtIatsdTqepARY3CCy/KOg0Jx7j6I+IzJAStUwW468GRt7I2oM8qzltVEgjVjvvgT3grm99Ztv5y8lDB8yZRvWITKGv1lX32xvALok1KBWwpjBNs18boOcRPvyeVwg/yUBtg6akjvbd1uhsEtY/hroEcHISJVr5hEdMxsWFFr3hcYH3d0DeZafsTxXNWF1ukIf2uroY0Pjl5238ZsKtk6sVDcfBm2dDwf86yA93gxldE5BGqO+9v0LaA8Y5WpJEOOvmfgYwRIMwIfXOWRU9wIGpoGSlVAKz7jmEHdt706RZjg4KAt5RpyurvV7U0Ez55KgQc+s4dpAT/ZV6xj8rzQWM4fveu9eAdlrUErb+x2wupVtS4UDHeqdApOScxVPxLfzkfhaaSrVpD/O7jSaYHe29ELSjUxvG6gTO9bdd7FlBba/tJ/fv1mx+Y3E4rpvKbC83iFxL81MojFtyVRzvwrfGez1PyyO1Hgj9ZvYr3ICvKfyoBVSbO+nESyyRfbcbQmpFlVFnejDvqFuYe6VhNYHwxfPWjIFo+JJ3cHzCURxqaE4cCOJXgUWmmduVp1SpQq8nJexoKtTvvYfHOq3GiZYEkVW8MY6zXYNiL86UbCYXr2n4d2NIlwghBOW9tWDdvuK8Q0XkVDZAcC51kQg/++hzeSrNVRdxryJnBK16l4atQ0PL1B/KLgmpa099ql6xVu1T1+ljaEc3meKMYl0KB/52CwjafEyvu+mTBUEyDR4w==|920 \ No newline at end of file +}//ujfJqMAoZgk8SDH787PyuRSBuQ9p9Fn+ALj8sfX+3DA4ASVBiRG1S9rLfnkpWbNuG0xjhmage0voTsSnEv3V/3FwfzCm4+43cVPX1IysGEZlrPmWuiEfjONPjZvkZx+LhUpSbppnvfRSz2fIjZY8+e98NkES5Shx9PPHl0LlAsVPe1KxdCCj/ooS/Ku3nXrqes/qIoUMHic2qidWcj18EReJ5TNS7k9uTuepbwcW5tim+cL8OiHqYze2iY7hft488Cd0bJ80YtA5VaQJaxns7yBS77vAQexIsnYHdm3+MFy8clKvMsPguWI8cfz00vhBbVR88xT8583yu09dUb7DskBURAiUmbHqLPx1YLBUwog1TTfcx3RRL4Ivsd/vYiU/5jlKvbUwvWhMtOM2aSmj+QNTduu2M2MRIPjNZG25AEjj/fE9P9PkJAN7Yw5epCEqCKGwbIV+TWy1sTUvFOYLoVEaNR2/zS8r4L0f0CQyYz3Gk9GWvbdNU7/z2LLQzmHBfr0IBCCh4JmVymD6hkMU8XouDqBlFyVeTb6p6PPt0g5IUTvzGKApXAOZbsnQdTqI6Wd4RzZdfFaaMhbs6+yvv9PZVQBj6SSyPMYbG7kXlvf9O1oa+n67I5Yaq8f499z8MbUXGaQQx6gkOt0bEmCLXyQpLrFCKFNuoQ7UP9mqX5DgrRuvhIcWxSXnk7wvLIanxDykJc0IcQ3+uWQ+CqhUtF1e/NbPDpg5DGYdNB9XHcQQfQ/1jrfzM9JtGnvs1OYP1BqJ86FFZgLM1q8OY2ayUE7SjHcle06OjamHnI+s9JsZATJKQvuF/V9YiMrq+pSuz6WvDJEP8SBWXTOD7JYpaKq6cIkrYWCAQS91CxTziUh1QEpkPQFnQ0jxxduNQm2r20vYgYpLbIUyD8ExMyMGjA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-侧栏.rd b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-侧栏.rd index 86f70f0f..b3de7a4c 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-侧栏.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-侧栏.rd @@ -1,7 +1,7 @@ { "PageType": 0, "ColumnCount": 11, - "RowCount": 11, + "RowCount": 12, "Formulas": { "1,1": "\"参与者（\"&参与人数&\"）\"" }, diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json index f3baf0b4..980d2837 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json @@ -153,12 +153,14 @@ }, "18": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 39.0 + "DesignLengthInPixel": 39.0, + "IsHidden": true } }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 39.0 + "DesignLengthInPixel": 39.0, + "IsHidden": true } }, "20": { @@ -170,10 +172,16 @@ }, "MaxLength": { "Value": 1.0 - } + }, + "IsHidden": true } } }, + "InLogicalVisibleIndexes": [ + 18, + 19, + 20 + ], "Count": 22, "DefaultSize": 32.0 }, @@ -297,7 +305,7 @@ ] } ], - "ID": "abbee7c9-2f21-429e-9226-4aa228a1417a" + "ID": "71b6d37e-f897-46b0-b6f9-bbe2941b6c34" } ] } @@ -436,7 +444,7 @@ } } ], - "ID": "714ee0b8-ebf3-4885-918f-8b7e735d9b04" + "ID": "84141b5a-d7a3-4cfe-ba99-785801036d9c" }, { "CommandList": [ @@ -451,12 +459,12 @@ "BtnText": "知道了" } ], - "ID": "c28c21c7-7912-4bf1-adbd-c311d8027b9b" + "ID": "a8883b34-ae55-4ee6-9160-483af9b50d9d" } ] } ], - "ID": "3ae52d0b-4f17-4c59-a8fb-3a4c5fc64031" + "ID": "e15049e0-d9bf-490a-8ea8-f048ea176b20" } ] } @@ -469,7 +477,7 @@ } ], "Comments": "小于进行中", - "ID": "cd8e04f6-e102-4c25-b5e7-8a0f38c177da" + "ID": "e57f3250-8603-4b4a-aa00-27846f9c51b8" }, { "CommandList": [ @@ -479,7 +487,7 @@ "Message": "任务尚未审批完成，不可修改状态" } ], - "ID": "51d4ee99-8f4d-42cf-a1ae-d939f622210b" + "ID": "f2041ac2-c3da-47ec-a5f5-70d1aeeecf6a" } ] } @@ -578,7 +586,7 @@ ] } ], - "ID": "a37cb7fc-0b0a-4a25-a991-f27d59a9cec5" + "ID": "f9288020-f0fe-4d79-a9b4-f558bc206dac" } ] } @@ -758,7 +766,7 @@ ] } ], - "ID": "a6831e51-dd57-4dab-a3b2-90f781eea955" + "ID": "8e17ca22-e1b9-45a3-8130-00c4893e14ab" } ] } @@ -1052,7 +1060,7 @@ "BtnText": "知道了" } ], - "ID": "4daf1b12-ff8d-4bb0-8006-327935d86a06" + "ID": "eab6d269-4bf9-4c24-ab4f-373eab5b63e4" } ] }, @@ -1066,7 +1074,7 @@ "Title": "计算中" } ], - "ID": "545d2d79-aa6c-4183-b941-08e5c9b76c45" + "ID": "553c5cb9-fb23-4e12-afad-a590608a9fbe" }, { "CommandList": [ @@ -1081,12 +1089,12 @@ "BtnText": "知道了" } ], - "ID": "93ee37f3-2d7f-49da-a917-9aff05e12478" + "ID": "166d1c2b-b56d-48fb-bc32-950013c5023c" } ] } ], - "ID": "7188a6bf-5f4a-4e9e-baf5-04782685bc90" + "ID": "0321c36e-9758-476c-a326-3dee7d0080d0" }, { "CommandList": [ @@ -1122,12 +1130,12 @@ ] } ], - "ID": "291ee7e4-d2e4-4f97-849a-b04d1955b0f4" + "ID": "fd1845c8-8b93-43d4-b959-0b9524be8fc1" } ] } ], - "ID": "5c81f989-322c-4dd6-8edf-b22cf4bfe931" + "ID": "47dae6fc-e5ea-4caa-82b5-44d3546ce6cb" }, { "CommandList": [ @@ -1137,12 +1145,12 @@ "Message": "本项目已设置为“不分配”工时模式，无法修改！" } ], - "ID": "a26662c3-d3d8-4104-8c07-477ec1b38184" + "ID": "31e6f8f8-f8c5-4b57-9949-b56103883b75" } ] } ], - "ID": "1942b19c-a7d4-4b50-9399-25376dc7e7be" + "ID": "918b0230-4a3a-429f-8b9e-40bb817662cf" } ] } @@ -1252,7 +1260,7 @@ ] } ], - "ID": "465011f0-92df-46ab-a5ff-88e2679c9ef1" + "ID": "df10692a-4168-4f91-bc70-672cfb582636" } ] } @@ -1406,7 +1414,7 @@ ] } ], - "ID": "3364ee29-265e-47e1-a9d3-bb74cd70d482" + "ID": "62d155c6-1f43-4351-b5f7-4cf5a60bdd88" } ] } @@ -1570,7 +1578,7 @@ ] } ], - "ID": "44ea51f7-8139-4dad-97fb-d47fc588b8cc" + "ID": "f0aeaaa2-82aa-4fff-a980-13f712a3be2e" } ] } @@ -1678,7 +1686,7 @@ ] } ], - "ID": "79a40cc0-e647-4cf4-a1da-33ece42c8498" + "ID": "5caefcba-7658-4ed2-be4b-2f5fe9576dbb" } ] } @@ -2056,7 +2064,63 @@ } } ], - "ID": "262e48e6-bab0-433c-8c6f-01b2cbd510b8" + "ID": "93ebcbc5-21aa-4dc5-8106-414caa32b571" + } + ] + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "3a1a51ea-a584-4f3e-a52c-ff7d0103eb63", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "工时分配方式" + } + } + }, + "value": "4" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!S:U" + }, + "Value": false + } + ] + } + ], + "ID": "a378d0e9-4f46-4d77-8405-060dce955db4" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!S:U" + }, + "Value": true + } + ] + } + ], + "ID": "29a212ee-62dc-40a5-b76d-fce5bfabb53e" } ] } @@ -2275,4 +2339,4 @@ "Formula": "'任务-基本信息'!$C$8" } ] -}//qiHaT9qX1Lru3WmBFow0YT9/SvLKAuNBISVpxYwPe+4vMySx7OIN/FoYzrO/85jFCe5NF4JyqMoftZNuEqlGS/8qpLcL/r4oI61LxvMN/1M93GoBkvcZS5xt5m578A8Um5xXydQgAhUTocJoPOJZe8y1mZ/p3u7pb7dhEwvTfyeJLRZAvoD3fJlD63jJmtw7Wn3X3VfpKgDH5CEheCoIXFQASM/3Sylx/7dSXqlrmOF1dCQOdVcXEr28IQzc3w2Vmx8ZIt1ybyYzFwE2SOZf+dKY+HnIY0K+TnQ2QQeM38gPZyaySfJ7fWLs6raNxFsvxkGO9GUkSIdkcBIyjKzY1cC9sPieTOG5JLm3qOu8Ia/YAkVlLQ1IroPQTUz3dLMolhWawT38pdsgqY53xYgApoRtypHZ/tNz6ZdJEnKJj3OzmvOXQPeVR0c5hG8MnIdeFbOlf073LSSIWKfw6R0hpPRtJJhx64lmlV0nKizx5jFBDfjCyCEAAdNUD2FvtMWB4BFAYuRIH9mU0LtI0XkTdculttj2MpTxGsUuR8e8VS8WMGyVH13QCHjqZ/xpk0MaLxN9GdlpU2vA3NojJN2c9NMVfqD32RlBofWuXScdGR7qK+FaGYmmocxYCQSh1FO9JATJBm0skIF6Qv3IcxfMN1Tito1j3hlbQjiqMm96ZNQ0t0OxHCu+3JvrMnPc0GEMJFA/64QXL9eLHNUc4Z67sRU/6Ofgt9Oi281mgG5XV1m8WagtYkf/p68mIWVslsZHnQ0hBCZKz2C+fwGI8s08IX07DjzBAKpcnEb5mHOLE/vJ6a9v/aZYaC1NTxS8xAIAVPp+9H1UkgoFYj4z0mTLyPBPhNctJzC7bKmuuig/vw2gUrREqmEnkxKXI+FHS7ISHjQZl2Dls8PlNN8XuBPuMA==|920 \ No newline at end of file +}//YIlooN/HdpYyvj/JXiqb0aXQYarh6aOH9vxCUVQx2gDQV7Q5InIVvBdzv4ACHgjQSOxkaqIpfm3bt3TqlUUYXx2TlVGW8+vfWEOvMgbZZkpq9RHYkr+4UBcUotlMV8rdOqaswblCXQlasnHqvss3C0IY7JNS6eIbRxfNenB0vj8rmdo6YHD7IiqGtTwqZoW9c4kuRWc4M8VUr4E2JV2QxUcFiVBxsGRNIr9WuIiEMbL0DwMONFuR1aX6PVVa68uya+joHiU6EFNPmLf2p4NQf280kHx3cgabHSTyEFE09Xnwl4tZ7QaPmVrPxd8RnsjaFtqztlX9h8Oe/a5gYZZLTiQ4G2g1kI2N0I1RaC4OFQHfmZnKPjmYLWmaJpbci8frzs5AUQpW08tsR0h9CJRWyI3WRFNmeNFMlwJOz2PleOZ6cc3J2VWs8Cj0mr1r9XMZyPMIjZ3pffu59AXigT1FomvZl4R+V4iWSIm923tzAwYdnDyF8VIp8piO4iqNp5NCuOUM5tEpKjXt7yQbp2PWbKYRHawW6F58bdKQEoeoWy7JTSJRZ6oINWeqA244f6Ch5DUuiWK4mpEeXN6uaMXBvnEwLr4585h5gX1eYXWzQpNNAbtF5qe5B6ZbLavqISXpkHwqqnEqe8526d5iJteHINipGNmc2aifaRdrv5th51wX6XfSVmPBNEE+talzyyWDVmoMwmFj8ueMGrpU2z/8ykMwYViclMXMb/scrHiQ8qXOd/Qd2YWqfOeD3CQO9l4q0dLukn902AqNRJFZim7/NhUcqPmb75UDMXBmpK/vpdBqtdVthxwUij1Fj2u1P83kmnv59JGoTHqGr/11w0nyIsnBKjlDbvbqKIEbcwic+XijBezZSEXpPiTrp4v7mz93Uy+K9bw5iR7OsH+1fI00jg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务成员/参与成员管理.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务成员/参与成员管理.json index 3fdf20a5..eb2a7b40 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务成员/参与成员管理.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务成员/参与成员管理.json @@ -33,15 +33,22 @@ }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "IsHidden": true + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 } } }, "InLogicalVisibleIndexes": [ - 6 + 1, + 2, + 6, + 7 ], - "Count": 7, + "Count": 8, "DefaultSize": 24.0 }, "Cols": { @@ -123,7 +130,8 @@ "Values": { "1,16": "添加成员", "3,2": "成员", - "3,16": "时薪" + "3,16": "时薪", + "7,1": "%CurrentUser.UserName%" }, "AttachInfos": { "1,1": { @@ -370,7 +378,7 @@ "Message": "添加成员成功" } ], - "ID": "3a878b4e-0173-4171-bc50-4472b9aa1470" + "ID": "b00d0c65-9c47-4485-b8b0-34a384238459" }, { "CommandList": [ @@ -383,12 +391,12 @@ } } ], - "ID": "8cf4071e-8dda-41b8-abde-e59598d8d80b" + "ID": "c2a7061b-f7ec-4ccb-baae-eeeac0e7ce5e" } ] } ], - "ID": "363803fb-c835-4aeb-8471-4e134e6f8723" + "ID": "1b78caf6-3fdd-4596-adef-30561fb284de" }, { "CommandList": [ @@ -407,7 +415,7 @@ "MethodName": "Focus" } ], - "ID": "59a4d0d7-606a-4b30-815c-53e075dc5f81" + "ID": "7f61cd7a-52e5-46d0-8c3c-254e44d08afe" } ] } @@ -486,7 +494,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "830e5eb7-d2b8-4e37-882d-49afe809904b" + "ID": "b23f50c8-e10b-49e5-8185-ade6c00e26c9" }, { "CommandList": [ @@ -496,7 +504,7 @@ "Message": "未找到该项目成员资料" } ], - "ID": "617c9ea0-6ad7-4a2f-a9d9-19517eb95e64" + "ID": "d17f3127-f261-4746-ae57-175a875aa959" } ] } @@ -598,24 +606,71 @@ }, "6,1": { "BindingInfo": { - "TableName": "任务平行视图", + "TableName": "任务表", "ColumnName": "ID", - "GUID": "c2f63c91-4b45-4133-9350-0149f561944c" + "GUID": "ab5a638c-c5f8-4332-bb5c-b43065a48d60" } }, "6,4": { "BindingInfo": { - "TableName": "任务平行视图", + "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "1c206115-b50c-4a3c-8623-4b98739ae38d" + "GUID": "d3800191-8608-425d-9517-5fc243e39d33" + }, + "CellType": { + "$type": "Forguncy.TextCellType, ServerDesignerCommon", + "SavedValidators": [ + { + "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" + } + ], + "TemplateKey": "_RS_NewLittleRoundCorner" } }, "6,7": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "fa549877-b621-464b-9844-8ddac2e65ffc", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目经理" + } + } + }, + "6,10": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务负责人", + "GUID": "2aad8869-524f-4dbe-9736-67d2ad6ad192" + } + }, + "6,13": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "父任务ID", + "GUID": "d4ac1a34-7aa7-417a-81b8-4f17df5effbd", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "任务负责人" + } + } + }, + "6,15": { "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务成员", "GUID": "67d24efe-51a5-489b-8ffd-c5c054acadf1" } + }, + "7,4": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "aeef7d10-6ab1-4289-97ff-fd4b6cd9b99b" + } } }, "StyleDatas": { @@ -652,7 +707,11 @@ "HorizontalAlignment": 4 }, { - "FontSize": -1.0 + "Background": 5, + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 6, + "HorizontalAlignment": 4 } ], "Types": { @@ -662,7 +721,8 @@ "Bold", "Text 1 50", "Center", - "#FFFFFF00" + "#FFFFFF00", + "@" ] }, "CellStyles": { @@ -674,11 +734,17 @@ "3,17": 1, "4,1": 4, "6,1": 5, - "6,4": 5, - "6,12": 6, - "6,13": 6, - "6,14": 6, - "6,15": 6 + "6,4": 6, + "6,15": 1, + "6,16": 1, + "6,17": 1, + "6,18": 1, + "7,1": 5, + "7,4": 5, + "7,15": 1, + "7,16": 1, + "7,17": 1, + "7,18": 1 }, "SheetStyle": { "FontFamily": 0, @@ -691,19 +757,121 @@ "1,1,1,14", "1,16,1,3", "3,16,1,2", + "6,1,1,3", + "6,15,1,4", + "6,7,1,3", + "6,10,1,3", + "6,13,1,2", + "7,1,1,3", "6,4,1,3", - "6,7,1,4", - "6,1,1,3" + "7,4,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "Title": "参与成员", "PageLoadedCommandList": [ { - "$type": "CloseCommand.CloseCommand, CloseCommand", - "PassValueBack": true, - "ReloadData": true, - "PassQueryCondition": true + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "任务负责人", + "GUID": "dee7f9ad-8482-4307-aa5a-9adc66e5a60b" + } + }, + "value": "%CurrentUser.UserName%" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "父任务ID", + "GUID": "3c5d8a32-b30e-4d93-a658-13050ff48ba5", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "任务负责人" + } + } + }, + "value": "%CurrentUser.UserName%" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "f6e47bf0-c2d3-4f51-8e7a-ce132ffd58a8", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目经理" + } + } + }, + "value": "%CurrentUser.UserName%" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon", + "currentUserProperty": { + "UserProperty": "角色", + "PropertyType": 3 + } + }, + "value": "Administrator", + "compareType": 10 + } + ], + "RelationType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与成员管理!2:3" + }, + "Value": true + } + ] + } + ], + "ID": "560d5f2f-6aa1-4d74-9d6e-6fe036f4d3d4" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与成员管理!2:3" + }, + "Value": false + } + ] + } + ], + "ID": "8ece2feb-7282-43f8-ab44-6e80ae886a7b" + } + ] } ], "PermissionData": { @@ -722,7 +890,7 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], - "RelatedDataTableName": "任务平行视图" + "RelatedDataTableName": "项目表" }, "PrintInfo": { "PaperSize": {}, @@ -739,7 +907,23 @@ }, { "Name": "任务成员列表", + "Formula": "参与成员管理!$P$7" + }, + { + "Name": "项目经理", "Formula": "参与成员管理!$H$7" + }, + { + "Name": "项目负责人", + "Formula": "参与成员管理!$K$7" + }, + { + "Name": "父任务负责人", + "Formula": "参与成员管理!$N$7" + }, + { + "Name": "当前用户", + "Formula": "参与成员管理!$B$8" } ] -}//RA8CK7ROa9Z4BpFn8ZaN32jhRArU5O6ejReSlj/+fsXB1uM2jMG+HMoauJbpAtV7rcACwf0ukWqBJmRbq/N9fJ7ZvclQHV59WzJ9Wm0aI8P8rm5yNpZW/cPh2L16EB9ktdC+hTdg9rLaRMdL6R+AvvVcS0pSaEFVdZb2rL7T0KxzfUxNDOSD9IU6IXkoQX+sHrZKMFTL6WAdRA0yBkiye0t2nitD8XAp6jl2i+dxf5mVtg/DwgzRz2+GkTxK53cvsXhhtClrXjIGYjh/1jAVneyP3QVm5bajsGZ7geJDbshm6OqbYZaU9fHoK7//f5DW1LInskWRywh5Ay7UtKDLKvez7Q6QXldTQRlHRz05NRpKuOcC/GqsBcVgPYdeTrVlCGSqj33Jd36W2MY7dPu2qOV2guQPjxMJBBvwhPP075JofxQAKnx0jzSjBmlPuBb/yQ0j4aIm+RZMnM2rXGUVaG1QV2Y8hGaJ7C89q2k9A9NGk6IxJcUCU1kOw4mep+18d5gEfGNKNVa9zX7XfqDhFQNphE1lX9zHCUmLDJfp3q6CfHY4VySnIeEo27nNMw/ekUcnGe/rcakhyH6pQHzjuxvJXNXuwbEWKpFEhZhdsDic/xjeymXAwdCu16Y6jcadz9bgFkI/RN7Hw74ISvrKlYApg6vKqJDBYh8zK0JVT905Z/XcLXU+n1L6nfx14u7TaT3cPOyVCXcXG0DsI/5BXznqWiEM9DCGIdTVO1Y/3eNbI6sBSYKxCczymlGhApK69qaDBGba6XNvS0CiYF65gNiAKaQ+9pP7T6LVnwMdiWicBT0OWPwNjAkEg0o1L3mS+isi5B1nfhTzHOiNAfGI31Z58EBVsA0/G/aIxqwO//prdFKy2FpPdbjl5PlkhLgiR9lyVRu/FrORiUQOc8tlLw==|920 \ No newline at end of file +}//PqhtJFMG66TV1hDV2WUKRbnL0JOFTuVZNV6mI6AWbN5MUdUTGP3eDSsg8PFW7w2tO8Z6g8eQ4TpzxeTZMnwZoGRDlyckjTDh0ysK/xKIH0Bop2oRD0WaLZ2Wa6BRfH8pfone60R5I+D25/yJtMNjcspeiYAfuuDknYs94cqDTv/9DzzU9Loo7ZBQR+SgqSKnrbC6UCbKc27DMpkLvMDg8y2vHmTxOhTEPkLSUfQNLCX0rSCu2L3IafBWgBX9rKMjwQyXldWKz7r3sY983tB7kAqLIgPjZR5Xnc8kr3mhVZs3cDRptWW3Qk1G7WrwkgNT1okrasEYic3LFgJR6rFYzRkULeBergV5HHNfMEpoLbFRmtAhKrisvlT8L4cCVZvu9fmlC4MRSi1sglUcEB9tnXV4mQDQuYDNkjwjwDYQediEEnaQDr5BFdB5KXYYUXBuiTsV1mCo7rHh7RYlFTvL5VE7q/gs7yTZJx+jrhGjeSoNYOTpBsUBS7Ay6NmSNKEm/xDgLhKojFuVJkyQaRErooiuYxX+6CKYSYA84T0cOMfiK/4+MN7kPXahhq9eIxD63rrZ7Rflvt/cvBawrFTCjxdsY0OaaeoEWklLuoExvCU6K0yCPOCo0pBkHU5xtIByfffi49m2OHX25HArYvYQBOvzSHGwg4t6DL3Q570c63rotkT/W6ZyNfgAMSu2HOZSohshyIWaAZoZtez/SsnT6QG9Vt95VpNnEva4cMc9KLyyaCogkU0HsVCODHP6nRRN3Jal1B45bhKz/9XBoji4UlfO+mlNJxWcs5jGHLmgjmPjsNtZe3byXy0+tHRJXp4rrx7oN7tGq5ATDjgru4v9A7O0ozif2rbKsINm4coQ7m+VhwTZGurQhPNqN5ckPiYSWdxsZGcEQCMwc3gnqh/S5w==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务成员/参与成员管理.rd b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务成员/参与成员管理.rd index cc96792d..0530927e 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务成员/参与成员管理.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务成员/参与成员管理.rd @@ -1,7 +1,7 @@ { "PageType": 0, "ColumnCount": 20, - "RowCount": 7, + "RowCount": 8, "CustomNames": [ { "Name": "任务ID", @@ -13,7 +13,23 @@ }, { "Name": "任务成员列表", + "Formula": "参与成员管理!$P$7" + }, + { + "Name": "项目经理", "Formula": "参与成员管理!$H$7" + }, + { + "Name": "项目负责人", + "Formula": "参与成员管理!$K$7" + }, + { + "Name": "父任务负责人", + "Formula": "参与成员管理!$N$7" + }, + { + "Name": "当前用户", + "Formula": "参与成员管理!$B$8" } ] } \ No newline at end of file diff --git a/Plugin/Lottie动画插图-10_0_2_0.zip b/Plugin/Lottie动画插图-10_0_2_0.zip index bfcb0094..782fd598 100644 Binary files a/Plugin/Lottie动画插图-10_0_2_0.zip and b/Plugin/Lottie动画插图-10_0_2_0.zip differ diff --git a/Plugin/Unlayer-9_0_103_0.zip b/Plugin/Unlayer-9_0_103_0.zip index 445336da..20e37a86 100644 Binary files a/Plugin/Unlayer-9_0_103_0.zip and b/Plugin/Unlayer-9_0_103_0.zip differ diff --git a/Upload/87a01e25-1dc0-4ebe-b4fc-e8290dd2931a_Snipaste_2024-03-07_10-50-50.png b/Upload/87a01e25-1dc0-4ebe-b4fc-e8290dd2931a_Snipaste_2024-03-07_10-50-50.png new file mode 100644 index 00000000..36a5806e Binary files /dev/null and b/Upload/87a01e25-1dc0-4ebe-b4fc-e8290dd2931a_Snipaste_2024-03-07_10-50-50.png differ diff --git a/Upload/87a01e25-1dc0-4ebe-b4fc-e8290dd2931a_Snipaste_2024-03-07_10-50-50.small.png b/Upload/87a01e25-1dc0-4ebe-b4fc-e8290dd2931a_Snipaste_2024-03-07_10-50-50.small.png new file mode 100644 index 00000000..a9183a26 Binary files /dev/null and b/Upload/87a01e25-1dc0-4ebe-b4fc-e8290dd2931a_Snipaste_2024-03-07_10-50-50.small.png differ diff --git a/UserControlPages/任务统计信息.json b/UserControlPages/任务统计信息.json index c71ebb88..0a88abf5 100644 --- a/UserControlPages/任务统计信息.json +++ b/UserControlPages/任务统计信息.json @@ -941,7 +941,7 @@ ] } ], - "ID": "c007fc7d-8e7d-4fe3-8eb4-14e55618aadb" + "ID": "ded5f71b-f35d-48bd-9e60-0ce601c17355" }, { "CommandList": [ @@ -965,7 +965,7 @@ ] } ], - "ID": "80b774f6-2705-4fed-9b84-ddd89d7b8999" + "ID": "942f77af-2ca7-4167-8214-127b54cc23d7" } ], "Disabled": true @@ -1010,7 +1010,7 @@ ] } ], - "ID": "cbef6c4c-c764-4b11-bcf6-3f1f7147b52f" + "ID": "6caa074a-3c7f-426a-ae8c-0b86a6f3f11a" }, { "CommandList": [ @@ -1034,7 +1034,7 @@ ] } ], - "ID": "a3530d6a-5b7a-4ad4-bd58-df9b271bab38" + "ID": "0951e30d-0f1b-4e0a-8a8c-30ccac1364cc" } ], "Disabled": true @@ -1236,4 +1236,4 @@ "BoxShadowString": "1 6 0 14 #06000000" } ] -}//bKRKr8aeIRJS5y206BkuHbb9apE4M6FiBUIBSbT08hv1gLNjmEsakTvHvCI3YVBty7PqVZJrsFOUZNlfxF2GdI0cqVtmDRpXpEVUdGo/wqc4hZYzpkUflBgpw0Y4NqKrleYvBQDXZ4ZuZZypJg+kiIZW8NCFuQEwGT7BfGXNVWfdpPJxbpDpWml2KhuTtvXk156sSL632OavaHXdBhMzhs8sl9p3+91IbxiMv4NcglZtd38U1khvhceOCrmnSdMp+gUfU6WYTAFdNK96WfayOQBsbUPJai8X1AoSWtnIcBEApSoHydm/BRYqfQ6b2YoAnSFSPVnwFA62j9NJUuXWgeL14cjnLmkbsWe7cdJCk0Ob1WvD8DBjl0/owJyWur6NxG3NpsfmrbH9JS1Y2idYWCaI6M5zG1lv5IM7qvSRUGrdMJoygOEaMBNbCM32CUrXKcRxAndcFbFWCohqOZ7cYOgKQ0jkwazZelMGzXghQeI+NdW0OM4Ej9OVJJ+dsym6L1Nl9yZnjdf0lykWQD6dzoWlSqfpVxM0qn+8JpsndUsi4VU4UAhBzcxjj41vGO2Kg7FcpUKWCpWzRHh72rIG104WhIbJwu/pcTXBnE0Ftggrz7t2t+YB1V0fcElww6UtMnyOtNpywiWWGHOYvHjGJFbD4bbNp8pz17+R3eylE0Bg0AXUqa2NPZ74sulitXHr+XBJgsBgdX25S4TnCMD0ZmwhhPcmQF0eP/4bCEoeXY3p6/tmON1eb21JZwYNbreOEwSVKIF+aTbQ/VMIaXdQSxSfoCzzBF/9BDdvTDnUCjosIXplAjBD2DnBszr4ziCTsAH/VSNK0E0MHzox0J4kW9maeCNcBwbE61f3+hpQh7s8UOccedwCNHotKBh/IdP2B3ImeXkUwpVqDw4XpVBgjw==|920 \ No newline at end of file +}//TgFh3zW+CMBOuo7XxjZK6h8AH0K6LNjhGslXw9VMbq0V8KjASrIwn4X+BbbUaTS0oCqUV771tJEAgwtOiisro/kT/ZGBMZHy6pdo7TCT6wzGiHLmPJPyYmFR0YT8oMGpspMBm2jlDZ3v2WTMNdF/YHylDei1uX/P1Tw+uSNDz69l8ofV0zKSGJ9kPa+ywrL+Tnp1pcT+0XYqraA5+UsRJ9MvPfXvG+cUCizaFVzx1rhwndtQzmj2ewurPtstHklAAqMvo2KUbAnUXBbkZ98Lncf/5snL3ozuMa02RFyCrCv3xxzmqU3j8wMJEJgrOYbzo2alLnPjHA5xlrBm5m7wxEUvanB8JpmaEaiJhHqIkI6KuxFmWvZa8wGsnjESMZxNyqUDxNJTJhFm6A3+lCyP8H0QSpF51qbjBYUQFFIsbhiEraymTNCnGGAf9lmlzzduQCQUTDlpmPxiLvJHvweJCX4Fa/o3ZYJifFOo6c92jDyi+NZfCOHj3nU7/DDIinoIqQyfe5xkgyrdIoR1JgInAMMimkOQ8qGYFJth2Wgg7J38FfZxNGuDQ3a5Ro5GMCLW5QZn8ajKHb20yDL6yYJGoFzaEH6kDAV9KvtSIWNRuvrZxffdwcbmsXAa7T2bjuHxUOBlr+qXGu42ihGD/FuHAkZKLS98x8DQKSOZEvX6UzNdg634vhE9AMWoey3cPPqwc16rmp+eJBBGYnoUzEtrZ+ycvFcRUpRh+xgAxRUZKq6wMAKnCv4UmZGpjka9L3dVEnGCecSZMUGNqUYly1DovY+cbCPCve9Kuf9Q7k1Clbk6PHmBvNUQ98FNyf2t5a+rFAkaX4JU2uTjF3VFb4iIVLL41WGSH+qC9xFqk+VuqTjLbJFqUMq5hzp7S47iijdgfDXtTzEAs5k9UJKC7c3A0w==|920 \ No newline at end of file diff --git a/UserControlPages/评论组件.json b/UserControlPages/评论组件.json index d13dfea6..6416d171 100644 --- a/UserControlPages/评论组件.json +++ b/UserControlPages/评论组件.json @@ -112,6 +112,7 @@ "1,2": "用户名", "1,4": "刚刚", "3,2": "xxxxxxxxxxx", + "6,3": "删除", "6,6": "回复" }, "AttachInfos": { @@ -173,7 +174,8 @@ }, "5,2": { "CellType": { - "$type": "FilePreviewer.FilePreviewer, FilePreviewer", + "$type": "ElementUI.UploadCellType, ElementUI", + "CommandList": [], "UIPermissions": [ { "Scope": 2, @@ -194,24 +196,31 @@ ] } ], - "UploadLimit": {}, - "Folder": "%CurrentUser%", - "KKFileViewExtensions": "(doc|docx|xls|xlsx|ppt|pptx)", - "LayoutMode": 5, - "CustomWidth": 40, - "CustomHeight": 40, - "IsHiddenFileName": true, - "IsHiddenToolbar": true, - "CustomUploadIcon": { - "Name": "Application/105_upload_5.svg", - "BuiltIn": true, - "Color": "Background 2 -10" - }, - "Readonly": true + "accept": ".jpg, .jpeg, .png,.gif", + "listType": 2, + "buttonText": "点击上传", + "tipText": "暂无文件", + "multiple": false, + "ReadOnly": true }, "TemplateCellSource": "附件" }, + "6,3": { + "CssName": "hover-btn", + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.CallUserControlPageCommand, ServerDesignerCommon", + "CommandName": "点击删除" + } + ], + "Text": "删除", + "TemplateKey": "Gost" + } + }, "6,6": { + "CssName": "hover-btn", "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -275,8 +284,19 @@ "WordWrap": true }, { + "FontFamily": 7, "FontSize": 12.0, - "HorizontalAlignment": 7, + "Foreground": 8, + "HorizontalAlignment": 9, + "WordWrap": true + }, + { + "FontFamily": 7 + }, + { + "FontSize": 12.0, + "Foreground": 5, + "HorizontalAlignment": 9, "WordWrap": true } ], @@ -289,8 +309,9 @@ "Right", "Text 1 50", "Top", - "Center", - "Body" + "Body", + "Accent 4 40", + "Center" ] }, "CellStyles": { @@ -310,20 +331,21 @@ "4,8": 3, "5,2": 3, "6,2": 3, - "6,3": 3, - "6,4": 3, - "6,5": 3, - "6,6": 4 + "6,3": 4, + "6,4": 5, + "6,5": 5, + "6,6": 6 }, "SheetStyle": { - "FontFamily": 8 + "FontFamily": 7 } }, "Spans": [ "3,2,1,7", "1,4,1,5", "6,6,1,3", - "5,2,1,7" + "5,2,1,7", + "6,3,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon", @@ -366,6 +388,9 @@ "Name": "用户名" } ] + }, + { + "Name": "点击删除" } ], "MethodDefinitions": [], @@ -421,7 +446,7 @@ ] } ], - "ID": "7427745f-52a6-4128-a365-db874bb0a177" + "ID": "a438c066-0fb5-48c1-8a26-d3a78e7b3374" } ] } @@ -437,4 +462,4 @@ "PaperSize": {}, "Margin": {} } -}//lwNZ2I/bU5uyG9mlWZOadvIDpik/gx8JhZS5M6ZhYvjrqHgoTg87+XWpuaNeI992ohjLznZPb1ka2+G6FOvPafzBwsJ9ZChxFVUlawBfEkgYyHiY7gLwAm6f9LUBduXsgqhzJePRyA/wJYuilhDfVN3JaI72OCCJcKYgHt+ELY1JIwLPpJmROioxgreIHLUSRiVVt8VnRfEGzQSr2Q9yP06bHJ/7oiPZjIJWulg/4mh94o/5HG7p87UMepHcNtyBugfIVpHSQC0/r6AS5Sc9m2TrkdowL1u9I+TE+3sWvc7y9Kk3+NuYqAg/GE5W+Lv784FqJlpTeqZj3Huh3TMCJtQeHdgyyIzekM7lLK4phnAaLz3Oh/qYoU1RfumLTQfKp+li0jxZLkrr9S2aEhZN1n5lMPnUvcz7AlopE9CAYsQEkWE1tuhSqykrUP3M2kKNFp140rH/mEg840KSggTULZkrmAhEZ6MNs9w0dNBIkFahSxwAsraFxzdfIEAOQe0n5VGMld6dkByaBdhE2YiBblqPFC8Qo7bBWgOyHBgItDgsj7cmd+cPnFMWwE1WQebVIK74592dbCKS3PZ3qLxta23YijfxQae5uiXFUfrsFR/v8uhLyvlJ0to3y2JCElyzhxZ6vVFtGvzOJNA2+06FCcEXjAYf6zbdvoh08+fOFz5MchqPA8xwT30NmMSrlZKjRhSMHcyUfwcXx65ikSrB64BgS9qH2q1RR83uO1vafrvYeizBfwNNk9EqYmHQxN+s6qBjlHtOO66wuI+mSxKOlAB5EzapIpCu6mNRQPa3YuZWcz9o/GiPzX6qblVNSqbs+H8HxZlZLMCvB2f7+0kfStfJhDm62//WWFToAV0N1LNd1cjfyjC3C1ldERTrPZiU2d7X/8+l482akCB/BhwiZA==|920 \ No newline at end of file +}//ZNAq+wbyn4hHhRvivtfggNbry4RhmkytkJOwBz7j/+Ty/Zh0F9IiTwSfi6wvHjSO/lmQo0C7w1A5hpfghkiUiGzsjXtd0kmmuSGMXhqqkbyNYTreB0CK1KGRmobF+KJ0Bn8G+IhNDl/M24e2kZ/wyetSWyUVgvPWH5Bt9bGqS5LEMgpXTRdwbBVXD8NXsxMIGAcH/PGiac1wDZV2Akat702W8paFCNr5fLA4u5QvXPw3u63Z8wN1dcSPw+P3atZwlDJ2Lbrb+Bnn1j7DQoykPnb3FeoxsXgmff3p9BCaq29SXmCwHROzOJC9W9I/366DjP9yYSqHBs36D+M44yxnx/9xmGFMxd8oEAqFVV9Tte/L8oxcVZ8E4orWvCblISa8eUXu4i716hTs4cFPgwzrtyZyJQuo9SaOh9DY0zc3yULgjU5VDioBnpG9o3RAbdb3YpLBGU8uleRq42G7ZQGvYPZa2dLMIY4KeHkFcuXDgja9JGVX+ickuqLcbeJARWBzzhqa6+bW/ENZCYP3qT0pEP3gr9Ey9OOdjcH5tl8Jh6qgLYlcxVZCwWnSKXzLqcUyzzy3SvOKjIGLkzc1MR+ggBuNOz/4NS4/UhECtdkLdVVJla88PHYnVcmVYlhZY4bgxsq2R9XWMUzs3Wwe1CdLBkaO80Zv83goWUmU6KcXtqQA47aUHbiYdbmtPZIS5TAj9ex+0k67q76V2IO64Nk+/liYrETQ3pSgw0zFmG1AaPT5r6VwOaa/E7b28mmVaTGkbAhWTZp6fGzMYg+P9aXSpyL4JekeccwzQCLatW84eGUHyKUhjvOLd62ytu7lhHE3ESEv+iNmRcjKNHxFU33gVYDA4e11bokqq4fsylG4kfWNQmXXfzZJJPAow+n2GtM1CpIPQUoJt1ORxRa0dbCUPg==|920 \ No newline at end of file