diff --git a/.collaboration b/.collaboration index 5542820f..cff1f586 100644 --- a/.collaboration +++ b/.collaboration @@ -170,16 +170,7 @@ }, { "ModuleName": "Table/会议记录表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-16T13:51:17.3935982+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\会议\\会议记录表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Tables/Git", @@ -711,17 +702,7 @@ }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-16T13:47:27.5221707+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目标题.json", - "Pages\\项目\\项目首页\\项目标题.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目审批历史", @@ -1149,19 +1130,7 @@ }, { "ModuleName": "PCPage/发起钉钉项目会议", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-16T13:14:39.4001637+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\发起钉钉项目会议.json", - "Pages\\项目\\发起钉钉项目会议.rd", - "Pages\\0fc62e2b756949678106d2a2a72a491.json", - "Pages\\0fc62e2b756949678106d2a2a72a491.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/富文本编辑器", @@ -1797,16 +1766,7 @@ }, { "ModuleName": "ServerCommand/批量同步所有用户UserID", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-16T13:10:49.1717225+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\批量同步所有用户UserID.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/钉钉登录绑定账号并登录", @@ -1814,16 +1774,7 @@ }, { "ModuleName": "ServerCommand/dingtalkLogin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-16T13:11:27.1801924+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\dingtalkLogin.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/解绑钉钉", @@ -1831,16 +1782,7 @@ }, { "ModuleName": "ServerCommandPrivate/订阅钉钉回调事件", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-16T10:42:39.3089158+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\订阅钉钉回调事件.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/创建任务审批待办", @@ -1848,29 +1790,11 @@ }, { "ModuleName": "ServerCommand/创建项目视频会议", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-16T13:13:27.304255+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\创建项目视频会议.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommandPrivate/初始化钉钉配置", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-16T14:48:21.0412267+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\初始化钉钉配置.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/删除钉钉待办", @@ -2558,52 +2482,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-16T15:27:59.0222667+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\DingTalkPlugin.zip", - "Plugin\\Echarts图表-10_0_102_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\EL插件102版本.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\Forguncy.PassListviewDataCommand.zip", - "Plugin\\JSON 序列化和反序列化-10_0_102_0.zip", - "Plugin\\JSON数据源-10_0_102_0.zip", - "Plugin\\Lottie动画插图-10_0_2_0.zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAI套件-10_0_5_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_102_0.zip", - "Plugin\\UI操作工具箱-9_0_103_0.zip", - "Plugin\\Unlayer-9_0_103_0.zip", - "Plugin\\xTools快速开发工具包-9_0_4_0.zip", - "Plugin\\内容编辑器-9_0_103_0.zip", - "Plugin\\加载动画-10_0_102_0.zip", - "Plugin\\发送HTTP请求命令-10_0_102_0.zip", - "Plugin\\取消当前行-9_0_103_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_102_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0.zip", - "Plugin\\应用服务器操作工具集合-8_0_3_0.zip", - "Plugin\\异步运行命令-9_0_103_0.zip", - "Plugin\\支持预览的附件上传-10_0_102_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\标签页和打开标签命令-10_0_102_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_102_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_102_0.zip", - "Plugin\\设置焦点命令-10_0_102_0.zip", - "Plugin\\读取管理控制台日志-10_0_5_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -2647,42 +2526,18 @@ }, { "ModuleName": "Tables/系统", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-16T10:39:29.3061835+08:00", "ModuleType": 22 }, { "ModuleName": "Table/钉钉事件订阅表", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-16T10:39:43.4016385+08:00", "ModuleType": 7 }, { "ModuleName": "PCPage/项目会议", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-16T13:48:20.7170453+08:00", "ModuleType": 1 }, { "ModuleName": "Table/会议状态", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-16T13:50:24.7457272+08:00", "ModuleType": 7 } ] \ No newline at end of file diff --git a/Pages/0a1afa56cef44a3c88bd15e1ace1317.json b/Pages/0a1afa56cef44a3c88bd15e1ace1317.json new file mode 100644 index 00000000..311bff44 --- /dev/null +++ b/Pages/0a1afa56cef44a3c88bd15e1ace1317.json @@ -0,0 +1,281 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 33.0, + "Mode": 1 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 21.0 + } + } + }, + "InLogicalVisibleIndexes": [ + 5 + ], + "Count": 6, + "DefaultSize": 15.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 27.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 69.0, + "Mode": 1 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 134.0, + "Mode": 1 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 134.0, + "Mode": 1 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 536.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 94.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + } + }, + "Count": 10, + "DefaultSize": 24.0 + }, + "Values": { + "3,3": 0, + "3,4": "~", + "3,5": 0 + }, + "AttachInfos": { + "1,1": { + "CellType": { + "$type": "ElementUI.Tag, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "ColorList": [ + { + "color": "Accent 1" + }, + { + "color": "Accent 2" + }, + { + "color": "Accent 3" + }, + { + "color": "Accent 4" + }, + { + "color": "Accent 5" + }, + { + "color": "Accent 6" + } + ], + "separator": ",", + "size": "large", + "effect": "light", + "allowAdd": false, + "addButtonSettings": { + "width": 100, + "text": "添加标签" + }, + "ReadOnly": true + }, + "TemplateCellSource": "状态" + }, + "1,3": { + "TemplateCellSource": "会议标题" + }, + "1,8": { + "CellType": { + "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", + "Caption": " 自动拉会", + "Style": 3 + }, + "TemplateCellSource": "自动拉会" + }, + "3,3": { + "TemplateCellSource": "会议开始时间" + }, + "3,5": { + "TemplateCellSource": "会议结束时间" + }, + "5,3": { + "TemplateCellSource": "ID" + } + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": -1.0 + }, + { + "FontFamily": 0, + "FontSize": 12.0, + "Foreground": 1, + "HorizontalAlignment": 2 + }, + { + "FontSize": 14.666666666666666, + "Foreground": 3, + "Formatter": 4, + "HorizontalAlignment": 2 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 1, + "HorizontalAlignment": 5 + }, + { + "Foreground": 1, + "Formatter": 6, + "HorizontalAlignment": 2 + }, + { + "HorizontalAlignment": 5 + }, + { + "Foreground": 1, + "Formatter": 7, + "HorizontalAlignment": 2 + }, + { + "Foreground": 1 + } + ], + "Types": { + "Strs": [ + "Body", + "Text 1 50", + "Left", + "black", + "yyyy/m/d", + "Center", + "yyyy/m/d h:mm", + "\"结束时间：\"yyyy/m/d h:mm" + ] + }, + "CellStyles": { + "1,0": 0, + "1,1": 1, + "1,2": 1, + "1,3": 2, + "1,7": 2, + "1,8": 3, + "2,0": 0, + "2,1": 1, + "2,2": 1, + "2,3": 2, + "2,4": 2, + "2,5": 2, + "2,6": 2, + "2,7": 2, + "2,8": 3, + "3,3": 4, + "3,4": 5, + "3,5": 4, + "3,6": 6, + "3,7": 7 + }, + "SheetStyle": { + "FontFamily": 0, + "FontSize": 13.333333333333332 + } + }, + "Spans": [ + "1,3,1,4" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", + "ParentPageName": "项目会议" + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//aFRQ7IRW+3jtzTeLjw9cC7JlbvGXaZ/pncEPSmaBCXB+EUydcCdJWfhnLzn9E3lsJqqrZQblavhbfAHbfRGy5+usFHEah4sEL4eWUxHxapu5F7daCR2Hs978Z36HJ1IH/Yfw4e8nUNUpf+3y16A0B/IYD37I0rjOcKHG3U2fajeeZCaARC6H5pcmxLZKGBREaNaRUg6I2LUVsRA9bo728JmgpOJpPTiC4Hk6wvxc+NOXMHpay0iEsKIjQNymH8bff0ApEsjQdkE6dqFQEiWJ9+sZ9bW+SM03TI8uNzkYBVMkli+k7o5b+wG+BwJ05F5n3N0YZCOffyiOn6zDeS3FR8A6BSkQQg7rH3ZOa/MjRbPcMWz54GKPbnag+19aYV+EAxmquthiUvW/3FrRSPisgrRaixqWD/BZKQYAMVkp7N1pxNI4yWv51CO7RlL+IgZn+our6JLob7GQqlP8Duhr4hV3fAlV2ELt1iKFuJOny2FtSExl0pxl6ElqCriU/8G4ocwU89++F8UP15Kmz2h9QTDV+jX4V9q8YgKxn+gd7D8i6g6OyKTVb4slzgepoYccvcFH2B5afz4jJc6G35sV2zZ4BHxiM0gp+iKuTt9UWeiug/wPSAJFiwX17RDI/K4J+eNMvd5YJJe2wbTHGHavzM+bP6k2Y8Hga35Y2Ks3dg9kRamwrkgv+9COe58xkQ4RyI4/57wMZ9vryZK3YnAHoAzXfDpZsgrg05HvMHowy2RLy7Ti5nLebdPv0nTAjVbRv2hik6dJ1wgeLvjKcAK3yxMmWc70v/RtXri7zVRi5SirBT6Rygv+bvXIZ/bQTzzneoMJMyH9iHoJCBq6pVh25jsPhLm3UR8HDVh9kN2mi4vCvzOlIRnn1K7BYjUBkmcBQ7biOu4UN9a/PdyG+o0Dwg==|920 \ No newline at end of file diff --git a/Pages/0a1afa56cef44a3c88bd15e1ace1317.rd b/Pages/0a1afa56cef44a3c88bd15e1ace1317.rd new file mode 100644 index 00000000..f385eb24 --- /dev/null +++ b/Pages/0a1afa56cef44a3c88bd15e1ace1317.rd @@ -0,0 +1,5 @@ +{ + "PageType": 2, + "ColumnCount": 10, + "RowCount": 6 +} \ No newline at end of file diff --git a/Pages/项目/发起钉钉项目会议.json b/Pages/项目/发起钉钉项目会议.json index 10b632e5..27972021 100644 --- a/Pages/项目/发起钉钉项目会议.json +++ b/Pages/项目/发起钉钉项目会议.json @@ -193,7 +193,7 @@ "15,1": "发起钉钉项目会议" }, "Formulas": { - "2,1": "会议主题&会议类型" + "2,1": "项目名称&会议类型" }, "AttachInfos": { "2,1": { @@ -378,26 +378,60 @@ } }, "ColumnName": "岗位名称" + }, + { + "GUID": "ba4c73dc-2b80-490e-ad82-b5e652987c98", + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "db198add-0b74-4ae8-9b0a-fa4f0af18c18", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 5, + "AttachTypeTag": "DingTalkUnionID" + } + }, + "ColumnName": "UnionID" } ], "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目ID", - "GUID": "40916105-02ad-400e-9a87-f61698663ef1" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=发起钉钉项目会议!项目ID" - } + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "40916105-02ad-400e-9a87-f61698663ef1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起钉钉项目会议!项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "e4abbfbc-6498-43e9-b91d-d2d29afbe13e", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 5, + "AttachTypeTag": "DingTalkUnionID" + } + }, + "Value": "%Null%" + } + ] }, - "NullFormulaValueQueryPolicy": 1, "IsListviewDataSource": true, "CustomColumns": [ "项目成员", "项目成员_全名", - "岗位名称" + "岗位名称", + "UnionID" ] }, "DataSourceListviewName": "图文列表表格1", @@ -489,8 +523,8 @@ "ListviewName": "图文列表表格1", "Columns": [ { - "ArrayItemName": "用户名", - "Column": "项目成员" + "ArrayItemName": "UnionID", + "Column": "UnionID" } ] } @@ -550,7 +584,7 @@ "BreakpointIdentity": "d4689739-de6c-40df-85cf-4ae41f712a8d" } ], - "ID": "1038feb8-006c-4e93-9741-3a976d053f46" + "ID": "d499df1f-edc4-44d0-abd5-85e3cf89f504" }, { "CommandList": [ @@ -566,13 +600,13 @@ "BreakpointIdentity": "42da755d-5e1d-406f-9547-5361035a0bb5" } ], - "ID": "a926877d-4d3c-4486-a226-01e124d6a089" + "ID": "c68a2b03-0c49-44a3-afa4-508153b52bdc" } ], "BreakpointIdentity": "4c10cefe-a28f-4c58-8132-0eff5e7976f5" } ], - "ID": "7d83e6fd-94ae-4161-bace-9f30bd7c6a65" + "ID": "adf4b5d4-914b-467c-8bc6-b2d61323e1b3" } ], "BreakpointIdentity": "4be28bf5-7693-4ae2-a6fe-0bd8f67e3e02" @@ -593,6 +627,13 @@ "ColumnName": "ID", "GUID": "d9d6d8bf-2d0d-4713-a85c-2a146e0e0ec5" } + }, + "17,5": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目名称", + "GUID": "87e2401d-808d-40cb-ad9c-9198c46e15f4" + } } }, "StyleDatas": { @@ -710,7 +751,8 @@ "5,1,1,13", "12,1,1,13", "9,1,1,13", - "17,1,1,4" + "17,1,1,4", + "17,5,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -749,6 +791,10 @@ { "Name": "项目ID", "Formula": "发起钉钉项目会议!$B$18" + }, + { + "Name": "项目名称", + "Formula": "发起钉钉项目会议!$F$18" } ] -}//YPtlqLoPkyMU5n7Q9zTDluoiSmKKBvAR9T/cf7w0ZpiDKfvpNfq9UoDGZ65P2L1s7QiD59Zg8hnvszAC/uEmru9Nkznjqu3656+Wrb7ijnKmZN69lmmA0CacZKssvmPbym0jHp7cC9Sr6BbOdiWylyWTR0Oye/WAhYRhCz1S8De2w/9MpFo65yCXR2ur6HTHMRqAy3WENGCLne4OK+8JMuOKJnNITx1aVtR6vtwZIsNu/xUk3bSc+XHuuVjyJ1brdtVp8o9+RVyiCoq7d1I6ucXZEwwMNrfRVjsbUMGA+8mQEHzbakPHsWOJmszewhUlWmmCLsB3d26MGtXZ57eC6K79AOaoXQDNPhrwPMSDjjpRopadvyhZDURKM8aVOZBpWvjzQQRJ5lQJMtgnkBsd+6MomaC1/oFFWGYGPhyZw1qICdgv0DJJktDAoWiiB1KnTMHlp0mFJwuec6Yb23fiOuYpcqkEA/eY/03VwuK/eRRdh3BtJHO+p05E24GU3Xgv/wZ8EtQnaOBDdkiELnqi66k4q//tvJ9+dtKOIqUzsDm3MikUl4glh85UiRim1pIwc3d7lgxzFrm9PTlFNC5KObO6Ay+38fWpKBfExtseKshAsKZK4Woj829DcfAbvNw1k2wfCYzupD0q0QzAhXcgbLkNTlaDnGsT2qMZyVzhx9jv4nlatxGUJOcFCmDDPrqay5RYpelt8gX8icjRDg+qLIYjBcSCz5oaL+xYnC9hCZ34q34LTbn4k0c9QKihxSaRjXli/ScfQX/5XVIRsjOKlIreIM5AvyajCxSV8JJzInj5nlSg3BdEkV5Z9wcgLjGTj5uAj2EOECD5eh//oqk/F06L8vOwlVYgApOyGAG5bAJgBOFUFh1Bw8kJe6k9YqEGNmYpJshReA1320/4PfGO0Q==|920 \ No newline at end of file +}//P05Ih+0tbLOQVnoXXUPsiP8aSctvnjgC8QzUwc8pRcAoWwNdJgHPuPlaaXtlidom4NBqbCEj5nUeOJ9XmMoipkulV1PYLMOg/cD7E2HvPridXV/GnUgvJ0Q0ARhcz8KwlSRIjYE9KLDLV4dKCpC6goJXPNTVq0wDHuj0ljBtNZKL6SJRf7IOgt8+poGLYzI7Zem5/x+Q35FU9zqy0AyanONv6PgUgQ0YmDW0mvIuNx5wzYZPaH9tkl8Trnnqs9DCyJ77w+6Q7VFBTKSp99GVxXbPk4ItIrSJuyamzA6ZS1syG/wT/JspLsyL3chsfuv0uOct8sDyE38Ib5cRHTX8vJoazru8uanIWANSgojnzNVGBVlmE95R/p/FuvFQriwjSo5S5MimLdu3Ux7azN+rn8XIrv/sBmwSnEDKZy2e7ELtIKEd6zmR2fCiuiMoxpVZmn8Oqi05zEmbami7As8B9L+LFZO5KsKohtNhJXVkjdxyQSUhkoeHdCuT4WlLmg8Pmzr/Iz+3/VsEGavoQvRlu1OAC0rK9IaiC+NiYZUIiu2n4EkdxQKtxDH7mzRLEA5tahxklI1EOSBvbfrPoAb57fa4ezSS7J1ub1fe0zvoFnGVWMf8CIgRa2t5+h9D3/2sXMcXfCn1sp5TSnu9jRHC31+HzC8i4TLfM2623ltOQ6nya7jkcOb1SW95AsBqN1m62RiMgPe2sYnxDdM/0TVfIY/RZYumeC9FRd1Cw7biqK4wOm48UBSVi50OGBvzv1i+XlrxxrcFCbZRPuRQ6ihuMnzPLmD5jDmgbf3a8qg49rNTGMJ+kmBYnxbTPW06Eejm4/5AAho7N4WnJLuQ7NaJHmbQx4vSONRcYf/WxSaSRaXeXpkP1OR9ZRjBXxON8VLLJmGREMpj1AmuY5vl3dDV8A==|920 \ No newline at end of file diff --git a/Pages/项目/发起钉钉项目会议.rd b/Pages/项目/发起钉钉项目会议.rd index cf120e3a..50ac1dc8 100644 --- a/Pages/项目/发起钉钉项目会议.rd +++ b/Pages/项目/发起钉钉项目会议.rd @@ -3,7 +3,7 @@ "ColumnCount": 15, "RowCount": 18, "Formulas": { - "2,1": "会议主题&会议类型" + "2,1": "项目名称&会议类型" }, "CustomNames": [ { @@ -17,6 +17,10 @@ { "Name": "项目ID", "Formula": "发起钉钉项目会议!$B$18" + }, + { + "Name": "项目名称", + "Formula": "发起钉钉项目会议!$F$18" } ] } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json index 1c801b80..3de4acfd 100644 --- a/Pages/项目/项目首页/项目标题.json +++ b/Pages/项目/项目首页/项目标题.json @@ -258,7 +258,7 @@ "BreakpointIdentity": "93ac0fbb-69f7-4710-8707-64e964e081dc" } ], - "ID": "7feffdfe-b67d-418a-8181-b9230ae03dfc" + "ID": "87ba768a-4878-4e07-9e3b-732946b37120" } ], "BreakpointIdentity": "b0a3b176-ed6d-44a3-a416-9360c0ff8e94" @@ -486,7 +486,7 @@ "BreakpointIdentity": "7e0822bf-35cd-4983-9935-b4f09f551a2b" } ], - "ID": "3329ecce-546f-4f54-8e3c-af4d33ff6f62" + "ID": "a73b486a-fa65-4ca6-8b6a-9bd0c970c9c9" }, { "Condition": { @@ -509,7 +509,7 @@ "BreakpointIdentity": "09c0e29b-5a2c-4206-a4f5-919eec7cb09e" } ], - "ID": "8a03e0b8-3604-4a16-8aea-c0d2109a4419" + "ID": "62a0dd3a-070c-43b8-a103-871e65d27ab2" }, { "Condition": { @@ -559,7 +559,7 @@ "BreakpointIdentity": "b01dae39-d21c-45d1-a85e-f4a255964a77" } ], - "ID": "05a2d834-aa20-4e66-8a3d-4bfcd31ae73f" + "ID": "6b3cd8f8-2275-40ae-8620-514801ca2913" }, { "CommandList": [ @@ -570,13 +570,13 @@ "BreakpointIdentity": "ba2732d6-0520-4256-ad76-1d97e4c5320a" } ], - "ID": "c88bfa0c-d5e4-4a91-9f66-32d8e7846af1" + "ID": "ede844f5-a202-483b-a096-601b5b62b51d" } ], "BreakpointIdentity": "8feab600-304e-43f2-b5f0-3932e63e5285" } ], - "ID": "02323650-9747-43dc-b251-ec82c095fc46" + "ID": "d7758166-57a0-4204-83fa-e2efbc38e1f0" }, { "Condition": { @@ -644,13 +644,13 @@ "BreakpointIdentity": "edb5f15a-41f3-448a-bd18-10fec354b0c9" } ], - "ID": "0a25e3f1-5a47-4ea3-af6e-7724999b7bc7" + "ID": "e95df6f0-6741-41e4-b245-879afce3a85b" } ], "BreakpointIdentity": "30bbdf92-551f-47ad-806f-9f7f4794a52b" } ], - "ID": "983abbf9-17d7-49cb-abef-5ddc730eb5cc" + "ID": "c32645e1-7f33-48e0-a39e-a06c8044676c" }, { "Condition": { @@ -752,13 +752,13 @@ "BreakpointIdentity": "3d653eb8-a9fc-4a44-bd99-6f6c67f75d1c" } ], - "ID": "defd61e9-1de4-4de4-80d3-bcd7a9d634b7" + "ID": "ef0658a0-d86c-41c9-b5c9-cd0c15238841" } ], "BreakpointIdentity": "d8ae111b-2b83-43da-8ba0-1ea6b03bc8e2" } ], - "ID": "9b6024e9-5fed-4421-9b95-170b581d49f9" + "ID": "7982a10f-6aba-4440-81b7-f34274d3008d" }, { "CommandList": [ @@ -769,13 +769,13 @@ "BreakpointIdentity": "756ed293-76b8-496d-aa1a-5e1bf3fc076d" } ], - "ID": "c8b6ca4b-6e4f-41ab-86ca-09ac3cb66fc6" + "ID": "c899c34a-4453-4eee-9afd-5113147dbe76" } ], "BreakpointIdentity": "95af4ff9-cddf-4f43-8d75-6b2c931bc6fd" } ], - "ID": "652e3718-84ff-4506-a986-b9d3b3f77e7f" + "ID": "caeccbe5-1f5b-44b5-919c-06c94e03e675" }, { "Condition": { @@ -809,7 +809,7 @@ "BreakpointIdentity": "910a7066-07af-4af4-a44c-3799fd68ebd1" } ], - "ID": "d77f66be-f6a6-4dc7-8a8b-ed39f377ca10" + "ID": "df95e919-1ba4-45b1-a6f5-d4e7696e3413" }, { "Condition": { @@ -832,7 +832,7 @@ "BreakpointIdentity": "c5dc9a3a-dcb5-4534-85ad-8ae1954da410" } ], - "ID": "52992ba5-837b-4aff-bf79-aacc7c92adca" + "ID": "2466ab2c-03af-49fd-a6ab-098fcba84ad8" }, { "Condition": { @@ -868,7 +868,7 @@ "BreakpointIdentity": "466ce9bd-3dc9-4afe-afa7-2df4fe5f7e23" } ], - "ID": "a51f9312-46a9-4be9-9c22-ba589907a194" + "ID": "2bdcffef-93fa-4076-a6c3-7e08978daa48" }, { "Condition": { @@ -999,13 +999,13 @@ "BreakpointIdentity": "60997118-26bf-44ce-bc0f-b1531de0e9b9" } ], - "ID": "3c5bb0a6-c848-4b49-99be-5cdaddf11716" + "ID": "0cc7e36a-f901-414d-a32b-de912e655f25" } ], "BreakpointIdentity": "dce59186-3abb-4231-b4e8-842ec301da20" } ], - "ID": "c43c9d16-1ba6-41a2-bd73-3ce8a6f1f38d" + "ID": "68112310-8d7e-43ca-9fce-09099c0c8e17" }, { "CommandList": [ @@ -1019,13 +1019,13 @@ "BreakpointIdentity": "0edb8222-5ce0-4e3b-92cb-b32a92078fe7" } ], - "ID": "27250549-8eaa-45a6-987a-8212c1c8e948" + "ID": "733d0334-88cc-45a8-a21b-6adefe65a02f" } ], "BreakpointIdentity": "8b1853ee-7a60-442a-b1eb-b5017d21a08d" } ], - "ID": "74638e55-7e0a-4b39-b7f3-d575ea2e92fe" + "ID": "c71080af-90a7-4cff-b7ef-dea14fad8a87" }, { "CommandList": [ @@ -1036,13 +1036,13 @@ "BreakpointIdentity": "1852f4a1-cb35-4e85-95a3-9e1615ed8beb" } ], - "ID": "142e3d73-ef70-4c9b-ab11-3ea867250b3e" + "ID": "35882398-be36-42c3-9ce7-24627f7977ff" } ], "BreakpointIdentity": "4e529179-17b8-49f1-a0a4-13304e269271" } ], - "ID": "fc7d88f9-d5a4-4dde-a374-7803a5df96cb" + "ID": "d040dfec-1d35-4ff5-b84b-5a616f52bee9" }, { "Condition": { @@ -1087,13 +1087,13 @@ "BreakpointIdentity": "5a7bca19-6bac-4c68-b0da-be6c272ee4a7" } ], - "ID": "61a3c09f-bcc2-42d5-a308-2e480a15737f" + "ID": "61525e3c-a737-4475-9337-2a8a3f6a9b2f" } ], "BreakpointIdentity": "8620f105-6edb-408a-8dde-f6b4e17a99a9" } ], - "ID": "804dc4ff-0a7f-410c-bc87-7d2d967191b8" + "ID": "0b7a7202-c31a-4bef-958f-c7a9bcc8271b" } ], "BreakpointIdentity": "132d40ba-1042-4a52-a632-f30e854ca2ef" @@ -1172,7 +1172,7 @@ "BreakpointIdentity": "1b7ef161-545b-4885-9fe4-53e7edad5e25" } ], - "ID": "d05749b0-fc60-460b-bb09-0d942c5391e6" + "ID": "fdd0a846-2366-4c24-aaab-d2e710c4d6a7" } ], "BreakpointIdentity": "aa963409-8fa1-4eb6-b070-48ff6d05409f" @@ -1221,6 +1221,10 @@ "Value": "项目代码", "Name": "代码" }, + { + "Value": "项目会议", + "Name": "会议" + }, { "Value": "项目发布历史", "Name": "发布" @@ -1409,4 +1413,4 @@ "Formula": "项目标题!$F$2" } ] -}//kplQBq8SaybPbaUGWgeOZaEBlfg8S5zkpe/AH7fWBGjdtjIyK31SWehJgeAKwSNmdcM6x1YyWjuIoNzV0p3eBz+WP3v0cN7zPbX15f8+vkNEwC3MhEvPM77y/KS4UZW8dfq0ekMUu0xKGFKpOx6tS6laLbOxRW7uklcbffDAui/AXbL+p8tkfwe6f4Q+V/3Hea8XJk7lRobv/yvRWcqmZbqdaeBsUC78ufEM19WT4c3+ykXcgT7cP9elsDyzZQHcKMqQJ3KNNZtTacYTSe3T1buW3I932QS3J0SLRxDGP/bIsnT/LB97ILN/WEuP44FMk7SQuH2eX3k3rHgCUm/gzgcunbhSHqgqmhRxsBb3UoDyHacLQ41AIkewO6FPtynCZR4dLjJIwBSYEWD7O2VUYSeutz71ULrJj8sBDk0OC4C+ZUlXRPTUNK0GIsQtA9OwJVj6WhO3APbBFmv8R2vYxHpJ1Va8Utn9zAn2+WUxV5WujGa/3VuXdu/SPewijIuX84CvArQWXStj0SgEh2KkP68/u3aCGtmxEaYveHLU2nlQka1Q32FUAdNwxK41f4YrH/74V1r0c9ohb+5Iviae7FBMBOTVkt75Ew0LEYBhgCsXlq826Hee41FVwBsXKxdQjhTIT5aklL8iEKw2MIMpA58/QG56bewY+Shje8AV+0x/vSPjY/PiG7YqJXmICd+0AmyOhZbCoFNwvLjADvIqKmxB13eA/acmaw/6Ez66hqNMt+BKmwBsm4mKuYMSURfH71M1CIPGivUWVheMOc83rhd60PkGT/+PqQItwf37l9QDhYSPbQ/dxwvBj2ZT6inFKPhSr3W9Rkop+tIPMMJdDg1ZUtWtF395yJafu+hx/PrWO078cG1559y1E9QzumFSGehIGh4mQ+Invi6gEAcNCA==|920 \ No newline at end of file +}//kBD4kP8fjEW2Q5wKX2aoIaLOD7j9VEeBUnVVjI4X5JwZJJKzilDr+vWn330oUzppFBXfhhAagKQglLcfhV8+Fvz4J2X/W2NZeDx/lyfsJM5l911yeaZLDzg4s/uN7HL0GvpE0c+UAzbSLtfugXeAsHy83KBqv+3atu3lpYiOnv3TCTOqz/8h1Y+t3FEudHL22Ywd+/5Ktge83WJSQqycx1PrUd9s0MfnxJ1uqlzCh9DGoQ697FCj5BgU992+QoR2YNn5BDWUXxgg4cP9oavgM+LQdwIC0ZC0afc6KO3bYSm4IcLuUg3NtAK7AEHuwvx4B1Nb3jmmtycezHt0mmIU76JNZCq3pZKD4Mhq+P5P+Z4XCYDpS+rHO5lSC7dji1krrMIYUQOaGjv5CHeNVbi9ostJe0jWJ5zH0Tkox0uxxPohR6c//+uhgBXOZ98tS0Jy18x9LHPXzOguok/ck8iwZ+A39uhp7B+E/xv/rkEXWaADQVnN55qGqJAPgGubRpU+/n8zM9ZbK5ls8A1klLLQ/1qYtQ4GUXLIkNo1pBZbSVElcMChEm7ggsuT1ZLiftB7peyQyNWvZYV0KC6xeDUGnkCn3HuTr69kqnAOgg5QneiyGz7WVLVC0aeZqusboPZhhJHcOsF4FroeDz3/3ffavDMFSG8g1HkfwbrEDrNU5wT2WL2lV9RR1p0601rRgZ1cXTQCf6sncd1x8Sej2OAvkwOiodoFYAScz+VsENG5JI8tZBDODIpVdBU79GJwGF/zpW/v5m6HtowLfXhhdABE3KDNxwkU9UMS47eOr613IR6bwnINmEmqaLEZy9zSzTg9YVaNzmMvtLR7rfCXCQ6TFGrBJcjcnLPyIgcatAkgNzefgjm2HUNpvTiUTC+7EBlqiM3qFIev37wEMKvyoazxvA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目会议.json b/Pages/项目/项目首页/项目首页-容器页面/项目会议.json new file mode 100644 index 00000000..2d524acb --- /dev/null +++ b/Pages/项目/项目首页/项目首页-容器页面/项目会议.json @@ -0,0 +1,727 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 342.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 28.0 + } + } + }, + "InLogicalVisibleIndexes": [ + 5 + ], + "Count": 6, + "DefaultSize": 15.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "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 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "20": { + "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": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "33": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "34": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + } + }, + "Count": 35, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "日期", + "1,17": "关键字", + "1,31": "发起会议" + }, + "AttachInfos": { + "1,3": { + "CellType": { + "$type": "ElementUI.DatePickerCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目会议!D2" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "=项目会议!开始日期" + }, + "EndValue": { + "SerializeProperty": "=项目会议!结束日期" + } + }, + "BreakpointIdentity": "66bba9a0-1817-4158-948e-ea1c4819c111" + } + ], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "daterange", + "startPlaceholder": "开始日期", + "rangeSeparator": "至", + "endPlaceholder": "结束日期", + "firstDayOfWeek": 1, + "DefautWeekFormat": "yyyy 第 WW 周" + } + }, + "1,19": { + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "text", + "placeholder": "请选择", + "resize": "none" + } + }, + "1,31": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 3, + "DrawerDirection": 3, + "ShowDrawerHeader": true, + "PageName": "发起钉钉项目会议", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目会议!项目ID" + }, + "TargetCell": { + "SerializeProperty": "=发起钉钉项目会议!项目ID" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目会议!项目名称" + }, + "TargetCell": { + "SerializeProperty": "=发起钉钉项目会议!会议主题" + } + } + ], + "BreakpointIdentity": "7fd3d57a-06a5-48f2-9c2b-30e1cc5e9c4d" + } + ], + "Text": "发起会议", + "TemplateKey": "_RS_Main1", + "Icon": { + "Name": "Application/001_add_1.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "3,1": { + "CellType": { + "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", + "TemplatePageName": "0a1afa56cef44a3c88bd15e1ace1317", + "DataSourceType": 1, + "DataSource": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "会议记录表", + "BindingInfos": [ + { + "GUID": "63d86740-5920-4e39-a734-e20efd250a97", + "BindingInfo": { + "TableName": "会议记录表", + "ColumnName": "ID", + "GUID": "658e066b-10e4-4313-8176-5017fabb61e5" + }, + "ColumnName": "ID" + }, + { + "GUID": "f9008845-d815-4cd5-88f4-9ccd7aab8286", + "BindingInfo": { + "TableName": "会议记录表", + "ColumnName": "会议标题", + "GUID": "8cd2b386-0fc0-4f9b-9c26-eb0c91d5e981" + }, + "ColumnName": "会议标题" + }, + { + "GUID": "abfd0abc-34f1-4d49-a68f-ac39587afe18", + "BindingInfo": { + "TableName": "会议记录表", + "ColumnName": "会议业务类型", + "GUID": "75c4a888-fd20-475b-a705-4e9a99ae5008" + }, + "ColumnName": "会议业务类型" + }, + { + "GUID": "9e12de08-9abe-4c4a-ad87-9098ead425a0", + "BindingInfo": { + "TableName": "会议记录表", + "ColumnName": "钉钉会议ID", + "GUID": "9c76c751-34f8-4e08-82a6-449bc17497c7" + }, + "ColumnName": "钉钉会议ID" + }, + { + "GUID": "0e3f584c-f34d-4279-8b51-ffccc6c065f1", + "BindingInfo": { + "TableName": "会议记录表", + "ColumnName": "发起人", + "GUID": "daaa00aa-b5a1-4c4a-8e47-0c6b4d0a4444", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "发起人_全名" + }, + { + "GUID": "5dcb7b62-f134-4abe-8dce-8085898ef12e", + "BindingInfo": { + "TableName": "会议记录表", + "ColumnName": "会议开始时间", + "GUID": "f7478954-4d02-4400-92fb-2592d55f36e5" + }, + "ColumnName": "会议开始时间" + }, + { + "GUID": "24a0fe3e-ee80-4f49-811b-9d734557217b", + "BindingInfo": { + "TableName": "会议记录表", + "ColumnName": "会议结束时间", + "GUID": "71fd1a08-4264-4b15-94b1-954cb9a5ca79" + }, + "ColumnName": "会议结束时间" + }, + { + "GUID": "48e93711-f5cd-4a2a-a2d9-14dff27c8ca3", + "BindingInfo": { + "TableName": "会议记录表", + "ColumnName": "自动拉会", + "GUID": "8887d966-3ce7-40cf-b10e-8d9faf18963c" + }, + "ColumnName": "自动拉会" + }, + { + "GUID": "409b6397-8b24-4ac0-b90b-98c1f10b9fd9", + "BindingInfo": { + "TableName": "会议记录表", + "ColumnName": "会议状态", + "GUID": "838c8a34-0a38-41e9-b1b0-98742e187a5a", + "RelationBinding": { + "RelatedTable": "会议状态", + "RelatedColumn": "状态码", + "DisplayColumn": "状态" + } + }, + "ColumnName": "状态" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 3, + "ColumnBindingInfo": { + "TableName": "会议记录表", + "ColumnName": "会议开始时间", + "GUID": "cf506ec5-4af9-4071-9091-e1e0ab5cd490" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目会议!开始日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 5, + "ColumnBindingInfo": { + "TableName": "会议记录表", + "ColumnName": "会议开始时间", + "GUID": "507f4879-08f9-4b1b-823b-dc002722ecad" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目会议!结束日期" + } + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "会议记录表", + "ColumnName": "会议标题", + "GUID": "f45f064e-7056-4ab5-a222-fe9d48a4d06d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目会议!T2" + } + } + ] + }, + "NullFormulaValueQueryPolicy": 1, + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "会议记录表", + "ColumnName": "会议开始时间", + "GUID": "678130b4-7462-4b21-8db1-d4020307a614" + }, + "Order": 1 + } + ] + }, + "IsListviewDataSource": true, + "CustomColumns": [ + "ID", + "会议标题", + "会议业务类型", + "钉钉会议ID", + "发起人_全名", + "会议开始时间", + "会议结束时间", + "自动拉会", + "状态" + ] + }, + "DataSourceListviewName": "图文列表表格1", + "IsLoadOnDemand": true, + "LoadOnDemandCount": 15, + "NoItemSetting": { + "ImageForNoItem": { + "Name": "无数据插画 (1).png" + }, + "NoItemImageSize": 150.0, + "TextForNoItem": "暂无会议记录", + "Orientation": 1 + }, + "TemplateKey": "横向分割", + "DetailTableSetting": { + "$type": "Forguncy.Model.DetailListViewInfo, ServerDesignerCommon", + "ColumnOfDetailTable": "项目ID", + "MasterTable": "项目表", + "ColumnOfMasterTable": "ID", + "DataCommitType": 2 + } + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 0 + }, + { + "HorizontalAlignment": 1 + }, + { + "FontSize": 13.333333333333332, + "BorderBottom": 0, + "BorderTop": 0, + "BorderLeft": 0, + "BorderRight": 0 + }, + { + "BorderBottom": 0, + "BorderTop": 0, + "BorderLeft": 0, + "BorderRight": 0 + } + ], + "Types": { + "Strs": [ + "Body", + "Center", + "black" + ], + "Borders": [ + { + "Color": 2 + } + ] + }, + "CellStyles": { + "1,1": 0, + "1,3": 0, + "1,17": 1, + "1,18": 2, + "1,19": 0, + "1,30": 0, + "1,31": 0, + "3,1": 3, + "4,1": 3, + "4,2": 3, + "4,3": 3, + "4,4": 3, + "4,5": 3, + "4,6": 3, + "4,7": 3, + "4,8": 3, + "4,9": 3, + "4,10": 3, + "4,11": 3, + "4,12": 3, + "4,13": 3, + "4,14": 3, + "4,15": 3, + "4,16": 3, + "4,17": 3, + "4,18": 3, + "4,19": 3, + "4,20": 3, + "4,21": 3, + "4,22": 3, + "4,23": 3, + "4,24": 3, + "4,25": 3, + "4,26": 3, + "4,27": 3, + "4,28": 3, + "4,29": 3, + "4,30": 3, + "4,31": 3, + "4,32": 3, + "4,33": 3, + "5,1": 4, + "5,2": 5, + "5,3": 5, + "5,4": 5, + "5,5": 4, + "5,6": 5, + "5,7": 5, + "5,8": 5, + "5,9": 0, + "5,10": 0, + "5,11": 0, + "5,12": 0, + "5,13": 0, + "5,14": 0, + "5,15": 0, + "5,16": 0, + "5,17": 0, + "5,18": 0, + "5,19": 0, + "5,20": 0, + "5,21": 0, + "5,22": 0, + "5,23": 0, + "5,24": 0, + "5,25": 0, + "5,26": 0, + "5,27": 0, + "5,28": 0, + "5,29": 0, + "5,30": 0, + "5,31": 0, + "5,32": 0, + "5,33": 0, + "5,34": 0 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "Spans": [ + "1,1,1,2", + "1,3,1,13", + "1,17,1,2", + "5,1,1,4", + "5,5,1,4", + "3,1,1,33", + "1,19,1,11", + "1,31,1,3" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "Title": "项目周报", + "PageLoadedCommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中", + "BreakpointIdentity": "f4dca3b1-b2ae-4da9-a6f0-1cc59476cdc4" + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目会议!项目子页面" + }, + "Title": "加载中", + "BreakpointIdentity": "98734c09-5851-4a64-a54d-ef0b028d4415" + } + ], + "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": "项目会议!$F$6" + } + ] +}//20JiQvZciSJLplK31RDTXdAyZBabZeShZuqqcoqswXuWRNO/hga64+MC1hYhHZlS1+S51AdrYiArS+majlvizuFBb1lnfFa1n+Y9nPfXEvIWfcrYeeGcmvJFPy/eEd8sdqJuVXjWjxYx9bG7Pi1OQyvwRDpXpeEkvtZvJGNpiAXh1u3pdFl5ANzLpJoTL2ca4bGtAkFn7z0QtFEZFGql09m4gUmQz5MpHkcwHxVgrhW2OkLGuZVglF1VjIO4SeK9qfzNjETkzbE+/GhmUMrxAAsCHUmU4RJ6R/uNLIXQyk/s7aHfSPuB1hB27PN/1hy6Tj3IJbqizOTVGCl55nqU0KPkpzgeJalHFtN0MvnnUHlegAAvQEN67BKdT8nWLpGtrvMd5R9XJbdIoYkqJQ5UVkekO4dwwGWp2Bw/QJmY3e+Dhh14IjXJmLGj5pq+m1tBaSjaIMiQIOmmoaH6jAvjU8c0cteHjZb8VArGsdPsl9wGv4rDjSuhbl+KrX9aqnLxhW3XjBORibm6zvkL8zyRMB5dKCQ6MKZkTjlvhXgZWRYTEBMcNC7HcEW6Iy5K4w77Dml5m6TH8sWG9BC5i7xySlcFtFkYNodDVdelGKyahKkA2ete2I4dnihMyeyJ13rxKm6zoKrERPaIylleFuXuDqX+fId6ZbxvuqISjLFN3R9JizeCTwefPgvGI/aeLV3/miQyMxmYWo497b58xqVCJmtAaF6hqRUgOCX8sNezTx9ZIcZhqewKqAqMi6eqQEF3ecgu89t+OwVzK8QiXjUEdsOz5QOLNdEVRoyApkEJyxPNPS5XrVGf6sCvY7RbrL46e8c8/7B/fKgH2bD+iU3ec43yltqVJCXV+CydVl+usF94ym16JamE46qDz3jMlxP/IKChbczbKRHvWKG7e3Hu8w==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目会议.rd b/Pages/项目/项目首页/项目首页-容器页面/项目会议.rd new file mode 100644 index 00000000..10374a66 --- /dev/null +++ b/Pages/项目/项目首页/项目首页-容器页面/项目会议.rd @@ -0,0 +1,15 @@ +{ + "PageType": 0, + "ColumnCount": 35, + "RowCount": 6, + "CustomNames": [ + { + "Name": "开始日期", + "Formula": "项目会议!$B$6" + }, + { + "Name": "结束日期", + "Formula": "项目会议!$F$6" + } + ] +} \ No newline at end of file diff --git a/Plugin/DingTalkPlugin.zip b/Plugin/DingTalkPlugin.zip index 4fc0a197..48d130d5 100644 Binary files a/Plugin/DingTalkPlugin.zip and b/Plugin/DingTalkPlugin.zip differ diff --git a/ServerCommands/钉钉/dingtalkLogin.json b/ServerCommands/钉钉/dingtalkLogin.json index 5292bf5b..9c95d715 100644 --- a/ServerCommands/钉钉/dingtalkLogin.json +++ b/ServerCommands/钉钉/dingtalkLogin.json @@ -78,7 +78,7 @@ }, { "$type": "DingTalkPlugin.Getbyunionid, DingTalkPlugin", - "UserName": { + "UnionId": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=个人信息.UnionId" }, @@ -97,7 +97,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "c5496bba-4833-4374-b4c5-9d45c1e8d3dc", + "GUID": "0776cf8c-e7ac-42a9-94d1-16916c3e3df4", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "用户信息视图", @@ -124,7 +124,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "a41b2b5a302041d8bd180ebf72771907", + "ID": "35941bb56df04762a700ed2239671b3e", "BreakpointIdentity": "7cc4d694-9b53-465d-83a5-3058d68bd3a1" }, { @@ -233,7 +233,7 @@ } ] }, - "ID": "5ad67a70-a9c8-4344-b3e7-e3ba9d7e18c4" + "ID": "eb269102-b5a1-4ec9-9317-0e1f6f6d8f0a" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -269,7 +269,7 @@ } ] }, - "ID": "82f611fa-225e-4894-aeca-ad61871347f1" + "ID": "c7b754e4-6792-4dc5-805d-77d97c3131c6" } ] }, diff --git a/ServerCommands/钉钉/初始化钉钉配置.json b/ServerCommands/钉钉/初始化钉钉配置.json index 0526cd5c..b5ffb9e7 100644 --- a/ServerCommands/钉钉/初始化钉钉配置.json +++ b/ServerCommands/钉钉/初始化钉钉配置.json @@ -9,7 +9,8 @@ "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon", "InvokeTriggerTestData": { "$type": "Forguncy.SaveLoad.InvokeTriggerTestDataSaveData, ServerDesignerCommon", - "UserName": "Administrator" + "UserName": "Administrator", + "RequestTimeout": 10 } } ] @@ -54,5 +55,9 @@ "BreakpointIdentity": "b5c014bc-8792-4d83-afb2-c212d33e46d3" } ] + }, + "ReturnProperties": { + "$type": "System.Collections.Generic.List`1[[Forguncy.SaveLoad.ReturnPropertySaveData, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [] } } \ No newline at end of file diff --git a/ServerCommands/钉钉/批量同步所有用户UserID.json b/ServerCommands/钉钉/批量同步所有用户UserID.json index be68e34d..f90dc3f3 100644 --- a/ServerCommands/钉钉/批量同步所有用户UserID.json +++ b/ServerCommands/钉钉/批量同步所有用户UserID.json @@ -51,7 +51,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "731660ff-5bbd-41ba-b54a-856a47d40bf3", + "GUID": "e3531496-5fd6-4817-a88b-34692d903406", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "用户信息视图", @@ -62,7 +62,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "0c3518d2-0de2-4071-86c0-ebdcd3161099", + "GUID": "cbe99b7d-7868-4d8e-a917-2164e99ca391", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "用户信息视图", @@ -73,7 +73,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "252fa0a6-bd5c-4fac-8345-89b42f82a9c9", + "GUID": "a0e05e74-0ad1-44f6-bc7b-9dd9edf25581", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "用户信息视图", @@ -81,6 +81,17 @@ "GUID": "52c1dc14-e0c0-4438-9615-321ec3e8996c" }, "ColumnName": "全名" + }, + { + "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", + "GUID": "6899fa9c-7c85-4e09-b338-a939aa604c3b", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "用户信息视图", + "ColumnName": "DingTalkUnionID", + "GUID": "7179d44d-706f-4387-9d5e-816ce029facf" + }, + "ColumnName": "DingTalkUnionID" } ] }, @@ -115,7 +126,7 @@ }, "NullFormulaValueQueryPolicy": 2 }, - "ID": "42a09959a21547a2b74f393964494529", + "ID": "b78eff73dfcd4de98bcdb10364095287", "BreakpointIdentity": "0e35ed51-f2f3-4e33-8bb7-f2039b672626" }, { @@ -133,9 +144,9 @@ "$values": [ { "$type": "DingTalkPlugin.Getbyunionid, DingTalkPlugin", - "UserName": { + "UnionId": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Item.用户名" + "SerializeProperty": "=Item.DingTalkUnionID" }, "UserId": "UserId", "BreakpointIdentity": "c49713ef-ca23-4343-8b4c-b204ef959ca5" @@ -184,5 +195,9 @@ "BreakpointIdentity": "4e00c4fd-a54f-4da3-ad52-24223857aab4" } ] + }, + "ReturnProperties": { + "$type": "System.Collections.Generic.List`1[[Forguncy.SaveLoad.ReturnPropertySaveData, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [] } } \ No newline at end of file diff --git a/ServerCommands/钉钉/订阅钉钉回调事件.json b/ServerCommands/钉钉/订阅钉钉回调事件.json index 752318bb..519cfdd5 100644 --- a/ServerCommands/钉钉/订阅钉钉回调事件.json +++ b/ServerCommands/钉钉/订阅钉钉回调事件.json @@ -6,7 +6,12 @@ "$type": "System.Collections.Generic.List`1[[Forguncy.SaveLoad.TriggerSaveDataBase, ServerDesignerCommon]], System.Private.CoreLib", "$values": [ { - "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon" + "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon", + "InvokeTriggerTestData": { + "$type": "Forguncy.SaveLoad.InvokeTriggerTestDataSaveData, ServerDesignerCommon", + "UserName": "Administrator", + "RequestTimeout": 20 + } } ] }, @@ -46,7 +51,7 @@ }, { "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "日志表", + "TableName": "钉钉事件订阅表", "UpdateType": "add", "ShowConfirm": false, "UpdateBindingValues": { @@ -56,34 +61,92 @@ "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "日志表", - "ColumnName": "标题", - "GUID": "eea12101-9ee4-4654-a171-f7f3ca4bc4f4" - }, - "Value": "钉钉回调事件" - }, - { - "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", - "BindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "日志表", - "ColumnName": "内容", - "GUID": "193c1f85-8586-44fb-a962-bd714a56785d" + "TableName": "钉钉事件订阅表", + "ColumnName": "统一应用身份ID", + "GUID": "05cefa5d-40d9-47cb-95a1-cad82738ed84" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=事件体" + "SerializeProperty": "=统一应用身份Id" } }, { "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "日志表", - "ColumnName": "类型", - "GUID": "5b49edec-1bf8-4890-a685-76d4c0215b08" + "TableName": "钉钉事件订阅表", + "ColumnName": "CorpId", + "GUID": "19abfd2b-0a29-4dc1-9081-a61448a31e32" }, - "Value": "Info" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件所属的corpId" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "钉钉事件订阅表", + "ColumnName": "事件类型", + "GUID": "e461bc48-f9b0-484b-a179-3369f56144de" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件类型" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "钉钉事件订阅表", + "ColumnName": "事件ID", + "GUID": "d6aec93e-e8bc-4ad6-9527-b579389a0d7a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件的唯一Id" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "钉钉事件订阅表", + "ColumnName": "生成时间", + "GUID": "bfc93c34-bf17-436d-9fcb-5dbdb6aea794" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件生成时间" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "钉钉事件订阅表", + "ColumnName": "主题", + "GUID": "4d1250f7-1fbf-442e-a390-c9a9757ec068" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件数据" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "钉钉事件订阅表", + "ColumnName": "事件内容", + "GUID": "c0d656fa-3345-4324-867f-8ed7121c3fd3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件体" + } } ] }, @@ -122,7 +185,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "1bc93d72-a847-4519-b43c-0cd749afa635", + "GUID": "80933ce1-0ef5-4565-856f-574ab0803a03", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", @@ -133,7 +196,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "b444411f-47e9-4398-afbc-663c187657ff", + "GUID": "a64b8f38-4e59-44e3-b784-9ddb3213203f", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", @@ -144,7 +207,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "46df0d8d-b41f-466c-8281-d2fc8eabea89", + "GUID": "c7853997-2b51-46e7-b420-f789f4903217", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", @@ -155,7 +218,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "c388a90a-2b0b-47df-9a96-96d67cdaf314", + "GUID": "fa5b370e-00a6-4672-b290-eee7544b7515", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", @@ -166,7 +229,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "56d9b1ae-b2f0-43f2-ab6e-2d5a001ec13e", + "GUID": "424d540b-02ea-47b4-8ec6-965bfc1ea17d", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", @@ -177,7 +240,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "308fc235-15dd-4d33-a2cc-f9e726781776", + "GUID": "0b176a96-0c11-4bb7-ba83-93f93b9a5c78", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", @@ -204,7 +267,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "00e5b220d2c04d6fa33f10cd9600a8bb", + "ID": "a7813df78aed40dbae79c0fd4bcda51d", "BreakpointIdentity": "403cf6eb-46cd-4d23-a5cf-5ad989836b5b" }, { @@ -257,7 +320,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=(事件体.openConfModel.startTime/1000/60/60/24)+DATE(1970,1,1)" }, - "ID": "e9f95cc65be04c368627956c636f50df", + "ID": "00a2783c26fa44128db466188e5e961a", "BreakpointIdentity": "4862204b-68d4-41c7-aecc-62911dc5b0fb" }, { @@ -287,7 +350,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议业务类型", - "GUID": "d06973dc-b6fb-420b-90c8-67b5de5321fe" + "GUID": "9d444887-3023-4439-89be-39dac81cd6e8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -300,7 +363,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议开始时间", - "GUID": "02b8677f-c2a7-4ea7-883f-34030bcb027f" + "GUID": "9f28c2eb-2ec4-42de-94ab-d17cf9a716c7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -313,7 +376,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议持续时间", - "GUID": "f06d27e5-094a-4391-883d-4d63080f7a3c" + "GUID": "e68a5307-7ddf-4c78-82a4-56410816ab25" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -326,7 +389,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议状态", - "GUID": "1f3a2a6f-ce03-40eb-8fd5-297fc69d801f" + "GUID": "f363e806-229d-4e56-a10b-39a9f3a15141" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -340,7 +403,7 @@ ] }, "Comments": "会议创建事件", - "ID": "4d592dad-3268-4f59-a587-c801f64708df" + "ID": "84cbd131-7b12-4450-8658-2628d9fc473c" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -365,7 +428,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=(事件体.openConfModel.startTime/1000/60/60/24)+DATE(1970,1,1)" }, - "ID": "b68c2720a92a46738b9c63ecbcf89817", + "ID": "c268b4910bf641b69f75e3808b1d77d2", "BreakpointIdentity": "8f2dfd1b-0bed-43fc-85ff-6317352ebf34" }, { @@ -395,7 +458,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议结束时间", - "GUID": "cc1af09e-53cd-4ab7-b1ef-359b0055e3e4" + "GUID": "a7dbeb94-7c8e-4124-9fd3-7748a8b27f03" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -408,7 +471,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议持续时间", - "GUID": "898d81ef-d439-4a59-a92b-0f37174414b5" + "GUID": "f5833948-f4db-4e1a-9b94-07bc5b9c0c09" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -421,7 +484,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议状态", - "GUID": "a6fde8e8-4fe2-47fe-8601-43d6d9d779bf" + "GUID": "7f43473e-467b-444d-87cc-2fa554703a75" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -464,7 +527,7 @@ "SerializeProperty": "=事件体.openConfModel.confDuration/1000" } }, - "value": "59", + "value": "3600000", "compareType": 3 } ] @@ -473,6 +536,27 @@ "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": "909807c2-843d-4787-933a-24f21d14df44" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=会议成员" + }, + "Operation": 16, + "OperationParamaterAName": ",", + "OperationParamaterBName": "UnionId", + "OutParamaterName": "参会人员UnionIds", + "BreakpointIdentity": "7e900925-d3f3-49f0-99cc-37eef8f1b2a8" + }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", "ServerCommandName": "创建项目视频会议", @@ -513,7 +597,11 @@ }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "参会人员" + "ParamName": "参会人员", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参会人员UnionIds" + } } ] }, @@ -544,7 +632,7 @@ } ] }, - "ID": "f3e6c043-2f00-4384-a50d-7aa98d9e6997" + "ID": "82b28f9b-992e-4b78-9b61-7e4608969d17" } ] }, @@ -552,7 +640,7 @@ } ] }, - "ID": "72f01200-8356-48c2-9056-9dccb5750d13" + "ID": "a7b66590-e031-4cc5-aedc-a204c80f80e2" } ] }, @@ -560,7 +648,7 @@ } ] }, - "ID": "263716a6-a0b6-4502-bbfc-02e925b57a76" + "ID": "6196d007-2fa2-469f-ba60-0d19ce1b31a4" } ] }, @@ -569,11 +657,142 @@ ] }, "Comments": "会议状态变更", - "ID": "afa31b9d-f81d-438b-aeaf-9bf6b1800e1c" + "ID": "418021dc-3f15-4af3-8c19-be506105157a" + }, + { + "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件类型" + } + }, + "value": "user_modify_org" + }, + "CommandList": { + "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件体.diffInfo" + }, + "LoopItemParamName": "Item" + }, + "CommandList": { + "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "用户信息", + "TableValue": { + "$type": "Forguncy.Model.Commands.ParameterTableValue, ServerDesignerCommon", + "TableName": "用户信息视图", + "TableValueType": 1, + "BindingInfos": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", + "GUID": "8280cc90-65b9-428b-a462-76b5d789d34a", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "df14249e-4484-4967-93bd-067aa52ba3c0" + }, + "ColumnName": "用户名" + } + ] + }, + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "用户信息视图", + "ColumnName": "DingTalkUserID", + "GUID": "959e1229-4f5f-4cb1-a91e-601510774e53" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.userid" + } + } + }, + "ID": "d45007784bac4f00973c368930e05398", + "BreakpointIdentity": "021e9b65-8f24-45e9-9f79-6c69bee5dbf4" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", + "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": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", + "$values": [ + { + "$type": "UserManagementCommandsV2.UserManagementCommand, UserManagementCommandsV2", + "OperationType": "202", + "CommandOperator": { + "$type": "UserManagementCommandsV2.UpdateUserOperator, UserManagementCommandsV2", + "UserName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户信息.用户名" + }, + "FullName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.curr.name" + }, + "Email": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.curr.email" + }, + "ExtendedProperties": { + "$type": "System.Collections.Generic.List`1[[UserManagementCommandsV2.ExtendedPropertyDto, UserManagementCommandsV2]], System.Private.CoreLib", + "$values": [] + } + }, + "BreakpointIdentity": "9cc6b8cd-c201-4d53-b7a8-ceb2014220a6" + } + ] + }, + "ID": "14e1276b-144d-4708-8e38-3587ab281488" + } + ] + }, + "BreakpointIdentity": "ea4e5881-c2cf-4aa4-89a0-865db30d52ca" + } + ] + }, + "BreakpointIdentity": "0607afe1-0337-4ddc-a002-a83cec14bb5c" + } + ] + }, + "ID": "59bffb12-ae41-4d13-bd92-83e16b872e5e" } ] }, - "BreakpointIdentity": "3bb1285a-4ca5-463b-b0ee-dce20f43e79f" + "BreakpointIdentity": "0fb04d1c-2845-46b0-996e-7739716ba300" }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", @@ -660,6 +879,7 @@ "$type": "System.Collections.Generic.Dictionary`2[[System.String, System.Private.CoreLib],[System.String, System.Private.CoreLib]], System.Private.CoreLib", "eventUnifiedAppId": "统一应用身份Id", "eventCorpId": "事件所属的corpId", + "Payload": "事件数据", "eventType": "事件类型", "eventId": "事件的唯一Id", "eventBornTime": "事件生成时间", @@ -690,7 +910,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "日志表", "ColumnName": "标题", - "GUID": "e6b11501-8180-4ed2-a935-b44a2108ebbc" + "GUID": "be34be04-6266-4301-a771-081c93da385b" }, "Value": "订阅钉钉回调事件注册" }, @@ -700,7 +920,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "日志表", "ColumnName": "内容", - "GUID": "816e9dbd-58bb-4aff-858a-9ff9968a4b0b" + "GUID": "cb5683db-4b58-4d50-ae83-dbd8c538ea3a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -713,7 +933,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "日志表", "ColumnName": "类型", - "GUID": "7f1b826e-2cf0-45aa-b88d-5519244f8d37" + "GUID": "0e5be4b6-f257-497d-ba28-4b6643a4f6ce" }, "Value": "Error" } diff --git a/ServerCommands/项目/创建项目视频会议.json b/ServerCommands/项目/创建项目视频会议.json index 2c5728ba..442db040 100644 --- a/ServerCommands/项目/创建项目视频会议.json +++ b/ServerCommands/项目/创建项目视频会议.json @@ -71,7 +71,7 @@ "$values": [ { "$type": "Forguncy.SaveLoad.ParameterItemSaveData, ServerDesignerCommon", - "Name": "用户名", + "Name": "UnionID", "DataValidationInfo": { "$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon", "IgnoreBlank": false @@ -96,48 +96,6 @@ "Commands": { "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", "$values": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "项目信息", - "TableValue": { - "$type": "Forguncy.Model.Commands.ParameterTableValue, ServerDesignerCommon", - "TableName": "项目表", - "TableValueType": 1, - "BindingInfos": { - "$type": "System.Collections.Generic.List`1[[Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon]], System.Private.CoreLib", - "$values": [ - { - "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "ae136e45-f8f3-4bc0-a6c0-a984db108d46", - "BindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "项目表", - "ColumnName": "项目名称", - "GUID": "6cdf5178-317e-4abd-8460-d2a8e91d4069" - }, - "ColumnName": "项目名称" - } - ] - }, - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "1287418a-ac93-42f7-9005-01a8eafdf9e5" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "beeb0b13abc0431e9c9bd8cd0550eb20", - "BreakpointIdentity": "92d6e0fd-72bc-460a-9236-ba42bd42e3fe" - }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": { @@ -151,15 +109,172 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息" + "SerializeProperty": "=参会人员.Count" } }, - "value": "%Null%", - "compareType": 1 + "value": "0", + "compareType": 2 }, "CommandList": { "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", "$values": [ + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参会人员" + }, + "Operation": 16, + "OperationParamaterAName": ",", + "OperationParamaterBName": "UnionID", + "OutParamaterName": "UnionID拼接", + "BreakpointIdentity": "481f11f1-a708-43a2-98ab-1608290c4fb3" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "当前用户", + "ParameterValue": "%CurrentUser.DingTalkUnionID%", + "ID": "987f56a732774eaa9513d7c96fed6b54", + "BreakpointIdentity": "fedb9d66-b60e-4f89-bf8f-f5b60abd91fe" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "会议标题", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=会议标题" + }, + "ID": "c711fb8f58d34e0f9c0f4e258f4174cf", + "BreakpointIdentity": "3fb2ff75-5fae-406e-b580-088d675924a3" + }, + { + "$type": "DingTalkPlugin.VideoConferences, DingTalkPlugin", + "ConfTitle": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=会议标题" + }, + "UserType": "UnionId", + "CreatorId": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前用户" + }, + "InviteUserIds": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=UnionID拼接" + }, + "Result": "返回结果", + "BreakpointIdentity": "0f4ce002-6665-4b27-bbb4-41b08c0c2c44" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "会议记录表", + "UpdateType": "add", + "ShowConfirm": false, + "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": "2fe7847c-2ffa-4dd7-b247-3c8228bda784" + }, + "Value": "0" + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "钉钉会议ID", + "GUID": "e2c4fadf-e2c3-4e1a-a470-18418ec37675" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=返回结果.ConferenceId" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "发起人", + "GUID": "0fdb4021-ff0b-42f3-8b8b-cf5fdc24bf4b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前用户" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "参与人", + "GUID": "c3143ba3-f99c-43d2-901b-8397d88be91d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=UnionID拼接" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "会议标题", + "GUID": "4794dbc9-3afb-4581-89e4-f67354fa9b59" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=会议标题" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "自动拉会", + "GUID": "d2492af0-6e15-4449-872e-87a320bbd4c3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=自动拉会" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "会议状态", + "GUID": "e6a6731f-c13a-4fbf-a8c4-a634c0aaf5fe" + }, + "Value": "2" + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "项目ID", + "GUID": "6d6d3b4a-c58b-4d87-a480-f56454243b9f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + } + ] + }, + "BreakpointIdentity": "4a20ad8e-b454-4fad-99b8-6bbe1a7b7b54" + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": { @@ -168,263 +283,91 @@ { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参会人员.Count" - } + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": { + "$type": "System.Collections.Generic.List`1[[ForguncyDataAccess.ISqlCondition, ForguncyDataAccess]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=开启云录制" + } + }, + "value": "1" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=开启云录制" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TRUE()" + } + } + ] }, - "value": "0", - "compareType": 2 + "RelationType": 1 }, "CommandList": { "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", "$values": [ { - "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", - "InParamater": { + "$type": "DingTalkPlugin.StartCloudRecordHeaders, DingTalkPlugin", + "ConferenceId": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参会人员" - }, - "Operation": 16, - "OperationParamaterAName": ",", - "OperationParamaterBName": "用户名", - "OutParamaterName": "参会人", - "BreakpointIdentity": "481f11f1-a708-43a2-98ab-1608290c4fb3" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "当前用户", - "ParameterValue": "%CurrentUser%", - "ID": "55a553cc142043369c51b0f75f201911", - "BreakpointIdentity": "fedb9d66-b60e-4f89-bf8f-f5b60abd91fe" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "会议标题", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(会议标题=\"\",项目信息.项目名称&\"项目沟通会议\",会议标题)" - }, - "ID": "e6ce2438ce8645e4a9b560530765020d", - "BreakpointIdentity": "3fb2ff75-5fae-406e-b580-088d675924a3" - }, - { - "$type": "DingTalkPlugin.VideoConferences, DingTalkPlugin", - "ConfTitle": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=会议标题" + "SerializeProperty": "=返回结果.ConferenceId" }, + "UserType": "UnionId", "CreatorId": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=当前用户" }, - "InviteUserIds": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参会人" - }, - "Result": "返回结果", - "BreakpointIdentity": "0f4ce002-6665-4b27-bbb4-41b08c0c2c44" - }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "会议记录表", - "UpdateType": "add", - "ShowConfirm": false, - "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": "62f54880-cb00-432e-80fb-ad7f35049baf" - }, - "Value": "0" - }, - { - "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", - "BindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "会议记录表", - "ColumnName": "钉钉会议ID", - "GUID": "e7647db4-a0df-4682-a48b-90a32a42fe3f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=返回结果.ConferenceId" - } - }, - { - "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", - "BindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "会议记录表", - "ColumnName": "发起人", - "GUID": "17e71522-e06a-4ca3-8a02-17aab9f5cbc5" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前用户" - } - }, - { - "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", - "BindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "会议记录表", - "ColumnName": "参与人", - "GUID": "bbdcd346-1e1e-4f8e-8515-3b2261ede380" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参会人" - } - }, - { - "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", - "BindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "会议记录表", - "ColumnName": "会议标题", - "GUID": "a9c9feb1-31a1-4380-81f7-ea5e5d79334f" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=会议标题" - } - }, - { - "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", - "BindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "会议记录表", - "ColumnName": "自动拉会", - "GUID": "793de123-8715-4270-b2bc-7bbba760fbbc" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=自动拉会" - } - }, - { - "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", - "BindingInfo": { - "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", - "TableName": "会议记录表", - "ColumnName": "会议状态", - "GUID": "741b92e2-b9fe-4118-9491-0cc2bc9ce40b" - }, - "Value": "1" - } - ] - }, - "BreakpointIdentity": "4a20ad8e-b454-4fad-99b8-6bbe1a7b7b54" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": { - "$type": "System.Collections.Generic.List`1[[Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon]], System.Private.CoreLib", - "$values": [ - { - "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", - "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": { - "$type": "System.Collections.Generic.List`1[[ForguncyDataAccess.ISqlCondition, ForguncyDataAccess]], System.Private.CoreLib", - "$values": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=开启云录制" - } - }, - "value": "1" - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=开启云录制" - } - }, - "value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TRUE()" - } - } - ] - }, - "RelationType": 1 - }, - "CommandList": { - "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", - "$values": [ - { - "$type": "DingTalkPlugin.StartCloudRecordHeaders, DingTalkPlugin", - "ConferenceId": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=返回结果.ConferenceId" - }, - "CreatorId": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前用户" - }, - "SmallWindowPosition": "float_bottom", - "Mode": "full_screen", - "BreakpointIdentity": "3e338c06-8a11-473e-9038-585bba40a40e" - } - ] - }, - "ID": "079322e1-6a96-44f0-85f7-e9f3653bb39b" - } - ] - }, - "BreakpointIdentity": "894bb60f-e90c-440a-bd83-c0897166076b" - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "发起成功", - "CustomReturns": { - "$type": "System.Collections.Generic.List`1[[Forguncy.Model.CustomReturns, ServerDesignerCommon]], System.Private.CoreLib", - "$values": [ - { - "$type": "Forguncy.Model.CustomReturns, ServerDesignerCommon", - "ReturnPropertyName": "会议ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=返回结果.ConferenceId" - } - } - ] - }, - "BreakpointIdentity": "783291b8-4913-4562-b2d0-da812f4a2a64" + "SmallWindowPosition": "float_bottom", + "Mode": "full_screen", + "BreakpointIdentity": "3e338c06-8a11-473e-9038-585bba40a40e" } ] }, - "ID": "8c6efedc-056f-4c6b-8967-93250e5375fe" + "ID": "a392f35d-ff07-4be3-b482-ea1ebcaade21" } ] }, - "BreakpointIdentity": "a618d238-74cd-47c1-91bd-c5cad1d22cb6" + "BreakpointIdentity": "894bb60f-e90c-440a-bd83-c0897166076b" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "发起成功", + "CustomReturns": { + "$type": "System.Collections.Generic.List`1[[Forguncy.Model.CustomReturns, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.CustomReturns, ServerDesignerCommon", + "ReturnPropertyName": "会议ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=返回结果.ConferenceId" + } + } + ] + }, + "BreakpointIdentity": "783291b8-4913-4562-b2d0-da812f4a2a64" } ] }, - "ID": "d3fddcda-623a-41f8-aa50-41633a67a100" + "ID": "545b5f66-1705-464a-b43f-5b871db6b47f" } ] }, - "BreakpointIdentity": "3ed17605-dda1-49f5-a64a-ab7ac5341411" + "BreakpointIdentity": "a618d238-74cd-47c1-91bd-c5cad1d22cb6" } ] }, diff --git a/Tables/会议/会议状态.json b/Tables/会议/会议状态.json new file mode 100644 index 00000000..c503ffe6 --- /dev/null +++ b/Tables/会议/会议状态.json @@ -0,0 +1,60 @@ +{ + "Name": "会议状态", + "Columns": [ + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "Unique": true, + "AutoIncrement": true, + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "状态码", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "状态", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_Creator" + }, + { + "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_CreateDate" + }, + { + "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_LastModifier" + }, + { + "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_LastModifyDate" + } + ], + "ExternalDatabaseInfo": { + "DataBaseType": "6db454c0-531c-4395-9122-921a18942902", + "AllowModifySchema": true, + "ConnectionId": "业务表", + "SourceTableName": "会议状态", + "SourceTableSchema": "dbo" + }, + "PrimaryKey": [ + "ID" + ], + "Indexes": [] +} \ No newline at end of file diff --git a/Tables/会议/会议记录表.json b/Tables/会议/会议记录表.json index ca1dbc78..4d3a14ac 100644 --- a/Tables/会议/会议记录表.json +++ b/Tables/会议/会议记录表.json @@ -140,6 +140,13 @@ "ForeignTable": "会议记录表", "ForeignColumn": "项目ID", "IsDetailTableRelation": true + }, + { + "PrimaryTable": "会议状态", + "PrimaryColumn": "状态码", + "ForeignTable": "会议记录表", + "ForeignColumn": "会议状态", + "IsDetailTableRelation": true } ], "Indexes": [] diff --git a/Tables/系统/钉钉事件订阅表.json b/Tables/系统/钉钉事件订阅表.json new file mode 100644 index 00000000..2256a394 --- /dev/null +++ b/Tables/系统/钉钉事件订阅表.json @@ -0,0 +1,95 @@ +{ + "Name": "钉钉事件订阅表", + "Columns": [ + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "Unique": true, + "AutoIncrement": true, + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "统一应用身份ID", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "CorpId", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "事件类型", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "主题", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "事件ID", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "生成时间", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "事件内容", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_Creator" + }, + { + "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_CreateDate" + }, + { + "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_LastModifier" + }, + { + "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_LastModifyDate" + } + ], + "ExternalDatabaseInfo": { + "DataBaseType": "6db454c0-531c-4395-9122-921a18942902", + "AllowModifySchema": true, + "ConnectionId": "业务表", + "SourceTableName": "钉钉事件订阅表", + "SourceTableSchema": "dbo" + }, + "PrimaryKey": [ + "ID" + ], + "Indexes": [] +} \ No newline at end of file