diff --git a/.collaboration b/.collaboration index 2bb14fdd..a8afedf9 100644 --- a/.collaboration +++ b/.collaboration @@ -1274,17 +1274,7 @@ }, { "ModuleName": "MasterPCPage/FGC_母版页", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-28T22:03:46.7925006+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\FGC_母版页.json", - "MasterPages\\FGC_母版页.rd" - ] + "ModuleType": 3 }, { "ModuleName": "UserControlPage/任务统计信息", diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json index 926f0ccc..81cf3d63 100644 --- a/MasterPages/FGC_母版页.json +++ b/MasterPages/FGC_母版页.json @@ -1232,7 +1232,7 @@ "BreakpointIdentity": "93a42dfd-568c-458f-8329-5f109667a10d" } ], - "ID": "bffcedf8-ad1a-42a0-b9b4-ffa395691f05" + "ID": "50f6c68f-f00f-4b14-bf8a-067abc943459" }, { "CommandList": [ @@ -1254,13 +1254,13 @@ "BreakpointIdentity": "8c119858-efa0-4da0-a07c-a0dd79baecd5" } ], - "ID": "1b32b434-32f7-4070-861d-36ee888197e2" + "ID": "f46e03d2-1342-4584-81d2-111a04a3c1b1" } ], "BreakpointIdentity": "969ae033-7873-46a1-81a1-9b8e65fb33ca" } ], - "ID": "2f1a7e30-92a4-41df-a526-60efda252a3e" + "ID": "a7cc6f4f-1f34-4dae-879c-3186ed2e38f5" }, { "Condition": { @@ -1311,7 +1311,7 @@ "BreakpointIdentity": "0c54b865-bdb8-4095-8e71-675943dc6dba" } ], - "ID": "22063b18-8ae5-453e-8d7e-a9bfd453fbb7" + "ID": "0c49075d-5e03-4311-beb9-f38d30f16346" }, { "Condition": { @@ -1346,7 +1346,7 @@ "BreakpointIdentity": "f20dc5c6-d4f5-43ee-99a3-4f94332145d1" } ], - "ID": "bf0cd953-6e1a-48a3-9343-58fdd54f5c26" + "ID": "409be45a-8ca5-4daa-9033-c00943684cd7" }, { "Condition": { @@ -1383,7 +1383,7 @@ "BreakpointIdentity": "692c798f-e9fe-4d6a-9065-76af5915989e" } ], - "ID": "d3096742-c1b8-4b4e-8120-cb15c13951a1" + "ID": "1833fc20-921f-4958-adc9-37f8c245f273" }, { "Condition": { @@ -1419,19 +1419,19 @@ "BreakpointIdentity": "a6635eec-fb42-4663-b576-5a45041a36a4" } ], - "ID": "e341b959-57e3-42ec-b012-a600be40aa34" + "ID": "b7aa5e5e-dad3-40cf-aef9-147dbe302940" } ], "BreakpointIdentity": "dc81da90-9ea2-4f47-86a9-69552d8d9859" } ], - "ID": "938752bc-515d-4f23-8ad9-bd89074606de" + "ID": "4826fecd-a28b-4e6a-a968-5ef667b03b3a" } ], "BreakpointIdentity": "ebce4947-cdf6-4822-bf2a-1b39dfe85079" } ], - "ID": "5a0beff5-7355-49c0-b4fb-31027e8a5f6b" + "ID": "c43ef20d-421b-45d0-8965-1efd2bc320c0" } ], "BreakpointIdentity": "1797eab4-9995-496c-85d8-4ec4d448f51e" @@ -1446,7 +1446,7 @@ "BreakpointIdentity": "aacc45c3-b13c-4494-a8f9-f585962b2e7e" } ], - "ID": "0fce902b-4d79-4fad-9a14-77b0115cded8" + "ID": "e8dce0c1-c598-4090-9313-19cb4a900deb" }, { "Condition": { @@ -1554,7 +1554,7 @@ "BreakpointIdentity": "c25e32ee-3b70-4862-8d4e-319ec62ab08c" } ], - "ID": "f1e889de-9291-48c1-bd48-7b2be3a0f4c8" + "ID": "2fb8930c-8922-4d81-b3f5-505014332672" }, { "CommandList": [ @@ -1576,13 +1576,13 @@ "BreakpointIdentity": "21b1ac03-ccd8-4ec2-a027-10c57fac30a7" } ], - "ID": "4c4603b6-fe5f-419a-a709-417eded96be7" + "ID": "e6de2ee4-86ec-4395-8aee-e5ceb0475335" } ], "BreakpointIdentity": "fa123ae4-f0ab-44c4-b993-68fdcd2ac87d" } ], - "ID": "0a732ee4-d7d3-49a8-b900-e7f365655bc1" + "ID": "39636096-1da4-4dc2-85d5-84d483f9c75b" }, { "Condition": { @@ -1633,7 +1633,7 @@ "BreakpointIdentity": "cb631bfb-30fe-4d1d-99c8-6a67a0fb8e29" } ], - "ID": "4310736b-dbe6-4261-8832-8327f5e848c3" + "ID": "a7353fd2-a374-4e30-943f-807b646a5a78" }, { "Condition": { @@ -1668,7 +1668,7 @@ "BreakpointIdentity": "2e7bbdef-12f5-4403-9881-e28853c1ddf3" } ], - "ID": "a8afa6dd-a7c1-435e-9d0b-f56deeed5d92" + "ID": "b6307459-a7af-408c-971c-8bf52636abd0" }, { "Condition": { @@ -1705,7 +1705,7 @@ "BreakpointIdentity": "32ff7538-b8b1-448a-a6ac-11bf1f423e4b" } ], - "ID": "a82e1416-056f-4506-ad64-f87e32dde664" + "ID": "c4beead2-8918-4d77-8cda-041655241298" }, { "Condition": { @@ -1741,19 +1741,19 @@ "BreakpointIdentity": "8d3185e2-b48b-4c88-a6b0-21348c3c7886" } ], - "ID": "cf693ac8-53b5-465c-ba38-1592bd2e8a1e" + "ID": "c68756ad-df5d-4ca9-a975-eba08f5ca732" } ], "BreakpointIdentity": "40512f68-5598-402e-b32e-7e8aa84cd6b9" } ], - "ID": "f14a3a51-be7a-4903-8eaa-ad5a23bdc554" + "ID": "36c78311-4570-40cf-9b14-9dd8ef6a1023" } ], "BreakpointIdentity": "61dcc8d6-7c86-4cd1-80ba-3f5d005ba83b" } ], - "ID": "08fc8286-df70-481e-8480-7ed6fc03d6ae" + "ID": "a03bc076-f03d-40f8-b482-812363d7e480" } ], "BreakpointIdentity": "b0a7b2ff-83d6-43c3-b9f2-e63b81c9194a" @@ -1768,7 +1768,7 @@ "BreakpointIdentity": "ff1ca583-b4f0-4859-bf29-fe5902e6d3e1" } ], - "ID": "8001c706-a3c4-4d82-88b7-fed36bc9a9c7" + "ID": "db146361-985a-4959-b96e-fcb43e4f5e5b" }, { "Condition": { @@ -1876,7 +1876,7 @@ "BreakpointIdentity": "54534b74-a29f-44ae-99b2-e28f2f440a71" } ], - "ID": "1cda0f3c-3f30-4237-a5be-9ce6dcd9d8ea" + "ID": "adcf78a3-33a2-4613-bdd6-5b47f4d5d2a0" }, { "CommandList": [ @@ -1898,13 +1898,13 @@ "BreakpointIdentity": "6c7d2476-067f-492d-be7e-ee51d0953562" } ], - "ID": "5c773a8d-1174-4206-9464-b7a3a308e959" + "ID": "75a14319-e136-40d8-bf54-22999ec7999f" } ], "BreakpointIdentity": "5fa8cf02-b78b-4f05-a9bf-e6fcd1a3278f" } ], - "ID": "1e5f5752-9ff1-40a4-9c7a-c1daa2df994f" + "ID": "b4200aa3-a825-4cc4-8299-f9ab58b3b5e7" }, { "Condition": { @@ -1955,7 +1955,7 @@ "BreakpointIdentity": "6b2c138b-81e2-4c96-8a9a-7b15e8d2af41" } ], - "ID": "de2ac71c-5b9b-4542-8e8e-e9f6493add37" + "ID": "df4242eb-7965-4aca-a2c6-72a5b303fc10" }, { "Condition": { @@ -1990,7 +1990,7 @@ "BreakpointIdentity": "32a8989a-0321-4daa-9db7-354dda93cb6b" } ], - "ID": "aa1a8efe-71de-46be-a5ca-d0ab7794a144" + "ID": "0ac242fd-26f5-4112-a3f6-be4072feb107" }, { "Condition": { @@ -2027,7 +2027,7 @@ "BreakpointIdentity": "9d5a7ef8-9d01-412d-b350-b2fb4db012cb" } ], - "ID": "000db25a-eb5a-4dea-ba05-72d73a24f1c6" + "ID": "b12f7799-def6-4c82-8ce5-dcb7eb7d26b7" }, { "Condition": { @@ -2063,19 +2063,19 @@ "BreakpointIdentity": "f62c6f7d-40a5-46cd-bec9-087107916b4b" } ], - "ID": "c7a5e7a1-b358-4b9d-bfb3-63f7a55ea7f3" + "ID": "2b6d30c4-6295-41e7-9cba-89bf6133386b" } ], "BreakpointIdentity": "2eb6d3a7-dbb3-483d-912c-235d4e8e4a0a" } ], - "ID": "85b15551-1f71-415d-995b-4b033f2c24f2" + "ID": "2339e591-744d-4eb1-9be4-1011992d7aa2" } ], "BreakpointIdentity": "bda7027f-3f7f-4608-870a-be5b29ca3107" } ], - "ID": "a8a5bf71-ad8e-4286-b458-dd2da65a9525" + "ID": "c8c77323-80a3-4c0a-9bd3-d7f2a6086c07" } ], "BreakpointIdentity": "bb272395-1c45-4f35-ba4b-4f55a5aa5b3d" @@ -2090,7 +2090,7 @@ "BreakpointIdentity": "0cdabfdb-449c-400e-b747-339c71869bea" } ], - "ID": "295d4084-2613-4ee4-8fdc-6043d9479930" + "ID": "8c2e77c6-393f-4d60-bbd1-ecd80170d0ef" }, { "Condition": { @@ -2198,7 +2198,7 @@ "BreakpointIdentity": "f30c2b20-d028-4767-8db7-55e1149758c1" } ], - "ID": "065ed44d-e660-4fa4-920a-fc5f16080e3c" + "ID": "44d8d116-8930-4f65-8be6-7af06ed47afa" }, { "CommandList": [ @@ -2220,13 +2220,13 @@ "BreakpointIdentity": "94205cb2-e185-4d45-a981-bd7eadc450f7" } ], - "ID": "89454e48-0f7a-40ed-b045-a4c8d65e116b" + "ID": "385548c1-15b4-4305-9d20-0dbc7c9286c4" } ], "BreakpointIdentity": "2e764005-dd75-472a-8e78-299f723cd0cf" } ], - "ID": "c314ca7e-0938-4303-81e4-f187d66104a2" + "ID": "826e2b9d-d993-4c07-a33d-468b19d00a75" }, { "Condition": { @@ -2277,7 +2277,7 @@ "BreakpointIdentity": "2fcafc31-62d4-42f1-8000-f7d9333ac500" } ], - "ID": "af7715ab-ba86-4b9a-a8f8-d8f4ee57ce3b" + "ID": "9ce206fa-5d9a-4cfb-8a58-680cd99438a0" }, { "Condition": { @@ -2312,7 +2312,7 @@ "BreakpointIdentity": "caa4a42f-bff7-4989-b539-55a0d8f24d20" } ], - "ID": "02a03847-ce57-4162-b9b5-85f99ae5857b" + "ID": "eba6a6aa-8fde-4c1d-a021-b8ccee371f51" }, { "Condition": { @@ -2349,7 +2349,7 @@ "BreakpointIdentity": "c08dc4ab-fe0e-4928-aaa7-f8470c5e15bf" } ], - "ID": "eb169b2d-1efe-4ec8-b9e8-e3aa523b289b" + "ID": "69eba687-5138-4f6e-a3e2-4502819ada5c" }, { "Condition": { @@ -2385,19 +2385,19 @@ "BreakpointIdentity": "cc0440db-c781-4b77-b485-93fdb8d6874d" } ], - "ID": "ff93b1f9-49a7-42d5-a7a1-70a050a99fef" + "ID": "0ce95cc1-4cd9-4228-b392-e526dd205691" } ], "BreakpointIdentity": "44e95042-8990-4521-9985-55bbfa92d8db" } ], - "ID": "9d67558f-3286-44fa-9259-967cd10b445f" + "ID": "249924cb-e150-4ad5-91c3-a0f775c72040" } ], "BreakpointIdentity": "e95e5e23-18d0-4058-bc48-424a8abd2313" } ], - "ID": "79c9efbd-8dc5-4391-a9aa-53eabcf0f197" + "ID": "186935ce-bd9c-4e55-914b-fd189dd82a40" } ], "BreakpointIdentity": "0bca50da-fc39-4ea0-acf5-515ca80b8bfc" @@ -2412,13 +2412,13 @@ "BreakpointIdentity": "06108817-3d19-41e8-a64f-b9f5ef92e2fb" } ], - "ID": "9927d8f7-7651-4d82-aa8a-0476a848b48a" + "ID": "c7d8c2c5-cbfa-4d87-9e16-a5c82e076fa1" } ], "BreakpointIdentity": "e73bda49-7ee7-4c1c-8d64-6bcce134a9de" } ], - "ID": "8ecae1d4-75bb-46dd-82de-a68f07e502a2" + "ID": "d1dc81e2-1857-4711-af01-dbefd7327f04" }, { "Condition": { @@ -2503,13 +2503,13 @@ "BreakpointIdentity": "bb2578ef-d07e-472e-af66-56480cfcadfa" } ], - "ID": "f17f8c4e-c4e6-4524-a1b3-223b05b41445" + "ID": "1283e304-476a-43a3-b314-7c86ef1bc3d5" } ], "BreakpointIdentity": "1c17b13d-b8e1-448a-be3e-900d6745a52a" } ], - "ID": "b2287b21-d580-469d-b911-9817aae3e8b7" + "ID": "14e6c756-f837-405b-a7c0-4d835dd8f308" } ], "BreakpointIdentity": "33a98260-470d-477c-a40e-ac58277d3a7b" @@ -2562,6 +2562,16 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=FGC_母版页!业务配置.版本号" } + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=FGC_母版页!当前版本ID" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=FGC_母版页!业务配置.版本ID" + } } ], "BreakpointIdentity": "38982f28-2985-4b01-be47-faa3df252fea" @@ -2701,13 +2711,13 @@ "BreakpointIdentity": "a1fea9b2-7c89-4aef-a9ad-1779f30142ff" } ], - "ID": "55cb5f53-eb15-4b30-b3a0-c112dfa4b982" + "ID": "53d6b2ec-d249-482b-8780-20bf6f25fe61" } ], "BreakpointIdentity": "cb476024-020d-4e60-bd52-0f274f21589a" } ], - "ID": "1c2a4d89-77f1-44da-8c6d-dec21d0ee3d6" + "ID": "400f2834-0907-43dc-92bb-ec9ed0205e14" } ], "BreakpointIdentity": "495ca2c1-c930-4844-89e3-078cdcaf89e9" @@ -2741,7 +2751,7 @@ "BreakpointIdentity": "04f0cb77-3dc0-4be1-92a7-838f18561aea" } ], - "ID": "9dcc0ef7-a866-4caf-adb7-b5b44e3788d1" + "ID": "53425746-1004-4159-a04c-74f858c23734" } ], "BreakpointIdentity": "7be84535-2fb7-4180-a5fb-0af9b82abed1" @@ -2794,4 +2804,4 @@ "Formula": "FGC_母版页!$D$6" } ] -}//UV+gErDXj/Tc0USL2LIrkEZKYwHSEkdhm1nWWNvmOY96Wj9sN7VOsHr/GI6ddCWQHf2Baw7BIqb4lQQoX2Kp82eLef05Kq2fVqErSPJ2YEraiWB72X7BhQzcjGZ6WSyVbeUPLSTtRbCvA448ot5eRcVzdbY+rESl4Lx0IhHrxkytwViKXuq3zxp9zVySGO2+97/3XZrXRyJ2hiM3LglzGS5ikL9FgHQXnBuVaPWejODGI4r0eX3RYAbPVsdR9ZaoJmNSZihcu0+g0INJzAYQR2aihLzz0YdK0Y6OjQDBpZR+4uGBJ0EaPRvhdguvZ4A6QAVFpAOThmndk70RnMIhueiyZBW2XstWmmmQY+Usc+C7fGfUbj04D3ZPn8GPY/lBCKnyUSY0v9uhTkGrzDMYh7TT2eRDvqHs2i0eqL0UEs87XZ1/v4sXMojo98djxv6dzoWsjuKu3agUiOBAm9kHys/Ci+3HH8rks4oNE+j012/ciHa+Lo2+iFogL2JySZ4L47NPZBF/GV7+Qzy1McXt6k2eGhgYjq/mX1HOzWV85OthC9ASEcvRd5MheuFp4+MI2PPQDBkxqa3fwnRSArSn3PQfh/+at+3Vh0IozffRwWPjLpPvoz2LP6XUnHmUFumQS5ORHJ3MvNP0FWM4cQDlM2VQ1A5+Nyt7ON6X0vU8QQx+kVEusxinVTvb+rveUwh+Qs7LuJ7x8TLfsoMbsVoEEgDIkEJ0gW9kPGDV+wQqXOZUCZuGLPvDnKuh0yfq478aOlfEo78CWdN7UYF14xkVQJPynvAilYt/oPgjU3GFtkj7fbxU3NlIQQrpiEcdOsUeonUPGSMvknaGl+0SV7g9l27EzaokMuTQI+BtAAqkPl48X8krbZrJquIv/QWmBkxNUv8nnQtBfEcPN5u4t6wGwg==|920 \ No newline at end of file +}//M4RSv4FsEygUOE0TKxifgOMX+MLYC8UPGY6bn2J2BQo9N5eTT8DGx5lP7ZqW2b1boSWESg9RVv+mMUqlTu87w3rC7cPtOqg77RLqdIDUPoKHQA9BCETBm3zf/WjB2Gpw2qK0aFb/Vyr+t5eUNwNM7KyeO8tbfrkeJIB/cybD/48vZwjyFownHn4YmNBz7QgTWuwXM1/BAKXOWrOKrocZYwLo17hcvNSIHb74zv74jw7M5SYqxbZh/ader635CTCWmvutCumNyPv0Lv43WRy5Xdg8PMYMU2Lv1pK8n1pFazWaIHMM+3CXYtq7Mobl4oAnC1IIUIT/xFzIv3WJramv+cj/lyqwnR13tPWmyBiNnlQtKmhyfjXgtH/H1rDGc2870nlHKOBhkVsDYMLVA8ZIirGXYWlgGemtO2qbrRW73jv0JLCuVMxKoSadscz3CB2RRc/qkCFuEJ9pxrkh5srTbV6xtSRvTv2rK6SHMefN0ghSrEaVFb7B32XkAPC3LX06icvahtGGRcFku8RPkJv1clgL9wEcTGOU3PW+G0IDiEAXPEx1NBtyfrpKS+WNvTIoXtw335tgUOV1U6IGaR5lVrpL20x0yzQmS4N8mil+F1CuNWFimV7Kalc/oqQ/UitK7Pk8VTIBmxe/59AOpmcpnKMNDPy8oL/GuDhoj+xbJQ11+SQvSO+3S85gIzzozlv5J2DGFIwg6OCLfTFKqQbh75tUVQLGnM1vN2nVO5hCIkiR4m7w/jNLCUvphksHOeUzznWBn1IUAS8O4cmy6SJhIWtDlc2BxENRziMsfHXf+OhLjVkPhsxp6DlPZCZwRU9OBmtSL0HliMXj76bR9gcROJqNWxi8NWXWRKQsHSBtcwyurbdfrVWQPCwnT9A0wOpLjKLHA5+snHeMDx8qvzkOdQ==|920 \ No newline at end of file