diff --git a/.collaboration b/.collaboration index c807af62..6031f7d9 100644 --- a/.collaboration +++ b/.collaboration @@ -37,137 +37,47 @@ }, { "ModuleName": "TableView/用户角色关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T12:48:39.1204812+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户角色关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织级别视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T12:48:39.1204871+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织级别视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T12:48:39.1204887+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织信息视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T12:48:39.1204904+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色拥有权限视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T12:48:39.1204921+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色拥有权限视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色信息视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T12:48:39.1204931+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T12:48:39.1204941+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T12:48:39.120496+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色分类关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T12:48:39.1204973+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色分类关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -228,16 +138,7 @@ }, { "ModuleName": "Table/需求反馈登记表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T15:28:07.2170421+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\需求反馈\\需求反馈登记表.json" - ] + "ModuleType": 7 }, { "ModuleName": "TableView/反馈收集任务匿名视图", @@ -277,47 +178,17 @@ }, { "ModuleName": "Table/FGC_商品表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T12:48:39.1205289+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_商品表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_订单记录", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T12:48:39.1205324+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单记录.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_订单明细表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T12:48:39.1205343+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单明细表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -354,17 +225,7 @@ }, { "ModuleName": "Table/message_test", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T12:48:39.1205372+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\message_test.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -385,16 +246,7 @@ }, { "ModuleName": "Table/任务表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T15:17:13.5190197+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\任务\\任务表.json" - ] + "ModuleType": 7 }, { "ModuleName": "TableView/任务平行视图", @@ -474,16 +326,7 @@ }, { "ModuleName": "Table/项目表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T23:13:05.6405143+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目\\项目表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Tables/字典表", @@ -523,16 +366,7 @@ }, { "ModuleName": "Table/日志表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T14:50:57.9056936+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\字典表\\日志表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/汇报状态", @@ -1352,17 +1186,7 @@ }, { "ModuleName": "PCPage/开发测试", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T12:04:23.8126182+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\系统\\开发测试.json", - "Pages\\系统\\开发测试.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/工时", @@ -1390,17 +1214,7 @@ }, { "ModuleName": "MasterPCPage/FGC_母版页", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T12:06:11.1953201+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\FGC_母版页.json", - "MasterPages\\FGC_母版页.rd" - ] + "ModuleType": 3 }, { "ModuleName": "UserControlPage/工时记录列表", @@ -1840,16 +1654,7 @@ }, { "ModuleName": "TaskScheduler/任务表更新事件", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T14:51:22.7434987+08:00", - "ModuleType": 16, - "ToRemoveFiles": [ - "SchedulerTasks\\事件任务\\任务表更新事件.json" - ] + "ModuleType": 16 }, { "ModuleName": "TaskScheduler/应用部署时", @@ -1873,31 +1678,11 @@ }, { "ModuleName": "ProcessItem/项目立项流程", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T15:18:48.801527+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\项目立项流程.json", - "Process\\项目立项流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "ProcessItem/反馈处理流程", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T15:26:05.779317+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\反馈处理流程.json", - "Process\\反馈处理流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "ProcessItem/结算申请", @@ -1905,17 +1690,7 @@ }, { "ModuleName": "ProcessItem/新增任务流程", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T15:16:43.3750592+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\新增任务流程.json", - "Process\\新增任务流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "ProcessItem/预算申请", @@ -2455,18 +2230,7 @@ }, { "ModuleName": "UserService", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T23:23:42.0203686+08:00", - "ModuleType": 11, - "ToRemoveFiles": [ - "UserServiceDB.sqlite3", - "CloudStorageProvider\\data.json", - "SecurityProviderV2\\data.json" - ] + "ModuleType": 11 }, { "ModuleName": "CustomLibrary", @@ -2482,39 +2246,7 @@ }, { "ModuleName": "Upload", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T12:48:39.1208409+08:00", - "ModuleType": 26, - "ToRemoveFiles": [ - "Upload\\3f4beb7f-df0f-40a0-8457-c833a332f924_新生成的图片.png", - "Upload\\443d5833-c737-4769-9a2e-104182d6e821_新生成的图片.png", - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.png", - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.small.png", - "Upload\\6955d4b4-16ef-4ec6-87cd-d021d48c27c4_新生成的图片.png", - "Upload\\6f34b1f7-5fa5-40fd-8cd1-103a63ff37b9_新生成的图片.png", - "Upload\\8131abcf-935a-4aa7-b774-45523e96717c_新生成的图片.png", - "Upload\\86eb9c3b-133d-4cb0-ba1b-06aa7189f6b7_Animation - 1718097457056.json", - "Upload\\87a01e25-1dc0-4ebe-b4fc-e8290dd2931a_Snipaste_2024-03-07_10-50-50.png", - "Upload\\87a01e25-1dc0-4ebe-b4fc-e8290dd2931a_Snipaste_2024-03-07_10-50-50.small.png", - "Upload\\88aea4ae-f850-4b94-b2ca-4fb74595161c_新生成的图片.png", - "Upload\\897e9d75-6bb0-4d81-937d-af672e7c9c49_新生成的图片.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.small.png", - "Upload\\ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.medium.png", - "Upload\\ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.png", - "Upload\\ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.small.png", - "Upload\\d5185fbc-ff70-4662-9ab0-6dd3c736ff39_新生成的图片.png", - "Upload\\e8bc81ba-c90b-4bf3-82dd-1ca73c73d426_新生成的图片.png", - "Upload\\ea205b17-51f0-4c25-8484-6026eeffc4fc_新生成的图片.png", - "Upload\\ec25d4da-d567-435d-ae65-6c2c5b062c1d_新生成的图片.png", - "Upload\\f1363a17-58ca-4373-8aea-72deeb26b1c2_深色LOGO 拷贝 3.png", - "Upload\\f1363a17-58ca-4373-8aea-72deeb26b1c2_深色LOGO 拷贝 3.small.png", - "Upload\\f5e49362-3d64-4cf5-b8ca-b3bb89bdd7fa_新生成的图片.png" - ] + "ModuleType": 26 }, { "ModuleName": "PublishConfiguration", @@ -2522,49 +2254,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T15:35:01.3947897+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\DingTalkPlugin.zip", - "Plugin\\Echarts图表-10_0_3_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip", - "Plugin\\JSON数据源-10_0_2_0.zip", - "Plugin\\Lottie动画插图-10_0_2_0(1).zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAI套件-10_0_3_0(1).zip", - "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip", - "Plugin\\ReadLogs.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_2_0.zip", - "Plugin\\UI操作工具箱-9_0_6_0.zip", - "Plugin\\Unlayer-9_0_103_0(1).zip", - "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip", - "Plugin\\内容编辑器-9_0_103_0.zip", - "Plugin\\发送HTTP请求命令-10_0_2_0.zip", - "Plugin\\取消当前行-9_0_103_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0(1).zip", - "Plugin\\富文本编辑器-10_0_2_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0(1).zip", - "Plugin\\异步运行命令-9_0_103_0(1).zip", - "Plugin\\支持预览的附件上传-10_0_2_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_5_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_2_0.zip", - "Plugin\\设置焦点命令-10_0_2_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip", - "Plugin\\超哥富文本增强工具包-9_0_103_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -2644,16 +2334,7 @@ }, { "ModuleName": "ServerCommandPrivate/初始化钉钉配置", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T14:10:46.0935558+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\初始化钉钉配置.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/通过免登码获取用户信息", @@ -2701,82 +2382,34 @@ }, { "ModuleName": "ServerCommand/服务端命令2", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T23:04:52.8187137+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommand/创建项目审批待办", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T23:06:31.075519+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommand/删除钉钉待办", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T23:14:11.4628472+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommand/更新审批待办", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T15:18:48.8014987+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommandPrivate/Basic创建钉钉待办", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T14:58:51.9928263+08:00", "ModuleType": 27 }, { "ModuleName": "ServerCommandPrivate/Basic更新待办", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T14:58:47.0033897+08:00", "ModuleType": 27 }, { "ModuleName": "ServerCommand/创建任务审批待办", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T15:17:00.5601216+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommand/创建反馈审批待办", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-05T15:28:33.6004693+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index 136b994c..243521ea 100644 Binary files a/ForguncyDB.sqlite3 and b/ForguncyDB.sqlite3 differ diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json index 66160f34..422e437d 100644 --- a/MasterPages/FGC_母版页.json +++ b/MasterPages/FGC_母版页.json @@ -424,6 +424,23 @@ "Administrator" ] }, + { + "Value": "开发", + "Text": "开发", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "开发测试" + } + ], + "CanVisitRoleList": [ + "Administrator" + ] + }, { "Value": "菜单1", "Text": "我的", @@ -1170,7 +1187,7 @@ "IsOpenInNewTab": true } ], - "ID": "22384c7f-5066-4da4-980f-cc0d4923b7fe" + "ID": "3cc67325-06a8-4e3c-b321-e16018c2d4ae" }, { "CommandList": [ @@ -1191,12 +1208,12 @@ ] } ], - "ID": "4bad96b4-ac3c-4e44-b5b3-7459cb23b42e" + "ID": "a3e804e1-f77c-4058-a139-6fc595b808dd" } ] } ], - "ID": "040d4878-a714-44c1-a43d-5315b3e32847" + "ID": "3d29e8cf-b6db-47d4-b165-20b5a9254acb" }, { "Condition": { @@ -1246,7 +1263,7 @@ ] } ], - "ID": "2206b2e1-699e-4f71-b440-fc1b8f0a4063" + "ID": "6520d88c-6817-4dbf-b457-40dc6949b50f" }, { "Condition": { @@ -1280,7 +1297,7 @@ ] } ], - "ID": "69cc3c44-03d2-4b95-9ac1-bdebdf768889" + "ID": "38e76aa1-7270-43de-826f-ba964aaadb90" }, { "Condition": { @@ -1316,7 +1333,7 @@ ] } ], - "ID": "b47f704b-50ee-441d-9486-2a419dabd3b2" + "ID": "f4c94b44-fc9d-41ae-bd96-0cadc960e495" }, { "Condition": { @@ -1351,17 +1368,17 @@ ] } ], - "ID": "54847d5c-bb19-49c9-88f4-ca82c8f5bf69" + "ID": "6444a25d-40d6-4161-8082-3d0e14e8e9d0" } ] } ], - "ID": "9d4b18c1-9e14-4547-885b-e6c6efc428c6" + "ID": "1f446573-506a-4559-aa0d-6abb971dc052" } ] } ], - "ID": "af59dda4-3ead-4c96-9f9f-9ea2a87a3a46" + "ID": "6e0d6eb8-a1c4-4f05-b947-8356142fb6c9" } ] } @@ -1374,7 +1391,7 @@ } } ], - "ID": "94333fb7-cd76-4774-bfe7-363f2235c0df" + "ID": "125b5987-1aef-4f3e-baf7-29fa8e327474" }, { "Condition": { @@ -1481,7 +1498,7 @@ "IsOpenInNewTab": true } ], - "ID": "74c35025-4d8d-429d-8985-d6588cd97c58" + "ID": "ad9c1274-6d87-4b68-90de-6cf4cffdfacd" }, { "CommandList": [ @@ -1502,12 +1519,12 @@ ] } ], - "ID": "408eb27a-5752-4d40-8657-5aa515a14d0d" + "ID": "546b154d-2fbb-4891-813c-b9401f3b399b" } ] } ], - "ID": "dfdf1c77-efe3-4a6b-b913-e3e605d2adad" + "ID": "b25f5700-b461-4a29-8ce2-83c4e736f69a" }, { "Condition": { @@ -1557,7 +1574,7 @@ ] } ], - "ID": "564fab5f-7ef2-46dd-a26b-e0101b5a9521" + "ID": "bfccbbc6-c4a9-47c7-a996-e08dfcf2e6fa" }, { "Condition": { @@ -1591,7 +1608,7 @@ ] } ], - "ID": "94acc5fe-05ca-474e-95f0-707ac394fb3b" + "ID": "bbcba83a-b4d6-429f-aaaf-a773a78be164" }, { "Condition": { @@ -1627,7 +1644,7 @@ ] } ], - "ID": "74d2b10b-3418-4537-935b-e163805d4b05" + "ID": "26ddd43e-f5f5-44d3-bc29-242b9ee1cf2c" }, { "Condition": { @@ -1662,17 +1679,17 @@ ] } ], - "ID": "839ba575-5ae9-4632-ac8f-0329f91918b6" + "ID": "57da68f0-026b-47cd-a8eb-3201d52d6fed" } ] } ], - "ID": "43b72753-1106-45a0-9413-66b9f296923c" + "ID": "7227974f-5af1-45ea-9f9a-e3621107a8f4" } ] } ], - "ID": "5090b358-da43-4d68-a612-01533c69e34e" + "ID": "a9d5b066-70b9-41c8-9acc-46f189bb2e2f" } ] } @@ -1685,7 +1702,7 @@ } } ], - "ID": "cbbd9d98-1b94-47de-9109-a754d1d82114" + "ID": "fa544daa-7231-4e5c-b743-9c7cab93926a" }, { "Condition": { @@ -1792,7 +1809,7 @@ "IsOpenInNewTab": true } ], - "ID": "2429e7ff-ffa4-4242-b00b-c5a2c71a21d2" + "ID": "4bcdfaee-40fc-4fba-a711-6b4d4125ceea" }, { "CommandList": [ @@ -1813,12 +1830,12 @@ ] } ], - "ID": "803af2d8-c34c-4d1e-a4df-e84ab010b596" + "ID": "8d4f755b-34a7-4d47-a0be-1b5895436ace" } ] } ], - "ID": "d073e352-dca7-4445-b6e7-fc129a5ca4f3" + "ID": "9ff0191c-15ef-4588-a618-2e4dbb36783f" }, { "Condition": { @@ -1868,7 +1885,7 @@ ] } ], - "ID": "a0da1026-25c0-4101-896f-b98a9c5ba2ed" + "ID": "2abdf9ce-f2e5-4fc8-a3e8-3246e619565e" }, { "Condition": { @@ -1902,7 +1919,7 @@ ] } ], - "ID": "1b60d5b1-6739-47da-bd5c-824ac97d71fe" + "ID": "e0fad22b-bbec-4734-bdbe-10902b966fbe" }, { "Condition": { @@ -1938,7 +1955,7 @@ ] } ], - "ID": "1e6d28de-b0d9-464c-9141-3fc868d11bf2" + "ID": "a939e4e9-abe5-4ee4-8987-a389e485434a" }, { "Condition": { @@ -1973,17 +1990,17 @@ ] } ], - "ID": "9e1ea73a-e551-434d-ad9b-bc3031008130" + "ID": "8dcb3de0-0944-4be2-b9bf-43b45bf1788e" } ] } ], - "ID": "867e1811-249b-41be-bbfe-dc2f10538fa7" + "ID": "3d9cba29-675c-4fea-8199-625c2d7c6433" } ] } ], - "ID": "1a5238ca-3797-4129-9416-428334c75801" + "ID": "79bfc257-b1ab-4fd9-b901-cf09c4813736" } ] } @@ -1996,7 +2013,7 @@ } } ], - "ID": "0c286c90-be48-474c-89fe-c79bbdcb4aa4" + "ID": "2c2dac34-8dbc-4b7b-b1cb-e28e0e851fde" }, { "Condition": { @@ -2103,7 +2120,7 @@ "IsOpenInNewTab": true } ], - "ID": "cd2f1e68-90b7-420a-9f2e-8b35d0934ad8" + "ID": "e5e97754-b7fb-48be-935b-17c722909f70" }, { "CommandList": [ @@ -2124,12 +2141,12 @@ ] } ], - "ID": "705ba95f-854e-4c3f-996b-12df672851c1" + "ID": "4a38d0f0-76fd-46d1-ae10-0d0ef0b3cdac" } ] } ], - "ID": "2e0eef86-5b9d-439c-9bc9-472704bd61cb" + "ID": "ecadef34-c5db-4f9d-845c-3fb67f4b4afa" }, { "Condition": { @@ -2179,7 +2196,7 @@ ] } ], - "ID": "00263957-f9ba-4d5e-a140-3ddfa9801398" + "ID": "f5c91766-3130-43b5-b2e6-2ce7e83ace52" }, { "Condition": { @@ -2213,7 +2230,7 @@ ] } ], - "ID": "b5883465-c735-46c5-92da-f84aa1ef6a2a" + "ID": "c9c4e2f1-d241-4ee7-9d59-b7f385b9e1ee" }, { "Condition": { @@ -2249,7 +2266,7 @@ ] } ], - "ID": "4c813c51-cc55-453d-90f0-8a3139859f40" + "ID": "61cc23d4-fd10-4250-a41b-d4ae1bdd68ab" }, { "Condition": { @@ -2284,17 +2301,17 @@ ] } ], - "ID": "fcbf4828-7444-4b68-abd5-76b52e8f24cb" + "ID": "73aafa13-c87b-467a-bbcf-40ba323ac0bc" } ] } ], - "ID": "c438bbe6-359f-407b-907c-0411c1712a2d" + "ID": "044486aa-49cc-4b6a-8306-76da79bec4f8" } ] } ], - "ID": "60e2d368-d125-4e07-8162-2b3f58cf6ea0" + "ID": "47969f28-d9c9-4d50-8fea-1e50a2b60d4e" } ] } @@ -2307,12 +2324,12 @@ } } ], - "ID": "dfcbe6b2-6d26-4fa1-997e-5f132de19116" + "ID": "1aa2954b-3191-4df8-a056-5db3c3391838" } ] } ], - "ID": "32f65148-9be1-4120-9aab-c1d43bed9766" + "ID": "b00a29f4-670c-403a-a4d3-089d402f2c20" }, { "Condition": { @@ -2395,12 +2412,12 @@ } } ], - "ID": "7724b6dd-4b4a-494c-ab88-08733aea8ef2" + "ID": "9887dc88-6188-474e-86dc-8f20596dda89" } ] } ], - "ID": "aca8caa0-26e7-40f0-8340-6726909c05c5" + "ID": "2a65bca8-9da8-463b-8461-427fb4e34733" } ] } @@ -2445,7 +2462,7 @@ ] } ], - "ID": "f1c8b783-6f30-435b-ab94-c0d699e5b2df" + "ID": "8cd4dfe7-f4b0-41ca-a08d-bc1c7dcb17fe" } ] } @@ -2518,4 +2535,4 @@ "Formula": "FGC_母版页!$C$7" } ] -}//cPSXSp3SI5FNYgLRwskFFIyTZ8huJVMVOE1x4YSewA2AUwOZABumyd3sXXDdM6NjCugi4Wqmdj9tXHt0rSxsunykNDOiLbDQ9u3r1LHlNaznML0IC3fPNVWbZNJXlH7vH78JM/aOdrcvNA6b9dEjYIb4AcvvOFmgcAaD9AInD9eFfQOpJkv0lrOKQZbzXSiEOW7RYCrFFMrNB0geo2/qycILX2EcjW+Mg7s4ZpKkqEWSWkpyzNk/jGBpCXd5LFB76KKyCZ2twCMaDsuq0892Pk/zgJb6mAHB1lUDE9aHKeMulWVD9z6pKWokQproC/KS0XfU8cfsncQTAi1AB1Tgb2n5A+b5/kL0LytQQk4Kb9vUkfs1fjiIxkNmKIV4EISEVeJ9t+iURG5xNZCKaqyqtOpjk/GsypY3PT+KtUZNr0fQ/ImwlyTITkHfjVBk8qkwqUj3sfESX4cxlGAZnQCFD6gIE8+fMPEtK+XbqG50E3VEpPZ+XqnozlK5G2Cm1qVutznlnE+xPB/H5MeCdAhH0p44fAZSclH0ImhbhPJoZ1iFSI60p2EwIdGkMx+IqvVb278XeUTtcDu7X3v0jvpFnuv4pfu1Rai8jfGErz7xVneVYBtAtBIIdX8j0K/NwdLQYnu1YhDk0JErpKUV78a8b4EPf+uLjujiugPNOW+Cfdm7Qb8hiPazPjt5DxMIYSLiw8Ex3tYJLJE1OZh8v0tEYCvjF1sfkVvedEKS/8tQCLCtXEGLFxQP+1vdkM0+tUFXvk6Ju0GerPi2k+K/xUz9yNGY3bczK3n52HEikrzIjEE/UIxOdnyjvO0iZ01Y6V2ujYOXBdzF49FPMzxS1HEMfve6MBPDIZCpncJJyLOFMbHkvVPbB/cGqzwKYiU4b+7coX0MbLZO4z4WaneudNhLvA==|920 \ No newline at end of file +}//VDRZYyCrCOffLLGhyOBXQgkAupObn8twQrfazBY5dZfLohklpPcay4XZ1zgcG4V4lrETe+HQ2FQ/Faxo5OCxpjyXI/uqzxq69eLS8D4mBuywLhZ8U17EzuluxUS+Kc4m9D8mnK0QqeHJHKhfmbkoRjQSxJC9LrkfqY+lIuk+cW7Fg/q7yjOwMVMCA3eze9JT0uSAYBnazkyJLw2F3aeIf//IhYhvieYAwTK0lDAVMA5uxQTOs6oIHEyGn5wzspqsPWMpArM4047jEpIYhL6om8Lr0m+fP58V4Ht2Ynk5h3SNN9Eau0dzvibo7DlCUE+OsCyB6oKMyE8jbjTWlUjiAzpL5UNtNzWV0jyOqZNCoeOVd+Faj+PZz9o0dX8EcrbQgx2fZrPk1BP+R4+bTzjDpYfIukdA7VZTM3o58cc9StIrw1OWnJ6evmn8Ea2xjidh2EzkxUILeAiRGwYMVQEizjruIjauDsDjHdXRUJO9SQES8bNnOFMGdeuqldAUHEPzP1GxQs9upPTez+PJmQR/ryRrpfvwW9JJVFuQ3qciT76VewKhhsQw+I673ZQRXbUD9XYsaSIG3qM/CwjuAjMY7NgmyygZLZlfCrVgaZppUl6DJ1df6T3kp9FjtOnnfkRG0+tA26X2iEeJDUsKkLdaLU6oMuDb4XKkoMDjLkdvtKEtg6toJJWBLnmjiN2g2re+frhM9kUF5dL+HSNkxgE3M4uzGbK4hqYyO8cvN/K7ls3t3uYTIaYco159sttXQyrtyOYKjXK509pB6UT5KDg2aUHzVY5bmReHlrAnQbMXX4ucP+bAMqLo08HOd+eg5AUBibfVMmcgiObgki4olt28iP7dsp9h3kQ3W+1JwBXIeceYyODH5DMYUgVaWb9kcbCfbQdD/IwIc2JYDwpSGdSdBg==|920 \ No newline at end of file diff --git a/Pages/系统/开发测试.json b/Pages/系统/开发测试.json index 0d22b207..85a6090a 100644 --- a/Pages/系统/开发测试.json +++ b/Pages/系统/开发测试.json @@ -353,7 +353,8 @@ }, "Values": { "1,1": "批量构建个人日志", - "2,16": "生成" + "2,16": "生成", + "4,7": "创建项目审批待办" }, "AttachInfos": { "2,1": { @@ -464,22 +465,120 @@ "Text": "生成", "TemplateKey": "_RS_Main1" } + }, + "4,1": { + "CellType": { + "$type": "Forguncy.TextCellType, ServerDesignerCommon", + "SavedValidators": [ + { + "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" + } + ], + "TemplateKey": "_RS_NewLittleRoundCorner", + "WaterMark": "项目ID" + } + }, + "4,7": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "创建项目审批待办", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=开发测试!B5" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "待办标题", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"测试待办\"&TEXT(NOW(),\"yyyy-mm-dd hh:mm:ss\")" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "待办描述" + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "发起人" + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "执行人", + "Value": "shamus" + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "待办ID" + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "info", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=开发测试!msg" + }, + "BtnText": "知道了" + } + ], + "Text": "创建项目审批待办", + "TemplateKey": "_RS_Main1" + } } }, "StyleDatas": { + "Styles": [ + { + "Formatter": 0 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332 + } + ], "Types": { "Strs": [ + "@", "Body" ] }, + "CellStyles": { + "4,1": 0, + "4,7": 1, + "4,8": 1, + "4,9": 1, + "4,10": 1 + }, "SheetStyle": { - "FontFamily": 0, + "FontFamily": 1, "FontSize": 13.333333333333332 } }, "Spans": [ "2,1,1,14", - "2,16,1,3" + "2,16,1,3", + "4,7,1,4", + "4,1,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -505,4 +604,4 @@ "PaperSize": {}, "Margin": {} } -}//EjcwJUfw0DbHsa1VvyzQwKyrG5duqtUsL895S3+W+OEdZ9kzj7mOgRb/ZXFExCK1QbwOo98NcA06kH9rv48j1hPqNqgciPTDJJzYTYSbcOvi/+lLqX1Ez4dGFhsE7sfNWZ325YooXznwa7Wu0b73hDdokUUyxCcgXyPxlBqLfnj1ogztUknRBdHqM9hp42T7jpScuEcHNqE8OfjCpY7jEoch93orqSXwKR+OT+rvZbkI0DD1IAnUDNzhdPrdPMlr2xuYTZKwWCl++Otj3IMEzdkFYwOWQejrgU767nWoE9mC1yRPe6qh7qyuY/eO7OxhririVMDZTqng62L2YUbYxXpxemnoYVGuZQyCIGq0IhZu7msw0jwz5TT2Ktm8sYpOJ3FKnUwN5IUyTdeq2ElNSmvLB1lwdNGK9IFnatAuCDhcXhDPIWPyzY6CJ+kXZcjdt78VUVwRyOi8vtxZlSOtyjHx4Z+RUP+eEXhy5kmGKHviK4ecus8MasPJ0RKGpJUly9WbAqTvfJd0eZvPypsWDV+WH0OPiMewop7ufnjGSaQTET1UFi9/HWGN1VbldDaWtsaml8Lv7D3VWAIvD1/JbxQlVnLhF890vmhSrExvHtwrtDIdTtrWZhIAVyBwBv2USx5XTzxnRYFAjMAZidDzpW0xuFZUuHLDzJtiQiog7O+1f1Sjg9VKNZdkQciUo+Cf1pYo8uQqrSDiKLKBM2xnsPBav0iNl6TxKwhbz/rs134sVE70gcN+DCFQclPRYcfZTmLWcmQBAsPJ17eYGRBdMVPm8CM+SMI13qEROTazlZLfw5+AqF3VN4qtVYkjEVBBVp1un6uJ+bxidJWsnCeMThmBEKlQBLQ/wVZqOqZu2ZWDbPVAPZZJOqrvx3r1L6aWuS8W1MqKcZL2yMyVBf6+WA==|920 \ No newline at end of file +}//VcouN8dL2OqrqzCsHqYQMhs7k5TtM9+74xrOxsvIxml2R3qdoDCdEw0y/asoxZ9DdfuN1dEpSHcq5Az80qMSy37kisscnkPfk9fNI0HGdqCz9t1zleUFxYxlOLV9QGoiK9yKU0imoy5ObwvdP/EeuMuqb+q1AYZYeZKekJucuJs5kRfVqdzAL/uVYDGe/E5tdQHxArBXawSDAvyUiP+D9GOdEQ3jngeDsy6sKwmY2qTa1INX8MLq+QDYQPEnlaB53SpKT7gR2jMc2lLMVJQKmBGTePOkrW2M7ILrKb3Ux/0DnfhXvZKmMMLyaXAm54G0kZzHn1xHuM71i0dJQJqAHYNAOghT+cNneyAYhm10Gvw8L3bd5/8LNA1mNnbNYIgM+A5MAomEcvxvK1UaeeOgCOxRjh9PHMSNC6WdjRZPQSRWGh5YjjQJstfBfiHrZPw/xoAOMSBzIQW98OXdVi5k3BPcUr+EnUhKHieOQjv3o8RoPUxCrq0sU6Upp1tvHrnCde0GIV+MOa66wJxwxXK5LIR4Nu0GFYVC21/WjjPaxXYNyX12H/7oOOVjL9FhpsK+zVF5yUe8qYsr5XruhpaJG4SQd9OSDk5hKLTV77ZH0/h0wwqrVEVT+755zaaqRzkPdciQ3V2OaErU2/bn3R2drFQYbWJuhapYTNOlvCGtqhwXFKlDy52t54K40A7M0n/fEeLyXtD2A64ioyiGnd98O/GlqAX+QKUijABVSsymMwR/KB+xQvzB3QhikV7ro3jwKQzXNSNKZYl2RMYhi6mE4t+euXsbjwNAKzce+AwP9yylbHD7rUvfOu/6a0+y/lrafR4DUEyxv87MvqyFaWgvDp3V32d+74Rtf7oI1R3+Wpve/SAHl16lVboFgAGyYLje9gHAlmrzuaPmWz6/YDwmjQ==|920 \ No newline at end of file diff --git a/Plugin/DingTalkPlugin.zip b/Plugin/DingTalkPlugin.zip index b147a4f8..b9a72bb7 100644 Binary files a/Plugin/DingTalkPlugin.zip and b/Plugin/DingTalkPlugin.zip differ diff --git a/Plugin/超哥富文本增强工具包-9_0_103_0(1).zip b/Plugin/超哥富文本增强工具包-9_0_103_0(1).zip new file mode 100644 index 00000000..884fb984 Binary files /dev/null and b/Plugin/超哥富文本增强工具包-9_0_103_0(1).zip differ diff --git a/Plugin/超哥富文本增强工具包-9_0_103_0.zip b/Plugin/超哥富文本增强工具包-9_0_103_0.zip deleted file mode 100644 index 3f95a984..00000000 Binary files a/Plugin/超哥富文本增强工具包-9_0_103_0.zip and /dev/null differ diff --git a/Process/反馈处理流程.bpmn b/Process/反馈处理流程.bpmn index 3f12a61c..80fd43cd 100644 --- a/Process/反馈处理流程.bpmn +++ b/Process/反馈处理流程.bpmn @@ -4,7 +4,7 @@ 处理用户提交的需求反馈 - + diff --git a/Process/新增任务流程.bpmn b/Process/新增任务流程.bpmn index abcfb1a1..58b97147 100644 --- a/Process/新增任务流程.bpmn +++ b/Process/新增任务流程.bpmn @@ -4,7 +4,7 @@ - + @@ -21,7 +21,7 @@ - + Flow_0otbu5x Flow_1bfvbmv diff --git a/Process/项目立项流程.bpmn b/Process/项目立项流程.bpmn index 6d8835f5..66e535ee 100644 --- a/Process/项目立项流程.bpmn +++ b/Process/项目立项流程.bpmn @@ -4,7 +4,7 @@ 用于项目的立项申请审批 - + @@ -14,7 +14,7 @@ - + Flow_0cq5pfu _8c854f9d-40d8-4aed-acb1-6778e09b2e08 diff --git a/SchedulerTasks/事件任务/任务表更新事件.json b/SchedulerTasks/事件任务/任务表更新事件.json index 30ff00c0..5df480fa 100644 --- a/SchedulerTasks/事件任务/任务表更新事件.json +++ b/SchedulerTasks/事件任务/任务表更新事件.json @@ -30,41 +30,6 @@ ], "OutParamaterName": "任务负责人列" }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "日志表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "日志表", - "ColumnName": "标题", - "GUID": "184bd238-f1e9-46ea-a7be-774190ae3fa4" - }, - "Value": "任务表更新事件" - }, - { - "BindingInfo": { - "TableName": "日志表", - "ColumnName": "内容", - "GUID": "ce51b8d9-a10e-4c6c-82ef-f7676b1d6b2b" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务负责人列" - } - }, - { - "BindingInfo": { - "TableName": "日志表", - "ColumnName": "类型", - "GUID": "c2105bcb-0f6a-4b9b-a80e-16aa70e207c1" - }, - "Value": "调试" - } - ] - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -136,7 +101,7 @@ } } ], - "ID": "80cf8333-b0f2-477a-9367-47c731e377c7" + "ID": "6548fe7c-56bd-4104-a126-0ee42176e4f4" }, { "CommandList": [ @@ -146,12 +111,12 @@ "Message": "负责人无变更，忽略" } ], - "ID": "06ec3e4a-039a-46ff-aafc-34c64fe95ab2" + "ID": "c64ee68f-de23-4bda-b769-95ec44803617" } ] } ], - "ID": "9377971a-c8b3-4aa0-a5b8-418884f57b7e" + "ID": "3673222a-ab2e-471c-bf76-24a83247f84e" } ] } diff --git a/ServerCommands/钉钉/Basic创建钉钉待办.json b/ServerCommands/钉钉/Basic创建钉钉待办.json new file mode 100644 index 00000000..c47a92c1 --- /dev/null +++ b/ServerCommands/钉钉/Basic创建钉钉待办.json @@ -0,0 +1,125 @@ +{ + "Name": "Basic创建钉钉待办", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon", + "Parameters": [ + { + "Name": "创建人", + "DataValidationInfo": {} + }, + { + "Name": "业务ID", + "DataValidationInfo": {} + }, + { + "Name": "标题", + "DataValidationInfo": {} + }, + { + "Name": "备注", + "DataValidationInfo": {} + }, + { + "Name": "截止时间", + "DataValidationInfo": {} + }, + { + "Name": "执行者", + "DataValidationInfo": {} + }, + { + "Name": "参与者", + "DataValidationInfo": {} + }, + { + "Name": "APPURL", + "DataValidationInfo": {} + }, + { + "Name": "PCURL", + "DataValidationInfo": {} + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "当前用户", + "ParameterValue": "%CurrentUser%", + "ID": "332fda17b08943d2a4d91637aaff2c69" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "生成创建人", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(ISBLANK(创建人),当前用户,创建人)" + }, + "ID": "c44d72489bed4ccfaf113f5119fd6603" + }, + { + "$type": "DingTalkPlugin.CreateTodoTask, DingTalkPlugin", + "CreatorId": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成创建人" + }, + "SourceId": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=业务ID" + }, + "Subject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=标题" + }, + "Description": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=备注" + }, + "DueTime": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=截止时间" + }, + "ExecutorIds": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行者" + }, + "ParticipantIds": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与者" + }, + "AppUrl": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=APPURL" + }, + "PcUrl": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=PCURL" + }, + "IsOnlyShowExecutor": true, + "Priority": "20", + "Result": "返回结果" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "创建待办成功", + "CustomReturns": [ + { + "ReturnPropertyName": "TaskID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=返回结果.Id" + } + } + ] + } + ], + "ReturnProperties": [ + { + "Name": "TaskID" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/钉钉/Basic更新待办.json b/ServerCommands/钉钉/Basic更新待办.json new file mode 100644 index 00000000..430bb9c4 --- /dev/null +++ b/ServerCommands/钉钉/Basic更新待办.json @@ -0,0 +1,88 @@ +{ + "Name": "Basic更新待办", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon", + "Parameters": [ + { + "Name": "待办ID", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "task7440b0746dc8b4151d0fdf80da3b10ea" + }, + { + "Name": "标题", + "DataValidationInfo": {} + }, + { + "Name": "备注", + "DataValidationInfo": {} + }, + { + "Name": "截止时间", + "DataValidationInfo": {} + }, + { + "Name": "执行者", + "DataValidationInfo": {} + }, + { + "Name": "参与者", + "DataValidationInfo": {} + }, + { + "Name": "是否完成", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "1" + } + ], + "InvokeTriggerTestData": { + "UserName": "hai" + } + } + ], + "Commands": [ + { + "$type": "DingTalkPlugin.UpdateTodoTask, DingTalkPlugin", + "TaskId": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=待办ID" + }, + "Subject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=标题" + }, + "Description": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=备注" + }, + "DueTime": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=截止时间" + }, + "ExecutorIds": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行者" + }, + "ParticipantIds": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与者" + }, + "Done": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=是否完成" + }, + "Override": "0", + "Result": "返回结果" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "创建待办成功" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/钉钉/创建任务审批待办.json b/ServerCommands/钉钉/创建任务审批待办.json new file mode 100644 index 00000000..912be747 --- /dev/null +++ b/ServerCommands/钉钉/创建任务审批待办.json @@ -0,0 +1,258 @@ +{ + "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" + ] + } + ] + } + }, + "HttpMethod": 3, + "Parameters": [ + { + "Name": "任务ID", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "7" + }, + { + "Name": "待办标题", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "7项目正等待您的审批" + }, + { + "Name": "待办描述", + "DataValidationInfo": {} + }, + { + "Name": "发起人", + "DataValidationInfo": {} + }, + { + "Name": "执行人", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "shamus" + } + ], + "InvokeTriggerTestData": { + "UserName": "shamus", + "RequestTimeout": 20 + } + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "Basic创建钉钉待办", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "创建人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起人" + } + }, + { + "$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": "=待办标题" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "备注", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=待办描述" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "截止时间" + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "执行者", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "参与者" + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "APPURL", + "Value": "https://www.yugasoft.cn/clue/%E6%B5%81%E7%A8%8B%E4%B8%AD%E5%BF%83" + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "PCURL", + "Value": "https://www.yugasoft.cn/clue/%E6%B5%81%E7%A8%8B%E4%B8%AD%E5%BF%83" + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "TaskID", + "ResultTo": { + "SerializeProperty": "待办ID" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "5417d087-7f0a-477a-aaf9-512ad09e755a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "钉钉待办ID", + "GUID": "eb083e3d-be2e-43c4-96cd-53d1580c46db" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=待办ID" + } + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "待办创建成功", + "CustomReturns": [ + { + "ReturnPropertyName": "待办ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=待办ID" + } + } + ] + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "日志表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "标题", + "GUID": "a2b2d328-f311-40ab-9e19-dbabbb884119" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"任务ID：\"&任务ID&\"，创建待办失败\"" + } + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "内容", + "GUID": "69bd56dc-749c-4d75-a699-44300fd9d60f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "类型", + "GUID": "73a7a55a-18eb-4ae1-8d39-9a18d9312d24" + }, + "Value": "错误" + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "待办ID" + } + ] + } + ] + } + } + ], + "ReturnProperties": [ + { + "Name": "待办ID" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/钉钉/创建反馈审批待办.json b/ServerCommands/钉钉/创建反馈审批待办.json new file mode 100644 index 00000000..824f1ce1 --- /dev/null +++ b/ServerCommands/钉钉/创建反馈审批待办.json @@ -0,0 +1,258 @@ +{ + "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" + ] + } + ] + } + }, + "HttpMethod": 3, + "Parameters": [ + { + "Name": "反馈ID", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "7" + }, + { + "Name": "待办标题", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "7项目正等待您的审批" + }, + { + "Name": "待办描述", + "DataValidationInfo": {} + }, + { + "Name": "发起人", + "DataValidationInfo": {} + }, + { + "Name": "执行人", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "shamus" + } + ], + "InvokeTriggerTestData": { + "UserName": "shamus", + "RequestTimeout": 20 + } + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "Basic创建钉钉待办", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "创建人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起人" + } + }, + { + "$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": "=待办标题" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "备注", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=待办描述" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "截止时间" + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "执行者", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "参与者" + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "APPURL", + "Value": "https://www.yugasoft.cn/clue/%E6%B5%81%E7%A8%8B%E4%B8%AD%E5%BF%83" + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "PCURL", + "Value": "https://www.yugasoft.cn/clue/%E6%B5%81%E7%A8%8B%E4%B8%AD%E5%BF%83" + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "TaskID", + "ResultTo": { + "SerializeProperty": "待办ID" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "需求反馈登记表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "ID", + "GUID": "127fc833-9891-4a25-9d6e-87f1bf2aa4f1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=反馈ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "需求反馈登记表", + "ColumnName": "钉钉待办ID", + "GUID": "276590f1-855f-4ab8-981a-911769ddd02a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=待办ID" + } + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "待办创建成功", + "CustomReturns": [ + { + "ReturnPropertyName": "待办ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=待办ID" + } + } + ] + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "日志表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "标题", + "GUID": "24b8798d-9f7c-4275-9b38-da995db3b058" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"反馈ID：\"&反馈ID&\"，创建待办失败\"" + } + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "内容", + "GUID": "687d07e1-5f28-4f88-8a83-8d072adc523b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "类型", + "GUID": "5eb6c5a5-1b5b-4b50-80c8-e8ec7fbd0d26" + }, + "Value": "错误" + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "待办ID" + } + ] + } + ] + } + } + ], + "ReturnProperties": [ + { + "Name": "待办ID" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/钉钉/创建项目审批待办.json b/ServerCommands/钉钉/创建项目审批待办.json new file mode 100644 index 00000000..ef7ec48a --- /dev/null +++ b/ServerCommands/钉钉/创建项目审批待办.json @@ -0,0 +1,258 @@ +{ + "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" + ] + } + ] + } + }, + "HttpMethod": 3, + "Parameters": [ + { + "Name": "项目ID", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "7" + }, + { + "Name": "待办标题", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "7项目正等待您的审批" + }, + { + "Name": "待办描述", + "DataValidationInfo": {} + }, + { + "Name": "发起人", + "DataValidationInfo": {} + }, + { + "Name": "执行人", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "shamus" + } + ], + "InvokeTriggerTestData": { + "UserName": "shamus", + "RequestTimeout": 20 + } + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "Basic创建钉钉待办", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "创建人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起人" + } + }, + { + "$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": "=待办标题" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "备注", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=待办描述" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "截止时间" + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "执行者", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "参与者" + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "APPURL", + "Value": "https://www.yugasoft.cn/clue/%E6%B5%81%E7%A8%8B%E4%B8%AD%E5%BF%83" + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "PCURL", + "Value": "https://www.yugasoft.cn/clue/%E6%B5%81%E7%A8%8B%E4%B8%AD%E5%BF%83" + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "TaskID", + "ResultTo": { + "SerializeProperty": "待办ID" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "201159ae-566e-4820-9589-a4b897bc1db5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "钉钉待办ID", + "GUID": "8c68fff9-d16b-4ebf-ac57-eb66b23e8b5b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=待办ID" + } + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "待办创建成功", + "CustomReturns": [ + { + "ReturnPropertyName": "待办ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=待办ID" + } + } + ] + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "日志表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "标题", + "GUID": "af56f440-ac16-4a9c-a3a4-91fb0cf9092a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"项目ID：\"&项目ID&\"，创建待办失败\"" + } + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "内容", + "GUID": "a5349a46-f927-4434-ac9a-482b8b36dbc7" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "类型", + "GUID": "d9c1e029-8aaa-493b-aea9-3a2a9f362a7a" + }, + "Value": "错误" + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "待办ID" + } + ] + } + ] + } + } + ], + "ReturnProperties": [ + { + "Name": "待办ID" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/钉钉/初始化钉钉配置.json b/ServerCommands/钉钉/初始化钉钉配置.json index 0b86c0e4..2aa7f821 100644 --- a/ServerCommands/钉钉/初始化钉钉配置.json +++ b/ServerCommands/钉钉/初始化钉钉配置.json @@ -3,7 +3,10 @@ "Enabled": true, "Triggers": [ { - "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon" + "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon", + "InvokeTriggerTestData": { + "UserName": "Administrator" + } } ], "Commands": [ @@ -34,6 +37,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=钉钉配置.AppKey" }, + "DingTalkeExtendedName": "DingTalkUnionID", "AppSecret": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=钉钉配置.AppSecret" diff --git a/ServerCommands/钉钉/删除钉钉待办.json b/ServerCommands/钉钉/删除钉钉待办.json new file mode 100644 index 00000000..cf1077c1 --- /dev/null +++ b/ServerCommands/钉钉/删除钉钉待办.json @@ -0,0 +1,52 @@ +{ + "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 + }, + "TestData": "taskab0ff3dde0de6478627eb6d97c064594" + } + ], + "InvokeTriggerTestData": { + "UserName": "shamus" + } + } + ], + "Commands": [ + { + "$type": "DingTalkPlugin.DeleteTodoTask, DingTalkPlugin", + "TaskId": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钉钉待办ID" + }, + "Result": "返回结果" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "待办删除成功" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/钉钉/更新审批待办.json b/ServerCommands/钉钉/更新审批待办.json new file mode 100644 index 00000000..95a6f361 --- /dev/null +++ b/ServerCommands/钉钉/更新审批待办.json @@ -0,0 +1,141 @@ +{ + "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 + }, + "TestData": "task5732575e558ac7db4a631618e3572fc3" + }, + { + "Name": "标题", + "DataValidationInfo": {} + }, + { + "Name": "描述", + "DataValidationInfo": {} + }, + { + "Name": "执行人", + "DataValidationInfo": {} + }, + { + "Name": "参与人", + "DataValidationInfo": {} + }, + { + "Name": "截止时间", + "DataValidationInfo": {} + }, + { + "Name": "是否完成", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "1" + } + ], + "InvokeTriggerTestData": { + "UserName": "shamus" + } + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "Basic更新待办", + "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": "=标题" + } + }, + { + "$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": "=截止时间" + } + }, + { + "$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": "=参与人" + } + }, + { + "$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": "0", + "Message": "待办更新成功" + } + ] +} \ No newline at end of file diff --git a/Tables/任务/任务表.json b/Tables/任务/任务表.json index 9724a7e6..60ca2b76 100644 --- a/Tables/任务/任务表.json +++ b/Tables/任务/任务表.json @@ -174,11 +174,11 @@ "进度": 5, "里程碑": 5, "项目ID": 5, - "子任务数量": 5 + "子任务数量": 5, + "钉钉待办ID": 5 }, "subTableOperations": { - "任务表": 5, - "汇报子表": 5 + "任务表": 5 }, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" @@ -220,11 +220,11 @@ "进度": 5, "里程碑": 5, "项目ID": 5, - "子任务数量": 5 + "子任务数量": 5, + "钉钉待办ID": 5 }, "subTableOperations": { - "任务表": 5, - "汇报子表": 5 + "任务表": 5 }, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" @@ -266,11 +266,11 @@ "进度": 5, "里程碑": 5, "项目ID": 5, - "子任务数量": 5 + "子任务数量": 5, + "钉钉待办ID": 5 }, "subTableOperations": { - "任务表": 5, - "汇报子表": 5 + "任务表": 5 }, "dataFilter": { "$type": "Forguncy.RbacPermission.Core.Impl.Data.FieldFilter, Forguncy.RbacPermission.Core" @@ -449,6 +449,13 @@ "Name": "收集反馈", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "钉钉待办ID", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DefaultValue": 0, diff --git a/Tables/字典表/日志表.json b/Tables/字典表/日志表.json index c76900de..55385aad 100644 --- a/Tables/字典表/日志表.json +++ b/Tables/字典表/日志表.json @@ -1,5 +1,6 @@ { "Name": "日志表", + "ShowBuiltInFields": true, "Columns": [ { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", diff --git a/Tables/用户/用户信息视图.json b/Tables/用户/用户信息视图.json index 4aca9e61..279a3205 100644 --- a/Tables/用户/用户信息视图.json +++ b/Tables/用户/用户信息视图.json @@ -71,6 +71,13 @@ "Name": "GIT密码", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "System.String", + "MaxLength": -1, + "Name": "DingTalkUnionID", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "System.String", @@ -96,7 +103,7 @@ "BuiltInViewInfo": { "ViewName": "用户信息视图", "SourceTableName": "FGC_UserInfoTable", - "CreateViewSql": "SELECT [FGC_UserName] AS [用户名], [FGC_FullName] AS [全名], [FGC_Email] AS [邮件], [FGC_IsEnabled] AS [有效], [FGC_Role] AS [角色], [FGC_OrganizationSuperior] AS [组织上级], [负荷] AS [负荷], [默认时薪] AS [默认时薪], [GIT用户名] AS [GIT用户名], [GIT密码] AS [GIT密码], [公司] AS [公司], [部门] AS [部门], [小组] AS [小组] FROM [FGC_UserInfoTable]", + "CreateViewSql": "SELECT [FGC_UserName] AS [用户名], [FGC_FullName] AS [全名], [FGC_Email] AS [邮件], [FGC_IsEnabled] AS [有效], [FGC_Role] AS [角色], [FGC_OrganizationSuperior] AS [组织上级], [负荷] AS [负荷], [默认时薪] AS [默认时薪], [GIT用户名] AS [GIT用户名], [GIT密码] AS [GIT密码], [DingTalkUnionID] AS [DingTalkUnionID], [公司] AS [公司], [部门] AS [部门], [小组] AS [小组] FROM [FGC_UserInfoTable]", "ViewType": 1 }, "PrimaryKey": [ diff --git a/Tables/需求反馈/需求反馈登记表.json b/Tables/需求反馈/需求反馈登记表.json index 8875d293..eea9bd89 100644 --- a/Tables/需求反馈/需求反馈登记表.json +++ b/Tables/需求反馈/需求反馈登记表.json @@ -132,6 +132,13 @@ "Name": "优先级", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "钉钉待办ID", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DefaultValue": 0, diff --git a/Tables/项目/项目表.json b/Tables/项目/项目表.json index 328da7f5..05f9f9f8 100644 --- a/Tables/项目/项目表.json +++ b/Tables/项目/项目表.json @@ -223,7 +223,9 @@ "项目岗位数": 5, "起始日期": 5, "商务经理": 5, - "客服经理": 5 + "客服经理": 5, + "进度": 5, + "钉钉待办ID": 5 }, "subTableOperations": { "任务工时表": 5, @@ -288,7 +290,9 @@ "项目岗位数": 5, "起始日期": 5, "商务经理": 5, - "客服经理": 5 + "客服经理": 5, + "进度": 5, + "钉钉待办ID": 5 }, "subTableOperations": { "任务工时表": 5, @@ -353,7 +357,9 @@ "项目岗位数": 5, "起始日期": 5, "商务经理": 5, - "客服经理": 5 + "客服经理": 5, + "进度": 5, + "钉钉待办ID": 5 }, "subTableOperations": { "任务工时表": 5, @@ -576,6 +582,13 @@ "Name": "立项流程示例ID", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "钉钉待办ID", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DefaultValue": 0, diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3 index 8d81313c..18a435d1 100644 Binary files a/UserServiceDB.sqlite3 and b/UserServiceDB.sqlite3 differ