diff --git a/.collaboration b/.collaboration index 7b996f98..d9f73e2f 100644 --- a/.collaboration +++ b/.collaboration @@ -866,17 +866,7 @@ }, { "ModuleName": "PCPage/模板详情", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T19:19:16.332108+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报模板\\模板详情.json", - "Pages\\汇报\\汇报模板\\模板详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/模板列表", @@ -896,17 +886,7 @@ }, { "ModuleName": "PCPage/汇报详情", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T19:16:21.1862329+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\个人日报\\汇报详情.json", - "Pages\\汇报\\个人日报\\汇报详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报管理", @@ -1202,17 +1182,7 @@ }, { "ModuleName": "PCPage/开发测试", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T18:50:50.3919509+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\系统\\开发测试.json", - "Pages\\系统\\开发测试.rd" - ] + "ModuleType": 1 }, { "ModuleName": "MasterPages/流程母版页面文件夹", @@ -1272,17 +1242,7 @@ }, { "ModuleName": "UserControlPage/汇报卡片", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T19:16:37.3768201+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\汇报卡片.json", - "UserControlPages\\汇报卡片.rd" - ] + "ModuleType": 31 }, { "ModuleName": "UserControlPage/聊天列表", @@ -2246,18 +2206,7 @@ }, { "ModuleName": "UserService", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T18:51:04.7581837+08:00", - "ModuleType": 11, - "ToRemoveFiles": [ - "UserServiceDB.sqlite3", - "CloudStorageProvider\\data.json", - "SecurityProviderV2\\data.json" - ] + "ModuleType": 11 }, { "ModuleName": "CustomLibrary", @@ -2281,51 +2230,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T19:42:36.7734163+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\\加载动画-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", @@ -2337,16 +2242,7 @@ }, { "ModuleName": "ServerCommandPrivate/Base根据汇报模板生成内容", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T19:18:05.1986441+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\Base根据汇报模板生成内容.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/getEmployeeWorkHoursData", @@ -2414,16 +2310,7 @@ }, { "ModuleName": "ServerCommandPrivate/初始化钉钉配置", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T18:56:44.9996363+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\初始化钉钉配置.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/通过免登码获取用户信息", @@ -2607,45 +2494,18 @@ }, { "ModuleName": "ServerCommand/发送工作通知消息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T18:51:58.02283+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\发送工作通知消息.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/批量同步所有用户UserID", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T19:01:11.9514072+08:00", "ModuleType": 15 }, { "ModuleName": "TaskScheduler/汇报新增事件", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T19:27:26.5126566+08:00", "ModuleType": 16 }, { "ModuleName": "ServerCommandPrivate/发送日报消息到钉钉", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T19:30:08.6358657+08:00", "ModuleType": 27 } ] \ No newline at end of file diff --git a/Pages/汇报/个人日报/汇报详情.json b/Pages/汇报/个人日报/汇报详情.json index 28f224fd..a8582d84 100644 --- a/Pages/汇报/个人日报/汇报详情.json +++ b/Pages/汇报/个人日报/汇报详情.json @@ -266,7 +266,7 @@ ] } ], - "ID": "ecfbc209-62fd-4032-b15f-ce2ee811871d" + "ID": "87295ed2-dbd0-4630-8b78-7e8f457fa094" }, { "Condition": { @@ -302,7 +302,7 @@ ] } ], - "ID": "0a9f2f12-7fd3-4c08-9fa5-615f13ec751b" + "ID": "b2fce3fb-8e28-4e26-a23d-1ce073184577" }, { "Condition": { @@ -338,7 +338,7 @@ ] } ], - "ID": "0efbba0b-f17f-49db-a345-02e815115c6e" + "ID": "11a7647c-bdb8-49d7-893c-5daf741093f9" } ] } @@ -637,7 +637,7 @@ "ErrorCode": "0" } ], - "ID": "107dfbdd-625c-410a-bfa1-721b5a9f77c2" + "ID": "741f28f9-927a-4438-89e9-fd8723090cdf" }, { "CommandList": [ @@ -647,7 +647,7 @@ "Message": "必须指定成员" } ], - "ID": "075489f1-310f-4577-9c92-576e3a7c12d6" + "ID": "0b8bee76-f362-4e96-b332-5dacdce6c926" } ] } @@ -1032,7 +1032,7 @@ "ErrorCode": "0" } ], - "ID": "94f89d7e-9754-4452-8400-29955de6740f" + "ID": "8e35bd27-8ec5-4aa5-a48e-e0d44bc9add0" }, { "CommandList": [ @@ -1042,7 +1042,7 @@ "Message": "必须指定团队" } ], - "ID": "d302e9aa-4d40-4617-a6cf-e4eeac360ccb" + "ID": "206e60e7-cf71-49a0-9111-242e9398d62d" } ] } @@ -1173,7 +1173,7 @@ "ErrorCode": "0" } ], - "ID": "20a3ede1-0221-4a3a-aa46-710b7d35a1d6" + "ID": "48ec2030-9755-4c48-9f0d-b1d644b9998c" }, { "CommandList": [ @@ -1183,7 +1183,7 @@ "Message": "必须指定项目" } ], - "ID": "29cce292-03a7-424f-b297-9ff5bef0ee47" + "ID": "d0f76a23-85f3-41df-93df-e91a181bc2b1" } ] } @@ -1197,10 +1197,11 @@ "GUID": "67469ff5-0ac2-4a5a-836a-87f19c768ee5" }, "CellType": { - "$type": "TinyRichEditor.TinyRichEditorCellType, TinyRichEditor", + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], "UIPermissions": [ { - "Scope": 4, + "Scope": 2, "AllowRoles": [ "FGC_Anonymous" ] @@ -1210,9 +1211,17 @@ "AllowRoles": [ "FGC_Anonymous" ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] } ], - "WaterMark": "请输入汇报内容" + "type": "textarea", + "placeholder": "请输入", + "resize": "none" } }, "16,19": { @@ -1322,12 +1331,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "fa1e229d-cba6-41f5-b53f-9182083caca0" + "ID": "20a5fb36-662b-48c4-84c4-decf06921f44" } ] } ], - "ID": "01055807-e2ce-4601-bf13-0db97ba7e861" + "ID": "83a18ba6-fe0f-4fb3-be32-c1ae5d70a234" } ] }, @@ -1457,7 +1466,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!P7" + "SerializeProperty": "=汇报详情!工时" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1467,7 +1476,7 @@ { "TargetCells": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报详情!B15" + "SerializeProperty": "=汇报详情!内容" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1477,7 +1486,7 @@ ] } ], - "ID": "253640c5-16e4-4a2d-8e56-af5adb5e5727" + "ID": "059fe832-b125-4798-b522-6d3caf19f77d" }, { "CommandList": [ @@ -1491,12 +1500,12 @@ "Duration": 3000 } ], - "ID": "737be3af-7438-48ec-bc7b-e087e60537ae" + "ID": "718b1993-63e6-47a4-9aa3-d70bd73027ea" } ] } ], - "ID": "fc2c75dc-dd2b-46c1-9ac5-06d19836d1b5" + "ID": "09dff6f3-9c4f-49ea-bde6-dc939e257815" }, { "CommandList": [ @@ -1514,7 +1523,7 @@ "AdvancedSettings": {} } ], - "ID": "ddc01600-4b1a-4100-90e9-54943c601323" + "ID": "5385edf7-0d8f-473d-84ce-5258ae942d06" } ] } @@ -1708,7 +1717,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "状态", - "GUID": "c26abee8-3769-4c2a-b1a9-cd1842b290c6" + "GUID": "77c2bceb-7b47-48df-90e7-3737dc2e0a0e" }, "Value": "1" }, @@ -1716,7 +1725,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "纯文本内容", - "GUID": "3a802c9b-c63c-4ce0-9c27-e05363f44c96" + "GUID": "266dc664-ca0f-4558-a1b6-6fc8521a295b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1726,7 +1735,7 @@ ] } ], - "ID": "dc11b95e-3d2d-48b1-b185-397d0be48e27" + "ID": "6d29eba0-d93b-4746-b77f-84c5745b1aff" }, { "CommandList": [ @@ -1801,7 +1810,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "状态", - "GUID": "e5812985-55e8-4542-bf01-df10cfa9dcfd" + "GUID": "d473195c-93fb-47e3-8cc5-5cbd193a6b2a" }, "Value": "1" }, @@ -1809,7 +1818,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "纯文本内容", - "GUID": "03fd980e-46b6-4c98-979d-2093c143f73c" + "GUID": "c5a8017a-7463-4f6f-816c-33f04a290f6c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1820,7 +1829,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报对象", - "GUID": "7b457b55-0485-4893-970c-929c6345e452" + "GUID": "9e313fea-2c99-4c73-9799-4a75ed502529" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1831,7 +1840,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报类型", - "GUID": "29f49580-43c4-40b7-a7a4-9a35f50f1b50" + "GUID": "9541bb18-954e-4800-b42a-86ba5247257e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1842,7 +1851,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "开始日期", - "GUID": "b9631bd4-c56e-40d0-b1e9-b460a8f5a798" + "GUID": "ec958f1b-f54b-4676-984b-3ad35314c918" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1853,7 +1862,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报人", - "GUID": "932152db-7e44-4f2c-9f93-81e773cb3b7a" + "GUID": "36e4d9bb-c12b-4e12-a402-d09eb00a4edf" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1864,7 +1873,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "内容", - "GUID": "43111fdd-2a18-4d0d-b8c8-f13e3fa4ebb2" + "GUID": "a3c55ec5-c6e8-4b13-b028-491ed9217f7d" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1875,7 +1884,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "总工时", - "GUID": "9a7574f8-e626-4399-922b-05209b696a7b" + "GUID": "cf592d86-e36e-4a9f-baff-32ee05f3f091" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1885,7 +1894,7 @@ ] } ], - "ID": "420053cb-58df-4e26-87fa-2d5356039d2a" + "ID": "ef5e73b6-ec89-4a02-a654-f6c32fc44a64" }, { "CommandList": [ @@ -1893,12 +1902,12 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "59a1d0c7-2bdb-4649-afb9-321d7ab75793" + "ID": "93fdbd03-a72b-491f-b5b3-cc5ee7b3705e" } ] } ], - "ID": "51015094-1e06-48cf-81f0-4f05e517b920" + "ID": "32c13338-8e17-4015-aa58-d71f93f54cd3" }, { "CommandList": [ @@ -1908,12 +1917,12 @@ "Message": "您无权限修改该汇报内容" } ], - "ID": "c56eb4bd-d97a-4df6-9ed7-ac777dd14f1d" + "ID": "630a14a8-12c3-4376-9fe0-7523631bfcfb" } ] } ], - "ID": "217813b2-e237-4af5-8f11-8795f28ee630" + "ID": "e4b01114-2e3e-48a8-ac96-20b687d04e25" } ] }, @@ -1930,7 +1939,7 @@ "ReloadData": true } ], - "ID": "e5c979d2-d6a6-430f-a84e-69b0ed41be37" + "ID": "8455879f-2585-4e95-9254-39adfd0281b9" }, { "CommandList": [ @@ -1945,12 +1954,12 @@ "AdvancedSettings": {} } ], - "ID": "6e9f0cdf-ced6-4658-ac30-14289df7cc64" + "ID": "7b74caf3-59f0-447b-b25d-f20af8009418" } ] } ], - "ID": "996f2fd5-5e6d-4274-b342-57972746c7c8" + "ID": "e9156e27-992f-44f6-a054-4a06fb395b64" }, { "CommandList": [ @@ -1965,7 +1974,7 @@ "AdvancedSettings": {} } ], - "ID": "6b23c13a-498b-4069-8796-2c81523b48ca" + "ID": "635eb796-7e7f-409a-a507-d6095e80a541" } ] } @@ -2456,4 +2465,4 @@ "Formula": "汇报详情!$B$11" } ] -}//6H+NXmWeZQjoVg5w4uYbHSkvv3AmfQqCQPRoBCsdoToM2ZFVxE2nSlOVTg/7ZRPQyjs2mS27h1BN34bJccloW86B8RtjRjsVEKFf0KbaYUvl2kACUGABaHf1D4YIDh1iAX7qvHt6hfYbX4XSuR/JX0LuOzNokhS8y3bjAtg9K4EDBMDXabAgZ8QTVVMF8g/gCVj8x49kcpvapcEBbndtgTvByzp5RRhEHotHHf+vYHleOJ9qva+S71LOe0+hn81VwXvPVkT+fJ5/m1SHM+IDyAK71mggcVXvnW4pvMabAlVuCA+uJcNRW+4TXI4cLJLtDgWifA2M/d0OiBdloC8YzGFRpEvKBqL9tZYWkU8sBp/G8GtCj5xEBCAioCA6XvgGRRvExFAB4A6+pG/qb7PN42pPRYDBhbl0mpLbivqdOP7eAQkXKsUdN647aCMYhSTCKoOFYtFY+K1TPKdfTHX6S7/DVf3uq9Ua1N4mm15Usk+SV3TnHQElSlBy2togfxx7Q7pyGhgrq0TDAJAwfu1JKT711Cz0pSj8GXCSPrst/FxWu4rcY+u7ExoyyFHjYvvR4tSJnlB9lQchN1Skd86MmTr8udpXF4wb+6nkqwn4p3Ff0Y8fgZLsdua0uiLgC/82Kw8/TBAZ5hj042Vn22IjthLL13jcO/twBOGgTMOEfCfv4fGxOEo5jA9x3DhlD8aMspLbJH8YuItfWV8g7nwj5JsdqZhFAofjcEcxszdAFsNTY2U5BcggR/rel1T7OOYBCj9YgzVVoCLatUKZRoA/mftwqOKFwL7Z2B6akO7oSpBQ6WNGQEe2nkiDUlA/kle2yHn5dZypYpB/tBCdmJ2j+00g6F1KOoRSn4j3+0QEUyr3aSosW8gXNXipdnWaOkpYHQtUstek3GZ8fHFiEwy9RQ==|920 \ No newline at end of file +}//zOHXFg/6y2KB7JYT3MLEyXpAUVgSdCMeDaEBuCbcpoF0Zn0Li/DmiMw7mmwmOmbDMo2HCcai62GwkHc3+/nNrGe1uxQHGUCWEnBelPpCRCS82Q7F5pGzik5hQJQRUQ9/qAS+hK18BpqY/zIQJYy5YekFizEDnqhPPA6PYVhMCBp/YcxBj27l3uRXsETKgB4EEKCJZHyZvuyo9RcO9Gkgn9OL25L4gMGvcvftYcC1WJknLB+5VQMawFn3KoMOeOhMS1ZiWFUumCDVqjmUFvGxw3j1RIBLKZNaiTlhkuLL1HtNsD4h9LllFR/tyYZNA4MeA+y6MPE2UNuoe7TghMZkkNAU+ZDdnTlZcVkwfRWdkxz2v5JzhNdOVxWkvjwv3g6xizXyy/wAPLeFoWy1lY/ajbZtazes7lUeCnMSQkkCUSnrrSRXKheFLDhsB27Iwijxm3vkB/39CEknYrkKaGpR4QVvm9iQ2Xhd6Q7iLeN8fN9FUC9wv+fRGpxVhY0s1nP92dxSIh49tHbgfKmF8moiiPLgaNmrAG28OitrLdcDPGgbPsAeTTzROtpSWLsaASG2DDJ1Ob+RwitFfqhhFPayCBytrQZZDCtKvx8CNvM3fANJwl0zJvDqWBOjrf8qxV1aLqJFKwhk0+nIjm/JbGv4rn4kHC230aJRV9BNvKtGQDCV2fIP/lghuqrP97/vrYlAaw+uzQknoLdtl4cejhm0jRuC8oan92egJvMO5jn6L13dwYiuxeYtPJb4xbRg9YBh/D2x77W4zLS0FlrhwLNYOnn4V07i9mvPcc2Ek2BXMKnayLeQvt7WLNt86h4eIkqJO/WTjSpD3P8FKbTYgTDN/LQEjX59rOhZxDMODgyd4ivpEpAiuZU4LrsY6rBoyHvTdobJOyffqEHuAfyFmH2tfQ==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报模板/模板详情.json b/Pages/汇报/汇报模板/模板详情.json index e63ceafd..e9e8e499 100644 --- a/Pages/汇报/汇报模板/模板详情.json +++ b/Pages/汇报/汇报模板/模板详情.json @@ -13,7 +13,7 @@ }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 446.0 + "DesignLengthInPixel": 684.0 } }, "7": { @@ -51,36 +51,6 @@ "DesignLengthInPixel": 32.0 } }, - "9": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "11": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "12": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "13": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "15": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -135,16 +105,46 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, - "Count": 26, + "Count": 32, "DefaultSize": 32.0 }, "Values": { "1,1": "模板名称:", "4,1": "模板内容:", "7,1": "取消", - "7,21": "保存" + "7,27": "保存" }, "AttachInfos": { "2,1": { @@ -190,10 +190,11 @@ "GUID": "5a59d792-c4be-4fe1-8806-e66f7e3ac148" }, "CellType": { - "$type": "TinyRichEditor.TinyRichEditorCellType, TinyRichEditor", + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], "UIPermissions": [ { - "Scope": 4, + "Scope": 2, "AllowRoles": [ "FGC_Anonymous" ] @@ -203,8 +204,17 @@ "AllowRoles": [ "FGC_Anonymous" ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] } - ] + ], + "type": "textarea", + "placeholder": "请编写模板", + "resize": "none" } }, "7,1": { @@ -220,7 +230,7 @@ "IconSize": 14.0 } }, - "7,21": { + "7,27": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -284,7 +294,7 @@ "ShowConfirm": false } ], - "ID": "4804756b-1855-4fe8-bf5b-f46ed2d40c3f" + "ID": "75ec226f-2a05-4ff9-a8ad-6a4cb39cc599" }, { "CommandList": [ @@ -294,7 +304,7 @@ "ShowConfirm": false } ], - "ID": "0b018b7b-01b0-4afd-9c45-9dde1d9db172" + "ID": "b2191013-b752-4381-914e-a37044944f51" } ] }, @@ -303,7 +313,7 @@ "ReloadData": true } ], - "ID": "b827200c-50a9-4b0c-871f-48bd9626b0b0" + "ID": "13056886-dbb8-4071-8e95-7153eac67c36" }, { "CommandList": [ @@ -318,7 +328,7 @@ "AdvancedSettings": {} } ], - "ID": "ecd9ed9a-4305-4835-ad7a-9349c0f7c11d" + "ID": "d622fe41-d223-4990-8ac2-1092467fbb19" } ] } @@ -381,18 +391,18 @@ "7,2": 1, "7,3": 1, "7,4": 1, - "7,21": 0 + "7,27": 0 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "7,21,1,4", + "7,27,1,4", "9,1,1,4", - "2,1,1,24", - "5,1,1,24", - "7,1,1,4" + "2,1,1,30", + "7,1,1,4", + "5,1,1,30" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -420,4 +430,4 @@ "PaperSize": {}, "Margin": {} } -}//ofQMVL3BZ01HB86fr/oMKxjsOZMk5OzfzYbsRmSlMG8vetkYSY3tQGiiPSEA3izA+maVlyvZ3PP5oOxQudbLuWKIHl1o8DpqKWINUI6KqduhkK1GBBpjEFTHNoqmkOlLyW0NLHgcEvBScwL4q8jvWh1BAeZhht1km0JAP+fHdteTxS9Q1Ah/W/Ravs2rqkQ7r0AUurVyYK84ECWoOOgtZiVC3IY/uNNKWBKV9MKSZYX0685iLg36cfK3ZW9mJ/cc6rOW6Hmy1oJB59oDjdSWG96OqWnfxl/wSRR4EGWPba5zHVlb8Kfa0ql2ff8Cc0piU6ZIjCF7UrJCX2BM4JkS8BSvUOu73fEYtiXWH5sKY7wWFNdxSkoK/8Vr0d6hRCDRvpOA0v9ULzTvHc9PhX1zPV7q8N98idSJeG9RCd1iZtkCKXT9H5Tzg8k+Z69B9uvCc+mszLBrrVako2glpJGMo1VXuXiFtiifejx1j/XIiIfhmH5NnA7wWzvsd/IjQRA32OzAeM+ak5Ga8da5It79jDPYxo5/63ydzDHRMOgZt9Lnwz4tYGjloY3oJdUiLsIXvatGKvmVQSMrAYs/VC8FSWibcxPwL1Ix8txQ89klNjMQjCrmbvTIiWudPW1mVrk5noXu+a8hl4FJsl+IQ/eSib5/arDNe5F09k6y4gKMS/KwnvCq6/JpnEuUkePst7CYN/sbktR+o0P30LMHItfjvM/a8J09RYWdB1q/cRGRdOy6DSfQ8bxCDV3hFax+yK4q9dL6IUaQbl+tZMlmXlSL2iCixtxDQZt0tGbS/92fyBCq1kWucUzgbHrreU4JafU8tnQk7NKfqlsiFtcv9v3UvPLSwnnFgNlyl0Qae4Icthk8kfXhigmxJEttoVFR3he0BPxhygTZcc2j2AIPS5GBpw==|920 \ No newline at end of file +}//wCERYj9VywTzvuS+MAFtmTBFhWcAHArvONykD60d2HocWAUXUkf3qYv6Scuji8uwq0c4vD8IjzRPgoeW1Nt0rW6XeihMwHoz23h0YEnZI4smKFoaA04HsnhbV6dzLHoqWXHEHpuwtoou1qtqttuFYrDpQgE0b8gb/Ihi8Anr439Va3YTsQ2ialGUE/HmY/fDBLuCzEw0IHvc4kQorJoSlJVYkrO4WU0dMeJ5hen/NcdNZbpWD58N8427POfoVbaUwYqcLq1do6lL5whNgOrMwvt6Sj8y7iwjNtz21Y2F8RRMVUv99KnRlu/cuATpWsgk36KPGK0pPo5cUloJCstP0oZrHzd1nhPU+FDkbliWYnobLwCWeIkrG8JLnKniGnt8fbw7A6ul6XLP/Kl76UiyRvGwMJ5v3vuNqEguvU/xpiJ2WkLa8t+3nnNDZQeBbtlTWHOUnK40rT3+bsLQ2iI5XtDoHsOWOohn6GUFCctObcmQOsORPsJchBcO6xQI/jk/M4iXc5OGs9KdhFu0fawfK7rD203l/bNk1CQs/HM8yIDeGfnKWPbt/tbWMvz4PdbIWUP1bkA6qqDUqYZBbkHxTCOMo06EmlL22toFVK/FUoBJ9VYuqp9UhRrACtc+gy2W1aRnA+ugTOjI8eYy0+9vc1LG3stqwyOKDNb3eNujVjBNkJLxiRiDHV121ByeOY5DWZA4qkz1eQPMyrmWiYHT88WapGRV96jUGRjNZhnkug664x20rlfU3AWD//QTFDwttONYHzO8A/fZpmQsD6AzD8Vv+/oxEkY58O38QRzSXjHuDJrP0wYZ82wOSk3VoWh7tZQItmPIfU/fe098lXFM9CmSJ1f4GGTvO3S8QdKjfkBS6ls4ZELO2Sry3Y5T6Dljg69Cw7QltWt0EakxFiSq5g==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报模板/模板详情.rd b/Pages/汇报/汇报模板/模板详情.rd index f2b5456c..a63b7dcb 100644 --- a/Pages/汇报/汇报模板/模板详情.rd +++ b/Pages/汇报/汇报模板/模板详情.rd @@ -1,5 +1,5 @@ { "PageType": 0, - "ColumnCount": 26, + "ColumnCount": 32, "RowCount": 10 } \ No newline at end of file diff --git a/Pages/系统/开发测试.json b/Pages/系统/开发测试.json index 80fba598..813df023 100644 --- a/Pages/系统/开发测试.json +++ b/Pages/系统/开发测试.json @@ -364,6 +364,7 @@ "Values": { "1,1": "批量构建个人日志", "1,35": "发送钉钉通知", + "1,39": "更新所有用户Userid", "2,16": "生成", "4,16": "创建项目审批待办", "6,1": "强制结束流程", @@ -416,7 +417,7 @@ "TableName": "用户信息视图", "BindingInfos": [ { - "GUID": "a804098c-1446-45b5-88ac-995b05efa8f5", + "GUID": "b1f8ef13-519a-4888-8e48-7c775a6acd1c", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", @@ -425,7 +426,7 @@ "ColumnName": "value" }, { - "GUID": "b8d26ead-9953-40bd-a3e6-eb6faa28993e", + "GUID": "8df27a75-dd91-43b5-951b-ec36ed0d0d8e", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "全名", @@ -444,6 +445,7 @@ }, "Value": "%Null%" }, + "NullFormulaValueQueryPolicy": 2, "CustomColumns": [] }, "placeholder": "请选择", @@ -480,6 +482,46 @@ "TemplateKey": "_RS_Main1" } }, + "1,39": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中", + "VBalidate": true + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "批量同步所有用户UserID", + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=开发测试!msg" + }, + "BtnText": "知道了" + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + } + ], + "Text": "更新所有用户Userid", + "TemplateKey": "_RS_Main1" + } + }, "2,1": { "CellType": { "$type": "ElementUI.DatePickerCellType, ElementUI", @@ -1285,7 +1327,8 @@ "6,42,1,4", "3,22,2,12", "1,22,1,12", - "1,35,1,3" + "1,35,1,3", + "1,39,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1311,4 +1354,4 @@ "PaperSize": {}, "Margin": {} } -}//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 +}//xosThgDBySuYqm7uR6invthKrraIda/f00orbI9IBd+pdQuD8IXGH6aUhpjRUr7AaPsESMgfgDKYGC/JylMOOW3C7lGHBe5eYGq1z9vx4Hzonm6Br1Q7azImdhCySLA8n5YGkZB17EfvOtMl3dWPdcxjvGbtyg+mOPpM8phUwTwqpuIQno7EmdqpXfFY7uPlBMfLJpWkx53ZTkVoVvKsAmvinx+O1xeL/rdIQjY3iXnh1SzmwW/yDhxmnnnOWtAYjZ6pXD2evFoFEC82VNL7YwIVXlDsAo9BJBYmP5dEZJ+1/GzJPqWxCZF0Mvi3ATNlw7bonQtGr7AhlwKMfAK5F7LH5Dt88DYfhbW3m8J/9iPALdRyOY7MLvJGvQVUoboIofBoCSv+o9kz/mP+KK4CBhMV97og8YMuP/PdL9uOYmI+i2S/ETdvW8lB/lYQ+w+rP8Rxp5wHbzmZcmWXBM/EO4SuHEr4CFlTeSA/aM8AV8nGy195Zkbni09gFGFWIWq0nZU64vRJTnNfe6UWj2Dv7IPDLwoEkPawQLyOj0caj7Vbe88Io7wvNQA8qVpuZCyEFy2j8VilNM9YxEXCXL65UBgLn4b43wkfwxGrPlkeVMeDt6gjbXPNBXQl45LxcA2smIXXLU/Z+zilKAjh0BzdhXgSox4qDN/I4JXzk1/cnPpfQzFUDJLqm0f8pXBdlftKXsCXjqm1CUj1LDam+4S0UyDA5doTgxx1LX1KwcHWdi/56IjQ71O+mnlglIS/LeDMaPh4i3QlAiP25kmLgm/lp+jUeiWT0aWSTQB/NXbTxTIbzfpqFLdSa8XNlSfExnN75rsukOWDL8Ep1poPddlbNUdPBL3U6wANbgIXElYAXdoYkjyOyHcXlhOAumThNv8gF+Qs7N9x7a0rq7Puv/EguQ==|920 \ No newline at end of file diff --git a/Plugin/DingTalkPlugin.zip b/Plugin/DingTalkPlugin.zip index a20f6486..2f24ec28 100644 Binary files a/Plugin/DingTalkPlugin.zip and b/Plugin/DingTalkPlugin.zip differ diff --git a/Plugin/内容编辑器-9_0_103_0.zip b/Plugin/内容编辑器-9_0_103_0.zip new file mode 100644 index 00000000..439281c8 Binary files /dev/null and b/Plugin/内容编辑器-9_0_103_0.zip differ diff --git a/Plugin/超哥富文本增强工具包-9_0_103_0(1).zip b/Plugin/超哥富文本增强工具包-9_0_103_0(1).zip deleted file mode 100644 index 884fb984..00000000 Binary files a/Plugin/超哥富文本增强工具包-9_0_103_0(1).zip and /dev/null differ diff --git a/SchedulerTasks/事件任务/汇报新增事件.json b/SchedulerTasks/事件任务/汇报新增事件.json new file mode 100644 index 00000000..204dece3 --- /dev/null +++ b/SchedulerTasks/事件任务/汇报新增事件.json @@ -0,0 +1,35 @@ +{ + "Name": "汇报新增事件", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.EndDBInsertTriggerSaveData, ServerDesignerCommon", + "DataParamName": "变更数据", + "TableNameParamName": "数据表名", + "PrimaryKeyParamName": "主键", + "OperatorParamName": "操作人", + "OperationTimeParamName": "操作时间", + "SelectTables": [ + "汇报记录表" + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "发送日报消息到钉钉", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=主键.ID" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + } + ] +} \ No newline at end of file diff --git a/ServerCommands/汇报/Base根据汇报模板生成内容.json b/ServerCommands/汇报/Base根据汇报模板生成内容.json index e8849ad0..3d9ee70a 100644 --- a/ServerCommands/汇报/Base根据汇报模板生成内容.json +++ b/ServerCommands/汇报/Base根据汇报模板生成内容.json @@ -54,7 +54,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=TEXT(生成日期,\"yyyy-MM-dd\")" }, - "ID": "4ace18ec3a9544668738b0790a291a54" + "ID": "d11c05c8d8d34fb787323cc011713dd2" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -64,7 +64,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "373b5db3-9019-4c86-8b5d-b749601675b1", + "GUID": "4e66c3dc-ca1f-4652-98b9-37b01649e0fe", "BindingInfo": { "TableName": "任务工时表", "ColumnName": "总工时", @@ -113,7 +113,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "46450718969a4aeea8c451b6a387a2bd" + "ID": "4e927f8d881042489c0eb1c859ae9d03" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -439,19 +439,6 @@ "SetMaxRecursionDepth": 10, "ResultTo": "输出结果" }, - { - "$type": "Summernotetools.ReplaceTemplateParameters, Summernotetools", - "HtmlContent": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=输出结果" - }, - "ReplaceRules": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"\"" - }, - "ReturnText": true, - "ResultTo": "纯文本" - }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "0", @@ -468,7 +455,7 @@ "ReturnPropertyName": "日报文本", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=纯文本" + "SerializeProperty": "=输出结果" } }, { @@ -481,7 +468,7 @@ ] } ], - "ID": "d99a69b2-dada-466b-9438-7beb198fbf7e" + "ID": "c3200006-a2c4-4982-b42f-e243171f9ad8" }, { "CommandList": [ @@ -502,12 +489,12 @@ ] } ], - "ID": "d4f5036c-26c9-483f-b70c-fb1600445b4a" + "ID": "f7671178-8151-45e6-935e-bcef30e8de56" } ] } ], - "ID": "dcf8e352-1cda-4ca6-8be2-fade4ad579b9" + "ID": "07d4985c-8707-4373-8fc0-5a53f2e992f4" }, { "CommandList": [ @@ -531,7 +518,7 @@ ] } ], - "ID": "30cd4c35-14a0-4ee1-8a41-0861c1ba52b8" + "ID": "65f4b2cb-254a-446b-bf87-8b7924351072" } ] } diff --git a/ServerCommands/钉钉/发送工作通知消息.json b/ServerCommands/钉钉/发送工作通知消息.json index 70317c4a..cecd58ec 100644 --- a/ServerCommands/钉钉/发送工作通知消息.json +++ b/ServerCommands/钉钉/发送工作通知消息.json @@ -32,7 +32,8 @@ "Name": "消息内容", "DataValidationInfo": { "IgnoreBlank": false - } + }, + "TestData": "### 测试Clue消息推送\r\n - xxxxxxxxxxxx;\r\n - xxxxxxxxxx;\r\n - xxxxxxxxxxxxxxx;" } ], "InvokeTriggerTestData": { @@ -47,50 +48,28 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=接收人" }, - "MsgType": "text", + "MsgType": "action_card", "Text_Content": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=消息内容" }, - "Action_card_Btn_Type": "0", + "Action_card_Btn_Type": "1", "Action_card_Markdown": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=生成结果" + "SerializeProperty": "=消息内容" }, - "Action_card_Title": "这是一个工作汇报卡片模板测试", - "Action_card_Single_title": "XXX提交了个人日报", + "Action_card_Title": "XXX提交了个人日报", + "Action_card_Single_title": "查看详情", "Action_card_Single_Url": "https://www.baidu.com", - "Action_card_Btn_orientation": "1", + "Action_card_Btn_orientation": "0", "Action_card_Btn_list": [ { - "Title": "查看" + "Title": "查看详情", + "Url": "https://www.baidu.com" }, { - "Title": "查看" - }, - { - "Title": "查看" - }, - { - "Title": "查看" - }, - { - "Title": "查看" - }, - { - "Title": "查看" - }, - { - "Title": "查看" - }, - { - "Title": "查看" - }, - { - "Title": "查看" - }, - { - "Title": "查看" + "Title": "更多...", + "Url": "https://www.baidu.com" } ], "Task_id": "钉钉消息任务ID" diff --git a/ServerCommands/钉钉/发送日报消息到钉钉.json b/ServerCommands/钉钉/发送日报消息到钉钉.json new file mode 100644 index 00000000..b408ee01 --- /dev/null +++ b/ServerCommands/钉钉/发送日报消息到钉钉.json @@ -0,0 +1,235 @@ +{ + "Name": "发送日报消息到钉钉", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon", + "Parameters": [ + { + "Name": "汇报ID", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "24" + } + ], + "InvokeTriggerTestData": { + "UserName": "Administrator" + } + } + ], + "Commands": [ + { + "$type": "ApplicationServerOperationCommand.GetAppBaseUrlCommand, ApplicationServerOperationCommand", + "ParamName": "baseUrl" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "汇报信息", + "TableValue": { + "TableName": "汇报记录表", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "c4c85967-163a-4778-af21-74bf0de0b8bd", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "ID", + "GUID": "0e93dc38-27a6-4f43-8d1f-259e2ed63004" + }, + "ColumnName": "ID" + }, + { + "GUID": "4a352d5e-d89c-4c7d-bf24-c09b792e0c26", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "开始日期", + "GUID": "558f2e8b-d834-4550-9071-faa795353960" + }, + "ColumnName": "日期" + }, + { + "GUID": "efa0143d-f403-49da-b4c8-dd67b97ed18a", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报对象", + "GUID": "f039b950-9b7c-4f2b-b7ee-59efe980fe9c" + }, + "ColumnName": "汇报对象" + }, + { + "GUID": "d82fb480-c470-4842-9c22-fca24e0776b0", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报类型", + "GUID": "6ff51c49-9039-4eb8-b8a8-96e949ab2c3f" + }, + "ColumnName": "汇报类型" + }, + { + "GUID": "9c542390-a435-4279-9ca9-4fcc3c14325d", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报人", + "GUID": "85bf0bc0-52ba-42bc-9439-c1a9801d04a1", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "汇报人" + }, + { + "GUID": "f3556ae4-e1e9-4dbc-8199-0ba2747b7b71", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报人", + "GUID": "10e12df8-125c-466e-9b70-4bce9bc43281", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 8 + } + }, + "ColumnName": "汇报人_组织上级" + }, + { + "GUID": "bb7a271e-488b-41e0-a152-b06331cea346", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "内容", + "GUID": "4ae3db68-4d61-4995-90ca-e2f92f654771" + }, + "ColumnName": "内容" + }, + { + "GUID": "4d75fd9d-7798-4c8e-b2fe-8d69d86b34a2", + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "总工时", + "GUID": "f2b71908-1c86-469e-a9f9-1b8487e971e3" + }, + "ColumnName": "总工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "ID", + "GUID": "3c264ea1-de8e-481f-b05d-530d9505afdb" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报ID" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "f4635eb887aa4179b89d7345df2faef7" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报信息" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "Operation": 17, + "OperationParamaterAName": "|", + "OperationParamaterBName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报信息.汇报人_组织上级" + }, + "OutParamaterName": "组织上级数组" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=组织上级数组" + }, + "Operation": 19, + "OutParamaterName": "组织上级数组" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=组织上级数组" + }, + "Operation": 16, + "OperationParamaterAName": ",", + "OutParamaterName": "组织上级" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "跳转URL", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=baseUrl&\"汇报详情?id=\"&汇报ID" + }, + "ID": "c28fd4468d4148e8b8a79bc915502b81" + }, + { + "$type": "ContentEditor.ContentEditor, ContentEditor", + "Content": "### [=汇报信息.汇报人&\"的\"&汇报信息.汇报对象&汇报信息.汇报类型]\r\n[=汇报信息.内容]", + "Result": "生成结果" + }, + { + "$type": "DingTalkPlugin.Asyncsend, DingTalkPlugin", + "Userid_list": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=组织上级" + }, + "MsgType": "action_card", + "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": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报信息.汇报人&\"提交的\"&汇报信息.汇报对象&汇报信息.汇报类型" + }, + "Action_card_Single_title": "查看详情", + "Action_card_Single_Url": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=跳转URL" + }, + "Action_card_Btn_orientation": "0", + "Action_card_Btn_list": [ + { + "Title": "查看详情", + "Url": "https://www.baidu.com" + }, + { + "Title": "更多...", + "Url": "https://www.baidu.com" + } + ], + "Task_id": "钉钉消息任务ID" + } + ], + "ID": "54443f00-aa2e-4adc-9790-6da16cd2b90e" + } + ] + } + ] +} \ No newline at end of file diff --git a/ServerCommands/钉钉/批量同步所有用户UserID.json b/ServerCommands/钉钉/批量同步所有用户UserID.json new file mode 100644 index 00000000..f134f919 --- /dev/null +++ b/ServerCommands/钉钉/批量同步所有用户UserID.json @@ -0,0 +1,146 @@ +{ + "Name": "批量同步所有用户UserID", + "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" + ] + } + ] + } + }, + "InvokeTriggerTestData": { + "UserName": "Administrator" + } + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "用户列表", + "TableValue": { + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "731660ff-5bbd-41ba-b54a-856a47d40bf3", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "8d823ac0-83b0-4d0e-ab80-c7e9261b4b49" + }, + "ColumnName": "用户名" + }, + { + "GUID": "0c3518d2-0de2-4071-86c0-ebdcd3161099", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "邮件", + "GUID": "2fb73d28-4319-434f-851e-c554170418f4" + }, + "ColumnName": "邮件" + }, + { + "GUID": "252fa0a6-bd5c-4fac-8345-89b42f82a9c9", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "52c1dc14-e0c0-4438-9615-321ec3e8996c" + }, + "ColumnName": "全名" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "DingTalkUnionID", + "GUID": "d7205a45-e0a7-42c7-8153-55bf43737998" + }, + "Value": "%Null%" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "DingTalkUserID", + "GUID": "5a6555f4-7dcf-4eb2-9f35-ed7e19f84334" + }, + "Value": "%Null%" + } + ] + }, + "NullFormulaValueQueryPolicy": 2 + }, + "ID": "42a09959a21547a2b74f393964494529" + }, + { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户列表" + }, + "LoopItemParamName": "Item" + }, + "CommandList": [ + { + "$type": "DingTalkPlugin.Getbyunionid, DingTalkPlugin", + "UserName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.用户名" + }, + "UserId": "UserId" + }, + { + "$type": "UserManagementCommandsV2.UserManagementCommand, UserManagementCommandsV2", + "OperationType": "202", + "CommandOperator": { + "$type": "UserManagementCommandsV2.UpdateUserOperator, UserManagementCommandsV2", + "UserName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.用户名" + }, + "FullName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.全名" + }, + "Email": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.邮件" + }, + "ExtendedProperties": [ + { + "Name": "DingTalkUserID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=UserId" + } + } + ] + } + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "执行完毕" + } + ] +} \ No newline at end of file diff --git a/UserControlPages/汇报卡片.json b/UserControlPages/汇报卡片.json index b4dab368..91f116f7 100644 --- a/UserControlPages/汇报卡片.json +++ b/UserControlPages/汇报卡片.json @@ -164,9 +164,9 @@ }, "4,1": { "CellType": { - "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor", - "ShowToolBars": false, - "ReadOnly": true + "$type": "editormdPlugin.editormdPlugin, editormdPlugin", + "Toolbar": true, + "Pren": true }, "TemplateCellSource": "内容" }, @@ -387,11 +387,11 @@ } }, "Spans": [ - "4,1,1,11", "9,1,1,1", "9,2,1,1", "1,1,1,9", - "6,7,1,5" + "6,7,1,5", + "4,1,1,11" ], "PageInfo": { "$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon", @@ -519,4 +519,4 @@ "PaperSize": {}, "Margin": {} } -}//Y5je/S7+rj8Hydrq0SJbjsSAKdhwmONFIOvxlpxC7McDdwQrYOYTbmJVcY/RMTjMThKQnsmeTqq2JzXoCQ0dVyaE509bELZ6fCtpZDe4hORLoIt8ppeY9haq7RxjfmORTNhPTyi4Hj+D41bIgiDlJ5166aoZY68RKu0GxIv6wRqac8f6KlrVsCkLee2+ecE0G1RQ6PNsGjc7oDsbcuTOhxhytyE29PYNdtv63zP6dB43szj5fCOeIWjSMD4EqbwzNFabuYRHPOpGiTcPmk3HgeBUHhPLF7q9V8zJYkwGxvqabv0I6wOMHmx8ISo2bjsqCjkIxtIWvHtuyXiWxj1KTT1IdNsDOQYIJd53kUBA++o9iRJMNyvS5JprG5pZNwKY/IV2r/FwFQVZh48aurC7VYS9fXYlq9p9bW5bkqVE3S2tOQEqHCuyrBf20XoCt07rWtHl2kQ1ZIUx9/LWoQfWF8MV7Wo+E3aAfUE4f+DD4AYL+K7r5t38QrM1FWPM6dg8d6RA/4oHvHemdMLthLTTZfmtI5mrep/Fpn4MVmc4GLmnBGJyVjhLHh1cyTHwgJLK8RuK1DlJ8/zrrHs/8McH3PCJsbMQwLpvnVmUE4mpvv2jRNyAL/Z3zoPGr+zkrHBTNNFhkIvEclgMksUs0QFWdMaKrBBYMlKBHVpPylbwWF0JARGQ8RiPLuxNpbw77u1aom/+AIyOsE7zdlmUOzgpptLZoM1CrHLRWATILqntLb7y38x2z5zeWAhWAu9c32aS69V1L5F8ypV/xCNBTLzvrzYwa3S0yeDClxfna+vPOLP8aS5bP7Ao3StLB4NNLXh4R4oW2sayyBvhGU32Tdd0VhAxf62IcTXLNAtMtuc8F1RcXsUHD2mNU5iqauhVzspTx01rxjQGoJA4qOAX30OqJw==|920 \ No newline at end of file +}//+JogOc6MfkprkZDSNhxc3GtwKYFmmw9JgqRPO+DQOyx27iztOppaMGRfO5n+Ncq1k2eqv4QFrc7nG8nmvfvlsZtvZKKkQXzkA7fnbEcZlY0m1oehQNeYIn9AY2BE2eGJC1YrvTtn6uP0ndWGMbWdOc29eInDEfIBw4Tmnv0elGGMaZcNKRZBxNADDYqGsjdDXbX4XjtNhk2Br8IGtOL8wKQ8ZbLS7ZheDjXzDzsTN6AJ6KPsKrlKwANYAzH43IHgoizaOdCeKNve37lz6yntCqgYC6EzeJMhHjB6dVCzf6V3RzpE8ABsnhRRDBSKaF+0IWrlb1AwBZI7XVTMs6LEOVyfnll5YZygwP4ht35UeOXTIAi23EPrwAeP7r5owsdPzKeI9U9VxCqFkKP3hRxDEQzx1EZVIzr35wlmft7EOQtkEs3EEF2QcbKpxkvG96QQYtF6JpBHyy1A6KNTwweVMGkn3YX/IuO2gzp+LOxTD1UlZamjF1ivCP8oHoGR8dyXyDYBpSWXEjXnisdm8aENDt0JeUUdYLgmlyTPf7s1u/UvHqLZ0VuQf4JYmGCwWEc+cwW7ELr08j+RGHOhGZpqkwDeAP3/VpfhzL08An8PUNvLRpF6e5k+43+zQLRyA90NKX+6ypyCvJPjmvaDlCjqoQjIHVPXG7gkQBFKjj9UbkKLBQbc4uRBvCr1uS3kG2HWBtNi11Daru8Jrs6hKhGMOd8wVPF24sDlh3x5HYi8dl8epUAUo1RCK9goR6Oj/6bNCx0kTadH5SZES9ELMUa6ysSm+nNueSZc37m19GIzAhqIpwUA1PhnYGcZihKHFlfumEwdZtAH/VgIAkYPhycc91aKYHM+6yFqxsQYh35+9AobadEfcRWDbycSMUfu6qjwNd42jRL9o0E7FFIjM6HFGg==|920 \ No newline at end of file diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3 index 8e236673..19be44f7 100644 Binary files a/UserServiceDB.sqlite3 and b/UserServiceDB.sqlite3 differ