diff --git a/.collaboration b/.collaboration index 786e5c97..73f9a553 100644 --- a/.collaboration +++ b/.collaboration @@ -170,16 +170,7 @@ }, { "ModuleName": "Table/会议记录表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-29T17:58:07.6429417+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\会议\\会议记录表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Tables/Git", @@ -2443,19 +2434,7 @@ }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-29T18:27:29.5438739+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json", - "UserFile\\BaseCss.css", - "UserFile\\CustomFormula.js", - "UserFile\\Load.js" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", @@ -2583,16 +2562,7 @@ }, { "ModuleName": "ServerCommandPrivate/创建项目视频会议", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-29T17:58:59.107875+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\项目\\创建项目视频会议.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/获取业务配置", @@ -2608,19 +2578,7 @@ }, { "ModuleName": "PCPage/会议管理", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-29T18:04:58.6341467+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\会议\\会议管理.json", - "Pages\\会议\\会议管理.rd", - "Pages\\502ee1db03c84e88a5a54340cf07e2c.json", - "Pages\\502ee1db03c84e88a5a54340cf07e2c.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Table/ClientInfo", @@ -2728,12 +2686,6 @@ }, { "ModuleName": "UserControlPage/多头像组件", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-29T18:00:58.9072028+08:00", "ModuleType": 31 } ] \ No newline at end of file diff --git a/Pages/502ee1db03c84e88a5a54340cf07e2c.json b/Pages/502ee1db03c84e88a5a54340cf07e2c.json index 34c080c3..0b96a577 100644 --- a/Pages/502ee1db03c84e88a5a54340cf07e2c.json +++ b/Pages/502ee1db03c84e88a5a54340cf07e2c.json @@ -76,7 +76,7 @@ }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 923.0, + "DesignLengthInPixel": 668.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -86,28 +86,39 @@ } } }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 112.0 - } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 213.0, + "Mode": 1 } }, "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 112.0 + } + }, + "11": { "GridRowColumnDefinition": { "DesignLengthInPixel": 26.0 } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 44.0 + } } }, - "Count": 11, + "Count": 13, "DefaultSize": 15.0 }, "Values": { @@ -180,6 +191,23 @@ ] }, "1,8": { + "CellType": { + "$type": "Forguncy.UserControlPageCellType, ServerDesignerCommon", + "UserControlPageName": "多头像组件", + "PropertyValues": [ + { + "Name": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='502ee1db03c84e88a5a54340cf07e2c'!I5" + } + } + ], + "OverflowMode": 1 + }, + "TemplateCellSource": "参与人用户名" + }, + "1,10": { "CellType": { "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", "Caption": " 自动拉会", @@ -196,7 +224,7 @@ "3,5": { "TemplateCellSource": "会议结束时间" }, - "3,9": { + "3,11": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -204,7 +232,7 @@ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", "PopupDisplayMode": 1, "Placement": { - "SerializeProperty": "='502ee1db03c84e88a5a54340cf07e2c'!J4" + "SerializeProperty": "='502ee1db03c84e88a5a54340cf07e2c'!L4" }, "ClosePopupCallbackCommand": { "Commands": [ @@ -252,7 +280,7 @@ "BreakpointIdentity": "a71ec74d-c95a-41ae-aba4-171b7d9f4e12" } ], - "ID": "6f2960b5-d6b2-44a8-a4ff-94e13570fdef" + "ID": "77a951ab-d980-4ea7-a8db-eb80c01d9b5b" }, { "Condition": { @@ -349,7 +377,7 @@ "BreakpointIdentity": "76928a79-bf15-4a54-9b15-c3d37b0a5a96" } ], - "ID": "45eccc42-1787-439c-a642-08da58825fff" + "ID": "f445fd19-ffd8-458c-ae34-8b0adb1d07e3" }, { "CommandList": [ @@ -368,19 +396,19 @@ "BreakpointIdentity": "a6859d7f-c680-460a-874f-ebbf01793316" } ], - "ID": "211cefb3-0d1a-417c-b78c-ebdc02346493" + "ID": "633ad077-08b6-4092-8ba5-3c5899133459" } ], "BreakpointIdentity": "cc7068c3-cbee-40e3-8a4b-8590aac7844f" } ], - "ID": "96bd84fc-35d6-4bc1-918e-81773c5adba0" + "ID": "1ca97644-b383-45a6-89ce-dfbd8ed07528" } ], "BreakpointIdentity": "134f0fda-c760-49de-8fce-7a58af9e254e" } ], - "ID": "dc6d454b-0ac5-49bc-8276-873a3b8f47dd" + "ID": "1000af28-c68f-4dde-9d5c-01fb73b98ce5" }, { "Condition": { @@ -431,7 +459,7 @@ "BreakpointIdentity": "76928a79-bf15-4a54-9b15-c3d37b0a5a96" } ], - "ID": "31c2468c-1351-4822-b24a-e675b2b17c43" + "ID": "be7b3aed-ce61-4f37-9d73-abb33a8631e7" }, { "Condition": { @@ -463,13 +491,13 @@ "BreakpointIdentity": "76928a79-bf15-4a54-9b15-c3d37b0a5a96" } ], - "ID": "a75da53e-4715-4e60-b164-a840f1a992f6" + "ID": "a21d41d5-7b10-41b1-b0be-ea82b80d1468" } ], "BreakpointIdentity": "ce1a0c05-2c47-454f-8796-01207357e397" } ], - "ID": "3a44e49b-de85-4ab5-b096-9fcdeb97c6cd" + "ID": "33f398ed-375a-4f52-ae40-694407f57a04" } ], "BreakpointIdentity": "9a3037a2-4ed3-4350-aad8-1ba8656dc7b2" @@ -521,6 +549,10 @@ "Formatter": 4, "HorizontalAlignment": 2 }, + { + "FontFamily": 0, + "HorizontalAlignment": 5 + }, { "FontSize": 14.666666666666666, "Foreground": 1, @@ -548,6 +580,11 @@ }, { "Foreground": 3 + }, + { + "FontSize": 12.0, + "Foreground": 8, + "HorizontalAlignment": 2 } ], "Types": { @@ -559,7 +596,8 @@ "yyyy/m/d", "Center", "yyyy/m/d h:mm", - "\"结束时间:\"yyyy/m/d h:mm" + "\"结束时间:\"yyyy/m/d h:mm", + "Text 2 0" ] }, "CellStyles": { @@ -567,24 +605,29 @@ "1,1": 1, "1,2": 2, "1,3": 3, - "1,7": 4, - "1,8": 5, + "1,7": 3, + "1,8": 4, "1,9": 5, + "1,10": 6, + "1,11": 6, "2,0": 0, "2,1": 2, "2,2": 2, - "2,3": 4, - "2,4": 4, - "2,5": 4, - "2,6": 4, - "2,7": 4, - "2,8": 5, + "2,3": 5, + "2,4": 5, + "2,5": 5, + "2,6": 5, + "2,7": 5, "2,9": 5, - "3,3": 6, - "3,4": 7, - "3,5": 6, - "3,6": 8, - "3,7": 9 + "2,10": 6, + "2,11": 6, + "3,3": 7, + "3,4": 8, + "3,5": 7, + "3,6": 9, + "3,7": 9, + "3,9": 10, + "4,8": 11 }, "SheetStyle": { "FontFamily": 0, @@ -592,9 +635,9 @@ } }, "Spans": [ - "1,3,1,4", "5,4,1,2", - "1,8,1,2" + "1,10,1,2", + "1,3,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", @@ -627,8 +670,8 @@ "Underline": null, "Strikethrough": null }, - "IsDisabled": false, - "IsInvisible": true, + "IsDisabled": true, + "IsInvisible": false, "IsReadOnly": false } ] @@ -638,4 +681,4 @@ "PaperSize": {}, "Margin": {} } -}//Tkrh0k07P5ET9ntz4EF56jXnTs9dhS0kw3KAxok8IusTMDvwnj6LCLqQ9ENU+q1KOSKgNBbVnmASRhH0IWOli3yKFbvMYY33VepvdfKEqtpNZvM+EFQxm05xc+2sa7IRtoO7vmxy/UQQjDzAjzrxKz1xX7I6HfKYs2AmOulzali0sqWivCWJn8LtXY/U+mu70gX96Vg595IybMmEeft470FgvoAzqxgZNZ1goYonyRUVEkPOakw4W4yaIXVshQksMuXBG0TKJQPntTwKU3T10l9GO3es8QgMCsdhI73WxrQO5CUzoq5alMkonErhLPE421r6o/QHMf4gUZtbwPFldIfEQ7JOYI3tMSUdvGClcqZFAXU0jxG1zZKmUFOo1eLoFdz/J4u8A1WqiG6h3OgDMHnh5kfkXrsW36ttYVpApX2Pnl9huV+SJv7LEP/UXcRgQev3uEKRdSsryFcKx4Rbp+mq/Q2HHwogCcprlCjdz3l65LEGvfjRv5aZsiG/L6ee/yFzq3TKzeIF6pDQ19FnyV78g2IhPpN4a232TPwzenJrMqCFdfZ/+0A3LCqSvmgU9/V3MUr6B4DsmHzxO6bUTWNlaA/pkrfuTdrIs+oGQO1ijcbRhm4n27LTAgZDi7BgubNJNUCgg4tOcfKVHR0rMB8Z2BoyYwg1+5E1Qq36vDeqPzYmBgDCFABIEJG+xPL8dy2B6+9elpaa1M07SVOrCb+4lhRiQTx+tcxdc/MfdeCSkvy35iPGN8X2i8KRwYC1DarpusHugPydRWvXg6zqMNPzUdpoE74wt3AZZUJ2JmJNL1Gu1RPPZv3rBNiQQsn+GSf9zYlnRoSsDvfMNiGw2adAbTps4B3iXMSvInV49vE6A/WC/8fE3KNwR2O+PYtz7Z31xMpLG11HwkWOV3FNjw==|920 \ No newline at end of file +}//Nykn1/xaoFPWM0JcR3dzomkf/IsBuzNaxpa/4GtueWroyi8jTGswtflVAYZHDoL30HPMyu6W0biWEo7HZXNoOhpApgH3iVHo222/TLvE+ZigEJrFWiz0jnbULlP3hEw/bSwa4ZQF3liPIJQxcOO/koXKk4tBb3RvRSCUO6vR9QCKbpk4YH0SyeBEvc86cauLnq5lmS1wxLzB/vf3NdJBAExM2iQ5TW/vI6dAprP/P4rIdRGvbO6x1s4Xd7UnLRMrU25hEZ0l76Q/aCH2DGXTzoIz0Or7gqyzBDuiLlEql17XKetsX2043eDe7aK42/1k3b+FZM59E7naR8TbL7xyK8RzEaK3B2NsTv9NP2bqv6V0NWZ6mJWTDjJ+nxdx+cO9uGnEcBS81pWbiY2td8PjK/6+radIvj/bbsSCcGLjqQhIuiFEqQGic87BMImc4j6oGZsC+lE3ay9ETKuL0vI+7nfIvt7y/xZl/Yjb3Af/XBTgJcnwspf9i/RQ9EAs97GZKvn72GFpmh+y2s3V2NAcb1A82wwU79ddIcwFeMf20LkUJ/vQ3NfViYPKIBXRM2Qd+CQOMYWGOtNh9KJ0r/iHGTonjilGYDFxz9YPRJTU83hT1q8v5qh+aTS0psbbyaJnRzMEQxedrDxITRvURuUbc04W4tzMsjAgVSl5arhwJE+lfLDkC8wZ/Kl/8F8IJTz000bFBRVBrsti0GDNQzocx6pc0u4LBo1DK+mNF6fH1Ucb4bkoghSriFVWXLH7tEKbo3e2rJArFhWDc+2kQ0LXyqr++8dLMdAs70NER0dGYdd7mW5BqB3pZu/KWu3SKJvvGp6K5zbUYZ1g09wQBZmoppeQ6KZcqf1sK+kua+In/M6rNX1Y+QJMDBTXEcGom1M5oLC9nTQY2aNOJCnZJ0KwbA==|920 \ No newline at end of file diff --git a/Pages/502ee1db03c84e88a5a54340cf07e2c.rd b/Pages/502ee1db03c84e88a5a54340cf07e2c.rd index 7e8a519b..ce33f19b 100644 --- a/Pages/502ee1db03c84e88a5a54340cf07e2c.rd +++ b/Pages/502ee1db03c84e88a5a54340cf07e2c.rd @@ -1,5 +1,5 @@ { "PageType": 2, - "ColumnCount": 11, + "ColumnCount": 13, "RowCount": 6 } \ No newline at end of file diff --git a/Pages/bb37d006d7fa42868edcb64a2148268.json b/Pages/bb37d006d7fa42868edcb64a2148268.json new file mode 100644 index 00000000..1b791949 --- /dev/null +++ b/Pages/bb37d006d7fa42868edcb64a2148268.json @@ -0,0 +1,64 @@ +{ + "Rows": { + "Count": 1, + "DefaultSize": 32.0 + }, + "Cols": { + "Count": 1, + "DefaultSize": 33.0 + }, + "Values": { + "0,0": 123 + }, + "AttachInfos": { + "0,0": { + "CssName": "", + "CellType": { + "$type": "ElementUI.AvatarCellType, ElementUI", + "CommandList": [], + "icon": { + "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", + "Name": "默认头像.png" + }, + "showSystemAvatar": true + }, + "TemplateCellSource": "用户名" + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0 + }, + { + "FontSize": 12.0, + "Foreground": 1, + "HorizontalAlignment": 2 + } + ], + "Types": { + "Strs": [ + "Body", + "Text 2 0", + "Center" + ] + }, + "CellStyles": { + "0,0": 0 + }, + "RowStyles": { + "0": 1 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "PageInfo": { + "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", + "ParentPageName": "多头像组件" + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//VxtZDjfUMJDxZ/RoCcHyJafCjPIQhv0x9X1xNiUWIYFjJn2zI58hDMeXoRAtbG7BuchLDAECsnjr5ww+ffao0aH70xdJxCTjHwUf5R8DViUSJx7ijaqVfW+Du7D7gyLi96AK6Zljw3GyGAyPra6tsuH5tFCG78wywnhNCaEVAghBBLc8IL3OVqShjP65eXo4XgQRnZSl4edH4yYpMe97l6JATrO2Oro20vNXljb5vEn7uKQPmzhrtc2e52jvXp9oiQzl9zXc0CJDzQyrzfXnuRBjLuvMpuBZs/WkYqIYHHxmYV0/47DbTHxq9QTy9ppIrxz62boVnXhwzivKx/VHZftsGTi++TzQhh2QSA88NC5NVb/VvBTkH36ccbKNOqVNJ89ddKPwKXxbowa2PwcYPoyUa6RCG8FBVVuxn9tVt3eMJCjxkyPBdJbnhgJZW69N/ZCPCSeNChvhcSrSYg/OrotPc0fl8dyGoZVDzytAu3h30SH76S6doIL4xj77h+XdO5CTdJR8AUi4bflNn3Kc7j2K0kwk0RCf/ZQiTpzT/+vp7SQyp9lgXz8DKNeBT2/Me1AEsOWCu3csB3JunVKpayI/N/3t8qvHE3jO+IpPaFa5MYAINkaxy/00WYA2lYuWrb7y80PiqinNlsKfZgMzxqjSAgtAsOOSzfUGJk7wWuCoG8XJguF+SLUrdmDGSOafuzIhm6sXxyA96SGdhMUlYOchmtGi3abExny30zQ21bHz+os2VM7OZT/ql/uEWYR44Vgqss69m2V0ezokIB7RuWGi5/marQHfNjfHB33U7VczjeKgk+RCycC7WbL81ZUfzGsjhx67ONeWqHD4wBHAbU0e3Hm18iW3Tq7g1e4DXBeB7fsI/UWCfBYmGn5lBdnMDRaj3ulWwTDqBA+PDn/NpA==|920 \ No newline at end of file diff --git a/Pages/bb37d006d7fa42868edcb64a2148268.rd b/Pages/bb37d006d7fa42868edcb64a2148268.rd new file mode 100644 index 00000000..e8913531 --- /dev/null +++ b/Pages/bb37d006d7fa42868edcb64a2148268.rd @@ -0,0 +1,5 @@ +{ + "PageType": 2, + "ColumnCount": 1, + "RowCount": 1 +} \ No newline at end of file diff --git a/Pages/会议/会议管理.json b/Pages/会议/会议管理.json index 03af6a88..7b8cba4d 100644 --- a/Pages/会议/会议管理.json +++ b/Pages/会议/会议管理.json @@ -400,7 +400,7 @@ "BreakpointIdentity": "c57fd584-34ef-4a17-b6ff-128bb2e23f21" } ], - "ID": "9482b224-0a32-41c3-958d-2e790494596f" + "ID": "9f411b0b-1589-46b3-95a3-d363958cdac9" } ], "BreakpointIdentity": "1b9971fc-5e6a-4671-9c15-ffac6ebace5d" @@ -759,6 +759,24 @@ "GUID": "930bbd88-31ab-43a8-8e81-77ec2cd235b3" }, "ColumnName": "会议状态" + }, + { + "GUID": "b84add5c-53b8-4c7a-9f6f-00e9f34363bb", + "BindingInfo": { + "TableName": "会议记录表", + "ColumnName": "发起人用户名", + "GUID": "0dcc6776-eae9-4b8e-a103-94401de74efd" + }, + "ColumnName": "发起人用户名" + }, + { + "GUID": "cb973b0a-aebc-41fc-879a-ad54303cb7cb", + "BindingInfo": { + "TableName": "会议记录表", + "ColumnName": "参与人用户名", + "GUID": "0514caa8-0b57-4b45-968e-7f3ed4ef1316" + }, + "ColumnName": "参与人用户名" } ], "SqlCondition": { @@ -862,7 +880,9 @@ "会议结束时间", "自动拉会", "状态", - "会议状态" + "会议状态", + "发起人用户名", + "参与人用户名" ] }, "DataSourceListviewName": "图文列表表格1", @@ -1322,4 +1342,4 @@ "Formula": "会议管理!$J$14" } ] -}//h+7ltiUWook+PPND+nj2IXi+uaA3HVbi8PRlIx2kEJUZc96VBXZjBp/1FXkiHYisoE9y5jVkyOIPKtqIdErdR0zkGZd3tVTXvQkUk/DeVVc2yA0xTnlHJn7QRp1wyhb/RqHgB9q8OBYoAp+xXH/ZlfIO76aZG/UAlqDQ5gQ34qosGSkmJ1zBVMQc9TI7opKA6jkx8SbxKVm7NQ0klH5UYIQJ4XR6ein10rMhcJDJuEioivL8qjavRv/oVrwrdchCI3VKRKxpbCGICunDfi13znH5bDceBDd/B7QRXTcVE5EoEPsRrH9JrUua/maEEobLUWaFwsEmuBsLot81p1BoN+4IV0slZUVWPG1m6PaRajeQ6dUwjFWTYRgKKyzPYw1Fy4+ZReVDDxa35N6mrxxT+pMsBzewj9wf31U0MzDR9snhnykD7rBI5FLmYP84QbrNt5p5SwKctXKfmY4Intc5DpafBMbY/J1Iz65cEjbZxfkivCiHlzytCC4bmWcpRj0O07IydNjamrYuI8GIRKWYT9zblQe5UZNKeus10x4pPa8eqb8RvesNRIcls5Lexjq5uASGD/+Rp9qsBZSXQC6jurO4Gued93e1EXlu6hWt0/71esUhonim4Nf8+K0OZ3e82wR5k+oGzBkjmnEuWg6iFCfHx7aaVsZlYzWu8sKyfAFJ5bz4+HRiKF6eWtjz1q/9lJSwHaTe+xb0VU3Xh+39inYvQ4KheOBjgwWKYBDoTtjmX3BRyZZUxqG/X9UpmgxAieF4zayUPOhAaySzFCrZcWM9oP2P8OI1ILQBx2kymzzGJxEqNwAVfw8qhIJdxDOdytPCd6jJQJ2wvMNMhIliukD6/HftAwA234pJ9lk/H0GUPc/qmS1ebs6OxXrxCKAk8bJXk585v6TvTrng1E/H4A==|920 \ No newline at end of file +}//hrL+fjSKDSBMKFFBk9ELk1H/sc+KVvwQJaHrr4ai7ZOFzjrkE2tb1C5RFSLcj+g68pl4UEdmRzUhl3/6dCewGhJCkF0Xe4cSWjfNd6xZxxxlC/2EdGOl4SXE5EvAztvqmY2XMRc0giRXw0IZkXJB+HUY5+CpDrcJZoyVbFY2YmkPYNIKr+F+LzWwynSXb4CpQkbzabsVgZM6/1/ZIh4moslqgwfYtCJMsA2g6cECgyzzxsCbu/RBg6ZbODj+XOpAt6aFWxnLMuw9NSVHjk68zjT/F06iLCumpNSg0MCBmyiw2WBx+b1TK+X4iCzT0Bs1SB1uMVGfkynKq5TsxK6OJEWYIwecVedgFqHmUyeTkasUdBdLMZhCi2vLbSmn+Y34abOzyenl4ApbBUJ94z+AmA/eHBWTkFazJcj1EGb0Q5uAI9h1g4WGhBFHcYkp1me/BPPt84SLBMINBD+L5BB9HckpaL+68DzGzVn1LDt2cd6KhHrKyPBNlO6HLdgR1KR0rM0q+9ZrYTKDby9ffIInZLt4lkie18S2yMdwO1O7kaQ66flLp5J5m256Z82BqBBknypdVAOxChUwYS9M6/RjnnNE0uug2kqH3rUVsjzEtgFxwgGp8JYWymMbnGO+RIBDLr/pE2h4pzmQcwjAwYUDyxTzovpPMwvNqSr9pM94UTfGL8H1SjjWkwKhcI+CtXYTq9tIfKerQu+fIpbKvC65l6RAEtqgKvaLyg9s6C//c6GIbSvT56ajAIvmagWGwjsaPNOivzrWQ4eft7oMdLQxF4NbjCTHFpQ+rpyz5LLKtlDFm1GMywnC1o0TKpfx0SEVjjEwnqScAWQnVXxBQ0Msos3ABmAv0R9DZwE7+5Jnq0OWUhQWn62PKI5gNvGg9P4bLCA1PLnUsZX3Fg+GJN6QHQ==|920 \ No newline at end of file diff --git a/ServerCommands/项目/创建项目视频会议.json b/ServerCommands/项目/创建项目视频会议.json index 827eacdd..805fec82 100644 --- a/ServerCommands/项目/创建项目视频会议.json +++ b/ServerCommands/项目/创建项目视频会议.json @@ -87,9 +87,106 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(会议标题=\"\",\"临时创建的会议\",会议标题)" }, - "ID": "e3b3ec5c9f9847eabf82dd61dbb46939", + "ID": "41b4f30c28884829bc17f090a1fc9ae8", "BreakpointIdentity": "3fb2ff75-5fae-406e-b580-088d675924a3" }, + { + "$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": "b83a2ab2-dff1-417e-b562-3ff272f0768c", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "4a81832e-9b50-4abf-81a9-efe8d4c78160" + }, + "ColumnName": "用户名" + } + ] + }, + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "用户信息视图", + "ColumnName": "DingTalkUnionID", + "GUID": "48ef96d8-96b3-405b-af94-a8059bf3d9bb" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=主持人UnionId" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "3dc7a5f6820a4e98943f3807c6131630", + "BreakpointIdentity": "d9be80a0-377d-4567-9fdb-534dfce80c19" + }, + { + "$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": "489fc3ce-9dcc-45a3-a4f8-f8f7b2f2819f", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "f5241363-cc0a-4a12-863b-0f8631faf5b3" + }, + "ColumnName": "用户名" + } + ] + }, + "SqlCondition": { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, + "ColumnBindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "用户信息视图", + "ColumnName": "DingTalkUnionID", + "GUID": "809fe762-99ab-41f0-b9fe-9257f3ff6a43" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参会人员UnionId" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "5aef7420492140e5bf7197286348473f", + "BreakpointIdentity": "789cb039-d39f-440a-9841-1a3dd325d4ff" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与人列表" + }, + "Operation": 16, + "OperationParamaterAName": ",", + "OperationParamaterBName": "用户名", + "OutParamaterName": "参与人用户名", + "BreakpointIdentity": "20e4259b-f85f-4018-9d4d-3bde15d1276a" + }, { "$type": "DingTalkPlugin.VideoConferences, DingTalkPlugin", "ConfTitle": { @@ -122,7 +219,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "项目ID", - "GUID": "b4434b57-898a-4732-8238-2418c6754cb3" + "GUID": "df0c34c6-19b5-429b-bb8a-8508f44ecb86" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -135,7 +232,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议业务类型", - "GUID": "23e0aa60-a18e-4107-b47b-76c5d69af109" + "GUID": "03903b29-d649-424a-8afa-afe726c16fd6" }, "Value": "0" }, @@ -145,7 +242,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "钉钉会议ID", - "GUID": "21792d1f-e1b2-4347-ad90-79262bc28d11" + "GUID": "ef453d08-15d0-42f4-9637-41e30a36ffeb" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -158,7 +255,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "发起人", - "GUID": "cceb3d5d-508c-4a9a-b78e-064fd2e19786" + "GUID": "cef12ad4-6772-4742-ba03-65eb8dd13958" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -171,7 +268,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "参与人", - "GUID": "6f7235e7-df20-4e9f-9e61-5b0119e79d21" + "GUID": "e5d8410c-9453-41f5-9194-2b3b9a06153e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -184,7 +281,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议标题", - "GUID": "2fa79f2d-e710-4e73-8720-204ea37e0460" + "GUID": "83855451-2eea-4b5b-97e3-145b32f4e9bc" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -197,7 +294,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "自动拉会", - "GUID": "75f74a3a-05fd-40c1-b305-866b7758ddb1" + "GUID": "fc5cff9f-2dbb-4afc-b597-4977381b1ad4" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -210,7 +307,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "开启云录制", - "GUID": "01b0cf46-e683-4c3c-b15d-6218235a6be9" + "GUID": "64719837-68e8-4158-829b-912992a76ca8" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -223,7 +320,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议状态", - "GUID": "1fb98051-4ab5-4025-a42d-cf0ac3a0cbb8" + "GUID": "ace6ae3c-45f0-4eb1-8d52-82721eec4ec1" }, "Value": "2" }, @@ -233,12 +330,38 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "关联钉钉会议ID", - "GUID": "9268821e-48a3-49dc-b1fd-a4e97eaafe63" + "GUID": "7f69922d-24fe-42e7-9789-0b2da7d4d8c4" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=关联钉钉会议ID" } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "发起人用户名", + "GUID": "5220f948-23f1-4a2b-9de8-0271863d2570" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=发起人信息.用户名" + } + }, + { + "$type": "Forguncy.Model.UpdateBindingValueItem, ServerDesignerCommon", + "BindingInfo": { + "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", + "TableName": "会议记录表", + "ColumnName": "参与人用户名", + "GUID": "3184139d-d774-4c8b-97d1-d6afa1d01794" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与人用户名" + } } ] }, @@ -305,7 +428,7 @@ } ] }, - "ID": "a63e51d2-a412-4b94-90ca-3ae3a73f1cbc" + "ID": "305340f8-7a4b-411f-8f2d-dc35f908f8ce" } ] }, @@ -375,7 +498,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "日志表", "ColumnName": "标题", - "GUID": "78afccf6-de84-42ab-8fcc-362aa8e601ff" + "GUID": "8a540af4-0b77-46d4-9f97-989ed953eb9f" }, "Value": "创建视频会议" }, @@ -385,7 +508,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "日志表", "ColumnName": "内容", - "GUID": "8d14dc7c-bdcd-4921-8955-73f985966658" + "GUID": "75fc03fc-bee2-4d39-a51c-54b8041bc830" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -398,7 +521,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "日志表", "ColumnName": "类型", - "GUID": "e9709932-9a87-4c97-8e23-22ccb54e79f1" + "GUID": "ec3121c9-49d6-43ed-a56d-1dab2e662604" }, "Value": "异常" } diff --git a/Tables/会议/会议记录表.json b/Tables/会议/会议记录表.json index 27fd69be..dcdf7214 100644 --- a/Tables/会议/会议记录表.json +++ b/Tables/会议/会议记录表.json @@ -39,6 +39,13 @@ "Name": "关联钉钉会议ID", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.UserBindingColumnSaveData, 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", @@ -46,6 +53,13 @@ "Name": "发起人", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.UserBindingColumnSaveData, 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", diff --git a/UserControlPages/多头像组件.json b/UserControlPages/多头像组件.json new file mode 100644 index 00000000..37f29abd --- /dev/null +++ b/UserControlPages/多头像组件.json @@ -0,0 +1,234 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 41.0, + "Mode": 1 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "InLogicalVisibleIndexes": [ + 1 + ], + "Count": 2, + "DefaultSize": 41.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 269.0, + "Mode": 1 + } + } + }, + "Count": 1, + "DefaultSize": 269.0 + }, + "AttachInfos": { + "0,0": { + "CssName": "avatar-group-list", + "CellType": { + "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", + "TemplatePageName": "bb37d006d7fa42868edcb64a2148268", + "DataSourceType": 1, + "DataSource": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "ad613c21-3267-4a2a-b1d2-8cb15b27486e", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "bad82e52-7e2b-4231-9989-aea8e0364833" + }, + "ColumnName": "用户名" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "2aae63d4-7c36-4727-a49f-986d2aea4b31" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=多头像组件!A2" + } + }, + "IsListviewDataSource": true, + "CustomColumns": [ + "用户名" + ] + }, + "DataSourceListviewName": "图文列表表格1", + "TopCount": 6, + "DisplayMode": 1, + "OverflowMode": 2, + "CommitDataWithCommand": true + } + }, + "1,0": { + "CellType": { + "$type": "Forguncy.TextCellType, ServerDesignerCommon", + "SavedValidators": [ + { + "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" + } + ], + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=多头像组件!A2" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "用户列表", + "TableValue": { + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "17606bce-4077-4a2e-a809-3586ecaa4519", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "05a24a5f-1715-4373-a06d-ed115f033ed7" + }, + "ColumnName": "用户名" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "a136e8f1-32b7-4048-a9c9-6fe72a779abf" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=多头像组件!A2" + } + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "e21af03eae4c4a60a2ee3b478afd3d1f", + "BreakpointIdentity": "b451730d-d4e0-4dba-8055-45c25f8e5323" + }, + { + "$type": "JsonDataSource.ImportJsonDataToListviewCommand, JsonDataSource", + "Listview": "图文列表表格1", + "ListviewColumnInfos": [ + { + "ListViewColumnCell": "用户名", + "PropertyName": "用户名" + } + ], + "SourceCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=多头像组件!用户列表" + }, + "SampleJson": "[{\r\n \"用户名\":\"\"\r\n \r\n}]", + "BreakpointIdentity": "cac71a22-a047-4f59-a509-b2d2e2d4c802" + } + ], + "ID": "849687b6-c3b5-48f4-bbbd-4897cc722100" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", + "ListviewName": "图文列表表格1", + "UpdateType": 2, + "UpdateRowType": 2, + "BreakpointIdentity": "48df8496-c729-4231-8908-167a2c141900" + } + ], + "ID": "0540dcd4-396b-422b-b338-50ab9975e3ae" + } + ], + "Disabled": true, + "BreakpointIdentity": "df154152-6ceb-4867-b47d-41bed5c973e1" + } + ] + }, + "TemplateCellSource": "Fgc-UC-TwoWayBinding-Value-Column" + } + }, + "StyleDatas": { + "Styles": [ + { + "HorizontalAlignment": 0 + }, + { + "Formatter": 1, + "HorizontalAlignment": 0 + }, + { + "Background": null + }, + { + "Background": null, + "FontSize": 12.0, + "Foreground": 2 + } + ], + "Types": { + "Strs": [ + "Center", + "@", + "Accent 5 0", + "Body" + ] + }, + "CellStyles": { + "0,0": 0, + "1,0": 1 + }, + "RowStyles": { + "0": 2, + "1": 3 + }, + "SheetStyle": { + "FontFamily": 3 + } + }, + "PageInfo": { + "$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon", + "PropertyDefinitions": [ + { + "Name": "用户名" + } + ], + "CommandDefinitions": [], + "MethodDefinitions": [], + "PageLoadedCommandList": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//9DOwbC5mBprLob/YTuUkyObH2gfZHt0DMyIugHpMJ18mO7xxgt/Sj2jbUyRKDJODu9Mz3hSIuDLtJ4NmI6Zs0WNFlR0OWE4wQnKVVJWsDqHn0ykJnNhh/Z2ko8rI//2ZLE+pGWgXn6WWKDpJ9ZeH9Fni924T5jRaU9lPWWJvtXuopLDYTEY/ZMs1fE3bmsDnfguqRSkHh1zrGiSkWNesTdaqaP0QRkUhAzo7eMmR5W2BmhJ0nLrUNEXRyYCDjBzeQ3QLzo/pDFgc6TDSjGyn5YoZEepWpFLuuER9e7i31A8RVzIv3zuy0JlM7gEamP2BX9UDrc4veMWRwoTwiYrvSGZz0EUOEf723dW6058dSSjLeUHNA0mqxFCie67RxlldFO3eiFByiC1+zjQYLiJtZAXa2gyl+SZTD0FVOSkbgt1oEzugzQe2JQXdHf0+WtAIGlaD2lqMOfy1vWZbavzM6ewI9BjQjnEJD7yC/tMTn03ppmOTe4MZdhd3MRSa6FlDsPfT/f3FuekT382yNKwmlb/nhIxdCvfx9TAlFWgPAQf1X+OfvLu7nKS+a9IziTFikC9IA5eYKroEP2r+plzMZv8aGKmZF8zOZh49LbiTyu/24UtoGIOla5zNVO33XPsExTopr1DvWDRssYl/jDAES8HMM1tmIGFOin/DuJQIRz7GWwpJzWttceMJ6f8xxFO2LVU9iO3KZDvmtTe0fiOtZyacnT4uzkn3DizNumznVNYyT66KJ2Ff1gz1x7HJlI96YDdHdfi6AyoL7QIPtr7w24w43yq1wGRgaQh7O2w0m1kAg1QhBVlqPLhsjCCviFWpytqWWXN/NxUeU0Z3UqqOL1nq8ZVlupZ6m1Aroflwoa9F3NH2Ke9nqHDSz2licILV4k8u5FrrGHG2nSwUrL1k7g==|920 \ No newline at end of file diff --git a/UserControlPages/多头像组件.rd b/UserControlPages/多头像组件.rd new file mode 100644 index 00000000..623b7ba3 --- /dev/null +++ b/UserControlPages/多头像组件.rd @@ -0,0 +1,5 @@ +{ + "PageType": 3, + "ColumnCount": 1, + "RowCount": 2 +} \ No newline at end of file diff --git a/UserFile/BaseCss.css b/UserFile/BaseCss.css index 9e9d679c..7357a4f1 100644 --- a/UserFile/BaseCss.css +++ b/UserFile/BaseCss.css @@ -1,3 +1,9 @@ +/* 头像层叠图文列表效果 */ +.avatar-group-list .repeater-item-content:nth-child(2) { + transform: translateX(-15px); +} + + /* 单选框 */ .box-radio label.fgc-toggle-button { background-color: transparent !important;