diff --git a/.collaboration b/.collaboration index e2d08f02..34b3fc99 100644 --- a/.collaboration +++ b/.collaboration @@ -9,47 +9,17 @@ }, { "ModuleName": "Table/FGC_订单记录", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:25:05.134542+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单记录.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_订单明细表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:25:05.1345554+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单明细表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_商品表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:25:05.134558+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_商品表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -206,137 +176,47 @@ }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:25:05.1345649+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:25:05.1345693+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户角色关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:25:05.1345711+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户角色关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:25:05.1345732+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织级别视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:25:05.134575+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织级别视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:25:05.134578+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色分类关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:25:05.1345798+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色分类关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色拥有权限视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:25:05.1345813+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色拥有权限视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:25:05.1345829+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -865,19 +745,7 @@ }, { "ModuleName": "PCPage/汇报详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:33:19.0974298+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报详情.json", - "Pages\\汇报\\汇报详情.rd", - "Pages\\484d3ed119274a60bf32f15d178cf60.json", - "Pages\\484d3ed119274a60bf32f15d178cf60.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报详情预览", @@ -1157,17 +1025,7 @@ }, { "ModuleName": "ApplicationSetting", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:27:36.4147641+08:00", - "ModuleType": 8, - "ToRemoveFiles": [ - "ApplicationSettings.json", - "favicon.ico" - ] + "ModuleType": 8 }, { "ModuleName": "Theme", @@ -1503,19 +1361,7 @@ }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-17T22:36:23.145749+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json", - "UserFile\\BaseCss.css", - "UserFile\\CustomFormula.js", - "UserFile\\echart.js" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", @@ -1527,19 +1373,7 @@ }, { "ModuleName": "Upload", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:25:05.1347445+08:00", - "ModuleType": 26, - "ToRemoveFiles": [ - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.png", - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.small.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.small.png" - ] + "ModuleType": 26 }, { "ModuleName": "PublishConfiguration", @@ -1547,39 +1381,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:38:38.1540606+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Echarts图表-10_0_1_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\Forguncy.PassListviewDataCommand.zip", - "Plugin\\JSON 序列化和反序列化-10_0_1_0.zip", - "Plugin\\JSON数据源-10_0_1_0.zip", - "Plugin\\Notiflix-9_0_103_0(1).zip", - "Plugin\\OPENAIFORGUNCY.zip", - "Plugin\\PC组件包-ElementPlus-10_0_1_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_1_0.zip", - "Plugin\\xTools快速开发工具包-9_0_4_0.zip", - "Plugin\\加载动画-10_0_1_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_1_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0(1).zip", - "Plugin\\支持预览的附件上传-10_0_1_0.zip", - "Plugin\\甘特图-10_0_1_0.zip", - "Plugin\\用户管理命令 V2-10_0_1_0.zip", - "Plugin\\表格报表-10_0_1_0.zip", - "Plugin\\设置当前行命令-10_0_1_0.zip", - "Plugin\\设置焦点命令-10_0_1_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -1625,19 +1427,6 @@ "ModuleName": "ServerCommands/汇报", "ModuleType": 20 }, - { - "ModuleName": "ServerCommand/AI自动编写汇报", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:00:39.5281847+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\AI自动编写汇报.json" - ] - }, { "ModuleName": "PCPage/项目版本管理", "ModuleType": 1 @@ -1652,17 +1441,7 @@ }, { "ModuleName": "Table/message_test", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:25:05.1345878+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\message_test.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -1671,69 +1450,22 @@ }, { "ModuleName": "PCPage/日报助手", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:00:30.1915325+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\日报助手.json", - "Pages\\汇报\\日报助手.rd" - ] - }, - { - "ModuleName": "ServerCommand/AI生成日报详情", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:00:30.191346+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\AI生成日报详情.json" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/AI内容转报工数据", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:00:30.1913631+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommand/AI报工数据转日报", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:33:19.0968175+08:00", "ModuleType": 15 }, { "ModuleName": "Image/gpt.svg", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:07:07.24882+08:00", "ModuleType": 38 }, { "ModuleName": "PCPage/确认小弹窗", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-18T17:13:23.6624857+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/ApplicationSettings.json b/ApplicationSettings.json index 1421ccd4..bd3d4a46 100644 --- a/ApplicationSettings.json +++ b/ApplicationSettings.json @@ -7,7 +7,7 @@ "GlobalProperties": [ { "Name": "全局配置", - "Value": "{\"AI提示词1\":\"我将发给你一个记录着某人一天工作内容的数据，为JSON字符串，请你尝试解读它，内容中的[汇报类型]分为`日报`和`计划`。\\n- 日报指的是昨日工作内容的总结；\\n- 计划指的是今日计划工作安排；\\n请你使用为我编写一篇简要的工作日报，对于日报结构和要求如下：\\n标题为固定格式：YYYY年MM年DD月-某某工作日报\\n内容包含两个主题：昨日工作总结、今日工作计划\\n每个主题下的内容从JSON中总结，可以适当润色，但不可过度偏离源数据中的工作内容,所用工时在内容后面用括号备注，如：(1h)；\"}" + "Value": "{\"AI提示词1\": \"我将发给你一个记录着某人一天工作内容的数据，为JSON字符串，请你尝试解读它，内容中的[汇报类型]分为`日报`和`计划`。\\n- 日报指的是昨日工作内容的总结；\\n- 计划指的是今日计划工作安排；\\n请你使用为我生成HTML格式的汇报内容，对于日报结构和要求如下：\\n标题为固定格式：YYYY年MM年DD月-某某工作日报\\n内容包含两个主题：昨日工作总结、今日工作计划\\n每个主题下的内容从JSON中总结，可以适当润色，但不可过度偏离源数据中的工作内容,所用工时在内容后面用括号备注，如：(1h)；\"}" } ], "WebSitePort": 26489, @@ -19,9 +19,6 @@ "StartPage": "项目列表", "StartDateFiscalYear": 1, "BaseOnStartingMonth": true, - "SuppressedWarningMessages": [ - "数据表, 有部分连接到外部数据库的数据表没有检查过连接状态，如果无法连接到数据库可能会导致数据无法在页面上显示。如需确认数据库的连接状态，请点击数据表右键菜单里的“刷新”" - ], "SyncUserInfoCacheForBuiltInView": false, "PageLoadingMode": 2, "MultipleLanguageSettings": { diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index 4b4eda36..88d3994b 100644 Binary files a/ForguncyDB.sqlite3 and b/ForguncyDB.sqlite3 differ diff --git a/Pages/484d3ed119274a60bf32f15d178cf60.json b/Pages/484d3ed119274a60bf32f15d178cf60.json index ae76f7d9..c349cf5f 100644 --- a/Pages/484d3ed119274a60bf32f15d178cf60.json +++ b/Pages/484d3ed119274a60bf32f15d178cf60.json @@ -208,9 +208,42 @@ "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.DeleteRecordCommand, ServerDesignerCommon", - "ShowConfirm": true, - "ConfirmText": "您确定要删除吗？" + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "提醒", + "Message": "确定删除该行记录吗？", + "Type": "warning", + "ConfirmButtonText": "确定", + "ShowCancelButton": true, + "CancelButtonText": "取消", + "ShowClose": false, + "DialogResult": "按钮结果", + "AdvancedSettings": {} + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=按钮结果" + } + ] + }, + "value": "confirm" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.DeleteRecordCommand, ServerDesignerCommon", + "ShowConfirm": false + } + ], + "ID": "df12acbb-b2ef-409a-8f3b-b4fe4ab5ed31" + } + ] } ], "ToolTip": "删除", @@ -814,9 +847,42 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.DeleteRecordCommand, ServerDesignerCommon", - "ShowConfirm": true, - "ConfirmText": "您确定要删除吗？" + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "提醒", + "Message": "确定删除该行记录吗？", + "Type": "warning", + "ConfirmButtonText": "确定", + "ShowCancelButton": true, + "CancelButtonText": "取消", + "ShowClose": false, + "DialogResult": "按钮结果", + "AdvancedSettings": {} + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='484d3ed119274a60bf32f15d178cf60'!按钮结果" + } + ] + }, + "value": "confirm" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.DeleteRecordCommand, ServerDesignerCommon", + "ShowConfirm": false + } + ], + "ID": "c387f35a-d701-41b6-8ca8-c0085dcbbdff" + } + ] } ], "Text": "删除此行", @@ -901,7 +967,7 @@ "MethodName": "ExecuteCommand" } ], - "ID": "72808d34-0d35-4b0c-844d-a126daef0126" + "ID": "0bd8e80d-a842-4d10-a4dd-22509ad7feea" }, { "CommandList": [ @@ -915,7 +981,7 @@ "MethodName": "ExecuteCommand" } ], - "ID": "2f6ef102-f11d-409c-813c-3b3c857c94d4" + "ID": "8824caac-3853-493d-9db1-2a856bea09b2" } ] } @@ -1083,7 +1149,8 @@ "14,16": 11, "14,17": 11, "14,18": 8, - "15,1": 12 + "15,1": 12, + "15,5": 12 }, "SheetStyle": { "FontFamily": 1 @@ -1131,4 +1198,4 @@ "PaperSize": {}, "Margin": {} } -}//VkyUTj+Jg8ZNCDDlVcRntGXgqPmJj5UOug2qxZS5vrfrfVwGC2IBeXmQo6uB0kT4RABZninu8IwFiFEj04snz0Xr1iQlMFAN/Bf4lqe1QW30+K2em1P/LSjNJhfhS6ZWO0SBpgDEw/mMjNpnBDytP/E7eRn2dnrxieifSc8IrJMo89EIrJivQyOP08+usEdXHEH1ES+LisgSz9CeRR3n6BpUnELXHuw/JHOGd02DBlGBh+w/DOgObD6hg/Ki7+10psx42vCByHrw74A1HXtzTAg/8rc64XOdmWUM0jqcnxa2nT6x26tF5H+jgZUvjL8t7yw6Oc3UVanA6o0tEcVSK1lE/Li40hhp+OGGJa7LukDBvyzLyktl/p0OQMOK1RNwF6V8sIN9S8S2/rhXdAJMBgLrLOBgCEVi/WYako4JU8MptQDp31iMPnfDn7chLz1k5HOfeD6wR3EnBtvP5k6vQkp3/P6CysL9m5+LbTfi0WZ7nYZOgPJeYs4rjNBQo8amVgUWzJU5SeRlRYZlYeCx/6GkwCZUYO1KYG8YfTCJmVUZ1vw0k1s6asahJ2kmeD7isNka5+PfrNlP9s9OIrzYENsT5V6k94iDAyq5S7YDhv79m39aP+4Q5vYXhPYWGuq4lvWYSQvzZ+mz1YbkpICAPdcq8B4xuqtz/3eTuH2kAQKlT21iFBrxr/J91WXgJsAFF09gyGCOGOWHUFn1BZl5CGoHb+vV/0HxzS2WFnLfvSh3zgTQFa8lJZD1SKYQy1El9MlL6qj57jWXVFdS8rJJGDPWdxJFh9KbpSEudajOmeW34X2ojPFPDtcTUb/jHb/FtkRgztvnM9GhAvbNh9hTvUS9S2+JSif1lRoYJcyzhKu3CpwgoIWbfgfdrDnqKDmFhznLSQrTIYKHldJt1wklPg==|920 \ No newline at end of file +}//aQUclE+ecgg9d6/OJ/K0nZ27FP1ypCufaKbVXlroMxZ9ECcgtA0YvRAyhr93thvLql9dhr8chbqBBqDl90b5+9yrkqoMD1Jc/c+zSp6Ima2cI1/Fbk+YjyZudvAftnv6iSAPlFAgrjAWh6eyQ7QCTWTtW617lsra1UiXN+cv86lbIKwpREiknOglz9mbMIJIkPTZukmnqH7zwuq1R9TWiudeWcXlsiJ/UiIB6lGd2e6gpv16zPxliNJ6jD0TMNzl0UZPugWIuqcojFILSZ/RioctUTImCFxgnlUlTaiiaxXRSoPmRY6LoOyODyaetLqhCwpeMYoI7SlHEHeD0GR7kv2caFbYC7haBFMmVgIG/CdSmb4s1q5t01XomECGc4frVIBaPGyY1TXWlveXmNs6ao5fWtD4/X8jEIig40HljxNqUTXqf7knO2FH8ySXNj/g7I8vTuePBKIeBxr4z7JrAHRVvpvSIzYbADb0yGE2Sl+u5wJUkcRTRuP4eCIm/Muta6Xl/ahGYsnvYUnNWULIWQorp8uML8EULrL4kBiigQqxj3n1C3N+3eI3sFop3azLDvgVBchtbYUtZ5GuxXMA5x9qzuCXhOXGETUfhkWbnMezJcP4VyHIw96u6Bi8ltT3pUUomFDa2Wk7TyFqkfgT2jnZAKnmPqvuHgD248MnRjJsWeS1sDJ/MyhLg970PsrupxpHSsrMdE82/WBpalEsavAN1RYh4ikr06mekuo6FcYgTqz64nUTZYNTBOfIVHBVQDPRvctKyqMiZ5ZI0nvBFnI53765gd0uGfGGMzx0Oj70EPER42Y/TJJDS/druwyPGXxmXKaYMyUR62gM9OxpHg9BLJyH2y3QryCd8OqsmNpViEW17RA9dq+Z/AtRLMQcaR66WaM3vnmN/gsBOPrEeQ==|920 \ No newline at end of file diff --git a/Pages/共用/确认小弹窗.json b/Pages/共用/确认小弹窗.json new file mode 100644 index 00000000..5f666ef3 --- /dev/null +++ b/Pages/共用/确认小弹窗.json @@ -0,0 +1,159 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 22.0, + "Mode": 1 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 28.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 14.0 + } + } + }, + "Count": 5, + "DefaultSize": 15.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 60.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 14.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 60.0 + } + } + }, + "Count": 5, + "DefaultSize": 15.0 + }, + "Values": { + "1,1": "确认进行操作吗？", + "3,1": "取消", + "3,3": "确认" + }, + "AttachInfos": { + "3,1": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupResult": 1 + } + ], + "Text": "取消", + "TemplateKey": "_RS_Information3" + } + }, + "3,3": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" + } + ], + "Text": "确认", + "TemplateKey": "_RS_Main3" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": 12.0, + "Foreground": 0, + "WordWrap": true + }, + { + "FontSize": 12.0 + }, + { + "FontFamily": 1, + "FontSize": 12.0 + } + ], + "Types": { + "Strs": [ + "Text 1 50", + "Body" + ] + }, + "CellStyles": { + "1,1": 0, + "3,1": 1, + "3,3": 2 + }, + "SheetStyle": { + "FontFamily": 1 + } + }, + "Spans": [ + "1,1,1,3" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "提示语", + "Formula": "确认小弹窗!$B$2" + } + ] +}//x/odDjHpRQvyr66oVlrwY/MTUXxsNh0oLDUqDp3STiu7ppzqDRHvkQude0L+bx2kYGSZxhjvk+yKFBc43n69O+7yr38XEKkK3XaF85nAa32kopxS6JPreeycLMRn/0+1n117A3m3D3khrIygkg0Wz5mDuF+48eWfpN0Z4h598nAhy0KYrrxfSS6rcwoyGEJlIP3S96jMqvH7oR4A/kWNa+MS0XX/fm1+45xACdWpP7XS72bWp+OQ8Ik0ZqMK/Vb0LH/SyzAqfoOiS1yDzQgrm/gbBIVAzn404r2UBtckbJYhAryVqjpwl0YKvfG341bvmb9H554c1sJceo6C/6dEH5NJqe7NuNtPRMLlGmn3hBsiDjx3eIl8seWSNSdbKVufcNf5LOuYKvQwEuS0XdCJTo82H3bzzsnYFgpVfSlxJbvrnAlEVnahkwdY5qgNDxw838mY4dhbg05MvM5waou49RvUY3RWWJkbHSa32kTwwMiaxrImcZ65AJX//MkrQ7SQUJQNctMR4Exta7Hi+F9Yp0UXbjipaYlwuLloRXxCS2PwqPx5uJLVCOTJcRHxdxyNAY/GaClwJQLKNZYdgIuOeyL4hFZCa19OD5+ZxrZQMjUKW9MgA+ZmtFFhno/t0P/KRlE9F7u9eBJrQeGwbI4IEGC/s09i7SDB2kw34h7oZ0uUqdU4BmxKdnNQ6e7UcA4r7GMl5s0HlFiVaU+1iMGKMr/i4NoEbK7KNAhxFqus6ehTpLW3nb7VwvQh+gEvRcH7UYyCTWfZnMsIaZUaVQbrbFFYaTXQRALHyjgkv15A6oJ7Hfls1SPQch8acVz6tx9cO0r8gGRgO0Y/n/H8PXKo2kZMSRWa6fZYIAz3o4l11ptSa3wAfNwWXTkm/udH9WiyQt4m3okcNSICI84C46fVDw==|920 \ No newline at end of file diff --git a/Pages/共用/确认小弹窗.rd b/Pages/共用/确认小弹窗.rd new file mode 100644 index 00000000..631bc77f --- /dev/null +++ b/Pages/共用/确认小弹窗.rd @@ -0,0 +1,11 @@ +{ + "PageType": 0, + "ColumnCount": 5, + "RowCount": 5, + "CustomNames": [ + { + "Name": "提示语", + "Formula": "确认小弹窗!$B$2" + } + ] +} \ No newline at end of file diff --git a/Pages/汇报/日报助手.json b/Pages/汇报/日报助手.json index 6ae060b4..3597410e 100644 --- a/Pages/汇报/日报助手.json +++ b/Pages/汇报/日报助手.json @@ -264,7 +264,7 @@ }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "AI生成日报详情", + "ServerCommandName": "AI内容转报工数据", "Parameters": [ { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", @@ -374,7 +374,7 @@ } } ], - "ID": "5a76d1c7-dcf6-46ce-a8a4-a665b849d626" + "ID": "a8376e4b-5a95-43ac-aec7-1b46037401c6" }, { "CommandList": [ @@ -389,12 +389,12 @@ "BtnText": "知道了" } ], - "ID": "9feacc86-15a8-4fe2-8e90-377848fa11cf" + "ID": "6b2dde53-4e4e-4268-a269-fee829ad6686" } ] } ], - "ID": "c1c208a6-04e4-4471-8822-6b373c76bc89" + "ID": "4bb75e89-1593-46d9-ba4c-1c31cbbf0ca1" }, { "CommandList": [ @@ -409,7 +409,7 @@ "BtnText": "知道了" } ], - "ID": "c7f03c5b-4d3f-4040-a0cd-6b1dc3718dbd" + "ID": "a7f99142-4c40-487f-b2ea-3ef53a09946e" } ] }, @@ -627,4 +627,4 @@ "Formula": "日报助手!$G$20" } ] -}//++G/vx89i5Xhq7K+HiCyRHnqNjTOVqR25MY75zI0P6lC4pHzu7El1CdWogC5WO7tfUN4rqhwgFkHs1nCPGd9tdCxeZ3sI6Wt2cUZqpFeONzsWUY9odMGYdtAgtiFObDBxP+8oSgffyuj4uc+lgmEmn4IFsTzJf9qf7XvD57ruI9Ka1JATTpWYWJtcFYGanTeciRdTS3Qvl8gcShOMtW1meakudmGqMFVYqhbBauikVmynaC4O+o2m7dCuGYAfazizsNCyuDns7pOzChqaPLgi4YO/Mw8++M38sXMqM7CdI2GExsGmtPQzZSyC02gcEUKytoO2DS8KmboH15SmCtZy9QxV/cVLeCzsnOt56KwlXErKfrXSLAVYbIh9kg8IfamafSo8PjAzp5uwFPwHru1aAoZvSNhZ02QNlHyaX2EHuKqOdbsACjEu2MH56UJv6lv9TUJhQNZlA17IC81F9Wl6EpIcaxFwlAVPw4rk7zHSsZ+lsSCsb/5GwrZbi9xf+1aim6rFIW2zonZPml0x4X/8nqWFaLFp9PDbgGBcJ+HetMrtklZNSY9z706gZdqc+mf6I9oNNdly87gRzhSehZ7ezhUgi3hHmzdNhSMx2T0eRIp5meQYc7wI0I55TrNML4PH3pcakoMi9zDH7IObKBIaV6Yx1JGcDGQ+1esWA4N4YTb2Q+d80YYKzc1b06Aaz8x1NWIMwQVJK0iky00FhgWV/h56GAxGqJz0c4gz7uJOLwE6csETcNxyTKH50Ix54CVsr7TnuIyxZc3KWW2D7aKbZ54pVQmVHRdULFptPjZp40fmTjCWzHspK/GunelPAjx//Qn2IWW3eDlVXPB3BfU7Lvnd9I+9uDVYgMurbcAv/wX6DfVUSoRUmbP0GtDntf8InYFgS4qPwNXeMDf+Pp37g==|920 \ No newline at end of file +}//NXAFxfjeA0N/g9Dm8CQ/+aa2uxA8kFAS8p7lg4Z2rO5W0SMnCDh+Aaiy0LuudRoscJ/rkH4tjnjvoynhW6edUsMRMZk4hZPnv1VRBdMpJdRmzm973eZHxkyCdhQ/pjuhnGigxrdNK/gCXm7kP6WYWJWLUPYLtsvMBkSvSvVr0IQzMlT81VVtLumLTSP4EU/92Gzb1zsh6ILmBb3/Xe6u3A8+3p5EERu/QEASxYM2ueMVY1MMDzrilJ7S/QqN0swz1cP6ml6818o6ktSuCodf+JmwxAL5GoZpURbYfl03/CSrdUhsXFBhXwuDAyZ7E5/QGJKULchMi1TylgeKjXL8nKnH5CfAJGoQx9UNoh+HH5TEKlS//xxQK6JMXKMfAsC/LzV7N8fGCDuPbTbc7wNjBJTNq8n4d6O9MTPFojxRmaMlx6xOSrGRBC1jbwuKo4YHXUn5rnUoyht48dygye54MVRSRQTbJlrfIxq40dmiglDzukYF8fqBJ+SrJydQtu5TRUpDu5izy3MPx+l5wPNjx+73hJqQcQLqL7XVf6yQcxqNGSfUD80F4vUuZVBNUksEQFtJxu97TW74g5QfGXuNVEYurzl3rkrNgb2DQJNdcYn6txvZQ7vvt6N8BcDFJYHd0JuXrhzxHqqzqa5vAVUjheyzrwYIh+kNN03EUdGw2A2xepxSWgR6yG1zBSL9NDih3EovY0OcoPihtDkmlPecKG49W0fNu7l9lYHeMxXLLuyK8NpT9vS+2vv1zyO9iPhKGr7oFQic46kmlrmFxHGvxQfkJQqldqyQlJxk7UGTgQUZM3gePkADiNpSo01BIPJwoVRyollB2eeEEYokRBf628w+BaZALW7srOF4EwaQH1PV9z5nX4SXuRbrqeypyR+8dB3Nq9XuhF5GdTSBfnWjDA==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报详情.json b/Pages/汇报/汇报详情.json index 0ec08b0e..96974c83 100644 --- a/Pages/汇报/汇报详情.json +++ b/Pages/汇报/汇报详情.json @@ -33,7 +33,7 @@ }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 14.0 } }, "7": { @@ -64,6 +64,11 @@ } }, "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 39.0, "IsHidden": true @@ -71,9 +76,9 @@ } }, "InLogicalVisibleIndexes": [ - 11 + 12 ], - "Count": 12, + "Count": 13, "DefaultSize": 32.0 }, "Cols": { @@ -185,12 +190,37 @@ }, "24": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 317.0 + "DesignLengthInPixel": 32.0 } }, "25": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 200.0, + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "36": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -200,36 +230,51 @@ } } }, - "26": { + "45": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 126.0 + "DesignLengthInPixel": 32.0 } }, - "27": { + "46": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "47": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "48": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "49": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, - "Count": 28, + "Count": 50, "DefaultSize": 32.0 }, "Values": { "1,4": "上一天", "1,16": "下一天", "1,24": "使用AI助手来编写日报", - "1,26": "AI生成", + "1,38": "帮我生成日报", + "1,44": "帮我生成报工", "5,1": "今日工作", - "9,1": "*日报指的是昨日的工作总结，计划为今日工作安排", - "9,15": "关闭", - "9,19": "保存", - "11,7": "新增一行", - "11,13": "%CurrentUser.UserName%", - "11,16": "%CurrentUser.FullName%" + "10,1": "*日报指的是昨日的工作总结，计划为今日工作安排", + "10,40": "关闭", + "10,44": "保存", + "12,7": "新增一行", + "12,13": "%CurrentUser.UserName%", + "12,16": "%CurrentUser.FullName%" }, "Formulas": { - "9,19": "IF(汇报ID>0,\"更新\",\"提交\")", - "4,24": "TEXT(汇报日期,\"YYYY年MM月DD日-\"&用户全名&\"工作日报\")&CHAR(10)&\"昨日工作：\"&CHAR(10)&CHAR(10)&CHAR(10)&\"今日计划：\"&CHAR(10)&CHAR(10)" + "10,44": "IF(汇报ID>0,\"更新\",\"提交\")" }, "AttachInfos": { "1,4": { @@ -295,32 +340,7 @@ "TemplateKey": "Gost" } }, - "1,21": { - "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "日报助手", - "PassValues": [ - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!汇报日期" - }, - "TargetCell": { - "SerializeProperty": "=日报助手!日期" - } - } - ] - } - ], - "ToolTip": "AI助手", - "Size": 24, - "ImagePath": "成功.svg" - } - }, - "1,26": { + "1,38": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -334,7 +354,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=汇报详情!汇报ID" + "SerializeProperty": "=汇报详情!汇报日期" } ] }, @@ -343,10 +363,104 @@ }, "CommandList": [ { - "$type": "xTools.Commands.xTableToJson, xTools", - "TableName": "图文列表表格1", - "ColArray": "汇报类型,汇报内容,工时,关联项目,关联任务", - "ToParameter": "json" + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!B8" + }, + "Title": "生成中" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!AM2,汇报详情!AS2,汇报详情!AS11,汇报详情!AO11" + }, + "PropertyType": 0, + "Value": false + } + ] + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "AI报工数据转日报", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!汇报ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TEXT(汇报详情!汇报日期,\"yyyy-mm-dd\")" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandListviewParam, ServerDesignerCommon", + "ParamName": "汇报数据", + "ListviewName": "图文列表表格1", + "Columns": [ + { + "ArrayItemName": "类型", + "Column": "汇报类型" + }, + { + "ArrayItemName": "内容", + "Column": "汇报内容" + }, + { + "ArrayItemName": "工时", + "Column": "工时" + } + ] + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "生成文本", + "ResultTo": { + "SerializeProperty": "data" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!B8" + }, + "Title": "生成中" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!AM2,汇报详情!AS2,汇报详情!AS11,汇报详情!AO11" + }, + "PropertyType": 0, + "Value": true + } + ] }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -358,184 +472,231 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=汇报详情!json.length" + "SerializeProperty": "=汇报详情!code" } ] }, - "value": "0", - "compareType": 2 + "value": "0" }, "CommandList": [ - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!Y5" - }, - "Title": "生成中" - }, { "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", "PropertyItemsList": [ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!AA2,汇报详情!Y4,汇报详情!Y5" + "SerializeProperty": "=汇报详情!Y5" }, - "PropertyType": 0, - "Value": false - } - ] - }, - { - "$type": "JsonUtilityCommand.JsonSerializeCommand, JsonUtilityCommand", - "SourceObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!json" - }, - "ToParameter": "表格内容" - }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "AI自动编写汇报", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "汇报ID", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!汇报ID" + "SerializeProperty": "=汇报详情!data" } } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "ReturnPropertiesTo": [ - { - "ResultPropertyName": "生成文本", - "ResultTo": { - "SerializeProperty": "data" - } - } - ], - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!Y5" - }, - "Title": "生成中" - }, - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!AA2,汇报详情!Y4,汇报详情!Y5" - }, - "PropertyType": 0, - "Value": true - } - ] - }, - { - "$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": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!Y5" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!data" - } - } - ] - } - ], - "ID": "ebdebbff-23b6-4cc0-89af-5e0135845151" - }, - { - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "warning", - "Title": "温馨提示", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!msg" - }, - "BtnText": "知道了" - } - ], - "ID": "170c99f7-8e1b-418a-9df1-612c24718fc9" - } ] } ], - "ID": "40c52b13-79e9-4702-8e82-ffbb991597c5" + "ID": "1ed0c68b-5796-420c-8766-bd84fb7c4fec" }, { "CommandList": [ { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "warning", - "Message": "请先填写工作内容" + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!msg" + }, + "BtnText": "知道了" } ], - "ID": "252c8a8a-e8f7-48e9-9cca-9b5facb8fc1a" + "ID": "a2d23c36-2177-424d-a3aa-f88344d14092" } ] } ], - "ID": "aec91fd1-c2f1-4a62-b6a0-a1d29e9eb426" + "ID": "c35f0d15-6ded-4cdb-8747-76200fa9097e" }, { "CommandList": [ { "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", "FourStandardStyle": "warning", - "Message": "请先保存后再试" + "Message": "请选择汇报日期" } ], - "ID": "54ca4f05-afbc-4b7f-a184-edd833b0c48a" + "ID": "1c3b537a-68f3-460e-b930-8ba6175a4178" } ] } ], - "Text": "AI生成", + "Text": "帮我生成日报", "TemplateKey": "_RS_Success3", "Icon": { - "Name": "Application/123_send_3.svg", - "BuiltIn": true, - "Color": "Background 1", + "Name": "gpt.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "1,44": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=汇报详情!Y5" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "AI内容转报工数据", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!用户全名" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TEXT(汇报详情!汇报日期,\"yyyy-mm-dd\")" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报内容", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!Y5" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "日报JSON", + "ResultTo": { + "SerializeProperty": "日报JSON" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=汇报详情!日报JSON" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "JsonDataSource.ImportJsonDataToListviewCommand, JsonDataSource", + "Listview": "图文列表表格1", + "ListviewColumnInfos": [ + { + "ListViewColumnCell": "汇报类型", + "PropertyName": "type" + }, + { + "ListViewColumnCell": "汇报内容", + "PropertyName": "content" + }, + { + "ListViewColumnCell": "工时", + "PropertyName": "time" + } + ], + "SourceCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!日报JSON" + }, + "SampleJson": "[\r\n {\r\n \"type\": \"日报\",\r\n \"content\": \"今天和报价系统部门做了沟通，了解了关于成本的细节\",\r\n \"time\": 120\r\n },\r\n {\r\n \"type\": \"日报\",\r\n \"content\": \"对发票标准版系统进行了升级\",\r\n \"time\": 0\r\n },\r\n {\r\n \"type\": \"日报\",\r\n \"content\": \"研究了时间轮插件，并进行了测试\",\r\n \"time\": 120\r\n },\r\n {\r\n \"type\": \"计划\",\r\n \"content\": \"继续测试时间轮插件\",\r\n \"time\": 0\r\n },\r\n {\r\n \"type\": \"计划\",\r\n \"content\": \"更新发票标准版系统的离线发布文件，并部署到测试服务器\",\r\n \"time\": 0\r\n },\r\n {\r\n \"type\": \"计划\",\r\n \"content\": \"完善PMS\",\r\n \"time\": 60\r\n }\r\n ]" + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!msg&\"，请完善所属项目和任务\"" + } + } + ], + "ID": "4267cd34-d691-4bdd-b49d-e6ddb2aaa481" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "info", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "c4a5c5ab-faae-470f-a93a-7c5bf99a6b26" + } + ] + } + ], + "ID": "20aaa4b9-a31c-4d9e-8bc0-304368e09f13" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "请在下方编写你的工作内容，让AI帮你完成左边的日报！" + } + ], + "ID": "3a9c80de-e110-43ef-a4b9-a37ddfbc1b53" + } + ] + } + ], + "Text": "帮我生成报工", + "TemplateKey": "_RS_Success3", + "Icon": { + "Name": "gpt.svg", + "Color": "Accent 1", "UseCellTypeForeColor": true }, "IconSize": 14.0 @@ -551,12 +712,32 @@ "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor" } }, - "5,11": { + "5,6": { "CssName": "toolbar toolbar-right ", "CellType": { "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", "TemplateKey": "横向迷你菜单", "Items": [ + { + "Value": "清空", + "Text": "清空", + "IconPath": "Application/043_brush_2.svg", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", + "ListviewName": "图文列表表格1", + "UpdateType": 2, + "UpdateRowType": 2 + } + ], + "CanVisitRoleList": [ + "FGC_LoginUser" + ] + }, { "Value": "菜单1", "Text": "从工时导入", @@ -722,7 +903,7 @@ "CommitDataWithCommand": true } }, - "9,15": { + "10,40": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -735,7 +916,7 @@ "TemplateKey": "_RS_Information3" } }, - "9,19": { + "10,44": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -774,7 +955,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!N12" + "SerializeProperty": "=汇报详情!N13" } } ] @@ -837,7 +1018,7 @@ "ReloadData": true } ], - "ID": "e74fee6f-d3ad-4608-9fe0-ae528118c9f7" + "ID": "2917f64a-71fa-43d3-b7b6-ad185b089c4d" }, { "CommandList": [ @@ -847,12 +1028,12 @@ "Message": "该日期已存在汇报，请前往列表中进行更新。" } ], - "ID": "f1e16a87-4c0d-4b51-b2b1-42b9a11766fd" + "ID": "c9ee1fe9-0bbc-4d23-8e55-6d7d41009803" } ] } ], - "ID": "0cba311f-843f-4a42-b7cf-6d0091a712a7" + "ID": "494ef1aa-58a0-4e19-876d-6501148a8ecc" }, { "CommandList": [ @@ -906,7 +1087,7 @@ }, "value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!N12" + "SerializeProperty": "=汇报详情!N13" }, "RightBracket": 1 } @@ -929,13 +1110,9 @@ { "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", "Message": "保存成功" - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "ReloadData": true } ], - "ID": "af3dd6a8-415e-44de-9efb-debb2c8b7dba" + "ID": "09bacc9d-53ac-4d91-a099-82785e89ee4e" }, { "CommandList": [ @@ -945,12 +1122,12 @@ "Message": "该日期已存在汇报，请前往列表中进行更新。" } ], - "ID": "e2f73e60-0f01-4bf0-8ada-a695d0b97d0b" + "ID": "bae1662c-1438-4c66-877a-eae322ecf6e9" } ] } ], - "ID": "15455a5d-d07f-4cc6-be86-3f6dc7af1b53" + "ID": "11c9672d-ffba-4a8d-862c-2ae9aa008579" } ] } @@ -959,14 +1136,14 @@ "TemplateKey": "_RS_Main1" } }, - "11,3": { + "12,3": { "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "ID", "GUID": "cdb43b1e-2041-4d56-ab6e-da5a26c7d5b0" } }, - "11,7": { + "12,7": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -1003,7 +1180,7 @@ "IconSize": 14.0 } }, - "11,13": { + "12,13": { "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报人", @@ -1052,6 +1229,15 @@ "HorizontalAlignment": 2, "BorderLeft": 0 }, + { + "HorizontalAlignment": 2, + "BorderBottom": 0 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "BorderBottom": 0 + }, { "FontSize": 12.0, "Foreground": 6 @@ -1090,6 +1276,28 @@ "0,24": 1, "0,25": 1, "0,26": 1, + "0,27": 1, + "0,28": 1, + "0,29": 1, + "0,30": 1, + "0,31": 1, + "0,32": 1, + "0,33": 1, + "0,34": 1, + "0,35": 1, + "0,36": 1, + "0,37": 1, + "0,38": 1, + "0,39": 1, + "0,40": 1, + "0,41": 1, + "0,42": 1, + "0,43": 1, + "0,44": 1, + "0,45": 1, + "0,46": 1, + "0,47": 1, + "0,48": 1, "1,4": 0, "1,5": 1, "1,6": 1, @@ -1099,6 +1307,14 @@ "1,17": 1, "1,23": 3, "1,24": 4, + "1,26": 4, + "1,27": 4, + "1,38": 0, + "1,39": 1, + "1,40": 1, + "1,41": 1, + "1,42": 1, + "1,44": 0, "2,4": 0, "2,5": 0, "2,6": 1, @@ -1139,39 +1355,82 @@ "4,23": 3, "4,24": 1, "5,1": 6, - "5,11": 1, - "5,13": 1, - "5,14": 1, - "5,15": 1, - "5,16": 1, - "5,17": 1, - "5,18": 1, - "5,19": 1, - "5,20": 1, - "5,21": 1, + "5,6": 1, "5,22": 1, "5,23": 7, "6,23": 3, "7,1": 8, "7,22": 8, "7,23": 9, - "8,23": 3, - "9,1": 10, - "9,15": 0, - "9,16": 1, - "9,17": 1, - "9,23": 3, - "11,3": 1, - "11,4": 1, - "11,5": 1, - "11,7": 0, - "11,8": 1, - "11,11": 1, - "11,12": 0, - "11,13": 1, - "11,16": 11, - "11,19": 1, - "11,20": 1 + "8,1": 10, + "8,2": 10, + "8,3": 10, + "8,4": 10, + "8,5": 10, + "8,6": 10, + "8,7": 10, + "8,8": 10, + "8,9": 10, + "8,10": 10, + "8,11": 10, + "8,12": 10, + "8,13": 10, + "8,14": 10, + "8,15": 10, + "8,16": 10, + "8,17": 10, + "8,18": 10, + "8,19": 10, + "8,20": 10, + "8,21": 10, + "8,22": 10, + "8,23": 10, + "8,24": 11, + "8,25": 11, + "8,26": 11, + "8,27": 11, + "8,28": 11, + "8,29": 11, + "8,30": 11, + "8,31": 11, + "8,32": 11, + "8,33": 11, + "8,34": 11, + "8,35": 11, + "8,36": 11, + "8,37": 11, + "8,38": 11, + "8,39": 11, + "8,40": 11, + "8,41": 11, + "8,42": 11, + "8,43": 11, + "8,44": 11, + "8,45": 11, + "8,46": 11, + "8,47": 11, + "8,48": 1, + "9,48": 1, + "10,1": 12, + "10,40": 0, + "10,41": 1, + "10,42": 1, + "10,43": 1, + "10,44": 1, + "10,45": 1, + "10,46": 1, + "10,47": 1, + "10,48": 1, + "12,3": 1, + "12,4": 1, + "12,5": 1, + "12,7": 0, + "12,8": 1, + "12,11": 1, + "12,12": 0, + "12,13": 1, + "12,16": 13, + "12,19": 1 }, "SheetStyle": { "FontFamily": 0, @@ -1180,66 +1439,23 @@ }, "Spans": [ "7,1,1,21", - "9,19,1,3", - "9,15,1,3", - "11,3,1,3", - "11,7,1,5", - "5,11,1,11", - "11,13,1,3", + "12,3,1,3", + "12,7,1,5", + "12,13,1,3", "1,4,1,2", "1,16,1,2", "1,7,1,8", - "1,24,1,2", - "11,16,1,3", - "4,24,6,3" + "12,16,1,3", + "1,44,1,5", + "1,38,1,5", + "10,44,1,4", + "10,40,1,3", + "4,24,4,25", + "12,19,1,4", + "5,6,1,16" ], "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": "ID", - "GUID": "c78f299c-eafa-4e37-b45a-fe606983832c" - } - }, - "value": "%Null%" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", - "ListviewName": "图文列表表格1", - "UpdateType": 1, - "UpdateValues": [ - { - "Column": "汇报类型", - "Value": "日报" - }, - { - "Column": "汇报内容" - }, - { - "Column": "工时", - "Value": "1" - }, - { - "Column": "关联任务" - } - ] - } - ], - "ID": "cc5d109b-543d-4052-acdb-216b41f1ca63" - } - ] - } - ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -1264,11 +1480,11 @@ "CustomNames": [ { "Name": "增加一行按钮", - "Formula": "汇报详情!$H$12" + "Formula": "汇报详情!$H$13" }, { "Name": "汇报ID", - "Formula": "汇报详情!$D$12" + "Formula": "汇报详情!$D$13" }, { "Name": "汇报日期", @@ -1276,7 +1492,7 @@ }, { "Name": "用户全名", - "Formula": "汇报详情!$Q$12" + "Formula": "汇报详情!$Q$13" } ] -}//xVgHtuHppQV22BH3kVkSKbXwzKZ5Gp4+Yjb/+DIxRNkC/Ts3027uyMzQ0ZmHqXtPGXioergHZ0SfVuiAFLNI4oGTJrjg1mcHQgXHyAJ1pWWcysfhx3NxSQx4boOrUOV+IX7wH+7Ah6dQn/evmKdY8ugX28caH86LPAasJ0krDqVAL5QOROHijYDfWv66VpuGXJS1FozXA/iGS38hprn8HfaXf1tABBpS5JLfsIcDKNey34NTfJg5rQ6YhZ8yQo/1Lenh84vMbRCnWyNS6k78pKHxd/XnF+8f/JpVgOY9GwwZGdSODi8X0E7i96H7VmC4dC/6umC2eGQ0i+rXWxCh5EtbKlZTh1b9W4KHQ+CJFjDAeg1TO0d1G+y9NzBhktIRs9/Nqzmtu2sb461eWMVB+qC4rMPMeeHg1qm75GBQO3BG6Ap7VfzAWdNk+had3ke1iBi+gkBGaUv3IiQkWr06DuMkmZKFHpG1UK5d4O+OLFq6CniCZV5pRh/c+x/wBHMu9w+5oc7cUg2x6uVworpka/9k5oSiG2k2+9hznWIUSXoYMoIYCTUDTPAjJXiHVghA+zRxU+njEpYMeVkYGpBdfwKvBBeeLJAHZ4bUpN5oHpafkXsGC5zkBtcv35qG1bpEkmz/HSL+aPrQdJ9lQdEsIdmhxaSgo41DDWazNTFVomAJxLCdRq4Wpnl/OstAgD9OJd9qY09gw9DJ/OYkCPG5MKAchvL9+DwYPX5oR9h5/Zy88ApToXMyKf76A5G1ljWMLx8R/eiMSJCtLZBs6TKwlsYmpPZxf1Uqs8InNxVRvG8mR3efsaaZJYBUa0q5pXH/2yMECMww0tmgr43fCTRvimVQEut95m0Y6ZYChvN4e0HjrO1r0fIMjbL23VN0kRH2lhfosWSnmVpwoiFHjz/eqQ==|920 \ No newline at end of file +}//o67ujDVfiX0B9TFHQNP/T3o6IDq8WZNaKIBPhzMlbFszbKH+ZMYT8UvCAVuP3BlGaVgTFxT2mykc755wMxB3KU5I9vPkLXFEQQqZXpt8zqii2sM7Vy5mMSPrfHStrTiy2SRRyxD7bZ/Puxyt7Mr5TRpJJoSDI+bgXoQk6ef3j24+ZRCJy936BmJy6DA0kR5JRh9Kv6GFY8Thq77AT9M5dc4VCenM8cGilteNgwDlp01sOeELYeJ2BGDRuoxRJsaYlpFXqMTptMfWl5PXDcbgf1zuztW5VlSRlu/8xtc51irLiBXHe1lvWtiLtVcds6zd/D7KZ58BxN/N8TgeJTsXsq1kXDsdPRWxVWHPTfRp/wTE40s2apm/TFBHiqF64mB9meaHd5Bg+qbzGF9lJyVfD6IUg5H4JuxHZbTXzB1zX5vssb8l9D2+kP3dLhj3k44Hdo7681a2+yJ03n5pjen5taGQW5sai8C8eXwKCVrNXv5Ay1r5rYfX9jq1P6c2YlgHZKgMf920e/zUo5++IiKqkGNxx8q48Vbt4GUqFZmgMJIRzrEhijuNRw2KGTYQMyh7tkK4G1M/Zv+H1C43VpTZU0Alw01XDf7XrG51hGvGvMOT9YvCSNpLNrBPMHzBLZhwJWaGRj369tsjhGr41GR1JUK80LuKcYu7wIPCSvIL+eZ+GEUH5yle6blDwIKdEgoL2kvdSJ7y60CbLYUJpyUZXTkmbvJMPsyEnAEVu3f8GxOJC+/NUmS2aN0j9sdMmhUSild+CkHfpjRxd8NpNwNGudhm9ZcbvkZDc4DLg/NWgOb1Prf7XnVD1qKZOLwrK/oodd35pZwJXEtSnx8vXfMV47lHXbEIb4hS1IhPzZtVVvWXC2EOJ0Zd3G8CrOTIpNIgDkojwgBCYqu+HbG7JURuSg==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报详情.rd b/Pages/汇报/汇报详情.rd index 977ee97a..b34e472e 100644 --- a/Pages/汇报/汇报详情.rd +++ b/Pages/汇报/汇报详情.rd @@ -1,19 +1,18 @@ { "PageType": 0, - "ColumnCount": 28, - "RowCount": 12, + "ColumnCount": 50, + "RowCount": 13, "Formulas": { - "9,19": "IF(汇报ID>0,\"更新\",\"提交\")", - "4,24": "TEXT(汇报日期,\"YYYY年MM月DD日-\"&用户全名&\"工作日报\")&CHAR(10)&\"昨日工作：\"&CHAR(10)&CHAR(10)&CHAR(10)&\"今日计划：\"&CHAR(10)&CHAR(10)" + "10,44": "IF(汇报ID>0,\"更新\",\"提交\")" }, "CustomNames": [ { "Name": "增加一行按钮", - "Formula": "汇报详情!$H$12" + "Formula": "汇报详情!$H$13" }, { "Name": "汇报ID", - "Formula": "汇报详情!$D$12" + "Formula": "汇报详情!$D$13" }, { "Name": "汇报日期", @@ -21,7 +20,7 @@ }, { "Name": "用户全名", - "Formula": "汇报详情!$Q$12" + "Formula": "汇报详情!$Q$13" } ] } \ No newline at end of file diff --git a/Plugin/xTools快速开发工具包-9_0_4_0.zip b/Plugin/xTools快速开发工具包-9_0_4_0.zip deleted file mode 100644 index 85590e1d..00000000 Binary files a/Plugin/xTools快速开发工具包-9_0_4_0.zip and /dev/null differ diff --git a/ServerCommands/汇报/AI生成日报详情.json b/ServerCommands/汇报/AI内容转报工数据.json similarity index 98% rename from ServerCommands/汇报/AI生成日报详情.json rename to ServerCommands/汇报/AI内容转报工数据.json index 78d6ac16..451b98e8 100644 --- a/ServerCommands/汇报/AI生成日报详情.json +++ b/ServerCommands/汇报/AI内容转报工数据.json @@ -1,5 +1,5 @@ { - "Name": "AI生成日报详情", + "Name": "AI内容转报工数据", "Enabled": true, "Triggers": [ { @@ -92,6 +92,7 @@ "$type": "OPENAIFORGUNCY.Completions, OPENAIFORGUNCY", "URL": "https://oa.api2d.net", "APIKEY": "fk211858-C6yKrsealBkvHao04yT9Ypg6GR0NVPyh", + "ORGANIZATION": "", "IsDataSource": "json", "MessageJSON": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -356,7 +357,7 @@ ] } ], - "ID": "300a6ec6-53fa-4905-b7f1-0012908a7e0b" + "ID": "60df54c2-2839-459d-b58a-c5bdc29f8aa5" }, { "CommandList": [ @@ -374,12 +375,12 @@ ] } ], - "ID": "dfbd1700-2f8a-4b7b-b463-6dccbebebb89" + "ID": "da6ed090-e0aa-4fa0-b22a-a1105b688201" } ] } ], - "ID": "d956f9c6-8745-4ebf-a734-e51ac0b16884" + "ID": "42aca21c-1cf5-45a7-b67d-5cb3037c30a2" }, { "CommandList": [ @@ -397,7 +398,7 @@ ] } ], - "ID": "fe995339-bbde-4a48-8025-c9b547f90a85" + "ID": "eafe1dc4-aa54-4e9c-8b05-1b76f8a2f0dd" } ] }, @@ -473,7 +474,7 @@ ] } ], - "ID": "e3ba3945-2a3b-4f3e-9d79-1a1468b184e5" + "ID": "91c4ddef-2d4c-4af1-97cf-81124fafdd66" }, { "CommandList": [ @@ -494,7 +495,7 @@ ] } ], - "ID": "57d738ed-67d2-4d6b-b0fa-addd60807fd5" + "ID": "bc934775-5772-4ddd-be5c-b3efd191e6d1" } ], "Disabled": true diff --git a/ServerCommands/汇报/AI自动编写汇报.json b/ServerCommands/汇报/AI报工数据转日报.json similarity index 56% rename from ServerCommands/汇报/AI自动编写汇报.json rename to ServerCommands/汇报/AI报工数据转日报.json index 5c5878ea..1e767f98 100644 --- a/ServerCommands/汇报/AI自动编写汇报.json +++ b/ServerCommands/汇报/AI报工数据转日报.json @@ -1,5 +1,5 @@ { - "Name": "AI自动编写汇报", + "Name": "AI报工数据转日报", "Enabled": true, "Triggers": [ { @@ -22,11 +22,36 @@ }, "Parameters": [ { - "Name": "汇报ID", + "Name": "汇报人", "DataValidationInfo": { "IgnoreBlank": false }, "TestData": "1" + }, + { + "Name": "汇报日期", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Type": 1, + "ArrayParamItems": [ + { + "Name": "类型", + "DataValidationInfo": {} + }, + { + "Name": "内容", + "DataValidationInfo": {} + }, + { + "Name": "工时", + "DataValidationInfo": {} + } + ], + "Name": "汇报数据", + "DataValidationInfo": {} } ], "InvokeTriggerTestData": { @@ -35,51 +60,6 @@ } ], "Commands": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "汇报主表", - "TableValue": { - "TableName": "汇报记录表", - "TableValueType": 1, - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "汇报人", - "GUID": "b4df1d1d-bad2-4169-8d6a-f58887c99582", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 1 - } - }, - "ColumnName": "汇报人" - }, - { - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "汇报日期文本", - "GUID": "657dec23-28df-476f-8709-36b38c0e7b96" - }, - "ColumnName": "汇报日期" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "ID", - "GUID": "813a1102-e2e5-41d7-8044-6a088af709f4" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报ID" - } - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "e777d0a6268f4e639a936c5658147d64" - }, { "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", "JsonString": { @@ -89,78 +69,6 @@ "SampleJson": "{\"AI提示词1\":\"我将发给你一个记录着某人一天工作内容的数据，为JSON字符串，请你尝试解读它，内容中的[汇报类型]分为`日报`和`计划`。\\n- 日报指的是昨日工作内容的总结；\\n- 计划指的是今日计划工作安排；\\n请你使用为我编写一篇简要的工作日报，对于日报结构和要求如下：\\n标题为固定格式：YYYY年MM年DD月-某某工作日报\\n内容包含两个主题：昨日工作总结、今日工作计划\\n每个主题下的内容从JSON中总结，可以适当润色，但不可过度偏离源数据中的工作内容；\"}", "ToParameter": "全局配置JSON" }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "汇报子表", - "TableValue": { - "TableName": "汇报子表", - "BindingInfos": [ - { - "BindingInfo": { - "TableName": "汇报子表", - "ColumnName": "汇报类型", - "GUID": "4f46c36a-25e6-4b82-a1ac-16109d071ab8" - }, - "ColumnName": "汇报类型" - }, - { - "BindingInfo": { - "TableName": "汇报子表", - "ColumnName": "汇报内容", - "GUID": "0d671561-a0b5-46f2-8012-da3267e15083" - }, - "ColumnName": "汇报内容" - }, - { - "BindingInfo": { - "TableName": "汇报子表", - "ColumnName": "工时", - "GUID": "2c0c577e-37de-431f-a226-3adac1d33e53" - }, - "ColumnName": "工时" - }, - { - "BindingInfo": { - "TableName": "汇报子表", - "ColumnName": "关联项目", - "GUID": "875dd053-4423-4c34-bb9d-d588a882d0a6", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "项目名称" - } - }, - "ColumnName": "项目名称" - }, - { - "BindingInfo": { - "TableName": "汇报子表", - "ColumnName": "关联任务", - "GUID": "0f17a3a1-f25c-418b-a9b2-c5d7456d5c29", - "RelationBinding": { - "RelatedTable": "任务表", - "RelatedColumn": "ID", - "DisplayColumn": "任务名称" - } - }, - "ColumnName": "任务名称" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "汇报子表", - "ColumnName": "汇报ID", - "GUID": "de513bc4-ed82-42fe-8d68-e673d86727d5" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报ID" - } - } - }, - "ID": "e846b647f4a74a52b07bdb4e3878e485" - }, { "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", "OperationParamaterPairs": [ @@ -168,21 +76,21 @@ "Name": "汇报日期", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报主表.汇报日期" + "SerializeProperty": "=汇报日期" } }, { "Name": "汇报人", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报主表.汇报人" + "SerializeProperty": "=汇报人" } }, { "Name": "工作内容明细", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报子表" + "SerializeProperty": "=汇报数据" } } ], @@ -278,38 +186,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=result.choices.0.delta.content" }, - "ID": "95a0adfcd0154562a30ddff9790d7ab9" - }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "汇报记录表", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "ID", - "GUID": "bcf306d3-379f-40af-bfb6-b7898ba65c7b" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报ID" - } - }, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "概要", - "GUID": "6e19f144-087e-4d4c-bb08-5b87b45dd518" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=回复消息" - } - } - ] + "ID": "39923e69847142ef9112d1f7ff63b431" }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", @@ -326,7 +203,7 @@ ] } ], - "ID": "9731e3f4-249b-4d04-896a-b5d56770ef37" + "ID": "dbdf0e96-358e-42dc-a61d-f09dd8cb86a1" }, { "CommandList": [ @@ -347,7 +224,7 @@ ] } ], - "ID": "31f43036-644c-4ca2-8fd9-66d6a590c3f3" + "ID": "a04a35d9-d9e6-49fa-9dfe-a3660e371ce6" } ] } diff --git a/image/图标/gpt.svg b/image/图标/gpt.svg new file mode 100644 index 00000000..bba36fe8 --- /dev/null +++ b/image/图标/gpt.svg @@ -0,0 +1 @@ + \ No newline at end of file