diff --git a/.collaboration b/.collaboration index ab552181..fda22ea5 100644 --- a/.collaboration +++ b/.collaboration @@ -538,19 +538,7 @@ }, { "ModuleName": "PCPage/任务-子任务列表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-12T09:17:52.5237097+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-子任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-子任务列表.rd", - "Pages\\558ca610fafc4ffd8884b819161bfd6.json", - "Pages\\558ca610fafc4ffd8884b819161bfd6.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/工时详情-列头", @@ -586,17 +574,7 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-12T09:19:54.6458005+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务首页", @@ -2404,16 +2382,7 @@ }, { "ModuleName": "ServerCommand/创建项目审批待办", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-12T10:54:10.7919281+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\创建项目审批待办.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/删除钉钉待办", diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json index 4723e88f..332f7a50 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json @@ -305,7 +305,7 @@ ] } ], - "ID": "c0eb5dc8-e319-4597-b8f3-572b7e53a882" + "ID": "abe726ed-e279-4374-8203-668fb2269777" } ] } @@ -444,7 +444,7 @@ } } ], - "ID": "fffaab88-efe3-4a1a-8116-45467be7f3cb" + "ID": "298b9c8e-1110-4aeb-bf54-c04e8242d810" }, { "CommandList": [ @@ -459,12 +459,12 @@ "BtnText": "知道了" } ], - "ID": "94b1c028-7334-4123-95b9-2ab1dbc1115b" + "ID": "7bebe287-41ec-4960-84b6-8cb72f5a5e5e" } ] } ], - "ID": "121a185a-fe30-47e3-bed3-438c48832d2f" + "ID": "24187998-8a6f-48b0-af93-a0dfc42ece89" } ] } @@ -477,7 +477,7 @@ } ], "Comments": "小于进行中", - "ID": "38e0e748-ce38-4f7c-8318-9bb194c43cb5" + "ID": "a5cb827c-4005-4d68-a7a9-302672a43f77" }, { "CommandList": [ @@ -487,7 +487,7 @@ "Message": "任务尚未审批完成，不可修改状态" } ], - "ID": "e10f86d5-ed93-4a2a-a333-c9da1cef7e73" + "ID": "fd9f18ff-7637-4a94-a263-e76b508d037d" } ] } @@ -586,7 +586,7 @@ ] } ], - "ID": "ce0ffc90-0e6f-4899-b7ff-181c49c2a8a3" + "ID": "ea1ce308-bca8-4171-aeaf-d166e70aaf77" } ] } @@ -766,7 +766,7 @@ ] } ], - "ID": "ffab80e5-7e2c-47cd-a666-29af0f286f66" + "ID": "8b8df787-e024-43a0-8c3b-9e228353a4bc" } ] } @@ -813,7 +813,7 @@ "TableName": "项目成员表", "BindingInfos": [ { - "GUID": "d9d18b1b-50f4-4127-a981-9f07880ea216", + "GUID": "99b6423d-d5e6-4aec-bf2c-5952497397c3", "BindingInfo": { "TableName": "项目成员表", "ColumnName": "项目成员", @@ -822,7 +822,7 @@ "ColumnName": "value" }, { - "GUID": "6eb4dd5f-9544-4cda-b00c-c32ef2e4c348", + "GUID": "648ffc65-b6bb-4ead-86da-0940c94a45dd", "BindingInfo": { "TableName": "项目成员表", "ColumnName": "项目成员", @@ -847,6 +847,10 @@ "SerializeProperty": "='任务-基本信息'!项目ID" } }, + "CacheSetting": { + "AllowCache": true, + "ExpiredTime": 600 + }, "CustomColumns": [] }, "placeholder": "请选择", @@ -1029,12 +1033,12 @@ "BtnText": "知道了" } ], - "ID": "9fda1bee-1523-442c-88c7-04b3ba5331af" + "ID": "c6fbe6f5-a575-45e0-be1f-bdced6afc227" } ] } ], - "ID": "17c44852-d074-4d99-9ad0-b5b6bfa96b8e" + "ID": "69e92e94-8cac-4dee-812d-d477094769b4" }, { "CommandList": [ @@ -1049,12 +1053,12 @@ "BtnText": "知道了" } ], - "ID": "9f19d1f5-9a70-4277-a6fd-e8e212cf3d67" + "ID": "3271ace4-c639-4262-833a-31f851a71857" } ] } ], - "ID": "b6d8920e-2bc1-4082-ba9a-0111a135ce0b" + "ID": "08ad579e-e39b-4e7c-922f-2f637b72cd63" }, { "CommandList": [ @@ -1090,7 +1094,7 @@ ] } ], - "ID": "29944013-b6b7-4229-800d-698cc9dfadd1" + "ID": "b18bfba5-09af-4789-9d48-5b81367ed948" } ] }, @@ -1100,7 +1104,7 @@ "Title": "加载中" } ], - "ID": "7b8545ee-b30f-48cc-9e85-f9013041240d" + "ID": "e3936c67-26f3-4ce4-9fa0-540650513793" } ] } @@ -1207,7 +1211,7 @@ ] } ], - "ID": "6a9ab2a9-054d-4925-925b-0b168509283e" + "ID": "d20cdcf8-cc7f-4e28-8b61-87609cc4fc14" } ] } @@ -1254,7 +1258,7 @@ "TableName": "任务类型", "BindingInfos": [ { - "GUID": "b531e798-d6c2-44d6-bc5b-26d37b084dcb", + "GUID": "981b23a0-a1d1-4490-a925-79376d94649a", "BindingInfo": { "TableName": "任务类型", "ColumnName": "ID", @@ -1263,7 +1267,7 @@ "ColumnName": "value" }, { - "GUID": "761f486d-2c14-46aa-9095-356470e9825b", + "GUID": "819446ca-89f0-4124-bb28-4d3b01ca1e64", "BindingInfo": { "TableName": "任务类型", "ColumnName": "任务类型", @@ -1272,6 +1276,10 @@ "ColumnName": "label" } ], + "CacheSetting": { + "AllowCache": true, + "ExpiredTime": 600 + }, "CustomColumns": [] }, "placeholder": "请选择", @@ -1361,7 +1369,7 @@ ] } ], - "ID": "87241108-9006-4d92-85ec-c86e0905c7b2" + "ID": "5b358992-056d-4fbb-870d-74b07e5fa2b2" } ] } @@ -1408,7 +1416,7 @@ "TableName": "项目任务分组", "BindingInfos": [ { - "GUID": "53238d04-639f-4d5c-87bc-a6f4951ec912", + "GUID": "09b51acf-910d-4741-a0b6-e9674b18caf1", "BindingInfo": { "TableName": "项目任务分组", "ColumnName": "ID", @@ -1417,7 +1425,7 @@ "ColumnName": "value" }, { - "GUID": "2d3404ed-293c-4676-9bdc-456ae12e9e03", + "GUID": "800873fc-8029-4ba2-a741-101a8dfa9e62", "BindingInfo": { "TableName": "项目任务分组", "ColumnName": "分组名称", @@ -1438,6 +1446,10 @@ "SerializeProperty": "='任务-基本信息'!C6" } }, + "CacheSetting": { + "AllowCache": true, + "ExpiredTime": 60 + }, "CustomColumns": [] }, "placeholder": "请选择", @@ -1525,7 +1537,7 @@ ] } ], - "ID": "0fda3fa2-b08d-454d-a7ba-ea66a638481b" + "ID": "0737366e-f0d0-4bc0-8d73-48c0d8bf440e" } ] } @@ -1633,7 +1645,7 @@ ] } ], - "ID": "91bd3e0c-c7b0-4ff3-adf3-ed2277ff95f1" + "ID": "70563479-d425-462c-917b-99ff3eb5e85c" } ] } @@ -2005,7 +2017,7 @@ } } ], - "ID": "83f27215-c5ab-4f74-8eee-46ad2bf2d056" + "ID": "9401197a-142c-4a9b-b7cf-c5b88fc40ed0" } ] }, @@ -2044,7 +2056,7 @@ ] } ], - "ID": "c0dd1dda-0056-4f6c-a123-75f37559d4a8" + "ID": "e4b1c804-c0e9-4edc-a32a-bdbcdfc9902a" }, { "CommandList": [ @@ -2061,7 +2073,7 @@ ] } ], - "ID": "dfbb2e36-e9cc-45fd-b288-2049d898ec56" + "ID": "54e4e89b-5a52-41db-a4a1-af9fd2cfbb44" } ] } @@ -2248,4 +2260,4 @@ "Formula": "'任务-基本信息'!$C$8" } ] -}//dSBIGRjw0cTP61TLFG2CfNBrwU4/edQ3a2xlVt8SjgUF+brzTIpKzRFqHaaVvFt3RPPUWjr/xTOIGSEAmKDcK19YNLk8xri1ydW2q0bubCSclNuJ+icvCjqC8MFTda9C+rkON3HiEAOa8RVr4UYcGvmIPDwe6iyk8DzXV0i5+/AzpwwovGJDM9qyZUS8+LR5lWomP8t3DhBbqO6oTxZBHacWLbEoRehNa9Gqns65+KqgYNkO84qUpZy4HRRrTTOzDE/qJgmWLHwL7XAQDPRafMr6jZv1FbW9i1p1V//K+YmvtQMB1SJVTFKqbZ2G6uSBxgGs0pTo0Pob7Z5zhbFllVjup9qrOxeVcruWoIq0uLukgWd9RKBIHS74GL8OYmZW54XE7LGp/XvhKA4kq1Z8pvvyTWCxPVHXy9YPzOnJyubxTToESwipV0f/pjp1Up7f5TJFgYb3eMBziDjK1PQ2qbVNPYfCcO9x90mLx1+c0HiWBhG6JdlIR+G4b3xpmkhY8YJcZt3AI52Jq1ydgzBvw09Wa8T6L3WmOGNMgbw/4Yn5hWIkdW8r9X6e8IifoJp4s61bErORnR/pRgoTMBTrkUJL8z7LdL1+01BXQUoVUdLZ/erifdzsuicJNMEvVyaEfaL/e0atqoU+3+mXgFOndx2P9lffIhgPTQ1wjxv/BdAm2yoMKPJULf/mftA0bDuFqXyHiQzflp775FugaX3zYwYsBr1t1+a3+jDqN0vzAvpbpFHGBD8KlkdML/CkqQKholyjAhWZan358K3aA4Gw4ApK0wUuil/7VIMCZfZZnlg4SvInYtckD2Xgp+cJwlsob4jNJpHu3d1ebKddiHKHgCZ5xftzVK6GAO2npGtXmmfCiiwVPrsyv9KLKJfduTMiRgs71X/Rwz+U/SMDFd0A7A==|920 \ No newline at end of file +}//+Yow7JFTp1Dedx6SvFzMXXrRos/FKwM4p5X+6DRiU251LzHHbAIkrR9n/ouLdl3vjPjsTCSBryQrrNo8MPFdrBJI1KJx/ifR2SSyActLu1lGFiBgcF0zZ2Uvf6sPl/afw2od+L2zlAe2Xrt00r4osDDIoHN9s8r5rG+xwXQCIJHQjmtPutt6fqvefl4FRxCyRbV1Di93HvavnCJFwUxQKRgIunTiGTLnZBWLuIddi2j3iZGr94Ilpl4fFpYRvs+Bow9IrWoGBPRiG3G1hGHgTT7WR7wvd7cdBWbO3/htkQgqaMXvMPGN36yuG4cY/aPA0Ps4nNTvvnp/B9QfumktuJ62VzYyDoUxlQCfVuYITW0Rf00uu1ESYyJP55iXKW4cV/Ecx8qrHXbAgxY5QR3fcRrpBDEc7+nCfJNijiRfGOFNKyoWVn79ldlDNX/JzTvagqEXmxVtZApd8lR0ysTem/4oAQ2bS2Re33F1s6UU3aTKu6Q+VegUbeKCePxQQxO6A3vhUW4rybLkn3snuYqAgekiRQoPnzU/11aAsc9tlPlWRMbbfQUGTNYm1WTpJTB9jcq/bvW9iKHvQDL8Q9KTr3aHdru3iETVZJ3oxH/D/hcmdbPKYUB40DdZAZ2fehkyrdHlN+ztBVHHaML507rJgNRGCIPs7IaGfezGi11OYo6RLY7R07BvYUTNAyul5Q4Xxxziq+Fc6okHYNe+2pANtw4BZxVeYOtoTgoxEl9+0Lo67KcR0hboBdc067OeyGhT6lWE+Eb/ofagPsSPNwciZQ3Ps8HBS6FzsfSjT/SbahA0r02RiP+oI2J3GE89mNdZSgTzGXd2S1fLaRdFdNTydnLwC9paDa1Yqs4nY5hP/k8aAfCBMRPcNEkAkGnf1pVSEdOTlJ0l9n2wYQMVKMCbNQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-子任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-子任务列表.json index a97c8909..0cf431d0 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-子任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-子任务列表.json @@ -306,7 +306,8 @@ "ColumnOfMasterTable": "ID", "DataCommitType": 2 }, - "CommitDataWithCommand": true + "CommitDataWithCommand": true, + "DoNotLoadDataWhenLoadPage": true } }, "5,17": { @@ -348,7 +349,7 @@ ] } ], - "ID": "9cc3a4c3-0775-41f3-9b58-fe8958c86760" + "ID": "cb369477-e98a-42f7-bd11-0f227f476a05" }, { "CommandList": [ @@ -365,7 +366,43 @@ ] } ], - "ID": "42f5dea9-9df4-4611-84b2-5d3020e1ff45" + "ID": "b3be7ed3-17ff-4ef8-b3b4-e51f13a1384d" + } + ] + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='任务-子任务列表'!折叠子任务列表" + } + ] + }, + "value": "1", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", + "ListviewName": "图文列表表格1", + "UpdateType": 6, + "UpdateListviewCommandRunTimeMethodSetting": { + "MethodName": "Reload", + "ParameterValues": { + "clearFilter": false, + "clearSort": true, + "clearRuntimeQueryConditions": true + } + } + } + ], + "ID": "12966010-694e-412a-a4af-c4d5d4e803a8" } ] } @@ -580,4 +617,4 @@ "Formula": "'任务-子任务列表'!$R$6" } ] -}//VQrZsc663Z+Z2oyV3wjUNyeRNEU9QmDTIOsdmdYLNf5omYWXWEM7f7CiaUuYzscL85z+AEHHl4rSC0uEolRk3q5cp3w+NmCO6RXsGhqgTp+dlPEXpesP6fpiqKnx650vRkyG45Ndc/WXhITuGpyP/CjpVvg1G0NFHzbp+zyAu6EkbvOBAfsdMdFvTlIEHaG5Osft4fG7KactTXaCkOa5QFKzG82CMtBFmeucfO6/zmeA6FzRpee2Wr+UdnFbG1vcS8tpumklGSDZ8MCnOVxRLTgEfm2pQaOWj7/MiW0/tu0R54/5h9cT6z0ujXTJYsJEzWbnWTtw0K41MlpbFzv4CmX6yO0PE5mPw0QbIaQci/BKVd44ahwGQs2hbkAd8R38U5kaATZQdolPuHzH27DvoA9rPAcbubpe5J2LfFtbJVJptlRYK+3ziGy3qDZ5JHEPhOtFwBtX2TZPMJfpUFvNm3E23Dz/ym5uAqsLbwDBH+GvlbyLHlMSDr2HLMnrCAuk1cGEXGKtQCDipOjemTUcu+BMr8m+QaIGDeRu2AWSIIvLQADoGM/zDX7xkR6ZKYS5GGBS3Z0SD9+G+k6sw3VXpismFzSfnNi0jFyFQLrPrCxCcZ6Iy4n7Bk3WBaAkKedNbfV+wvhTbXoKT1aWlVRi/V5i/pFxkHvCwFfdWUUDh71oFOXlVviw+riyrIoHdxBqMTdUnM/ElHVgiQb2klKcNEEcY+qnq2Qb+qYXK25yAwttAnL0xag5lgnlKFMr/18j/OzKXWdsP6k+uk2/xkdQQGDDfDZiyAmuwCo65apJRjeG6NJX7Xr2C7zM62kImj820BNtDrjaL+R2DmCm0zaj4SqBpZbDNguhgZLZLLsF3uMN3y4sFJ8e0BRcy/hLYIaudQUSr2Rs7CHZNHooRPkQyQ==|920 \ No newline at end of file +}//a06TlJ54pEdWVrbS4r/XD3AdyKUJ/U7Y894H5FQLYbBrOLEuvuN1mKwLR4JotJN2t1/9ekIZYHJFMVQAV8mLwgzwwD7an3Q04ncSodmHeJQiMavG5+eRuazx+UUJZCS8Wo+ivHPXo77JxmuL0n/F3L10DHoReYsYQa1EHc1EYhF85ZNoi22Wu1ZzC+DSZYWedH8g4hFnh/eXG6A4Ox0Ffvs3iZlRNT59YQG2Yt02Lipz6aO7wZ3UvEZsy0Oer6YTojl87um7DPAOYbt96WNU6BMW8nU51kF+T1tOYmCjKt5V+uVg3k9gpbaiOuhoH8GKcgpAylTp8EnUK6Obr82K0RXV6PkLemmJjgt2ZdCWFv8ya9NxjcdIvr5zETwctYjkhT/j4FWk/uyFTnLwwyzN+PhylMNZqdWbT4KWkM1Bf3WZggNE9Nw8zdO6ryQW4sfOTNCvjZTJw8TPw9vW25aWVC9w1yiNDeBEHkFnikoQkO8d73DrXFDZVTlDOT3E+g+D4kHCABkN4oJtLp4q0eEO8TdIOkSAnZNnhTYFMJCaPuTnzAKBfK3oet5EwMf0nwrvbwT092Q+PkPzqf3IlkAxEdznzhBc0Bo47F2w6nQDp/9bY+/LaX2RBOjhnQsySyHAFKsFsqo8UwcoGQQNX6M8/N8qni61JZMW9hKf/jlN5qut/n/k+iG/ItM4QJ7IuEcGpSzYwVvmxLqXJMoSp6dD9BqSrMJRTrR7T/4OviKhSo8fusFZ4q7tRkX95Hn8/WEQmVh3Pn9oIOkpQUPpW4dXcwJTEcBx0qM1R2EPhf3L6CuqhtbhHzRgmyxKlY7pDi9PNZXtK1FxThgWPzyAekrPnmVeSVSex7vlXSJj4a+EZs2JQHPuWDDY/0LOEI5o56GETKOTFtoOCRRhdO2yLpqHWA==|920 \ No newline at end of file diff --git a/ServerCommands/钉钉/创建项目审批待办.json b/ServerCommands/钉钉/创建项目审批待办.json index 3ad03008..876f82b2 100644 --- a/ServerCommands/钉钉/创建项目审批待办.json +++ b/ServerCommands/钉钉/创建项目审批待办.json @@ -27,18 +27,19 @@ "DataValidationInfo": { "IgnoreBlank": false }, - "TestData": "7" + "TestData": "8" }, { "Name": "待办标题", "DataValidationInfo": { "IgnoreBlank": false }, - "TestData": "7项目正等待您的审批" + "TestData": "8项目正等待您的审批" }, { "Name": "待办描述", - "DataValidationInfo": {} + "DataValidationInfo": {}, + "TestData": "项目正等待您的审批" }, { "Name": "发起人",