diff --git a/.collaboration b/.collaboration index 0078ba62..92574142 100644 --- a/.collaboration +++ b/.collaboration @@ -606,17 +606,7 @@ }, { "ModuleName": "PCPage/项目信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T09:04:48.8510562+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目配置\\项目信息.json", - "Pages\\项目\\项目首页\\项目配置\\项目信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目岗位配置", @@ -624,17 +614,7 @@ }, { "ModuleName": "PCPage/项目审批", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T09:21:18.3195772+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目流程页面\\项目审批.json", - "Pages\\项目\\项目流程页面\\项目审批.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/预算申请", @@ -794,17 +774,7 @@ }, { "ModuleName": "PCPage/客户基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T09:15:37.170659+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\客户\\客户基本信息.json", - "Pages\\客户\\客户基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/客户部门管理", @@ -908,17 +878,7 @@ }, { "ModuleName": "MasterPCPage/FGC_母版页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T09:24:51.6155987+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\FGC_母版页.json", - "MasterPages\\FGC_母版页.rd" - ] + "ModuleType": 3 }, { "ModuleName": "MasterPages/流程母版页面文件夹", @@ -1442,19 +1402,7 @@ }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T09:11:36.1452551+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json", - "UserFile\\BaseCss.css", - "UserFile\\CustomFormula.js", - "UserFile\\echart.js" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", @@ -2002,16 +1950,7 @@ }, { "ModuleName": "TaskScheduler/项目表新增事件", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T09:04:09.0572819+08:00", - "ModuleType": 16, - "ToRemoveFiles": [ - "SchedulerTasks\\项目表新增事件.json" - ] + "ModuleType": 16 }, { "ModuleName": "Pages/项目/项目流程页面", @@ -2081,19 +2020,6 @@ "ModuleName": "ServerCommandPrivate/同步仓库的所有提交", "ModuleType": 27 }, - { - "ModuleName": "ServerCommand/生成项目封面", - "State": 2, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T09:04:57.2800144+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\AI\\生成项目封面.json" - ] - }, { "ModuleName": "ServerCommand/测试回复JSON", "ModuleType": 15 @@ -2340,22 +2266,10 @@ }, { "ModuleName": "ServerCommandPrivate/生成项目封面", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T09:04:57.2801047+08:00", "ModuleType": 27 }, { "ModuleName": "ServerCommand/从页面生成项目封面", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-04T09:06:03.570859+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json index 0dee6fb4..bfda3c24 100644 --- a/MasterPages/FGC_母版页.json +++ b/MasterPages/FGC_母版页.json @@ -257,7 +257,10 @@ } ], "CanVisitRoleList": [ - "FGC_LoginUser" + "Administrator", + "项目经理", + "项目总监", + "商务总监" ] }, { @@ -322,7 +325,10 @@ } ], "CanVisitRoleList": [ - "FGC_LoginUser" + "Administrator", + "项目总监", + "商务总监", + "财务" ] }, { @@ -1117,7 +1123,7 @@ "IsOpenInNewTab": true } ], - "ID": "3ce65377-b93e-452e-8960-9b6a30440395" + "ID": "ea247c42-5b24-4627-9d74-d1182a94f099" }, { "CommandList": [ @@ -1138,12 +1144,12 @@ ] } ], - "ID": "f1ddb7de-0580-4ce9-94d3-55d51b596756" + "ID": "23817e92-646e-4743-a1bb-451552613d89" } ] } ], - "ID": "3211c6f3-d22d-47e1-b333-21d4e27e29e5" + "ID": "6628a713-a6df-492f-a888-a94992adf709" }, { "Condition": { @@ -1193,7 +1199,7 @@ ] } ], - "ID": "a560963c-db07-4eb3-a81e-a4fd84674ab5" + "ID": "b76bdbd2-8556-4d81-9b57-45f661fb280b" }, { "Condition": { @@ -1227,7 +1233,7 @@ ] } ], - "ID": "711ee79c-a881-4377-969e-530f6ef921dc" + "ID": "ec012db8-fdae-4d36-a929-b77066ce2791" }, { "Condition": { @@ -1263,7 +1269,7 @@ ] } ], - "ID": "d3128d5f-35af-4bad-b31c-215bef863b23" + "ID": "901f96ed-cfb6-419c-99ad-534ff6500c3a" }, { "Condition": { @@ -1298,17 +1304,17 @@ ] } ], - "ID": "623bf66d-fe74-4700-8f14-049ac97bed7b" + "ID": "87e15364-e083-4e7a-b9ab-6a1f3a554299" } ] } ], - "ID": "4e995fa7-d1b4-442a-88e6-3da49d4fb407" + "ID": "b6e94365-afbc-4e2e-b8ac-369f45fdf2f5" } ] } ], - "ID": "8957ce3e-0dfc-4e25-a541-6767448cf63f" + "ID": "5ca8601c-76b7-4041-bd78-4e441684ec13" } ] } @@ -1321,7 +1327,7 @@ } } ], - "ID": "5ed4c509-b5bf-4c41-a45b-a170025e35bd" + "ID": "ea6cecf9-ca33-450e-921e-ca6a42851822" }, { "Condition": { @@ -1428,7 +1434,7 @@ "IsOpenInNewTab": true } ], - "ID": "8e42c719-26ca-4694-8010-95cf1198a723" + "ID": "bbe39abb-d063-45c0-967d-5086dd83b161" }, { "CommandList": [ @@ -1449,12 +1455,12 @@ ] } ], - "ID": "7ff29df7-8adc-471b-b007-81493daf9070" + "ID": "ef4acfde-37ee-4791-8648-e3ff2e5ac6b1" } ] } ], - "ID": "c1c69dc3-d44a-4dc9-95d9-8b3513c57bdd" + "ID": "9ca168e9-434d-4816-b07a-db2f99c8eda4" }, { "Condition": { @@ -1504,7 +1510,7 @@ ] } ], - "ID": "8f000592-f625-466c-b861-e73886c0cc70" + "ID": "78c702e4-17b3-46cb-9df2-6201d07fcbea" }, { "Condition": { @@ -1538,7 +1544,7 @@ ] } ], - "ID": "078c9b52-91e7-4bc2-aeb3-af3ccc110b2c" + "ID": "0ec363d5-1c39-4827-b9d6-13b8b0f0accf" }, { "Condition": { @@ -1574,7 +1580,7 @@ ] } ], - "ID": "8079a29e-116f-40e9-b68c-6c198bb23d43" + "ID": "5299acb3-0b86-4182-be1d-de7e5529e738" }, { "Condition": { @@ -1609,17 +1615,17 @@ ] } ], - "ID": "9e351bc0-1c6c-4441-80e0-e8cbc0df1565" + "ID": "ad9f0b45-1bb7-4610-ad90-8703453026cc" } ] } ], - "ID": "559e9932-68b5-445e-ac44-5c64c8720a39" + "ID": "5a862a41-5f28-46d5-b706-f945c2c9537a" } ] } ], - "ID": "dcc5c42c-ad9a-4cee-a1a1-55f01cd0d54a" + "ID": "c6d9c53d-6bae-468b-a2e2-3c4dc2a77170" } ] } @@ -1632,7 +1638,7 @@ } } ], - "ID": "b872c3b4-f57b-4e66-a709-8255956df1c8" + "ID": "c746a8ff-4fa3-464a-b059-009f9696a5e9" }, { "Condition": { @@ -1739,7 +1745,7 @@ "IsOpenInNewTab": true } ], - "ID": "8ea4a68c-e8b1-464a-9fc0-5e8ad007a4fa" + "ID": "c019a1a8-68f8-46b3-8ea4-830de80b54eb" }, { "CommandList": [ @@ -1760,12 +1766,12 @@ ] } ], - "ID": "562bef72-080b-4945-9e9e-180c03754f95" + "ID": "c0bec0ed-ed48-4922-a94f-780808614905" } ] } ], - "ID": "9c0f1668-30b1-42ec-8b18-5f84493b308e" + "ID": "b22f5309-1cec-4057-8594-8809d7ea282e" }, { "Condition": { @@ -1815,7 +1821,7 @@ ] } ], - "ID": "5e52c18d-18fb-4967-a00a-e16beacfd102" + "ID": "bc91cbce-7679-4a73-9642-b32f114a7bd9" }, { "Condition": { @@ -1849,7 +1855,7 @@ ] } ], - "ID": "120c56d2-dd7e-4e09-857f-1ad48d51797b" + "ID": "a29608aa-5d05-4b3f-b87b-0b8492831c73" }, { "Condition": { @@ -1885,7 +1891,7 @@ ] } ], - "ID": "0a4aee24-2cf7-445a-ad0d-ae117d283361" + "ID": "67018e7c-8051-4e0b-ad5c-7e945938cd1e" }, { "Condition": { @@ -1920,17 +1926,17 @@ ] } ], - "ID": "aa6ce687-1e6a-4ee9-b8da-6c1535fe60f0" + "ID": "3d820f38-555c-4d52-8e20-72518b81ee43" } ] } ], - "ID": "d665aa92-9b4b-4783-af5c-30ed32e8b226" + "ID": "7e8de023-627d-4346-b31e-76a40b476d86" } ] } ], - "ID": "1a7b77ff-7cf0-4e66-968a-b82c75fa68f5" + "ID": "9dc7d8f3-c0c1-40c9-9322-e1ed133ed73c" } ] } @@ -1943,7 +1949,7 @@ } } ], - "ID": "39d1962c-2c87-4df4-ad63-74381ed9508c" + "ID": "81709277-70e2-49f0-93d6-5bc8333b2577" }, { "Condition": { @@ -2050,7 +2056,7 @@ "IsOpenInNewTab": true } ], - "ID": "ef75397b-c7c8-45e8-93dc-fc1aa0e8a7d2" + "ID": "1302c230-aa4f-4752-80c4-6dc7aeeab404" }, { "CommandList": [ @@ -2071,12 +2077,12 @@ ] } ], - "ID": "07b2952c-0ef6-4180-a8ec-668e4830f78c" + "ID": "7f513aa3-fe1a-4ffb-906f-8c647a6cc4c9" } ] } ], - "ID": "c83d6be7-1d86-461e-a47c-0ea24e002cf1" + "ID": "97e96e68-2921-476b-be4a-2ea9f91a2b62" }, { "Condition": { @@ -2126,7 +2132,7 @@ ] } ], - "ID": "2987599c-1a62-48f8-98a2-30a63773777c" + "ID": "ef0d6469-24b5-4404-9472-a5f73df7b9d0" }, { "Condition": { @@ -2160,7 +2166,7 @@ ] } ], - "ID": "f262ec65-d97e-4b88-8b4f-88e88882fe0e" + "ID": "a2b68f85-5041-4c71-abf2-5aa5129c67cd" }, { "Condition": { @@ -2196,7 +2202,7 @@ ] } ], - "ID": "9dbb0b51-1d19-44e6-aeeb-8cb4c0bdbbcd" + "ID": "79e93654-eb65-4d2b-b23e-c186ad203bb9" }, { "Condition": { @@ -2231,17 +2237,17 @@ ] } ], - "ID": "bcbfc997-c61e-4634-90e7-5faf76b50b67" + "ID": "8a591381-900b-4d42-8908-6ffec8ce94cd" } ] } ], - "ID": "1522a625-2446-4a25-afa9-ccb0a1856dec" + "ID": "cb8cd067-408c-4ce0-bfd6-139727f35b02" } ] } ], - "ID": "c7a69d25-c563-4898-bc27-be650acbb173" + "ID": "772194d0-f445-4c3f-9589-9876b5283aab" } ] } @@ -2254,12 +2260,12 @@ } } ], - "ID": "4a8e727d-d5cb-4ea7-b29f-7ae63184e4f7" + "ID": "a03a295d-f69f-4422-96c6-a7e83510a77f" } ] } ], - "ID": "1ad01403-69a6-44cb-85d4-77c9065efa06" + "ID": "525623cf-759e-4811-a6f4-265bdcdf270a" }, { "Condition": { @@ -2342,12 +2348,12 @@ } } ], - "ID": "381f5ae0-1eb7-4143-a06f-36de946f6fc7" + "ID": "604f2bde-53cb-4867-8464-82f9dd5f6910" } ] } ], - "ID": "fddf6319-6eb2-4cdb-81c2-6c235049e6e8" + "ID": "7aca5d8f-a3e1-4ec4-8069-7b64eef0b668" } ] } @@ -2392,7 +2398,7 @@ ] } ], - "ID": "bd5f32ee-d371-4f1f-a7c8-a7cb3b769db3" + "ID": "78f019d9-c9c0-43ba-b537-8286d2420ef0" } ] } @@ -2465,4 +2471,4 @@ "Formula": "FGC_母版页!$C$7" } ] -}//aoDWArNZRxYAk/unSI7W6xxFB/PL2IgA/3DaL6qLsdQQLvWGeKmbZUINw4XO4+9pNQjgkiLbr6nNMccIZ7OTE7AAeEQOE5p9GPNLPd5i6Haft9YIhNgj1wFOAZO7J8G90s/mc7KbLDswZ6VcYkbQk806+FxXQD6ayh6mLz0umfdnmoPdlshsxMSt7Phr87q7vtugNaIZRry5g6a7HdOgrEKl9IwVf1Q2RDIMNG++UeCGxNk/bp1wcxVApf1Vh6kvC5lIrYkucwSVmWb1J+LPkwVo7p7xxC8TQcEGLOXE5vgEpl/pB0Vz/v0wwnoKg3+yFggmWxXsW0/M6mIdaovp4pAvo3aw+D4xuIdJV7fHOp64hAGAwAy6EssMaG3Y6e4pMd36MadBUG8EP/F/qaLJ4Zd7Aps/ycCw4sauDp5PrWuPiRxjwmyAcDEKgGR226nTfs8SY265BZ6DpNxzOn4Iu043ilpTzqNnysu3PFD3vmIv3yx/b3lof2jxVCLwEuKhtIa8rBukAakz+7e+qRpyIqIPJBoj+pKjezRDkFyLM8mS1bNf/MB+hdslnoQXJ6uItybR6fyfr9LNKTu1MrMc5bX00gnbld8r1DkgXYeIW1yyOiPALE1jLtjQfTtK/NmqzxzebnfMjHt3ORSfc00u5szTlytPRPfcdL/tOqxs0UuNtRrycBcDILEsK1vI+JOSiQAnhpp8m46sO8aKZiqZo2rbMFfQ0m70by3TDxujemK66wQYGVCf4sHddufApvgBXbwFLutQVkR9ec881pWAdrq83QvTKOiN2q2Aq6SXbveYhLZIwFbszAdL8epLDAjYomjbf7dty9wxHlF8vzFzcT0RYTf4lMgxQJaXUwCNlL97HWhVcGXqi2nFWGsIr1xlnuTEzDPEBMXA3nNsFvHkbg==|920 \ No newline at end of file +}//HyGLE4SOq4+rAXINL/9lYNFMBZe8oOC3CIRsVkT1NN72bZLEbKKWa1dryYR0MrYuwqzJAgz5rpmV0bAi88XgibFrm7vpW0m628JiZl+NvDMI7dVFhWkxBFyCOHpGnl9zvJpIcV+cQ2p5L1cQyurbhN/vymiaYK9Xu2j3Jg/qlp1kX61wkNrYtjgZ5zCl+dcT5QWcYQXZQDK6OpGYAR5Z3RuhBGWep8EqnCFb6NlWRvIAmgBFzSH5RM6bSYPkK8bsCZbmU/Kxglie1JFIUNA5DKznvZQ8KVUZMzkAgwBtq2kt6lhrK3iNBbdve2lrwdJV5aqK9HXqaFsyCNyxhz5YK4GoO/UmNEn0o9Nvmc1yTjB3pCiQyjCF/QOcDNRs/T5aXEUNd2W+jjLXiMjWYIcGoUTDkjMlDNbPTmMuKvv8KxY/YPkMtzCAHyXjFxRmmMlSUb0k5FKlstd4x5Vbf0s0rdpji3Eput6p1nwEHocZNZrQMSxUmHZIXzsA6EeTNh4aUW3I3FNKT5pHt47bLsFR0gmiUhX2VB/DECOU9BkS+AXB37c9+aNQ5h6AjJHIAxxUayNImdV6A6UCyNqY429NIn8wljegMCIAk6u787WmC02trq2j6WoEU6kKF2YAF6didLL1ct4oW9uK+2aTCRvLMmz8F4tnRZJl3+m/Z67HJiHzTIrEtA3P+qnBu3UnWX+MN21Ohc7SfonUUdmlb0X3NsAN+RpHv54vGwCV5Do6G4dHGho9SK5WZ1U7HGXnrJZTYPnZI6EqAnpop+piK+fSHnhk9R9+sj987BdboLqKumyfn2tvgRtGHlofN2OwvAZO3EAduNaESq/Qg5RsbBggfZgHilDaFBQNeF5ncsq9Nl3CCmWVpa+ME61v3LEpNfuHWtKVvcmCTE21WxMgDUhwVg==|920 \ No newline at end of file diff --git a/Pages/客户/客户基本信息.json b/Pages/客户/客户基本信息.json index 9f1d8a62..edc6e9bf 100644 --- a/Pages/客户/客户基本信息.json +++ b/Pages/客户/客户基本信息.json @@ -236,6 +236,9 @@ "13,1": "客户经理" }, "AttachInfos": { + "1,1": { + "CssName": "required" + }, "2,1": { "BindingInfo": { "TableName": "客户表", @@ -368,6 +371,9 @@ "resize": "none" } }, + "13,1": { + "CssName": "required" + }, "14,1": { "BindingInfo": { "TableName": "客户表", @@ -632,4 +638,4 @@ "PaperSize": {}, "Margin": {} } -}//gfJ1z1DqKccvGmfAGNoIgQLm6rXk9Z4cYgfjl1lD86/WrYy0iQR7dSFhkaJsysqrAiyHtf94aPGRxY5NLMhX7HBmAcWYP2Qe2I3KJpH81bAxxO84H2qljeEi9xfUZ9wTcldKnpu/hJPDMUE+0KvsgAjM7aRa76C3z+fR30azCf2YlYo7TEQmrvuxzWMeUcQPHm+x2B1UNxR67oLbaMdIMLsOmpMFLK1ZoZIKbvPHUy3jmR9f7WibbTBgu09JoFx3LYBrChYfDp3RE2kjS+h4JCiYyiYIHIR2jgnQlfowOlgcsI1sVuCXPVWCN0Vire3BCy+ywqyT3kmV2wOg6zOj1qlvvMJCoGM3lMThYFygQF32vuSSqkS/flOEp5pB2/PUkBEx+A4iAMBSbdXygJ0xrLu6jhRETWdWg60itF8JouUH2LY1m0CtrfKsnHrmgmODZ5bdjZrzz/jkIz+3azfDk1LbVdNa1lCGoou/8UETJRU05+8qvToWG+C0vWR1e5c13Ppgrsbie1cWealat6WxKczDY5W2iaU7q+jVb3QazOt77Y6aTJgidx9NP2XQkTOhBwf3G0rFlJo8jobl+DKpk1mqDYi+CJDZl7rjbkq/8KRVJukKXGoGzTZj6ykJlHVxP8zB9WN96NLP/uCEQlPU6er7cWkP6pc1WCCXyrOAUNcBN/GolU0rbcXZeDFpJuTegkpq6StCEW6R1pV+7rCidAx+88YsZ2suVpviworqVHkNlLGdF7IsRj5oMU9SnIYjT8x2RLdtlZSGxmgNaUOVHwfm2d3Y306HY2SWhVVffGO5DAj9Rqy7Z/OofxBCPmwwO8x1ST1clpjTF7Wq6BJR5mJ1f2a9/YaMTJz74pSb/JhwLkclARsfWt65KsLT4HRxjaIW1ZT6IODHN6m2StiB8A==|920 \ No newline at end of file +}//se+bUNkh7zvJS+3DEQZYWlrtxW+OMyEuhMBj9XpW0Swll9D5YPIBB/HAFXY68IN5Q47p3W7Gd7y2+J3gih3C1wTF4H4cDvL4FmaH/LY8OZRgHYlgqpolL8NPZHG+oYnTZ5kQUnJijpKXQf5WD3EVOOIBxwPwXGe2G/gQx8wLlp1MAVEm6tDUUsJsedhOeyXmLJXU900vJuIL21rHn2+51CS2gPznpuaZZ7NaCQeXyiicu/Si1GbWQV2EYOsVJ5+ZPdkO/Ep2k4syz3iH4Gwox7qvYjgjT31x6mQkM+st8f/89nU7VjqEgTyAQpWwsbc8X//KF/oIy3iSrN8FS83KiMpd9CzkSLHCEewFaS3DVCSKMGzt5SdIs36nFI5S6cnilcTcBYiRAkW+HGeEmR8n5pdTINtJXBrSedDbk1+amsl/A6VOxplF6w0TY9sj2PXfr442XOkbOaXmZovb2uzSrr8da7Y7d7I15m6bm3RdbMITURfZ+mPA035CihojGc6uG3IGH+UgXnY1/BKO4fncp8+6HJOW6ExU9LZ0Q4bmVocuiLalJw7XGzBVQQTCwRBTt2L/J4sUmvuqHeQAXFjT7O16Dh14OcGjQnxlS1VES5BUbEdDpt6YkMzd+Plkw9OA9y4/OPuFmzb42dSh8mEK0JTAQZKZ1OIEfRCFhh31QMZH++d00viUu0+BgvLxKUFrQ3K+FhZ4ejcov/fhHjHa3UCJb/tCae0F6i/9KzYuZaYsiE/ps4HevBzwb5ys9L5PsD/Fq0vP2WOLifNkIPVDO/CHG1I2VY+GtjZD2P2BIkl/nCRCFGy5lGjjxQEfQgY6+jxOcmNpyt+EfmiuE+/JllryaZEkCOVRRxqrAYZD4U13m7w7tq4Wn56WB5y/fHkJl35DvhPw451rg2b296iKMg==|920 \ No newline at end of file diff --git a/Pages/项目/项目流程页面/项目审批.json b/Pages/项目/项目流程页面/项目审批.json index ac8dfc81..bdc04a77 100644 --- a/Pages/项目/项目流程页面/项目审批.json +++ b/Pages/项目/项目流程页面/项目审批.json @@ -339,7 +339,8 @@ "Formulas": { "1,33": "IF(C23,H23,G23)", "10,16": "IFERROR(ODATA(\"客户部门表?$select=ID&$filter=客户ID eq \"&IF(ISBLANK(F11),\"null\",F11)&\"&$top=1\"),\"\")", - "14,27": "DATEDIF(F15,Q15,\"d\")" + "14,27": "DATEDIF(F15,Q15,\"d\")", + "10,27": "IFERROR(ODATA(\"客户部门表?$select=联系人&$filter=ID eq \"&IF(ISBLANK(Q11),\"null\",Q11)),\"\")" }, "AttachInfos": { "0,35": { @@ -532,12 +533,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "dca3d09b-3dda-4aef-bcea-6fe080536ee0" + "ID": "d46f83ae-c3cc-4ad8-8ad2-2c457b7eca8d" } ] } ], - "ID": "31d06bfa-8d06-44f8-a965-bf1e5fd3e6ef" + "ID": "e2ef4fc7-7f9c-40cb-9224-e4863ba5483f" }, { "Condition": { @@ -563,7 +564,7 @@ "MethodName": "Refresh" } ], - "ID": "d39d1bc8-b7c5-45e8-b310-7e5dec43412c" + "ID": "40a6e209-1733-4dc6-a621-8493c54e2369" } ] } @@ -672,6 +673,9 @@ "resize": "none" } }, + "6,1": { + "CssName": "required" + }, "6,5": { "BindingInfo": { "TableName": "项目表", @@ -766,6 +770,9 @@ "IgnoreBlank": false } }, + "6,12": { + "CssName": "required" + }, "6,16": { "BindingInfo": { "TableName": "项目表", @@ -860,6 +867,9 @@ "IgnoreBlank": false } }, + "6,23": { + "CssName": "required" + }, "6,27": { "BindingInfo": { "TableName": "项目表", @@ -954,12 +964,16 @@ "IgnoreBlank": false } }, + "8,1": { + "CssName": "required" + }, "8,5": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目分组", "GUID": "05f5a4b7-7839-4add-ad5b-569113f4efad" }, + "CssName": "", "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -1034,12 +1048,16 @@ "noMatchText": "无匹配数据" } }, + "8,12": { + "CssName": "required" + }, "8,16": { "BindingInfo": { "TableName": "项目表", "ColumnName": "公开", "GUID": "3809b5d8-8022-437d-987f-b91a6bf85c71" }, + "CssName": "", "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", "CommandList": [], @@ -1080,18 +1098,25 @@ "IgnoreBlank": false } }, + "8,23": { + "CssName": "required" + }, "8,27": { "BindingInfo": { "TableName": "项目表", "ColumnName": "严格模式", "GUID": "101cbd01-a027-4dc4-8a00-feb8af902243" }, + "CssName": "", "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": " 成本严格模式", "Style": 2 } }, + "10,1": { + "CssName": "required" + }, "10,5": { "BindingInfo": { "TableName": "项目表", @@ -1175,6 +1200,9 @@ "IgnoreBlank": false } }, + "10,12": { + "CssName": "required" + }, "10,16": { "BindingInfo": { "TableName": "项目表", @@ -1310,6 +1338,9 @@ "IsDisabled": true } }, + "12,1": { + "CssName": "required" + }, "12,5": { "BindingInfo": { "TableName": "项目表", @@ -1339,6 +1370,9 @@ "controls": false } }, + "12,12": { + "CssName": "required" + }, "12,16": { "BindingInfo": { "TableName": "项目表", @@ -1369,6 +1403,9 @@ "controlsPosition": true } }, + "12,23": { + "CssName": "required" + }, "12,27": { "BindingInfo": { "TableName": "项目表", @@ -2246,4 +2283,4 @@ "Formula": "项目审批!$I$23" } ] -}//P2pH6iSDaKfYQc5l4cE5IU0+0MUBt28/OZjOmb8WhGxuBKg7zqxrJrn4czVTmSbUVFHgBPqskjGacdxCrA5J9/U2ittzMZVbrbQ6W7rb7oy0VWjMc54GCXp7pGNy+EWhN4kTUpITFo3nq4WU+5GBiz1pCyBgbAB/vf/9gDDfdNnqoqHw++M+DVMW6y9JC6E1no0Eq8dRUrft3aCOoQHOJNLElRHrt6xMmQBUaNfLQhgNWqYyMzgyWLV/zLNVyQgKrZY2dknuxrTc3Uj+ti423cQeJoT/J9m/InROE1RLDWXswy0lO3OZtIKXKtVhVUKs3RjbXA0OKU1k6EOPKoUMb8VC9QwNLNMO9D2OYwJshrzDEYOVi7axsc9fW6gJu9AmsMnQUOTC8ii90ISpyWknPwXvNndywKNwRm/IVCZWN4tKsY3fqvIWjtqhOIWwS7gdC00Mkp4jGMPEKJQ0CIjX0N4PEuKqWYpQVzriqqrsnehqRGaNk5PmP+1AIznPuzWRoAi2jQGn59Z2My0U/JKK7joT/KiaspHyYoLJEdEQJbKXYvrHIXwPkdVyJTQgdWiTAoGB3TOpINPTITIWlhMtkDSpkSvrbWyq84Rf8frttNh2yPi4T/orBSFRd5RSpv5F/NJxC/vsdrqXdX8q5YUGqMFxLdmNTH9p6ObzsEkMFqZIo0zutp/rkBr3T3GIHpMUPJ8sPQn869R5wal5xq+jSTmX69Z6WdhYGhSg+xazP6KrJCK5oZtz8KT1fgaaDFp1iZHWsx+Nmcix05qDQL8RCmpiNdFuevI9cVDtgxbHBBRrcyinZCE1XoA4MFAD9S5Z7wERp5NLwlwW/9jbn5SqLFSJgJVJltMziqOHJFUhn/MqM5fbTNzYhVuZ7M2E737Ul92VKpeMAMKZ6yymZ7yqog==|920 \ No newline at end of file +}//1fqiFLO8uhhfqmITxUA99Me7Jn4cOgG2xJIgFNr1HRSIwvdU8BHiA9l6GlJqL8fbLmiGU73+OGX3dxlm4ylPH2RPnUMTdUhYM3ATRcyY9L+UStrPgXICTwt6NfeYcwu7NfwQwLE4Q/WWm33YmCtqfBJ8GAVWYoHsqCAv0dsL4kydxfKkovfx39ojJB6SLq5D2OIwNaBGhcDkW7sPhRqqAmxUsZ/0U0vkIiVPiyUsaRp0TyIRKk5NTpMYarmqCcxNSQgknqU/20M+6a3ZUWunkhGSVI1Nssz1IRol2UrFEctSFn41eURHJH8OgRrO/0TiujgxCNx9k6lID88v42Sm8L6AIZ/DY7yxGSU6M4U4eOQrbxqDJEx+84aLouFL4EPcKn7BpHRTBFtgGdrRk2iMjQ745pX/CPkmdBP5TPdPdDm3pzJ1MjEHz4gbtrp/wHyjeZ9fw1UtIH+JLpGu23c9Hg7wkcejR5XA6k7kYRJw23Z0+YrNxC2NiGtQVTBfFLLd4CahsnD7Ykzf0NMfBp001XtGoUr9XK1/28vrztQjD/8Ued51fRQhCjV3rG/hp6NedTVatdqI2GhrmS3cG+wgtaV2e7PTc3s9IGUSCxQQp4Cv7jQKqa+EpmsyYcqLT1LS5YBVu6ID/jXOTTS5kDIrrBHY4xNYE3vcjkEgypQLyIxia32BtKZZAGKZSIuSsgrGycN858hOKjLs3d5kbRc1fhmm1LtDhLuzRKFf4wqia2uupAGM9oX6xnrzzO8zyWYT30qTIAPd22KidB/yeK2yyp5RxfLzt5R6e82GSLSILJBcZYBcx6ll7nr74VV3pUHJhYL00ojbPTmGh/2jt4rkMp7XLwKXlWyI5UTyO62RS46UeBSKPvvPAbUMzB3pgktD1PN5vUupjK+pZvnKob1qZQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目流程页面/项目审批.rd b/Pages/项目/项目流程页面/项目审批.rd index 9ed6815f..df97f3bd 100644 --- a/Pages/项目/项目流程页面/项目审批.rd +++ b/Pages/项目/项目流程页面/项目审批.rd @@ -5,7 +5,8 @@ "Formulas": { "1,33": "IF(C23,H23,G23)", "10,16": "IFERROR(ODATA(\"客户部门表?$select=ID&$filter=客户ID eq \"&IF(ISBLANK(F11),\"null\",F11)&\"&$top=1\"),\"\")", - "14,27": "DATEDIF(F15,Q15,\"d\")" + "14,27": "DATEDIF(F15,Q15,\"d\")", + "10,27": "IFERROR(ODATA(\"客户部门表?$select=联系人&$filter=ID eq \"&IF(ISBLANK(Q11),\"null\",Q11)),\"\")" }, "CustomNames": [ { diff --git a/Pages/项目/项目首页/项目配置/项目信息.json b/Pages/项目/项目首页/项目配置/项目信息.json index 074e56ba..271857fe 100644 --- a/Pages/项目/项目首页/项目配置/项目信息.json +++ b/Pages/项目/项目首页/项目配置/项目信息.json @@ -368,7 +368,7 @@ "BtnText": "知道了" } ], - "ID": "4b0d8b4e-ddfd-49ab-94ea-f41c6b65107c" + "ID": "7a929d6b-c730-4b18-8705-d4ced127418f" }, { "CommandList": [ @@ -608,7 +608,7 @@ "ReloadData": true } ], - "ID": "6d1167c4-e2fe-456a-bddf-7d01d4a355c0" + "ID": "9d626b83-95a4-420e-995a-351fa4443146" }, { "CommandList": [ @@ -623,12 +623,12 @@ "BtnText": "知道了" } ], - "ID": "cf9753e2-f7dd-4048-8a57-49f6710400f7" + "ID": "28d2c12e-9e58-4ed3-b554-0e5f83cd0df8" } ] } ], - "ID": "d27489a1-4056-4571-95b2-6a552feaddb9" + "ID": "359dd832-bd28-434c-9f8e-ab64bd6693ee" } ] } @@ -637,6 +637,12 @@ "TemplateKey": "_RS_Main1" } }, + "3,6": { + "CssName": "required" + }, + "3,16": { + "CssName": "required" + }, "4,1": { "BindingInfo": { "TableName": "项目表", @@ -734,7 +740,8 @@ "DataValidationInfo": { "NumberType": 6, "CompareParamType": 5, - "FirstParamValue": "12" + "FirstParamValue": "12", + "IgnoreBlank": false }, "RulesGuidList": [ "cfda52e4-b004-454a-9650-2ee428efb4a1" @@ -818,7 +825,7 @@ "CommandList": [ { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "生成项目封面", + "ServerCommandName": "从页面生成项目封面", "Parameters": [ { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", @@ -836,7 +843,6 @@ "SerializeProperty": "msg" }, "RequestAsync": true, - "RefreshAfterFinish": true, "CheckDataValidation": false }, { @@ -844,7 +850,7 @@ "Message": "图片生成耗时较久,将在后台生成,请稍后查看!" } ], - "ID": "914fb805-ea36-4e93-8ac3-df7e0057a950" + "ID": "a3b83967-f593-47fd-a11a-89e26dc991c7" }, { "CommandList": [ @@ -854,7 +860,7 @@ "Message": "请填写项目名称和项目简介" } ], - "ID": "62293548-bf59-404f-8922-3c3cfddcdcca" + "ID": "2269f65a-e982-4926-9e0e-8c786fc3679c" } ] } @@ -981,6 +987,9 @@ "IsDisabled": true } }, + "14,1": { + "CssName": "required" + }, "14,12": { "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", @@ -1016,7 +1025,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "48fee825-4d42-48d1-9757-a222b8833efd" + "ID": "d9c9d353-0370-44c6-b1cd-aa6bc17aa5a1" } ] } @@ -1034,6 +1043,9 @@ "TemplateKey": "_RS_Main" } }, + "14,15": { + "CssName": "required" + }, "15,1": { "BindingInfo": { "TableName": "项目表", @@ -1221,7 +1233,7 @@ ] } ], - "ID": "e5d176e1-0d65-489b-b02e-1e993f92f4df" + "ID": "a56342b3-8612-42b1-9bb5-f09de867406e" } ] } @@ -1314,6 +1326,15 @@ "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, + "17,1": { + "CssName": "required" + }, + "17,8": { + "CssName": "required" + }, + "17,15": { + "CssName": "required" + }, "18,1": { "BindingInfo": { "TableName": "项目表", @@ -1602,6 +1623,9 @@ "48a495d0-ed7c-4527-8f9b-c98c9da0eddb" ] }, + "20,1": { + "CssName": "required" + }, "20,12": { "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", @@ -1633,6 +1657,9 @@ "TemplateKey": "_RS_Main" } }, + "20,15": { + "CssName": "required" + }, "21,1": { "BindingInfo": { "TableName": "项目表", @@ -1845,6 +1872,9 @@ "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, + "23,15": { + "CssName": "required" + }, "23,17": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", @@ -1970,6 +2000,9 @@ "cfda52e4-b004-454a-9650-2ee428efb4a1" ] }, + "26,1": { + "CssName": "required" + }, "27,1": { "BindingInfo": { "TableName": "项目表", @@ -2830,4 +2863,4 @@ "Formula": "项目信息!$B$19" } ] -}//w+oMfGAFLEBb4zAMiv5tt7mKSFxf5hNBZTLIQG3GLjRB1fh4EDeQe0astGWbzo6kqEvVWa+qoI9hNbZOigKWmq+fJLmf1TBpbEH8vgJJhSSuEZDKh8jiPjHEW962gXY+WIT1Uo1AI5IWO5wvgHezGCIkgQE6+IG/hc1VQ+HR68UuoBOTaFZkCn94ZeUy91PRWpfQoXtncTccwaeewugpvuElX+ym4tfhc6lfI8O7ufQcP4D6FfOk3/Nl13cdhvzt/a3h/x3RGqhCdR8jQcShacKEP1tb2SeyDHO09os3VqKbUJt5rJUPBX9AX6hiOPTD0spHg4bP4KdlkajiNwPo+7qsRft3MOj3xZRT+qsAx1V8glj+6QdsVeqD1T8yPj1UqLTbOhV7GBnYvc4xGmM7sxLx3pZ6DJhkysRwDgUdI8d4skoMma2kSvuF0yMC2hCP+zEapVIzui62Udn9ySpAFuJ64Z3IjZoqWMDsiiD5rrSM9QFcSLHKIJUUMuXMzqq48edqPJfgT+QJ2yB0hyMSlRl0vzKdnfGfGnDv/qKrZGjETNrICMQJFHrbKy6hUqpJxHwy2JRLUVyOEShVsYNYbsLKQTrfGcJ9nTpkcwVGySp4SgzDj5f687QBLM5N+jqZ3or8LP6MmWbAthlFwbPZ2K92CMm0pOUfEoZLCinxeiuJFUEKCOf8cCUbsMKl9o+fDDMFC+39raMDxFUw96ptCgsinVMc/PvfYt/swLf64P4ZAkbqHX3ImLcq4Li3SDDGHv6iGXCk1X6aIzLm2Q+ubaUJ0jVk8T5PURk7IR5hO22gUNNMXAnVQqFGJHlE1sB2NaQ3iGEAbeazMhNsrwHjCrnM1MdbuwE309hUkQwMMDVRFMsycy6gGoRyopDJXMP5BTbszsb3xpMXYIg7hBGqKg==|920 \ No newline at end of file +}//EBCRLhLIPPrKbGlJLb7UU2QSofG8GkJjpB0w2IJKnXxd/sx0qBKL7ZQ57momxkmhvh1p98rg4iFaVEMi9yMi6LDwnu0sNOc1M5/MLZcN+UtyGE4EZjyx+JnpdG19E9DyZ4BG16qVSY57kxztlAyUfoL6yW8NufNPtYi6DL5Vr68zBo4xbboM8iKw265pcro17Wn6aeBAqNU4Q3DA6bWMkppl54I3fgqszFUbl27ZAfogTt3kY6JgHXdx3e3wLmVokFikLwTufkHgfk3DTpPY4j5N8JlE2wdcMjruvPMVMBjvueDaY2BeTvX/R6BupGVh/+ZhCaNXRmFVlrVMcr35l3EyBiDXhDNrQyl4JRDBbHyssXwT0BgVMBBhJDnqsqpr0D+B2I9FFb7P4e6Y06x2dBAaA50df2RX06d3fLV3GdthqD4kp4xw+Ybh8BT713r49AKbIlLs6eJQKPDe1nk+KVfbttS5PpA+xBoq+YUPFpgGBpE2sbWoJ5QLt8cHQpLa1CUfVvCm6JfwrAwNyYCqZUscIl7A52SK2bIecj20cTzm9hW6vmoRbqdOQofcnLU3Rma+bDJrFsPUmbL6QV3X9Grmg4P6oOFbprM7veaBGNwPdWZO66/G599IkiveOfj7Nxip6quegOYa64qo0egNsSv/HJDU3NwTZXyXR79xfEyqtIcPWB751l10tLdnPs58TEivcTsHjOpQl0EsHSGvxWz0dK5d6xA+zh1Ijcf94JF8w4nKQIadU87Jo+bug9CMbuVrcWLwJKR8XcbRHh6NF0sigddw6uglGAttEK4oWo8KE2feUUt9wJXZASEEJ7GVjSpoAbW0oJaeHVGz3+Weg5nHH7C5k8hGbtZZhHwMp3pDWMMpWINOmZzEMgpEp2UXFnrpwuto49CTk9ZpfNHqfg==|920 \ No newline at end of file diff --git a/SchedulerTasks/项目表新增事件.json b/SchedulerTasks/项目表新增事件.json index b79ea702..222ce39f 100644 --- a/SchedulerTasks/项目表新增事件.json +++ b/SchedulerTasks/项目表新增事件.json @@ -37,6 +37,31 @@ "RefreshAfterFinish": true, "CheckDataValidation": true }, + { + "$type": "AsycCommandList.AsycCommandListServerCommand, AsycCommandList", + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "生成项目封面", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=主键.ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "当前用户" + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + } + ] + }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": { diff --git a/ServerCommands/AI/从页面生成项目封面.json b/ServerCommands/AI/从页面生成项目封面.json new file mode 100644 index 00000000..426eeb41 --- /dev/null +++ b/ServerCommands/AI/从页面生成项目封面.json @@ -0,0 +1,82 @@ +{ + "Name": "从页面生成项目封面", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "项目ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "当前用户", + "ParameterValue": "%CurrentUser%", + "ID": "be6b3c5342a54ca8a8fbfdad6d1488a3" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "生成项目封面", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "当前用户", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前用户" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=code" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=msg" + } + } + ] +} \ No newline at end of file diff --git a/ServerCommands/AI/生成项目封面.json b/ServerCommands/AI/生成项目封面.json index 51b5014f..0777bf4a 100644 --- a/ServerCommands/AI/生成项目封面.json +++ b/ServerCommands/AI/生成项目封面.json @@ -3,23 +3,7 @@ "Enabled": true, "Triggers": [ { - "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", - "Permission": { - "PermissionData": { - "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", - "permissionResource": { - "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" - }, - "permissionBindings": [ - { - "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", - "roleNames": [ - "FGC_LoginUser" - ] - } - ] - } - }, + "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon", "Parameters": [ { "Name": "项目ID", @@ -27,6 +11,10 @@ "IgnoreBlank": false }, "TestData": "13" + }, + { + "Name": "当前用户", + "DataValidationInfo": {} } ], "InvokeTriggerTestData": { @@ -40,12 +28,6 @@ "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", "TryCommandPart": { "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "当前用户", - "ParameterValue": "%CurrentUser%", - "ID": "b9907689a4444b30ab6f2863f9702dda" - }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "项目", @@ -54,7 +36,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "0c6372c7-35b2-4d8f-9a28-fddaf84330ec", + "GUID": "d7dd533a-f61e-493e-970b-c75065b89c4c", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目名称", @@ -63,7 +45,7 @@ "ColumnName": "项目名称" }, { - "GUID": "20c6bf15-496b-4ac0-822a-9c3df517f53c", + "GUID": "291e03d0-3fe3-4844-82dd-0269f040abac", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目简介", @@ -86,7 +68,7 @@ }, "TopCount": "1" }, - "ID": "e91db780eb764a39bb3c08fe95083c24" + "ID": "4258d9cad0ab46759a779ee7d5e19d41" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -201,6 +183,7 @@ "$type": "OPENAIFORGUNCY.Completions, OPENAIFORGUNCY", "URL": "https://openai.api2d.net", "APIKEY": "fk211858-C6yKrsealBkvHao04yT9Ypg6GR0NVPyh", + "ORGANIZATION": "", "IsDataSource": "json", "MessageJSON": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -320,39 +303,61 @@ "OutParamaterName": "参数对象" }, { - "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon", - "NotificationName": "提醒通知", - "SendType": 1, - "UserNames": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前用户" - }, - "Params": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "Name": "标题", - "Value": "任务完成" - }, - { - "Name": "内容", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"项目\"&项目.项目名称&\"的封面已经生成完毕,记得看看哦~\"" - } - }, - { - "Name": "类型", - "Value": "打开页面", - "Remark": "分为:打开页面、执行命令..." - }, - { - "Name": "参数对象", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参数对象" - } + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前用户" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon", + "NotificationName": "提醒通知", + "SendType": 1, + "UserNames": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前用户" + }, + "Params": [ + { + "Name": "标题", + "Value": "任务完成" + }, + { + "Name": "内容", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"项目\"&项目.项目名称&\"的封面已经生成完毕,记得看看哦~\"" + } + }, + { + "Name": "类型", + "Value": "打开页面", + "Remark": "分为:打开页面、执行命令..." + }, + { + "Name": "参数对象", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参数对象" + } + } + ], + "ID": "34a32d9791db4e28a98c3e124753d6d8" + } + ], + "ID": "0780d347-fe3b-449d-bb35-58fe4d4ffd66" } - ], - "ID": "2f75ccf37baf40af82ba7be5d052a5d6" + ] }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", @@ -365,7 +370,7 @@ ] } ], - "ID": "8313122a-ccd7-4205-a4c0-ccaa96b07fd9" + "ID": "d4280ccb-e4fe-42f7-b0c4-043474850622" }, { "CommandList": [ @@ -375,12 +380,12 @@ "Message": "项目资料不全,请在项目简介中尽量详细说明项目背景、使用场景、使用人群等。" } ], - "ID": "64bb754c-3f26-4d67-a73b-9c5e23c57a1b" + "ID": "4c8a6cd8-f7d1-494f-aa73-e675cec22fe9" } ] } ], - "ID": "dc5669cc-9c9a-4cb6-91cd-77e47f09e9c9" + "ID": "e0e0a881-a8ab-431b-91f3-563800e855ac" }, { "CommandList": [ @@ -390,7 +395,7 @@ "Message": "项目不存在" } ], - "ID": "1d51bd03-17f8-43f5-a9f2-b0de38ec89df" + "ID": "1dfedf1f-5e08-4bc5-b6d0-71eb7263d44e" } ] } @@ -466,39 +471,61 @@ "OutParamaterName": "参数对象" }, { - "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon", - "NotificationName": "提醒通知", - "SendType": 1, - "UserNames": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前用户" - }, - "Params": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "Name": "标题", - "Value": "生成项目图片失败" - }, - { - "Name": "内容", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ExceptionMessage" - } - }, - { - "Name": "类型", - "Value": "打开页面", - "Remark": "分为:打开页面、执行命令..." - }, - { - "Name": "参数对象", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参数对象" - } + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前用户" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon", + "NotificationName": "提醒通知", + "SendType": 1, + "UserNames": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前用户" + }, + "Params": [ + { + "Name": "标题", + "Value": "生成项目图片失败" + }, + { + "Name": "内容", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + }, + { + "Name": "类型", + "Value": "打开页面", + "Remark": "分为:打开页面、执行命令..." + }, + { + "Name": "参数对象", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参数对象" + } + } + ], + "ID": "36f09bdad8db44d69c390c4231083668" + } + ], + "ID": "ca8b0591-4ea0-40f5-b2b4-95a605c915c9" } - ], - "ID": "cfd62bd647df4e64ba3428d7f54370d9" + ] } ] } diff --git a/UserFile/BaseCss.css b/UserFile/BaseCss.css index 4f764c54..c63f46cb 100644 --- a/UserFile/BaseCss.css +++ b/UserFile/BaseCss.css @@ -1,3 +1,12 @@ +/* 标签必填 */ +.required label:before { + content: '*'; + color: #ff3b30; + left: -10px; + position: absolute; +} + +/* todo里的图标 */ .todo-img label { background: #ff0000; width: auto;