diff --git a/.collaboration b/.collaboration index c1cd2008..993befb9 100644 --- a/.collaboration +++ b/.collaboration @@ -2230,51 +2230,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-30T09:04:17.6387566+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\\OPENAIFORGUNCY.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_103_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\\加载动画-10_0_2_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\\应用服务器操作工具集合-8_0_3_0.zip", - "Plugin\\异步运行命令-9_0_103_0(1).zip", - "Plugin\\支持预览的附件上传-10_0_2_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\标签页和打开标签命令-10_0_2_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" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -2414,16 +2370,7 @@ }, { "ModuleName": "ServerCommand/更新审批待办", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-30T09:04:04.6914738+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\更新审批待办.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommandPrivate/Basic创建钉钉待办", @@ -2431,16 +2378,7 @@ }, { "ModuleName": "ServerCommandPrivate/Basic更新待办", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-30T09:01:18.7725239+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\Basic更新待办.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/创建任务审批待办", diff --git a/Plugin/DingTalkPlugin.zip b/Plugin/DingTalkPlugin.zip index 2f24ec28..76888370 100644 Binary files a/Plugin/DingTalkPlugin.zip and b/Plugin/DingTalkPlugin.zip differ diff --git a/ServerCommands/钉钉/Basic更新待办.json b/ServerCommands/钉钉/Basic更新待办.json index 430bb9c4..888f4c95 100644 --- a/ServerCommands/钉钉/Basic更新待办.json +++ b/ServerCommands/钉钉/Basic更新待办.json @@ -47,42 +47,88 @@ ], "Commands": [ { - "$type": "DingTalkPlugin.UpdateTodoTask, DingTalkPlugin", - "TaskId": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=待办ID" + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$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": "创建待办成功" + } + ] }, - "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": "创建待办成功" + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "日志表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "标题", + "GUID": "9e8ad30e-a757-4531-9695-50503fea8917" + }, + "Value": "更新钉钉待办" + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "内容", + "GUID": "64bbe57b-735f-434c-b6dd-e2c85a8ba922" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "类型", + "GUID": "3d5fc62a-4c0e-45b1-8032-997d527eccba" + }, + "Value": "错误" + } + ] + } + ] + } } ] } \ No newline at end of file diff --git a/ServerCommands/钉钉/更新审批待办.json b/ServerCommands/钉钉/更新审批待办.json index 69af358f..1948c567 100644 --- a/ServerCommands/钉钉/更新审批待办.json +++ b/ServerCommands/钉钉/更新审批待办.json @@ -14,7 +14,7 @@ { "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", "roleNames": [ - "FGC_LoginUser" + "FGC_Anonymous" ] } ] @@ -189,7 +189,7 @@ "Message": "待办更新成功" } ], - "ID": "18f08a0c-d5f2-4ad7-aecb-b71905c5c48c" + "ID": "a8103d39-1b9a-4db2-8e18-5b9ef48ebabf" } ] }