diff --git a/.collaboration b/.collaboration index 26b7bcf6..2837f980 100644 --- a/.collaboration +++ b/.collaboration @@ -485,21 +485,7 @@ }, { "ModuleName": "PCPage/项目列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-06T21:08:10.661695+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目列表.json", - "Pages\\项目\\项目列表.rd", - "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.json", - "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.rd", - "Pages\\b90932e038f94707b54e571ff7cd84d.json", - "Pages\\b90932e038f94707b54e571ff7cd84d.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员详情", @@ -515,17 +501,7 @@ }, { "ModuleName": "PCPage/项目首页", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-06T21:04:59.5659999+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页.json", - "Pages\\项目\\项目首页\\项目首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目标题", @@ -541,19 +517,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-06T21:05:14.3595427+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目工时", @@ -601,17 +565,7 @@ }, { "ModuleName": "PCPage/项目配置首页", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-06T21:04:33.154848+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目配置\\项目配置首页.json", - "Pages\\项目\\项目首页\\项目配置\\项目配置首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目审批", @@ -655,31 +609,11 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-06T21:14:43.099755+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务首页.json", - "Pages\\任务\\任务首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务部分", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-06T21:15:51.9897364+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务部分.json", - "Pages\\任务\\任务部分.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-侧栏", @@ -691,79 +625,23 @@ }, { "ModuleName": "PCPage/任务-任务信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-06T21:13:57.2998953+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-任务信息.json", - "Pages\\任务\\任务-任务信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-关联资源", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-06T21:14:03.6208316+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-关联资源.json", - "Pages\\任务\\任务-关联资源.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-子任务列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-06T21:14:10.6956935+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-子任务列表.json", - "Pages\\任务\\任务-子任务列表.rd", - "Pages\\558ca610fafc4ffd8884b819161bfd6.json", - "Pages\\558ca610fafc4ffd8884b819161bfd6.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-06T21:17:28.5601154+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-工时.json", - "Pages\\任务\\任务-工时.rd", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-进展", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-06T21:14:18.4090377+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-进展.json", - "Pages\\任务\\任务-进展.rd", - "Pages\\77fae08dfbac4664a299aa7ec207218.json", - "Pages\\77fae08dfbac4664a299aa7ec207218.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/工时详情-列头", @@ -1503,36 +1381,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-06T21:28:04.9964594+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Echarts图表-10_0_1_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\Forguncy.PassListviewDataCommand.zip", - "Plugin\\JSON数据源-10_0_1_0.zip", - "Plugin\\Notiflix-9_0_103_0(1).zip", - "Plugin\\PC组件包-ElementPlus-10_0_1_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_1_0.zip", - "Plugin\\分步引导提示-9_0_103_0.zip", - "Plugin\\加载动画-10_0_1_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_1_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0(1).zip", - "Plugin\\支持预览的附件上传-10_0_1_0.zip", - "Plugin\\甘特图-10_0_1_0.zip", - "Plugin\\用户管理命令 V2-10_0_1_0.zip", - "Plugin\\设置当前行命令-10_0_1_0.zip", - "Plugin\\设置焦点命令-10_0_1_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -1564,12 +1413,6 @@ }, { "ModuleName": "ShareCommandContainer/打开任务详情", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-06T21:22:09.9856638+08:00", "ModuleType": 36 } ] \ No newline at end of file diff --git a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json index 3fd65d06..ca0d30ca 100644 --- a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json +++ b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json @@ -145,7 +145,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "54aca865-54c8-4723-be0e-3fbf7a86425d" + "ID": "564449fd-9f25-4b28-994a-4bb108bb803b" }, { "CommandList": [ @@ -157,12 +157,12 @@ "ConfirmText": "您确定要删除吗？" } ], - "ID": "9dedeaa3-a614-4318-a4aa-bb63dcdb5bf3" + "ID": "ef4ee973-b50f-4ebb-aec0-6e2a7ba9fbf5" } ] } ], - "ID": "eb948567-c8ce-4ea9-9260-01b7ae4af2ce" + "ID": "6800afea-ba47-40bc-afec-f9f1998d51ce" } ] } @@ -230,4 +230,4 @@ "PaperSize": {}, "Margin": {} } -}//P4LKDj8TkCAhC8LZb6Kqo6dELMo+8BpxVk78+9Aor4uqZLF4i4XBF6DoQpEXsO9rqg5sq3OKjS0gjb4XT/NGMocgZUKfCEIk/R6Rx9cWiVd0qBGyFkeovYoZwp3UI3j8LkkNgZE+8pu9C2Zf3b1aHIu2MKOg3V4r+q7j+SKeyQT6qxyxO7Z7yJeRzjcibElBcCD5eeIvThrX2kGyfqJkCTPWdpeg0LxYkf6GQLAKtaZjB9x81rUBVrgPl1d/Ui0Mp/ld6CO/VuAA6Bz192Em8wdfvgqpCmAmXx2S4Te2v5SmPwljMVc2xZLwu1gjGeMmFIh4w6gXmKy1N7VvR2Uzh3zYBX0fRp32LvmrkjPpYVk3UVFuGenpOGsOi+7TpEgjJyNszfGkyz6jK2H8Kq+bvSfABetPyJpGwI57U2mWReCqIBvHU+eqhe31IXHJMKSC7NmE5r762PeEqct417z/i43gMKgzY3PNLzVHmP+sX9sDOPqB9wL49fFKsb7LkXGD1hSTh8SO7SC8thjwn5qzr4Gclii9F54cWJypcQ/AMlmRnPBtNU9J2aQGlzf6WScY7JZVhi9Fr4wN/gkAXldaCd2PAtfb5IsQndsJ/YS+tE2F+cN6xUtFTF+Pb255Eo6OOl0Btd/V9xgadtaru58hLzBktk/+PxM3+lcdMCndOzwUfceBIGrXqyAPHLrVbHD5Tljuah/a4kN2BqZm2HubfRRonVFaJU/Gm0rleCoqcX72dZUz8OGjw3AauyGQe32hfFfIpN74ojbmu+Zqn2NlGmH5W4Oo/lxv/0WHhlh24ztuoJ16VAppFry5nNM2BX4K2zPBT3CCJRuVwKq7AQCJPwpzEO38u/W/a1thFsS2Lx0zfKXZTWeOjAqbVMuIbQ8GLf5O23yHT9cqN+ofT0Qfdg==|920 \ No newline at end of file +}//7OAZYgyMS7G1Gs5YQbIqwAVCiaIGuSeYjADlsQ8a78j+JIsEs7V5ul+GWoF+C04Fss/pHMzFQRVipfApXCP5Y+cwZgiiBm9kPMtAS96JINPeljX/n94zBoU9i15hhwpxRygYuxqEqYBn3dirMrrB5vEPGSaUqI40hWJN346ERyaEX5fBvCDD2xH/WDd7P4CwxUlX3ueQW/+VkOP0F12cyMnoxwfoAb7CHE8IzwzTU2923TntyJ/MF0Op8ZcDWbhRtzD8KnQUr1EpDo1zVnZh0aeGCoL3ZVzOc3bTH3jcN2xFCHTKGdui8yiea97KEwMx4bvWQ2Vxkx+RZIdPvowv2jT1zsURuoUWszX/ozjwCb4P5AW78EP3U/xETXwLyE7LdJUMtre4lMH+0IEiNcc9tE6tj6WiGkO+bKbp5wnOhzBt2hYFcLgPv5GdLL2dfBSJOrQm0g0XLltPLIDZM4Jo33bpHr/TawQU+rep1wMmOWojHn9GEmOFa2ofMWhIP8Mea4wjWRExACFzVSSY14ORvWjncTxhjSNYnvK4xH3OySBx+kvOnrf9Rrk68UTkL1s/78dxoc6Ihufxmuq6Wykq/wPs5mqFzm5WMJMS1ThXhUFMIBXztu0MOL+fdLi1m0JUN9VjccD5XZ9bYzGk98buq2nt1/oKLxdM7IA2nkX7d0sh/QgJAWXw5JzwkdcCbO8PnC3zR5vHtHvxW5GltYx27+crBoUX0I2A6aRJ66qeSaU8Dase7kMhjacBEL8gBi7+YXGoVDWBK9xqOD3QHWr5kB4CTDHTdOeF/kXA9M1Gd1dr6cZzYnqS5HGIFjylpOBBpaFOzhQLslPq3uZ+rp8z/ZC2KmsUv/tkPXr7LumQ+rc+QKoIhgCNxvLRpinb5KkG3tCDjqX//YRqIxcS8v/9nw==|920 \ No newline at end of file diff --git a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json index 5254b89e..6ddf1548 100644 --- a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json +++ b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json @@ -18,7 +18,8 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 21.0 + "DesignLengthInPixel": 21.0, + "IsHidden": true } } }, @@ -42,7 +43,14 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 110.0 + "DesignLengthInPixel": 110.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "3": { @@ -196,12 +204,12 @@ ] } ], - "ID": "6743295b-ca52-41a9-9088-8dd8d8366556" + "ID": "dcc3192d-6dba-4d32-a095-1402e52be96d" } ] } ], - "ID": "70bfcdda-4c74-4429-8279-402fe201546c" + "ID": "46f680a9-199d-4c16-abbe-bd19c440c81f" }, { "Condition": { @@ -231,7 +239,7 @@ "Message": "复制成功" } ], - "ID": "720e625b-6bbc-4c07-95da-8858235d16fa" + "ID": "c8f34bca-e2ff-46e4-9f32-de9d1a2c824f" }, { "Condition": { @@ -308,7 +316,7 @@ "Message": "操作成功" } ], - "ID": "d4405962-59d8-459c-9d3d-93fe62d0e1d5" + "ID": "1549c568-4892-4768-8272-1de9911cb3e9" }, { "CommandList": [ @@ -323,17 +331,17 @@ "BtnText": "知道了" } ], - "ID": "c92cf3e7-2e07-4a43-afa9-70ca482c036f" + "ID": "d6effe06-1888-46f7-be97-5fba12c59901" } ] } ], - "ID": "e829f3ed-7083-4bf9-8879-0fe4524c27ce" + "ID": "eb87ff70-4cc3-4951-9a8f-219e9a4eb08b" } ] } ], - "ID": "24ad90f4-454a-4665-984e-dcb7041edf45" + "ID": "64c63b67-ad60-487d-a13a-51a9bf783704" } ] } @@ -410,4 +418,4 @@ "Size": "24,24" } ] -}//9eICao+xunffPQOep0jT7YZLw/Mw2R6PtqL1BjSX/GRo0m15mftLi8Jikb7ihhc7v9SfKK49k38DOOsBNOWU+buaHU6jsMClD2Lvulqa0LGnhVPHyWWAsFSKF01S+iO0x/gvprDCpTiog+aZwon4EWO3BfcQU/TD6k3Haxza2P7TKlN9egH3wMRBgIafyVrLW6//P8JpkCnHRt8Oe209WLtU+3nXC9ePPMz2/ZHnf4xtWtlX31NEBlujS/L4gQoeFJ70NRuwEElThDNCx52/NrCA5Z1qYjQgplI6uQOh8HrlooO2WbutB1p0Yhs4OXjmpBAl1JUDTCKnbCjxs+ihobjVnfxFsztUELlIu6JMtWO29wrXtzoXYVwli4xD+HdbM3FM4gIOujEd3XVCoUSWyY0U5an7vXllbAlz1bcGyvEwG82SU2aBUfJHHsaRE56Il1C0qa0qxWo+1xTo2B/qwpJqM2JPqUMzjly5wW92TWyqO2Z+z7WQzZvq3U4BAakPYFRU0cNmQyHI69CA1CAUjGoPCPl5WB5Ey9eCCYulMk88JLt1nM+rqS4bh4rJJITswL+jqKESEnDq066RoGYtJN+zoFhULK19hdQ2mzQfYLYJ3YbsMJ+qO8/d6oRAQVBYBNRDrq7KGCWEfQyDi9yBkTCWhrBOqbOx/91iCE/iionG5FijkkqiboBAlHOymBemb3+zEvYoG0ibBHNsM6Y7UNFkNU36muh7dCHAdh+nqrIwUfno+RZBHcxW8w6JZ0pM3ZaneyXZ9U5VSVDoKvO3xhrMhiiSQadlGZMeXGS4j55XNFIwVp1q11EQtXCe0EZrjQggdSDQasv/Ge2DrnFczAXTv2/mhSUtNrTiCfqLgfP1WgXE7lmFQvdV/Pb2TwLgDP25fyDRutVi4bId3sTL1Q==|920 \ No newline at end of file +}//Ji2cOS5U4sefFK/FzVuzvaaLrHZN4RnnVnNqbQfF7fXsrKxl+KfXeM3L5kW+yJp7Uda+Om7y0/XVtfQKb7luDzNP3wxcdFXOvbitZqDPoxE9UJgO4kuOAldOa5xW+I3e3On0BnpgUAvWLFv6dBUBBdLFm5Bt6miFWAqEQiiWOMzN+YuaBhX3mq2aUGFTGDujPZVflcPK0SmsEqrDvIibtkZH34R1ks+zhZk7D8xXnOEs68oBAAg52wjdYURGc054rIDB9FJRLsWUwXf6l6XD4WxaRN8CAaTzDTFnX+IPt2JUlTUPYNJ85cxm8RK77kxUunZvRoGoOsRmPYJU3qcsC9l4V6rGolvOc8c5DneAC06JwptQdPymCdaEtLjexShUrfUwHOlB1H550VNctVBGKh7e5qeUb84woV9QY9eghgwZIHvrwdFZ+nIEPZ+9tXPtYQvC+27eXrgncz9F8fWmaDmPWsL25D4IsPHRi8KjsilefR5c/EoLts1am9ZbdoST9M6qDP8O6YEo0PxCCjhbTRx1Cv6uMnZ5LwUGlQzZTjJLlqziHC01SpnViUHi18ZWCP7L30ZTgj/jP1zSrf828seNBxcH+QfPkoPmC0kvC+UOseCFjZWUEsCpIqgKj3WBrTaoooluYIEuAyZq78DxDrZ04K8x1LZg4NOGS/MygcZNR7YEhoMWA58zPqDwdsP63esBzg/5VEbdYJ1Ha8ipencTEEx33nXfrB5JUmPRPtFNaK6OL4akXTBTGVtZHaNkjv2oqCAKqO2Q/NIQRtGq9ZVBzQuhm2ka4OCFjTZp2dRg0S+L/FetD+fIBxTngEqALB/PkE9YNrkp2Q6MHti9/1BBB/1Y0UbAUqh211ODJ692GZl4i75+/uIauDcJkeQllZmOHH5veJUdiXgJ2wH9lA==|920 \ No newline at end of file diff --git a/Pages/任务/任务-任务信息.json b/Pages/任务/任务-任务信息.json index 97baa0ee..2c84c414 100644 --- a/Pages/任务/任务-任务信息.json +++ b/Pages/任务/任务-任务信息.json @@ -130,7 +130,7 @@ }, "14": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, + "DesignLengthInPixel": 44.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -140,13 +140,13 @@ } } }, - "27": { + "20": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, - "Count": 28, + "Count": 21, "DefaultSize": 32.0 }, "Values": { @@ -155,7 +155,8 @@ "3,1": "任务说明", "3,2": "编辑", "7,1": "备注", - "7,2": "编辑" + "7,2": "编辑", + "10,18": 0 }, "AttachInfos": { "0,1": { @@ -187,7 +188,7 @@ } } }, - "0,27": { + "0,20": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -197,7 +198,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!Z11" + "SerializeProperty": "='任务-任务信息'!S11" }, "Value": "0" } @@ -300,7 +301,7 @@ "noMatchText": "无匹配数据" } }, - "1,27": { + "1,20": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -310,7 +311,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!Z11" + "SerializeProperty": "='任务-任务信息'!S11" }, "Value": "1" } @@ -355,7 +356,7 @@ "ShowConfirm": false } ], - "ID": "4e9e1367-5d07-41f1-b120-db84370b6c9d" + "ID": "2130d738-d6b6-4419-b89a-479a61c118e5" } ] } @@ -443,7 +444,7 @@ "ShowConfirm": false } ], - "ID": "89fe97cb-dec4-4315-a25d-9495b2c324a8" + "ID": "dbc59390-710a-4624-a77b-65bb1c60cd25" } ] } @@ -499,7 +500,7 @@ "ReadOnly": true } }, - "10,25": { + "10,18": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "折叠", @@ -515,7 +516,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('任务-任务信息'!Z11)" + "SerializeProperty": "=NOT('任务-任务信息'!S11)" } }, { @@ -525,7 +526,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!Z11" + "SerializeProperty": "='任务-任务信息'!S11" } } ] @@ -559,9 +560,6 @@ "HorizontalAlignment": 2, "Underline": false }, - { - "FontSize": -1.0 - }, { "FontFamily": 0, "FontSize": 13.333333333333332 @@ -577,6 +575,9 @@ "HorizontalAlignment": 2, "Underline": false }, + { + "FontSize": -1.0 + }, { "Foreground": 6 } @@ -594,76 +595,61 @@ }, "CellStyles": { "0,1": 0, - "0,27": 1, - "1,27": 1, + "0,20": 1, + "1,20": 1, "3,1": 2, "3,2": 3, - "3,15": 4, "4,1": 2, - "4,2": 5, + "4,2": 4, "5,1": 2, - "6,0": 5, - "6,1": 6, - "6,2": 5, - "6,3": 5, - "6,4": 5, - "6,5": 5, - "6,6": 5, - "6,7": 5, - "6,8": 5, - "6,9": 5, - "6,10": 5, - "6,11": 5, - "6,12": 5, - "6,13": 5, - "6,14": 5, - "6,15": 5, - "6,16": 5, - "6,17": 5, - "6,18": 5, - "6,19": 5, - "6,20": 5, - "6,21": 5, - "6,22": 5, - "6,23": 5, - "6,24": 5, - "6,25": 5, - "6,26": 5, - "6,27": 5, - "7,0": 5, + "6,0": 4, + "6,1": 5, + "6,2": 4, + "6,3": 4, + "6,4": 4, + "6,5": 4, + "6,6": 4, + "6,7": 4, + "6,8": 4, + "6,9": 4, + "6,10": 4, + "6,11": 4, + "6,12": 4, + "6,13": 4, + "6,14": 4, + "6,15": 4, + "6,16": 4, + "6,17": 4, + "6,18": 4, + "6,19": 4, + "6,20": 4, + "7,0": 4, "7,1": 2, - "7,2": 7, - "8,0": 5, + "7,2": 6, + "8,0": 4, "8,1": 2, - "8,2": 5, - "9,0": 5, + "8,2": 4, + "9,0": 4, "9,1": 2, - "10,0": 5, + "10,0": 4, "10,1": 2, - "10,2": 4, - "10,3": 4, - "10,4": 4, - "10,5": 4, - "10,6": 4, - "10,7": 4, - "10,8": 4, - "10,9": 4, - "10,10": 4, - "10,11": 4, - "10,12": 4, - "10,13": 5, - "10,14": 5, - "10,15": 5, - "10,16": 5, - "10,17": 5, - "10,18": 5, - "10,19": 5, - "10,20": 5, - "10,21": 5, - "10,22": 5, - "10,23": 5, - "10,24": 5, - "10,25": 5 + "10,2": 7, + "10,3": 7, + "10,4": 7, + "10,5": 7, + "10,6": 7, + "10,7": 7, + "10,8": 7, + "10,9": 7, + "10,10": 7, + "10,11": 7, + "10,12": 7, + "10,13": 4, + "10,14": 4, + "10,15": 4, + "10,16": 4, + "10,17": 4, + "10,18": 4 }, "ColStyles": { "1": 8 @@ -676,11 +662,11 @@ "Spans": [ "3,2,1,3", "7,2,1,3", - "10,25,1,3", + "10,18,1,3", "1,2,1,8", - "4,2,2,26", - "8,2,2,26", - "0,1,1,25" + "4,2,2,19", + "8,2,2,19", + "0,1,1,18" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -709,7 +695,7 @@ "CustomNames": [ { "Name": "折叠任务说明", - "Formula": "'任务-任务信息'!$Z$11" + "Formula": "'任务-任务信息'!$S$11" } ] -}//nyAST56G9WITROuOnDFE4vjZXgfnAwIbtDv/EJIf/RgKnN4dsa+lj4m7Blpab1Tr9RGjcRgTxtLgR6LL22wuiy0wiw981kG2XSTgCiTbJ7OINApATEMonK3Y5boEBSNLBN0vcAyZglN+QVt7LJFehPaZdy04vea/XS3MGAeqiHD5az9ScduP5M6C6ePCMexp6a2zS6i66EOrOYumNa9N6z1312n4kzQns5Qrlio3zDjOI4eFZMLh+3pAlLAldl9YuWJeQ3GS0LPxR0K1mTu3rQKifzPmHiHTRQvywPquKyxXWk2EqQr071M/5/fquHQ7B964OJ0Vs/i9XgOm49kPDgvQ7grb9lJNtG6D5vnuW46LwAXUBEZfRjombVDIrBo6Wbxpui8LIUBTXXEedpctfG2TaaWWxzF86WPLenzO08VyZmt9d27GZinD9ocguG1J62zJVc3+Yg909uLjttKULE5uTXEao8Bh+BIktlVlqKmIiS3NV8JI5wtaEBYO13hBF9UuH82ntOl+BKxJlVmlvKdfhCtzwLLae0dWR1ktsh5AWAF20SSknPLqBX7T/3gSFmgBmserNun39aVpBpbBR5tfi+XWXreavJM5mSSUdgfryDwwmySIO37vyDcjiBMUw2We0xThR96qvBttZsHSEnWi8dHP0jPT8Wcew6unPj4pnjfKfq480wyLc7UxDRBDg7GxEeNNUjoFPepUAGITV6N+a7ySoIZe/XoJHn4fULMoGQon6srMh54OpmWCnByiIQrUvg6Uqy4BjOIEHJfnzCHPjV46idDiyMDE0+Bx+iYeTtc0TJUR1nrW5HEASw3bSvF6PwXTskarQtZOMM2rHcJgbdrdtNdOTl0wXPcsaWPVvlhqzpFR6Vmz2KR5wr8NjRarFkTh8ZlSCSSbVHbadw==|920 \ No newline at end of file +}//iFTQ4Ibsp70DO3nvjuapi8o1nPbBRZQphF7/YEmKSZLZ9eTFc3N0r93/YWoICkjXrQJqiONvZM1ZsuP+lggMN1NdShpVN196+OxIrO5EHYHKC3rKZqTSDpqDt5ZrXTJgSLG7rhIDIVgXoJtGizd5kv59hwVh6Y6JziRzLcv0pnSSvWNVHTOyp8pByGcjMifK0j0Q0OHjeVSyAoFrXsr52Fjf477auaZmVtgRDr2AgkkdWm2YUs4F+u2glFJcmknIrjmryILm14peNSGVdZO4Rc6griaagEeKJ50NDxM+0rG1wafjWz6pYSmRyF1zcW1RfpsaiZWoZUbCuicDuuvBjQ/ddGXuvgyRQh0/hEAU8twweeHsQtugwlZqowh5oItNbHjeE5bBNpFXVFb+GvPP07NDlFoH7A7yn8AHD0E6RAJc8wxCHf7a4TjYtqUAyM1y+H+SXzuBgmNfahdpuYkqKYet2rG9ZbljAzICHiNuirIQl9CQBPjI48mkGdYnFuLoqhfF0C03wgnK6CGA4Xiq/gX8ZQqAfZM1A2kEZIHUuqOsqel7vhVeXEjKoNhkT2xilVvMzXGLz9Ayfehw/AZbMEc4eaf721+5uB+hmoUPhJsI02JxsAxdXDJlITGHT9rpoPWgW9AJDIdwgNkQMqQw2tHq3SX1v7KWBIJ5cHAXFsWrtsIdgon9LBbFrGjNXCq96itIV6N5J6LrPFyjg+HzGqtK0cUuT4qOh82Meio1Vrbl419T6uPpDwrzDmJtOJ8xMj7GX5eEsjXZsyokfCZdbh9IRqIgeQjDzC06hyeGrO63L3ZZn4878OVquufbWZ4PbZLXwDBaw6SYiwzL9ZYLK4T0JajK3YVE5nPqMxXwcLPY09e2XNKSjNdvBMpyIBaNjQ++ACto2DAMK2oW37sGyg==|920 \ No newline at end of file diff --git a/Pages/任务/任务-任务信息.rd b/Pages/任务/任务-任务信息.rd index 8976528e..4a9864b1 100644 --- a/Pages/任务/任务-任务信息.rd +++ b/Pages/任务/任务-任务信息.rd @@ -1,11 +1,11 @@ { "PageType": 0, - "ColumnCount": 28, + "ColumnCount": 21, "RowCount": 11, "CustomNames": [ { "Name": "折叠任务说明", - "Formula": "'任务-任务信息'!$Z$11" + "Formula": "'任务-任务信息'!$S$11" } ] } \ No newline at end of file diff --git a/Pages/任务/任务-关联资源.json b/Pages/任务/任务-关联资源.json index 02e30d67..579f3dd6 100644 --- a/Pages/任务/任务-关联资源.json +++ b/Pages/任务/任务-关联资源.json @@ -105,7 +105,7 @@ }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, + "DesignLengthInPixel": 42.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -115,28 +115,19 @@ } } }, - "13": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "27": { + "20": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, - "Count": 28, + "Count": 21, "DefaultSize": 32.0 }, "Values": { "0,1": "关联资源", - "1,1": "关联资源" + "1,1": "关联资源", + "4,16": 1 }, "AttachInfos": { "0,1": { @@ -168,7 +159,7 @@ } } }, - "0,27": { + "0,20": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -178,7 +169,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-关联资源'!X5" + "SerializeProperty": "='任务-关联资源'!Q5" }, "Value": "0" } @@ -190,7 +181,7 @@ "UseCellForeColor": true } }, - "1,27": { + "1,20": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -200,7 +191,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-关联资源'!X5" + "SerializeProperty": "='任务-关联资源'!Q5" }, "Value": "1" } @@ -247,10 +238,9 @@ "IsSmallButtonMode": true } }, - "4,23": { + "4,16": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", - "CellDefaultValue": true, "Caption": "折叠", "Style": 1, "CommandList": [ @@ -264,7 +254,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-关联资源'!X5" + "SerializeProperty": "='任务-关联资源'!Q5" } }, { @@ -274,7 +264,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('任务-关联资源'!X5)" + "SerializeProperty": "=NOT('任务-关联资源'!Q5)" } } ] @@ -326,9 +316,9 @@ }, "CellStyles": { "0,1": 0, - "0,27": 1, - "1,27": 2, - "4,23": 3 + "0,20": 1, + "1,20": 2, + "4,16": 3 }, "ColStyles": { "1": 4 @@ -339,9 +329,9 @@ } }, "Spans": [ - "2,1,2,27", - "4,23,1,5", - "0,1,1,25" + "2,1,2,20", + "4,16,1,5", + "0,1,1,18" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -369,7 +359,7 @@ "CustomNames": [ { "Name": "折叠关联资源", - "Formula": "'任务-关联资源'!$X$5" + "Formula": "'任务-关联资源'!$Q$5" } ] -}//o53lBUBAY4nE4Cy95jgIjdR5tRJ6gU77LVaU9MwEKJW+2AB3C/aSDOIdHi3U7VJ7AxeciZdHFGTJIiHbAbCG48zyfJat1LwLR3K5Vs/Lvlayk9uQYEAz3V+nN6mjYcGORuAqS31k6JIUN1bT0a0tuIF9XqQCnUl+mEHMnkJgylCiTdty3KNnuvwvdJqhJ2nIeTD0iJ3vaRD8ojann3ah6WCfK3xYESuJToQvJZ70fxqD/CzNZq0wLXJEa6+RIugsmmYy8CmBfzUgF0uDHYzltNSpT2P5nU5E+0bjDMlk1sD14Kb4ZAaikkXFtWZujz5VIpIzX6TsxfBsMp3F/wjIW5QZQloK+jprjBLkvUowU3e58V26b1a936zy/S1Zq/WHqa2m544ePRO82gEZpAWfmDnQnD2buOSOPW7LEqAP3WYUGM94iuRmD3PSpnstopHloPoI3ttABw/JRiEWoP3qoO0j/71sIGGgZhKj9io76+Kxsk9bc/mCS29pXT42fWhk/ksHnmI0NpW5BPvKUcXQu0ll1LoyhTbUd/JPwd4++juURBUgsU4UpNHV3/R8EJuJZEChUro9pTL0Gmg3wsz1oytMzTtyGYEqnwegmXgrc6bq9XIESL7+K5O7awzjWb1v2wnp5popySldTNNhp/yoGF4eGWaim66S4gPtzz3X2RzFpQ/L/qY7s+xuZyt4iw3f39Dbt48z3yT1kqQ9Aui2sHpvEne0QuVge6KPR/16Vp4Tm/NJ5YpjUFcwcbPWs8JFTSWWoErj2NxE4x1ClYhMo+oDtmi7b99FKEzwCB8EOopTyP8I+72i+pTyEP7Z/l/A4VO4fGTKHcU3UzrKZrapYDNzEAiFhCyHD8THaS8d7SqJhzo4XK3a55uqeGsRW01UyGqfLfAl1jN2T9+XWpQ+Ow==|920 \ No newline at end of file +}//KrXpgABOqjV9zbLEwVgiyiLdRbhuimoj7Ps5TYarBcZl+vHs1TRKJaVesea+YNrnn5oC3AEqzaOuQj2l/aMbM4rMiFxFqFc4+A4J8oH70/f++xbt/ddUflFCnBqE9zpTe7am6eSCD0ZyX7vRwZR3JX/pO7WRJS9+AMdWNeSvUF9m8ZSRiNhe+s99ghKUBYPARjDOR2VLJBmTWumJ0KlKfX+lorigJQwN++Izb7u3HuH8CJHnK1l8peV7up0adJ7qPb8M1vf3uW37csxC36B8cTtP5WBD44WnWVPgQFXDR48n2dKpD5FIK/d4LFalBi2FVAW7hKyxqLE6pAQRHnOzntTBAbv/g4HZWD7ag53XABsMYvyreBWG5HOZIKAiQQS6KGL1itjjBAex4oC7NDNNq/SopQmihuvWG0/8hXaq3gGX48rSk/F2aQohuidLaGCMSrhRLHmuNB+Y1dQtfSSEZTXTeBYXkSm46LwUeVK7QKHcR7D3zYqSzwgoJzGqjwXg+HZFDqEdwVpm8guXi6AlcoTnmcoE+1R3/nk3k4i+RUAL1pSxr2vg3hF2BRZ5LM8DCQsBNQ4k6dlyhN9zCt3qswyit2TQ/4ZWiy0ion1WTQjX1viSAKwWk4k/9/71S06O8IyVZ2Ki0WmG3bHk+5G3U54SL8J6r+6UTTLScuIYUqyRgzpcI1GV+aKro97Ztk9I4/T8v1KFEYCmc3Nw/NJYRdZUSGhHNflFCU6YabxlR9Q9SHuiXDuibqJED2mA+JkDBEWRyscNQfkETQd4j0vNvmAmHLTycmkr+abauM+Gr/jHGSsJNQMJj5TOb/JHgR3qSQsIJDSCieBRhzuAtzq/qsEA2oyBTVH3Zjpk+IoivcPoXUiv/MeJ3q6a+5GcXEfe9cAJW9UrLbGfTq2sdHJMhg==|920 \ No newline at end of file diff --git a/Pages/任务/任务-关联资源.rd b/Pages/任务/任务-关联资源.rd index 7614c531..2737e2ca 100644 --- a/Pages/任务/任务-关联资源.rd +++ b/Pages/任务/任务-关联资源.rd @@ -1,11 +1,11 @@ { "PageType": 0, - "ColumnCount": 28, + "ColumnCount": 21, "RowCount": 5, "CustomNames": [ { "Name": "折叠关联资源", - "Formula": "'任务-关联资源'!$X$5" + "Formula": "'任务-关联资源'!$Q$5" } ] } \ No newline at end of file diff --git a/Pages/任务/任务-子任务列表.json b/Pages/任务/任务-子任务列表.json index 3564a178..a9820370 100644 --- a/Pages/任务/任务-子任务列表.json +++ b/Pages/任务/任务-子任务列表.json @@ -97,32 +97,7 @@ }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "11": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "12": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "13": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, + "DesignLengthInPixel": 39.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -132,19 +107,20 @@ } } }, - "27": { + "20": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, - "Count": 28, + "Count": 21, "DefaultSize": 32.0 }, "Values": { "0,1": "子任务", "1,1": "子任务", - "1,2": "增加任务" + "1,2": "增加任务", + "5,17": 1 }, "Formulas": { "1,1": "\"子任务（\"&B6&\"）\"", @@ -180,7 +156,7 @@ } } }, - "0,27": { + "0,20": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -190,7 +166,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-子任务列表'!Y6" + "SerializeProperty": "='任务-子任务列表'!R6" }, "Value": "0" } @@ -243,7 +219,7 @@ "IconSize": 14.0 } }, - "1,27": { + "1,20": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -253,7 +229,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-子任务列表'!Y6" + "SerializeProperty": "='任务-子任务列表'!R6" }, "Value": "1" } @@ -385,7 +361,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-子任务列表'!Y6" + "SerializeProperty": "='任务-子任务列表'!R6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -397,10 +373,9 @@ ] } }, - "5,24": { + "5,17": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", - "CellDefaultValue": true, "Caption": "折叠", "Style": 1, "CommandList": [ @@ -414,7 +389,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-子任务列表'!Y6" + "SerializeProperty": "='任务-子任务列表'!R6" } }, { @@ -424,7 +399,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('任务-子任务列表'!Y6)" + "SerializeProperty": "=NOT('任务-子任务列表'!R6)" } } ] @@ -484,14 +459,14 @@ }, "CellStyles": { "0,1": 0, - "0,27": 1, + "0,20": 1, "1,2": 2, "1,3": 3, "1,4": 3, - "1,27": 1, - "2,24": 2, - "2,25": 2, - "2,26": 2, + "1,20": 1, + "2,17": 2, + "2,18": 2, + "2,19": 2, "3,1": 4, "4,1": 4, "4,2": 4, @@ -513,13 +488,6 @@ "4,18": 4, "4,19": 4, "4,20": 4, - "4,21": 4, - "4,22": 4, - "4,23": 4, - "4,24": 4, - "4,25": 4, - "4,26": 4, - "4,27": 4, "5,1": 5, "5,2": 4, "5,3": 4, @@ -537,14 +505,7 @@ "5,15": 4, "5,16": 4, "5,17": 4, - "5,18": 4, - "5,19": 4, - "5,20": 4, - "5,21": 4, - "5,22": 4, - "5,23": 4, - "5,24": 4, - "5,27": 4 + "5,20": 4 }, "ColStyles": { "1": 6 @@ -555,10 +516,10 @@ } }, "Spans": [ - "3,1,1,27", + "3,1,1,20", "1,2,1,3", - "5,24,1,3", - "0,1,1,25" + "5,17,1,3", + "0,1,1,18" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -597,13 +558,13 @@ "IsAutomaticStroke": false, "IsAutomaticFill": false, "Location": "24,72", - "Size": "957,272" + "Size": "740,272" } ], "CustomNames": [ { "Name": "折叠子任务列表", - "Formula": "'任务-子任务列表'!$Y$6" + "Formula": "'任务-子任务列表'!$R$6" } ] -}//CQlBD4PvupQrDCiRU6MnfknbHc4bchf5FjHSDniB9G80DocbsQfKJ/f34/UL6t5uO5d2W6fbeuu4yCKpHA+OzG8xsPOeL5bIpLjdbfvbj4GtP8OY/JyHb2l7engmqRYhk7xVZzcQjmVNHN9ajgQhzUsDJKOOJiGmBrlgO5JfepWwVHqtLNbe0WJP9FEb4f9q4XZEV+Yx8FO8As6sSokDkvYLHS4Lyv/UO2sxzKxa8tqZPy90+2xT+Ctcq7v2OidQCjH6M6F2gB0mtSTSi7LY9xdfUQtl47erl/d+X7aK2iKXtl3PgRM+V0hoiCWNa+wawSwItyD90RernTmUS0L/e8tDhxI5rxDHCG9VTJVj8YHAp7/kLVgkSSPq3EDE3bOu44uHWqdKbc1ZreCaacMcxZ/hF28ri7hJH1ez+0NgOq5fnnHGP1Rg6hTJ35URlbgyglQ4FuluB6J7jyYN35QQ1w3FnQnotqcQokwyBi68RQGPqJ7TWlZZcMBYY/yj5vPtnfiMbrvnZFWl+kHwxYuiFoltrCfSPa7iCwQK2yiSD9vOkcuG1P5IRF3bJXSVHvuru5qGt3inPror+qqx6/VEfeawHFKyF7CHG3kAA1+0GT7MUa+d/y8RskGjSJMxxEMTWPIhqb6eeW9wYTjBKWLZ9U8WYgNirZJOVwCvb5rBV/xqZ3U0tO1pzqN2oCM8eTxu+CVa6nOXPGEOOlwkiQ6MKzVNqZCRoYncXVuquZfShWmqdLeB4MJWoR+0KHpVZDdrNZNbfgnMDIAtlPE64M9wcgOyEM18F5tIQUZ4Kcc4kiYwKiyIKOVxEIO/TdYNIDQP6WzN/RCDACDs6oetZEJz9OgNyJj4EVD0P30Wt2vZtgbprHkoLozW6pMRIq/JHeWlOLBSW41mM7T3kmzt7NJuwg==|920 \ No newline at end of file +}//pCdDeFq1i3wq7LSHTlj5TDC/Z04X0KMVr6hn/p+3LmoWJ7grcvyJ1hPrMeZ9fYpHFTOUSD0ITyORZIHH+zzQkfd6TkhcTX4bm8oATvpnwgvUWuCl0GxiuGolKzwzu2CXcV0TVLCtkBYNFnre80FWnEvJ/wnxl0TMtSCthCfAr23CkTtGotPEy3JMjNHzXQrUei9Uv/7boKk6sM+1y9zwKXM0ADhoHnXLD6Hq291+BIw9cQ0Kb65AC/Vti6Kr7xIhSKbji/MeIdllKvNXwruMCtg0bXsCwlUxaoxiTxD5HKG4hXIPs8Xk5nhoibk4eBxM4q98lR0Ui8gTFKLvO05LoEKsZaMH/rHmhMffz16Mapdpyiq4yhylJU0yqqUqkHzxYEdgvXalVkSqvev1C7yyf/7E1vei2fnMaP3Sfqoz/dgI69d/5msYGbGxHmR9muLafJf+E3bgPpU31m9qgwgv4igU/81CQfjPXOxjxBdK7YDQ/+tptK/v6uqvgZj9+Qn/4ssaikLdLHYMBvBJ4mhHSgc1GT/I3uGjQQLtj9MKXN1FLhI9MIaLc8DZFppiq/0PUHatZnYTovMYth4w2cQIMoEwdCXULkoHTDklM+nd3cVLUrm9oHRFq9YmwNAagw9oLpBTAMcL53P+4oiqLzuGyWFWcyihTYFYi5I1TRx7WhxCCg1hcboZus7Gyd78BNRNU0Seo/jT5Xw4fnETUddJk+YeIFy+AW+fPkmeMuxtMdBGq2VXuxNgInGXRlJGbhz+lhlrsgQE3h2U37NgJDFaWfmEtCwoZGyzYNsVPufyODHVhF7Qy1YpGLkhKvXA7hI5zRZ1S5uEso+DkgYXhBykGx2hvw8ITs+W89/HSKVWPscqV01sV57dYXqgnMoJBb4VAcSgUlcr1aLlOszMZYnhcA==|920 \ No newline at end of file diff --git a/Pages/任务/任务-子任务列表.rd b/Pages/任务/任务-子任务列表.rd index 2cc1fa4d..cdae28ca 100644 --- a/Pages/任务/任务-子任务列表.rd +++ b/Pages/任务/任务-子任务列表.rd @@ -1,6 +1,6 @@ { "PageType": 0, - "ColumnCount": 28, + "ColumnCount": 21, "RowCount": 6, "Formulas": { "1,1": "\"子任务（\"&B6&\"）\"", @@ -9,7 +9,7 @@ "CustomNames": [ { "Name": "折叠子任务列表", - "Formula": "'任务-子任务列表'!$Y$6" + "Formula": "'任务-子任务列表'!$R$6" } ] } \ No newline at end of file diff --git a/Pages/任务/任务-工时.json b/Pages/任务/任务-工时.json index 4ce1003e..a09e35a7 100644 --- a/Pages/任务/任务-工时.json +++ b/Pages/任务/任务-工时.json @@ -165,7 +165,7 @@ }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, + "DesignLengthInPixel": 54.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -175,28 +175,23 @@ } } }, - "16": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "29": { + "23": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, - "Count": 30, + "Count": 24, "DefaultSize": 32.0 }, "Values": { "0,1": "工时详情", "1,1": "工时", "3,2": "计划工时", - "3,26": "计划工时", + "3,20": "计划工时", "7,2": "实际工时", - "7,26": "实际工时", - "11,27": 1 + "7,20": "实际工时", + "11,21": 1 }, "AttachInfos": { "0,1": { @@ -228,7 +223,7 @@ } } }, - "0,29": { + "0,23": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -238,7 +233,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-工时'!AB12" + "SerializeProperty": "='任务-工时'!V12" }, "Value": "0" } @@ -251,7 +246,7 @@ "UseCellForeColor": true } }, - "1,29": { + "1,23": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -261,7 +256,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-工时'!AB12" + "SerializeProperty": "='任务-工时'!V12" }, "Value": "1" } @@ -307,7 +302,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "f8a78c51-836f-402e-80bd-22e164df3134" + "ID": "d1812aad-7ab5-427f-b7b3-ac4f5e4a06e8" }, { "CommandList": [ @@ -346,12 +341,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "6bd2e166-6132-4eec-9818-188e4a2f7c34" + "ID": "9d2b57be-d6cb-4f18-aa7e-0504e7ef4ca3" } ] } ], - "ID": "f2eaf479-d494-43b4-9736-b18a74a0001e" + "ID": "b252d2be-40b6-456b-b3fe-d36632f47021" } ] } @@ -360,7 +355,7 @@ "TemplateKey": "Gost" } }, - "3,26": { + "3,20": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -388,7 +383,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "ad37166c-46f5-46ba-8aec-4f88e8afe693" + "ID": "844e9cc8-f688-444a-8af6-28fced7acd87" }, { "CommandList": [ @@ -427,12 +422,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "e4013d7e-b88b-4482-a3fc-f3bfbb6fa33f" + "ID": "52354edf-b7d4-4cda-8909-2826850975e5" } ] } ], - "ID": "06d1f205-be7c-4891-874c-9b62ab9566eb" + "ID": "eaa4caa2-144b-4cf1-8be9-716c2fe32c47" } ] } @@ -485,7 +480,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "7eff0387-78c9-4348-ba43-ab00a515bed6" + "ID": "36d86a32-3c0b-4989-aa18-4ba7c776258d" }, { "CommandList": [ @@ -524,12 +519,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "011742ed-b9f0-4a17-b38b-84987cd5ea6b" + "ID": "74a8f4dd-323a-4e73-b1d5-e7b112423033" } ] } ], - "ID": "bcf125b7-f937-4f6e-99e2-47dca9112eb5" + "ID": "19f628e0-5b9a-4d3a-8d06-4f56a3fd198b" } ] } @@ -538,7 +533,7 @@ "TemplateKey": "Gost" } }, - "7,26": { + "7,20": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -574,7 +569,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "f0ec4d4e-7b17-4540-936f-8920f1137452" + "ID": "ce14dd0d-3a61-49d9-8ee4-937b10c4167b" }, { "CommandList": [ @@ -613,12 +608,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "e348772c-fb72-48aa-8154-3a501b5a7636" + "ID": "400b6288-b3fc-45c0-8068-6b63ea70d844" } ] } ], - "ID": "e8ee92da-f051-49ee-9bd9-cfe0d2a88e98" + "ID": "9f9b0923-44cd-4ff0-8314-719884dcb024" } ] } @@ -801,7 +796,7 @@ "hideOnSinglePage": true } }, - "11,27": { + "11,21": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "折叠", @@ -835,7 +830,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-工时'!AB12" + "SerializeProperty": "='任务-工时'!V12" } }, { @@ -845,13 +840,13 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('任务-工时'!AB12)" + "SerializeProperty": "=NOT('任务-工时'!V12)" } } ] } ], - "ID": "f288cf5e-2ff5-4344-a697-a6c45ced54bb" + "ID": "24d19063-fdab-41e8-b07b-7067357b8d4d" }, { "CommandList": [ @@ -865,7 +860,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-工时'!AB12" + "SerializeProperty": "='任务-工时'!V12" } }, { @@ -875,13 +870,13 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('任务-工时'!AB12)" + "SerializeProperty": "=NOT('任务-工时'!V12)" } } ] } ], - "ID": "68264236-0da5-4bd7-a4d1-c388d5f3980f" + "ID": "269e504e-d11d-43ee-adf8-a28380712b6a" } ] } @@ -956,11 +951,11 @@ }, "CellStyles": { "0,1": 0, - "0,29": 1, - "1,29": 1, + "0,23": 1, + "1,23": 1, "3,2": 2, "3,4": 3, - "3,26": 4, + "3,20": 4, "4,2": 2, "4,3": 2, "4,4": 3, @@ -978,23 +973,17 @@ "4,16": 3, "4,17": 3, "4,18": 3, - "4,19": 3, - "4,20": 3, - "4,21": 3, - "4,22": 3, - "4,23": 3, - "4,24": 3, "7,2": 2, "7,4": 5, - "7,25": 6, - "7,26": 7, - "7,27": 6, - "7,28": 6, - "7,29": 6, + "7,19": 6, + "7,20": 7, + "7,21": 6, + "7,22": 6, + "7,23": 6, "8,2": 2, - "8,29": 6, + "8,23": 6, "9,2": 2, - "9,29": 6, + "9,23": 6, "10,2": 2, "10,3": 2, "10,4": 5, @@ -1012,17 +1001,11 @@ "10,16": 5, "10,17": 5, "10,18": 5, - "10,19": 5, - "10,20": 5, - "10,21": 5, - "10,22": 5, - "10,23": 5, - "10,24": 5, - "10,25": 6, - "10,26": 7, - "10,27": 7, - "10,28": 7, - "10,29": 6, + "10,19": 6, + "10,20": 7, + "10,21": 7, + "10,22": 7, + "10,23": 6, "11,2": 2, "11,3": 2, "11,4": 5, @@ -1040,15 +1023,9 @@ "11,16": 5, "11,17": 5, "11,18": 5, - "11,19": 5, - "11,20": 5, - "11,21": 5, - "11,22": 5, - "11,23": 5, - "11,24": 5, - "11,25": 6, - "11,26": 7, - "11,27": 7 + "11,19": 6, + "11,20": 7, + "11,21": 7 }, "ColStyles": { "1": 8, @@ -1063,14 +1040,14 @@ "Spans": [ "3,2,1,2", "7,2,1,2", - "3,26,1,3", - "7,26,1,3", - "7,4,1,21", - "3,4,1,21", - "8,2,1,27", - "9,2,1,27", - "11,27,1,3", - "0,1,1,27" + "3,20,1,3", + "7,20,1,3", + "7,4,1,15", + "3,4,1,15", + "8,2,1,21", + "9,2,1,21", + "11,21,1,3", + "0,1,1,21" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1129,7 +1106,7 @@ "IsAutomaticStroke": false, "IsAutomaticFill": false, "Location": "24,131", - "Size": "911,354" + "Size": "741,354" }, { "Name": "a0c55ba2-d00e-42f2-ba40-0168dedc4f0d.png", @@ -1143,13 +1120,13 @@ "IsAutomaticStroke": false, "IsAutomaticFill": false, "Location": "24,64", - "Size": "911,52" + "Size": "741,52" } ], "CustomNames": [ { "Name": "折叠工时详情", - "Formula": "'任务-工时'!$AB$12" + "Formula": "'任务-工时'!$V$12" } ] -}//aX9e2MvHTXGW42u02Z7RgBikESD3gmg6ZolN0nnw/xht53aGQ6Ou9OC5FYi1I0VSHejFBuytgroju9KmTzn4Fn2IfEqBY9+6yER701tmb35d2FGdsbvfS4XPf6j5jnTwe/G4vjZxKIsGFfR66/F8z5pwxKmI+ywCq5t6f3pPgWoyF150L8aF0NsNHfrg8pr7dr2HV6fra/aK15OW8dRD+pblzT46Ja5Zj3wRPYtABd8GbL4I1wJzj+dq/Ngn+0fO8euQYUNxLXonz38AqM8XqQEdVGUG2t5zD5E/5iPelNkAU0QPL2cXK5rRhrEoL15Am7CEMeJdnB/AsmqCxS3tDK85iGdMuKL3AEfS4xiH3gJCldhE3PsNKWSDLxIJIHdnHuBDTIovF28k4tFezRYuyUp0jV9OyL/fEQYUNcGiEdy8HKBBvQgwV8jnRHd9Lu9NcKamapoTf8uAFt2AueA7lVK+D1cAOnmitVXLf/nR8PHpk1ZKzdZnVSg2FF0NAYBPGxWNo+N9tOUBexsozix9WYKlcVQg+GrnzaxMYJVYhvlkDm6AjxxjGPMZu+N0FXfivBqqUzMDJ2dIw6nD5920LrRsev8D/IaclSsuwJu/tbAVIfeYAWumOR0O5ZEysjzI1Pu7Fpw3qPJR8/hU8wQzsIUbHVxTb0WCWOzNeMFq+HNnVEPArbvf0RtsGvUcDJo/8g5JPy2zQMitmZHbN++GC5EPjSdDHT/3+zCODWDO65WkIsw24sMpCmUWuaJPyZeSs3CxZACwhRZrWsJcRsOUyAks2OryM5TXu654k3fNxu8iNVKfwdCIPcFWJQ0cpLRB2QDnHJBpYYTP5w0XGBSqar7FNINjO3ClWrWKxF7NIJpgvGUhCaSjFGN9lRL6UJ+/sfPhOOem5NjMF8EBkMWyeQ==|920 \ No newline at end of file +}//WT7yyZS+v+bYOb5xjSPSQy3PFmMaLbZhJHNN+65y0PBKNT8AGfIir3eUYaTQh8wVgVtaXjKP8aqr9Zw02FpwfeRvrP7/wwY+s8M8fe69AY0KOPloBH+qTrhlnKi0VHTl2dQ8UTe2nWkDu29rm3W5/LIueQ8+m+5sW4ioY+w23J89GyfQnA6ayep0h70ULj3kpqn0fG6U6zlNeuLlPNKl55ZmE3eOrfQwFWsuJ848S9E7qFRJFsYpN0X+caYOWTUi6oNlyfHVfg9r3OULCbZ3sjU2cvDtku0lcJpT4R8QpIrQjajdRaGUDwrXNG72oFCMmBzEw7Dqgzz5fwN2wf/3+IDLtiH6QoT5vxfw/strlCbFNEw6YL3rTtbavyAAw8JUd9PPTBHEH9ASLhd05Cd2EqztPbRlQK752BwEFkFydo7GUa1UsM444FnshnRqFBwmF7Z/uEA+fTmm2ax6iINSTs+x9O0G17+b56SFbi5LkGLOo5uB5MaAFlG383CAobIPWPHBAxhu9qFzaNPavMBvQAxItri3qW1AaRP37FSN+Rou++PeauP686lrOjZpszO0n/fqvj0jeYYLwBYzjGsb25nPvVJvGJQSIsHwhSMRHeKOJ0soTn4H/SLiTYJykkxHPZe/K/izXveccYUdm251r8gQsqDBlGWwDGak9CkHENawlKgUCnqLMYmLK05WXFa5sn9YK9HlpaV02GqtcW9I1DFhGAvJT23aAsFhLFwBL0rvmhS2SdxeP4z+tbuNndoHzjydryAdwMT/jyKBD3Tp0GQ1QRSocRnSENDOd4Prq7BAq+FaA17UZtr5lScx4xxnakQFca7KQNxAlLvLNc39Jh+2vsV59rOHfrb5C7KuwVwTUAcgwov/+8M0XoLSI3pdnDPFc/mztGiOO4Q99AaAmg==|920 \ No newline at end of file diff --git a/Pages/任务/任务-工时.rd b/Pages/任务/任务-工时.rd index ff8a5e48..62e3029a 100644 --- a/Pages/任务/任务-工时.rd +++ b/Pages/任务/任务-工时.rd @@ -1,11 +1,11 @@ { "PageType": 0, - "ColumnCount": 30, + "ColumnCount": 24, "RowCount": 12, "CustomNames": [ { "Name": "折叠工时详情", - "Formula": "'任务-工时'!$AB$12" + "Formula": "'任务-工时'!$V$12" } ] } \ No newline at end of file diff --git a/Pages/任务/任务-进展.json b/Pages/任务/任务-进展.json index a1bdb19c..259f5922 100644 --- a/Pages/任务/任务-进展.json +++ b/Pages/任务/任务-进展.json @@ -134,29 +134,20 @@ "DesignLengthInPixel": 32.0 } }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "15": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "28": { + "21": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, - "Count": 29, + "Count": 22, "DefaultSize": 32.0 }, "Values": { "0,1": "任务进展", "1,1": "任务进展", - "3,2": "新增进展" + "3,2": "新增进展", + "6,18": 1 }, "AttachInfos": { "0,1": { @@ -188,7 +179,7 @@ } } }, - "0,28": { + "0,21": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -198,7 +189,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-进展'!Z7" + "SerializeProperty": "='任务-进展'!S7" }, "Value": "0" } @@ -211,7 +202,7 @@ "UseCellForeColor": true } }, - "1,28": { + "1,21": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -221,7 +212,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-进展'!Z7" + "SerializeProperty": "='任务-进展'!S7" }, "Value": "1" } @@ -347,10 +338,9 @@ "TemplateKey": "竖排无样式" } }, - "6,25": { + "6,18": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", - "CellDefaultValue": true, "Caption": "折叠", "Style": 1, "CommandList": [ @@ -364,7 +354,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-进展'!Z7" + "SerializeProperty": "='任务-进展'!S7" } }, { @@ -374,7 +364,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT('任务-进展'!Z7)" + "SerializeProperty": "=NOT('任务-进展'!S7)" } } ] @@ -440,9 +430,9 @@ }, "CellStyles": { "0,1": 0, - "0,28": 1, + "0,21": 1, "1,1": 2, - "1,28": 1, + "1,21": 1, "3,2": 3, "3,3": 4, "3,4": 4, @@ -466,13 +456,6 @@ "5,18": 5, "5,19": 5, "5,20": 5, - "5,21": 5, - "5,22": 5, - "5,23": 5, - "5,24": 5, - "5,25": 5, - "5,26": 5, - "5,27": 5, "6,2": 5, "6,3": 5, "6,4": 5, @@ -489,16 +472,9 @@ "6,15": 5, "6,16": 5, "6,17": 5, - "6,18": 5, - "6,19": 5, - "6,20": 5, - "6,21": 5, - "6,22": 5, - "6,23": 5, - "6,24": 5, - "6,25": 6, - "6,26": 4, - "6,27": 4 + "6,18": 6, + "6,19": 4, + "6,20": 4 }, "ColStyles": { "2": 7 @@ -509,9 +485,9 @@ } }, "Spans": [ - "4,2,1,26", - "6,25,1,3", - "0,1,1,26" + "4,2,1,19", + "6,18,1,3", + "0,1,1,19" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -569,13 +545,13 @@ "IsAutomaticStroke": false, "IsAutomaticFill": false, "Location": "24,64", - "Size": "944,316" + "Size": "720,316" } ], "CustomNames": [ { "Name": "折叠任务进展", - "Formula": "'任务-进展'!$Z$7" + "Formula": "'任务-进展'!$S$7" } ] -}//YHrlh6mUCOnuX+0yTh6iTa45PB5bXF13EDn02C9gjQocEGs3SJB+HtoxbSnJ+bdjBbP1AS+qIJhyloQhOIqys5zNZVLJcleLOCwc1z4b1IEr5C67y9rBsIxiK5KqEQTvLIhU+pi0fdi4UiIeSv+UQaBZWL0vdGCBk1+8eFtMgCjuxYwo8e/mL/WQSpND6jdNBNLB1kPJVJDrH4j0xP1tD75MVCiLXlZJSSta4RoBCu6zOTCpNor3WaRfCF7YOZ7dWIGRS2alY6U7CscSquLws7T4PPBx1SThy2/qqHlyLmwwe7DEVupcSbLzRofGoEW/n0sS3Zt/4m4JwR6Yf6uNPQ4SSu8dEAOa1l++bdHXA37w2qCIDLo9M/3RmTT2ip6X8s5mOiEqm5WF5Bkj6QclnskRMczQjlgfwzyyT8plalJx1EQ/C/GY2JBzACswum+uIYqOE3ka1BcVpD39gwXKLOvWwYnoyRPMznzXIRKxBR1tZonmWkxmXkBAkjvZ7SNZHOlzQH0ORDJzkevuVg1msi6N22YkaaKhs0eGklrgaDFHRh5xXAZ3Lb+hb9F9cdxEeMITJb8kQddC5JAEPU0X/aare9+6qY2oS3S9p2Xei4cciPzpfhD6WzmmpBrLOz21xRyT1sXBLq5/Blnv3k7EcQCAJmfSninvBVYRUsI1p1p+egpv1RtsG2IQ20+T+aTD2cZAHKYKbJO+ZKt4XCtXQhMORoZ7QWGOCCBfpTDfhapSvNgsyH8Ei77ZrPdL61RQ/uL1RAkmP+/zvsZRm3SMD11hsWUGjy+/6rl0HQ46Flc63QF+h770aU+uNKBPZd32BE0PYOcDURmxRBx/VpXK4PFOUzPF5T4/pzC6n27kuvay5tznUCYyuc8K7hgz8e/Pf897aleG8f865j1JqcL0ow==|920 \ No newline at end of file +}//EqJm0NYCtGSZ8ZrFlZLK+dgq9MWOgv+vxFQNu6tq9vSoYoWjAH0fTBSOdZHIAwp2UvzbNq0Cuso0quTHOELL7J8L7TKWGFm5QZkrrb1KSsrgz7u+5mLs/j1teod4Cv/PJTiYd81p0FoG8XVf2HT3GsNv31rWbYujP9smZP0T7wUwIJP7wqMIgAZiVxmqRm9U4sU/YVH6IIpOtnf5VtOJXFATOyYOo7ONGGnHrM+YgOab2KGAjyvLAma+RQDYI4bB8IPs4XXaCYwY3345YL1PzEjYZ7JvsqbQODIoKLH9+lnMoH0lt9gRyKYBJTImAKaf4mt2zbB4CUIbAqauQ2PQ+UlyDn4DfI8qYr/gYuJWtPit2kOnRJrPuExtBv/8byeTqwgdXnnATM3g7WtEhe21Euno0nDbDWAyAGnVWNrVjSXzU3tWEm1pPrqkNFNhQ0hz24+Fo+1cAcAMcWqC6gIJ5WG+LQ2vuBZE2PBZi7r+mUBLcHdrNVEy+beaosclSgDE3m9VElXze2IsHbrp5dTEYsqp4OU+TTPhsXFx06KIprnEMCGQNiZaQkxCHSEdlzlg6QkMrbpKw7/+/aRiwpToAdLxj2XMeiE7vqa3racKNhJa0hGlXurVHdZSEo9p0gjswKroOjtHrKVAYo1sNrhsIh/BdVXHzPexMb/i0v8VgRANrWKUsKJRxcdYhlhnFP/MBdFfpG9li4m7MHxa8MYgeSLP2C2UGEE6pzd3EAhPex0Pji/Rzd9kPIY+fj8ORRWaoQh/qvyEAdP1hnoJCdorZAeiszk6EsFW1wpwzP4uX5js+dtbx+mSh7myZ8uqo6I5m9gmxMV3ay8AGZeFhACVoAyodaxfCvbaGZUS7q5tg/ityYD7RhjiuMbMW2yM6X7gxjppajP3Vds6PBIhdlBTgQ==|920 \ No newline at end of file diff --git a/Pages/任务/任务-进展.rd b/Pages/任务/任务-进展.rd index 06b3cc98..fe343902 100644 --- a/Pages/任务/任务-进展.rd +++ b/Pages/任务/任务-进展.rd @@ -1,11 +1,11 @@ { "PageType": 0, - "ColumnCount": 29, + "ColumnCount": 22, "RowCount": 7, "CustomNames": [ { "Name": "折叠任务进展", - "Formula": "'任务-进展'!$Z$7" + "Formula": "'任务-进展'!$S$7" } ] } \ No newline at end of file diff --git a/Pages/任务/任务部分.json b/Pages/任务/任务部分.json index 169b869b..6535dec8 100644 --- a/Pages/任务/任务部分.json +++ b/Pages/任务/任务部分.json @@ -160,22 +160,22 @@ }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 40.0 } }, "14": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 39.0 } }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 40.0 } }, "16": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 40.0 } }, "17": { @@ -189,56 +189,6 @@ } }, "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 - } - }, - "20": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 - } - }, - "21": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 - } - }, - "22": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 - } - }, - "23": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 - } - }, - "24": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 39.0 - } - }, - "25": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 - } - }, - "26": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 - } - }, - "27": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 - } - }, - "28": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 - } - }, - "29": { "GridRowColumnDefinition": { "DesignLengthInPixel": 159.0, "Mode": 2, @@ -250,13 +200,13 @@ } } }, - "30": { + "20": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 } } }, - "Count": 31, + "Count": 21, "DefaultSize": 32.0 }, "Values": { @@ -341,9 +291,9 @@ }, "CellStyles": { "0,0": 0, - "0,25": 0, - "0,29": 0, - "0,30": 0, + "0,15": 0, + "0,19": 0, + "0,20": 0, "1,0": 0, "1,1": 1, "1,2": 1, @@ -357,24 +307,14 @@ "1,10": 1, "1,11": 1, "1,12": 1, - "1,13": 1, - "1,14": 1, + "1,13": 2, + "1,14": 2, "1,15": 1, - "1,16": 1, - "1,17": 1, + "1,16": 2, + "1,17": 2, "1,18": 2, - "1,19": 2, - "1,20": 2, - "1,21": 2, - "1,22": 2, - "1,23": 2, - "1,24": 2, - "1,25": 1, - "1,26": 2, - "1,27": 2, - "1,28": 2, - "1,29": 1, - "1,30": 3, + "1,19": 1, + "1,20": 3, "2,0": 0, "2,1": 0, "2,2": 0, @@ -396,16 +336,6 @@ "2,18": 0, "2,19": 0, "2,20": 0, - "2,21": 0, - "2,22": 0, - "2,23": 0, - "2,24": 0, - "2,25": 0, - "2,26": 0, - "2,27": 0, - "2,28": 0, - "2,29": 0, - "2,30": 0, "3,0": 0, "3,1": 0, "3,2": 0, @@ -419,14 +349,9 @@ "3,10": 0, "3,11": 0, "3,12": 0, - "3,13": 0, - "3,14": 0, "3,15": 0, - "3,16": 0, - "3,17": 0, - "3,25": 0, - "3,29": 0, - "3,30": 0, + "3,19": 0, + "3,20": 0, "4,0": 0, "4,1": 1, "4,2": 1, @@ -440,24 +365,14 @@ "4,10": 1, "4,11": 1, "4,12": 1, - "4,13": 1, - "4,14": 1, + "4,13": 2, + "4,14": 2, "4,15": 1, - "4,16": 1, - "4,17": 1, + "4,16": 2, + "4,17": 2, "4,18": 2, - "4,19": 2, - "4,20": 2, - "4,21": 2, - "4,22": 2, - "4,23": 2, - "4,24": 2, - "4,25": 1, - "4,26": 2, - "4,27": 2, - "4,28": 2, - "4,29": 1, - "4,30": 3, + "4,19": 1, + "4,20": 3, "5,0": 0, "5,1": 0, "5,2": 0, @@ -479,16 +394,6 @@ "5,18": 0, "5,19": 0, "5,20": 0, - "5,21": 0, - "5,22": 0, - "5,23": 0, - "5,24": 0, - "5,25": 0, - "5,26": 0, - "5,27": 0, - "5,28": 0, - "5,29": 0, - "5,30": 0, "6,0": 0, "6,1": 0, "6,2": 0, @@ -502,14 +407,9 @@ "6,10": 0, "6,11": 0, "6,12": 0, - "6,13": 0, - "6,14": 0, "6,15": 0, - "6,16": 0, - "6,17": 0, - "6,25": 0, - "6,29": 0, - "6,30": 0, + "6,19": 0, + "6,20": 0, "7,0": 0, "7,1": 1, "7,2": 1, @@ -523,24 +423,14 @@ "7,10": 1, "7,11": 1, "7,12": 1, - "7,13": 1, - "7,14": 1, + "7,13": 2, + "7,14": 2, "7,15": 1, - "7,16": 1, - "7,17": 1, + "7,16": 2, + "7,17": 2, "7,18": 2, - "7,19": 2, - "7,20": 2, - "7,21": 2, - "7,22": 2, - "7,23": 2, - "7,24": 2, - "7,25": 1, - "7,26": 2, - "7,27": 2, - "7,28": 2, - "7,29": 1, - "7,30": 3, + "7,19": 1, + "7,20": 3, "8,0": 0, "8,1": 0, "8,2": 0, @@ -562,16 +452,6 @@ "8,18": 0, "8,19": 0, "8,20": 0, - "8,21": 0, - "8,22": 0, - "8,23": 0, - "8,24": 0, - "8,25": 0, - "8,26": 0, - "8,27": 0, - "8,28": 0, - "8,29": 0, - "8,30": 0, "9,0": 0, "9,1": 0, "9,2": 0, @@ -585,14 +465,9 @@ "9,10": 0, "9,11": 0, "9,12": 0, - "9,13": 0, - "9,14": 0, "9,15": 0, - "9,16": 0, - "9,17": 0, - "9,25": 0, - "9,29": 0, - "9,30": 0, + "9,19": 0, + "9,20": 0, "10,0": 0, "10,1": 1, "10,2": 1, @@ -606,24 +481,14 @@ "10,10": 1, "10,11": 1, "10,12": 1, - "10,13": 1, - "10,14": 1, + "10,13": 2, + "10,14": 2, "10,15": 1, - "10,16": 1, - "10,17": 1, + "10,16": 2, + "10,17": 2, "10,18": 2, - "10,19": 2, - "10,20": 2, - "10,21": 2, - "10,22": 2, - "10,23": 2, - "10,24": 2, - "10,25": 1, - "10,26": 2, - "10,27": 2, - "10,28": 2, - "10,29": 1, - "10,30": 3, + "10,19": 1, + "10,20": 3, "11,0": 0, "11,1": 0, "11,2": 0, @@ -645,16 +510,6 @@ "11,18": 0, "11,19": 0, "11,20": 0, - "11,21": 0, - "11,22": 0, - "11,23": 0, - "11,24": 0, - "11,25": 0, - "11,26": 0, - "11,27": 0, - "11,28": 0, - "11,29": 0, - "11,30": 0, "12,0": 0, "12,1": 0, "12,2": 0, @@ -668,14 +523,9 @@ "12,10": 0, "12,11": 0, "12,12": 0, - "12,13": 0, - "12,14": 0, "12,15": 0, - "12,16": 0, - "12,17": 0, - "12,25": 0, - "12,29": 0, - "12,30": 0, + "12,19": 0, + "12,20": 0, "13,0": 0, "13,1": 1, "13,2": 1, @@ -689,24 +539,14 @@ "13,10": 1, "13,11": 1, "13,12": 1, - "13,13": 1, - "13,14": 1, + "13,13": 2, + "13,14": 2, "13,15": 1, - "13,16": 1, - "13,17": 1, + "13,16": 2, + "13,17": 2, "13,18": 2, - "13,19": 2, - "13,20": 2, - "13,21": 2, - "13,22": 2, - "13,23": 2, - "13,24": 2, - "13,25": 1, - "13,26": 2, - "13,27": 2, - "13,28": 2, - "13,29": 1, - "13,30": 3, + "13,19": 1, + "13,20": 3, "14,0": 0, "14,1": 0, "14,2": 0, @@ -728,16 +568,6 @@ "14,18": 0, "14,19": 0, "14,20": 0, - "14,21": 0, - "14,22": 0, - "14,23": 0, - "14,24": 0, - "14,25": 0, - "14,26": 0, - "14,27": 0, - "14,28": 0, - "14,29": 0, - "14,30": 0, "15,0": 0, "15,1": 0, "15,2": 0, @@ -751,14 +581,9 @@ "15,10": 0, "15,11": 0, "15,12": 0, - "15,13": 0, - "15,14": 0, "15,15": 0, - "15,16": 0, - "15,17": 0, - "15,25": 0, - "15,29": 0, - "15,30": 0 + "15,19": 0, + "15,20": 0 }, "RowStyles": { "0": 4, @@ -770,17 +595,17 @@ } }, "Spans": [ - "3,0,1,30", - "6,0,1,30", - "9,0,1,30", - "12,0,1,30", - "15,0,1,30", - "4,17,1,13", - "7,17,1,13", - "10,17,1,13", - "13,17,1,13", - "0,0,1,30", - "1,17,1,13" + "3,0,1,20", + "6,0,1,20", + "9,0,1,20", + "12,0,1,20", + "15,0,1,20", + "0,0,1,20", + "1,13,1,7", + "4,13,1,7", + "7,13,1,7", + "10,13,1,7", + "13,13,1,7" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -824,4 +649,4 @@ "Formula": "任务部分!$A$1" } ] -}//some99+seAX76Sm+UG4PG7irOT/NjPQK0FEcGdommxJSaEKgBtGYtXVgZuDf91Q790wCRLIbM2OR0F5hBOrQH+7nhgxp8a8+RqpWObtXFQ2GCPFcYDTudYtIWlh9xGY5PXXA4y2wxwd3o/XkSlSDr09dggDF80Kd2BxXd1YU6XcEmC9MBDsx9GeLLJdoUdMLxdK4sRJ4HBn7zerjhuUTLz7GgmbqTpzob4lZpFWkuoen8VD49F6q1bH+2/urozzHHaS7Bebqbmfb3OtxH7Gh1xx/9dZsarFpzxgdky4XFPeOSpiQ2ODyQXWuIcAMOJIEAihs0Ui4Nvm/HTs65OCHriQ+H/c/XR866uuLK1Eg4nMqG5i1NMNozqbBbl5PFjSJ+Ww0iCWA9vtSD59TQb5d8yvE9xe97raOo0Zo3gOlSITogg5yxn6g4My9TlT0PXbwO3H5Jtu3lauZIlqJhm3lGp0S/79UuIB33bypnOwVyiLkUoZqFSQcQYlu3XhrR1T+fF577dGlPqnIZE3jWO0DAqHugpGDd0yxuDjVQZ2qEys3o0o5dE7JIN7ydLUUEVisbJUoKSWJXB9BE6EUHTYcdHU+we5ZMRuBagEQphzN16tLwFkJyjiecHSGYgWi4/+jm18BL4Wlt5WsauDJxLITncOEdXvl8E4Z74uHdSvR4Be0LjfP8sHILA7m1Ng7/xd5wBmj9jL/NJ46skLoUbhrZAPMZKidnL/B35CxgNTqZ2VI4ePptZPyVumTVxWU3IEa+yNYm6ehTfX8HAMt/t+xwW8WHZLxlzKbBrOXX8zZWH2U35ovrOtflbH160kVKIIMAcSiljDhcGtpiXIFUMgojNi3kceE6P7Br25AEBReOFbdIqcNF1XHm4tmdzu15I/k2d/iUCODvkehYKFwCz5Hcg==|920 \ No newline at end of file +}//lSDudjxOWddtNutDB8SJeGQCFwKG46gQkffVtUehLwWFAuKyt7NbK2nOOrVZWDwFBH5qobphA7vcD3nRA8nNqYdGV5TaZRQf2BYbqMJ5nigCpbFetm6JXd/Hn9Ztf3awJWuAvgz/rlW7Paiq/baQDokT8vUSuaC6mP7oyvENJSBCL3ohadpw3H7meLhVxPCSyM/PnJKE+1pp18uDy2GlXl7NKUbbyWYfTowMq2nQs7Gi6TgZmXYOOsccMoiIYRE9kIWYVKNUAqesho///yY1jFWWw+9U4gJyGCEQ97f5CiRPu8ztBAa8gSfjYOsQXl42Kg/1AutmoCCQlJUYa7Mwx53uybKTkLC9XHRxW+DbyWsUCWOQz3XK+hqbWB6o3LZxLYjRqyngP4by5VQmGxBzFzZWI977uAT+z4zD9sQp/C3zCqofDC7PijxLEts7O2RVIR4Cc+tOS/TKU9c4T9gpOI6lWP/lV6DFD/SSEMU2+dc4qBVJTmck2tvXnrqkr/yhrvBAPOuE+2n6CFGZZBpYiIi6TVBer/KvH7IwsMp3ISYXYWA3KBWNvFTDKNXA5oqThqF9lW9Zx/jPAM2vGb8RWjVSt/QcfcvWepw11WkcQDYRxIGbBa2vhBgZCE1WKUFZlMdVqxkYOsyh6d7YDTgz9LdJZgkfOpxhjva+7crkgntMTsSKULGNznwccomkGWhrd5jzNFUCCVT9JTYMCi+kcbplnX+rAja948bZ2sw6idWG8pA+soqTu5dHPyLfLmuP5M4kgEyXjclt5ttV0lHRtIOxQFtCt+BTmW5NessMi/74t5tn6ffpHvNeOMV6DchFnJ19n1EqblOx0KR4maujnEKb16NV9XxMQQurvfJULOtAElLrJHInDkCPY7aMyBts3IsWvxpLf/gC/vrEVmQdPA==|920 \ No newline at end of file diff --git a/Pages/任务/任务部分.rd b/Pages/任务/任务部分.rd index fd1a4b9c..37191136 100644 --- a/Pages/任务/任务部分.rd +++ b/Pages/任务/任务部分.rd @@ -1,6 +1,6 @@ { "PageType": 0, - "ColumnCount": 31, + "ColumnCount": 21, "RowCount": 16, "CustomNames": [ { diff --git a/Pages/任务/任务首页.json b/Pages/任务/任务首页.json index c7ae4d9b..91f4caa3 100644 --- a/Pages/任务/任务首页.json +++ b/Pages/任务/任务首页.json @@ -38,7 +38,8 @@ }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "IsHidden": true } } }, @@ -130,12 +131,12 @@ }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 40.0 } }, "16": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 40.0 } }, "17": { @@ -155,7 +156,7 @@ }, "20": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 + "DesignLengthInPixel": 39.0 } }, "21": { @@ -164,36 +165,6 @@ } }, "22": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 - } - }, - "23": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 - } - }, - "24": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 39.0 - } - }, - "25": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 - } - }, - "26": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 - } - }, - "27": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 - } - }, - "28": { "GridRowColumnDefinition": { "DesignLengthInPixel": 40.0, "Mode": 2, @@ -205,32 +176,32 @@ } } }, - "29": { + "23": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "30": { + "24": { "GridRowColumnDefinition": { "DesignLengthInPixel": 400.0 } } }, - "Count": 31, + "Count": 25, "DefaultSize": 32.0 }, "Values": { - "0,30": "任务-侧栏", + "0,24": "任务-侧栏", "3,0": "任务部分", "5,3": "任务ID：", - "5,8": "项目ID：", - "5,17": "参与人数：", - "5,23": false, + "5,7": "项目ID：", + "5,15": "参与人数：", + "5,19": false, "6,1": "工时分配方式：", - "6,8": "总计划工时：" + "6,7": "总计划工时：" }, "AttachInfos": { - "0,30": { + "0,24": { "CellType": { "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", "PageName": "任务-侧栏", @@ -258,21 +229,21 @@ "GUID": "2c5a4904-3a02-4c35-9080-be6d81c7674b" } }, - "5,11": { + "5,10": { "BindingInfo": { "TableName": "项目表", "ColumnName": "ID", "GUID": "83e8051b-34cd-41da-a2b4-9699687b73bd" } }, - "5,18": { + "5,16": { "BindingInfo": { "TableName": "任务表", "ColumnName": "参与人数", "GUID": "dd68b5dc-2111-47fc-92e0-c24293bc5265" } }, - "5,23": { + "5,19": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "收起侧栏", @@ -284,11 +255,11 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务首页!AE:AE" + "SerializeProperty": "=任务首页!Y:Y" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=NOT(任务首页!X6)" + "SerializeProperty": "=NOT(任务首页!T6)" } } ] @@ -296,7 +267,7 @@ ] } }, - "5,26": { + "5,21": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "折叠全部", @@ -382,7 +353,7 @@ } } }, - "6,11": { + "6,10": { "BindingInfo": { "TableName": "任务表", "ColumnName": "总计划工时", @@ -448,11 +419,6 @@ "BorderBottom": 1, "BorderTop": 1 }, - { - "BorderBottom": 1, - "BorderTop": 1, - "BorderRight": 1 - }, { "FontFamily": 0 }, @@ -493,15 +459,14 @@ ] }, "CellStyles": { - "0,30": 0, + "0,24": 0, "1,1": 1, - "1,29": 2, - "1,30": 3, - "2,30": 3, + "1,23": 2, + "1,24": 3, + "2,24": 3, "3,0": 4, - "3,25": 4, - "3,29": 4, - "3,30": 3, + "3,23": 4, + "3,24": 3, "4,0": 4, "4,1": 4, "4,2": 4, @@ -526,67 +491,54 @@ "4,21": 4, "4,22": 4, "4,23": 4, - "4,24": 4, - "4,25": 4, - "4,26": 4, - "4,27": 4, - "4,28": 4, - "4,29": 4, "5,3": 5, "5,4": 6, "5,5": 7, "5,6": 7, - "5,7": 7, - "5,8": 8, - "5,11": 9, + "5,7": 8, + "5,10": 9, + "5,11": 10, "5,12": 10, - "5,13": 10, "5,14": 11, - "5,16": 12, - "5,17": 13, - "5,18": 9, - "5,19": 10, - "5,20": 10, - "5,21": 11, - "5,29": 13, - "6,1": 14, + "5,15": 12, + "5,16": 9, + "5,17": 10, + "5,23": 12, + "6,1": 13, "6,4": 9, "6,5": 10, "6,6": 10, - "6,7": 11, - "6,8": 8, - "6,9": 12, - "6,10": 12, - "6,11": 15, - "6,16": 12, - "6,17": 13, - "6,18": 15, - "6,19": 15, - "6,20": 15, - "6,21": 15, - "6,29": 13 + "6,7": 8, + "6,8": 11, + "6,9": 11, + "6,10": 14, + "6,14": 11, + "6,15": 12, + "6,16": 14, + "6,17": 14, + "6,23": 12 }, "RowStyles": { - "3": 16 + "3": 15 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "5,4,1,4", - "5,11,1,4", - "5,18,1,4", - "1,1,1,13", - "3,0,1,30", - "0,30,4,1", - "5,23,1,3", - "5,26,1,3", - "6,4,1,4", + "5,4,1,3", + "5,10,1,3", + "5,16,1,2", + "1,1,1,12", + "3,0,1,24", + "0,24,4,1", + "5,19,1,2", + "5,21,1,2", + "6,4,1,3", "6,1,1,3", - "6,11,1,4", - "5,8,1,3", - "6,8,1,3" + "6,10,1,3", + "5,7,1,3", + "6,7,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -627,7 +579,7 @@ "CustomNames": [ { "Name": "参与人数", - "Formula": "任务首页!$S$6" + "Formula": "任务首页!$Q$6" }, { "Name": "任务ID", @@ -635,15 +587,15 @@ }, { "Name": "收起侧栏", - "Formula": "任务首页!$X$6" + "Formula": "任务首页!$T$6" }, { "Name": "项目ID", - "Formula": "任务首页!$L$6" + "Formula": "任务首页!$K$6" }, { "Name": "折叠全部", - "Formula": "任务首页!$AA$6" + "Formula": "任务首页!$V$6" }, { "Name": "工时分配方式", @@ -651,7 +603,7 @@ }, { "Name": "任务总计划工时", - "Formula": "任务首页!$L$7" + "Formula": "任务首页!$K$7" } ] -}//9iWcTkxJ7wb3iqOy4Z7eqTreJROVl4qRJuczkE8bJYrIeCiWt23ZIag9oSCGHKBdIB1eDVWY29WSQQyj9HWlUGK/TU/z/wsRus0hbyvZZQ7wLOvc3s4+5PIT2/bsQ9Y0HLml8rXMYr5jdg/ARhFnrxmKYZOIy0SvcEyczoDf214ZlHzxPAyUUeER8BiUG0qK3MLKNcpxsSOShZX+XRyDWVgNTTeyd31MwkZTZykhU9rJVAWSaPeIzyhOq8j6Q5c4b8uBxoGfurmTbC5RqbxkkSWxV4Zc33kmmppNG9ri+KA7X6OIR3cfq8GII/1d0ibFY59wqHpVxVJZUzFCSAJWrSgaFmjWv4uaXH6jbVEkT4lBuP/A0haOU7Ft95MiUYxfDZhIjI7BHVeo8pCGqlP2F7Vi8wre3mUTSEfx3PUJZrDg0xfeTEO1WccP3HWD/atGOWu7TM++ImZCvnRB7CG3XFUWWK8CyKlH6RIS53twDe5SguLwVtR44WX1kut/GmtKBGggj9MRG59DxHrPqM2aItNRn5kMKqg+z5Xyet5wESuCo4BpWd1io4bdujNbzsTZgVspcq6iQiNtC4xuuZAGvjzNynZVq737gZD40dXHLdJN7s8EhY4EL34HeICnFEKHLQRKNOUM9t4bc9Q3e4j7F7x4fmdjJtL6jdECKLxH1Xew8NeQ2++XERL5xTJ4rvR+NGEPG5ZF036dmYIem9o6zLY5qn0YEnNVrrvdFvxbwILwh7+Tq8Ca4tXK6znWrKJ+n2r3gxIDaFPTs5DDSUDmRHPDd0csT5g5+/J/tCKrKwTNtVdEO55bZOdFOedOxZYGHvT1+muW2JVKF+wjjUgCjol7dM7BgdyaA57XHtziO4Zg/Ev6hztMx1eobY/Fl2xHNJJVr1i6HJMkZVdcrN5usQ==|920 \ No newline at end of file +}//FEWyRMsH5Qa/QB774LlDuBOCTRl02zsfDOHJ6CTLDIP5qXuyEw/776vKgRL+qdcsVrup9/Aqh8puca90YblMEEXes8C8iQwP8q4L5t2+m6UgOZS1CJ/SU2wibXcmjmGkAoo1IG+M87KNjt7K4DqVuGJc6xezf+JsQ5SLbhwnxCOdimAik0//Goth3YUC28Kc07kW1tQn5Ki0ORK5UXoCyIheprzWWWN7cGfLlUtWkGmovbogtFEdReCZaqLPpvVQ6iP/oOzp7lSEzbTADiWfX57/DfsOo6dj8Kc/vPLc4AadvLJOHPGlja03OqSn6p9s2HKIkHdKeRMBpuWs1AODqN0uLcflCNTWTG7qA/MCEfboU2o+bxQ/YyLNJfelC2w161zxYnEp4Xm3/Xb2ir4CD2Ljv0Ep3OtGZHHmr+lPZHY7wzRzmsL16uGIxDzRiEgKXRUDvs/yVTvj77QqwLOWIsgyLn0joibufkSWJVsvU/P23i7dzVmgxlO1QIbU2FFtkwYIr1Xf4uCAoAMG8aPVCMUn8AkcMF8JrEq4eIvb6utvj8UPn1SMBl2mSnsYOPbx7Zydv8q9oVbPO8UGQQNWez3/GnGqNqq21Quh9Q0QLlaR0L3RpHmuncVQEtC6x9MVY87EQbyzSLAbHkaAKZBf8jeGUAUELHaA++NB10EikO9fALzLOu/nU5auQ3g6DP3CWpGq5VAPX3SEbgI9uCql2bLjT40AUHVOxy+IAv/W0gxAKFEaUEyIYW8O9R+1MDDLrW2zpzmuDDeciMZDtR6ogaOvY/J8TMVH9Ph0APO/CnEaAKs0yVMzM5K2sWFcAGLQSuRIyuAruwP2EsHZ2UeyFx7vccv0DDesQtw+a7XQ6bO21sUlflQs6dOsVbYajXaB5oWGx6JyGxYHl3y7KjEXJw==|920 \ No newline at end of file diff --git a/Pages/任务/任务首页.rd b/Pages/任务/任务首页.rd index c60e62da..799890fe 100644 --- a/Pages/任务/任务首页.rd +++ b/Pages/任务/任务首页.rd @@ -1,11 +1,11 @@ { "PageType": 0, - "ColumnCount": 31, + "ColumnCount": 25, "RowCount": 7, "CustomNames": [ { "Name": "参与人数", - "Formula": "任务首页!$S$6" + "Formula": "任务首页!$Q$6" }, { "Name": "任务ID", @@ -13,15 +13,15 @@ }, { "Name": "收起侧栏", - "Formula": "任务首页!$X$6" + "Formula": "任务首页!$T$6" }, { "Name": "项目ID", - "Formula": "任务首页!$L$6" + "Formula": "任务首页!$K$6" }, { "Name": "折叠全部", - "Formula": "任务首页!$AA$6" + "Formula": "任务首页!$V$6" }, { "Name": "工时分配方式", @@ -29,7 +29,7 @@ }, { "Name": "任务总计划工时", - "Formula": "任务首页!$L$7" + "Formula": "任务首页!$K$7" } ] } \ No newline at end of file diff --git a/Pages/项目/项目列表.json b/Pages/项目/项目列表.json index d0b13b0c..231ced95 100644 --- a/Pages/项目/项目列表.json +++ b/Pages/项目/项目列表.json @@ -68,7 +68,7 @@ }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 327.0, + "DesignLengthInPixel": 418.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -124,6 +124,11 @@ "DesignLengthInPixel": 32.0 } }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 @@ -131,12 +136,12 @@ }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 15.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 24.0 } }, "9": { @@ -219,7 +224,7 @@ "DesignLengthInPixel": 32.0 } }, - "26": { + "25": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } @@ -265,6 +270,11 @@ } }, "35": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "36": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -276,11 +286,6 @@ } } }, - "36": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "37": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -302,32 +307,37 @@ } }, "41": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "42": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } } }, - "Count": 42, + "Count": 43, "DefaultSize": 32.0 }, "Values": { "1,1": "%PageTitle%", "3,1": "类型", "3,4": 0, - "3,11": "状态", - "3,20": "项目经理", - "3,30": "所属客户", + "3,12": "状态", + "3,21": "项目经理", + "3,31": "所属客户", "5,1": "关键字", "7,1": "查询", "7,4": "重置", "10,1": "项目分组", - "10,8": "项目列表" + "10,9": "项目列表" }, "Formulas": { - "10,8": "IF(选中分组=\"\",\"全部\",\"属于[\"&选中分组&\"]的\")&\"项目\"" + "10,9": "IF(选中分组=\"\",\"全部\",\"属于[\"&选中分组&\"]的\")&\"项目\"" }, "AttachInfos": { - "1,29": { + "1,30": { "CssName": "toolbar toolbar-right ", "CellType": { "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", @@ -467,12 +477,12 @@ ] } ], - "ID": "688fc591-f523-43f9-b035-f161d8c9fc21" + "ID": "a2162dc1-2966-41e6-a86c-3d798fcc79f9" } ] } ], - "ID": "79acbfc7-28a2-4fee-ba13-e89996b5556e" + "ID": "75a27b99-57af-4100-9853-f4445e5fd305" } ] } @@ -522,7 +532,7 @@ ] } }, - "3,13": { + "3,14": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -600,7 +610,7 @@ "clearable": true } }, - "3,22": { + "3,23": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -678,7 +688,7 @@ "clearable": true } }, - "3,32": { + "3,33": { "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -803,7 +813,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目列表!E4,项目列表!N4,项目列表!W4,项目列表!AG4,项目列表!E6,项目列表!选中分组" + "SerializeProperty": "=项目列表!E4,项目列表!O4,项目列表!X4,项目列表!AH4,项目列表!E6,项目列表!选中分组" }, "Value": "%Null%" } @@ -815,6 +825,22 @@ } }, "10,5": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目分组详情", + "LoadBindingDataOption": 2 + } + ], + "ToolTip": "添加分组", + "Size": 14, + "ImagePath": "增加.svg", + "UseCellForeColor": true + } + }, + "10,6": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -831,7 +857,7 @@ ] } ], - "ToolTip": "显示所有项目", + "ToolTip": "清除筛选", "Size": 14, "ImagePath": "清空.svg", "UseCellForeColor": true @@ -909,7 +935,7 @@ "TemplateKey": "竖排无样式" } }, - "12,8": { + "12,9": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "b90932e038f94707b54e571ff7cd84d", @@ -955,7 +981,7 @@ ] } ], - "ID": "cafda1dc-336d-4807-b15c-482c56d11c3f" + "ID": "9436f4bd-02d4-46ea-9c6b-5b1e44d72fb8" }, { "CommandList": [ @@ -968,7 +994,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "833cf19c-a862-4d7c-ab1f-18bbc5033b2d" + "ID": "9415c21a-ec8a-42f7-b88a-801869f65cf0" } ] } @@ -1109,7 +1135,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目列表!N4" + "SerializeProperty": "=项目列表!O4" } }, { @@ -1157,7 +1183,7 @@ "TemplateKey": "BlackWhite" } }, - "14,8": { + "14,9": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "显示搜索栏", @@ -1224,6 +1250,7 @@ "BorderBottom": 0 }, { + "FontFamily": 1, "BorderLeft": null, "BorderRight": 0 }, @@ -1231,18 +1258,18 @@ "HorizontalAlignment": 5 }, { + "FontFamily": 1, "FontSize": 13.333333333333332, "Foreground": 6 }, - { - "HorizontalAlignment": 5, - "BorderLeft": null, - "BorderRight": 0 - }, { "FontFamily": 1, "Formatter": 2 }, + { + "BorderLeft": null, + "BorderRight": 0 + }, { "FontFamily": 1, "HorizontalAlignment": 5 @@ -1279,7 +1306,6 @@ }, "CellStyles": { "1,1": 0, - "1,29": 1, "1,30": 1, "1,31": 1, "1,32": 1, @@ -1291,30 +1317,31 @@ "1,38": 1, "1,39": 1, "1,40": 1, + "1,41": 1, "3,1": 2, "3,2": 1, "3,4": 2, - "3,10": 1, - "3,11": 3, - "3,12": 1, - "3,13": 2, - "3,14": 1, + "3,11": 1, + "3,12": 3, + "3,13": 1, + "3,14": 2, "3,15": 1, "3,16": 1, "3,17": 1, "3,18": 1, - "3,20": 3, - "3,21": 1, - "3,22": 2, - "3,23": 1, + "3,19": 1, + "3,21": 3, + "3,22": 1, + "3,23": 2, "3,24": 1, "3,25": 1, "3,26": 1, "3,27": 1, "3,28": 1, - "3,30": 3, - "3,31": 1, - "3,32": 2, + "3,29": 1, + "3,31": 3, + "3,32": 1, + "3,33": 2, "4,1": 2, "4,2": 2, "4,3": 2, @@ -1329,7 +1356,7 @@ "4,12": 2, "4,13": 2, "4,14": 2, - "4,15": 4, + "4,15": 2, "4,16": 4, "4,17": 4, "4,18": 4, @@ -1350,15 +1377,16 @@ "4,33": 4, "4,34": 4, "4,35": 4, - "4,37": 1, + "4,36": 4, "4,38": 1, "4,39": 1, "4,40": 1, + "4,41": 1, "5,1": 2, "5,2": 1, "5,4": 4, - "5,39": 1, "5,40": 1, + "5,41": 1, "6,1": 2, "6,2": 2, "6,4": 4, @@ -1396,14 +1424,14 @@ "6,36": 4, "6,37": 4, "6,38": 4, - "6,39": 1, + "6,39": 4, "6,40": 1, + "6,41": 1, "7,1": 2, "7,2": 1, "7,3": 1, "7,4": 3, - "7,5": 1, - "7,6": 4, + "7,6": 1, "7,7": 4, "7,8": 4, "7,9": 4, @@ -1436,8 +1464,9 @@ "7,36": 4, "7,37": 4, "7,38": 4, - "7,39": 1, + "7,39": 4, "7,40": 1, + "7,41": 1, "8,1": 5, "8,2": 5, "8,3": 5, @@ -1451,15 +1480,15 @@ "8,11": 5, "8,12": 5, "8,13": 5, - "8,14": 6, - "8,15": 5, + "8,14": 5, + "8,15": 6, "8,16": 5, "8,17": 5, "8,18": 5, "8,19": 5, "8,20": 5, "8,21": 5, - "8,22": 7, + "8,22": 5, "8,23": 7, "8,24": 7, "8,25": 7, @@ -1467,55 +1496,57 @@ "8,27": 7, "8,28": 7, "8,29": 7, - "8,30": 8, + "8,30": 7, "8,31": 8, "8,32": 8, "8,33": 8, "8,34": 8, "8,35": 8, "8,36": 8, - "8,37": 6, + "8,37": 8, "8,38": 6, "8,39": 6, "8,40": 6, - "9,6": 9, + "8,41": 6, + "9,7": 9, "10,1": 10, "10,5": 11, - "10,6": 12, - "10,8": 13, - "11,6": 9, + "10,6": 11, + "10,7": 9, + "10,9": 12, + "11,7": 13, "12,1": 14, - "12,6": 15, - "12,8": 16, - "13,6": 17, - "14,8": 1, + "12,7": 15, + "12,9": 16, + "13,7": 17, "14,9": 1, "14,10": 1, - "14,11": 1 + "14,11": 1, + "14,12": 1 }, "SheetStyle": { "FontFamily": 1 } }, "Spans": [ - "12,8,2,33", - "14,1,1,5", - "12,1,2,5", - "1,29,1,12", + "14,1,1,6", + "12,1,2,6", + "1,30,1,12", "5,1,1,2", "3,1,1,2", - "14,8,1,4", - "3,4,1,6", - "3,11,1,2", - "3,13,1,6", - "3,20,1,2", - "3,22,1,7", - "3,30,1,2", - "3,32,1,7", + "14,9,1,4", + "3,4,1,7", + "3,12,1,2", + "3,14,1,6", + "3,21,1,2", + "3,23,1,7", + "3,31,1,2", + "3,33,1,7", "7,1,1,2", - "7,4,1,2", + "7,4,1,3", "10,1,1,4", - "5,4,1,35" + "5,4,1,36", + "12,9,2,33" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1545,11 +1576,11 @@ "CustomNames": [ { "Name": "显示搜索栏", - "Formula": "项目列表!$I$15" + "Formula": "项目列表!$J$15" }, { "Name": "选中分组", "Formula": "项目列表!$B$15" } ] -}//bZ6hHyJyBWTj2zFMpaEt+pr94e8vIymuWbgcidk/ggJayFi/vFeZJzOULvS1o2c/zXQatmD6tF31NtCPxWs6oiu2xrmZmmkaEwT90Wd0jd9UG+MW5q9ZiwWKuEIKIkt82AqAuRTyZ0mZTx7zXspICWRj+o2lQbBsuMBk0sJUppIj2XlaXVlOLXcfH71GjUW0wDjoRpM9Cwp1zshlM6m6dRk/g5909ZIOQs575rR9rxr7pEweKx+YPvUW/T4nSvS8rFh2iLLjuAOf2G0yOvziLIrz+hwS4yQGbecZSoG0UwrUQgo1pZibogqyLgLUuqFNzRaUBEu95lpzteHY71iI6PwFlt17XL7RHPgJ5b0MCaYne0XOS6scRt1J7mbBveYYVWoWKUAi3JLjzKwIrNJT5h5qVm2+N5mrW3HuZFiDTv24WalvZMsx/0bTMyqI+JBAyXyXMzJhiBSXeCpFz6LLZ2E2DFrsrIefTixtrKC2THMOSIa63F8FvA7RteLQo+BDCfSl3KEJakgjG/3o0vj5Z121MejV5Jzyps/w6PkK211oe9n2dgbJ9vYS4N+732qXCnwquQz6zqzzY3wWDIqJfZNgzWPM5XzR7YyLwigyYEiUXXlkQTrxk+1zHloI7Bi9cLwpUBJkr0aCGqPo0fS9Sxy6wa+SFmsI9tlUO9sM93nF9ucfCcKPKv/ikgNsEynRdAl8PsobTKhXXt+fAq7q8mVK9QLMzCtcpQzSEi7Y6TYYwwnflLjkshWqBXiUMwOM35OI6lXlAgC+ji2mXvYvt+Ocx/dlonjq9uzF0UsAcMYwi3M2QY4vNiwSerKV2p+2NwC+UFwAujinRLp+HDSgKSgGbcc1rLOQ4tkpi80GH94NC3Vi0qi9ZmnBj0A1qWKQY2kO6IAHrZ3jXJk9JZMn8Q==|920 \ No newline at end of file +}//U/BDgcJ5l/EeWnMp7PXu3s0g0/mRc/X5Bgb5WMAQZv1D6oLuIicG0FHIim6AZpONE2Wcs1U87eV6dQrg63IeXieFZFyC8ZbqDqovi0S2XycCneHbeUa6mcR014ZmMYW6XzN5/xT1pT6125neLsF2bhtCBWzPSrw8xBDeI+f0EW8E0Rc+XOzmcpcdueCMLN4acn0+KKwFkSAfq5ZBj8QjLkBbjDwxyYBDEcegOpRU7uRzuohs7z8IFCzOadNme46EZm9r0ECU7CDTVzOrbDENaj4TrT4FGzra5cMJ9XjKVchlF9YUXnevUyzG8Dt6q2thpYts/SlmPR2h/nftFqL2A4Ek+H/Z450KlMa8/FFT3OPP1vlLLEFfuWgek3uvjzfL2bewPjQegj9u2vh3eik2vsBozSXrzopIHoHnHI2XeMeh9mROVaaKBIlLlfiCxzSnuBM2jUuYJj2lLELKLyjFmIdAfReg7jLVtK3btiTG+IQJkuFz9Ctrhp+la/V8i4W4T+SUSA3/ciYMsdf0fPFIWJp0j9cXWPey6Tl/iqfZCNqjjjRQ1M/Lf/BGi0r8QWcWe1H2oYdtkYYAQw600LngcGmyydiI2rmw8AuqAqSzf1q4a8tLc2jke5nM6oRWg74OCt8sXxgKGkCQORBXPJBTNUcO6X/+EtnrFD9IbS7hDEq4Ni7rLD3nHG0yIi/JzhsyBzpzaqRWXlSPpac0FVApDmE++gm/C0W7AOHUL0vx8VYuKH/uWqv5NQUH+Iy0vk7AfbmLWiOc7uhDhIcwh8daM5UmhARX+2exhMi9qqPDwtPzbEsnjH8SbMn3hBp9ab+5h/JkwHSdRKO1zsyBa6HuJMX/b/7oeVO7sWfUroDoCleK8jVDGfAxT9Jh9C5CBq2diPmFo9QHMtoVJ7XOr9zavg==|920 \ No newline at end of file diff --git a/Pages/项目/项目列表.rd b/Pages/项目/项目列表.rd index 77fd600b..f8a45a33 100644 --- a/Pages/项目/项目列表.rd +++ b/Pages/项目/项目列表.rd @@ -1,14 +1,14 @@ { "PageType": 0, - "ColumnCount": 42, + "ColumnCount": 43, "RowCount": 15, "Formulas": { - "10,8": "IF(选中分组=\"\",\"全部\",\"属于[\"&选中分组&\"]的\")&\"项目\"" + "10,9": "IF(选中分组=\"\",\"全部\",\"属于[\"&选中分组&\"]的\")&\"项目\"" }, "CustomNames": [ { "Name": "显示搜索栏", - "Formula": "项目列表!$I$15" + "Formula": "项目列表!$J$15" }, { "Name": "选中分组", diff --git a/Pages/项目/项目首页/项目配置/项目配置首页.json b/Pages/项目/项目首页/项目配置/项目配置首页.json index 810591e5..1aee73fa 100644 --- a/Pages/项目/项目首页/项目配置/项目配置首页.json +++ b/Pages/项目/项目首页/项目配置/项目配置首页.json @@ -108,12 +108,14 @@ }, "21": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 36.0 + "DesignLengthInPixel": 36.0, + "IsHidden": true } }, "22": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 36.0 + "DesignLengthInPixel": 36.0, + "IsHidden": true } } }, @@ -343,11 +345,5 @@ "PrintInfo": { "PaperSize": {}, "Margin": {} - }, - "CustomNames": [ - { - "Name": "项目ID", - "Formula": "项目配置首页!$B$22" - } - ] -}//0xL/jEn4CjiKKOUlMzoxN9pkhRjSEG/GOiw/HvYfAJZhV7Qd1knDZoksknEiHW5etZAVtDegfyXrAt7XOUezK5LkGTh2rjuzGjWR0FujLJcdQ6hV9pxAVcextN32oKz2BZa1Vy49jtipYf7oF3nBRFtxHKXhsIiD7RwJPdoOmrVh5kmZzKFs0MrWo3f9eBsg/7WqTnILGd+5jDSXHNwumNJmE4qlJ0Ro9rO1Eozsbs3oNEmzBiImMRwKFVFBGQ7FCNdLHc4z6Y+iq/KLtEv5zqj9NsPf9tO/nnwQTC6LDaOGcPu/uSJVPSGd8DPzQKep0qa3IFQyYMqvlhLENIGdkljeiWT2vjHeilzrv0rR34Ij+eGSaOkJrIQTKcBuxiEaZacjJopc25Jl8VRJDZnnfHzjmUk1r8cDVcpdXoOn/k57iqnvmCPEaWBJz1vDwUtQ/fBvqNe7qYjJETybvAeYatLz0eNMsxnaVTNZypzwdmvrjXzlv+RoWRo19RbFY94v7iAmYfly/C421m/PkeOv/+jO/myhAyuyOqnQ36lFBd2E0LZTn3XW0aT+H3tcJeeRqhqfibxYj35KDZ2ylGRYTQXq31eTV5foMECsgCJHxgjBgg35yOQpZIDy6en0c9+DGuyGTmLkvVO4Q5W8bbWMhAneTxtU5qYB5hAMRpEXIeBdsqLqjOyjhozsfGkeUrTgYp8Sm5KVufVZIf0fFvmSLwTVOyjk2P3xHTtmzOvcT3XdT1yK5f3OLJQVzU/XHlJGyqW9kluj0QsJTTkebYmRzd/sHwPUrzJTw/45suB/Y99IU8CpQUYN4fV4QeH9wES6GIH6lHn2PnFlcJGFFA2OeuAiiptffOaIibEyC0GLrPmT6x1jLLbkUcnEXKDtvXMK14UYDXYkO03hAc9yLo6KBA==|920 \ No newline at end of file + } +}//LxpGiBIj5xfKwmxgIGee7YhLsP1UVvxiQtNhePOcJRGN0K6ntFkIEScENUOxBhyDZIqmzVq5L8S3fOuK+n37kXkOcHuElYuqEigcf3W355yM4ske/zklGhSyFPdxxe0Efx2AlkqPGd5W0TF4KjD/lwxgSIieEvDR4o+FiGqCBAq/tKmPeH9NyTWtATeaoZcdtk1UnLEX8e8PXBl4DtcgQGOd3ZDTZF3R95qDDH1BYtPaXnSw84fr213qJqFDxTFTYcL2ZyU5xB00UWI44chUTEDqxf2/AGQQ2j0OjLT1aBkaq/uuOXlAsz9bxK7HCnCaav2Ojgn8Pb2+x5RDTY3G0Q0XVbxhHlqeK9Iqwm+DR3pKqnnLlpPMHZp0kK1qW+U/DuPDuaWUMOq4RdBRduO/xwHGCIW3Ep+YmYeyBZtK2Rh9342P6bW5GdNkiuXGMGQYd9bGS5t81PUmiIiYoqMBBXroBhkYQQPZ74xbv+9wUpR90+u4jPLr/EEAO4mfy5wYhg8C7g1XhwKkqn85jw7SFA4Kxlmi6qitgXgOtq86/al9dpFNhyPdYFlBLLA+RAJshA9shEAWX8x3NRCl94KfvASvEmqveObp90qJ7s0eO2dpGJCQRS1ID9rv2p5qKuS3apG5Sw6BRovml+kwJxP9XOllKcVbQXgKGI5M68w7tqR4LBIvtywwSdhWWzZ7ezFhFZjJIqUkcgjYzSGrtlkbpWlEAYzYk2qFy31Ag+BohEj+ixsa87iirJ7NfpWGtQC6k+EYFSjWhnw43VpXesdm+wj5yZY19q/AvDT85Dm4fg98FGGPo/V1BqYBIbeSy2bXnNHEyepWEsDgdj778rvN/N+u2UuSnHDcORmB0SNHsj96HUj9T49i7N8G8DM+PcVICFPo6+gZDxX9j9Ezgi1zEA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目配置/项目配置首页.rd b/Pages/项目/项目首页/项目配置/项目配置首页.rd index 90145db6..168ee9c1 100644 --- a/Pages/项目/项目首页/项目配置/项目配置首页.rd +++ b/Pages/项目/项目首页/项目配置/项目配置首页.rd @@ -1,11 +1,5 @@ { "PageType": 0, "ColumnCount": 29, - "RowCount": 23, - "CustomNames": [ - { - "Name": "项目ID", - "Formula": "项目配置首页!$B$22" - } - ] + "RowCount": 23 } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index 0b6fc742..5c508820 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -59,12 +59,22 @@ } }, "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 30.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } } }, - "Count": 11, + "Count": 13, "DefaultSize": 15.0 }, "Cols": { @@ -272,7 +282,8 @@ "DefaultSize": 32.0 }, "Values": { - "1,35": "新增任务" + "1,35": "新增任务", + "10,1": "添加分组" }, "AttachInfos": { "1,1": { @@ -456,7 +467,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "a76e3403-2a83-4da5-8bdd-3cca8e239d0d" + "ID": "950ce299-7352-453d-b59a-789b2b4ce74b" }, { "Condition": { @@ -490,7 +501,7 @@ ] } ], - "ID": "28524c25-beb7-4c32-99f1-5a9bd038ef08" + "ID": "e549f024-9c5a-49f7-a0ca-1215fe963c98" }, { "CommandList": [ @@ -510,7 +521,7 @@ ] } ], - "ID": "b01cebd9-3fc1-49f2-9292-335c465ec20d" + "ID": "0ec91516-2713-4ce2-8f73-929b50445a37" } ] } @@ -594,40 +605,38 @@ "Title": "加载中" }, { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "1c788ef6-1380-4142-81c5-bba15db40b2e" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!行数据.value" + "$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon", + "ShareCommandContainerRefer": { + "ShareCommandContainerID": "fb580c25-10dd-4f22-8d8b-580f1b78aab8" + }, + "Params": [ + { + "ParamReferObject": { + "ParamID": "6a721307-5546-48b1-944e-d04195469758", + "ShareCommandContainerReferObject": { + "ShareCommandContainerID": "fb580c25-10dd-4f22-8d8b-580f1b78aab8" + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!行数据.value" + } } - } - }, - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PopupDisplayMode": 4, - "ShowDrawerHeader": true, - "CloseWhenClickGrayArea": false, - "PageName": "任务首页", - "LoadBindingDataOption": 1 + ] } ], "ParamProperties": { "dataRow": "行数据", "value0": "行数据.value", "parentValue1": "行数据.parentValue", - "任务名称2": "行数据.任务名称", - "执行者3": "行数据.执行者", - "参与者4": "行数据.参与者", + "状态2": "行数据.状态", + "任务名称3": "行数据.任务名称", + "执行者4": "行数据.执行者", "开始时间5": "行数据.开始时间", "结束时间6": "行数据.结束时间", - "任务类型7": "行数据.任务类型", - "任务状态8": "行数据.任务状态" + "总计划工时7": "行数据.总计划工时", + "总实际工时8": "行数据.总实际工时", + "参与人数9": "行数据.参与人数" } }, "DataType": "treeTable", @@ -877,29 +886,86 @@ "Fixed": "none", "HeaderAlign": "left" }, + "ShowOperationColumn": true, "OperationColumnSettings": { "ActionButtons": [ { "$type": "ElementUI.VirtualizedTableActionButton, ElementUI", "Type": "button", - "Name": "编辑", - "Shape": "default" - }, - { - "$type": "ElementUI.VirtualizedTableActionButton, ElementUI", - "Type": "button", - "Name": "删除", - "StyleType": "Accent 5", - "Shape": "default" + "Name": "打开", + "Shape": "default", + "Commands": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon", + "ShareCommandContainerRefer": { + "ShareCommandContainerID": "fb580c25-10dd-4f22-8d8b-580f1b78aab8" + }, + "Params": [ + { + "ParamReferObject": { + "ParamID": "6a721307-5546-48b1-944e-d04195469758", + "ShareCommandContainerReferObject": { + "ShareCommandContainerID": "fb580c25-10dd-4f22-8d8b-580f1b78aab8" + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!行数据.value" + } + } + ] + } + ], + "ParamProperties": { + "dataRow": "行数据" + } + } } ], "Label": "操作", - "Width": 200, - "Align": "left", - "Fixed": "none", + "Width": 120, + "Align": "center", + "Fixed": "right", "HeaderAlign": "center" } } + }, + "10,1": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目任务分组详情", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!项目ID" + }, + "TargetCell": { + "SerializeProperty": "=项目任务分组详情!项目ID" + } + } + ], + "LoadBindingDataOption": 2 + } + ], + "Text": "添加分组", + "TemplateKey": "动态背景", + "Icon": { + "Name": "增加.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } } }, "StyleDatas": { @@ -927,6 +993,12 @@ "FontSize": 13.333333333333332, "HorizontalAlignment": 4, "VerticalAlignment": 5 + }, + { + "Background": 0, + "FontSize": 13.333333333333332, + "Foreground": 6, + "HorizontalAlignment": 4 } ], "Types": { @@ -936,7 +1008,8 @@ "@", "[AUTO]General", "Center", - "Top" + "Top", + "black" ], "Borders": [ { @@ -999,37 +1072,48 @@ "9,5": 5, "9,6": 5, "9,7": 0, - "9,9": 2, - "9,10": 2, - "9,11": 2, - "9,12": 2, - "9,13": 2, - "9,14": 2, - "9,15": 2, - "9,16": 2, - "9,17": 2, - "9,18": 2, - "9,19": 2, - "9,20": 2, - "9,21": 2, - "9,22": 2, - "9,23": 2, - "9,24": 2, - "9,25": 2, - "9,26": 2, - "9,27": 2, - "9,28": 2, - "9,29": 2, - "9,30": 2, - "9,31": 2, - "9,32": 2, - "9,33": 2, - "9,34": 2, - "9,35": 2, - "9,36": 2, - "9,37": 2, "9,38": 2, - "10,7": 0 + "10,1": 6, + "10,7": 0, + "10,38": 2, + "11,1": 5, + "11,2": 5, + "11,3": 5, + "11,4": 5, + "11,5": 5, + "11,6": 5, + "11,7": 0, + "11,9": 2, + "11,10": 2, + "11,11": 2, + "11,12": 2, + "11,13": 2, + "11,14": 2, + "11,15": 2, + "11,16": 2, + "11,17": 2, + "11,18": 2, + "11,19": 2, + "11,20": 2, + "11,21": 2, + "11,22": 2, + "11,23": 2, + "11,24": 2, + "11,25": 2, + "11,26": 2, + "11,27": 2, + "11,28": 2, + "11,29": 2, + "11,30": 2, + "11,31": 2, + "11,32": 2, + "11,33": 2, + "11,34": 2, + "11,35": 2, + "11,36": 2, + "11,37": 2, + "11,38": 2, + "12,7": 0 }, "SheetStyle": { "FontFamily": 1 @@ -1038,12 +1122,13 @@ "Spans": [ "3,1,6,6", "3,7,6,1", - "5,10,4,28", "1,1,1,6", "1,10,1,8", "1,19,1,7", "1,27,1,7", - "1,35,1,3" + "1,35,1,3", + "5,10,6,28", + "10,1,1,6" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1090,7 +1175,7 @@ }, "IsAutomaticFill": false, "Location": "0,15", - "Size": "1196,579" + "Size": "1196,624" }, { "FitToBrowserHeight": true, @@ -1100,7 +1185,7 @@ "Fill": "Background 1 0" }, "IsAutomaticFill": false, - "Size": "222,594" + "Size": "222,639" }, { "Name": "6a8619c3-eb2f-4fd6-82da-9e421969cd18.png", @@ -1111,7 +1196,7 @@ }, "IsAutomaticFill": false, "Location": "246,70", - "Size": "926,514" + "Size": "926,559" }, { "FitToBrowserWidth": true, @@ -1134,4 +1219,4 @@ "Formula": "任务列表!$B$4" } ] -}//SPDex8VP3CFFdeB1ewRBzcCpgkKt/UwEMVvXMikjfo2F+FDJswqqMuBAtLkcr0/OPntRJrm2ZlLMDZ3x2NiM+KYwl8F30fRDzJg9S/yX/eyl5JEuL0Ho6A/RZNiOxYW/Ayunz3zx3C+4mbR4IP/qmndUkmc5cm8PP44mNHOfcfKH/7szOjW1AdSDqgAAOfoZJQQmvtRxLqEhdugdu/YeIkRN0TfiOS3E8YnxSLR/mQp+VhYQpPkhaBbYC84pQo6j4nfUvpJYt1neoMoOKfCC6Nvvo/SWa9RSXtKQCbI7OJtJBjWALwN0pq1Cq8CGHzMAeHsodLmmq12t6s3RsnNtk3bwgL1tRskRUOuvEMbvHkfm+qmWlM1mu5JlgYJzvZ35RTuAGfYKFungun3+shT2fsnuXG8jEswFimCeBPp6Q48CvMBWSJCtEkPl69q5MQQfQrtr/Hqpw+p8OY5uHfKBlqbYFHYCdDWO3ZMQa/gWogNJ0NDdHsQEyL7lDc92AJltVgnzLIKLzpVaAUf/5kmyiFiU8x7+9M4XwyMUdCMDTIbsvNZqIDo62NT1UYCW58Zo9gSh5mdZq6QcsRRldYOpFSK6o6FGSDjGrPrlxtv04sJ+/XvjvdE7gX83738hnJICQLpOS0p2ral0QjzNDkqAJd6A4LWePRam8yvoCdUBnnXldzLtNxz+IMFTlxLmiscrjUm5HMvUWCqxLnRCenYIFQwZp6Rq/bCFYbmCylQ0QLp71SaN9VyPQZKlH3G6f5fmTN5gW8wbxX6vNFgyFQcOqRkQtNHg23XMoCX8LuaAkPiRgnB5wdNqlkip302LgYPxjCn+btQldT7Q94CXFMH+20yJKh/22l9+obs03ejvwFJ5xcahABFSvhGfYaD5j4pIMKgvGHHmkbQq8WLMmG76Tw==|920 \ No newline at end of file +}//K4Qb241nRlI7L80rtT7t4bJ2RX415ycA7uawlNBXjjF0WgB9XUWUlkN5P94f9xaTacXe+/4B6CpNSRmMNC8UoW21FcnR3cOuq6wXqmuMBMaL6HpL3TYS7IfGHW+gsiOIq+ZLZZegkmVEPwsHBxmpEYb8oDouzv1m665jbNXFA6HCjL5FUa0P8H/7dfJXEe8CmmybhUNpFrFSwU0tXQtBAm6YWlPSiODSC60eB18ErOMziJc9wQ0Yp4yYLPrD1R1+ZFbKvQoZAwh70PKY1fP33pOGNVFzYGsSCWnnJo3bVx8dsLgNMpUVb4pbXcAiCi4ZCXs7hPEU3lJr0mY7uTB2eJKSj1mKp2ckEpg1is3FAWdrqQZOG+k3e2tVL2phXznfOmfCmynPdz58TnmOeCTnDCngUfG/PAoMdtRGC9IcISTRtzWZmlBv8MCoRwSNo0Trjmrr6knzckwwae+0xZhQRmaijbMmudSx1KX7dSMhcrkVFXZ5S3xcKZXQyADaiGVc34Wg8ihqQw+wcNcK0efS7ciJ8l4gCnCJPbRt8XLGzQuneU2spqJ43G+mihGWDf3zcFYysLIaVHUQqJdSBwVRUSb73itwJuB5fZgn3ypZqHXoBak58wFmxw75onmZGwSqSXuA003YgiVUnc74hh1z9eY6BIKroYuYSFbWzNLai0z22W8tt+nfxUk8Z7bWAU1ezskuisMO55qa3H+rRCfqPtU890rvG4SruW3nHCrbIpO+tqyMJDgitXcXfJkdDw0Pv6EZ4hfU5R5SkL8uKcWNoMtLHiM3X5a9sZ4XH0IF84qWRygejz47kR7yCy7Gj+Wzlc0VoIG04WyuTGDFA+W7Kl1XzRmk24zbIHvO3VOdg1k6Wk7WQujm36gH9cActepviJxXrW89MA3Nb3+dD7eNOQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd b/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd index 8c0e7f89..254507d8 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.rd @@ -1,7 +1,7 @@ { "PageType": 0, "ColumnCount": 40, - "RowCount": 11, + "RowCount": 13, "CustomNames": [ { "Name": "任务分组区域", diff --git a/Pages/项目/项目首页/项目首页.json b/Pages/项目/项目首页/项目首页.json index 1e884b91..e45669cb 100644 --- a/Pages/项目/项目首页/项目首页.json +++ b/Pages/项目/项目首页/项目首页.json @@ -329,7 +329,7 @@ "$type": "LoadingCommand.EndLoadingCommand, LoadingCommand" } ], - "ID": "e6d2995d-988a-4c9f-84e5-c07af328db1e" + "ID": "7c6a3b9c-90fb-4468-a52b-220be6e8912e" } ] } @@ -501,7 +501,7 @@ ] } ], - "ID": "31ef27e1-ea0d-4bfa-9426-55b540f79e1a" + "ID": "f88d0661-75a0-4140-ba46-18c58904167b" }, { "CommandList": [ @@ -521,89 +521,12 @@ } } ], - "ID": "55ce45a0-aff0-4566-bd66-3cf87e5fbd3a" + "ID": "47559d62-6eb4-40a0-8f6b-94e43112ed17" } ] } ], - "ID": "ddee4af4-c653-4eae-976e-9bd2d26252fa" - } - ] - }, - { - "$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": "a75511f2-5782-4ec8-8761-a5b68a3b4d43" - } - }, - "value": "0" - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "项目表", - "ColumnName": "项目岗位数", - "GUID": "b55e4a3e-2444-4ac7-85ce-09410459888c" - } - }, - "value": "0" - } - ], - "RelationType": 1 - }, - "CommandList": [ - { - "$type": "INTRO.INTROSTART, INTRO", - "Steps": [ - { - "$type": "INTRO.Step, INTRO", - "Name": "打开菜单", - "Intro": "在项目菜单中，点击“岗位配置”来设置项目的岗位及时薪标准", - "Element": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目首页!项目菜单" - }, - "Hint": false - }, - { - "$type": "INTRO.Step, INTRO", - "Name": "人员配置", - "Intro": "点击“人员”菜单，可进入人员配置", - "Element": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目首页!项目首页导航栏" - }, - "Hint": false - } - ], - "Option": { - "ShowProgress": true, - "ShowButtons": true, - "AutoHide": false, - "ShowHint": true, - "ShowBullets": false, - "DisableInteraction": true, - "DontShowAgain": true, - "KeyboardNavigation": true - }, - "WZDZ": {}, - "VBalidate": false - } - ], - "ID": "a215696b-aa3d-4616-8e32-656f8917e938" + "ID": "6b8488f7-7b52-4ac3-adee-fe72ae72a4e4" } ] } @@ -639,4 +562,4 @@ "Formula": "项目首页!$E$3" } ] -}//hEEKChnjS8L7DILkke/C9KQys8QOZkJbEenqnu36korHqXRw+rT/dKhcAbUHtrPLK5b+lZzSt4+kj+x7eo+o8pFKAL9In3bHCwAplywZFPComHB7PUY5PtPL59zD8jUzJqJdf+Dxz8q4uJxXvNRc20uMemDn7J8cdT81rnxcfcEZAgAuDHBBOpjI6HGyywAFZoOym04+Klws3yrDM6GaIPfNoq4fBcYuAjPnl2FL1WOlOIbFf1fhRhNZV4HZrW9w+O28/2G/YQmcl1lqvoxXcSWhT/i8pmtz8cZ+kyQYgGArF4CQyE1rTkZ1fYZrjtrIDc8Y8lFFpo0GJ4XfYcoaB2Jxfv3iaOwWp0bnth2BxsRbQEE6dM80zlOR5eKzUiuqHT/CuUE59z+9VE1GgUJXX4uofBB/kLNIr28oRdb1oBJUTZShrKZGJUgNkx7E3MTqIRj9FB1TVohquunKO5sghIbMLAeu218VbWi0JAQSXAC/2h2MJ08W9ZA5b1cxt8LYVoVTYoHaguR0TPvAs8r7HyP+fAzkqCp7/XDO23ZMipC16SvFLg30TXBPG+XNxWMlZKmKAQZ7oe9jwKaQyNTRqKXB4qHvfE8YGBCQQAzvqyN8273zjkHIt9d8n4QXbY1lnRbJhtzxBSik++elGOMlnMm63ghHYOMDi8g7r8CoTOH+zt4cUY5d2M7PjS8YiPqseaGSqk2htgaK4R55mIeFo6BtKnNDRciNfXEaEyzCFgBodnZLOqpiq3+7mhVFZ5KzntVzaDZBVxxSEmZ8P+9CqsvtvKjuhIILEn6SXjiDcUTh16QGcnWVHZBEYZSWBAnWcuEi//lOTD+SY+naQUImBVAobb2ZgJrJp3ihHPOPIdEpCaxq/VwE6eOjp1YHMBGpvvMsmPPJoUWgpSB4IPoGtA==|920 \ No newline at end of file +}//FFzhRcR9YZ9wXUoLkRYPMfLN4ioZ+/FNyXS1D42rJ8Pv4zz+Ihpd7iU0OYV89KVERfwQfyJrrsDI3GEcGxDf4lc/VKCx6rIlUHGvHD0nqF6fjWbk7Ssx8RXqzWhdMCx7FGki3iwk1nwcpVbqo/lVMQvQm4CMbcffEjjV8YW+SCI251B5gr0P+229Sr2aFIQHb9Cc5lwFGNc+S+WVuP5z9zxRmfSh800cED7d3nl5TQER0VkxuJidOL4kCai1YYhYc9+rih8EYpcZR7d1hUifQTbWByTd+sgurOOaeEA7gnG95GtnisEg7bSwE0m7DXB8vQ8PjE/jw7B3cq+w5YiuZMjxCxs1AaGH4IKIQb/+zr/q5wqsfvyNRTb22HcZxNTX9jj3c95YbfbrXed8yhchqMKxD2h0FZVwzikpqe8FVn5oT38JCYi+pS8b6/V+HI/U74zo12McGHUsF9KAmU9y7EOhkaDK5qAJNh0fME6+wjYZS4nT22/NtJMDGzP2s0vfst+lh+gSid26VwEGqFZoNAn6ZJGbVgADY8jpI7EQlBBkpyRhyXQdcVUooy6nriH3iUjqsYKLugt53nRqiSTIMVy8zOoehMVyZIfMx6LI6eUyDHby5mLJTC/j0a+w2cx5dtFbTIO6zJ5JRyW2DggPp3lVe5he0D0hhYIWKvrf4H/r9duazDBrJuJUruI/D/8eifUmKnaIwWlJIoflN35EFBrsgnkKpYCA/tvyV6pR+40T2RcLmqT1Ij5L9J5iGhQV6TZAqSELHxMzIWIeBt2bM/D7E3DXOLfRdOqh6W1hI7iNjL1e7VGatoUxdQE59T1sMW9fwO989muGYkPkZP6GNdwTKnrxvnjjWKPcXL24X9aZl85ZskyHkf2dq/Z5I/GXG9VdBaas8j/wAWLa7sJaRA==|920 \ No newline at end of file diff --git a/Plugin/分步引导提示-9_0_103_0.zip b/Plugin/分步引导提示-9_0_103_0.zip deleted file mode 100644 index 06956065..00000000 Binary files a/Plugin/分步引导提示-9_0_103_0.zip and /dev/null differ diff --git a/ShareCommandContainers/打开任务详情.json b/ShareCommandContainers/打开任务详情.json new file mode 100644 index 00000000..e1c89c37 --- /dev/null +++ b/ShareCommandContainers/打开任务详情.json @@ -0,0 +1,34 @@ +{ + "ID": "fb580c25-10dd-4f22-8d8b-580f1b78aab8", + "Name": "打开任务详情", + "Params": [ + { + "ID": "6a721307-5546-48b1-944e-d04195469758", + "Name": "任务ID" + } + ], + "Commands": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "b5a8d37c-0057-4405-b744-c4cca13707c9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + } + }, + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 4, + "ShowDrawerHeader": true, + "PageName": "任务首页", + "LoadBindingDataOption": 1 + } + ] +} \ No newline at end of file