From 3bc84df6b0ebd6bd97dabacacbe82d0465883f00 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Fri, 22 Nov 2024 13:27:55 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E5=AE=8C=E5=96=84=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E5=88=9B=E5=BB=BA=E5=8A=9F=E8=83=BD","MessageType":2,?= =?UTF-8?q?"Modules":[{"State":1,"Type":11,"Name":"UserService"},{"State":?= =?UTF-8?q?4,"Type":1,"Name":"PCPage/=E9=80=89=E6=8B=A9=E5=8F=82=E4=BC=9A?= =?UTF-8?q?=E6=88=90=E5=91=98"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E9=92=89=E9=92=89=E4=BC=9A=E8=AE=AE"},{"Stat?= =?UTF-8?q?e":1,"Type":27,"Name":"ServerCommandPrivate/=E9=92=89=E9=92=89?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86"},{"State":1,"Type":27,"Na?= =?UTF-8?q?me":"ServerCommandPrivate/=E5=88=9B=E5=BB=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=BC=9A=E8=AE=AE"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 63 +-- Pages/e58b161ccf7d4429955ac9e5e68d551.json | 4 +- Pages/会议/发起钉钉会议.json | 355 ++++++++------ Pages/会议/选择参会成员.json | 508 +++++++++++++++++++++ Pages/{项目 => 会议}/选择参会成员.rd | 6 +- Pages/项目/选择参会成员.json | 295 ------------ ServerCommands/钉钉/钉钉事件处理.json | 198 +++++--- ServerCommands/项目/创建项目视频会议.json | 2 +- UserServiceDB.sqlite3 | Bin 606208 -> 606208 bytes 9 files changed, 865 insertions(+), 566 deletions(-) create mode 100644 Pages/会议/选择参会成员.json rename Pages/{项目 => 会议}/选择参会成员.rd (57%) delete mode 100644 Pages/项目/选择参会成员.json diff --git a/.collaboration b/.collaboration index 7deb19ca..aa2b7e22 100644 --- a/.collaboration +++ b/.collaboration @@ -2446,18 +2446,7 @@ }, { "ModuleName": "UserService", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T13:19:18.803639+08:00", - "ModuleType": 11, - "ToRemoveFiles": [ - "UserServiceDB.sqlite3", - "CloudStorageProvider\\data.json", - "SecurityProviderV2\\data.json" - ] + "ModuleType": 11 }, { "ModuleName": "CustomLibrary", @@ -2489,19 +2478,7 @@ }, { "ModuleName": "PCPage/选择参会成员", - "State": 4, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T13:15:53.4667947+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\选择参会成员.json", - "Pages\\项目\\选择参会成员.rd", - "Pages\\e58b161ccf7d4429955ac9e5e68d551.json", - "Pages\\e58b161ccf7d4429955ac9e5e68d551.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Image/视频会议3.svg", @@ -2553,19 +2530,7 @@ }, { "ModuleName": "PCPage/发起钉钉会议", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T12:57:24.5945096+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\会议\\发起钉钉会议.json", - "Pages\\会议\\发起钉钉会议.rd", - "Pages\\0fc62e2b756949678106d2a2a72a491.json", - "Pages\\0fc62e2b756949678106d2a2a72a491.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/服务端命令1", @@ -2585,16 +2550,7 @@ }, { "ModuleName": "ServerCommandPrivate/钉钉事件处理", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T13:05:17.2755815+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\钉钉事件处理.json" - ] + "ModuleType": 27 }, { "ModuleName": "Image/默认头像.png", @@ -2622,16 +2578,7 @@ }, { "ModuleName": "ServerCommandPrivate/创建项目视频会议", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T12:55:29.8765938+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\项目\\创建项目视频会议.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/获取业务配置", diff --git a/Pages/e58b161ccf7d4429955ac9e5e68d551.json b/Pages/e58b161ccf7d4429955ac9e5e68d551.json index addb19cf..c2d000b0 100644 --- a/Pages/e58b161ccf7d4429955ac9e5e68d551.json +++ b/Pages/e58b161ccf7d4429955ac9e5e68d551.json @@ -23,7 +23,7 @@ }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 736.0, + "DesignLengthInPixel": 553.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -98,4 +98,4 @@ "PaperSize": {}, "Margin": {} } -}//ydutxQWNZmS7ahk7BrzSQZidGTek5VBck/05vgshWgXqge3okTA77gj2eOoguzuXdKrBo558p8MCZzgS95QAkG9Ys6pd/xc54GdmGsxhj/LkzA1Tw9TLlmeIUi8856dAOnH4OhU/24qa+kFH9iffQcfmi4ydZWNTX/4PqCmPrUPKVp2/VZvuZlXgVCYc58EIIdULVTT7ZcIaBsO99YKoY+L6EyPzslQbbjAD8IFmsPhdx3Sz5b2PNvFTLsrzQwmmcjnu8outAg30x7og2Xi7A7/SWa6y6hJ8vcSM/fX0CtjzLHoQEooHwDC/wsslx8g3OMGyCJs0mXgr2KgO2c+5bYN6cB/B95fEGyyW7jZO5rwd+wws5XzbLKfJJz+We9uPww+7RpIrHff0j4x2AgL5AnRIaD81Y0McNA+DDGrV3AxTYbDw19rSuyTkUeEHxN7GTZtULUlhwKsCorexzp2Le7LnIzgl/zcyNdSVnGNR3ugkZSQBpyUWqNci4izkweg9vjCkWVvM+Ih7DdOlXSNkR9P+JXB+Tx3NePRhr5+7Lvb887ELxMuzBq9QVb0tfNLIJ9PZCwGMER0NRFKgAuJBBks6YqU/MsX1nbcE7tfyIQHi5yNb9QalUrzvtx3Kx3I4rVgxot7J8r351oIL+XgYPEpdd2hG/4O4Z7qCn+5aVsCtmOi7hT2686FBFQ+s2gJxCkiACCwqqmztV1jREd+4iMUuMTZAFWAty9RlMO51Bbrst/Yj9jgwuGG7Oomen8G+TRgFYJs2o1NoIaMBIY7efPlUbAu+iwZjSzRkabk8uvYOtwBjybXpXYe8K/On++hPz5cJQ45n3g9JWxjBCZ9MuQRA4lBUc8/8crao1B2cvVPbwMszWXXgJw9lbUEiC5HV+KbYRBhfluDHPfskMEuo8g==|920 \ No newline at end of file +}//ycHtlTIxlgW5BPnfwznw2YwkDJXJqGaMMCsaGg5O+2Z+eOUWcyOrfQN2khUp6XhOMTUv3No9kXA6Dahb0VvPjnh3j8zZgu2toBL1LsCSph0jysgdM2GOPdQNpILqNZRCAV/l6vos3EWlzVTDgKrTB/jUdFjmd0Q+casEq0PoQczb8vRv7R5iJzpk5VMB+OLDMoIoCo6mP2lqbuEWNNdExeMVI+VNfMX6/BVdQj62XukG24+AUNhLZtWLIzmQJz5ZUXk8gyw6LP1frwysNOZ9lbycNgy7A+vkEFP7odZ2T0g3jjOu2FpEqJE3FrBUcT1rIk+2qv+66/5EWwwt96gQFGoOSIA6ErPkDIklQp7RE4LimioQyTaxWg+KPsgjKkDBURaAOj4RtbTf0082JNeL/ocAupUaIuZWUKmwrJlRAXs+q/yFp+7UQrXptf7DjYmHXxF+iI5DrBqZv7HHuNcVM2k9GegV9TdQwnV+dl8diOn7Izi1w4Zkt1SUVedxSu17/cYdwvnooNOscwOmvt55pRojm7ts1o76cVIYP0ApMiv9XA3qyv78Xzh/tXhwYbgxaRKtHFwttySDJze9tfIGUlV5URYIkOOSrL+9z/7cN5UHbpuvfxOZdQalOagB90Cgo1V9bKHXqmp21p8lWvzxLsmG/zVVRWc3eU5D/r75whCboHC7g6jgaQnAtoLZUfK/BfbP0uk2zgNHfszifm5vqkBy9IEC8vmtp2W/jWLAqEkcvRrPk0y14cB18gHUnKW6KkKNO9/FDMrkf1dxFZHH1rUEdq/2ivb4dPpbBfgemH5stwSn4yk0W9wY1Zvct99hFtN/xICapDcb+EqrPfpQlXgYgM0HMZLsuBCK4f5MqfHBNWvjllJHd70T0N12+r2Q3Mpkkl3rciW1sGyoD/vnRg==|920 \ No newline at end of file diff --git a/Pages/会议/发起钉钉会议.json b/Pages/会议/发起钉钉会议.json index 5b96c716..34f336e5 100644 --- a/Pages/会议/发起钉钉会议.json +++ b/Pages/会议/发起钉钉会议.json @@ -294,22 +294,66 @@ "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "xTools.Commands.xGetTableSelectRows, xTools", + "$type": "xTools.Commands.xTableToJson, xTools", "TableName": "图文列表表格1", - "ToParameter": "选择行", - "BreakpointIdentity": "908b8e49-79c9-482a-bce3-efcba09abd3c" + "ToParameter": "表格数据", + "BreakpointIdentity": "c4f9e2eb-372c-4569-869f-bcf2d6fdaf29" }, { - "$type": "CollectionOperationKit.ClientSideArrayOp, CollectionOperationKit", - "Operation": 16, - "InParamaterName": { + "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", + "JsonString": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=发起钉钉会议!选择行" + "SerializeProperty": "=发起钉钉会议!表格数据" }, - "OperationParamaterAName": ",", - "OperationParamaterBName": "项目成员", - "OutParamaterName": "项目成员数组", - "BreakpointIdentity": "b483bcef-277e-4621-a1b4-36a162c30d70" + "ToParameter": "表格数组", + "BreakpointIdentity": "0e8eae15-c12a-4509-8022-db9ad1a6deb0" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=发起钉钉会议!表格数组.Count" + } + ] + }, + "value": "0", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "CollectionOperationKit.ClientSideArrayOp, CollectionOperationKit", + "Operation": 16, + "InParamaterName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起钉钉会议!表格数组" + }, + "OperationParamaterAName": ",", + "OperationParamaterBName": "项目成员", + "OutParamaterName": "项目成员字符串", + "BreakpointIdentity": "b483bcef-277e-4621-a1b4-36a162c30d70" + } + ], + "ID": "db6c0b6a-ee10-415e-93d8-3d3f038107ad" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目成员字符串", + "ID": "102cc30e9ccf4be684452f8bc891998c", + "BreakpointIdentity": "9b8a49b3-3016-482e-9435-9df8ecdcf9d3" + } + ], + "ID": "7475d70f-ff72-4bce-9cb1-ba7b9cf98dd1" + } + ], + "BreakpointIdentity": "3c2060c3-5b57-46c0-81d2-9282414523c2" }, { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", @@ -318,7 +362,7 @@ { "Source": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=发起钉钉会议!项目成员数组" + "SerializeProperty": "=发起钉钉会议!项目成员字符串" }, "TargetCell": { "SerializeProperty": "=选择参会成员!排除成员" @@ -459,6 +503,19 @@ "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中", + "VBalidate": true, + "BreakpointIdentity": "3d1588db-5d4f-4c2e-b9ad-077aa8b2b2a1" + }, + { + "$type": "xTools.Commands.xTableToJson, xTools", + "TableName": "图文列表表格1", + "ColArray": "UnionID", + "ToParameter": "表格数据", + "BreakpointIdentity": "322c5947-8ea1-4da8-a0fe-7e1ed6012da2" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -469,7 +526,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=发起钉钉会议!项目ID" + "SerializeProperty": "=表格数据" } ] }, @@ -477,19 +534,6 @@ "compareType": 1 }, "CommandList": [ - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "Title": "加载中", - "VBalidate": true, - "BreakpointIdentity": "3d1588db-5d4f-4c2e-b9ad-077aa8b2b2a1" - }, - { - "$type": "xTools.Commands.xTableToJson, xTools", - "TableName": "图文列表表格1", - "ColArray": "UnionID", - "ToParameter": "表格数据", - "BreakpointIdentity": "322c5947-8ea1-4da8-a0fe-7e1ed6012da2" - }, { "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", "JsonString": { @@ -511,133 +555,144 @@ "OperationParamaterBName": "UnionID", "OutParamaterName": "参与人UnionId", "BreakpointIdentity": "f4d4e85c-dbc7-41b3-b3ae-7cfa3fe3990b" - }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "创建项目视频会议_页面", - "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": "=发起钉钉会议!B3" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "开启云录制", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=发起钉钉会议!B13" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "自动拉会", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=发起钉钉会议!B14" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "参会人员UnionId", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=发起钉钉会议!参与人UnionId" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "ReturnPropertiesTo": [ - { - "ResultPropertyName": "会议ID", - "ResultTo": { - "SerializeProperty": "会议ID" - } - } - ], - "RefreshAfterFinish": true, - "CheckDataValidation": true, - "BreakpointIdentity": "dbe14671-439e-4003-bc71-ec2fb2bc1fc7" - }, - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Title": "加载中", - "VBalidate": true, - "BreakpointIdentity": "d8cf3a26-3d2d-4739-893a-337e9b7ba583" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=发起钉钉会议!code" - } - ] - }, - "value": "0" - }, - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=发起钉钉会议!msg&\"，会议ID：\"&发起钉钉会议!会议ID" - }, - "BreakpointIdentity": "25ee5768-d52f-4965-85da-39c632c5c7ef" - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "BreakpointIdentity": "d4689739-de6c-40df-85cf-4ae41f712a8d" - } - ], - "ID": "ac9d39f9-b3d2-4c15-a58f-7856d9730271" - }, - { - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "warning", - "Title": "温馨提示", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=发起钉钉会议!msg" - }, - "BtnText": "知道了", - "BreakpointIdentity": "42da755d-5e1d-406f-9547-5361035a0bb5" - } - ], - "ID": "c4aebf59-32d4-497e-a1c6-9554d9acfd91" - } - ], - "BreakpointIdentity": "4c10cefe-a28f-4c58-8132-0eff5e7976f5" } ], - "ID": "214519e1-35c6-4d2b-9771-a117d668006a" + "ID": "74145e77-1c71-4019-9d20-cc75a6b81f18" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "参与人UnionId", + "ID": "05c4c290097148a7b184b5ece86d979b", + "BreakpointIdentity": "c27ff745-d3f2-4f0b-bdf3-e035959490ae" + } + ], + "ID": "15782806-f5b7-47b3-9e01-7a0729ae31e6" } ], - "BreakpointIdentity": "4be28bf5-7693-4ae2-a6fe-0bd8f67e3e02" + "BreakpointIdentity": "3fe835d1-b5a2-4ffb-b3e4-c39de428bf95" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "创建项目视频会议_页面", + "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": "=发起钉钉会议!B3" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "开启云录制", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起钉钉会议!B13" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "自动拉会", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起钉钉会议!B14" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "参会人员UnionId", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起钉钉会议!参与人UnionId" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "会议ID", + "ResultTo": { + "SerializeProperty": "会议ID" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true, + "BreakpointIdentity": "dbe14671-439e-4003-bc71-ec2fb2bc1fc7" + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中", + "VBalidate": true, + "BreakpointIdentity": "d8cf3a26-3d2d-4739-893a-337e9b7ba583" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=发起钉钉会议!code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起钉钉会议!msg&\"，会议ID：\"&发起钉钉会议!会议ID" + }, + "BreakpointIdentity": "25ee5768-d52f-4965-85da-39c632c5c7ef" + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "BreakpointIdentity": "d4689739-de6c-40df-85cf-4ae41f712a8d" + } + ], + "ID": "e3c5fa36-de97-4641-aa4f-48ee87b25adf" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起钉钉会议!msg" + }, + "BtnText": "知道了", + "BreakpointIdentity": "42da755d-5e1d-406f-9547-5361035a0bb5" + } + ], + "ID": "49fb1504-39f6-439c-840c-d46f6085f6fc" + } + ], + "BreakpointIdentity": "4c10cefe-a28f-4c58-8132-0eff5e7976f5" } ], "Text": "发起钉钉项目会议", @@ -816,4 +871,4 @@ "Formula": "发起钉钉会议!$I$18" } ] -}//01c8Gwh179LIrMxIpueMW2hfZP1VScCbrA3rj2ueqgcCJpuNGb9ov7D+HbyXJ3ZkCUNaOJhDqWZgJU8PvjjeVFxRwOyqqxg0n/Q4FrBEklz5xHlTbw6Eo5S+0kga9GIKRDiukyCjFDzQT0jVBW5qgFVMZTsO60hj7D3qelqDME/egjuHUAX6KgyWQW8wB6mIr+U63/3b+TMKlHxt65NaZa8TqXlo4E7MdkH5xxAteSMm+fQy8uIr4zSAD6tQIQ7EwnHws22N8fa3XtCNRw+3bAnguLUjPCPGlt2JwMYqAU9SljnGV9xJym099yJjrJdi62lWou1C4RngAISNR5sJlg74Isltz1+mpAIBVWWimtJJCwFlp8pqkWC16lJsmJVqSS0g0DnnldiYR5MXuH7vh6l5X/BlIDS7Cb4r6e7Yae4MLbc3HzkHcGt5fxWWWiJbjWkt2e7RuPkjWRiHMBlITRNGEI2EPsQWEe+r+osFizGEpvSYHfR1KYS/0Lx6PNyI4iqPaRf5iRlJLVeG2drkZlQLbz1qEGDlJYZuzjfT+XmIzOM0bpxu/7YLoKbVYpWQ1xDaxtXnNTLrgN5//AJfEUx2Mj85sNkX1Com6qF8J85x7to6XNPEjj94Cvr5hKHddxxyRfOvCILRASF0wBDui5qT8ok2oofunswhB9MkUVuRFqBUFxo93y1AZIrwYz9Rhn1r/rRMX3HBQOvErjwgyTz0Fef4xIsFo0YKS8ZhBkicd3twl12gMeG3f1A8b2qEdiVdjwrDHt7xTtlIHvyVguGgC7LuGWLKmd3GlFUCXcDwHxSsZTq0KP/11uAgwRIUjrTprZrOJxhzaUzcMUoE/Iaemze0YmqE2IsY8CpAKpJnm5sIGNK2zwUM3bK1Q0AbyMfjqPegTmAwFZ/xCy2vHQ==|920 \ No newline at end of file +}//49LYNzkZ7e98qZo3zfKAl+xhlGpkXVg2h6M3HEqvtH+UJS4Feto3cyMU1jeChWsEaSf1jsPeu/cNi8HyIowxH8jG/lM54/Bbl5xL0Ogig9dYAP2a89dYGewDEbxUpwfnAZKRfqBm6w5+rljBHVzDKVk16Y4hADuetONRDOqf65e6tXXuRDXizYgBwi3PfUkU+FnNvTqvp4GeEqkhHDeseQEq6sMM/0Vu5vQKQspxM+vFyvmLsDJRZt8GLfHCAg/zbz2JcwkaxkEH12US4h2hiEfVl5jMMXAEf+NuzZe73+/X7552xBpNjDuEtD3ePPXbbT7+0p4XMVBU3qFVegzjcc08P8Gg/WxoEZzDYKhNJbm5zTFd6b7hTGVsdoUdWu+3AreyPCAy5gYtMq6Ec2yeiR7Irrq+6zhCcjjKKygl43nqv5XOdymEdsr42W1RZNyYmlUSQllMNFwNqKv8hrCNkMnp71OpdeP7e54qYTLbJ6r3mVNqZWWHSlWyvGdo7PCVkgTtH0M59xfBYk/8oxGTFi/T3YYgC1ZX3VcSyAYEod+HBIAl+o0yrv63skIaqRngBavj2FyA4AjCUbTVq1YbPdnh0CuXBhM/5MplIUEq9LghdQx9rT4jehG5KI2DivHE7bO4fmP10fIWh7Mv2Rsju2x0P0e8lp8UvN1iMCVuZB8yzBuIVmQBzKiet8EMIvxzqs7IPOuNFEBypM5u3cJM3Me1W5jUpabv5fWByOojCO2b+r6jBvyk+0kHCk41LGtTLBQdbDjKL+tl9DDKqsXJ/2HOkVkSNVaehVttxvlYMpb9oat9Oio/wuoxvZyIwgSwvUlcr8mdpnATyP654ssj1ulGbBo0EaUKIwGvnFldCCrRwO+M6D8QgPsWlaaLoNvkP8HzJJcLmZGVNER0pltK+g==|920 \ No newline at end of file diff --git a/Pages/会议/选择参会成员.json b/Pages/会议/选择参会成员.json new file mode 100644 index 00000000..09c69308 --- /dev/null +++ b/Pages/会议/选择参会成员.json @@ -0,0 +1,508 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 538.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 29.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 42.0 + } + } + }, + "InLogicalVisibleIndexes": [ + 5 + ], + "Count": 6, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + } + }, + "Count": 30, + "DefaultSize": 32.0 + }, + "Values": { + "3,19": "关闭", + "3,25": "确认" + }, + "AttachInfos": { + "1,1": { + "CellType": { + "$type": "ElementUI.TreeCellType, ElementUI", + "selectCommand": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=选择参会成员!当前节点" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=选择参会成员!显示文本" + } + } + ], + "BreakpointIdentity": "dfc5c93d-3153-41bd-8f57-fbe3742c478a" + } + ], + "ParamProperties": { + "value": "值", + "label": "显示文本", + "parentValue": "父节点值" + } + }, + "isTreeNodeFromDb": true, + "configTreeNodeOptions": [ + { + "$type": "ElementUI.TreeCellTypeNode, ElementUI", + "value": "1", + "label": "节点1", + "icon": { + "Name": "Navigation/165_home_3.svg", + "BuiltIn": true, + "Color": "Background 1 -25", + "UseCellTypeForeColor": true + }, + "children": [ + { + "value": "2", + "label": "节点1_1", + "children": [ + { + "value": "3", + "label": "节点1_1_1" + }, + { + "value": "4", + "label": "节点1_1_2" + } + ] + }, + { + "value": "5", + "label": "节点1_2" + } + ] + }, + { + "$type": "ElementUI.TreeCellTypeNode, ElementUI", + "value": "6", + "label": "节点2", + "icon": { + "Name": "Navigation/169_user_2.svg", + "BuiltIn": true, + "Color": "Background 1 -25", + "UseCellTypeForeColor": true + }, + "children": [ + { + "value": "7", + "label": "节点2_1", + "children": [ + { + "value": "8", + "label": "节点2_1_1" + }, + { + "value": "9", + "label": "节点2_1_2" + } + ] + }, + { + "value": "10", + "label": "节点2_2" + } + ] + } + ], + "bindingDataSource": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "组织信息视图", + "BindingInfos": [ + { + "GUID": "a0153ff8-b6db-4501-8774-f87c2dfca3a4", + "BindingInfo": { + "TableName": "组织信息视图", + "ColumnName": "组织Id", + "GUID": "114499b1-167a-4fbb-881a-87ae78c3143e" + }, + "ColumnName": "value", + "Alias": "值" + }, + { + "GUID": "cbff16cd-7d87-4427-8187-08772261cf9f", + "BindingInfo": { + "TableName": "组织信息视图", + "ColumnName": "组织名", + "GUID": "4bf6ad77-48c5-4d79-8b47-b9cd4fd79ed4" + }, + "ColumnName": "label", + "Alias": "显示文本" + }, + { + "GUID": "98452d39-18a5-437f-86e9-9b5f6d628dc3", + "BindingInfo": { + "TableName": "组织信息视图", + "ColumnName": "父节点Id", + "GUID": "4d159e6a-4511-4257-a586-6ebbe211e9d5" + }, + "ColumnName": "parentValue", + "Alias": "父节点值" + } + ], + "CustomColumns": [] + }, + "emptyText": "暂无数据", + "isDefaultExpandAll": true, + "isClickCanExpandNode": false, + "isHighlightCurrent": true + } + }, + "1,7": { + "CellType": { + "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", + "TemplatePageName": "e58b161ccf7d4429955ac9e5e68d551", + "DataSourceType": 1, + "DataSource": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "da6b31a5-9165-4efd-b7ac-0c3b6f13bf9c", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "e4d98629-9e9e-4995-bfe8-d00c89aa5551" + }, + "ColumnName": "用户名" + }, + { + "GUID": "78bbac76-5376-40da-a15c-5a45832e07ae", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "14fe5794-f68a-4520-b7e6-4abd9adae86a" + }, + "ColumnName": "全名" + }, + { + "GUID": "3e815e8b-fef7-4f76-bbab-49c1430ed836", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "角色", + "GUID": "ef633b7d-8b44-4d4e-8454-78ac470b07b1" + }, + "ColumnName": "角色" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 9, + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "6015b51d-9db2-4924-b1db-7aca548a0b41" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=选择参会成员!排除成员" + } + }, + { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "公司", + "GUID": "3e1cd92f-b95c-4922-b1d0-57e553a9384b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=选择参会成员!当前节点" + }, + "LeftBracket": 1 + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "部门", + "GUID": "7037c185-7745-40b6-8acf-842b5e5b278c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=选择参会成员!当前节点" + } + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "小组", + "GUID": "6cf055ed-2ef7-4783-a0b7-15f0a285f0b1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=选择参会成员!当前节点" + }, + "RightBracket": 1 + } + ], + "RelationType": 1 + } + ] + }, + "NullFormulaValueQueryPolicy": 1, + "IsListviewDataSource": true, + "CustomColumns": [ + "用户名", + "全名", + "角色" + ] + }, + "DataSourceListviewName": "图文列表表格1", + "TemplateKey": "竖排横线分割", + "AlwaysReservedSelections": true + } + }, + "3,19": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "Text": "关闭", + "TemplateKey": "_RS_Information3" + } + }, + "3,25": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "PassListviewDataCommand.PassListviewDataCommand, PassListviewDataCommand", + "PassRowMode": 1, + "ImportMode": 1, + "PassValueItems": [ + { + "SourceCell": "用户名", + "TargetCell": "项目成员", + "IsPrimaryKey": true + }, + { + "SourceCell": "全名", + "TargetCell": "项目成员_全名" + }, + { + "SourceCell": "角色", + "TargetCell": "岗位名称" + } + ], + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=选择参会成员!H2" + }, + "Target": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起钉钉会议!B10" + }, + "BreakpointIdentity": "90840e7b-1604-462f-a327-c8aa0de85a7d" + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "BreakpointIdentity": "a0cf3906-8ac8-4e1e-bb42-ad33c56adaaf" + } + ], + "Text": "确认", + "TemplateKey": "_RS_Main1" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": 13.333333333333332 + }, + { + "BorderRight": 0 + }, + { + "FontFamily": 1, + "HorizontalAlignment": 2 + }, + { + "FontFamily": 1, + "Formatter": 3 + }, + { + "FontFamily": 1 + }, + { + "Background": 4, + "FontSize": 13.333333333333332, + "Foreground": 5 + } + ], + "Types": { + "Strs": [ + "Background 2 0", + "Body", + "Center", + "[AUTO]General", + "#FFFFFF00", + "black" + ], + "Borders": [ + { + "Color": 0 + } + ] + }, + "CellStyles": { + "1,1": 0, + "1,5": 1, + "1,6": 0, + "1,7": 2, + "3,19": 3, + "3,20": 4, + "3,21": 4, + "3,22": 4, + "4,19": 3, + "4,20": 3, + "4,21": 3, + "4,22": 3, + "5,1": 5 + }, + "SheetStyle": { + "FontFamily": 1 + } + }, + "Spans": [ + "3,25,1,4", + "3,19,1,4", + "5,1,1,4", + "1,7,1,22", + "1,1,1,5", + "5,7,1,3" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "排除成员", + "Formula": "选择参会成员!$B$6" + }, + { + "Name": "当前节点", + "Formula": "选择参会成员!$H$6" + } + ] +}//OWmMYTUDFDgxZAkZPG+GUTFKz9jnVSKugHJpqwaFBO9u7HsblCbUXMDp16upajJmxeIbTTA/k9zatKWDlijpnUhkrNrzUBsvY9tq5N8MkRNoLIBONSYSs9IbhvGI7Fhwv8y5Aa8FeL3wjTZjoTCcd0gAfAaunD6Y0WXovg8W7P67ucainIN+NeNlLvqf2wPoqQfVutC43FAbI1sYpw0DFLOk51Lt5etiovecNzorgQJOAGzEZh2OyARLU0pjoTlXbF2gxdVK9Jx6rT07PRiwcdehk8fYORw46+RllgWDa5ybahQndzWMaReNP/nYmtJ3h4lT1ZfURVQ8e/mPYsvUhB6LIskqQiwKX5c0LxaTWxD9ahBu9UUBgHWMcg+nxX6u6Mi+GrbZgWadOG8cWCMuBRUGTIuU0xyJ1Um0TSrCvA5DvpVTuEP6uGp8PJVNQe0PQPH6zpe9N8uIJmbzjBY/zS9pLMxYTBuRCWKp4PQcldNv/ioCCAzU4D95ahi2VawYwBADhxPuug9mhN4jJnmEjbksOR456iYRRIu6K1Dl3r1lIzw+Oqck97yTEt75J9fjKDPRpVGTdsn75nynPd+CcfwLhGzboMaP9iX72PzjNld2DFPEhA0PsCaUR8bkJXoc54MJSFsGhSlPAea1P6RqKW1GDqJStHrseB/I6P8nN5E+atWg34OafMzk7UaXFavNQQf901YwI/kpkXcuoE908JVWdXJRCyaUIEkOQL9P9qVKclSNRNPLo74QioCJ8KJbYjmPcVcSfrJkGM0tJyiRixpGLIx2+5qLVMZ7yAvnLQVHqxlB8xgYvx2bb3getRqtePhBljOFUatg70N4X9mw00kTL7ex/hUg6amC4PCwYaBwPCqg058A47p1DVpCEsRDCorTo2WwkSbJgNx33c4snw==|920 \ No newline at end of file diff --git a/Pages/项目/选择参会成员.rd b/Pages/会议/选择参会成员.rd similarity index 57% rename from Pages/项目/选择参会成员.rd rename to Pages/会议/选择参会成员.rd index 3afa89bb..3ceef683 100644 --- a/Pages/项目/选择参会成员.rd +++ b/Pages/会议/选择参会成员.rd @@ -1,11 +1,15 @@ { "PageType": 0, - "ColumnCount": 29, + "ColumnCount": 30, "RowCount": 6, "CustomNames": [ { "Name": "排除成员", "Formula": "选择参会成员!$B$6" + }, + { + "Name": "当前节点", + "Formula": "选择参会成员!$H$6" } ] } \ No newline at end of file diff --git a/Pages/项目/选择参会成员.json b/Pages/项目/选择参会成员.json deleted file mode 100644 index 1f697504..00000000 --- a/Pages/项目/选择参会成员.json +++ /dev/null @@ -1,295 +0,0 @@ -{ - "Rows": { - "RowColumnAttachedInfos": { - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 538.0 - } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 29.0 - } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0 - } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 42.0 - } - } - }, - "InLogicalVisibleIndexes": [ - 5 - ], - "Count": 6, - "DefaultSize": 32.0 - }, - "Cols": { - "RowColumnAttachedInfos": { - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "21": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "22": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "23": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "24": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "25": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "26": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "27": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "28": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - } - }, - "Count": 29, - "DefaultSize": 32.0 - }, - "Values": { - "3,18": "关闭", - "3,24": "确认" - }, - "AttachInfos": { - "1,1": { - "CellType": { - "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", - "TemplatePageName": "e58b161ccf7d4429955ac9e5e68d551", - "DataSourceType": 1, - "DataSource": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "用户信息视图", - "BindingInfos": [ - { - "GUID": "da6b31a5-9165-4efd-b7ac-0c3b6f13bf9c", - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "e4d98629-9e9e-4995-bfe8-d00c89aa5551" - }, - "ColumnName": "用户名" - }, - { - "GUID": "78bbac76-5376-40da-a15c-5a45832e07ae", - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "全名", - "GUID": "14fe5794-f68a-4520-b7e6-4abd9adae86a" - }, - "ColumnName": "全名" - }, - { - "GUID": "3e815e8b-fef7-4f76-bbab-49c1430ed836", - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "角色", - "GUID": "ef633b7d-8b44-4d4e-8454-78ac470b07b1" - }, - "ColumnName": "角色" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", - "CompareType": 9, - "ColumnBindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "6015b51d-9db2-4924-b1db-7aca548a0b41" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择参会成员!排除成员" - } - }, - "NullFormulaValueQueryPolicy": 1, - "IsListviewDataSource": true, - "CustomColumns": [ - "用户名", - "全名", - "角色" - ] - }, - "DataSourceListviewName": "图文列表表格1", - "TemplateKey": "竖排横线分割" - } - }, - "3,18": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "Text": "关闭", - "TemplateKey": "_RS_Information3" - } - }, - "3,24": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "PassListviewDataCommand.PassListviewDataCommand, PassListviewDataCommand", - "PassRowMode": 1, - "ImportMode": 1, - "PassValueItems": [ - { - "SourceCell": "用户名", - "TargetCell": "项目成员", - "IsPrimaryKey": true - }, - { - "SourceCell": "全名", - "TargetCell": "项目成员_全名" - }, - { - "SourceCell": "角色", - "TargetCell": "岗位名称" - } - ], - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=选择参会成员!B2" - }, - "Target": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=发起钉钉会议!B10" - }, - "BreakpointIdentity": "90840e7b-1604-462f-a327-c8aa0de85a7d" - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "BreakpointIdentity": "a0cf3906-8ac8-4e1e-bb42-ad33c56adaaf" - } - ], - "Text": "确认", - "TemplateKey": "_RS_Main1" - } - } - }, - "StyleDatas": { - "Styles": [ - { - "HorizontalAlignment": 0 - }, - { - "FontFamily": 1, - "Formatter": 2 - }, - { - "FontFamily": 1 - }, - { - "Background": 3, - "FontSize": 13.333333333333332, - "Foreground": 4 - } - ], - "Types": { - "Strs": [ - "Center", - "Body", - "[AUTO]General", - "#FFFFFF00", - "black" - ] - }, - "CellStyles": { - "1,1": 0, - "1,24": 0, - "1,26": 0, - "1,27": 0, - "3,18": 1, - "3,19": 2, - "3,20": 2, - "3,21": 2, - "4,18": 1, - "4,19": 1, - "4,20": 1, - "4,21": 1, - "5,1": 3 - }, - "SheetStyle": { - "FontFamily": 1 - } - }, - "Spans": [ - "1,1,1,27", - "3,24,1,4", - "3,18,1,4", - "5,1,1,4" - ], - "PageInfo": { - "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", - "PermissionData": { - "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", - "permissionResource": { - "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" - }, - "permissionBindings": [ - { - "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", - "roleNames": [ - "FGC_LoginUser" - ] - } - ] - }, - "RowBreakLines": [], - "RepeatRangeSettings": [] - }, - "PrintInfo": { - "PaperSize": {}, - "Margin": {} - }, - "CustomNames": [ - { - "Name": "排除成员", - "Formula": "选择参会成员!$B$6" - } - ] -}//Bhk9taJ1lnSQ+pRGG/ICGlXuzsacF5ll7SsUfIBpNm9QM1W4mDYD0HnvvSjV5pmwFdk7tWaYOSFtpvHSgHr7YE7NLpyLNQ4a4OeXUX/dsM6DxupmmTPg0/Ixmwfp4tgOBJIGeNbSAQPaydLgyQ4qK0/H433lqPR1oPoT2/Au3aV18zJ3W0ja+UYFncwiyh8fzDsdVEx8ZBpr+Yo28K9CPODyqHmF6jYWnzjeBh7eYb6dIgnbla81DVqNaCfvEJljsiJiAayChOUmHlj6ev6lL8Qt2+cRjwFdWwSrL8IeamxUvPBFOTOXhGztbFO/UVCNioUgvOBmFND3AQcDkdOOwBtkkeeYdu17HeEAJ71xX/p44WwNV9r9Pc1UB6u+b7zgDPxxn/B+NzmsQ/x5htW4AYDRxQeMe8SF4Nc0Kza2vll0nJs223hLHvR0+hAOwuc8ULYIaE0+OMkyeEhAvsYb2SeoqEXYUjNc0Lv0QSKUicG1EgUCIFyl+nqbkqRQaREn9ByoXzNhwyJ/Uif7CExPYK0/LpA881frhEye/ZDv+tt7Acy6Ui/FZjc0cLCfD0X272CpbI+Zir8gM4IhfZbdeIItIPTglQMNEgoFqYSfoDeyUMNYIamFG2MqOmvsckm9HsnCdveOYWRnhWKTab4RUOUH45YufqGIwToRk+Sw0yIwYK5Bx35lSQVoKnLO/hRLidSgrc3buh16s009WClpUE3TLhekfQFGDMM8TSgzskTDIOn4XfGIyEKgmAgADj3md8kmds0O5OAbX59Jsi8sgjNbuXudY8PnV56Zr3/UvfX9ikwJ6rX7ZfoenFnz0/yvrLA5lcL5XKc2k6sKoSuPfhPxvnrC3F7HOBsOfAdBQrsur8otu6OEZhsXfICNazF409zVCaKfMGQf8bo2fI6yOg==|920 \ No newline at end of file diff --git a/ServerCommands/钉钉/钉钉事件处理.json b/ServerCommands/钉钉/钉钉事件处理.json index b15ea57b..a677266a 100644 --- a/ServerCommands/钉钉/钉钉事件处理.json +++ b/ServerCommands/钉钉/钉钉事件处理.json @@ -233,7 +233,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "59ade27c-cd74-4899-a2bc-2dbb3db61215", + "GUID": "e2375363-e818-4ac8-943d-f5feb2aee451", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", @@ -244,7 +244,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "94586d2c-1555-4b9c-aaf7-6763163c83b3", + "GUID": "ec788f2e-51be-4a44-9f1b-a485021c46b6", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", @@ -255,7 +255,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "53440c0c-8cec-4ce1-ab4b-a516e8c60aac", + "GUID": "d24998cd-a1cd-4b35-9e7d-41ee82bc61aa", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", @@ -266,7 +266,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "9fb973e0-e14e-4ab8-a197-767bc2b1dea4", + "GUID": "d335f2f5-06f5-4451-bd78-ac9a33514d1f", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", @@ -277,7 +277,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "fa8b72e9-4b1f-4f91-b3ff-e9c41417878c", + "GUID": "4bcb7acd-d537-4d30-8ab6-0163b70d551e", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", @@ -304,7 +304,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "f0f10f374f5c446b99ba6fb178caa1c2", + "ID": "d8a1a70dfa0e41e2ab20c4dc2e9088ce", "BreakpointIdentity": "578fc267-2d96-4fd0-9ebe-470948482fde" }, { @@ -478,7 +478,7 @@ } ] }, - "ID": "31646ae1-075e-4065-b90c-d2ff27c5ac5f" + "ID": "8508d2ba-f886-4c18-b700-2670eb1d8309" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -616,7 +616,7 @@ } ] }, - "ID": "8e5f682a-da5d-44af-81e3-aed9f4a99511" + "ID": "299ecba6-1d10-464e-9303-7aa4a2f1886f" } ] }, @@ -625,7 +625,7 @@ ] }, "Comments": "会议创建事件", - "ID": "728e9f9f-4c09-403b-a597-6197f5ef3e52" + "ID": "7787890f-c3a6-4e0e-aefb-b06a3662727e" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -650,7 +650,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=(事件体.openConfModel.endTime/1000/60/60/24)+DATE(1970,1,1)" }, - "ID": "98006b4a641249f28067a1bf63441cc1", + "ID": "5ab7536987d54ea49a5f620379f30cfa", "BreakpointIdentity": "0f62e1fa-feac-4b59-8b89-2244064b9d79" }, { @@ -660,9 +660,30 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=事件体.openConfModel.confDuration/1000" }, - "ID": "0169cf7df65f46a4a54cc8d3c2aada2e", + "ID": "746a2ab72616499787b36bccb92be42c", "BreakpointIdentity": "f0c977f8-0e80-4d99-ad98-6b97538790d8" }, + { + "$type": "DingTalkPlugin.QueryConferenceMembersWithOptions, DingTalkPlugin", + "ConferenceId": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件体.openConfModel.conferenceId" + }, + "Result": "会议成员", + "BreakpointIdentity": "34389ae3-619a-4ffc-8206-9228abb5abd9" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=会议成员" + }, + "Operation": 16, + "OperationParamaterAName": ",", + "OperationParamaterBName": "UnionId", + "OutParamaterName": "参会人员UnionId", + "BreakpointIdentity": "03a57a76-76c7-43ee-9c64-b2036f54f4b3" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": { @@ -747,27 +768,6 @@ "CommandList": { "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", "$values": [ - { - "$type": "DingTalkPlugin.QueryConferenceMembersWithOptions, DingTalkPlugin", - "ConferenceId": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=事件体.openConfModel.conferenceId" - }, - "Result": "会议成员", - "BreakpointIdentity": "34389ae3-619a-4ffc-8206-9228abb5abd9" - }, - { - "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", - "InParamater": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=会议成员" - }, - "Operation": 16, - "OperationParamaterAName": ",", - "OperationParamaterBName": "UnionId", - "OutParamaterName": "参会人员UnionId", - "BreakpointIdentity": "03a57a76-76c7-43ee-9c64-b2036f54f4b3" - }, { "$type": "GETPOST.程序类.程序_延时, GETPOST", "CanShu": "3000", @@ -887,7 +887,7 @@ } ] }, - "ID": "6a4eaa77-beaf-454c-a70c-d80a4474e6ef" + "ID": "85571caf-5847-4c63-90d0-a6ad2fc3fa01" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -902,7 +902,7 @@ } ] }, - "ID": "76df59e7-781f-4b1b-a3fb-25679cbf1d1b" + "ID": "7ec95546-bae6-4f3b-8940-937c7f74d42e" } ] }, @@ -957,7 +957,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议结束时间", - "GUID": "58c30f10-6363-4820-96b1-8f8a22dd5f32" + "GUID": "9337cbc2-80d6-4335-8045-cabebf2108a6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -970,7 +970,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议持续时间", - "GUID": "e1416d74-1d2e-455f-b63e-496f3eb7a5fe" + "GUID": "b13d9b4a-757d-41f2-8a3a-19232821fdda" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -983,7 +983,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议状态", - "GUID": "48d4c6e5-9f41-49cc-bc22-692e9ca25642" + "GUID": "ad5b1cc7-b0c8-481e-98e9-3d503e5879a7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -996,7 +996,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "参与人", - "GUID": "c251c89c-c1be-405b-a93d-0013c8125075" + "GUID": "08cb4e44-d562-4e19-b5f2-85f2412fc382" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1009,7 +1009,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "关联钉钉会议ID", - "GUID": "7c589e9f-4d88-468e-861c-060e3e6150f7" + "GUID": "67ac4ffd-e4ef-4779-9734-cd180e97c7cc" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -1022,7 +1022,7 @@ } ] }, - "ID": "851399e1-f70c-460e-91ff-ba8e017f2782" + "ID": "1e63902a-8c6a-4d67-a494-37e3d7b26572" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -1160,35 +1160,115 @@ } ] }, - "ID": "cac60396-946a-4939-99ac-3df429eaabcb" + "ID": "09e7eb2e-5c95-42de-9f45-d8e9d0913b14" } ] }, "BreakpointIdentity": "6b485882-56b2-40ee-9c5b-71fbbd6cdd76" - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=code" - }, - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=msg" - }, - "BreakpointIdentity": "ca9ef66e-4b2d-4396-856b-990cc27ecf4b" } ] }, - "ID": "e5ab0413-2fb3-4e02-9143-932f281656c1" + "ID": "2cf94276-5118-4fdd-b27b-d159f15426fc" + }, + { + "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", + "CommandList": { + "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "会议记录表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "钉钉会议ID", + "GUID": "b44be0b2-4248-49e6-bbcc-10e9053de76b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件体.openConfModel.conferenceId" + } + }, + "UpdateBindingValues": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "会议结束时间", + "GUID": "35ecc0f1-a416-4179-bcd2-2333e6233ae0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=会议结束时间" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "会议持续时间", + "GUID": "0a53fb8e-f4be-4044-862a-2c48368ee279" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=会议持续秒" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "会议状态", + "GUID": "7e102a44-1673-49e6-91d1-20cd5e53776c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件体.openConfModel.status" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "参与人", + "GUID": "447e9b46-cef5-43ad-8d2b-b46ba2d2fb13" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参会人员UnionId" + } + } + ] + }, + "BreakpointIdentity": "d5a93709-9103-4195-872f-2e11aca75bff" + } + ] + }, + "ID": "55b4ec3b-001c-4af6-a5cb-4fcf9e14783e" } ] }, - "BreakpointIdentity": "547bde19-0c67-4591-b519-29e18c85ad2d" + "BreakpointIdentity": "a659bf23-4119-4e45-a22a-16c46b6c54a3" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "处理完毕", + "BreakpointIdentity": "ca9ef66e-4b2d-4396-856b-990cc27ecf4b" } ] }, - "ID": "066c7d53-e129-4639-b19a-cf8a07f036fb" + "ID": "5bb0408e-f66a-455d-979d-7fce9f5affc0" } ] }, @@ -1197,7 +1277,7 @@ ] }, "Comments": "会议状态变更", - "ID": "ad6d1d6b-1cc9-4a43-bdc0-9fe945989e68" + "ID": "8127a47e-dbc8-4805-b152-63dbf70c36f3" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -1316,7 +1396,7 @@ } ] }, - "ID": "734c2811-fee1-4636-b5bc-74f6f31b6438" + "ID": "f48c9c3b-76fa-4e57-9e7c-797438c9e6de" } ] }, @@ -1328,7 +1408,7 @@ } ] }, - "ID": "cc9b45be-d493-4102-8b38-04d55440ff28" + "ID": "b77b228b-b4c6-4d7b-824c-a11cb5872ea3" } ] }, diff --git a/ServerCommands/项目/创建项目视频会议.json b/ServerCommands/项目/创建项目视频会议.json index d98feea3..23c0c6da 100644 --- a/ServerCommands/项目/创建项目视频会议.json +++ b/ServerCommands/项目/创建项目视频会议.json @@ -304,7 +304,7 @@ } ] }, - "ID": "9b412800-09f5-4a8d-b485-957ef3ed016f" + "ID": "9c001645-7683-4792-994c-0757ca52c619" } ] }, diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3 index 2d81ddf8f6f0a8b677e5833ff87d9b94e69d5bd0..615941624429603c454b58f3d6282c30e56493cd 100644 GIT binary patch delta 62 zcmZo@P;F>Xoggh}#=yWZ1&Cq5Y@&`aqgi7@YXW0y0#j=Ob87-iYXWO)0$XbWdusy6 J)&$N4_5iLj4_E*I delta 62 zcmZo@P;F>Xoggi!%)r1f1&Cold7_RnqjF