From 08e086c6c8fc141c79813a5769b64e7379366d30 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Sat, 31 Aug 2024 00:01:33 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":3,"Name":"MasterPCPage/FGC=5F=E6=AF=8D=E7=89=88?= =?UTF-8?q?=E9=A1=B5"},{"State":3,"Type":38,"Name":"Image/=E9=AD=94?= =?UTF-8?q?=E6=B3=95=E6=A3=92-=E9=BB=98=E8=AE=A4.svg"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 18 +---- MasterPages/FGC_母版页.json | 143 ++++++++++++++++++++------------- MasterPages/FGC_母版页.rd | 4 +- image/多色图标/魔法棒-默认.svg | 1 + 4 files changed, 89 insertions(+), 77 deletions(-) create mode 100644 image/多色图标/魔法棒-默认.svg diff --git a/.collaboration b/.collaboration index 67a408c5..18137e5e 100644 --- a/.collaboration +++ b/.collaboration @@ -1214,17 +1214,7 @@ }, { "ModuleName": "MasterPCPage/FGC_母版页", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-08-30T23:59:20.0175871+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\FGC_母版页.json", - "MasterPages\\FGC_母版页.rd" - ] + "ModuleType": 3 }, { "ModuleName": "UserControlPage/工时记录列表", @@ -2288,12 +2278,6 @@ }, { "ModuleName": "Image/魔法棒-默认.svg", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-08-31T00:00:58.8271934+08:00", "ModuleType": 38 } ] \ No newline at end of file diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json index 25b8c877..ff92de7c 100644 --- a/MasterPages/FGC_母版页.json +++ b/MasterPages/FGC_母版页.json @@ -110,7 +110,7 @@ }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 295.0, + "DesignLengthInPixel": 253.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -125,30 +125,40 @@ "DesignLengthInPixel": 20.0 } }, - "7": { + "9": { "GridRowColumnDefinition": { "DesignLengthInPixel": 80.0, "Mode": 1 } }, - "8": { + "10": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 } }, - "9": { + "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 173.0, "Mode": 1 } }, - "10": { + "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 30.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } } }, - "Count": 11, + "Count": 13, "DefaultSize": 230.0 }, "Values": { @@ -157,7 +167,7 @@ }, "Formulas": { "6,0": "ODATA(\"ACT_RU_TASK_View/$count?$filter=类型 ne '抄送'\")", - "1,7": "IFS(TODO数量=0,0,TODO数量<100,TODO数量,TODO数量>99,\"99+\")", + "1,9": "IFS(TODO数量=0,0,TODO数量<100,TODO数量,TODO数量>99,\"99+\")", "6,2": "ODATA(\"TODO/$count?$filter=用户 eq \"&IF(ISBLANK(母版_当前用户),\"null\",\"'\"&母版_当前用户&\"'\")&\" and 完成 ne 1\")" }, "AttachInfos": { @@ -432,6 +442,21 @@ } }, "1,7": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "URL": "https://applink.dingtalk.com/client/aiAgent?assistantId=f64238ffbae444db9f143450e3190df7&from=share", + "IsOpenInNewTab": true + } + ], + "ToolTip": "AI助理", + "Size": 18, + "ImagePath": "魔法棒-默认.svg" + } + }, + "1,9": { "CssName": "todo-img", "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", @@ -440,7 +465,7 @@ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", "PopupDisplayMode": 2, "Placement": { - "SerializeProperty": "=FGC_母版页!H2" + "SerializeProperty": "=FGC_母版页!J2" }, "PageName": "TODO-FULL" } @@ -452,7 +477,7 @@ "IconSize": 24.0 } }, - "1,9": { + "1,11": { "CellType": { "$type": "Forguncy.CurrentUserCellType, ServerDesignerCommon", "CellCustomValue": "%CurrentUser%", @@ -541,9 +566,11 @@ "1,1": 1, "1,2": 2, "1,6": 2, - "1,7": 3, + "1,7": 2, "1,8": 2, - "1,9": 4, + "1,9": 3, + "1,10": 2, + "1,11": 4, "2,1": 5, "3,0": 6, "6,0": 7 @@ -562,7 +589,7 @@ }, "Spans": [ "1,2,1,4", - "3,0,2,11" + "3,0,2,13" ], "PageInfo": { "$type": "Forguncy.Model.Pages.MasterPage, ServerDesignerCommon", @@ -1125,7 +1152,7 @@ "IsOpenInNewTab": true } ], - "ID": "d7419777-48fc-46b5-943c-bf776f6f307a" + "ID": "8bc685e1-882d-412a-b681-a2d59a160bb9" }, { "CommandList": [ @@ -1146,12 +1173,12 @@ ] } ], - "ID": "77dbe3cc-6040-4677-9d06-37715cc959f0" + "ID": "47776746-732e-4c4e-9569-b347334344a1" } ] } ], - "ID": "8ce16870-ca5c-4c47-b598-7867dc220ade" + "ID": "6661b85c-ab38-4ec9-b424-6a98e8d42647" }, { "Condition": { @@ -1201,7 +1228,7 @@ ] } ], - "ID": "c0486a52-d0ae-40ac-85b7-831b71368ba4" + "ID": "2f998e34-da48-4e38-ada4-b033455fa919" }, { "Condition": { @@ -1235,7 +1262,7 @@ ] } ], - "ID": "4cf87d75-c9c9-43c4-8c52-d80f0c25d079" + "ID": "cfd73270-6fee-4263-869a-07c88d58bc04" }, { "Condition": { @@ -1271,7 +1298,7 @@ ] } ], - "ID": "6c98ec61-7d20-4dc6-a4ca-619d9038b373" + "ID": "b20be654-8a80-47fa-904a-98a34c30a083" }, { "Condition": { @@ -1306,17 +1333,17 @@ ] } ], - "ID": "9385b34a-0ca9-405a-be7a-6f4879284b56" + "ID": "e9904819-c018-4370-a096-1d4a7cd149d9" } ] } ], - "ID": "ea0b3e83-ae32-4d75-8028-8aada7c1184b" + "ID": "41608ff5-86a0-498b-97d1-42ce393913fb" } ] } ], - "ID": "e7c6c6c1-508f-470b-b39f-fe16c2554b92" + "ID": "1ad4436b-8789-4671-aac7-f19b8719edf0" } ] } @@ -1329,7 +1356,7 @@ } } ], - "ID": "13debbf8-86de-4ab0-b66c-264d620a3333" + "ID": "57d37f9d-509c-4a95-b08d-bfabc81130c8" }, { "Condition": { @@ -1436,7 +1463,7 @@ "IsOpenInNewTab": true } ], - "ID": "d8c7616e-1a54-4c3d-9ed0-eb619534967a" + "ID": "43f9990c-247c-47f4-ad28-d4a3ca60e830" }, { "CommandList": [ @@ -1457,12 +1484,12 @@ ] } ], - "ID": "8276c237-2989-4aa8-bbab-b62e6bc1bb4f" + "ID": "480da14a-455b-4749-a375-1001b907d9d4" } ] } ], - "ID": "9e14ab45-8f24-4ad6-b221-ab938c3ae3b5" + "ID": "8368d509-fc1b-44f1-b78c-69145aab277f" }, { "Condition": { @@ -1512,7 +1539,7 @@ ] } ], - "ID": "eb0653d3-e4b9-4a12-bb36-aed121bf863d" + "ID": "1ab6e4cb-b282-4ec1-ab23-aff89603a2e9" }, { "Condition": { @@ -1546,7 +1573,7 @@ ] } ], - "ID": "baf0be2d-3c47-4016-a2c7-b6079e19c760" + "ID": "0c1dc9ff-7ca4-4588-b955-9a07a6570b99" }, { "Condition": { @@ -1582,7 +1609,7 @@ ] } ], - "ID": "178a25a4-004d-4d41-9967-a93c46a3449a" + "ID": "86e79074-b298-4883-97c9-afbd8bc08031" }, { "Condition": { @@ -1617,17 +1644,17 @@ ] } ], - "ID": "951cf5e7-a595-446f-8252-9daea86ebe3b" + "ID": "570a11f6-ed75-457c-b03a-c560d34f0e3d" } ] } ], - "ID": "44945ee9-3bc1-4a48-a278-86fac3d086cc" + "ID": "573de154-2bba-468c-a7ff-b4eb01e97485" } ] } ], - "ID": "ad2e4019-8132-44bc-b257-bc956fd510cf" + "ID": "9e26e030-e293-46c9-80cd-b8700a0e363d" } ] } @@ -1640,7 +1667,7 @@ } } ], - "ID": "505bf262-c85b-41ec-ae6c-4c2ca2729ec6" + "ID": "e686cc29-c26b-4213-bd5b-d2a444516e9d" }, { "Condition": { @@ -1747,7 +1774,7 @@ "IsOpenInNewTab": true } ], - "ID": "cc97b346-1236-40d3-bf0f-da13efcb27ca" + "ID": "e297aa6f-19a8-481e-a307-dfea2a229c6c" }, { "CommandList": [ @@ -1768,12 +1795,12 @@ ] } ], - "ID": "2a16f94a-d4a9-4543-bf54-45deabf08ed7" + "ID": "f0dac0f5-3062-4040-873c-968369e15ee8" } ] } ], - "ID": "96726fa5-e2b2-4bef-ac4e-9900fd656e55" + "ID": "a949f5b8-cabb-4845-9aa6-752a25cb3232" }, { "Condition": { @@ -1823,7 +1850,7 @@ ] } ], - "ID": "114c3411-9793-4e26-b49c-d7cf4c87cc94" + "ID": "d730dde8-272e-4992-8e24-6447669a1010" }, { "Condition": { @@ -1857,7 +1884,7 @@ ] } ], - "ID": "e7117873-3cf3-4871-a50b-c48a91b1fcf2" + "ID": "d8751e1d-79cf-4641-9216-67b58d76de51" }, { "Condition": { @@ -1893,7 +1920,7 @@ ] } ], - "ID": "39936854-2b5b-4864-8b7e-6016437bab98" + "ID": "1243211a-396a-4474-bc83-3895dd4de913" }, { "Condition": { @@ -1928,17 +1955,17 @@ ] } ], - "ID": "eb0bb226-13de-40c6-87ba-4d25107b8baa" + "ID": "561c1294-5f88-4a74-9377-bd835315f11a" } ] } ], - "ID": "f71b6f97-0845-4944-a447-87acf928ee00" + "ID": "5615f2a4-7b10-40dc-a06a-20d718ad2982" } ] } ], - "ID": "f8044216-6ac7-4e09-b8b9-7c858c7f6e00" + "ID": "0648b4b5-6ca0-4445-8f18-f37deaa85ab4" } ] } @@ -1951,7 +1978,7 @@ } } ], - "ID": "7b38dad3-c247-44ea-ac12-881548c716b2" + "ID": "811c29a6-ed1e-485d-9161-76d6a2fe7e61" }, { "Condition": { @@ -2058,7 +2085,7 @@ "IsOpenInNewTab": true } ], - "ID": "d6764ba6-ee26-4f61-84e9-f2182fa92949" + "ID": "41b9cd0e-5999-4a97-a3b8-e8e2086b9298" }, { "CommandList": [ @@ -2079,12 +2106,12 @@ ] } ], - "ID": "a000c768-e9fc-4afa-b666-66d967c2d72e" + "ID": "d79ce232-29bc-4edc-a005-5dcecab30580" } ] } ], - "ID": "32d853cd-49a1-4dd8-8ec2-6c72b97eff19" + "ID": "8a7d028c-65fe-4261-80d9-92363a78827c" }, { "Condition": { @@ -2134,7 +2161,7 @@ ] } ], - "ID": "bc25e6e6-91a6-4804-8725-3dbddc361de1" + "ID": "fff66774-8206-4792-85ed-971ee1a7e766" }, { "Condition": { @@ -2168,7 +2195,7 @@ ] } ], - "ID": "9fcdc947-3dcd-45da-aa0d-b9b42f1a2fe3" + "ID": "78c1591c-37ab-43fc-9d59-e408e1ea61a7" }, { "Condition": { @@ -2204,7 +2231,7 @@ ] } ], - "ID": "d17b3f89-2098-4fdc-80db-1635025291dd" + "ID": "7ec36db5-fe95-4e9c-bb06-687e3cee28bf" }, { "Condition": { @@ -2239,17 +2266,17 @@ ] } ], - "ID": "9decdc4d-f8b0-4875-8493-215e4bc66d17" + "ID": "d6116c68-7519-4ecf-b225-ce83278cc649" } ] } ], - "ID": "6b052f88-c21d-4ea6-96e8-2a113b4491c2" + "ID": "48da9d8c-75dc-45a7-9c49-8f088a159bbc" } ] } ], - "ID": "6e899abd-0d28-4262-8c23-9b1dd1411d38" + "ID": "18799db7-4d64-4c3c-9b24-45df886878bb" } ] } @@ -2262,12 +2289,12 @@ } } ], - "ID": "cb0d69ba-ec33-487f-80f0-4b8fd49612eb" + "ID": "9b7a5500-e616-4e7c-8807-e6e1c072185f" } ] } ], - "ID": "0945632f-ac41-416b-8134-513e6abae933" + "ID": "f2a1d92f-4d9c-4add-a1b4-59c7c35a9302" }, { "Condition": { @@ -2350,12 +2377,12 @@ } } ], - "ID": "4f850361-c6b5-49bb-8d29-08a56d5f0f88" + "ID": "db9cfd01-cea9-4873-bda9-27bd01ad61f9" } ] } ], - "ID": "d8d4e2df-2c88-4533-b35a-88ba496ede98" + "ID": "df82a6e1-e82d-436e-a084-65c3a64696e6" } ] } @@ -2400,7 +2427,7 @@ ] } ], - "ID": "4fb6a11a-5542-4018-b1f5-967e30fcb92d" + "ID": "8f3df64a-778f-4412-9811-5146a1dd6aa3" } ] } @@ -2447,7 +2474,7 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Size": "1546,57", + "Size": "1544,57", "BoxShadowString": "0 2 0 5 #175D7183" } ], @@ -2473,4 +2500,4 @@ "Formula": "FGC_母版页!$C$7" } ] -}//VmPJl5L+bvp0POxOfwALkZoFuyAaUfeaPbVeS3ljzthAFrUTQr8aytg+a3Pdb0z4nG/TTCo9BXN/PBgG+ClVHlApLPJbZ6c0E4KPwiZDdrw1F+K2v7ZnVDvSlY3TbvicY4uuulqUZXAypI58k7by/DsjeaQJz22qxykd6uDilyjwt/f1Z9sCNLcrHyxQjS0Jf1AAehqps7D7o4mHcjqlWJgVQ/3jmaDNABZU6ZMfEi9mADtQvBC42aFfLH3keVWtZVXY8SAlEkD5x9Apevxg6bAAN9W7+HHeLWuQsa2/+FurLIHN9Q+Imx93DVVV/m/a5lTIqWWo+jvuXD8VpL7C4q/H4dtoUKgNcsXVeaS3w3ai4+FWaBDyVacQlt2Im+3iNKkDNElmgn/ZKcWlvViSWwTkoLxlovN/xuulvXLa0XGV31fQG6lmYQ/8yTak99ARLHJ6UeEc+j2goC/lazyGA+bIbwWmuMRdgVKppPe1jyV659ebTxqZmAptIsvGzDCVDxHdkpUEnZxntcOMRU+brSsAu0SBIM43gFno9chXPvztEzsec5PIAdQ54E31xmSkRGdXMhhOKUC5xk9fT8Vx5Moqnml/n0cPW95ejuzC/3Q0eQVByBpb/qO4SIunV6x3kUkwz+8Mzm1aU668dQyLpPirxDjCIVGNm0hc4OtOoXx6D1FPFJdTbWkhD1bcnXMg6elsFvu3aP5Ad0nrXawYrUJx9cvq+rLysz9WkM86kVp8ktrGSicsXppeoPTpBs7yi8lX5hvfM2rtC3f76WrdffcOsAqFhE6/xxuWQfRcg1lGUFykMbHQOm8xL9P0e/OOmZ5ab053SsJjrIW7Y0+yOd4Um0gw2sLVOfiWvt9FYMie3RpnnAP55koz88IEqxdN2fyERnjE3+u6ys9JRal6lQ==|920 \ No newline at end of file +}//qryTZUa1AeSV9BHJ9VPiwCbsiY27BfKTasaF7FOy9rdTpRaN5a6EqiAiIvJew0K4VTGKpJX6RyZjuPe0DDz72kIas37cL6nnPo79E1dyOujeJvVPDOYOnPKrJu5XmsvxtyYR/l+jqzlSOD2yV+cuVPD5LGQlZHV9w6hcGSua/sYbahWK9+3jbJDOUDusfrPJls5Bh5jpYPE8GSTYeN9nJdkC5I8akpToyFqycgW8p1XVtw/sDdO9xyWI3fpwZkiLwBusvUaTlS8bjUbuG44h4BiGtPHYBbD4uMD+j5nRAkE999Ot3xljCannxNlO11BVxFPQ3oqDG4rOAHpUukSsjwyOGuYg6hq3WHp+12WblER8doH0GEcLhs9MqJ3GQBGaS8P90dPEhP6RTysSJIVyb5MIlnC+OPIrdGlb+Jdi8rC16tcUNEoh4bn1HMvU87X0xBigp/g1Ua+kJqegG55bLBEPUqrxcqQ1cyTYIQ+SAAyiULQ3HMWLofJqaxwfPKT2HRKARTloTpUWy0/UlinJWgqNj7mJhCpCVczjl56WcoBc6nObcfNBtYUtmypZSWWIqDM5EPSfnMsJtV4/DLXOmOzLcQWyg7//p+mKNTGYjE6JMunqrxr8Lyplchph+Kn2rwQQOWq3sjzY2+uzPgWtAkZ2x8foXnGB8U0LsrfBxXQcyw2oK01cKLiMNw638HpWc9I2xzMNI6z8NFLjqU/QcMRfkuBnnvRmqy+GnG12no3CDi7zCPhWiemsV1BxTzf3NypEtMGRlr9WsPHCtEaLm/oCgn6m82q+dFNqEXpy2Qam0e9zQqR0q02+3CIjUPoqNAKMve1oXsVpx2EMXPY61VqoKRCZJQ1/Xo/FfzkFjDYcNdoIvKMI5Kb0NZBkt7GR+RiRTBexweQty3i3CZrn4Q==|920 \ No newline at end of file diff --git a/MasterPages/FGC_母版页.rd b/MasterPages/FGC_母版页.rd index 122ce49d..d56af6d8 100644 --- a/MasterPages/FGC_母版页.rd +++ b/MasterPages/FGC_母版页.rd @@ -1,10 +1,10 @@ { "PageType": 1, - "ColumnCount": 11, + "ColumnCount": 13, "RowCount": 7, "Formulas": { "6,0": "ODATA(\"ACT_RU_TASK_View/$count?$filter=类型 ne '抄送'\")", - "1,7": "IFS(TODO数量=0,0,TODO数量<100,TODO数量,TODO数量>99,\"99+\")", + "1,9": "IFS(TODO数量=0,0,TODO数量<100,TODO数量,TODO数量>99,\"99+\")", "6,2": "ODATA(\"TODO/$count?$filter=用户 eq \"&IF(ISBLANK(母版_当前用户),\"null\",\"'\"&母版_当前用户&\"'\")&\" and 完成 ne 1\")" }, "CustomNames": [ diff --git a/image/多色图标/魔法棒-默认.svg b/image/多色图标/魔法棒-默认.svg new file mode 100644 index 00000000..83dfc4c5 --- /dev/null +++ b/image/多色图标/魔法棒-默认.svg @@ -0,0 +1 @@ + \ No newline at end of file