diff --git a/.collaboration b/.collaboration index 1751edc2..6cc86911 100644 --- a/.collaboration +++ b/.collaboration @@ -1182,17 +1182,7 @@ }, { "ModuleName": "PCPage/开发测试", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T18:34:34.7678755+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\系统\\开发测试.json", - "Pages\\系统\\开发测试.rd" - ] + "ModuleType": 1 }, { "ModuleName": "MasterPages/流程母版页面文件夹", @@ -2216,18 +2206,7 @@ }, { "ModuleName": "UserService", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T17:27:08.052848+08:00", - "ModuleType": 11, - "ToRemoveFiles": [ - "UserServiceDB.sqlite3", - "CloudStorageProvider\\data.json", - "SecurityProviderV2\\data.json" - ] + "ModuleType": 11 }, { "ModuleName": "CustomLibrary", @@ -2251,52 +2230,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T18:37:01.1860213+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\DingTalkPlugin1.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", - "Plugin\\超哥富文本增强工具包-9_0_103_0(1).zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -2376,16 +2310,7 @@ }, { "ModuleName": "ServerCommandPrivate/初始化钉钉配置", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T17:27:03.8918189+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\初始化钉钉配置.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/通过免登码获取用户信息", @@ -2393,29 +2318,11 @@ }, { "ModuleName": "ServerCommandPrivate/通过免登码获取用户信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T18:32:32.5974498+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\通过免登码获取用户信息.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/绑定钉钉UnionId", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T18:32:32.597547+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\绑定钉钉UnionId.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/获取CorpId", @@ -2583,22 +2490,10 @@ }, { "ModuleName": "ServerCommand/服务端命令5", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T13:46:43.520527+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommand/发送工作通知消息", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T16:54:31.9254337+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/Pages/系统/开发测试.json b/Pages/系统/开发测试.json index dce038e9..80fba598 100644 --- a/Pages/系统/开发测试.json +++ b/Pages/系统/开发测试.json @@ -363,12 +363,123 @@ }, "Values": { "1,1": "批量构建个人日志", + "1,35": "发送钉钉通知", "2,16": "生成", "4,16": "创建项目审批待办", "6,1": "强制结束流程", "6,42": "结束流程" }, "AttachInfos": { + "1,22": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "a804098c-1446-45b5-88ac-995b05efa8f5", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "6b7f8cff-9f50-4a9c-9599-1b4d4164fb7b" + }, + "ColumnName": "value" + }, + { + "GUID": "b8d26ead-9953-40bd-a3e6-eb6faa28993e", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "da604d22-42cd-4042-90ab-8b99405b2a18" + }, + "ColumnName": "label" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "DingTalkUserID", + "GUID": "a40b8dfb-6385-41e5-9915-4c233cba1b0e" + }, + "Value": "%Null%" + }, + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + } + }, + "1,35": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "发送工作通知消息", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "接收人" + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "消息内容" + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + } + ], + "Text": "发送钉钉通知", + "TemplateKey": "_RS_Main1" + } + }, "2,1": { "CellType": { "$type": "ElementUI.DatePickerCellType, ElementUI", @@ -478,6 +589,35 @@ "TemplateKey": "_RS_Main1" } }, + "3,22": { + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "textarea", + "placeholder": "请输入消息内容", + "resize": "none" + } + }, "4,1": { "CellType": { "$type": "Forguncy.TextCellType, ServerDesignerCommon", @@ -1077,28 +1217,61 @@ "StyleDatas": { "Styles": [ { - "Formatter": 0 + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 1 }, { - "FontFamily": 1, + "FontFamily": 0, "FontSize": 13.333333333333332 + }, + { + "Formatter": 2 } ], "Types": { "Strs": [ - "@", - "Body" + "Body", + "[AUTO]General", + "@" ] }, "CellStyles": { - "4,1": 0, + "1,35": 0, + "1,36": 1, + "1,37": 1, + "3,22": 1, + "3,23": 1, + "3,24": 1, + "3,25": 1, + "3,26": 1, + "3,27": 1, + "3,28": 1, + "3,29": 1, + "3,30": 1, + "3,31": 1, + "3,32": 1, + "3,33": 1, + "4,1": 2, "4,16": 1, "4,17": 1, "4,18": 1, - "4,19": 1 + "4,19": 1, + "4,22": 1, + "4,23": 1, + "4,24": 1, + "4,25": 1, + "4,26": 1, + "4,27": 1, + "4,28": 1, + "4,29": 1, + "4,30": 1, + "4,31": 1, + "4,32": 1, + "4,33": 1 }, "SheetStyle": { - "FontFamily": 1, + "FontFamily": 0, "FontSize": 13.333333333333332 } }, @@ -1109,7 +1282,10 @@ "4,1,1,14", "8,1,13,45", "21,1,1,45", - "6,42,1,4" + "6,42,1,4", + "3,22,2,12", + "1,22,1,12", + "1,35,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1135,4 +1311,4 @@ "PaperSize": {}, "Margin": {} } -}//dRZ6JRSPjwniaGjFeXKOtQXYPQAlrWMfGmi9nqK9CT4FDfRTYswvO7pLN6W/2fyscq8PbQA9+myRVZuFEz1s0lyQ1edkUzCow5KrohoTGT1Anhe9S66Aq1W7JGYWCmMTV8elUvektO+YBRPex/sZh+7xP+EJmMNU5kNsdiyKXPfd2uLZkVXz9XiDxrRIbH+uYi0x7umnTm0B5ZDC8sS6ybV2hHVGQnT4gPxDxmXf07qqIeXtRlkHdEmdbqtCuOutw4OLvb4bD9+hjXwOe0WcpZL3nJW2BhpzjxqCiTmJjuW/GCK4td+ckk1xlbuLgq78yIbwEeTWJ5gtchVnDDNrfzipp4Q3j1ROZv75cPkZmwll9/cD5BOy0FD2bwcsJo3jEhrxEAsfX9jF5kIOLxD2O42vgMEqKp+ab8dHbneoAPhL52FgouNrPw3OCmUDHO6uReYtyNQ6bx6y1IkU63sWzkysmD0KlFsxVXtdHlKxPCW8ARoR+EWMsT3LcMvSCiDSyLGj+6l+wqETelytvWPSm19w846IOHAgZUXc20IOOFx+DvhwroLQ2KJP0qKr3vgqNhsfw5vuUsPHlMDeqCfHg7eABLB/juq/9AyiDQ2CJLwdUCoFCMZmsFmcxMRpVU6gLCHbV9ptRgp+FhRI0uq4XlmnERfkXymLdBUWofWmOQmktPNBLBKMXMCUGfQCJcwEH4pvVBl3t8Tmoiu85u2kAvnimFvl6ZxnmXmV09mQf4j9MLZP9o4AyIx7mBRY6QtYbGGUJCFNKXDvip9YFjvCFMDLLPpV8BD9LY8+Q2I6NB6WPvUIT/R/Y8CjJ+Pns3TGlgpiElJ//mCZqVe0RHEZqqcNxrDGltKYFGgfs7/o/O6OY1ZcRJ70LppWfgiaIYDEpg6zfE+1/dZa6dVP5KyIyw==|920 \ No newline at end of file +}//jek2LUSmScRHS9E8Nfsf78HPglEK0AVoKe/K7Dk9sHZ1zTZFIduy7ObB/75Z0NZG5C0ADh6Cr3DgIPmzi4IBL8k1ZDy7qAHTPgsKnwnxOeClpIBOsO2TOw23wXQffU5Q3GxX91Z56CtsgHIPnND3NNrnGuhG6LYfp/o0RqSaf56s+if204M1xPWaXP9+rGxbVFM2JnjGC2WqOb26M3Ays8rc88YbTB7AKqoBcyuJZli1DWNoyyMsdA0euh3KOmJyjBTQ12du4aHxTw2ojnjtKwItxkZrcDS7InpogWK1pQ3lIFkU2T/9mmsXqBhUt+8usBxoPfb5QzblYlHi7qJnEsuEBJQs/w+3EnE18OgqFuSTLNEy4QsQPX3v4/5RHAdngqIRHQxkvch47HpBb1crOWDvcEqJvy89A47kA017Kfiogv8AkHAGUDjw3rqJ7rzM3xK0KaVhMQbpFrWBIyH0zldX1vHPs8YQpQX9YLmx0wgjU48AECKPSDW6LU0IyrLJnaoGi1gUgSirgycwWwNGJB7ODy01yuX67a1gfpQzwauq3ofDVTLgPEkFkf+rU88+3O/XjzEXvUdMIBf/2OGX4C5OYoV8dIC2IvlDtzvemRyInYDs4EeaFzd8CU/MBZqROfM4ox8RgdZmgxGclmVI5vDEtGdDeMt9iaiHJvKNLNpQ3ivYRUwK2M6s3cXyYvh2l9DZu67obutwNi0nPID9ZGSUMJaOz9Tv/2MO2XG2QsONgWixPGVLNcv5LoKXulk+0cFRIcFiAG/P/i7642QOoTtRRwqZ2rtGbBMgFiCPOQYnlrBlieOe8YFOifi9V8EXXHQvgjdf9VETPUlXy9MrDCak+u4F4o9z3EQh3LxrZSOUfs2ffgKDqaUcvOz6A3P5tkxXeNDUQfls260RO+4IBg==|920 \ No newline at end of file diff --git a/Plugin/DingTalkPlugin1.zip b/Plugin/DingTalkPlugin.zip similarity index 99% rename from Plugin/DingTalkPlugin1.zip rename to Plugin/DingTalkPlugin.zip index 0ebf377f..a20f6486 100644 Binary files a/Plugin/DingTalkPlugin1.zip and b/Plugin/DingTalkPlugin.zip differ diff --git a/Plugin/内容编辑器-9_0_103_0.zip b/Plugin/内容编辑器-9_0_103_0.zip deleted file mode 100644 index 439281c8..00000000 Binary files a/Plugin/内容编辑器-9_0_103_0.zip and /dev/null differ diff --git a/ServerCommands/钉钉/初始化钉钉配置.json b/ServerCommands/钉钉/初始化钉钉配置.json index 2aa7f821..c03fb0b8 100644 --- a/ServerCommands/钉钉/初始化钉钉配置.json +++ b/ServerCommands/钉钉/初始化钉钉配置.json @@ -38,6 +38,7 @@ "SerializeProperty": "=钉钉配置.AppKey" }, "DingTalkeExtendedName": "DingTalkUnionID", + "DingTalkeUserIdExtendedName": "DingTalkUserID", "AppSecret": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=钉钉配置.AppSecret" diff --git a/ServerCommands/钉钉/发送工作通知消息.json b/ServerCommands/钉钉/发送工作通知消息.json new file mode 100644 index 00000000..70317c4a --- /dev/null +++ b/ServerCommands/钉钉/发送工作通知消息.json @@ -0,0 +1,99 @@ +{ + "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": "接收人", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "shamus" + }, + { + "Name": "消息内容", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ], + "InvokeTriggerTestData": { + "UserName": "Administrator" + } + } + ], + "Commands": [ + { + "$type": "DingTalkPlugin.Asyncsend, DingTalkPlugin", + "Userid_list": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=接收人" + }, + "MsgType": "text", + "Text_Content": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=消息内容" + }, + "Action_card_Btn_Type": "0", + "Action_card_Markdown": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成结果" + }, + "Action_card_Title": "这是一个工作汇报卡片模板测试", + "Action_card_Single_title": "XXX提交了个人日报", + "Action_card_Single_Url": "https://www.baidu.com", + "Action_card_Btn_orientation": "1", + "Action_card_Btn_list": [ + { + "Title": "查看" + }, + { + "Title": "查看" + }, + { + "Title": "查看" + }, + { + "Title": "查看" + }, + { + "Title": "查看" + }, + { + "Title": "查看" + }, + { + "Title": "查看" + }, + { + "Title": "查看" + }, + { + "Title": "查看" + }, + { + "Title": "查看" + } + ], + "Task_id": "钉钉消息任务ID" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/钉钉/绑定钉钉UnionId.json b/ServerCommands/钉钉/绑定钉钉UnionId.json index e1d251c9..00301007 100644 --- a/ServerCommands/钉钉/绑定钉钉UnionId.json +++ b/ServerCommands/钉钉/绑定钉钉UnionId.json @@ -54,6 +54,12 @@ "ResultTo": { "SerializeProperty": "UnionId" } + }, + { + "ResultPropertyName": "钉钉UserId", + "ResultTo": { + "SerializeProperty": "UserId" + } } ], "RefreshAfterFinish": true, @@ -215,6 +221,13 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=UnionId" } + }, + { + "Name": "DingTalkUserID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=UserId" + } } ] } @@ -234,7 +247,7 @@ ] } ], - "ID": "c64bbee5-ab11-4033-892f-0441fe2d7faa" + "ID": "333bbd2b-db19-4b12-b585-da82edcb6437" }, { "CommandList": [ @@ -272,7 +285,7 @@ ] } ], - "ID": "78b4fa6c-a0e2-4ebb-b351-bcf30798ce44" + "ID": "68a92064-43fc-4301-904b-5694a78eaf64" }, { "CommandList": [ @@ -290,17 +303,17 @@ ] } ], - "ID": "29f2d4cc-7ec2-4aff-81dc-33e4fcf656ee" + "ID": "d00f17e3-9afd-4f26-beaa-f894b1c9ec01" } ] } ], - "ID": "b1533ed2-d7cb-4c1b-8c36-7b5ff67c27d8" + "ID": "c5167a61-d7fa-4640-a368-25152215bf59" } ] } ], - "ID": "d697972d-1bee-41d6-9eb8-fa626cfe167b" + "ID": "cae9fcb7-ba66-4115-b3e0-e3879a259a47" }, { "CommandList": [ @@ -321,7 +334,7 @@ ] } ], - "ID": "bc8268c4-6832-4239-b690-657de19635cb" + "ID": "27d55936-78c1-41d3-9bab-9151c7a607f7" } ] } diff --git a/ServerCommands/钉钉/通过免登码获取用户信息.json b/ServerCommands/钉钉/通过免登码获取用户信息.json index 48f9ee7a..72a6faef 100644 --- a/ServerCommands/钉钉/通过免登码获取用户信息.json +++ b/ServerCommands/钉钉/通过免登码获取用户信息.json @@ -34,6 +34,13 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=用户信息.unionid" } + }, + { + "ReturnPropertyName": "钉钉UserId", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户信息.userid" + } } ] } @@ -41,6 +48,9 @@ "ReturnProperties": [ { "Name": "钉钉UnionId" + }, + { + "Name": "钉钉UserId" } ] } \ No newline at end of file diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3 index bb27d124..8e236673 100644 Binary files a/UserServiceDB.sqlite3 and b/UserServiceDB.sqlite3 differ