diff --git a/.collaboration b/.collaboration index 0d11b2fc..bc63c6b5 100644 --- a/.collaboration +++ b/.collaboration @@ -618,19 +618,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-01-27T10:47:24.1906456+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目甘特图", @@ -858,21 +846,7 @@ }, { "ModuleName": "PCPage/项目列表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-01-27T10:46:09.8171042+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/项目分组详情", diff --git a/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json b/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json index c948630f..4237f677 100644 --- a/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json +++ b/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json @@ -159,7 +159,7 @@ "BreakpointIdentity": "e05f184a-4975-4f9b-9f39-446a132b820e" } ], - "ID": "03357c7d-1ff0-45d7-8d24-afaf1a4a38dd" + "ID": "247438f9-05ae-4aa3-8565-de438c05ef78" } ], "BreakpointIdentity": "7f11b776-4c2b-4a50-a799-6fa332623c08" @@ -237,7 +237,7 @@ "BreakpointIdentity": "ba369856-984a-48d7-aebe-1805061a9a30" } ], - "ID": "fb7f60ed-5537-4fe1-ba76-f646f48e9f88" + "ID": "b3fb20fe-8cf1-445c-b339-c77704a866a7" }, { "Condition": { @@ -269,7 +269,7 @@ "BreakpointIdentity": "e60dff53-be6c-4166-8cc1-9d01b4044ec0" } ], - "ID": "a5492b3c-31b7-440d-b82d-fb3408d8aa8d" + "ID": "7d9b432f-9b38-488a-ae5e-b3244f56e10a" }, { "Condition": { @@ -350,7 +350,7 @@ "BreakpointIdentity": "f2051fd0-57e8-46b8-bc9f-9ca50becca99" } ], - "ID": "91bf2b1a-a620-4d52-a451-e5ddb1a9b54e" + "ID": "1a8a191b-2cd4-4783-9451-77cce1348d21" }, { "CommandList": [ @@ -366,19 +366,19 @@ "BreakpointIdentity": "a60d80b0-9a43-4a7c-a985-6a35940644f7" } ], - "ID": "3d7f8dbe-99ac-4a78-a717-e2495a53723e" + "ID": "d9b861db-9964-42be-8ae7-c5a2e06f7a62" } ], "BreakpointIdentity": "8a9e009a-888c-402c-b8d0-160f8727131d" } ], - "ID": "439bf4ea-aedd-44c5-bd12-0081866feab2" + "ID": "f7d6ca11-31bb-44d2-be4b-640204aef21d" } ], "BreakpointIdentity": "43191ceb-2366-44ad-b62e-68bc45f1a5c6" } ], - "ID": "5678757c-d6f4-4da2-a447-fa3ae3738711" + "ID": "6e9ad9f9-c7fe-43ff-91d4-a7e082aecb50" } ], "BreakpointIdentity": "6d4e3fba-f49f-47d4-8c12-97cef1e39ce0" @@ -452,4 +452,4 @@ "PaperSize": {}, "Margin": {} } -}//BzCMkBr96e7u+DnTE0nJO7Kr3O5EF+MC/HtmiEbu/ll1Q/PfsFkQ8LiEI0MDxu5pPlblHuv6Bft1Fq6NLcpbE56lEKS9hKzebFPdLeyxuPOIypLZTfvQCjHqV7P0RNViTfwHRFHINSL8oriS7kjWGAqt+0w8vxUz/lRgqePV5XDob5DnOqVYA+M4kBSRwq0lMGM+ZSF9YY7TCdudKu0LAo7a+Z3wX9VntANHY47Oc9OvvX6SbZxrB3Ey1c/U3cRNn1cdGRqJsLwlnuE/H/s7HBzi2h4iWX5w6uq13SWBhssFWZYun3vz3l63IJIBuwFnhiSn1yCfSEgtI7l748mOlO0nlggL4oHQZ/aGr3yxugnT8RebgmnwBnqaBrn3pCerOWb/V65B4TR/ZEeLMfq2dVaq9Co0/HzX0Y3eZT106wjXdC3S4qIG5PPwNUdAm0cEggVRSSEIhUAu3M8pchz602wvrxK6ARxA2K+ouHXYLDHRMsm2sQ7eUTK16Ijtlk4JGxU/tTj0xerfMUyl4mvILmGI3Xyioje+N1PxbHc1NGRm3y2KHZqt2ZPxq5u8i9p6Sjgk0qJBfYkKJGYiGoFSXM/vtVxq+DgKiSpEu0pra9WzU+xHHEwsTmXvit5pPdht9HVHmVWPIx1NpNxpzP4QBaBEzdlDpf/5t/IJddiLAuFKurYEGJ5ypFGBl81lCuifkZp2viF96oS8a1NGgn2jcuCd9Xx6vuOJMG1TWMUh3P2GTFtGVpuXrfukMRAdXVDHhhOBQH5zNavuF+9KwgbuMo8iWF9GVss/fYc/y3gA1dgY/R0cvmpTl2Sk2WDSVrNrbmEQdLmL/AUYUIclxOuvyYab2Si08fa8/dcO/i9rh2EABNjXWfClWraMd/+LTm7lCmxvy0JKWz7thAj4WUxtYw==|920 \ No newline at end of file +}//DDEnTZIzyjjX02IRG15qDnY3giuhJg94BYynq3ppQkvPaG7MLvveMr2WrNqM+kzAyeZuZtJqfIl0+O8DjWvJl0mYibYXbQm4rg2W8UpG9meEdvNRaO+Gv2JAErgvyeKlRAJWruIwnYyYSrGTbi9R83Px/4Int6Uz7r2xY0DkzJd669HXr75ytRBXPSZlkqnBxcFzhvqaFCL20+6f23m08s6pe7Bl6OuoDDqnI+PM3JgtQjdGHCOd0gswFFqq1BvmiU7Ay7aMZ4+9jLQ0E2POR7mqEOpJEbgYGcgu/HvJVT9AhJStImQS1P+dZb0SSSfGtq4uA0IGWj7nZK7Lnz9WT0Bd3TCj0cr8tBHFQWXeRNJcjftspC7fXtWMfBQlEbLOTcPMIHooA6h3xpcTX0xvQcvb+ukYsHvPGmCNhqPbZ7m3ZZpHP0xSTUt4s0myy/cI7cgooJ/RO/80nB1lx7OiXxJ9HiO4o9/pB6zXij5oCMSUkXqZcZeGYthkMBqsc4JDgxIrLLne22igPAbIB1mLhA6G2tHQccS22cfsScdlfftJxeUOuLtkSBovp98oO4e08DygBgKnLXa/l/i4uM1eYAM5DWhaUMZPRbiLAVsGFRZXHZijzIU7xLgi4JG/DaEvrwQXkfKAUeTdSIc3Yyzo+gRDkTWryCfHaq2EqcFHv0LBKoOn1VVWMJwFPKlF+mSgBl/M0+W2ND7S1WSuO5sYe/Y8CJLJdooEGJFU/ZMSgFEnpQgh9xRPpiu1Ss0UVGaF/yexgzFBlqaO74XGQICtliM2YgQ6CbZNVMFdL25Tzy2D8nzf6ByPSiLXCrVaP5FVHdHrEP2eznLnQMpbOXZiXDQ6dUNp29+gFofcd3vTnjxtgSTnwROpxmsdD4oQW9j9f2x2O+d7CabZ8Dl6m5x1mw==|920 \ No newline at end of file diff --git a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json index 6d569627..988707b6 100644 --- a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json +++ b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json @@ -154,7 +154,7 @@ "BreakpointIdentity": "bb12ab3e-9429-4dab-8613-ae145130da0f" } ], - "ID": "72147008-8392-45d7-9a21-b11e20a03b2b" + "ID": "fb5aa139-f6de-4be1-902d-8615e22b3b3d" } ], "BreakpointIdentity": "1274f65f-4fb6-449d-b9e3-b67904f3b60c" @@ -231,7 +231,7 @@ "BreakpointIdentity": "b2ebe488-60b3-4c06-a836-c6d741d3397b" } ], - "ID": "a833c778-f925-4027-841d-522a0ddc5eb1" + "ID": "505c51d2-2587-4297-b048-564cfe58f4d3" }, { "Condition": { @@ -263,7 +263,7 @@ "BreakpointIdentity": "85ef465d-5cce-4a47-9dbc-19d9fca38045" } ], - "ID": "4fd175d0-e422-4352-9129-560c7726d615" + "ID": "89b42232-cdb3-4b1c-ab27-480850934067" }, { "Condition": { @@ -344,7 +344,7 @@ "BreakpointIdentity": "2a47c74a-896e-40e0-ac93-da5b6bb990e4" } ], - "ID": "6801c6bd-f396-4310-affa-d46bd51f2309" + "ID": "087d30b7-4642-47fd-9070-8e0e93139e51" }, { "CommandList": [ @@ -360,19 +360,19 @@ "BreakpointIdentity": "7715a14f-db7b-4876-83b1-8eb1227cf738" } ], - "ID": "b09ce91c-898c-4b53-902c-f74b029ef74d" + "ID": "c27a095e-7fe5-4eff-a6e9-9a6cba0a0ea4" } ], "BreakpointIdentity": "5a93cff6-8e63-418c-bfc3-d2d6d9569b75" } ], - "ID": "63f43957-e670-4cfb-bfb5-edc32dd75b95" + "ID": "c6491289-cf08-475b-8eb1-b6e2f3999e6e" } ], "BreakpointIdentity": "ff186882-71da-4091-8bbb-994f58833d84" } ], - "ID": "98bea58f-bdb6-4fa0-98f7-9f57ea47f850" + "ID": "cc715fa3-f636-4ae8-a97d-3ba88d0a0e36" } ], "BreakpointIdentity": "6be2e41d-1056-40d2-bb3e-2ed23968ef14" @@ -469,4 +469,4 @@ "Size": "24,24" } ] -}//suC2nJKyAKazS3PSfKY6Gu6vw/GJeyoBMwCnzWf1sbyZmXnvz9BcMLsDV7l09l2upCbfPBq55NxGMyq52EbOuZYfkTYBc4H/TPwrm1B9dhydZrg/m89J/eMckJ5js2vmbbE17bgUpgd0iDkjb0YQvFHz7tfgBXljoN0Qnf9ebCa22fZZ6Sy7QFXWRBL4vMkkppkUW3+VQVzR+gAH6Jgfv/v5C0GM7fzK7jfAPVSyEz1JaZ0IC2PbkdfrKRhaFRi9rg6Coi6WuVgKQ430CPccFv64ToCb2Ij/ButVN8VhOkxY8OZLRojcnD4zFHX0agGhFDezcj8+tFb6q+OVGmjMjoUv9+nkR6DmcITPdACElXDPyGc/tGDCdWKMpXEkv/hKZZ+upqo3X22EJutxiPH5gR/RUyQcLRBKfHyqGkzMtFJirNUM548SPCXxWaPAc5jkHX7Ct5G1y0YhRN3XLz9+UNmht2WELinC/JGCwDAM78g9x7ePEj+0laWSi6+6GhDF9F9rqQE+dhKx31GnZkn566gt8R3m4ok2AXrlKc5aSmVefO439ROVsp0fzMY09XX20qQrBWbdLop7c3bMRJvgFeMC0dQhhpR21+LweVYRoJyuLsOXOw9I89JwWSk53lnXQTINk3492x9GH9Gf8RskBHVN1iZHGBX82+ONcA8N+14fUE6h329HDeJS2Redb9/4KnJNPu/G04kU5EmYXCM/oL/QeKhKNUCIiRN6+CjrbaKufaNApXCqAcPDce1IlMrQdjAkV/k4G3yXcYmL1Td04zyNDi6m89k1YOi6FeAkTr+uDwgZoQlOgRI/vP0cCsAPEve2MNxiro5HsBh/n+lrovBDCfiE3G0tzVMuhiCV91lFB5dh3gOdVDqZT1SBA1Pm7Xhubc4CzhjaIS06SYgRtw==|920 \ No newline at end of file +}//1YZMWhLf90DW5QqNTF+LeMzM2HBmktIfPV2SOnfpX/JqMAjVpCmDuKD7rR/hdIZwmzS8e7tp44vq0LnxDEPUj3BREPy/CtiWkjTW3/zMH3WQLuaJnhwcIDLHZrdFP43gOJTfeiMADnFHRP8JpDYk6GMtmUCMqZcM7XGqvO/G0OFKH7eQsKO0WbNsqZC9iXR3/ik1iIhUkRRR0518ogg5CgNF29B27KTlE8+jb7hNcpOYU0zCyFiu2EMiiK71XWzOWpsNgla5QUSPDsjXjvKQ+TkkU6XuB92tOIjnF7y7MKleA/sb8IS5D7dzKnTFy9qmr8yHlPlGiBXXpQrJFZ8DZB2p8zszJAY5MqY81SwoeFxenFh0CudwzqRrlGrnVVsKCFHwuVfuAX0zTZu/n+zzcyvXgkGXmGjZ76w8cfGrDfzannspi8R2Zo0R++obL8R2nsuLoXDpU51kKi16msOfmyqwx/KTVT1BqEeM59zaARebcvMZRDBFyPtE53Ji/ITJZykzwVksFpDxfRrzHSnHMyb9fRq2ReZ3L+tqFz7tpWyBpprwLIAFtw3jJ6dUBo4xAuYGnaywa/v363YtImjTWf4uYjG0xoCQWxI47obdceGAxTvEk3oGp61TP/Fe713jRXKoAcApMlUM9aUGqq1P80FgrEksKN+LEEqv+BO26PtASR4NSBKpVTFHmILWpwQPHiPolZnlAFH0UIKkyNcyOT3lbVs9n5gD/O8fxf6iVAx3jwVRxyQqVW1fKhg51DEzMwAk0K1kZr5qxmg4/jl8Oi/u32Ktv3tEc1xnCGg6VZnBeng2ClafXbENXe1Y6zyaeSs5gX2BfOtEbVlIxd7zlxni2mOqMFuO2mPUFRPBVjJht8oBDVVrah2yEz9VAtjnj+Kuzxw8Z0oQzLCdCVvscw==|920 \ No newline at end of file diff --git a/Pages/b90932e038f94707b54e571ff7cd84d.json b/Pages/b90932e038f94707b54e571ff7cd84d.json index 34d6bfa9..0f3b9201 100644 --- a/Pages/b90932e038f94707b54e571ff7cd84d.json +++ b/Pages/b90932e038f94707b54e571ff7cd84d.json @@ -263,7 +263,7 @@ "BreakpointIdentity": "08c1bd52-678a-4899-8594-f97eca56d853" } ], - "ID": "6afc70d1-4df9-46f4-823a-129c8d7d87ba" + "ID": "9cc6a5eb-98e1-468e-814a-6c4e1e985ef6" }, { "Condition": { @@ -369,13 +369,13 @@ "BreakpointIdentity": "3a992ee5-d493-426e-8317-f263d273f9a4" } ], - "ID": "8bdf6632-3595-4811-b4f4-b11de366129f" + "ID": "067b0a4a-9d0a-4d7a-816a-a6a10f73f0a1" } ], "BreakpointIdentity": "a9e22740-9a11-43ea-b57e-f6460ddd6b2a" } ], - "ID": "4fb40c6c-f99b-434c-be98-3099b9397514" + "ID": "1a0f6a45-5f55-4bae-9fdb-dbcf2e33855d" }, { "CommandList": [ @@ -386,19 +386,19 @@ "BreakpointIdentity": "a0d2026f-44e7-418d-bb64-96477b475916" } ], - "ID": "b6ff89e0-9b75-4426-af1a-1ab3c5f8a88b" + "ID": "f8d94762-ff63-4997-be5e-5884161be69b" } ], "BreakpointIdentity": "a88da50d-e90c-45d6-979d-d40440bfd3fd" } ], - "ID": "58c1f917-8eda-4174-b3fe-ff6ba9915a6b" + "ID": "ae0086ca-dce7-48d5-a515-47f3804ee0be" } ], "BreakpointIdentity": "aab78852-8a78-4aaf-9af3-e35063c2901f" } ], - "ID": "35aa103f-9024-4454-bacf-ec4d23253b08" + "ID": "816f445e-9573-4ec2-ace0-e03334d7f6b7" } ], "BreakpointIdentity": "380f6ed3-83db-4468-8d36-699c0a094c97" @@ -678,4 +678,4 @@ "PaperSize": {}, "Margin": {} } -}//yCIXD9XkGI8yJ0tytYIEIOuw6PZy7/RcCdmFyecKw3s0WHcN61PQeLFP81LI1QKtyle05LSvLHU+rnbkDY3KAh5+fl/y/MCrur0hF5pCzCqPBt042ggl+YRYLXb8YpPv4RSCXvMnjhWc4hv8yRQvayWjXxtL3es3kgE18QAZpAlolUR2Im8/WoikAFbp4z85aRtkzQ8DDiGBt7L0F0rdrvKjWm5xjSBlR3ySac+Ezq54h/y/rb1cNb50/xVdNcBIDc/3wXQcsyONG0mRnIr8GM/WY4BySbP6dBLlJXH4rUNfvmYaUbz+bO2hnc5EvKMXklj/pGxwrg23XFg/oPI9KGao15HHPyz/mHayVdAgchK0FTeEB/5r/ykZaT7S085arGQvWxYDLoshQJdst2LNsRD0MkfO3rvpKOolNDVdo3C+0QKu2kQUovbzDF8+ztNq2r7zF40DW+ofPVBx6tz0JNawDB/qim/8YOU81sozyFNM+IDhpoF6nUD64iXGoR5c8cLmwuidZRPZibgA2tUIbqD1m8lfC93OympUM1Xtpg2A2bhulgzDra7dVYe0SMVawHXfvRzCETgO7ks4ecgEO8bg399JJxOQZHti7MwPT0ozjpEJGyw51wWhSS0Ea8Zaf2GRrzCKdBy+6vmjljdW0ypyGhydgTXYixcjhmlxK6aH1pzZHGIP64yRd8Os4MfMeGdM8q/38I+nZksGYkT69Db7/ijuOFI7WE+SjQq1x0EShH9ap7BSWgjw9hmFiBiIliwKmhN2SztspmtmmlYQHPX06vfZWnD/CVzuQmbh5PjBTrN3BhGaMyKT1Uk22vsEc9zJU9jPE3ftF0qo3joml9DorRJPrdJAK3UUmpu1WgRwMUKVhPDMIfPgDX8tmRWkVsVLQmR1bVrhLAcevHny6g==|920 \ No newline at end of file +}//NATcFS7U1Qp2/S9GnvnJQ9tsgkKqRN8kC/sW0fhMYjRDBNMUInB/S/QFoA2BIr1aKUtTv1uZ2bwfwfe6s9ki09E1Cj5I1X/1qN/VFzqXrNA9CFrjnbpUU01VaLQaoClTWohRBXwuPfP9YostwheGrjCaFNPfd73gQoNZl8lw5UbhPdID3H0TIasY9kk+ez9eYYaffs8dLFbJjv+0zpn9peusSdf3WrqkdNgR4FefpIDkWQTgWrtGHpAYbIGpou6fpJVbPhJe5O/pww2Sw0tJ3jpMPtwHWldtD0/JzOeaiy/LP+wBrT1Udm+8J+OuK7AZD7bWFwFyaFaoda8CK6tfAsCZqProA7W5mvnm3l+r5WgMVKuG8AEZQXtXOKd4YjYDx9sW5MGJ8L/jkICTUOWpzLNb1u+0BB2Hn1jOmopKxTyU6w1bh4HOaGguJJC7vAV5UR3olBbmA9wTWor0ZNe+re+2R0/J/jpa4W5YTnL0m99mWTQ6gXddczihTXWht4CpsGbJvBi8rYYZ7lhF+ajwp4nTl+UOi4SnD+m0ve+h+bDQiuRNveaa6DS7JBvZl6I3G6B2jlN4h5TPtuhBwr4wFnZ2hlODlhIiuoKvCPR6+F129Ip07SIxkCXDa4yShSU9QQzM4f8Luz3pU3nh9wSwux7K1wU6MrdpI4KZIg3nGfEh/zJmKVODXy0SVlsyv8AweBqi70TvK4N/YJorT0NiIkjNS52+F9tKScwvvfItPJo5Zo+vSpH4Sfr5HGx70YmAVY24F4pkEWzIU6BcS6x4Tf7t+MNhy1tOl9GBRPDd4Q19BrXnAlsauLtPNfE4wxiLGK6JOHIOb+73Eq+OcFimgescTsVkgRnB49KFI/Y+0k3OjcAJzL3i0LMVwACAlzjJE5EUkCk1JFMkZIpQ7KGlZw==|920 \ No newline at end of file diff --git a/Pages/项目/项目列表.json b/Pages/项目/项目列表.json index 2dee6f02..36313852 100644 --- a/Pages/项目/项目列表.json +++ b/Pages/项目/项目列表.json @@ -844,7 +844,7 @@ "BreakpointIdentity": "49c0ba5e-ef6e-449b-a95b-3a9d9aebfbbf" } ], - "ID": "ff65fc68-a193-4a37-8d31-ca81d3d88568" + "ID": "9e85041a-2175-45e9-b8cf-bc24143664cf" }, { "CommandList": [ @@ -857,13 +857,13 @@ "BreakpointIdentity": "eb3eaa86-61fb-4843-887f-e4c861a4205c" } ], - "ID": "70081c70-fd38-4bb4-a469-79b206297de1" + "ID": "f3c97eb0-421c-47ce-8c22-3b515782a6b9" } ], "BreakpointIdentity": "fa030b70-9d76-44fb-8878-e3068e011037" } ], - "ID": "c538abf5-095b-44c3-8032-8c438f24dede" + "ID": "d6717ca8-6e41-4474-98fa-338897a122da" } ], "BreakpointIdentity": "6b112335-8337-4674-895c-a5a1a0113abd" @@ -899,7 +899,7 @@ "BreakpointIdentity": "1497778d-bdb5-4314-9688-27dc42e2ed79" } ], - "ID": "e38a92b3-0c60-4d8c-af0f-75256bc4a66b" + "ID": "001051b2-f995-4afc-a63e-53827ac7c821" } ], "BreakpointIdentity": "f1969dc7-3133-4cc1-acb0-436e6cc77194" @@ -958,7 +958,7 @@ "BreakpointIdentity": "046fabac-97e7-4bce-bf43-40ce06e5a1e6" } ], - "ID": "f192b4d5-e8e7-44cb-af12-613986fe7279" + "ID": "54e149d8-bfd6-4147-af3a-d683929fd7cb" } ], "BreakpointIdentity": "cb831397-e62f-421f-ba18-c622d906470f" @@ -1320,7 +1320,7 @@ "BreakpointIdentity": "a12df77c-b855-40c4-8eeb-2b847e7a31a5" } ], - "ID": "3858052a-b91d-411d-aa93-cfb8b995c145" + "ID": "659d70e2-37a9-4764-85f1-12e763d38857" }, { "CommandList": [ @@ -1332,7 +1332,7 @@ "BreakpointIdentity": "3617c0c1-7cc7-439e-af71-18f99f1b067a" } ], - "ID": "79677779-0f80-44b2-9e84-072a6e5618f1" + "ID": "3fab4112-8607-4f80-b25f-4cdddc892ee6" } ], "BreakpointIdentity": "7cbd3d06-12ae-44ed-b879-b99ae8536a7c" @@ -1562,7 +1562,7 @@ "BreakpointIdentity": "9e4938a1-c07c-4314-954e-3b04a9cb048c" } ], - "ID": "c55d6064-5e11-4dd1-906c-8935f2062375" + "ID": "413aada9-086f-4421-8af7-fe3d4e728027" } ], "BreakpointIdentity": "2329e48e-5fc4-489d-99a7-048aafb3fc98" @@ -1737,7 +1737,7 @@ "BreakpointIdentity": "57519858-b323-4de9-9d2c-728d6e452e2e" } ], - "ID": "5d15b2c5-d173-4f55-933d-6041f4b59948" + "ID": "9c10a35c-bdbd-4d71-baf5-cfebb4e5eafe" }, { "CommandList": [ @@ -1751,7 +1751,7 @@ "BreakpointIdentity": "7fc45575-b525-405a-801f-42a0dfefda35" } ], - "ID": "0d794a4f-6bf9-4700-9e39-9dd9f78fb864" + "ID": "c1babd01-fffc-4dfe-9b1d-5d6342221d42" } ], "BreakpointIdentity": "68d63b0c-a862-4801-b1bc-258944795477" @@ -1894,16 +1894,33 @@ } ], "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目平行视图", - "ColumnName": "删除", - "GUID": "2f82a680-59e8-47a2-82b0-82ee34c24815" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目列表!W4" - } + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目平行视图", + "ColumnName": "删除", + "GUID": "2f82a680-59e8-47a2-82b0-82ee34c24815" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目列表!W4" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目平行视图", + "ColumnName": "项目分组", + "GUID": "57e46891-6f16-4c1a-981a-d63115187079" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目列表!选中分组" + } + } + ] }, "NullFormulaValueQueryPolicy": 1, "OrderBySqlCondition": { @@ -2501,4 +2518,4 @@ "Formula": "项目列表!$O$22" } ] -}//S7131iyWlwOBjvuEQeNJs2vN0Y2wiIzKeOUyuvE9XuPQ+qPfVRxv+qUHZphQgoyG0KgV3JOEUQ1l/AX0zmlvYo8dyucAQoQfuoUvEr3HbZexKiwhSrdTjGQ0YEXUAuOIL+09iKJ555masoka1+XxYj7MiNoe/Cg/GFa29o/eMGOtBgpUVX5y/kIKl/k6UIa+sTJ3X7mngOmGn1Y4zltQakWhk6Hq9xUX1pgnNFK342mYHJEu9Ek+ySxBM/Q/pTox/z6//MevNvAGB6iym+9rPn0YnMRqveLgjMkNe0lzeuaRzMFiOLM38gycsUhXVlzqJWwZ5XCIpWEtbmGR5WaB6KsgONNBBi57r9DV5gUXv4Wgx1CLge0l4OFXBzIAxXq+i3i4hpyBCUx2JDVla7AKJDhyOrUqHIoNx8BzdO57Qo9esR7o/kkCyG1PIB6I0oCLUTE87VrTYlvMb0gzHCc3tkgonTcwzB2idGCaDMh1WilN7FzfsGGnEcGFTMAhS/HJci49K+9uCadeZs9Jd42VLMHzI9bvxQNGUKjlVb4M+0DBMGYZ1+Jt+U0qXSZw11p0B5LXi8PEF5b5DHzD6XDxWWaYJeBjIl8u9hPMZ90l+GW/ItNAFUr+yFGmC1LWqayArDZQPgPhefKNkOftO1EEyURTjLWk4Pd/gF4yzauPsHWvP62UA7JKeqZ+/FVdJ8OR6f9BcgZbpnmSnWJb5Rcj+TGJN/nueJGyhDYsokkcknTG/bBoFHNCRKkm5q2oSGt2a4/5WnIx52OpXGFuKbDC+CVDOT5WPqyS1691LGYp3a3gZYt6svyjRn7F/dxTfNLM/hfy6YiHXHT7KoLCZF6nH54vxtt6QYzgZA04V7CoHCw2NWWsTVfcL99aIRzVZnHvpgDxqwp+sQ85xEwCmsM3sQ==|920 \ No newline at end of file +}//ozlgKpsLIi/kp3giajlVyop9E7bsoEmVDfl56sVpP1RaPeUwhW6tYC4y7l0+lIPfL4OR/JNFlpWKx9laO+Y4wrS2kaxa3n4EYyfkKEmENDYAdguJBKm5jUjwGPxD+HUqXyHSkY3yK6U1MJ1idG7Ej6bR0yC2p7Si0CRLcvjirRlkFHyNT2I3Xj464hX+5pHJ+0GejdMvdRWMaln9nDvjm/qwxZSxJtD3HQ5a6jLOgGUX4vvNHPgRkOT6k6ufNEJqaXQAnOA/iUJsnQlEaTH1Wxw4TWajnFdetYEQOBcohVZAfP751mQqMLEuOMol64beY1gYESoTu9YmoickqSh6EuuQNMTIH8xovHCOe/PMKcK5EEOqCsTO9rj+5CxQ0xDp2EwouDpvToebtJL5+lXJDJlN2iVKJaKCPZo5GIZQ27ktHZciAyaLs/oHWr8Wi09xDHj44NKEP7V8fYxfxKzvI5DysniCqeLETcnu49r1AuZIRY4IOA8fHBB5g9I0HPyy17gaFW6gXtIly+xizSxm9GZ5kxwgN6nMv4peAmE8YwHh5qikdFYsKLzR5SY0EtF0jaOwWubaWWM/Apfjijd9W6WqXWBfEmzwijdElNMEg97xoGsekJ4AkRvD0d5x9olxzJgaA2mf+z1wm78Hgje7Hz8LCFNWIfrvlhLS932ec5X8vjtNNq59mJIoJkXqXvdMdZcB3f6dFZCVaZ4cZAScjh7g241au7vGcAO8rcx+3ze+KFr2FYvwErKp35x0aI5D2GSWTjYE12Junoz2fYjyjmqyqOU05vP+2hWRZUH0ar95IQMXRJcvNXWhHSe9YGQUBOAcWNGcIKXtXpxTeq0gcR7Dj4JfR2YMT47JxCMAPq5buJfOD/23InaYF18xMOBop7RTz+23sRwjQ7/yyKLJpA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index a67f762b..86f7bdfe 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -806,7 +806,7 @@ "BreakpointIdentity": "4f5c5035-8414-4eb3-bc78-7388e160c4c8" } ], - "ID": "b576004b-d19a-443e-93c6-af18e5988c97" + "ID": "acdf60f8-64d2-46e9-8603-9e2d8c0fd76e" }, { "CommandList": [ @@ -819,13 +819,13 @@ "BreakpointIdentity": "975dca5d-c1f1-4a85-a9b7-a05469880a7e" } ], - "ID": "3aa502c0-6a73-4e58-89d4-6ceada46ba57" + "ID": "dff94b5d-05ab-4ea9-a4b8-0d67090d396c" } ], "BreakpointIdentity": "52cbdce1-cc4e-491d-a80a-2b1a4d3a8ebb" } ], - "ID": "3114b635-3dc8-4ab7-bbcf-40d668e99a61" + "ID": "e5fdc24d-7fb7-40ec-944c-bb58328f81b5" } ], "BreakpointIdentity": "edbb3028-66f3-44c3-8f3a-37a07759a779" @@ -895,7 +895,7 @@ "BreakpointIdentity": "1610569f-4ba4-4f0c-9ca0-abd9fb402ed8" } ], - "ID": "a4a72c5b-29cd-41d7-a3ca-c8c991538ae0" + "ID": "b245dc65-24ce-44da-a407-328fba2ffaaf" }, { "CommandList": [ @@ -911,13 +911,13 @@ "BreakpointIdentity": "c218dd49-e0df-4a68-b032-a5f7ad2e8a2b" } ], - "ID": "e993dcc8-5f78-46e0-baa0-93723dae66ec" + "ID": "c9c18058-6374-458d-8168-a80f637308da" } ], "BreakpointIdentity": "f94e043e-e9e8-4ccb-8353-5eec7984df0c" } ], - "ID": "1b5391ab-2537-44f1-95c6-26445ff2d855" + "ID": "4ba3b199-69c9-41e6-9125-9b274e71096e" }, { "CommandList": [ @@ -941,13 +941,13 @@ "BreakpointIdentity": "d73ce87d-685e-4335-a16e-4cd03661bbeb" } ], - "ID": "2e00fd4b-3376-4dc6-85a8-d504dee3b828" + "ID": "89db3588-0b97-49ae-82fe-e837c492ae43" } ], "BreakpointIdentity": "1882da3a-7ad5-42c8-8c21-e4c3b47d71d6" } ], - "ID": "bd09f4d0-d891-4e61-9d0a-e29fcc7c2299" + "ID": "0104cb07-0bae-41e4-872b-43015fcfb81b" }, { "CommandList": [ @@ -964,13 +964,13 @@ "BreakpointIdentity": "6ec6c6d0-400a-4f1b-9e5c-ecc037411972" } ], - "ID": "e050058d-5b55-486d-b1ba-72dca31875ee" + "ID": "6307bf48-9fb1-4790-8ab4-50b6d9d6162e" } ], "BreakpointIdentity": "6f2f4328-317f-4900-bda2-6e39251f054e" } ], - "ID": "229d4100-ea5b-451b-80b4-8ca298c0c274" + "ID": "c6619c41-8fed-4466-9c61-d1d76c3cd662" }, { "CommandList": [ @@ -981,7 +981,7 @@ "BreakpointIdentity": "708d5ba5-b89a-4ba5-a8ec-2fd3e6dc44be" } ], - "ID": "995b1d5d-9f55-46ec-8298-a2b027db569e" + "ID": "940d7b2b-baaf-46eb-b2de-374ba804346d" } ], "BreakpointIdentity": "54550ee2-7801-41f8-a4ed-b3ccc2533bb6" @@ -1167,7 +1167,7 @@ "TableName": "任务平行视图", "BindingInfos": [ { - "GUID": "45fb6e40-255a-485a-a2c9-40d4b8d2bad3", + "GUID": "4ff2b40d-4595-4ba2-8061-c9c7d048b263", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "ID", @@ -1177,7 +1177,7 @@ "Alias": "值" }, { - "GUID": "6636bcd3-c28d-4c33-8067-c9fbe098574d", + "GUID": "d40e617b-5fb7-40b3-b3d3-6d87eed31d9d", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -1722,30 +1722,67 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "新增报工", - "PassValues": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "Source": "实际", - "TargetCell": { - "SerializeProperty": "=新增报工!工时类型" - } + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务平行视图", + "ColumnName": "任务状态", + "GUID": "924d8abe-8744-40f3-973c-b0230075aba3" + } + }, + "value": "2" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "新增报工", + "PassValues": [ + { + "Source": "实际", + "TargetCell": { + "SerializeProperty": "=新增报工!工时类型" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!行数据.value" + }, + "TargetCell": { + "SerializeProperty": "=新增报工!任务ID" + } + } + ], + "LoadBindingDataOption": 1, + "BreakpointIdentity": "1ed99059-8e78-425b-acfc-c009d41ac3b7" + } + ], + "ID": "12f1d693-083c-4f54-b6b6-beff1f818681" }, { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!行数据.value" - }, - "TargetCell": { - "SerializeProperty": "=新增报工!任务ID" - } + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"当前任务处于\"&任务列表!行数据.状态&\"状态,不可报工!\"" + }, + "BreakpointIdentity": "885f90f9-28e6-4705-b9fc-62ee3e9d2d25" + } + ], + "ID": "ef1cc6b5-78df-4174-be42-24c35e842177" } ], - "LoadBindingDataOption": 1, - "BreakpointIdentity": "1ed99059-8e78-425b-acfc-c009d41ac3b7" + "BreakpointIdentity": "999de722-d417-4fb7-bafe-e4bc6aadf273" } ], - "ID": "1a2bf64a-dc94-423d-b2c0-8563ca4e1650" + "ID": "fd11d89d-a7e7-416a-8440-f820bd8bc875" }, { "CommandList": [ @@ -1756,40 +1793,13 @@ "BreakpointIdentity": "70f7d6d4-91c6-43b0-b872-86210f345f4c" } ], - "ID": "0dbadf70-7965-4bc2-9484-609a838d0817" + "ID": "425c9f49-dfbe-4b99-a354-ba38d6d0307c" } ], "BreakpointIdentity": "f34d4361-909f-4189-a56c-b9a1cf54e29d" } ], - "ID": "1dd2164a-de81-4b3c-b86d-42d5f21f1a74" - }, - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "任务平行视图", - "ColumnName": "任务状态", - "GUID": "d8ff18bd-467c-4a19-94c9-8a5e5b252b3e" - } - }, - "value": "2", - "compareType": 1 - }, - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "warning", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"当前任务处于\"&任务列表!行数据.状态&\"状态,不可报工!\"" - }, - "BreakpointIdentity": "885f90f9-28e6-4705-b9fc-62ee3e9d2d25" - } - ], - "ID": "33af0bd2-793f-44f3-9c1f-0e2626b2f863" + "ID": "8728e2d3-a421-4df3-bf87-2e1b52274351" }, { "CommandList": [ @@ -1830,20 +1840,31 @@ "BreakpointIdentity": "2deb4ba3-ac25-46bf-80a3-06c316373d91" } ], - "ID": "a670a9d4-34ed-44d2-b5ed-822c4734aa18" + "ID": "0cff8909-b1f5-4c98-b1bc-663dcf33f23d" } ], "BreakpointIdentity": "ce362aa1-c8eb-4266-b625-3ac2ea8e05ce" } ], - "ID": "dc3dc6e0-af4a-42a9-b60b-d7bbf03d8012" + "ID": "88c46dc4-dfc6-4653-9e1f-183e3a68bf08" } ], - "BreakpointIdentity": "95957070-4a1e-417c-9f7e-0f63d2e73f0a" + "BreakpointIdentity": "c353a95e-e861-4e15-bd1f-8a8ad43c4440" } ], "ParamProperties": { - "dataRow": "行数据" + "dataRow": "行数据", + "value0": "行数据.value", + "parentValue1": "行数据.parentValue", + "状态2": "行数据.状态", + "任务名称3": "行数据.任务名称", + "版本名称4": "行数据.版本名称", + "执行者5": "行数据.执行者", + "开始时间6": "行数据.开始时间", + "结束时间7": "行数据.结束时间", + "总计划8": "行数据.总计划", + "可核定工时9": "行数据.可核定工时", + "任务成员10": "行数据.任务成员" } }, "allowRoles": [ @@ -2263,4 +2284,4 @@ "Formula": "任务列表!$I$13" } ] -}//q3jcXDxHMH7Ti6oLK6bHRl08FzmlIkr1+gQkLEIptwSGolFzXOHAGJqtECieX1NN9SzjA7bjTsJuvKnpeXt4KMEKli3MyoZ7rezHzdW57+VRIvcKE0W+1d3y/3gOGSM+Lrki18D5mXD1J0cUeFAVYP3TLoahmvSTW9N+2tDBJZPYqEtWhSOWqNdbZgvSSJ7O2/F+a8Nv4Q+bskDwjms8Zs0ZkaiOZj1y/Iv74a6vL0ZCbwjAaQzOn+p+wx/Ydq6wCkSgMYlP4TTy/qPKYkQIpWyCnftCkI95IvmVSdM3oVLs7itF+0ZQJG1Irzu6xPZnn0zO18PE+fM6+IgFco/NCKyq5hhFhg5LfQtNeFu21LZ5tcN/i62EAsM5KZz4Muub31duAW4sDnC+ZV8h7cZTGf762DCYfB8jwZt4fPFjqoQ+MRrjhLvjDEQfFiX0ISDdpapsGZ+0D15Wb72oL7bOdv7H25GBdbSmLGbC660LaH6pN2sTjpsNWnc9DQmpqSRUTz278f559TolYXgVBqNXzS2nuFWDsMwSnIoWCnvsoAiZxUY8s8glKh3JGwgHhGxVyc7bmSy/QzL6lk3hzK5KGeHmdRAqJkng1vMzZZ7DowMGaasJC6X+z6kCENAWBFrpKfElzCXKIa3uLLNFlg5Sl3d4xou2RAj5atyfkNWfvocFXf0qOdkxZdM/SRYx1Qghs7wK3tZlSH4G5O733IoL2ZCQag8/pKk+0I1cSldVtFuGUxjh9Zqc2+1KvTYW9Jk9FPML6qQ7tv6CRJpZNvlbiHYRhiUfKKhLKR5QpaxvRDmjg8ZT09+EKjidC2zG8ScqXsb/hXVoSP2JaTuTcGTwaeDqge/K6vs5aDtzY8iaJjURLl7oOJa5YNxRubcA33oNe4uNtfiaqspov7RmBDe3KQ==|920 \ No newline at end of file +}//Fdzn9ACJYszS0xBkEraVHdaJAFP0KDix5xDc4lfSDKp/MAuBpnUWgAtWgCfpuR/ArQ3QADOHL78NXG+VGGLKQSXL09ORnBzQOPIEOfX6XdSNWKlduZA5y9zrBRnp1Lrt83CVm9fYUd1gVoRCN05+UNov/NAo75AbEcAUJyZVK6HQzNUGB6v4PX3hos84ksvpqOX9yY6wbj2LMH325kHrY/PLlJWzvTJRGmFpsmPZsH4XVcRMPFJNXeeyGQioyzValsAfHQK5Bx8I5YDB/A0ui5LA5axua3l3opuLNflcQDFJTjq7xCST9OqtjDSfYAQ1uzeBcK92VSm6Tg0Br1a0yx7vWhtwc+2ODb/dqZqdSImMcO0qjWmU106RRujFCLFVbtt67IrHOmzSaI1Yc/jc9gmAKV9d66bbdE/54mshqXuRSxzmaTTqc9+/Iz6r4aTxdKsT2aSbke/+1wEXSqis/d6d46+bAHSMdxA7Cfp6v14ld9wPUO8/W7eWJpiim92fHjVte+EpPbduuds/4SSt0ErNjoNOuL4Sys4w6kmvAxWwMrXHRRcLa8xH45gEVQKyHFMlVGKbxjFPLVo0WN4vjSgjuScOxsWiwAtYrh/0QdF8ffVBG0nrr/TtMYBlF88nu6s/YPDGQyqGMAFPSTtQoz3cyb7jj4N+bLhAsFUrUbDcYJV0zb9OQsTLB5JK0eSdP4Xm4/lhzuvvLXWtep0I7F0l9xyYA0Qjkd+OQ7E+UXTdjZfDHhnODKo/P12g51hOJzOzW5QSsJiYO18HlUY6/DKZ7vMc96jKFJLiWPpa8bFVwDWVl6wHGW5UJkf5EPyIvOrbiXffoAQYkRovXwRrdnDxobzqKS9DKx5t62K0C+K9LawRxr4rAJduUggXQckJpvGeGdyZ3aN0iC3hbOIfiA==|920 \ No newline at end of file