From ddb3a1f044fb108561382ce5e0514ca8bb21c87f Mon Sep 17 00:00:00 2001 From: cuckooent Date: Fri, 29 Nov 2024 09:40:06 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E9=80=89=E6=8B=A9=E5=8F=82?= =?UTF-8?q?=E4=BC=9A=E6=88=90=E5=91=98"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E5=8F=91=E8=B5=B7=E9=92=89=E9=92=89=E4=BC=9A=E8=AE=AE"},{"St?= =?UTF-8?q?ate":1,"Type":27,"Name":"ServerCommandPrivate/=E9=92=89?= =?UTF-8?q?=E9=92=89=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86"},{"State":1,"Typ?= =?UTF-8?q?e":15,"Name":"ServerCommand/=E5=88=9B=E5=BB=BA=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=A7=86=E9=A2=91=E4=BC=9A=E8=AE=AE=5F=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2"},{"State":1,"Type":27,"Name":"ServerCommandPrivate/?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=A1=B9=E7=9B=AE=E8=A7=86=E9=A2=91=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE"},{"State":1,"Type":15,"Name":"ServerCommand/?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=8F=91=E8=B5=B7=E4=BC=9A=E8=AE=AE"}],"Vers?= =?UTF-8?q?ion":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 72 ++----------------- Pages/会议/发起钉钉会议.json | 14 ++-- Pages/会议/选择参会成员.json | 18 ++++- ServerCommands/钉钉/钉钉事件处理.json | 26 +++---- ServerCommands/项目/创建项目视频会议.json | 5 +- .../项目/创建项目视频会议_页面.json | 2 +- ServerCommands/项目/重新发起会议.json | 4 +- 7 files changed, 48 insertions(+), 93 deletions(-) diff --git a/.collaboration b/.collaboration index 9c394b2d..a8afedf9 100644 --- a/.collaboration +++ b/.collaboration @@ -2462,19 +2462,7 @@ }, { "ModuleName": "PCPage/选择参会成员", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-29T09:38:08.0690942+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\会议\\选择参会成员.json", - "Pages\\会议\\选择参会成员.rd", - "Pages\\e58b161ccf7d4429955ac9e5e68d551.json", - "Pages\\e58b161ccf7d4429955ac9e5e68d551.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Image/视频会议3.svg", @@ -2526,19 +2514,7 @@ }, { "ModuleName": "PCPage/发起钉钉会议", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-29T09:38:42.2657209+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\会议\\发起钉钉会议.json", - "Pages\\会议\\发起钉钉会议.rd", - "Pages\\0fc62e2b756949678106d2a2a72a491.json", - "Pages\\0fc62e2b756949678106d2a2a72a491.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/服务端命令1", @@ -2558,16 +2534,7 @@ }, { "ModuleName": "ServerCommandPrivate/钉钉事件处理", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-29T09:39:57.4318677+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\钉钉事件处理.json" - ] + "ModuleType": 27 }, { "ModuleName": "Image/默认头像.png", @@ -2591,29 +2558,11 @@ }, { "ModuleName": "ServerCommand/创建项目视频会议_页面", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-29T09:39:57.4317205+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\创建项目视频会议_页面.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommandPrivate/创建项目视频会议", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-29T09:39:57.4317059+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\项目\\创建项目视频会议.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/获取业务配置", @@ -2729,16 +2678,7 @@ }, { "ModuleName": "ServerCommand/重新发起会议", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-29T09:39:57.431762+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\重新发起会议.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/changelog", diff --git a/Pages/会议/发起钉钉会议.json b/Pages/会议/发起钉钉会议.json index 34f336e5..21104351 100644 --- a/Pages/会议/发起钉钉会议.json +++ b/Pages/会议/发起钉钉会议.json @@ -339,7 +339,7 @@ "BreakpointIdentity": "b483bcef-277e-4621-a1b4-36a162c30d70" } ], - "ID": "db6c0b6a-ee10-415e-93d8-3d3f038107ad" + "ID": "51e6b82b-05ac-48e4-91a9-614328bb5bc0" }, { "CommandList": [ @@ -350,7 +350,7 @@ "BreakpointIdentity": "9b8a49b3-3016-482e-9435-9df8ecdcf9d3" } ], - "ID": "7475d70f-ff72-4bce-9cb1-ba7b9cf98dd1" + "ID": "72498030-479a-4491-aae4-18ddd8e8302f" } ], "BreakpointIdentity": "3c2060c3-5b57-46c0-81d2-9282414523c2" @@ -557,7 +557,7 @@ "BreakpointIdentity": "f4d4e85c-dbc7-41b3-b3ae-7cfa3fe3990b" } ], - "ID": "74145e77-1c71-4019-9d20-cc75a6b81f18" + "ID": "fc8f743b-7365-49ca-aebf-749cac9dbfa8" }, { "CommandList": [ @@ -568,7 +568,7 @@ "BreakpointIdentity": "c27ff745-d3f2-4f0b-bdf3-e035959490ae" } ], - "ID": "15782806-f5b7-47b3-9e01-7a0729ae31e6" + "ID": "6b1ac9de-38b1-4817-b9ec-c55a4be3baf7" } ], "BreakpointIdentity": "3fe835d1-b5a2-4ffb-b3e4-c39de428bf95" @@ -673,7 +673,7 @@ "BreakpointIdentity": "d4689739-de6c-40df-85cf-4ae41f712a8d" } ], - "ID": "e3c5fa36-de97-4641-aa4f-48ee87b25adf" + "ID": "5684848d-e90a-473b-9412-62a2ab403fb4" }, { "CommandList": [ @@ -689,7 +689,7 @@ "BreakpointIdentity": "42da755d-5e1d-406f-9547-5361035a0bb5" } ], - "ID": "49fb1504-39f6-439c-840c-d46f6085f6fc" + "ID": "348351f7-4486-4e58-bfd6-5a4051e1cf35" } ], "BreakpointIdentity": "4c10cefe-a28f-4c58-8132-0eff5e7976f5" @@ -871,4 +871,4 @@ "Formula": "发起钉钉会议!$I$18" } ] -}//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 +}//tS2w9cFNzQoj2UjpumbRpFrCjxCqfCoWlOttjQDJ+fO/XHnl6717lsHdU7bCrdsgxmdF6oTnRh9KnLMtKHinpGPwBAkNSL2IdUbWbrKKu1we6wsa7Vd0cF/etGr6+7anp9WbynMGtUFNnpq2uLGz6cZHrv9yD3IjIIqzPY0cVPdYysC2mR55f9vAlj6beBneUJMDTgHsOiIQW7sDcnM/AZbJQ64c1/lXE9DawkyCJv/uTNxmsZIFg9J/0ASfvlYzonDQxmfj2heIMpwT1hP9PSy/AbFNYPe9o7DSE/iF/zCYRRiOpaQiPMnb7Bdoufr2zvHkP48EA2Hic9Cy39xMGO66e0GJ1G59HZHqg8g8+NjJJAVv2s0G/eXZ7oaj4pzWYWiZZLFBtOjYl3S2YYEBeCU3gbRveUxlucgyWUeeLQ/CVNqbdZkI6mswAGLBApekCq7RL4cJw8NzbJN3kb0hV+DTYnckoO7EHWCN93P1js+gdLxyQ04BV3Lswv7Jsh5sgLUO3709gGu1J4dGyV9Y56haPFnhJ71NsiqgtgMoj9N1BBCTPaY2y2ML0mjKYBK6HiNZN4fcn4wM9KPDS/noET1bcH1Yv1uo3tl2AqKZr+cvtRdct7TVEwV6evNjaXQ0Jkcl7uSg6p3SiI8efm/5/ws1niIOchMA2vtNXwFrM5yWq2ZmcbYjLkqk7ZA+qm+VL4/OIU8M/7v/eFRhzbGpcSoDyLPzmLko4kjyNTPcfucCjjr6b1Ivbfsn9SkNWL3CPHml/Na/VAwHRJuIDwJ+PXeET2R5NzEvb/einS5G9R+YIWxnTgvz1a0/10pX6XlLIFSA3lW9rdnigyKH8AHTuK/SdsF/ssgXiwVAwnD6ghSE8OA3Pnq16qrzKHcNCV2iu12zGi4gQNXG+nbzpJI12g==|920 \ No newline at end of file diff --git a/Pages/会议/选择参会成员.json b/Pages/会议/选择参会成员.json index 09c69308..d1f42105 100644 --- a/Pages/会议/选择参会成员.json +++ b/Pages/会议/选择参会成员.json @@ -276,6 +276,15 @@ "GUID": "ef633b7d-8b44-4d4e-8454-78ac470b07b1" }, "ColumnName": "角色" + }, + { + "GUID": "7d606e64-2fd1-4247-ab56-a7f5fb8699e0", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "DingTalkUnionID", + "GUID": "9b5ad9d8-4202-491f-a620-c06a05cb44ff" + }, + "ColumnName": "DingTalkUnionID" } ], "SqlCondition": { @@ -347,7 +356,8 @@ "CustomColumns": [ "用户名", "全名", - "角色" + "角色", + "DingTalkUnionID" ] }, "DataSourceListviewName": "图文列表表格1", @@ -383,6 +393,10 @@ { "SourceCell": "角色", "TargetCell": "岗位名称" + }, + { + "SourceCell": "DingTalkUnionID", + "TargetCell": "UnionID" } ], "Source": { @@ -505,4 +519,4 @@ "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 +}//NGm0VuYpxjRJLY7aofxiqfjrUm1r+Lll8On8begJu6G+2gUM21SklsHRAn5mdjgmR2SzVVUWAFlPMtJMyfmWzv3v6TwrKQpyzgjhp0x/3k6+C0c0tACQHstaWIY6tK6Dn61K45YlgHPzLp0b/h9cO13QIp6FpJ+u2/Hh+1kXWWNG6SfsXzlJeyGB9xs587AgmXwGb56SNy8UFJFkTeuLWvibh1rYnCjc9aSrwkdBH8k5bgXdkMK3simytv6JhGAzCESC/nh3g4i2+E1jg7reh4gqrRH4PRfGGWK+Dk06DcqmTBYiI/wzU6WktHUyOSARU9sZhwEQu48j1ZLn9vZLv2KCHp4ZeYp2ISVrpm1b3omCTQ7btO/bh1GDgMBR+VjLA78B0J51Itb3EZwWWg3ZbbNAXbJGo5Cs3gMZ8TAq3v+OTbtNXFMLe6FmneOEJfUmA9pNqzj27KpsXFP57KqWDqUYPltAys5GKdvSqGRHws954LgCFGnKZrJZRTdmE5elk05wjO7GUGbhGt9deKHt9UR7riGz0vaJRv9TQl0VnM3VMhSYHe6eK2ALxiC5vlNdmvuBYGZH/cmMmQUusSln/awR3d381sJaEejfv0bS/opi4T60ScLDkvfMprulWBSHeDJPanoVMh6B4he8JXzg34UrmMIMRrpVuJcg01R8YZOnG1qelrnBa5XSWVMEhzATjCfUKxvdc5Z0btJBxVBlvK4m7nc5etteBJg3AzQOAkSu3AtQTEif4zzTq2CNN26Kt8QOGdUp6b2Yf2d2oExC6fWcHCUypDc0fPXB0o79Lh8fXQu3DEKfbtLmvhzHO/MwFrEnEMraIMNpGRlvJTpKjIsv5u1K9O8Yp4JLu1xocYhDkHjWpPAD85pbGvgnA6lWqt3mpAmjWfp1I7O+7nzCuw==|920 \ No newline at end of file diff --git a/ServerCommands/钉钉/钉钉事件处理.json b/ServerCommands/钉钉/钉钉事件处理.json index 7a78be89..36775a5f 100644 --- a/ServerCommands/钉钉/钉钉事件处理.json +++ b/ServerCommands/钉钉/钉钉事件处理.json @@ -488,7 +488,7 @@ } ] }, - "ID": "8a4f26aa-c52e-4f26-99b9-1f576b4d5f19" + "ID": "4e8dfd9b-aacf-47e2-bf3a-e3826041df5c" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -626,7 +626,7 @@ } ] }, - "ID": "1131a64f-43ab-40af-8f01-9645e114f18a" + "ID": "1045d3c8-868e-43d0-a757-eea18b28c323" } ] }, @@ -635,7 +635,7 @@ ] }, "Comments": "会议创建事件", - "ID": "041d0999-3088-4fd9-9b71-29105943f99a" + "ID": "fe331700-3e54-405d-a975-1cb0eb75a81e" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -872,7 +872,7 @@ } ] }, - "ID": "a151d463-7f79-43bc-8454-a2ad938f3a61" + "ID": "31455ef9-8750-4a39-bc19-ac7778ccaa8e" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -887,7 +887,7 @@ } ] }, - "ID": "4a75e207-c21f-42be-bdf0-64d37050f92f" + "ID": "5046a579-e324-474e-9333-1d1169c972b5" } ] }, @@ -1007,7 +1007,7 @@ } ] }, - "ID": "ce285d41-0423-435f-9405-89d58cab952e" + "ID": "8d14ead8-fdcb-41f0-88e4-31bff19c6d5a" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -1145,7 +1145,7 @@ } ] }, - "ID": "8b42564e-3f28-4ec9-8136-3ed14fcd4e5a" + "ID": "76e6cf51-e842-4870-b5d8-f4bf83d13ace" } ] }, @@ -1153,7 +1153,7 @@ } ] }, - "ID": "2f006ea2-e39f-4b91-846c-1e412669c5cd" + "ID": "d18cfb4e-a9f9-4d5c-841d-2eafa151f16b" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -1239,7 +1239,7 @@ } ] }, - "ID": "5a22de71-e8a3-481b-9282-7f5ad341686a" + "ID": "be63b26b-34cf-4d87-9964-d159394c0d87" } ] }, @@ -1253,7 +1253,7 @@ } ] }, - "ID": "e6de8d4a-4385-41c8-b0de-015fe922d675" + "ID": "239a9654-76b5-4d25-bd9c-3e4965612d9b" } ] }, @@ -1262,7 +1262,7 @@ ] }, "Comments": "会议状态变更", - "ID": "a831ba66-683b-450f-8aa4-92892a2d40d5" + "ID": "0461d534-8d8a-443b-93bc-b6775a8dc7da" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -1381,7 +1381,7 @@ } ] }, - "ID": "41c78a6d-4232-4808-b4ad-a2e9d0a30bd5" + "ID": "96ddd03b-1597-472c-9bd3-038e611fdf53" } ] }, @@ -1393,7 +1393,7 @@ } ] }, - "ID": "12aeae13-8f36-42bb-a43b-fc858758b87f" + "ID": "22c17d8f-c8a8-4475-a383-f070ffd700dc" } ] }, diff --git a/ServerCommands/项目/创建项目视频会议.json b/ServerCommands/项目/创建项目视频会议.json index a185f64e..827eacdd 100644 --- a/ServerCommands/项目/创建项目视频会议.json +++ b/ServerCommands/项目/创建项目视频会议.json @@ -43,7 +43,8 @@ "$type": "Forguncy.SaveLoad.PostRequestParameterSaveData, ServerDesignerCommon", "Name": "主持人UnionId", "DataValidationInfo": { - "$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon" + "$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon", + "IgnoreBlank": false } }, { @@ -304,7 +305,7 @@ } ] }, - "ID": "0c828dd0-d54e-4528-a0ec-6495c175e07b" + "ID": "a63e51d2-a412-4b94-90ca-3ae3a73f1cbc" } ] }, diff --git a/ServerCommands/项目/创建项目视频会议_页面.json b/ServerCommands/项目/创建项目视频会议_页面.json index a52d61b1..cee939e9 100644 --- a/ServerCommands/项目/创建项目视频会议_页面.json +++ b/ServerCommands/项目/创建项目视频会议_页面.json @@ -85,7 +85,7 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "当前用户UnionId", "ParameterValue": "%CurrentUser.DingTalkUnionID%", - "ID": "563a0e3149254d7481f90e793b225d5f", + "ID": "c8e75d73b05340d79d7de80e9228fa79", "BreakpointIdentity": "0b80d82e-950f-403f-bcae-4279df0b9060" }, { diff --git a/ServerCommands/项目/重新发起会议.json b/ServerCommands/项目/重新发起会议.json index b30e9782..7fed3f7a 100644 --- a/ServerCommands/项目/重新发起会议.json +++ b/ServerCommands/项目/重新发起会议.json @@ -292,7 +292,7 @@ } ] }, - "ID": "bb492fde-b16f-48be-880e-97c6d0036e09" + "ID": "6ed1be12-3a5f-4c37-9d88-d47629d1e213" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -307,7 +307,7 @@ } ] }, - "ID": "c8118f51-362d-45a9-82a2-cc9fb297ffee" + "ID": "587996ea-241f-4c14-a6b3-d3633a51f7e7" } ] },