From d40549671962272d55748b6a6e3b97c942f92be5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Tue, 25 Jun 2024 16:15:00 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPage/=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E9=A6=96=E9=A1=B5"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8"},{"State":1,"Type":1,"N?= =?UTF-8?q?ame":"PCPage/=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF"},{"State":1,?= =?UTF-8?q?"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1-=E4=BB=BB=E5=8A=A1=E4=BF=A1=E6=81=AF"},{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E4=BB=BB=E5=8A=A1-=E5=AD=90?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8"},{"State":1,"Type":1,"Nam?= =?UTF-8?q?e":"PCPage/=E5=8F=82=E4=B8=8E=E6=88=90=E5=91=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86"},{"State":1,"Type":12,"Name":"CustomLibrary"},{"Stat?= =?UTF-8?q?e":1,"Type":31,"Name":"UserControlPage/=E6=B1=87=E6=8A=A5?= =?UTF-8?q?=E5=8D=A1=E7=89=87"},{"State":1,"Type":15,"Name":"ServerCommand?= =?UTF-8?q?/=E7=94=9F=E6=88=90=E9=A1=B9=E7=9B=AE=E5=B0=81=E9=9D=A2"},{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E6=B1=87=E6=8A=A5=E5=88=97?= =?UTF-8?q?=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPage/=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=97=B6=E9=97=B4"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 169 +---- Pages/3609617039444daea57da1978344c4f.json | 4 +- Pages/4efeb9a87d4e43c88bafd4aeae13e20.json | 6 +- Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json | 16 +- Pages/TODO/设置时间.json | 13 +- Pages/b90932e038f94707b54e571ff7cd84d.json | 5 +- Pages/汇报/个人日报/汇报列表.json | 52 +- Pages/项目/项目列表.json | 28 +- Pages/项目/项目列表.rd | 2 +- Pages/项目/项目首页/项目配置/项目信息.json | 136 +++- Pages/项目/项目首页/项目配置/项目信息.rd | 4 + .../项目首页/项目首页-容器页面/任务列表.json | 672 ++++++++++-------- .../任务容器页面/任务-任务信息.json | 57 +- .../任务容器页面/任务-基本信息.json | 578 ++------------- .../项目首页-容器页面/任务容器页面/任务-基本信息.rd | 5 +- .../任务容器页面/任务-子任务列表.json | 12 +- .../任务容器页面/任务成员/参与成员管理.json | 40 +- Pages/项目/项目首页/项目首页.json | 36 +- Pages/项目/项目首页/项目首页.rd | 4 + ServerCommands/AI/生成项目封面.json | 97 ++- UserControlPages/汇报卡片.json | 5 +- UserFile/BaseCss.css | 8 +- 22 files changed, 800 insertions(+), 1149 deletions(-) diff --git a/.collaboration b/.collaboration index 79b1d293..a26a4d39 100644 --- a/.collaboration +++ b/.collaboration @@ -518,21 +518,7 @@ }, { "ModuleName": "PCPage/项目列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T15:44:45.1098012+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/项目成员详情", @@ -556,17 +542,7 @@ }, { "ModuleName": "PCPage/项目首页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T15:52:13.5155796+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页.json", - "Pages\\项目\\项目首页\\项目首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目标题", @@ -582,19 +558,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T15:53:41.3345933+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目工时", @@ -658,17 +622,7 @@ }, { "ModuleName": "PCPage/项目信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T16:08:12.2909041+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目配置\\项目信息.json", - "Pages\\项目\\项目首页\\项目配置\\项目信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目岗位配置", @@ -724,31 +678,11 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T16:02:08.9419597+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T15:30:10.4862666+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-任务信息.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-任务信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-关联资源", @@ -756,19 +690,7 @@ }, { "ModuleName": "PCPage/任务-子任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T15:57:51.8951613+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-子任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-子任务列表.rd", - "Pages\\558ca610fafc4ffd8884b819161bfd6.json", - "Pages\\558ca610fafc4ffd8884b819161bfd6.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-工时", @@ -796,19 +718,7 @@ }, { "ModuleName": "PCPage/参与成员管理", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T15:30:55.5331597+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务成员\\参与成员管理.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务成员\\参与成员管理.rd", - "Pages\\4efeb9a87d4e43c88bafd4aeae13e20.json", - "Pages\\4efeb9a87d4e43c88bafd4aeae13e20.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务助手-首页", @@ -1548,19 +1458,7 @@ }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T15:40:06.5947931+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json", - "UserFile\\BaseCss.css", - "UserFile\\CustomFormula.js", - "UserFile\\echart.js" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", @@ -1896,17 +1794,7 @@ }, { "ModuleName": "UserControlPage/汇报卡片", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T16:12:57.6486237+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\汇报卡片.json", - "UserControlPages\\汇报卡片.rd" - ] + "ModuleType": 31 }, { "ModuleName": "Table/汇报模板对应表", @@ -2206,16 +2094,7 @@ }, { "ModuleName": "ServerCommand/生成项目封面", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T15:45:46.7275091+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\AI\\生成项目封面.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/测试回复JSON", @@ -2259,19 +2138,7 @@ }, { "ModuleName": "PCPage/汇报列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T16:10:48.3776196+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\个人日报\\汇报列表.json", - "Pages\\汇报\\个人日报\\汇报列表.rd", - "Pages\\3609617039444daea57da1978344c4f.json", - "Pages\\3609617039444daea57da1978344c4f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报详情(废弃)", @@ -2375,16 +2242,6 @@ }, { "ModuleName": "PCPage/设置时间", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-25T15:33:19.0666309+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\TODO\\设置时间.json", - "Pages\\TODO\\设置时间.rd" - ] + "ModuleType": 1 } ] \ No newline at end of file diff --git a/Pages/3609617039444daea57da1978344c4f.json b/Pages/3609617039444daea57da1978344c4f.json index 0e9f7afc..f8e36c58 100644 --- a/Pages/3609617039444daea57da1978344c4f.json +++ b/Pages/3609617039444daea57da1978344c4f.json @@ -241,7 +241,7 @@ "TemplateCellSource": "汇报人" }, "3,13": { - "TemplateCellSource": "状态" + "TemplateCellSource": "状态文本" }, "4,1": { "TemplateCellSource": "总工时" @@ -283,4 +283,4 @@ "PaperSize": {}, "Margin": {} } -}//bF5Nu3F/Qa3Z+sTF7Dfr1AVO2k7wp0bGOExkQpRxn7EFbLhjfJxbn75Dvq1rXe+1Etk8FliOjal2A+NijoHCe3+A3IfcMpILopTiRNlmyGYTc8pjDP/q40+k+IckrLnvjQH6B30Iwq+iQa49KzlPXARqkklsjSdU1i3oBL0g5/q+B3dXnrwW+92IanE71Nr9l/hSLDvLJsR6kuwCyicjZlvdgOrnyKYoF5fDefHTscAAe/UCTuq0A+6gWCaHi07qHjxch5KHPW9A/r7AYyV4lV0e9TuvZoRZiemNG1VHF45lY8QQ/PXCJpmHhMH59CJNsTImVQ809zNAXNxRZi119ks3HX8/Ezb7GlXoOJXwMt33hXukXqVUMc04Udn0BYUCdsOabJ+GWvIf5wNhCIWulMl6yQDTETYn5WJT8CgY7PNa0fTkwICXd5J8PVcWSS0nL3CMKYFgC1pNIBP41EesjDOBW2Rm9yMMuy7qYz4rFbyXBCv9QwHJoKMzuX9hr+0tZgPYizayOlhgFUEpV4uiDJlOfBROV1yx/KlTdJ1qq32b5x0gqX4FRVS/EHFS8kGwimfyZst5LnjsdML8W1ChDMXY2Uy3busyo8t4eIsuxIcTkzQp4am0iq2NzMQ1hKY4Usqot7lpYfNo1P2GhQ/KupczK/gN/wn3YbWsy1ji93N9zWjikY4tZj7KNkye2dKlO9YKkyv2t+p63aJmaQUINW+Ni9pUZ+6pMq759T5Blek5drkrPmUU78VDJr4gtCFXSnzmSrgnkJM5xRuHKx+1J+5Wk3SiXPCEyO0H1f7S5rxn3+6aw9vS0oIsK11oaFGu3vYCpjIWquCZE+U0bWYBKNv2+0xg8bKGfU5+AHVjeoiWOqetoij8jVHGeDuH9JWF5lOdgxfAoJ8lB1OiA5R97g==|920 \ No newline at end of file +}//G6mXZzjQ9EVP0foWgleQDlDuOA93fMrI2hPLZGGsPKs8mxurWfVjVQb8SXcjSE9lD/8x0mYGoRcDuoVw3JLsq3u9zis5D05KrlBK11gcqBHuHswSO1RS75E2iZRCJmPDHdVEptcXukj6YtEAR9x71z26/JSqmHTMahrrHk72G13utqJ1ZqwKDikB0s9JH7TADsV4p9qSyTTUESq2iHG2uUINessG6vPSZMqyRUgP1diV+zUE7ZEAgXXi+SqpK7uw7kqPOD/2NBYl7FxVdrUxjSiV/1+XAdiX0S7z5GZwgMrhpf4t0r2gUgMXoKzvj7Aa5cIDcy92wRG+PKB9UQSjc5/zwZnHJux+t2GrztRFvi1h3N7kPuXU/gzS07CYv8XpUEEC5aw8TfPcsnZcd5SHYoeFN9LjbQGccrTepWEw1njalC+vAa0ulfBVzY9L3SMJkEewNEpQ+A4k+JexELM7eqDyd2kVbYPLaBpiomDlufEgH2n6Fh6a7QpL0cLjNNfuSX3d0CYDCD4vcKlr9z4wxuMb0mOlwVtrbHjLSye0RFVpy3gUeCGNfQNDP3/r9hpj4NdePpR7z+4EX0+OuzP/kZ9ir7cfS8M5UHoSJTFc04A08hql7ztxPFY2wirv5tw/50hLKmV8hnpVyz4tuf6wQehj+D+A23kudt7GDCCozAvfoS8x53sB//a/vFbJzQf7UnAwi93rqQDHZmAlUz0kr1o0L/BUUoHelxg+mAgloVFN7kpHWp82yLvyn9SIsEUt5CZOxPiLagAtp6EOG3Gn2R4QIfDtHgxszATxQ5zsGg9abQqlI6SGbsvyZzug3os1h8nwM7I7z9EbioDjuMyelIzDuTlM3PedmwEp5VsyKNogZXyXUrhHbDN9PRyUP4ouYVTz+P0cIRK1I/PkuuVWrw==|920 \ No newline at end of file diff --git a/Pages/4efeb9a87d4e43c88bafd4aeae13e20.json b/Pages/4efeb9a87d4e43c88bafd4aeae13e20.json index 4501ab83..745e3997 100644 --- a/Pages/4efeb9a87d4e43c88bafd4aeae13e20.json +++ b/Pages/4efeb9a87d4e43c88bafd4aeae13e20.json @@ -166,7 +166,7 @@ "Message": "操作完成" } ], - "ID": "9e1ffc33-af96-45eb-931e-04de50d8c38d" + "ID": "89415483-a65b-4d2f-9df9-0151a04aa257" }, { "CommandList": [ @@ -179,7 +179,7 @@ } } ], - "ID": "678ca69a-7813-440f-b5a6-1d8c09a3e2c2" + "ID": "df5fc0a5-bbdd-440f-98f9-510a57f6cda2" } ] } @@ -272,4 +272,4 @@ "PaperSize": {}, "Margin": {} } -}//LGFNYvvfNfeZZmgQN81nuAxseyc6UDDL+gVjp7jI1xDtSTlsC5a2zCw8QU8Lc+ME3mPXdU99HmyqVN3h/caZBFIpRCwCI4NmsgTdrQnmaUbdFMJuysuo8TWWmneQEizwHIvKlc7NozuBUKm38nv/Pm/toNXqJ/fKfEXHeh4ViVu75mOTs3AEH4NbTDgDLzir/HQ675nNbh+E0/6b8zY35oNEsL4hfJWJsBeBZxjC6tJpG9hB7xhevyM/hbJ8X4OqZGKMjGOdWsYOC7wgcYfGbgybridgcNKRYgOjl34jbePHSvJm7X818PY9CSCqjkoYCAWnEbaxdQqAPs05AIvyRKsmfgNlFngjfIV93OrM2TJnpRkTYI+MKT5c1v3eyOaZuz3f/eO4LwNivGRZ81Qzn6R4o0inH/uBo8GVKTuzkSIBtGRTnnpd0SiJ7WYVEbLvo0fnNf9+gbb1bmQOLU2amZWLzRVYnjx+7wq4nzcfd8dQcqGlM5ffQaoGyyWgczUFCj5Kbnu7w5NGxcvI+AfNDhNZqFK2Y8rJXIo9SuXv1PeOvJCFgXbSfwYh2Guwmpycl8Fbr1246S3dxQ8T/VK9IcmwadyKqDs+WPNETQ6DJ6QojAKWBG/NKu5GgkMSQxNs932TlJ3O4YCMi3GUuXxAU/6n1yVCJqwwVfSX+N37cORLzIF1S9Ig2rUJejzkW50EZYwGyl78OxHHgo+yysGx/hVsALDtPnYgqndRu7MzHaprux3zLmFS6OzYx9bVig6Rj0dzDLffOSkKpHnhpMUYPbaPEC53fUhfGVSLEgELiAIsxREt6HZreqf6+GDL5wViAVKw1Wai12/KAtHHjw4XWdUQhzAyYpMyQnHmNOz3zXCyYJFbxvvbvhSP25lOBswGKc0KCpK2ax5g8U6xDwtOSg==|920 \ No newline at end of file +}//s2+FQR0VzjQ5jf7G4YQrrdY+/1MlTX52vdTEt3t/FMuw4P8PR2RYFSHtycWytkgjjPI8WTjp1JZNmskzB8yfgya3UzMmwCohNbJMgiTDTBBPdjHq/sXM2a1YTGpMEYWWIZsFOXqylLyGqeIIB389ycpQ+zX1abMEYDkXiemdqpYOwE53AwfQAU4OOq6VGeGK9INKYICWcvTGfIK5khBYbRhvFXL2HOtJUjF6qxaOsUPRBXjtbpaYm+1cELPoJ86qcHJiZtrUT3GqbgNGCWBm1hf3XVYvrU1BDtVAKj7E92eh6ARu6vZeBLnWg6KTEnsS1dNM2/K3YcqoAbeqF3NQd9iypJ2mAeGUr3qOeh7z3tFansSLBuQbMtE5SSXT5MFc2no3vUPhkVrXMwpeJUzxtarojuTkHTUHGk7sEPGWc2ecn5duDfxuSs4fueIng1X7HKmgE9n8HJoj1RVM8Z//8CMsSGUR+5RWdxvQknDCD5AhMgrmZ8BtBZZ+0XQ3Zk1xFjSU3YRvQzyjuPiB79/5W1QFL14sBCTdZZFuOb5YEuZ63W6rCezVdF4YiLYX+yRa2+6Vi2FJv21BAITsuwfA2ty1uwATw+A2B+Wlad3WsmX1bPgC9avhQOt3+tV/IzRzN92OgxHRs9lzcezNwcozC5rzT86vFyBklDjTV13AxwNiUPwkaFCJbwin7apy2VxUMGHY9gYp8akKDedfq+DFMgtdHTIEaRW6j+rLw54yJ7yrFPuCdzjG0dHoNAwSHJLJJDI0hZGAbdVyS+vAGFFRd4ZGP01yMI+8Iz1lBxk9Tp614eqoDxW84sOoQrV6Fo9WKitgUMUNkeOucULBm6XifejREnqSgXqVJyhSAjiRyAVV74dlZ4rPuonVRDTxdyQoCVxMZOHE2ZWZRYLblAEiDA==|920 \ No newline at end of file diff --git a/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json b/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json index c4d97832..1e9313bf 100644 --- a/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json +++ b/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json @@ -160,7 +160,7 @@ ] } ], - "ID": "fa6753d4-4d3c-460e-8e8a-c2a4876a86e9" + "ID": "8d7b5496-e483-4cbb-b66f-fb3a7e207683" } ] } @@ -235,7 +235,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "2da691fd-e258-4333-b825-4d35111abcdc" + "ID": "caeca0cc-5fc1-4e42-a050-2bf6665e5bbb" }, { "Condition": { @@ -265,7 +265,7 @@ "Message": "复制成功" } ], - "ID": "9e512a5d-6afa-417a-a056-a355853bbaef" + "ID": "6c942936-abc9-40ba-ba80-bb509d25a24d" }, { "Condition": { @@ -342,7 +342,7 @@ "Message": "操作成功" } ], - "ID": "1184e224-7bf5-487b-94fa-16232b619f9e" + "ID": "fb4d2fce-a90f-4ff4-a66e-92f06ad87abc" }, { "CommandList": [ @@ -357,17 +357,17 @@ "BtnText": "知道了" } ], - "ID": "b5e932a9-cf96-4a57-8da6-f9e2927ab78f" + "ID": "f51785e1-3453-456a-932d-01918dd25b3c" } ] } ], - "ID": "dadcb77b-fda3-47c6-acc8-d069d6b6a0da" + "ID": "e8d73f6a-2f0b-4b46-a539-56f99cd3fc18" } ] } ], - "ID": "6cfde878-dab8-465a-be01-93c2f047ef0d" + "ID": "20609eb1-41f3-4a72-9a87-d505d3a9f3f4" } ] } @@ -439,4 +439,4 @@ "PaperSize": {}, "Margin": {} } -}//gBPsCVgoevjEvCvR6RqeTiGk8F3cV4rMtnbUX2FSCtGVVbFh7WFwEVQL8fO2CtOrQAAooDTrX4qY33joRl7/SBvTkp8P/1AHRk1XQWvY871MwvuRHxOaeAH+gcQnpB5MEpWFRXUgA47/aoFTt2RgVbJ/zoVB003gCRlPNYTHBMNDRwBowt+SOIADsoYKnEgd32sDoBn/+Qx4WAT/PJCoyg5t8d3AO/MUm3/5SE95V6U9ZloDmLWhgkEYFEsv1cHuWx8OJK3h+ZB9gMpN1rWmS+fe07C43g1ON9L/M0eHsvI3JhICzwXnJu39UdjPje2g2+BNJAN7Ivpc2jDG3ZLkAxQYRmR0OuAr/Nj3DJO0y21V5Mp27r0df0QEGsQEUDZqlzJg0Jx/RpnWLtNR5ORgDKXKEr5TtL6bv+mBbZpxm+AAkIHH3LKEmlSQx/Y2tBrW0yTJOBlguHjrHQhxJFL6f1NgFgVMtirmB7q7jNB/Ctd9Y9x9jBNhDr6Jz54GD5/Ok5/7t2kordNCXBkqkcEKUSozuiC6PcLFW6Hv0aei2pnrUKXQQnjn6gXytrBRNazE6rUI4jLSm7CylxK9dLX1gbbgjv6qTM8OLHY4q+zT7KMORV9zU6Y7oxhpvCmjzInDZgv3ldhg9PSdQjSor9kc3gXUrPaJetYecZAmvB1u679zcG8UOWcvRPccdDP1XUf6Qo5lK4xlsG+kDCbT8ShyKiRgC3Mw4LdovkEWDTApZYdlEOFI2XjzJI4qoFkDEVxa9Ywx4dVKdpj5+g5W8f6yVepid69MIgMAqZb4afpeJSkWnI6vP8y1VWzu6VaPjNtetWpSSrdl/ba6YW5QMR/nGTNSIKoiUd2iKUcJyS0tSx+naXdOFxa5XQTBvURr6TsfkdOrTTh/7GkdZFYoMiWj2Q==|920 \ No newline at end of file +}//uce7J3jGEW+iyDZr1AayGBeQh7r6AYo5e+ZpOY1xUvRQbsY35v5NI00r4s2niCProC02eLVeqilIEiuiYLeYUZEpv1Z1Qln3M2/6Q+Ra4VWX68NMLX6uqoqy9frw0Cc+dQtaPhKYNzmYH3bq8c08T2+rdP1CZRqsDUScJ3q6eSOJxnDQp0cXkg1CIfoJJmUybyvm65AJI2ESXjzvYGyc6rVhyLRkmMNcXgCthAnKO2YIA5ySMzjl/eSRq1BxMVJ2wFfAefmYKV2/z2yRQ6U03qTpl9uLaYsRMCzQg2wXNxROE059gRl94YPhzFmpvjlcrZpwry4MK1nhNRHzZHgjF2fta06XhAdTer0S0J+rHTuLUOoSvl9oI2m0MT7NgZiT5IOkRIgfzWJ9xYWenbo1xLUugn83p8ztktTOVJSdJQlceEYG0w+V+SWTYmlOr6ac/yqUpbqY/i/RBGoScJgGZw/tGJ95NkwVSj+qZrVpT7zgy+zUOl8h1x45SaXs0irXerzKAIwhxRjhl4MQ2D1VPHdd8Wil2BMvxWQlyddNECRsdhEJ+Hj4Lwrkc0Lg7UoZTUYq6ShDXNyIQeB3LCWa1ys2ByFssGihbrSqvgHYaOI7ghu+ebN0tYAxzQE1Bwb6az+8hyt05OC3cjIO9HpgcalijdGJaCLaD6YMN0GhHu/0C8DTbABsHHY2nP+7DVKNAa8UWEKRPDliqDuitZOmsi+9Kjyx2qDcM1wsfCpQjbjGzhoOmqO/DPmLBm54cNmcAa9cTZfntph+XL43/p+GDI/jC7AfIBfzoUeoyLmqwAuarumkLs6giCRQjtIi3MZ1nD0h9oUIhbQ3SQ2gog50L3U8ugQbGFNU0jyDPLA0G4LzHauHWab0uoBSXmIqlnZaMqxBx/YYCX+L+o/noeeEnQ==|920 \ No newline at end of file diff --git a/Pages/TODO/设置时间.json b/Pages/TODO/设置时间.json index eb6214aa..5797b310 100644 --- a/Pages/TODO/设置时间.json +++ b/Pages/TODO/设置时间.json @@ -123,6 +123,7 @@ "Values": { "1,1": "提醒日期", "4,1": "重复方式", + "5,1": "不重复", "7,1": "保存" }, "AttachInfos": { @@ -175,17 +176,17 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=设置时间!B6" }, - "Value": "%Null%" + "Value": "不重复" } ] } ], - "ID": "fe201ad7-fe78-4ab1-9f7c-71bf9fba3dd7" + "ID": "2e3b88b8-28b4-47ba-8614-428e25c2fb0a" } ] } ], - "ID": "35090521-a024-4f35-8927-954a903d0f32" + "ID": "cca6b56c-804f-48aa-8612-cf0165d1f0b8" } ] } @@ -242,6 +243,7 @@ ] } ], + "DefaultValue": "不重复", "options": [ { "value": "不重复", @@ -266,8 +268,7 @@ "matchMethod": "contains", "loadingText": "加载中" }, - "noMatchText": "无匹配数据", - "clearable": true + "noMatchText": "无匹配数据" } }, "7,1": { @@ -350,4 +351,4 @@ "Formula": "设置时间!$B$10" } ] -}//ahVdC7/NBjan9AQevW54WTqxE7P2GIENnHGU0ViyzeK3xLIbf2tHm2m0CbocgX8cCCjMgRtXQrytJyMMuS9ZGtel8Ne/MpAOcIS8hAFi/HYOW6LIXXIYc85iQuhcgaBvv9SIhtQtcGqa4vHbAxKWFMUenyZUqpBuPT1XNx+DS61wkQv/UkNsiBEvlVjeVTwMPoHWwqFLmXFXvCRGkXMK5VWzIMzcj+5JvvAiaLjaP0xCozdigBOseFp2B12+32D5PN7l0hfzfIGGzSfZho0hbABhDefyo1zvHHAk/Jnsmf25zvyWapMx+3/YaVfk/RAAx/AAA+zI6zzaUwJVu3KeIzuUdGpFw3DWkTWWO21pDwzFyEjMEjcMxM5amK9fMSlJ1jM70vTV2ZSSDfSRpGv3yC6ItmFtaG1gloDUr9ByZGZAvd5dn4l5XwrgA8sbkhnmAvLKJPaiKV0gYMG9XMrHtEKhoxaiYGljiMgXmVCaJdewQlXIC+lEvSk17lfeiFVypUwCr1Utcg4N0fOFEs3qHbJhtnXRBOat2ha4QZMO7x7Mod5GtW3ZHldoJbfC911UzMMViBd1urO0WB2h7pQnpsEb5dhxXDlZaZgRcldguZZ9OoqEGYdv/0cWM4hp6ABMfAzw2JE6BbKS5Qlt20vxy5sjTQjDmgjg1XqBLf5cWAws7ZN/GVqy9jEzrHjYobpdZaGq89JMaj942pFpzSKtn/diyfa2gDg8dTeB7lbqyen77YwWa5CaViZyB/XBVQVbB6ttwBWRXcpPDyH8YPFLqVleh1OOc83EqZd9F2maITxvEf6ikuNvrnZ8+1JGYt/65bp1u4aNNZiM8Q0+yuNB2XKXHRuk6A0a6oQsP9D5bqA+dMEmRtH1dLKBESDvqh2Q8UKKX9qB/kBpuxQi0KMm+Q==|920 \ No newline at end of file +}//xNfFIyOX5TKrHm5XxxIfHyTqG5vTRyJ5aYGpUYwAunemYJ9q+QhVcCELJWxhu6qKjrfOiSDysGc3zB86SQvuRHnahDzyWIBfj0wLcMKvdwhG0Fqj7JjWZ/EvfMNQ8Ho4UZFzdisJwbPn0D8D0o2MQeijWNcz7t4WS1S0mgf/4kZyeIxE9TJIjaK4qxwtWK4AF48LGB+UmTZnXmil2wUdNrck349tLojrhpuxbt6jMc2qn3ATaHPQYibXKNthqqFkVZtIrInGFA8byJBnpB1QXNbabt0+lWLnPYCNfY4L2I9kZP2du49iPEKW80ZkWFAaoAv5L8GSCHvlUFGMaRn9jCJbJO958xIOYrJhlQf8GgqLnwk6sPKU3TmMYyCA2sYLOja4h0aAvFBwihOXDg9tyT/+huEcVxn9XLVrooqYdTqOwBU7NJlnY3HSlJLeV9q72nwuBJnJWEcAxILqSFcSXwGWjPOZM1XMsm/WRmn4q+oNh/+sRrMkLLeKrwieKIQuNPcIKtZ5bgTeaMWD6VhMnSVN7Y1u+74xJ+A4eCHtilx56SWR8T7V380jeqW9tPWn/LMM0D0CvfPltTwsQMmMXFPvTtYo0cnuSjYF7jS+QQhHzWsrG9Ldvm2OUBmtsQnf8q+QCBSsKtfuPESUFRD4YBoFkG3SpO1JUjSZc7ReVMTj/YjVjGrvDxbX7bHVi+wXnky+wFUNzLKuL4Pe5BUxy8RtK7rwzPzCE/savEXZnEYlOwSDEHSDK3buQexqX176dq5BL4s3mHWR+eaPlSZAMDRoPww1laPB1ZTlWKmNv++Nt1mjAYyth/QqinIs9hr3CqCdSoFsFPynY7CFWMtT7jnixnjoLzuTZapUtMk/y4d7ZFOzFez46TEQVK0Od+1hyw6e04r5x9Q4E459am6qDA==|920 \ No newline at end of file diff --git a/Pages/b90932e038f94707b54e571ff7cd84d.json b/Pages/b90932e038f94707b54e571ff7cd84d.json index 39c53536..bd3e179b 100644 --- a/Pages/b90932e038f94707b54e571ff7cd84d.json +++ b/Pages/b90932e038f94707b54e571ff7cd84d.json @@ -29,7 +29,8 @@ }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 25.0 + "DesignLengthInPixel": 25.0, + "IsHidden": true } } }, @@ -349,4 +350,4 @@ "Size": "20,20" } ] -}//PyeZVJmHeIPAXS/2J7/TBhMKdUkRWfes4OQo2v6S4ZKP+8hlPYVWv4Rf2gtTckVa3EDWpZ3crqB8qs9iYKJFZho9ZcV2CbHywP6IV4AQc6PAbW5UkaQ7MIw0H+VhWlzdhZCV+z3mxk/EQGvQ0GCKvV4fM+f1YD34vqAGK5OLkCz15An5ap+3qMY+89fdmFWr2DH/RxPKurPenVSFsch0MOMVGRku3m2VYCa9FAKlrPHrReC/lM3W8GItPrzCrLRa0bOGoWUAXyu4VRkuakQhg53//1+s6TG5Br+54HbugEmppKflZLg1EaRN7COugIUWJ9ClCUwXeOxFWvzSqf2dsJzhIvmIEJLHAXBKEf7Jl3F8nrs/vEO1/F5oN3TqcVvsItWMqrYAaCZDAfSuoqcUBsXI7Pv5Fbj59hfIujygk2t2TQrQ0bleCJuR1twB4zK8HU0+nBEQNNZK6r9WRGrMiWqbdJpLBfB4TTkmPQsQXUYqvLSEClru2THsmMwtYhuh/c6TE9jODu5rGlaumSLVtx87liQhqPAaJcvs0rydr/QhHgyilBVZ7V1lje2CikovNPV1snH23SNhOfC2XK0WKNJ59HUf9uc9KOXzBDwgHKkuR/TX1BFh9TWSgdAl29EwGGdvFLNd0iirJ84xsGpeWYcjrUYkUYynmBYMyHYlIps1pVuFeFXd0nx2oy9uqt9G56TdjNFudWnTJaA+iQvb25JR0C/eG0iaVIMW4wJ9boqbcF5z8bfT32dCIXM77bkIFCJLQSfEDIv2UovXb7V2W1wujH9upyunj9UGe6Khl8JGVQ33JfsDpf5ZOImwlJdO1AdK3ABrF/C4rvc9jp2BanjufdzMDMdEuHn5CHHbdLjdeRAanowFFauJ5H08A0d6Ihnu70MkfIFWTG6rr+f0aA==|920 \ No newline at end of file +}//nQfMFKbiivVRhLu543UutyPCZZOnZNb4zUln2Yqswc4UJRTxhHQXjx2X4NtK2i1u5tw2gnSR65qa6nV1zjZE393UHCxD8zTXdtH5ZL5tecZ1FlgIPKN3zA5042BcSt2AdaYbBn3XXlByi9YhhMIeAHCOotQ2cvjctMXTlQ2GksYfpl0C/yFol7pw1ar+YEQlLKmgbBo4+ccKPp0eWo6ahpxGQlkx90G6XsAdyVG0wZKIPNxo3Bbfl0tRKqs0ympLmTmJ/EhqQ5KA1Woo0mCB5yrV//CgceO4MuYGLzNP05aQnUkALaVqUbm3DZy/gf867qIYu5CILbkhJmoJycLjd9wBmuJFtA41ZMVK7LngDRQyjJQ9FdOc6F5U91B036vEMu3KMiQDQ2WIlO/tfTMfh07CJD/HnoGtnHnAqC3cMsJZaNwpEjlHUezbUcIiWe7x1k69KSmm//Qv5/77OOGi23kYIGIQKKeDLmSAOwAuE3N0DiYmxUoGUonJ7pyUTSUWLnUeOKX35YdXcy+A1KJ9ah8RQ1xFrHXtX3vb2Eo6YcZd+qj9QQ7IALcc4noR1M76UNRahyFkj+85/JsVYLHpm6lEaZ/DcwPnn9m2lSryUoGGVvE1YRrsb7x35YkV8EEe0znYbX8g6ZucSz/rh6nYkSlzFrhyfJiWeJTbHWb+Rwc84X0npJ79JRira4TFEHr0AcBi+dclkDOfgP3XN8yF6NnsVVoTNmqmFfBZ7aBwIqiStTzn7xKi54RqhmLmbUVHF2bEfSkATzOgVGvm0pZ0AyREwkfCDS+NGq0gt89mPWYTV6hv4H9YTQ0wvq6f0xNPAxuo5potmzVuOXMFZ8WUtlyKoQPml3a2GXcqH7SgV6AxjjWzzehX2Z/Y/XSufN57w4QYwAuW8zuK9V/qHtIIAA==|920 \ No newline at end of file diff --git a/Pages/汇报/个人日报/汇报列表.json b/Pages/汇报/个人日报/汇报列表.json index 35902844..dd7a8957 100644 --- a/Pages/汇报/个人日报/汇报列表.json +++ b/Pages/汇报/个人日报/汇报列表.json @@ -218,6 +218,38 @@ "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "3609617039444daea57da1978344c4f", + "Command": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "汇报记录表", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "状态", + "GUID": "b872391c-92e6-4cee-aede-c9cdf74ba4da" + }, + "Value": "1" + } + ] + } + ], + "ParamProperties": { + "ID": "ID", + "开始日期": "开始日期", + "汇报类型": "汇报类型", + "汇报对象": "汇报对象", + "汇报人姓名": "汇报人姓名", + "汇报人": "汇报人", + "内容": "内容", + "总工时": "总工时", + "状态": "状态", + "纯文本内容": "纯文本内容" + } + }, "DataSourceType": 1, "DataSource": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", @@ -311,6 +343,15 @@ "DisplayColumn": "状态" } }, + "ColumnName": "状态文本" + }, + { + "GUID": "8d6962b6-41e9-40f7-9aef-37d6dd329083", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "状态", + "GUID": "4f8ef8f5-682e-4747-a36e-0196b6e577f7" + }, "ColumnName": "状态" }, { @@ -387,6 +428,15 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=汇报列表!结束日期" } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报人", + "GUID": "6fa809b2-a70d-4bd0-9f9a-f82a47d9dfc4" + }, + "Value": "%CurrentUser.UserName%" } ] }, @@ -459,4 +509,4 @@ "Formula": "汇报列表!$A$2" } ] -}//idW/4/Dkb48rnpqdBadOZWgSZdZI6hq+v28AMX3BObloIQnf2Kr256PNCAVzkhFx1g4OKydniDLM2k6Xbis9YftoPtgSBRFdMS/NvxYeKJRzy+Nxb6MDOjXUui5k/qX+iXg4Y9Ta+xUC7u2rle6pj8nSDrU7NATbJVTSxf9q1L6ZvCMjIlZr1tF7MKnkS6yqYkq18IyGpyPW3qLPypqNfJF7iN2PxTylwgNubrOaWxObsJUNbOhZoW4ZsyUGp9CEQsc68nuSkLf+IOR56wD/Jm425VuuzFSGctTwoqOZxCOCmsKleNrMSQpvqAO1dRLSdzMfRo65gcrROswbJaxuJCs/vUmeiN5Y7fZdZJ/XeKUu1phi3A+vaKZEHQkitJeRXt9w6QRsgobe1yUcw9fl0EE4rWcZ+mJpoHVuupnV91n+X9Da4tUPr8NDl/SpYgBd+eWJGbKww7eZViToXU/OvEG3ewbDRefHY1TLNkimQ8iKz+iu31btX0v5x/BMqTRj0V92g5A1BarrDoVSHyefdpo1MAedfjrwkx0LmWZTa3KUzSgce4SIwCKl6KEGd7o4HHH47tUzFBy2jDVXQyV3zm+aJR7NMYcUm891ufgsr1MGrS/1s073MvVm9k64PgycpZb7Xge+bLfOm+liwwlwOYzPy5brdhuYZWCD/m3Ud/ufxb3+Y1k4Wo6Lx1Or71DmIufgKi04SbCg4ZSr2SPdPcdlRDsUltwl82ILtyqWpulkBR4wZcc3ODJZqv158Fu2fpPRIagKQIdPCTy0RS5dLYLTgBLpFxn7DBMneNn8jiLd4IytxtTVLB2lxDkqUyQOZjI6DIWGhZgHr1SYs4v3niahs9zoREHB8qHpMDQjdTaFCXc49SBqMY1vdb9vMR6zpbCwn09NAxWVPnqNc1Jt9g==|920 \ No newline at end of file +}//SGTI4RorTsoDMiwl8efWRWLf6N3W0nZ2I6EEk0jDsHCecc10b06zQw3Udhki93COr6EQPsg659DxBRWA1c0/1Yl7VkVB752Qbe88iOROiCuhZs1IgICuTcuFAqDKAZpjJxae7SN9eXxKRoqgdrug5+sytH5mv0Qbc3jGnEcjbKOfGWoouNaWyCeDFMknD2/1riphVgMtx02nemcqeS5R7gtOj7Z/fKjHQ9kW/9J9cLplZ4Qxem1wp5N85P0jZcuxlaz4wovW3BdA/p2FAIHHcRUDWb8QVfNFf7wEnjtd2GaHSXJ2sgVwc4ewn4cULoCwrEdHl7bdn6RI7/ER+IVZCts9SL4RxO0af9U9q5nPSIB/N2l2T/JSBEYCJoJ46PHn2iMheIBD0zvHEXZ0qJqGDqvHyDgWTofFRjWW84hcTwBUOdMaElS3sFOcW1JdiaB5mw3rJh7fIwnZtmG56XlpMRQgq0gy/uqLLgUbZVG3gJyRNFbu+yIjYmhRRLFSB+UzyldBsfXDRb1UUUJbR33ojlOOmzzE5dr+hDYCG7nAtkzfwHTOWYihNiJe7hzoglj7pb61uMQ/eFsMX53ZkbxRlKSuHqBbvmL+3Bx1dtRerAdGLUnolBASm5mz8uhCXTakiRISF5PYtzmOm7CWCIlXzYPpmnW/+wVYe7GjkSZAwSKiiQQRtapYekT2VKXtsTUevnbKR5OzeQ2bmafuAfBcriOTvw9BDIsQEEZEnzRoXsE54Tcx4FwOP4ZvqyCm2L/bIer4l+CVOmOo/BQW5qDVdk46j6crLuoZOnXA85Vfm4ZOF3lgqbiEltukrQAbpyE8SXWgM5PmeOvVxqoe2PIjgfD6vDIHwHEnnh5jb3JQFEhIwJjgFF/MOGKs5fojSBLgU5zVDkOPPZuKOREb8tOU3w==|920 \ No newline at end of file diff --git a/Pages/项目/项目列表.json b/Pages/项目/项目列表.json index 86d55643..f7c630a0 100644 --- a/Pages/项目/项目列表.json +++ b/Pages/项目/项目列表.json @@ -352,11 +352,11 @@ "7,1": "查询", "7,4": "重置", "10,1": "项目分组", - "10,10": "项目列表", + "10,11": "项目列表", "15,1": "添加分组" }, "Formulas": { - "10,10": "IF(选中分组=\"\",\"全部\",\"属于[\"&选中分组&\"]的\")&\"项目\"" + "10,11": "IF(选中分组=\"\",\"全部\",\"属于[\"&选中分组&\"]的\")&\"项目\"" }, "AttachInfos": { "1,31": { @@ -555,7 +555,7 @@ } } ], - "ID": "75dad0af-8e41-4dbd-b693-b41ef7cebdc5" + "ID": "2b4ec2bd-c984-4561-8308-f133d7236f27" }, { "CommandList": [ @@ -567,12 +567,12 @@ } } ], - "ID": "284e8176-c2f7-4b7e-ab6a-860cbd3f6aa3" + "ID": "172ee8e2-e2fd-4fb9-853e-0c2aca1309e1" } ] } ], - "ID": "36940c5b-aa05-4e2c-ba2a-9dcb556a96f8" + "ID": "43df6472-8f53-4e1e-8854-fb58e037cbf0" } ] }, @@ -600,7 +600,7 @@ } } ], - "ID": "6fdf534a-a0cd-4a89-9402-7b17333905c5" + "ID": "5540836d-ba33-4a32-a32c-431513b1f17e" } ] } @@ -938,7 +938,7 @@ "ID": "f80245fe95e54190b6fd428917237293" } ], - "ID": "b58e9f88-b8ef-4fbe-818b-cd0ca7cf48ba" + "ID": "3cbcb0c2-f33d-4076-bac9-f5c45221423e" }, { "CommandList": [ @@ -949,7 +949,7 @@ "ID": "f1f46d09366c4d40878ac41cc03c7045" } ], - "ID": "c353b831-862f-4a08-ac23-439b5c1ec0f3" + "ID": "b3add8a8-a524-4a71-a318-e32620874b32" } ] }, @@ -1077,7 +1077,7 @@ "3db70195-fce8-4da3-b3e5-e56009ee399a" ] }, - "10,14": { + "10,10": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -1240,7 +1240,7 @@ ] } ], - "ID": "1780d82e-d595-45ef-bd73-0099f0564c1a" + "ID": "afbe5d39-def4-4bff-96e5-bb19cc34ab85" }, { "CommandList": [ @@ -1253,7 +1253,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "4fc0008f-ee66-47e1-9c55-42fe63971c40" + "ID": "787f0013-9b02-4687-8c25-b057f5edf523" } ] } @@ -1720,8 +1720,8 @@ "10,6": 11, "10,7": 11, "10,8": 9, - "10,10": 12, - "10,14": 11, + "10,10": 11, + "10,11": 12, "11,8": 13, "12,1": 14, "12,8": 15, @@ -1859,4 +1859,4 @@ "Formula": "项目列表!$O$19" } ] -}//Uy2H2CCirK3sZH+DmJnFoF7HtPetcIFnlU2QN/VKibgYP6rFtKjzk7bT8DenrGRQzcHVXtkt8O/zcYIgaIsoBZ/odtT9A6kiXyht7BCoZsWNWRlT4K8pi14/0s3Q/rQKh8WR0Lb83Pdas5lPp6aV0qLTtZ37cQwAymonZjv44BwXDwiVCiLGUXPWxSROmkBa3aUMYTNPYThGk3yVCohX55xAJtFco+LTLZG5i7csadUF2R79UkWflj6grVu3Q/g3xuerah1iptRSRoSxbchsBhEJRisHh/kNfMOfTPMOAFFqVlYhz5ANCSGOgh9rxZhw4T0ab5f8mr76niFcKph+6LPVKHefR6qxq5F81z1y0bxXhOQZZyAZShoekrBZq+7gJB4qRYh1/1ytdXaI3h25rkJqttXpT9ropqyaWKNwHC+i+KdKS2MwvOCB5bZtruvWc2rCBWdEtK6jEp5NvnttWi9jQDIsyuFipYih+ZdKCyAefC8qBFzmHPfmszolNsMXFaY8wnOLoLU1UNAUk+cbe0z+12kDQ01oUdxvs0naEa4duKudPxyxQaXc1Fu7YqNyWRHFk4jwseGVQdhc/H0ipPVsdopED4lM/dEqkh7DVVY2ozDjfFFwPIcsgWO6zgbIItsu6zLnkjSj+KMRpc5vT9GcTSi6lbOeeFI0qmK1/+9SXy+cXDCPSyvMk5+CVjBWU7mPl5JakqZ63qUOyqmk9jk2OmiQp2jyeIyx2EKMqOfmFWmNgtcNkgd/0WuM8qmKd7ely6NT9Htm7xxfkUxxKR5ui5zlE253V17mwXTpKftgWM/1ol/DmVt90JoooFRafANSVxcFopsAkolJs20cbEL+SEcLvviW0YqoBt3SrPWtZyfa+0qUXeYwcwbgE0D6AtrOG1ugJ8YiPZer5rCp5w==|920 \ No newline at end of file +}//K3p3KU/Vf1cHo4l9M35iJRwsnfuRn3vYXeGQ3Inad6rZtd+ACUdUVzcpl4/a6dGJY97IXKcNYaAuVZLCHq2iIGJXxMMWoTOly3d7rj+b8+b1UaJ+zRTtcrRoBP6Em+XHjeTI8y9UZwrMhCl9D0N2LWYoeTg5nKe1HucFbKsZaVRSri39Sy1kjQx9dBDec15k9RZeVaXl/2pevGWfEmiLMazcQ6RMrISp200hZNDwvaac4mO5oua2Ewb6T5nXJgkANZzJm322lAsX4NkP4Mh7c+vsJHcn7LvXJRQmJPHU5a/w/zc1Nv4jxBeu0ZXpU5h7l6vmNoSaapdz1S/huU5q9MB57vwyEAj7o6RElHtmXoliJZ5ptehETVvQbIiphsx4ixjdV46mQpHQ8gkGVFFlIt3GE9aJwn79fJ/afczRS0gHuHEevGLSR71faXcanJ5IdBAYfUd9AU3n6QjfQK2arxW+uIr2m4qt7CXxk+7pvUvMM3dRK6rRZadhDs8dP//PtxmUg+/Wp8/q7QJ5nvI65/C4Rn/WS8lMqhSZy7gT2GEqAg/PMXKSqryX8q4GOe7AOhzaNzNvQZSITIkP7ZMunBj94PJ9v+gbhM3poKcn/R73UXIu3baij2gHmhfy+nYHLRZ9BP9IkVrr5qSwNqRhNWiJMGrbQC8Mfl9wZwLV5mnfsOZZNK1+P2AedKOPO3kGy18fgyXsFltocO9kDulWDqTfTzy/ucQxJurJbCCxXVkPSKypjbaeFiNEujcUOXQpdl/pOCbbycG88Vlm0mrOcDZUH4NKKnk+e5HsgNDoFW66vpA7unKBKwMJWA1MLU5mit77wTzetZ2zOag5ZE9ZLzMoEsV67zUFNleE5CHqbiJr7UyCLbkO8j7FxPHa4Qcpaf6BMCsVnoltkw0OeC5i8Q==|920 \ No newline at end of file diff --git a/Pages/项目/项目列表.rd b/Pages/项目/项目列表.rd index 4fa24d03..468e1b0b 100644 --- a/Pages/项目/项目列表.rd +++ b/Pages/项目/项目列表.rd @@ -3,7 +3,7 @@ "ColumnCount": 43, "RowCount": 19, "Formulas": { - "10,10": "IF(选中分组=\"\",\"全部\",\"属于[\"&选中分组&\"]的\")&\"项目\"" + "10,11": "IF(选中分组=\"\",\"全部\",\"属于[\"&选中分组&\"]的\")&\"项目\"" }, "CustomNames": [ { diff --git a/Pages/项目/项目首页/项目配置/项目信息.json b/Pages/项目/项目首页/项目配置/项目信息.json index 3ebb6bf9..70dfcddf 100644 --- a/Pages/项目/项目首页/项目配置/项目信息.json +++ b/Pages/项目/项目首页/项目配置/项目信息.json @@ -317,7 +317,10 @@ "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": "打开客户反馈通道", "Style": 1 - } + }, + "RulesGuidList": [ + "cfda52e4-b004-454a-9650-2ee428efb4a1" + ] }, "1,18": { "CellType": { @@ -348,7 +351,7 @@ "BtnText": "知道了" } ], - "ID": "6e08b47d-3d9a-4d09-8b36-7484c84616bc" + "ID": "e0c9b779-22e1-4a1b-98aa-ae32c81d6bb6" }, { "CommandList": [ @@ -572,7 +575,7 @@ "ReloadData": true } ], - "ID": "3df720c2-10c5-4c3a-90fd-2b010b72b4af" + "ID": "8a2f0832-3ef2-4fc9-aac6-f4a7705b1c83" }, { "CommandList": [ @@ -587,12 +590,12 @@ "BtnText": "知道了" } ], - "ID": "9b5332c9-6aaf-4a2e-94b3-aa250008c585" + "ID": "1775419b-3cc8-4b81-b3b1-4e0636f7f5ae" } ] } ], - "ID": "0c2ae451-e8bd-4e25-b410-bdfe0b947fc8" + "ID": "7432cbb8-c4ac-4143-8255-881d5f0dec80" } ] } @@ -615,7 +618,10 @@ "AllowExtensions": ".png, .jpeg, .jpg, .bmp, .gif, .ico" }, "ImagePath": "app-logo.png" - } + }, + "RulesGuidList": [ + "cfda52e4-b004-454a-9650-2ee428efb4a1" + ] }, "4,6": { "BindingInfo": { @@ -654,7 +660,10 @@ "FirstParamValue": "1", "SecondParamValue": "24", "IgnoreBlank": false - } + }, + "RulesGuidList": [ + "cfda52e4-b004-454a-9650-2ee428efb4a1" + ] }, "4,16": { "BindingInfo": { @@ -693,7 +702,10 @@ "NumberType": 6, "CompareParamType": 5, "FirstParamValue": "12" - } + }, + "RulesGuidList": [ + "cfda52e4-b004-454a-9650-2ee428efb4a1" + ] }, "7,6": { "BindingInfo": { @@ -726,7 +738,10 @@ ], "type": "textarea", "resize": "none" - } + }, + "RulesGuidList": [ + "cfda52e4-b004-454a-9650-2ee428efb4a1" + ] }, "9,1": { "CellType": { @@ -796,7 +811,7 @@ "Message": "图片生成耗时较久，将在后台生成，请稍后查看！" } ], - "ID": "85c30b39-37cc-4a73-9634-cdeab6872fb4" + "ID": "52c4c95f-4b8f-4fb8-9418-c4161c56b9a9" }, { "CommandList": [ @@ -806,7 +821,7 @@ "Message": "请填写项目名称和项目简介" } ], - "ID": "36df7a20-c9fc-4cca-8486-a709c23fad80" + "ID": "b9f4e6a1-f872-4fcf-b804-2bb3cddb21f0" } ] } @@ -817,7 +832,10 @@ "Name": "gpt.svg" }, "IconSize": 14.0 - } + }, + "RulesGuidList": [ + "cfda52e4-b004-454a-9650-2ee428efb4a1" + ] }, "12,1": { "CellType": { @@ -894,7 +912,10 @@ "firstDayOfWeek": 1, "clearable": true, "DefautWeekFormat": "yyyy 第 WW 周" - } + }, + "RulesGuidList": [ + "cfda52e4-b004-454a-9650-2ee428efb4a1" + ] }, "12,15": { "BindingInfo": { @@ -962,7 +983,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "ef31c5df-06c6-4c8e-aef1-72ea6009155e" + "ID": "972c706f-83ca-44a3-8e3f-4233e0626212" } ] } @@ -1060,7 +1081,10 @@ }, "noMatchText": "无匹配数据", "clearable": true - } + }, + "RulesGuidList": [ + "cfda52e4-b004-454a-9650-2ee428efb4a1" + ] }, "15,15": { "BindingInfo": { @@ -1164,7 +1188,7 @@ ] } ], - "ID": "383d3c33-cc46-4097-9ecc-a492399ca699" + "ID": "cf24c503-89a7-421b-b3c9-037643940452" } ] } @@ -1252,7 +1276,10 @@ }, "noMatchText": "无匹配数据", "clearable": true - } + }, + "RulesGuidList": [ + "cfda52e4-b004-454a-9650-2ee428efb4a1" + ] }, "17,19": { "CellType": { @@ -1366,7 +1393,10 @@ }, "DataValidationInfo": { "IgnoreBlank": false - } + }, + "RulesGuidList": [ + "cfda52e4-b004-454a-9650-2ee428efb4a1" + ] }, "18,8": { "CellType": { @@ -1404,7 +1434,10 @@ "loadingText": "加载中" }, "noMatchText": "无匹配数据" - } + }, + "RulesGuidList": [ + "cfda52e4-b004-454a-9650-2ee428efb4a1" + ] }, "18,15": { "BindingInfo": { @@ -1488,7 +1521,10 @@ "allowCreate": true, "noMatchText": "无匹配数据", "clearable": true - } + }, + "RulesGuidList": [ + "cfda52e4-b004-454a-9650-2ee428efb4a1" + ] }, "20,6": { "CellType": { @@ -1528,7 +1564,8 @@ "UseCellForeColor": true }, "RulesGuidList": [ - "8b0ef132-4ea9-4190-83e9-fa06a9bd6dd3" + "8b0ef132-4ea9-4190-83e9-fa06a9bd6dd3", + "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, "20,13": { @@ -1569,7 +1606,8 @@ "UseCellForeColor": true }, "RulesGuidList": [ - "b86e7249-aa30-4c1d-9c20-7cd975817126" + "b86e7249-aa30-4c1d-9c20-7cd975817126", + "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, "20,17": { @@ -1588,7 +1626,10 @@ "Size": 14, "ImagePath": "提示.svg", "UseCellForeColor": true - } + }, + "RulesGuidList": [ + "cfda52e4-b004-454a-9650-2ee428efb4a1" + ] }, "21,1": { "BindingInfo": { @@ -1630,7 +1671,8 @@ "ErrorMessage": "开启严格模式下，预算工时必须大于0" }, "RulesGuidList": [ - "80882aaf-77a4-42c8-a371-0d9c66111d9c" + "80882aaf-77a4-42c8-a371-0d9c66111d9c", + "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, "21,8": { @@ -1673,7 +1715,8 @@ "ErrorMessage": "开启严格模式下，预算工时必须大于0" }, "RulesGuidList": [ - "c6a3b850-e670-401e-87fc-553622e7d5ec" + "c6a3b850-e670-401e-87fc-553622e7d5ec", + "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, "21,15": { @@ -1687,7 +1730,10 @@ "Caption": " 开启严格模式", "Style": 2, "CommandList": [] - } + }, + "RulesGuidList": [ + "cfda52e4-b004-454a-9650-2ee428efb4a1" + ] }, "24,1": { "BindingInfo": { @@ -1721,7 +1767,8 @@ "InputMessage": "分配到人：提前给每个人划分该任务总可用工时\r\n分配到天：提前给成员按天分配每日可用工时\r\n分配到任务：无需分配，所有成员共用任务计划工时" }, "RulesGuidList": [ - "20ab66f4-8f42-4a32-a499-e96087c93406" + "20ab66f4-8f42-4a32-a499-e96087c93406", + "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, "24,18": { @@ -1783,7 +1830,10 @@ "KKFileViewExtensions": "(doc|docx|xls|xlsx|ppt|pptx)", "LayoutMode": 4, "IsSmallButtonMode": true - } + }, + "RulesGuidList": [ + "cfda52e4-b004-454a-9650-2ee428efb4a1" + ] }, "30,1": { "BindingInfo": { @@ -1818,7 +1868,10 @@ "KKFileViewExtensions": "(doc|docx|xls|xlsx|ppt|pptx)", "LayoutMode": 4, "IsSmallButtonMode": true - } + }, + "RulesGuidList": [ + "cfda52e4-b004-454a-9650-2ee428efb4a1" + ] }, "33,1": { "BindingInfo": { @@ -1831,7 +1884,10 @@ "TemplateKey": "_RS_NewLittleRoundCorner", "WaterMark": "请输入内容", "CommandList": [] - } + }, + "RulesGuidList": [ + "cfda52e4-b004-454a-9650-2ee428efb4a1" + ] }, "35,1": { "BindingInfo": { @@ -2381,6 +2437,20 @@ "RelatedDataTableName": "项目表", "ConditionFormatRulesCollection": { "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息!当前用户<>项目信息!项目经理" + }, + "Priority": 5, + "GUID": "cfda52e4-b004-454a-9650-2ee428efb4a1", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": true + }, { "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { @@ -2475,6 +2545,10 @@ { "Name": "当前用户", "Formula": "项目信息!$M$36" + }, + { + "Name": "项目经理", + "Formula": "项目信息!$B$19" } ] -}//sg+yV7FNlVixpcJf3I/AXUAgStuOPOqI3hNDC7vtxCF0x55bPQ/gqo5r7ctBVOLJ7la74VX2R3jJjGcxHWEgXC9Yz6om4cOUHxaWXoDrfaBqhWAkl+yuPxKcuROawudddBYQxfx7QaRDk0ihNY4m3RAd+qyasbobryvrMri6en++TWZAlfJV9CjGj9HprIcGFw+L1cMhhyycdaIQFBF9+Ubzd8+8TCTVCODuIlCxeFJzcKxhgez2nGb1XkYcnaGKY5sXzvl0J8VjhWywkQ9E6lRtPvbpb/YP73v6wjdbRMtFEYfJMKBthFBQRt7ZRHCu1bQ83Z9AzuyjGUPP6Ju7LhSXOPPU682Q+l4yt+rj7aL4vIJwc+GuEL/bcOeqt1GUrT47ebbFbLBdQHqVz0C2XKG2LoJEX3teD0fce5afOeb/+II2TJPjmWFmcA/J/Eew6G1KqsgviTOn8fPo9Gpfr9/2ceBDhjOxLs1PEwchroKkdzm3qLLZrZTFzdhm8+BDXZ523a0PHKLkVPOX7ETisXgdJDiXHYx444Em281De52Swv1M0LmCxfFWZ/J6RuW9rbEGPwQRjZVV1oL2io7xmaqSgNnPsqW/lGhSnNiu4UswD/eHiXgv+m7lr39aDyWVxnhyT0SDafV55CO65OUiNnEQj/ZVaBbQypjEh5b39b50Rz2sdiwEAOeVxdDBOFmBH7diqm/JKAOvfbGlmwezcJEKgXuX2G+jW6TfgamYV7huSSGnieRbIO2drqubnO9ks04IlYNl2YCGI1qHu3COy5bsZM/L8ksLnRNWZLtGjU+bM1fqT7Ov0LcRUSBh4/lPHnPTV8LmKrU4/GBtp0pJbroh1XDqKDlbmMwF8tNhVGkKonSPXYFE0jVOAFqfryYD+fA9L+hS5oZvOtivpIp53w==|920 \ No newline at end of file +}//xL7TFEBJY4+lJdlF4sKDRbIO7i8JEHDe7gQypkc75rwktu0Xw48NxLrKJ0wK7DNxO9cQ61ZaTNNOk6dISobVSyTwKP7OcWteVnYQLEf8oESrIxnMbWlnXldgbplydMre+DKaqTOcInseeSi4yXuWNZQvr9DT5EXwt4oiJS9Laq1YDOvx75+l9iuxylNbSVnHcstONm8Jdb8GpzinCeyF8GJyhNAnc5V9SmQb1ZVwo7DV8C4497KUu8JWfzQDAHLy01UKI2PCBZWfoqNnDBjGemb+R/8e09vX9I6Hcxi7GWOIdVqoIzo5+k+tG9UTaxjN64XMXHhYYiwmY3DuIwB5CLEJqY/AdftCr63ee5SEuPDmI1xRAAwXOQZ6gZQXAQb+8NSK8xiVDuIZufD/ywWYCA5G1VcQKZWXNGRn76WMWYt+3JIWaNmpOlGiRgDDEZnyaiqKwrPvgyuAusXhZFRH/fnE8aOp5x758IJgrv77UyoF5OG6yThgigeUwwBIsnh4XFDyXl+4UMoLOmQsbE8eUveswS1OuIOr5D03X4mBYqbp5YaZN6KKQHPc3N//plfwx7rqH4/WI41d0QGy+O3fTIjH0bJEfY3KAnaHfJPZ5DaYKRCn0Jm26QF1g09n7KMspFrb1xvmqWbyFm7DsL1YhIp+zuPVihbTzjXxYyfuo0Ch9t27pE7kO+Dqi78aNuK742UxEuZbDmouc9hXYl3N8Lowb9/+uCSGGdexkm5QA6qH7hS6V6QIOwj+jQ6kJMjdFoCmMFWkjDawCXN3jcMjKebJmAahzHveNi9TD6njfu3HMGnpuvZFopm/dDfed7rDRVcs5FWuw2kW9sTpRCX1+a3v9KZiMOrPdwYfr16q5HfoaX8ex5u3LXNvsvbzGRp+Q3xys+qhElKk9JCD5m2Yxg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目配置/项目信息.rd b/Pages/项目/项目首页/项目配置/项目信息.rd index 662eace7..bf0487df 100644 --- a/Pages/项目/项目首页/项目配置/项目信息.rd +++ b/Pages/项目/项目首页/项目配置/项目信息.rd @@ -14,6 +14,10 @@ { "Name": "当前用户", "Formula": "项目信息!$M$36" + }, + { + "Name": "项目经理", + "Formula": "项目信息!$B$19" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index 65940f58..38551422 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -269,7 +269,7 @@ }, "38": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "39": { @@ -283,7 +283,7 @@ }, "Values": { "1,1": "任务分组", - "1,34": "新增任务", + "1,36": "新增任务", "8,1": "添加分组" }, "AttachInfos": { @@ -463,7 +463,7 @@ "resize": "none" } }, - "1,34": { + "1,36": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -483,19 +483,8 @@ }, "value": "0" }, - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "info", - "Message": "您需要先配置岗位和人员后，才能新增任务" - }, - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "项目岗位详情", - "LoadBindingDataOption": 1 - } - ], - "ID": "eebe0221-39fb-4169-86c4-1f3495f2d465" + "CommandList": [], + "ID": "2c1523a6-efb4-4092-921f-850a471c0579" }, { "Condition": { @@ -510,38 +499,32 @@ }, "value": "0" }, - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "info", - "Message": "您需要先配置岗位和人员后，才能新增任务" - }, - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目首页!项目子页面" - }, - "Value": "项目成员" - } - ] - } - ], - "ID": "d95c56ac-81d7-4678-86cc-cb5e2b924cc2" + "CommandList": [], + "ID": "8d9db3dc-06e3-4523-a283-3b84782dafd0" }, { - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Confirm_Command, Notiflix_Forguncy", - "Title": "提示", - "Message": "确认要发起一个新的流程吗？", - "Answer": "我已确认", - "OklButton": "确认", - "CancelButton": "取消", - "Result": "按钮结果" + "CommandList": [], + "ID": "b0da1a86-ec4a-42ef-8e66-f6ce37bc42b7" + } + ] + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "项目经理", + "GUID": "696c86de-15e1-42bc-b345-0774cf3ab889" + } }, + "value": "%CurrentUser.UserName%" + }, + "CommandList": [ { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -549,25 +532,17 @@ "Condition": { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=按钮结果" - } - ] + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "项目岗位数", + "GUID": "e31a36b0-2d0b-448d-91c7-46d43983fcfe" + } }, - "value": "确认" + "value": "0", + "compareType": 2 }, "CommandList": [ - { - "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", - "ProcessDefinitionResourceName": "新增任务流程", - "ProcessInstanceName": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"项目[\"&任务列表!项目名称&\"]的新任务等待创建\"" - }, - "ReturnResultName": "发起流程结果" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -575,106 +550,94 @@ "Condition": { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=发起流程结果.ID" - } - ] + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "项目成员数", + "GUID": "f5efb0cc-b004-4db9-9398-ef036c348486" + } }, - "value": "%Null%", - "compareType": 1 + "value": "0", + "compareType": 2 }, "CommandList": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!临时存储发起的流程ID" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!发起流程结果.ID" - } - } - ] + "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon", + "ProcessDefinitionResourceName": "新增任务流程", + "ProcessInstanceName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"项目[\"&任务列表!项目名称&\"]的新任务等待创建\"" + }, + "ReturnResultName": "发起流程结果" }, { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PopupDisplayMode": 4, - "ShowDrawerHeader": true, - "ClosePopupCallbackCommand": { - "Commands": [ - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目首页!项目子页面" - }, - "Title": "加载中" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "搜索任务", - "TableValue": { - "TableName": "任务表", - "TableValueType": 3, - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "流程实例ID", - "GUID": "cf657190-e827-46f1-a2d0-aa553276a9b6" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!临时存储发起的流程ID" + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=发起流程结果.ID" } - }, - "NullFormulaValueQueryPolicy": 0 + ] }, - "ID": "7154a3728a3d466683e74593ff25406b" + "value": "%Null%", + "compareType": 1 }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=搜索任务" - } - ] + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!临时存储发起的流程ID" }, - "value": "0" - }, - "CommandList": [ + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!发起流程结果.ID" + } + } + ] + }, + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 4, + "ShowDrawerHeader": true, + "ClosePopupCallbackCommand": { + "Commands": [ { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "删除指定流程", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "流程实例ID", + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!项目子页面" + }, + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "搜索任务", + "TableValue": { + "TableName": "任务表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "流程实例ID", + "GUID": "cf657190-e827-46f1-a2d0-aa553276a9b6" + }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务列表!临时存储发起的流程ID" } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" + }, + "NullFormulaValueQueryPolicy": 0 }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true + "ID": "7154a3728a3d466683e74593ff25406b" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -686,7 +649,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=code" + "SerializeProperty": "=搜索任务" } ] }, @@ -694,159 +657,250 @@ }, "CommandList": [ { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"以为您删除刚才创建的流程\"" - } - } - ], - "ID": "531ab8a2-a77c-4e1f-868c-e26caeebce39" - }, - { - "CommandList": [ + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "删除指定流程", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "流程实例ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!临时存储发起的流程ID" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"删除流程失败，请手动前往我的待办，处理刚刚发起的流程，原因：\"&任务列表!msg" - } + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"以为您删除刚才创建的流程\"" + } + } + ], + "ID": "00294364-494b-4328-8ed7-3fcbde998492" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"删除流程失败，请手动前往我的待办，处理刚刚发起的流程，原因：\"&任务列表!msg" + } + } + ], + "ID": "d295943f-163e-42f0-b134-d44e4058c35a" + } + ] } ], - "ID": "f959d0f2-3314-45e8-9906-ba0aed5bf87a" + "ID": "d0bd48d1-fbb5-4b4a-b8dc-eea22ed1a2de" } ] + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!K6" + }, + "TargetType": "ElementUI.VirtualizedTableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "ResetTable" + }, + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_HI_PROCINST_View", + "ColumnName": "ID_", + "GUID": "b3046f51-7863-49de-97c6-2f169103abf8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!立项流程实例ID" + } + } + }, + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_RU_TASK_View", + "ColumnName": "PROC_INST_ID_", + "GUID": "90dea706-f9fc-4abb-a182-2ec586732108" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!立项流程实例ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "ACT_RU_TASK_View", + "ColumnName": "ASSIGNEE_", + "GUID": "d3d6dd27-3889-4696-9e81-64de94c409b7" + }, + "Value": "%CurrentUser.UserName%" + } + ] + } + }, + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!刷新项目" + }, + "TargetType": "Forguncy.ButtonCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", + "MethodName": "ExecuteCommand" + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!项目子页面" + }, + "Title": "加载中" } ], - "ID": "476cb2c9-fe71-4edc-b5f6-7a367e627e4e" - } - ] - }, - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!K6" - }, - "TargetType": "ElementUI.VirtualizedTableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "ResetTable" - }, - { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "ACT_HI_PROCINST_View", - "ColumnName": "ID_", - "GUID": "b3046f51-7863-49de-97c6-2f169103abf8" + "ParamProperties": { + "IsOK": "是否为确定" + } }, - "Value": { + "ValueFormula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!立项流程实例ID" - } - } - }, - { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ + "SerializeProperty": "=任务列表!发起流程结果.Page" + }, + "PassValues": [ { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "ACT_RU_TASK_View", - "ColumnName": "PROC_INST_ID_", - "GUID": "90dea706-f9fc-4abb-a182-2ec586732108" - }, - "Value": { + "Source": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!立项流程实例ID" - } + "SerializeProperty": "=任务列表!项目ID" + }, + "CellName": "=项目ID" }, { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "ACT_RU_TASK_View", - "ColumnName": "ASSIGNEE_", - "GUID": "d3d6dd27-3889-4696-9e81-64de94c409b7" + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!发起流程结果.ID" }, - "Value": "%CurrentUser.UserName%" + "CellName": "流程实例ID" } - ] + ], + "LoadBindingDataOption": 2 } - }, - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!刷新项目" - }, - "TargetType": "Forguncy.ButtonCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115", - "MethodName": "ExecuteCommand" - }, - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!项目子页面" - }, - "Title": "加载中" - } - ], - "ParamProperties": { - "IsOK": "是否为确定" - } - }, - "ValueFormula": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!发起流程结果.Page" - }, - "PassValues": [ - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!项目ID" - }, - "CellName": "=项目ID" + ], + "ID": "75001d54-c103-4866-92ab-5cdbe14f7d7d" }, { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!发起流程结果.ID" - }, - "CellName": "流程实例ID" + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!发起流程结果.ErrorMessage" + }, + "BtnText": "知道了" + } + ], + "ID": "139e765a-a9ec-4fe6-b81e-60975b7cca1d" } - ], - "LoadBindingDataOption": 2 + ] } ], - "ID": "b05d72c0-2238-4a00-9046-c347046169d6" + "ID": "9d37b96e-180a-4a2a-969c-13e868fbe6db" }, { "CommandList": [ { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "warning", - "Title": "温馨提示", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!发起流程结果.ErrorMessage" - }, - "BtnText": "知道了" + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "info", + "Message": "您需要先配置岗位和人员后，才能新增任务" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!项目子页面" + }, + "Value": "项目成员" + } + ] } ], - "ID": "0e9c4595-2cf0-4fe9-b5ab-52fbaf0c525d" + "ID": "07dd50fb-f327-4382-8805-511afc053f12" } ] } ], - "ID": "a171d198-534a-4642-a4f1-7a127603e322" + "ID": "1b3d0c19-2a2b-4d9d-9141-589728a6de4f" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "info", + "Message": "您需要先配置岗位和人员后，才能新增任务" + }, + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目岗位详情", + "LoadBindingDataOption": 1 + } + ], + "ID": "3fa4c549-0ffc-4428-852e-35a918059c27" } ] } ], - "ID": "6d7d26a9-96cf-4e1d-8247-162260a3e584" + "ID": "da607c7a-743a-4d10-8941-93cbbd5c3f68" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "只有该项目管理员可新增任务" + } + ], + "ID": "594f019b-c50b-416a-98f3-48c82a513ff0" } ] } @@ -860,25 +914,10 @@ "UseCellTypeForeColor": true }, "IconSize": 14.0 - } - }, - "1,37": { - "CssName": "rotate-slow", - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PopupDisplayMode": 4, - "ShowDrawerHeader": true, - "PageName": "任务助手-首页" - } - ], - "ToolTip": "AI助手", - "Size": 18, - "IsDisabled": true, - "ImagePath": "gpt.svg" - } + }, + "RulesGuidList": [ + "04baca80-3e32-40a5-8cf0-82513c6c839c" + ] }, "3,1": { "CellType": { @@ -1587,6 +1626,24 @@ }, "IconSize": 14.0 } + }, + "12,13": { + "CssName": "rotate-slow", + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 4, + "ShowDrawerHeader": true, + "PageName": "任务助手-首页" + } + ], + "ToolTip": "AI助手", + "Size": 18, + "IsDisabled": true, + "ImagePath": "gpt.svg" + } } }, "StyleDatas": { @@ -1662,17 +1719,8 @@ "1,24": 4, "1,25": 4, "1,26": 3, - "1,27": 4, - "1,28": 4, - "1,29": 4, - "1,30": 4, - "1,31": 4, - "1,32": 4, - "1,33": 4, - "1,34": 3, - "1,35": 4, - "1,36": 4, - "1,37": 3, + "1,36": 3, + "1,37": 4, "1,38": 4, "2,7": 0, "3,1": 5, @@ -1787,7 +1835,9 @@ "11,36": 4, "11,37": 4, "11,38": 4, - "12,7": 0 + "12,7": 0, + "12,13": 3, + "12,14": 4 }, "SheetStyle": { "FontFamily": 1 @@ -1797,14 +1847,14 @@ "3,1,4,6", "3,7,4,1", "8,1,1,6", - "1,37,1,2", "1,18,1,7", - "1,26,1,7", - "1,34,1,3", "1,9,1,8", "5,10,5,28", "12,1,1,5", - "12,8,1,5" + "12,8,1,5", + "12,13,1,2", + "1,36,1,3", + "1,26,1,9" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1847,6 +1897,22 @@ "RelatedDataTableName": "项目任务分组", "ConditionFormatRulesCollection": { "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!母版_当前用户<>任务列表!项目首页项目经理" + }, + "Priority": 1, + "GUID": "04baca80-3e32-40a5-8cf0-82513c6c839c", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": true, + "IsInvisible": false, + "IsReadOnly": false + }, { "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { @@ -1880,7 +1946,7 @@ }, "IsAutomaticFill": false, "Location": "0,15", - "Size": "1196,378" + "Size": "1213,378" }, { "FitToBrowserHeight": true, @@ -1901,7 +1967,7 @@ }, "IsAutomaticFill": false, "Location": "246,70", - "Size": "926,271" + "Size": "943,271" }, { "FitToBrowserWidth": true, @@ -1915,7 +1981,7 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Size": "1196,55" + "Size": "1213,55" } ], "CustomNames": [ @@ -1936,4 +2002,4 @@ "Formula": "任务列表!$I$13" } ] -}//AxsDjawDpIavHWPSkwW54mFm01e3M7Z+E+5ldjsClZ3AmMkabMTqE1Gi6MCGVkSNYU9wmlzFSZF1Gw48uAC+OJ7NBM6LWJtH2bL41O6/2hAABDAUvqDUYQka9EJeGMq3nBG67j1TREpcLq6Zev7NwvlAu/XyMpMPCJ5zfQCb/zICXidA7yl14HGBSDXMYh7MUb35wmdpYZPH6kbOEN/RS6HW5pHhW8ZWVVmNEQWBABlGDyjtxy+C63bBdxH2KYE0G2JS8VdY+zsaGssmpRm9C+FkuXdkTxmkenMyJCXJPIA1aEnDIEcD8/7HXvGOaBaFqEi4q/d0EGXYcxpv361fIpoBMq7AL8BnbqcRZVdXvdGTJWq/aPjXRus1gIb+SE2djSRw4urpscYITIuFEsxTKqT8KRRxtS6WPcxhac8WTf3PK9BCq8rBNPGhGOyTmWrvp+4ckqiC1Y60AjhtCfVlY5Ngyon3Z7XAtboxZEcUca2PQdEzP/pbB3bp6l3TeeofQPx9zmXkz6llnGSTjRAHlwceWgfTU6nzEhbMlETfO2jXa7jLK8fZqrdUIupPehj3LXvCCNTNZRUr+LiY/X/OHghQ3v2iR0MTOjofAwLuDCAFjraw7Gw4AICVlzAj0Dzi6L0RxWjEh9+Cn2t1cRsxEOXk6nZEsDB1HEJaAZlpckEvq2E6/tL90PePc4YQHeNvfIc6LSQ++EhJY+F3n5kESW+G+gP1FavXe7x5BRfGsWO4DLrG7o4yw5VmsTwezTfeKMaWpMmTDCArTjfrduH3WKZqzdEXHFJwnyT2DD7KysG7HdRTCzYelmNSJG7tLTeOYQDbwosyK9u6sssI46xTCJe1rUqAPIXzudfUmUkUjKlGtOz+qC17rBtF4T7xS+gfnmAP9h703GkVZegLdleMlQ==|920 \ No newline at end of file +}//o9eq3m5XR5cZLvkwstwZGxLF6xStwxhlL4Eqxv65AcPCkmxrfVG06aFYuowKT2LfFOT7b5agcXOrPTjyk3bt2vKix5jJ+JZtP82Y9aS0pL3xW98oVs61DhiZ2XhWtnkGbxJ+fkQvr0nCRTAr8CnKoXC1oEj1WJ5l6nehNTL5X3UKQr3VsGO7JToXEx94jyJzy/VDs7D3uqwfevowa3cG19R38yIC6dvenSFDa7t27oeeRaL0xYq1LNHyoMpDnhdHN4Fn9cgsD1Jq+aclk9T9Dl9pDDp2eWDOzSwlC6s5kVx9zIpuv5lu9K4mbt5I9iUdFSj9J7aVoCN9Xt8VJ+k+JrJj1r/8oSStYe9V3PglN359cESd88PFlqjuqx1wi4ETkIRXpH8our0VGeK7dyansbSN/lk9KNT3BvhdwCyeADta6KXxKw6Trqculc4Up5yUmGkGbao+k6en7QKiKXFst75ruBI5cz3oedQuv+iLVv419MPetWsFgCJDZ7bq+aPDpD7/nTKOA6tTjRIKCNcWngnkxe3wTIVSac4uwUuFKsMv+lCSv7Oi1wYVpZpSOV2cK5QZJzkyL9GK+tqiLlv4p0UJ9uKlaBXhr3Ye1l3OiCwD+AqGuONvzuLGODI9f2nzxSeXrTOpK/wazHiz23LvVmQ6ZE3mQwOVxtVwRFMrSkSLHghTJRbDHb6EQFt8XvcmkLIvxCRg1vVAeKBaU1wFuT2HIU3v+3jUg18A6ccQvu0FWnSNO6pajYLLGD5FoEphQiFTvAlKvLtFTHPHuc8i+8reym4VMrl3KXuzfTSuJiUxppep1HgsrUVgdOQr36gFws1SZo6DNM6ml6l23Csg0QUGOUD8Mi7BUjgLvYl2xDfLZJexRdneq01RlStdOmwKA8M2RVQxWulMYtwBrI/8cA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-任务信息.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-任务信息.json index 10ce3987..93aa0c9c 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-任务信息.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-任务信息.json @@ -1001,57 +1001,6 @@ "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "PageLoadedCommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "任务表", - "ColumnName": "任务说明", - "GUID": "4cdfa127-ffc2-47df-83b7-4eb09e19915a" - } - }, - "value": "%Null%" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!7:7" - }, - "Value": false - } - ] - } - ], - "ID": "4e5d7a47-4405-4597-9b0b-e2fa95ad2386" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "Location": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!7:7" - }, - "Value": true - } - ] - } - ], - "ID": "68da7112-0717-4d2e-98bb-f20c66de0dc9" - } - ] - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -1082,7 +1031,7 @@ ] } ], - "ID": "47550191-7a10-49d5-95ab-1e56f248ac21" + "ID": "36f1d002-e9b7-4902-8cc8-dd484b5387cf" }, { "CommandList": [ @@ -1099,7 +1048,7 @@ ] } ], - "ID": "e5920645-605b-48b5-8e34-a0a4edf2f7a4" + "ID": "7d522d3d-8807-4f51-a557-aa4788d47e9c" } ] } @@ -1173,4 +1122,4 @@ "Formula": "'任务-任务信息'!$C$10" } ] -}//+4wJtuZvdTTNeIKvZRm0XupUiwp6CZZF/YOdiKdPERAOj7ePcU+j+ZOQ1yigzwZxa8Gm6Hv1bNlLULtiyGfnFM1EtsaJk7+kE2Q7BIWAz1BkVH52JzQQwSyt5YFC1SkF3IeOIP3W0xOS+INyT1LEHsZRfjTCZMn1caZPttpECNo901iDwKR8eqpg1zfErfqaC8TwAGPv2DNQqppbqEtOIEpMqjUjqM1EsgWVsiNBbznIWclrU6lJOyjCTRQD/xLKtoxDpUnxPrcSqACwLNqUGq9WsqZqC8nKEymdwCfWmXpEBiTJ1mPylOOCou2/e3dTbuG6Ortq4Jixw7JG8knWf5azfl9K2xScUtCyWQesFign/MCXEaw+717ImEQvzJ9gYjjE7zO3NlzvYAm0nUCy7j0Km0uzXMKODTlmIasD0vLB9jbSPrTFJjr7T8Y8ezgAdFmiQ7dfWnxlm3JQ8Cqfg5kqkurFlP80rGhHYBVf/rl4SJ6iWeDZ2jeWBt6q29/Zzf3lzlE+ivaySEeuNVHwat9tGYVz/t3+i3OalbKwaK4HFVuW009A8ux4lYlQux2N/6biq4OMalTpHtNOfAAqIofC/fUhhx1hoMscbh0RQ2Ne1qndefy1MWlKHPB6DbX1ISHyDFy8uXbsRALmQQ5UW8D9+KeUl+p0dG0d/XN8CQWhkIA0s/tmO+vMaZIU+hKq318QNbbOldPaLO0xm5sKpNwCFDB7SHd75o6QPqmnjwZCUu5JTwWydZd0TSuxLARPjNbke2iLn6h1rFNHS4CLch8uF3oQ2aH2JhIqvI4xUK+Ds+AmbDriBayAwLDd8v6Ssv9IV212EDRmBmho1Oy5qr1zLUy6Cui1ixIq6pL/2X/9+vR6Al9Ix7xIX+JJL0VSDMYbDO8K65FLeB1waTMfxQ==|920 \ No newline at end of file +}//kzie6hgUapb504xbRee4G+oaTp0Msy4ZJ3QG6Jh/gXqHeTdWzC76sNNISJYVC8nQ/Q6KEV8Cue5Pu5Uk1d92zE4zUF5UZb5pzdb4qXZsUK3Wbcl0KNIepHy0z91upHA8szg9Ea7xCccXz6+gcWZYByggrKY5lIcwU+Qh3dmybkKSUwjyfI7Gdb+CmbaHcnNtIugaW2aS0WTqIodLOFeBSnvIRg/Ngr53LeoQKj5BWlQQWhYiGwVPeeHBl3uU2hZYXqMjp2UgjkJa52cz426hn/p71AeFR1DXz9Z2npCaLCUUzPr6YYuitpCjLLb28X14zWnEhJvKFjM43bEeDn5stDczf5CyO1cvYQt62YRWsqR2lqWeHaAhkSwNWCzrSBWhpgLqNq0AhOpihhHfYPTBexrql5bYXhWoCwqwKSn0vawUTwZmOz5p/xt3BQo66/InHkE+ZlfM+2/AMVd79ESCFHIdKTAT3g7e+xoaOwRRy8/AC9XsI4QTCKZWjGi2c8pXXB1uScc2P/3hr9cLQ7FX3KEkbVRsF8V3+2zKEl0oqAmJVDRe/Srbhu7u1HaxMKOMxarec1Yho0x59+7FLiUf06W8Y+cyR1KZfX56qn/vxquiylV0mhsmmWSuCH0X7ztF70gTJumpGeF32qEbMO//7MYvpaglQwOwMz9Zl5fzXYmyL9FJJsLwbqb++MLIFT9tM2PfBUIs5F6IGlpisz99/P9kFE0nBDuC9Ri0gqGPmOmwsfqS9/dFyQKUHrXvxlt9csjo7P3wyBKiK9bZqo9YjrOqWHOcDaztoxDX6fH0Ufn1Fo60lP9nJAO2o7hht11Zemfb4OSVdodMiO39+z+ATE3TlnQb2Q77U/R3a3p6sSe0+FtgkQW273Qdqb1xVdBj9SW1KM3WQJit0GVI2AXd8A==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json index 6d6e0989..f0398bed 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json @@ -191,7 +191,8 @@ "11,10": "结束日期" }, "Formulas": { - "5,2": "项目ID" + "5,2": "项目ID", + "5,11": "IFERROR(ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)),\"\")" }, "AttachInfos": { "1,1": { @@ -295,7 +296,7 @@ ] } ], - "ID": "ecb8f0ff-191a-42a0-a586-178caebedd72" + "ID": "2fd0c36c-d3d8-4b95-85c0-24e241efd668" } ] } @@ -434,7 +435,7 @@ } } ], - "ID": "77f7daf3-ef81-491f-82c6-4889fc31630d" + "ID": "c553be6e-e808-4e5b-bcae-5334f9c7aca0" }, { "CommandList": [ @@ -449,12 +450,12 @@ "BtnText": "知道了" } ], - "ID": "a4f9b82d-f6b9-4c22-9a63-b18c6c38a132" + "ID": "f54dbc55-a667-4d3d-a5a8-6e5a2ef98216" } ] } ], - "ID": "8a6a50f6-e4a4-41a8-82f7-2b4592801498" + "ID": "a62b5bf1-0f26-499c-aaa3-3ba6e90e127f" } ] } @@ -467,7 +468,7 @@ } ], "Comments": "小于进行中", - "ID": "074ea58d-c1ff-4149-b895-369f9f9369a1" + "ID": "364eebdf-60d5-4143-8771-94d1959ab553" }, { "CommandList": [ @@ -477,7 +478,7 @@ "Message": "任务尚未审批完成，不可修改状态" } ], - "ID": "2b08a404-4322-4ef0-9584-8c29595b92ee" + "ID": "429eb6c5-9de5-46f5-90e0-35461eb686ac" } ] } @@ -575,7 +576,7 @@ ] } ], - "ID": "79becebf-9576-4f75-9dba-a2d70a0299f5" + "ID": "6684cedf-b046-4449-8806-5efdfad9244c" } ] } @@ -672,501 +673,13 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "父任务ID", - "GUID": "8763325f-d288-4bac-9366-d259cad8164a" - }, - "CellType": { - "$type": "ElementUI.CascaderCellType, ElementUI", - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", - "contextProperty": { - "Display": "值变更原因" - } - }, - "value": "userInput" - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "8451b1e3-6a2a-47f8-9fbd-c840bd770712" - } - }, - "value": "%Null%", - "compareType": 1 - } - ] - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "任务表", - "ColumnName": "任务状态", - "GUID": "430fb608-3939-479c-b367-96a56fac1b01" - } - }, - "value": "0", - "compareType": 2 - }, - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!任务基本信息" - }, - "Title": "校验中" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "='任务-基本信息'!code" - } - ] - }, - "value": "0", - "compareType": 1 - }, - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "warning", - "Title": "温馨提示", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!msg" - }, - "BtnText": "知道了" - } - ], - "ID": "abd6323a-bc37-4cb6-94ae-8b4b3285062d" - } - ] - }, - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!任务基本信息" - }, - "Title": "计算中" - } - ], - "ID": "4a23bc13-ea32-4dbe-b83d-6e4d5fd2049a" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务表", - "ShowConfirm": false, - "CheckDataValidation": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "be57397c-730d-4811-ba26-c4dd14714c0f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!任务ID" - } - }, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "父任务ID", - "GUID": "30596874-c8b9-489b-9a9a-605c4820def2" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!父任务ID" - } - } - ] - } - ], - "ID": "3f703b27-1991-4d3a-ba22-b3c86ca273be" - } - ] - } - ], - "ID": "6eb1b7b9-0838-4124-b28a-3249d4e8bed3" - } - ] - } - ], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "useBinding": true, - "options": [ - { - "$type": "ElementUI.TreeNode, ElementUI", - "value": "zhinan", - "label": "指南", - "children": [ - { - "value": "shejiyuanze", - "label": "设计原则", - "children": [ - { - "value": "yizhi", - "label": "一致" - }, - { - "value": "fankui", - "label": "反馈" - }, - { - "value": "xiaolv", - "label": "效率" - }, - { - "value": "kekong", - "label": "可控" - } - ] - }, - { - "value": "daohang", - "label": "导航", - "children": [ - { - "value": "cexiangdaohang", - "label": "侧向导航" - }, - { - "value": "dingbudaohang", - "label": "顶部导航" - } - ] - } - ] - }, - { - "$type": "ElementUI.TreeNode, ElementUI", - "value": "zujian", - "label": "组件", - "children": [ - { - "value": "basic", - "label": "Basic", - "children": [ - { - "value": "layout", - "label": "Layout 布局" - }, - { - "value": "color", - "label": "Color 色彩" - }, - { - "value": "typography", - "label": "Typography 字体" - }, - { - "value": "icon", - "label": "Icon 图标" - }, - { - "value": "button", - "label": "Button 按钮" - } - ] - }, - { - "value": "form", - "label": "Form", - "children": [ - { - "value": "radio", - "label": "Radio 单选框" - }, - { - "value": "checkbox", - "label": "Checkbox 多选框" - }, - { - "value": "input", - "label": "Input 输入框" - }, - { - "value": "input-number", - "label": "InputNumber 计数器" - }, - { - "value": "select", - "label": "Select 选择器" - }, - { - "value": "cascader", - "label": "Cascader 级联选择器" - }, - { - "value": "switch", - "label": "Switch 开关" - }, - { - "value": "slider", - "label": "Slider 滑块" - }, - { - "value": "time-picker", - "label": "TimePicker 时间选择器" - }, - { - "value": "date-picker", - "label": "DatePicker 日期选择器" - }, - { - "value": "datetime-picker", - "label": "DateTimePicker 日期时间选择器" - }, - { - "value": "upload", - "label": "Upload 上传" - }, - { - "value": "rate", - "label": "Rate 评分" - }, - { - "value": "form", - "label": "Form 表单" - } - ] - }, - { - "value": "data", - "label": "Data", - "children": [ - { - "value": "table", - "label": "Table 表格" - }, - { - "value": "tag", - "label": "Tag 标签" - }, - { - "value": "progress", - "label": "Progress 进度条" - }, - { - "value": "tree", - "label": "Tree 树形控件" - }, - { - "value": "pagination", - "label": "Pagination 分页" - }, - { - "value": "badge", - "label": "Badge 标记" - } - ] - }, - { - "value": "notice", - "label": "Notice", - "children": [ - { - "value": "alert", - "label": "Alert 警告" - }, - { - "value": "loading", - "label": "Loading 加载" - }, - { - "value": "message", - "label": "Message 消息提示" - }, - { - "value": "message-box", - "label": "MessageBox 弹框" - }, - { - "value": "notification", - "label": "Notification 通知" - } - ] - }, - { - "value": "navigation", - "label": "Navigation", - "children": [ - { - "value": "menu", - "label": "NavMenu 导航菜单" - }, - { - "value": "tabs", - "label": "Tabs 标签页" - }, - { - "value": "breadcrumb", - "label": "Breadcrumb 面包屑" - }, - { - "value": "dropdown", - "label": "Dropdown 下拉菜单" - }, - { - "value": "steps", - "label": "Steps 步骤条" - } - ] - }, - { - "value": "others", - "label": "Others", - "children": [ - { - "value": "dialog", - "label": "Dialog 对话框" - }, - { - "value": "tooltip", - "label": "Tooltip 文字提示" - }, - { - "value": "popover", - "label": "Popover 弹出框" - }, - { - "value": "card", - "label": "Card 卡片" - }, - { - "value": "carousel", - "label": "Carousel 走马灯" - }, - { - "value": "collapse", - "label": "Collapse 折叠面板" - } - ] - } - ] - }, - { - "$type": "ElementUI.TreeNode, ElementUI", - "value": "ziyuan", - "label": "资源", - "children": [ - { - "value": "jiaohu", - "label": "组件交互文档" - } - ] - } - ], - "bindingOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "任务表", - "BindingInfos": [ - { - "GUID": "ab7cf1bf-f636-41b6-942a-63cf0289ebca", - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "ID", - "GUID": "e6216e4d-90fb-45b0-a820-5fc5cf5438ed" - }, - "ColumnName": "value" - }, - { - "GUID": "2a6f28da-2c7d-4669-b484-ddba3b7c0d94", - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务名称", - "GUID": "a123bac7-2d23-415e-beda-f3a5dd915931" - }, - "ColumnName": "label" - }, - { - "GUID": "6ffbb993-13d3-49e7-8cea-9aaffbd7cbec", - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "父任务ID", - "GUID": "f95d1df7-ac21-486d-bd33-7bfccf609ed5" - }, - "ColumnName": "parentValue" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "7ca2f7ab-1508-42e6-8a47-8e66b6f5deb5" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!项目ID" - } - }, - "TreeSourceSetting": { - "IdColumn": "value", - "PidColumn": "parentValue", - "QueryResultMode": 2 - }, - "CustomColumns": [] - }, - "expandTrigger": 1, - "placeholder": "请选择", - "separator": "/", - "tagType": "info", - "checkStrictly": true, - "filterable": true, - "clearable": true, - "IsDisabled": true - }, - "RulesGuidList": [ - "351faf93-8d96-48e8-8960-479d5746c480" - ] + "GUID": "2698f14a-4a43-4369-9208-631c7455a1f6", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "任务名称" + } + } }, "7,2": { "BindingInfo": { @@ -1243,7 +756,7 @@ ] } ], - "ID": "193308e9-c549-4dca-86ef-1a4aea30171a" + "ID": "e6499b98-884b-43dd-8f5c-8c3a2acaa2e3" } ] } @@ -1514,7 +1027,7 @@ "BtnText": "知道了" } ], - "ID": "c66c6cd9-2e89-4a32-a008-d5e867947cab" + "ID": "32dcdd1f-34f8-4f0d-ac12-482f5bbc5ed0" } ] }, @@ -1528,7 +1041,7 @@ "Title": "计算中" } ], - "ID": "a5feea95-25f9-409f-96cc-b8735384f2ec" + "ID": "bbfa118e-4e30-4963-98b7-28057c1724ac" }, { "CommandList": [ @@ -1543,12 +1056,12 @@ "BtnText": "知道了" } ], - "ID": "ca301e2e-e0bf-473c-885f-1fad0f86ff64" + "ID": "33d84cf5-0a2b-4c62-b0af-a8e1ac868a7a" } ] } ], - "ID": "00acbe8d-09f8-40a2-93a8-5d970d8fbe3c" + "ID": "dc7c13a8-ba5f-43f5-9148-eca71ad39ea8" }, { "CommandList": [ @@ -1584,12 +1097,12 @@ ] } ], - "ID": "5c153a16-a921-4b79-a6d7-54b21d70859f" + "ID": "98467510-d4ea-45b4-b5f7-bf7a98680409" } ] } ], - "ID": "96e2aaa3-38ab-4616-84fd-07dcc16af792" + "ID": "18f14bb4-9ed6-405d-9cf4-9f010380bfea" } ] } @@ -1694,7 +1207,7 @@ ] } ], - "ID": "4dbe773d-0a14-441f-8e8c-2ef1033b4a63" + "ID": "2b3141af-03e0-4fb6-a669-809bfd44bd3f" } ] } @@ -1848,7 +1361,7 @@ ] } ], - "ID": "f6ff4a99-a5f7-4cb2-ad07-368598e8a07a" + "ID": "a5e07d55-af2a-46dd-9d3d-ea52eb158c9a" } ] } @@ -2012,7 +1525,7 @@ ] } ], - "ID": "dbd2804d-bd33-46bc-91e1-24a1fab92ed9" + "ID": "20966b93-3ceb-4384-995c-c715dbca0632" } ] } @@ -2120,7 +1633,7 @@ ] } ], - "ID": "ddd2dfbe-621e-4e1c-aff1-99a933d88c42" + "ID": "4364642b-9f8b-4705-bbbf-57581acc5fa1" } ] } @@ -2152,6 +1665,16 @@ "firstDayOfWeek": 1, "DefautWeekFormat": "yyyy 第 WW 周" } + }, + "13,11": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "父任务ID", + "GUID": "8763325f-d288-4bac-9366-d259cad8164a" + }, + "RulesGuidList": [ + "351faf93-8d96-48e8-8960-479d5746c480" + ] } }, "StyleDatas": { @@ -2271,13 +1794,6 @@ "5,8": 5, "5,9": 5, "5,10": 7, - "5,11": 5, - "5,12": 5, - "5,13": 5, - "5,14": 5, - "5,15": 5, - "5,16": 5, - "5,17": 5, "5,18": 5, "5,19": 10, "6,1": 6, @@ -2407,6 +1923,13 @@ "12,20": 5, "12,21": 5, "13,0": 5, + "13,11": 5, + "13,12": 5, + "13,13": 5, + "13,14": 5, + "13,15": 5, + "13,16": 5, + "13,17": 5, "13,18": 5, "13,19": 5, "13,20": 5 @@ -2425,13 +1948,14 @@ "3,11,1,7", "1,20,11,1", "5,2,1,7", - "5,11,1,7", "7,2,1,7", - "7,11,1,7", "9,2,1,7", "9,11,1,7", "11,2,1,7", - "11,11,1,7" + "11,11,1,7", + "7,11,1,7", + "13,11,1,7", + "5,11,1,7" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -2461,7 +1985,7 @@ } } ], - "ID": "7c730b78-aef4-403b-8451-fef7f96a35f8" + "ID": "f17ea48f-aa63-4d9b-87bd-9a70e47f5f4a" } ] } @@ -2629,7 +2153,7 @@ "CustomNames": [ { "Name": "父任务ID", - "Formula": "'任务-基本信息'!$L$6" + "Formula": "'任务-基本信息'!$L$14" }, { "Name": "结束日期", @@ -2664,4 +2188,4 @@ "Formula": "'任务-基本信息'!$C$8" } ] -}//TioyOGwHSkG4f9TEW/rja/m/g7tCQchhFVecxyQWRnzEsnZ4RZj0nhG4m9SjDUlfaeNUHnzl/PrjRMVe4sOFM6/xXFjTrqVCom2osY+0XUP08QVP4tAuAUJESuKjHT7ZrszS9Zm8udwwCh6sEPp7HwxrAGXOHBiSKznboGT6xgcWjAns1AFKDVX+7sJzGZcLCsXmtV9sziCkDjeH07RU3jpqGXsVJKR2pQD51G/Crtc+Gwjd28kVd2UXqqpvFFmxdfF4PHRlu1NJdnV65BVRmlQYnrxO3xSq7QvsY8JN7UAt6kVLVr/Z3dCA6SUNELzNEl1+ktWKMvyjNt93kPT9kqIup2a2QRDHwunMUsoqSn2iFaUlvVYrw3fgxxf5GRo3gclSJsuGEWwZNM5Goa/A+gkHm/NSHiA+9gJ3Ei8onT3hP+pLLcMxkpvFxpNR/dy2XSvcPwlgJDQyI/wfFZmmLgN5l9wCzNCGdxeF98Zyz5+zcWLaDqRjwVPAXnQ/tG3g+CqaqjMg5mhmbgO3KBFwd0GfIjp5tn4D4WEJxswt3sN9b3r0rSU+AQLEBE/wJU3pXcjQ7Vs+DZ5cjpTC5umLEYmFQLVyv8Z6TE+JFnmOQ9UCh6065w4CdEx3IlHMGs+G0QXVXrPpqEUYZd3xjNlm9T3aU2ttkmFIdoPsTxzV3vZhYblAQ9h+UrRqRQ7qfnjp9tC5M0/KZhDEpsJVQFfijLxstvgMH+ovFWA98iFcSc2EW8gEYdZDmOGQ8ZVLTrajL01hrWLQRYeRwrhQ4jIxjJluNJ61G+eCGpUWs/jsEK4gaCSIJ9vgvWHpoby6Ma+2tllg0mQK1NXy2VKCHnzp0oaX9NftWlic/uz1TTUVlbOFoMdvwGX4XNrbn9S9UkXC+peUZTPuum1R9Ij1DpxaaQ==|920 \ No newline at end of file +}///vvil7ME3LnCZ6PYCtyMlP5XW2xDNq7LxBuFqFM97nNYxgPF7cmRvmwsFFMva5J9h6GYdqQKzEnnrX5xPRVFb3yXHm4L/3ZBvgNH/TD8EoGlc0/Wa9StCbF8cMi1x9mA2s4FYZBVDLE72LiGW6BiF61yyBK8DgKv6L+ZG3xJWSu/1y4glsZ2Ih7cXz1FxHzRDvxVuXurudH6AYn/UfnxqGBRr/MAIC0UzNEZ3xTvF+seTsYJfZB22MzfohNLnQyqf8JcngL6wJNBiO5am+HN9EsQHevsJk1owcPA/vewQESxckflNv3yRgslJkiAdMbjoNw+wYbN5Ou0P2p/x0VK21ZeklnOf+leHqe6b+PY2GC+UgxM2uiQroAYpBQQAknn2ojruFyWaCQ+KkwaLXMxB/XfJDJC6Q6X4KVKc3nT8YYk1OyaobADhqGTyfDxNIJPiyb0PgahE4uJ50kSLzTWep05eX4sMqc7LoWMdESOAUu8fh+drTQtEDPXrV+l6uE4ejVsYFGkeKXPhVHFWqjjir1bMDHYVPlUpBt8aD2Gse9nb+zafTG95T+Hp8F2GMKE97cvSpI19Vc8HUltMJESTpzOmpgiTI9vtaO61fh659RuwQQptduyNDND3xs/X/2oi8MjXqd0gZgYDuzwa+ufZ32h9XYOmneUQEEj3Xc1tBQrkDiJRPaeCrq+zaartAC8n8rB0oROnvmXacnwpHVSZtxY3M2OfNsDQUh6oh5pxPVyHDt9BrGQt9gFgr6E1Rno5YLl6lMvAvT6lmQBjPpgpmgNpjKvsf1V3XIRN4arJoCBz0G+l0JaKl3KFdflNf8SXHW2n0weLpq1n6MBdO3Cc+A3XZVaVQLROLtPbr2Fr0Jt4ccb9wDPCIj+cgy+Masl5EBvNu/jP30gzenybylkHw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.rd b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.rd index 47573803..80fb3783 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.rd @@ -3,12 +3,13 @@ "ColumnCount": 22, "RowCount": 14, "Formulas": { - "5,2": "项目ID" + "5,2": "项目ID", + "5,11": "IFERROR(ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)),\"\")" }, "CustomNames": [ { "Name": "父任务ID", - "Formula": "'任务-基本信息'!$L$6" + "Formula": "'任务-基本信息'!$L$14" }, { "Name": "结束日期", diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-子任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-子任务列表.json index f44c20dc..7919d643 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-子任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-子任务列表.json @@ -162,7 +162,7 @@ } ], "Text": "增加任务", - "IsDisabled": true, + "IsInvisible": true, "TemplateKey": "Gost", "Icon": { "Name": "Application/005_add_5.svg", @@ -348,7 +348,7 @@ ] } ], - "ID": "24ed3cd4-1228-4851-ae8e-4d6c9a8c8182" + "ID": "cd7f6033-bbee-4b44-b6e4-a1507e303e9b" }, { "CommandList": [ @@ -365,7 +365,7 @@ ] } ], - "ID": "4cfc396d-046d-4072-826a-aae613d3c916" + "ID": "1bcbf1f5-800f-4898-a23e-1eee87e43973" } ] } @@ -512,14 +512,14 @@ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=OR('任务-子任务列表'!任务ID=\"\",'任务-子任务列表'!父任务负责人='任务-子任务列表'!当前用户,'任务-子任务列表'!项目经理='任务-子任务列表'!当前用户)" + "SerializeProperty": "=AND('任务-子任务列表'!任务ID<>\"\",OR('任务-子任务列表'!父任务负责人='任务-子任务列表'!当前用户,'任务-子任务列表'!项目经理='任务-子任务列表'!当前用户,'任务-子任务列表'!执行者='任务-子任务列表'!当前用户))" }, "GUID": "c10f8c5b-5f0c-448e-beff-6508c5c3f90f", "StyleInfo": { "Underline": null, "Strikethrough": null }, - "IsDisabled": true, + "IsDisabled": false, "IsInvisible": false, "IsReadOnly": false } @@ -580,4 +580,4 @@ "Formula": "'任务-子任务列表'!$R$6" } ] -}//VdOvc//UwaIt2NyrNqVpukluG0QBY+pFrJfP7bZPvMLuLax/Gs+pTJmFx1HFOspRU4mhI01QMmr0D1mSQ2Fqa972vLD0KIj5bOBMmRFeJHFU2JIfjvRK1XDGw4SnhXqRQ5E2MLkOBzri6Q94Xc5+yC1Hdu8JoxSbE/vU3A7yaZUHc0rv1Z30BpJmanBLmy+XnOd2F/toT50QGHkPynFEGLCe50/yg8gIH/N/qeH+MTBgZE7Ya9vdLleob9avtkUnwtdBq9trFX7T7Yylp8F7oZNci0MKH8i/GfQzsBqBnaUjwTBNmTAY21DGgGmf6eUsNS7wcSKWxTZgPeHStPgTT5EZruXexsE5vKEyrAdNCaGgy39G1k4wJhrP33LVwuAxUxDqMoIPQ9pPHLKMjpl2TrMDWdcsY0KsdsGp4JYz5WdWFmL8rc7fMwEeAwZF2o7UegtlgtRJQRbd45yUhaGgfmOYKlamZAV3mRESnDH9H5iVx5EcVCsnyGDZKEvJHc0/Rks0LNSdkbJ9MIhMVSKK6Ds6Dp4xER8yUCoFim5419BjH/uBFlm8GIKlFARH9uLlxMRo3qIrrWAiMXNdWy3U+mVAhPKffpBBEjP+xa+v6F3Lgb/lHUrfiE4FNAyMgvPkIbgLMuqn33vqtmDy6bXGp1thinEAVFTKxttPZZzSTa8sa1wrVM/vY75Gjy/nPkjh5niAmF3h02++rAXBQNUGmNHMwYwW+f2L/q16NSPezIT/mrYxv5jClnDVPrTqWbbhvnpy5KtRQM52fJeJLHiG5JXJZUjRAVcjZF6FO2XMoSSnZutvp6NCnLMryqhIcbDF7WezLFUozOmuo70u5ve88RZGUbLg5j9nYpoo71H7jRq/yT6Zu0r7JYhj8Jo9rpvMyoua77pfzhirkkL1jhfmYA==|920 \ No newline at end of file +}//4G5FFc8VtEEEkLZbTkgajfIV29o/RiIMCVP0j8UTINxEvqX5/hONLfw8x4qtz7sgJP24H17YkStEYfvpVtHcUrMQAaDze5h33F9TpMUXqtW2fIV8hLRx2jQKqUfFCRAkja7YxL+8rC4LrM75rgZv8ejcQ8ju0K30Ts2FIQ/G8fWQxH8zJjaFRUzesrKhcMulN12hWiE+Vq+wCOZTatxPAgj9Ooz0OUpoNyebeTIkskX8iNrBnBXcEhQxlZPWMntF2HgoE+7ttU3uPCybJ+IHJ+JCrPWupn53ZjYuI9BjprAbiSFHgNdJNoEFyVPEp7oHm1AViRvyBbTBzyAqqkZugWGaE8m4RZrducdlrdlwx0dzayGxNQUwTgoLjrSeu5qKxKvK4lFQs8F5pV8qzLjMe0/mo9blsU6DesAFIG6pp/uu0Jl58WCPFKvguwlnGA9gBZbt/Ejvh1jkq4cJNW+rS4O0yswU7x0yXFq6/bn7H17M/6qrQQ6noh9ie2jFVIOF7FnZ/eeNFBiJnzPQeaJ2xJZVtOr8uxTx3yQR3MYaciuxzZOkrBR/63YC0U0lkvkX5wmlwN5zLI6W8BAQ0C86fajRo/ToShPJgV9g+iliYEhWfaCaAu3t8TstCgoeJza8K/08PvgrpKw5UxPTnoWX1dkMqVD6/2pOnhJeUEb01ibakUGBMSPpe+DU2QP1YVuBa5PwOFRERC+vVyuphZbFdVsD5gDojGeTroS8DU/b4VXrds3g5Ky+TURHkGBTsXaB1vngCpqKTScdxQMurFf39cSJv0x9LDklteStrTL0Xzi1U8hF6uA4h/eZnM1VnLuCl666/fBicKPyyHV/8ksxQl42jrR61jlR52QtsgZQxAbFkDHSW8H9oXfSR+9q0ZUOe7DC5aj4dxCvsf8x57u7lg==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务成员/参与成员管理.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务成员/参与成员管理.json index 889ddddf..3fdf20a5 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务成员/参与成员管理.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务成员/参与成员管理.json @@ -258,6 +258,19 @@ "compareType": 1 }, "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与成员管理!Q2" + }, + "PropertyType": 0, + "Value": false + } + ] + }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", "ServerCommandName": "添加任务成员", @@ -288,6 +301,19 @@ "RefreshAfterFinish": true, "CheckDataValidation": true }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与成员管理!Q2" + }, + "PropertyType": 0, + "Value": true + } + ] + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -344,7 +370,7 @@ "Message": "添加成员成功" } ], - "ID": "998c5120-3980-4baf-887e-21b871d7f801" + "ID": "3a878b4e-0173-4171-bc50-4472b9aa1470" }, { "CommandList": [ @@ -357,12 +383,12 @@ } } ], - "ID": "53409383-9bcb-41c6-b918-fcf8bf286b8c" + "ID": "8cf4071e-8dda-41b8-abde-e59598d8d80b" } ] } ], - "ID": "791d2fec-4ecc-4b10-ac1f-a9408676c838" + "ID": "363803fb-c835-4aeb-8471-4e134e6f8723" }, { "CommandList": [ @@ -381,7 +407,7 @@ "MethodName": "Focus" } ], - "ID": "e02f0d55-8401-4858-b579-f9ef64e9c703" + "ID": "59a4d0d7-606a-4b30-815c-53e075dc5f81" } ] } @@ -460,7 +486,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "b0b7e824-f1ba-4c57-a844-0af9081a39f3" + "ID": "830e5eb7-d2b8-4e37-882d-49afe809904b" }, { "CommandList": [ @@ -470,7 +496,7 @@ "Message": "未找到该项目成员资料" } ], - "ID": "b531a69a-f204-4e1f-9b96-254b9b45a5f1" + "ID": "617c9ea0-6ad7-4a2f-a9d9-19517eb95e64" } ] } @@ -716,4 +742,4 @@ "Formula": "参与成员管理!$H$7" } ] -}//945+ovfsXgOHcbWb4krHfmM9qhK6mRUO0qwb+TLwWD7eomzNqv6gGb3KBcX9q7BrWneRcWRxgn3BWNUzaay+xXWjok5hPO6wb5wvl2tl1l2tFHU/1OBXdaAaXCpCANBxDjHU4gCLdH8Z1ubaAVKTpTmV0Dl1t7QIsj3PXz1Dd+LBIUOvY/0bUyErU8vYF/kkjiVz5I0jq7VmQOrh9pwdjqyhDqOFL8VNLCP52H3lzDARgOLZodg8tyoqI0GAw3WTxcFVI2a92DnD0I39c4J+yxzUwnZj1Ejay/ZRZn82t43BCVoWtW3nHKPJufQCrx/OBSMyZnOrHN3HI5NtnmoiZguS3WLtE+UhFI1mFKmUIuWuUB598QqLnxgidAFj50x3uxgLaPgYVAIK58BqePt0aRXbW5VZc4fauPvRrunll0+SywIXqBqsQAAclqZULJNJlZWuBTmijqnl6OivAPQ5R0FfZ3PnUlozponf3g82Qop9ob6jo9hVu06PZ9OtLtooqTbD0GpRrkvFC7H6NIZDcVlxmVE/p92zVDzCmpVGknSrU4gdyFcxgjDUUUbO9UeYJt7Mv8KltgR+5QDl1M7Ch7n06c2cEaxLDDr3qL5xQ0WeXwO/JjoyPhhGGFzzximn25X+qd34pMVZRI5Yt8z7GO1qfMOh5NZI7QPSv/JWobkJ84/Ir5xowrzoXACuTibQo3I4amH8weud2m2UDIRI/utg0Tbtsc8I2YBbBQPVP4HGqdulZ+D9zk29/ArAcrTYmMRJi6Zgzmgk57cv/W9icBHpSCY3UX7z6yn8z7aKLqWi+SAQ8vIWsY+u31ksYBxBYLecMwFVZIDw8rA1oEGv7LOlbddck7NJeGrE1MPnfYmkJfjbCQzJ46PsWv8hkuLJfzXtirVnz9dtApXhh4Qe0g==|920 \ No newline at end of file +}//RA8CK7ROa9Z4BpFn8ZaN32jhRArU5O6ejReSlj/+fsXB1uM2jMG+HMoauJbpAtV7rcACwf0ukWqBJmRbq/N9fJ7ZvclQHV59WzJ9Wm0aI8P8rm5yNpZW/cPh2L16EB9ktdC+hTdg9rLaRMdL6R+AvvVcS0pSaEFVdZb2rL7T0KxzfUxNDOSD9IU6IXkoQX+sHrZKMFTL6WAdRA0yBkiye0t2nitD8XAp6jl2i+dxf5mVtg/DwgzRz2+GkTxK53cvsXhhtClrXjIGYjh/1jAVneyP3QVm5bajsGZ7geJDbshm6OqbYZaU9fHoK7//f5DW1LInskWRywh5Ay7UtKDLKvez7Q6QXldTQRlHRz05NRpKuOcC/GqsBcVgPYdeTrVlCGSqj33Jd36W2MY7dPu2qOV2guQPjxMJBBvwhPP075JofxQAKnx0jzSjBmlPuBb/yQ0j4aIm+RZMnM2rXGUVaG1QV2Y8hGaJ7C89q2k9A9NGk6IxJcUCU1kOw4mep+18d5gEfGNKNVa9zX7XfqDhFQNphE1lX9zHCUmLDJfp3q6CfHY4VySnIeEo27nNMw/ekUcnGe/rcakhyH6pQHzjuxvJXNXuwbEWKpFEhZhdsDic/xjeymXAwdCu16Y6jcadz9bgFkI/RN7Hw74ISvrKlYApg6vKqJDBYh8zK0JVT905Z/XcLXU+n1L6nfx14u7TaT3cPOyVCXcXG0DsI/5BXznqWiEM9DCGIdTVO1Y/3eNbI6sBSYKxCczymlGhApK69qaDBGba6XNvS0CiYF65gNiAKaQ+9pP7T6LVnwMdiWicBT0OWPwNjAkEg0o1L3mS+isi5B1nfhTzHOiNAfGI31Z58EBVsA0/G/aIxqwO//prdFKy2FpPdbjl5PlkhLgiR9lyVRu/FrORiUQOc8tlLw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页.json b/Pages/项目/项目首页/项目首页.json index ba38e9dd..b114c62f 100644 --- a/Pages/项目/项目首页/项目首页.json +++ b/Pages/项目/项目首页/项目首页.json @@ -569,6 +569,13 @@ "Text": "刷新项目", "TemplateKey": "_RS_Main1" } + }, + "2,18": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务负责人", + "GUID": "c68b41f8-0ea3-4cb0-8081-41f46276e2bb" + } } }, "StyleDatas": { @@ -594,6 +601,9 @@ "Formatter": 4, "HorizontalAlignment": 7 }, + { + "FontSize": 13.333333333333332 + }, { "Background": null } @@ -660,10 +670,11 @@ "2,1": 1, "2,4": 2, "2,8": 3, - "2,11": 4 + "2,11": 4, + "2,18": 5 }, "RowStyles": { - "0": 5 + "0": 6 }, "SheetStyle": { "FontFamily": 3 @@ -676,7 +687,8 @@ "2,4,1,4", "2,8,1,3", "2,11,1,3", - "2,14,1,4" + "2,14,1,4", + "2,18,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -749,7 +761,7 @@ ] } ], - "ID": "9efff644-dec9-4c16-8d82-6361f9563d2a" + "ID": "060cbeab-345a-42a3-8a8f-8d4af36c9385" }, { "CommandList": [ @@ -769,12 +781,12 @@ } } ], - "ID": "127fa183-a5b6-40cb-972f-cf6225d64d9e" + "ID": "ce4db4e2-2d8d-4205-9452-83e65efb8ec0" } ] } ], - "ID": "853e58c6-74d6-4ba7-9889-217d39a7bd78" + "ID": "f26fc5db-ef22-4e97-b15e-db8bda557e3d" }, { "CommandList": [ @@ -821,7 +833,7 @@ ] } ], - "ID": "e254e448-d629-4291-8bd7-d45137e880ca" + "ID": "942a8dc3-56f7-41ca-ab2e-21c50d658705" }, { "CommandList": [ @@ -838,12 +850,12 @@ ] } ], - "ID": "d4139f72-2b01-41ea-8bb0-1e40aec5dc4e" + "ID": "3d48a113-032d-472f-94de-9c103ba161a9" } ] } ], - "ID": "20ee53a3-4ba7-4f8a-a349-405be392b1bf" + "ID": "4d2237be-a7d5-4106-8fab-3a4b47dc1e86" } ] }, @@ -890,6 +902,10 @@ { "Name": "刷新项目", "Formula": "项目首页!$O$3" + }, + { + "Name": "项目首页项目经理", + "Formula": "项目首页!$S$3" } ] -}//7Cwxv64bU9IFhjUQa3McKUj/KD31eC0p7XUIWqKu6JNsp+wET8YvTMXQ9RyDcjbIlYZJ7vN/QtIcaxjHQCf9YnHvZXoDl7/9NsD+n2PCcYMihMKPfTHEP6tHj4xfuD8lvRPCF55wtPmlYmFzh/kXUWckRLscoiIHlxHQeER/rOSef4krbi9i2tbyHVJWhZC0+2An3VgnKHgyWV5I9Bq7M628qRvN44AlfnX2JQogEt6Ppue6615n/pqFkqwkxLe6l6T9RwzMxB3MzjQyMWZ0vUN+s5duD4PMFz3PhtmSPQRFlBHO8aC2pRueA1wr48JzACes89K8ZvLITFLt/qo/O0dIRwPqF+ovBMRQe1dOk194fNaj2Aqf/p2bvNlFzKOa9SXYaQlqcpMMPgaXqxgyUY5UXG2ogbv6dOWfAsNqYv/67cK5hdtReNyyUnwDG3O6YhXVaP52FJ5EYA3+sfDsqvadAL2SrIuVQQWBOz1W/7GCRxXTDCZk+OMfI37ipAjd1kfsHs3FY1860WI1DFjP5Arq/V+isoOsIHiJAbpTtbz2X1BxwVKHO1t0ec/zRmes6NRu3aEO9DA5xBaz+Ar3NzVjXd/MxCUeCQFdEJpeJOPIDv9E8p71W1rPRcIUel0gZEL4O1K2B+maRL2BCx3BXaUGidU2OW5+iP6Ge0fIgGSmlfROnE8blJF7ofs1GQvsb8B2ojRv1esuhQ+bV8Im1KCGl2MqDt7gskXUHYCR8rtWaUuDWmwZ6R0Zi8I98OBSvt65AxEPdNssg0BBAG+XhKYwf9PMD9Qn0VoplAWDUfj7sStsyRUQa6WU29L9ltyx7t0n8i4RBiCxBfFbdh7BGpmX/VkUnbh7UVfpr9TlwRCdsCppQi4thwjfGKCg6COYJEPIOEmDLaW4Hv9ceGYaKw==|920 \ No newline at end of file +}//5WlRtboYVfcd4M9JI6jgLQl49HG4z1WyatS8wb4yg4Wn6gojSu28IObIhQ8BJol8iERO6XSR1mvIs3wranQsSZCRWUzgNoOtd84Ve1JyXrAulgv8sPeTaNjyBqzM6I9o82f3jB23fehVfbcu0xspFq2LFccn0jhU3THvVtH+c0Zf6nX6KF4lBljp0hjzcao+OH/DoD6+rPOT3dW3IfMGt0o3awQo3n59seBm8YmXcXeogt028CNqi5U3JCuj96YLhT5UHHhCYzXQmy2wr9CBy+D8xXeF0mVOuyqHT+4n2/NeodRU4GyuLtKkvE1F5VoHG8Aq7GwGv9DjOVOGBWtuImJSi69r5Wm7vCwYLgAmVEvmk0coHsPbGJmBTMrFF99oc4HrDhNa7P2j5xe/Jg9LjfHT50+S+JNbmgaihEXpeEgQsWxWaSS5bwJurXC3uX14jsp0O6ADGZrtlqM4hv6fG0xQNRu4rKsiy+IO/Rdg19u2rbErVleghkKaCdqPxViXNx9319fDB2v8Qk+oWIwdFWpHSjc63dACW47I2IMqDdUAEWcpwaOOsj+Q8AdTSZvkLkcYQnWEqOOsEWhrjGx9OUgzZN3ZfMr7Ffcw85QkuoZE/B1D6wXYFAV1mZGS0KSF5FK5HaXLrINvF8kE0YJ865WizO4OYeN73DSNyN/owq3HSLhvGVFaXsGqL3JPQtnWRFLF4aqryxtNDEKl6KN5aqI94VlzJVHichN+SX9Q9Fgx0FlGQb3Mg3HD78uPDV5BvWOjnMWJc0pymHHxQuNXW0jdBG+uvmNZRYsqr6WthDMRDHcFsIkWyClSRLIhkNY0QGMZ31EJ1UsHjbrcS3d+FoUsyQlhczbvJO8Zw8pXUVm1/Hv1o9gXdLnNw95r5fw0xvlCnzKjUIXjet10pDfNZA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页.rd b/Pages/项目/项目首页/项目首页.rd index b6238be1..92d8ba37 100644 --- a/Pages/项目/项目首页/项目首页.rd +++ b/Pages/项目/项目首页/项目首页.rd @@ -21,6 +21,10 @@ { "Name": "刷新项目", "Formula": "项目首页!$O$3" + }, + { + "Name": "项目首页项目经理", + "Formula": "项目首页!$S$3" } ] } \ No newline at end of file diff --git a/ServerCommands/AI/生成项目封面.json b/ServerCommands/AI/生成项目封面.json index 18f44a5b..6d93a3cd 100644 --- a/ServerCommands/AI/生成项目封面.json +++ b/ServerCommands/AI/生成项目封面.json @@ -26,7 +26,7 @@ "DataValidationInfo": { "IgnoreBlank": false }, - "TestData": "2" + "TestData": "13" } ], "InvokeTriggerTestData": { @@ -39,7 +39,7 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "当前用户", "ParameterValue": "%CurrentUser%", - "ID": "28b1de6dd9b246fe8ab029030e502ed0" + "ID": "9c163f975ec2446891416edb45305743" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -49,7 +49,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "d2c29a63-a2e8-413c-b1d0-56474a78b2b2", + "GUID": "73c17c0d-0abf-4448-8a7b-4eb92a3a5eed", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目名称", @@ -58,7 +58,7 @@ "ColumnName": "项目名称" }, { - "GUID": "8163ca70-051a-4cb2-ae0f-bedd0b91de5c", + "GUID": "970b4260-56c5-4764-8170-b78c8b716aaa", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目简介", @@ -81,7 +81,7 @@ }, "TopCount": "1" }, - "ID": "fc63a37bbd2c40148f97f2f337607c77" + "ID": "5d735635c3964441b5e2a6c2c00d14d8" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -100,6 +100,15 @@ "compareType": 1 }, "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "简介字数", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=LEN(项目.项目简介)" + }, + "ID": "1c3d13eac3964aeaa4e075aaa233ebc1" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -137,11 +146,11 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=LEN(项目.项目简介)" + "SerializeProperty": "=简介字数" } }, "value": "12", - "compareType": 5 + "compareType": 2 } ] }, @@ -328,7 +337,7 @@ } } ], - "ID": "31fe719227d54079a1094a6ba7a1d41c" + "ID": "ae02abcafdb8482c9e99573b675aec20" }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", @@ -341,22 +350,86 @@ ] } ], - "ID": "41779c76-11b9-47f0-8622-79c68cf20051" + "ID": "97b5376b-8bfd-44f6-bd0d-55541e7f79cb" }, { "CommandList": [ + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "页面名称", + "Value": "项目首页" + }, + { + "Name": "打开方式", + "Value": "跳转页面" + }, + { + "Name": "打开样式" + }, + { + "Name": "主题", + "Value": "成功" + }, + { + "Name": "传值", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "Name": "目标单元格", + "Value": "项目ID" + } + ], + "OutParamaterName": "参数对象" + }, + { + "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon", + "NotificationName": "提醒通知", + "SendType": 1, + "UserNames": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前用户" + }, + "Params": [ + { + "Name": "标题", + "Value": "生成项目图片失败" + }, + { + "Name": "内容", + "Value": "项目资料不全，请在项目简介中尽量详细说明项目背景、使用场景、使用人群等。" + }, + { + "Name": "类型", + "Value": "打开页面", + "Remark": "分为：打开页面、执行命令..." + }, + { + "Name": "参数对象", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参数对象" + } + } + ], + "ID": "b606031976ae49b1b07826ec41fdf9d8" + }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", "Message": "项目资料不全，请在项目简介中尽量详细说明项目背景、使用场景、使用人群等。" } ], - "ID": "6ce09b77-fba4-4287-b7b9-4cd5e7aad5f5" + "ID": "b4971823-fbd5-4791-afaf-9a2a62cba4de" } ] } ], - "ID": "510729d7-9775-49ea-8844-c5f9cbe070b6" + "ID": "a30e9036-f58e-4e47-ba13-b6ad5e4a622f" }, { "CommandList": [ @@ -366,7 +439,7 @@ "Message": "项目不存在" } ], - "ID": "e4f3d3d5-142b-41d4-99f8-74fb9f34e138" + "ID": "07d6d91c-0be5-4f83-9d70-ad51a869f295" } ] } diff --git a/UserControlPages/汇报卡片.json b/UserControlPages/汇报卡片.json index 4fb2762f..88d14a66 100644 --- a/UserControlPages/汇报卡片.json +++ b/UserControlPages/汇报卡片.json @@ -575,7 +575,8 @@ "10,6,1,2", "10,8,1,3", "10,11,1,3", - "5,1,1,15" + "5,1,1,15", + "10,14,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon", @@ -706,4 +707,4 @@ "Size": "422,295" } ] -}//ClADz9ykUAxorMQPWMmsAa0fOPSrTv+wsUBq/uZDcGg8M8UxNv6ZYgE82DgXoMNAqE3mASErBsvksAE9rYy5oUPBWTkJhiz21LnIDujzcP5xWebuTIZ7LSdjzU37k8F4IBvHuSFu8NjEk6I/wtmZSSC/nkM0SmNvkgaQxHBhjxRXPVPkMEAD+vrIGiXXADsDlLwOZVdh2IuzfL4bK5A8XQDH1BxGto/xpmgF2WgXiQSTdrxQUH3d/0LsLdAl5gw+aK70qZNFkGntLyRSjSAFts+ASCMvc30eruBymi7cPt/c56boRAY2e71MPyAa+R2AlpDUkYtr6NTE2/NYJDbJpJJi0obi0XiebM+LohCi3yiUsnrJUqhgVduHnCpYUZXQWhF7BNIsMjQdi6Lr8FBuT9IhALLK3/3I0+yw5+l9SPwb/SlGWbfTS+8JNqy48LV6AFgaeyFT621ymeiHGFPr+gJwG/4pFZXXjdHZOKwnloYJ1OagNSEA2LJFSdV78x5Uile/+9+IlDXmWqR6tv1W5UHJWnsw+OAvOijLJWRseCEXhnAzBQ9ycKP8I1OZBLc0Y+D01P/9yyeoNsV1yfBWTTaO7xh20P5cjttVOp4zOEGYIUumcGhU6jHM0fvpxcj3A7/qUHiombkm9MNszG13MWJkOGf1P/z9QBmrxs5rtKPCEF2UqlF2SItPOVsdGYiJeyYFxq3EzgWoZPbhBTnQ2rWTQwyQNZQCrnQyx/OA3KpuVuPC5dD7SRHl9b1APwbxnDCV5Gf6bTIkt5BAykN5HhTI4xfgifxm1HKYWEbBDoQrVwsakyfQda4kjrxRJjVCLJDx1rIvD8lm/gK9CSXcnRGji30E3XueWIqokjMDQtht9Us2MpBn8hYPfJQb4yOqEJZn9PAdxdL+tyMkgTdALA==|920 \ No newline at end of file +}//9pgp90PKRhjMHaU5flANMvydUa9HQeGxf11zKVIz06O7ItQfirgyyDcTteaUkFfEwCe9fMX82NSpbADhohDuAX6ol5EF1RQ0KDxht/13TgVweLYymlmdc83sUI8676LNKt5kab2TLn39WvHHmiKPe+ylUet76naYejx4j/F77MbaJUJZodEI/wOg2pZrIXmCctwfSvbDNObNbN+DIW1freMAUqhak2/6X2xo9rrT15VeN6OlOtMeXacT5dpCGX4MvBM30hIptNVq3ntSoA6FAGDyHmSX4PwkDT1370Up3CghAUg0t2su1ax9MpGxbbAOCt5NjAE4QwWDVpwFNvzdDxoL2KcSuJMxr9RHbem1iWyyb7rXLlMwc4NfWlpeqc2FdR405ZzFYuvAl92cL4sDgd1L/0oNjI0iF5nDvH5AyDQj0HZTgMk9umF6olLgVKcgBLIz6698JBVaQYtNpj5Ug8FpF+rtkv+QPmIq0n4UCe0VF6o3G/jllLn9tI6PBIuKfFIYSlNrN69TS5qfytvhpj3lqUqH2OAzchZhyykOjPEw4tCHsOQHKT7CLXCDgvPI4RFImihLP1aVL7erQVj/T9v9QKRWCrEgqiNY3mUHHQqHQOrEhbvdXlGXd9Y68wT33Dzt/J3WPJBFjutqcFxD6bSzQnWu0D2h5KK/SI/RiwFrEnatENS3Cqlh9uWonhKy5JDH+qNBXD1GFMa9K6m84i9ZfiS879dUe94S44W9q1CPgAI5soIkXllRb9HNfecY1djSLgTrreNjfrLRt9IAf4eispeOXzKg/Rdk8vqYKYwf408g8T3PLMEOhbMidSDZ/otmKWYsQgy5lEIwvinC3ug64XC8zvAk0ujBOGAMKSbXpKbF5/ITWavlqalOiREI0D9RVjjvWHvMGInGkftN+A==|920 \ No newline at end of file diff --git a/UserFile/BaseCss.css b/UserFile/BaseCss.css index ce2e9c08..825b8707 100644 --- a/UserFile/BaseCss.css +++ b/UserFile/BaseCss.css @@ -14,14 +14,18 @@ .img-cover > * > :first-child { background-size: cover; } +.img-cover .fgc-align{ + overflow: hidden !important; + width: 100% !important; +} /* 动态文字 */ .img-cover label.fgc-whitespace-pre { - background: #00000029; + background: #0000007a; height: 100%; padding: 15px; text-align: left; - text-wrap: wrap; + text-wrap: wrap !important; transition-duration: 0.3s; opacity: 0; }