From d43ce5b23525de9a3c3819b4f6b8cee167bb050e Mon Sep 17 00:00:00 2001 From: cuckooent Date: Fri, 22 Nov 2024 12:42:14 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E6=96=B0=E5=A2=9E=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E6=A8=A1=E5=9D=97","MessageType":2,"Modules":[{"State?= =?UTF-8?q?":1,"Type":7,"Name":"Table/=E4=BC=9A=E8=AE=AE=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=A1=A8"},{"State":1,"Type":1,"Name":"PCPage/=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E5=8F=B0=5F=E5=85=B3=E9=94=AE=E4=BF=A1=E6=81=AF"},{"S?= =?UTF-8?q?tate":1,"Type":3,"Name":"MasterPCPage/FGC=5F=E6=AF=8D=E7=89=88?= =?UTF-8?q?=E9=A1=B5"},{"State":2,"Type":1,"Name":"PCPage/=E6=88=91?= =?UTF-8?q?=E7=9A=84=E4=BC=9A=E8=AE=AE"},{"State":4,"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":4,"Type":1,"Name":"PCPage/=E4=BC=9A=E8=AE=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85"},{"State":3,"Type":6,"Name":"Pages/=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE"},{"State":3,"Type":1,"Name":"PCPage/=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E7=AE=A1=E7=90=86"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 91 +--- MasterPages/FGC_母版页.json | 189 ++++---- Pages/502ee1db03c84e88a5a54340cf07e2c.json | 6 +- Pages/dca212d9143944f79673fb1776be989.json | 3 +- .../我的会议.json => 会议/会议管理.json} | 387 ++++++++++------ .../{工作台/我的会议.rd => 会议/会议管理.rd} | 6 +- Pages/{工作台 => 会议}/会议详情.json | 434 ++++++++---------- Pages/{工作台 => 会议}/会议详情.rd | 6 +- Pages/{工作台 => 会议}/发起钉钉会议.json | 8 +- Pages/{工作台 => 会议}/发起钉钉会议.rd | 0 Pages/工作台/工作台_关键信息.json | 6 +- Tables/会议/会议记录表.json | 7 + 12 files changed, 556 insertions(+), 587 deletions(-) rename Pages/{工作台/我的会议.json => 会议/会议管理.json} (73%) rename Pages/{工作台/我的会议.rd => 会议/会议管理.rd} (60%) rename Pages/{工作台 => 会议}/会议详情.json (74%) rename Pages/{工作台 => 会议}/会议详情.rd (68%) rename Pages/{工作台 => 会议}/发起钉钉会议.json (95%) rename Pages/{工作台 => 会议}/发起钉钉会议.rd (100%) diff --git a/.collaboration b/.collaboration index 0fe0f6f0..aa2b7e22 100644 --- a/.collaboration +++ b/.collaboration @@ -170,16 +170,7 @@ }, { "ModuleName": "Table/会议记录表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T12:40:43.4467335+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\会议\\会议记录表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Tables/Git", @@ -1251,17 +1242,7 @@ }, { "ModuleName": "PCPage/工作台_关键信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T12:32:48.4464187+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工作台\\工作台_关键信息.json", - "Pages\\工作台\\工作台_关键信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/客户", @@ -1297,17 +1278,7 @@ }, { "ModuleName": "MasterPCPage/FGC_母版页", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T12:34:00.0297215+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\FGC_母版页.json", - "MasterPages\\FGC_母版页.rd" - ] + "ModuleType": 3 }, { "ModuleName": "UserControlPage/任务统计信息", @@ -2557,37 +2528,9 @@ "ModuleName": "Table/会议状态", "ModuleType": 7 }, - { - "ModuleName": "PCPage/我的会议", - "State": 2, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T12:32:48.446361+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工作台\\我的会议.json", - "Pages\\工作台\\我的会议.rd", - "Pages\\502ee1db03c84e88a5a54340cf07e2c.json", - "Pages\\502ee1db03c84e88a5a54340cf07e2c.rd" - ] - }, { "ModuleName": "PCPage/发起钉钉会议", - "State": 4, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T12:39:44.3925854+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工作台\\发起钉钉会议.json", - "Pages\\工作台\\发起钉钉会议.rd", - "Pages\\0fc62e2b756949678106d2a2a72a491.json", - "Pages\\0fc62e2b756949678106d2a2a72a491.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/服务端命令1", @@ -2595,19 +2538,7 @@ }, { "ModuleName": "PCPage/会议详情", - "State": 4, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T12:39:39.8012863+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工作台\\会议详情.json", - "Pages\\工作台\\会议详情.rd", - "Pages\\dca212d9143944f79673fb1776be989.json", - "Pages\\dca212d9143944f79673fb1776be989.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Table/会议发言记录", @@ -2659,22 +2590,10 @@ }, { "ModuleName": "Pages/会议", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T12:32:40.1777913+08:00", "ModuleType": 6 }, { "ModuleName": "PCPage/会议管理", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-22T12:32:48.446371+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json index 1df81d03..41d08199 100644 --- a/MasterPages/FGC_母版页.json +++ b/MasterPages/FGC_母版页.json @@ -357,6 +357,28 @@ "FGC_LoginUser" ] }, + { + "Value": "会议", + "Text": "会议", + "SelectedIconColor": "Background 1", + "SelectedIconColorUseItemColor": true, + "IconColorUseItemColor": true, + "IsOldMenuPath": false, + "CommandList": [ + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "会议管理", + "BreakpointIdentity": "9d55664b-7750-4f1f-81ee-13af6643256b" + } + ], + "CanVisitRoleList": [ + "FGC_LoginUser" + ], + "Notification": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(DATEDIF(\"2024-11-22\",TODAY(),\"d\")>7,\"\",\"New\")" + } + }, { "Value": "财务", "Text": "财务", @@ -670,14 +692,8 @@ "width": "280px", "distance": "10px", "borderRadius": "5px", - "ID": { - "type": "formula", - "obj": "NotiflixNotify" - }, - "className": { - "type": "formula", - "obj": "notiflix-notify" - }, + "ID": "NotiflixNotify", + "className": "notiflix-notify", "fontFamily": "Quicksand", "fontSize": "13px", "fontAwesomeIconSize": "34px", @@ -714,18 +730,12 @@ "type": "color", "value": "#fff" }, - "fontAwesomeClassName": { - "type": "formula", - "obj": "fas fa-check-circle" - }, + "fontAwesomeClassName": "fas fa-check-circle", "fontAwesomeIconColor": { "type": "color", "value": "rgba(0,0,0,0.2)" }, - "childClassName": { - "type": "formula", - "obj": "notiflix-notify-success" - } + "childClassName": "notiflix-notify-success" }, "failure": { "UseFontAwesome": true, @@ -745,18 +755,12 @@ "type": "color", "value": "#fff" }, - "fontAwesomeClassName": { - "type": "formula", - "obj": "fas fa-times-circle" - }, + "fontAwesomeClassName": "fas fa-times-circle", "fontAwesomeIconColor": { "type": "color", "value": "rgba(0,0,0,0.2)" }, - "childClassName": { - "type": "formula", - "obj": "notiflix-notify-failure" - } + "childClassName": "notiflix-notify-failure" }, "warning": { "UseFontAwesome": true, @@ -776,18 +780,12 @@ "type": "color", "value": "#fff" }, - "fontAwesomeClassName": { - "type": "formula", - "obj": "fas fa-exclamation-circle" - }, + "fontAwesomeClassName": "fas fa-exclamation-circle", "fontAwesomeIconColor": { "type": "color", "value": "rgba(0,0,0,0.2)" }, - "childClassName": { - "type": "formula", - "obj": "notiflix-notify-warning" - } + "childClassName": "notiflix-notify-warning" }, "info": { "UseFontAwesome": true, @@ -807,18 +805,12 @@ "type": "color", "value": "#fff" }, - "fontAwesomeClassName": { - "type": "formula", - "obj": "fas fa-info-circle" - }, + "fontAwesomeClassName": "fas fa-info-circle", "fontAwesomeIconColor": { "type": "color", "value": "rgba(0,0,0,0.2)" }, - "childClassName": { - "type": "formula", - "obj": "notiflix-notify-info" - } + "childClassName": "notiflix-notify-info" } }, "ReportOption": { @@ -832,10 +824,7 @@ "type": "color", "value": "#7f000000" }, - "className": { - "type": "formula", - "obj": "notiflix-report" - }, + "className": "notiflix-report", "svgSize": "110px", "fontFamily": "Quicksand", "titleFontSize": "16px", @@ -992,10 +981,7 @@ "type": "color", "value": "#f8f8f8" }, - "className": { - "type": "formula", - "obj": "notiflix-confirm" - }, + "className": "notiflix-confirm", "fontFamily": "Quicksand", "titleFontSize": "16px", "messageFontSize": "14px", @@ -1011,10 +997,7 @@ "rtl": false }, "LoadingOption": { - "messageID": { - "type": "formula", - "obj": "NotiflixLoadingMessage" - }, + "messageID": "NotiflixLoadingMessage", "backgroundColor": { "type": "color", "value": "rgba(0,0,0,0.8)" @@ -1027,10 +1010,7 @@ "type": "color", "value": "#dcdcdc" }, - "className": { - "type": "formula", - "obj": "notiflix-loading" - }, + "className": "notiflix-loading", "svgSize": "80px", "fontFamily": "Quicksand", "messageFontSize": "15px", @@ -1055,10 +1035,7 @@ "type": "color", "value": "#383838" }, - "className": { - "type": "formula", - "obj": "notiflix-block" - }, + "className": "notiflix-block", "svgSize": "45px", "fontFamily": "Quicksand", "messageFontSize": "14px", @@ -1241,7 +1218,7 @@ "BreakpointIdentity": "93a42dfd-568c-458f-8329-5f109667a10d" } ], - "ID": "510e402b-0e6b-46cb-b40d-59023b7ac286" + "ID": "8839dd06-d5aa-4a34-9d91-2f26cdf87c73" }, { "CommandList": [ @@ -1263,13 +1240,13 @@ "BreakpointIdentity": "8c119858-efa0-4da0-a07c-a0dd79baecd5" } ], - "ID": "88b7c695-2c3d-4f38-a49a-f198c75d836e" + "ID": "08f66a63-710f-476c-9467-1e6d46e724fe" } ], "BreakpointIdentity": "969ae033-7873-46a1-81a1-9b8e65fb33ca" } ], - "ID": "e53e9133-d2d0-4f97-902d-0191288f127d" + "ID": "2197e88d-56dc-4dd7-8a3a-a2f20424b168" }, { "Condition": { @@ -1320,7 +1297,7 @@ "BreakpointIdentity": "0c54b865-bdb8-4095-8e71-675943dc6dba" } ], - "ID": "21ac8533-c7d0-40b3-b004-292d2f5e18dc" + "ID": "55c9bd50-8659-4208-bd9d-9c957e822c95" }, { "Condition": { @@ -1355,7 +1332,7 @@ "BreakpointIdentity": "f20dc5c6-d4f5-43ee-99a3-4f94332145d1" } ], - "ID": "b84aa892-cd10-40e8-9507-cb6370b6d183" + "ID": "79cd83fb-e0b5-458a-a1d2-4bf9bbbbd904" }, { "Condition": { @@ -1392,7 +1369,7 @@ "BreakpointIdentity": "692c798f-e9fe-4d6a-9065-76af5915989e" } ], - "ID": "1b3313c4-0f2f-4ba1-befb-146ec57868f3" + "ID": "9b1d05e5-ba00-483b-89c8-db2c5ca3cb23" }, { "Condition": { @@ -1428,19 +1405,19 @@ "BreakpointIdentity": "a6635eec-fb42-4663-b576-5a45041a36a4" } ], - "ID": "dd387035-a17e-4dec-90e7-4c318832a41d" + "ID": "bc33b4fc-4d14-4761-bf1b-bb4f0905ef61" } ], "BreakpointIdentity": "dc81da90-9ea2-4f47-86a9-69552d8d9859" } ], - "ID": "b1640a4f-90d2-418b-8eae-ab860bb5b9c1" + "ID": "fee32121-e6ee-4d4d-8e0f-91af2ccc7097" } ], "BreakpointIdentity": "ebce4947-cdf6-4822-bf2a-1b39dfe85079" } ], - "ID": "21e467b5-b434-44dd-a8ba-46eca31a35ac" + "ID": "f54acfab-7fde-46eb-a1e8-a779ae08d810" } ], "BreakpointIdentity": "1797eab4-9995-496c-85d8-4ec4d448f51e" @@ -1455,7 +1432,7 @@ "BreakpointIdentity": "aacc45c3-b13c-4494-a8f9-f585962b2e7e" } ], - "ID": "5f3e12f3-8b1f-4128-b0e5-80bf74151b7f" + "ID": "197ddd86-cda8-4818-940a-fa91d0b46361" }, { "Condition": { @@ -1563,7 +1540,7 @@ "BreakpointIdentity": "c25e32ee-3b70-4862-8d4e-319ec62ab08c" } ], - "ID": "44519473-53f2-4144-90d3-7e4847120631" + "ID": "a27b1fe8-10ec-481f-be27-a66e4a2ea2eb" }, { "CommandList": [ @@ -1585,13 +1562,13 @@ "BreakpointIdentity": "21b1ac03-ccd8-4ec2-a027-10c57fac30a7" } ], - "ID": "a7004f06-5cbf-43ab-8ccb-7e39f41fa426" + "ID": "b0ec687b-d6bd-4efe-9c11-d84750c6f65e" } ], "BreakpointIdentity": "fa123ae4-f0ab-44c4-b993-68fdcd2ac87d" } ], - "ID": "335f4baa-36cd-4c0c-b3b9-89b76bcf6f1b" + "ID": "2192a337-4a94-4092-a7aa-73c04b91d623" }, { "Condition": { @@ -1642,7 +1619,7 @@ "BreakpointIdentity": "cb631bfb-30fe-4d1d-99c8-6a67a0fb8e29" } ], - "ID": "8b230aa1-6b57-49dd-9b35-f5d3cd85b8ca" + "ID": "d35ba661-2be8-4332-bd46-0aadaa29b87d" }, { "Condition": { @@ -1677,7 +1654,7 @@ "BreakpointIdentity": "2e7bbdef-12f5-4403-9881-e28853c1ddf3" } ], - "ID": "d467e953-1322-4463-8ad5-60748ad93897" + "ID": "fc880722-48cd-4737-b1b8-c20ef7cbbe77" }, { "Condition": { @@ -1714,7 +1691,7 @@ "BreakpointIdentity": "32ff7538-b8b1-448a-a6ac-11bf1f423e4b" } ], - "ID": "e2f891b2-3c3a-4201-b68d-b26ef1c05644" + "ID": "c8e73ddb-9b42-4d62-a454-9886f68eb345" }, { "Condition": { @@ -1750,19 +1727,19 @@ "BreakpointIdentity": "8d3185e2-b48b-4c88-a6b0-21348c3c7886" } ], - "ID": "47524db6-2e44-4b1c-9ad6-15863d81ca2a" + "ID": "07caf5c6-e697-4e45-b52c-2855836a7c98" } ], "BreakpointIdentity": "40512f68-5598-402e-b32e-7e8aa84cd6b9" } ], - "ID": "bb39b09c-529e-492d-8c13-21cda37c6ba7" + "ID": "c64be0e4-0993-455a-8fca-da1262cae02a" } ], "BreakpointIdentity": "61dcc8d6-7c86-4cd1-80ba-3f5d005ba83b" } ], - "ID": "5b2981dc-ceef-4900-9b27-24c1fa965811" + "ID": "8a8d0eb6-bca9-41c8-ba8e-ef31dc9442d4" } ], "BreakpointIdentity": "b0a7b2ff-83d6-43c3-b9f2-e63b81c9194a" @@ -1777,7 +1754,7 @@ "BreakpointIdentity": "ff1ca583-b4f0-4859-bf29-fe5902e6d3e1" } ], - "ID": "8db73f26-2f6e-4bf2-b55c-18f882851c2b" + "ID": "6cbcdc62-d567-4715-b79d-348d9773928b" }, { "Condition": { @@ -1885,7 +1862,7 @@ "BreakpointIdentity": "54534b74-a29f-44ae-99b2-e28f2f440a71" } ], - "ID": "5dc89c09-53e1-42f9-a7fa-8e92f08fb5b6" + "ID": "87218c24-2ed5-4254-b660-e77deb0c35b2" }, { "CommandList": [ @@ -1907,13 +1884,13 @@ "BreakpointIdentity": "6c7d2476-067f-492d-be7e-ee51d0953562" } ], - "ID": "65146e06-63dc-4a85-ac5c-7adafff66cdf" + "ID": "cc0dc5ba-918b-4245-9d00-265e3ab7d534" } ], "BreakpointIdentity": "5fa8cf02-b78b-4f05-a9bf-e6fcd1a3278f" } ], - "ID": "59b576ad-b635-4030-8b12-5f47fa424490" + "ID": "3f74349e-017e-472f-a932-f2bc7834d501" }, { "Condition": { @@ -1964,7 +1941,7 @@ "BreakpointIdentity": "6b2c138b-81e2-4c96-8a9a-7b15e8d2af41" } ], - "ID": "d687355a-3db8-4fd7-b5e9-da6adc7f9934" + "ID": "8382a105-e932-4288-a1ec-7cfb78a1ed63" }, { "Condition": { @@ -1999,7 +1976,7 @@ "BreakpointIdentity": "32a8989a-0321-4daa-9db7-354dda93cb6b" } ], - "ID": "31781e47-f80b-41d7-9cd3-59a5f541d160" + "ID": "3ccd586b-98e6-4a67-9ef4-6301e82ff415" }, { "Condition": { @@ -2036,7 +2013,7 @@ "BreakpointIdentity": "9d5a7ef8-9d01-412d-b350-b2fb4db012cb" } ], - "ID": "c9458e1b-61bc-40f9-aac2-3b293ccb018b" + "ID": "fd14645c-4317-4411-a8f0-96383fef2f66" }, { "Condition": { @@ -2072,19 +2049,19 @@ "BreakpointIdentity": "f62c6f7d-40a5-46cd-bec9-087107916b4b" } ], - "ID": "e60d2472-4a09-4ef9-8f43-e6782ca04178" + "ID": "4836337a-8b6f-4b9e-9d00-610fcf5b32e4" } ], "BreakpointIdentity": "2eb6d3a7-dbb3-483d-912c-235d4e8e4a0a" } ], - "ID": "3dc17aa4-c0cc-4381-bf33-be6053585174" + "ID": "779f2bca-1ad9-4abe-b71b-11aa5c017b3f" } ], "BreakpointIdentity": "bda7027f-3f7f-4608-870a-be5b29ca3107" } ], - "ID": "ea1ced7f-ddf6-4c3b-9859-13e7425c2140" + "ID": "532ad7ad-7535-49b6-8f06-d41c11b3f7c1" } ], "BreakpointIdentity": "bb272395-1c45-4f35-ba4b-4f55a5aa5b3d" @@ -2099,7 +2076,7 @@ "BreakpointIdentity": "0cdabfdb-449c-400e-b747-339c71869bea" } ], - "ID": "c4bde6f6-0cd7-4e9b-bf82-f510daa2b0b4" + "ID": "1de88dc4-7f64-4377-84b2-3e9ecd7a7714" }, { "Condition": { @@ -2207,7 +2184,7 @@ "BreakpointIdentity": "f30c2b20-d028-4767-8db7-55e1149758c1" } ], - "ID": "8309426b-f524-44ef-b2b1-5c6b29e486ac" + "ID": "70908db8-032c-4319-bb40-b8efcc133cbc" }, { "CommandList": [ @@ -2229,13 +2206,13 @@ "BreakpointIdentity": "94205cb2-e185-4d45-a981-bd7eadc450f7" } ], - "ID": "e4c2e7cb-22c9-4955-8a82-47c84c61d0c7" + "ID": "bdc20497-7e04-475a-917f-23342ac0b390" } ], "BreakpointIdentity": "2e764005-dd75-472a-8e78-299f723cd0cf" } ], - "ID": "93599a72-1009-4a12-8db7-de75896bb9fe" + "ID": "18a230d0-001f-40c5-a6a6-7e54711e56a2" }, { "Condition": { @@ -2286,7 +2263,7 @@ "BreakpointIdentity": "2fcafc31-62d4-42f1-8000-f7d9333ac500" } ], - "ID": "12ba3a55-60de-4958-a482-abfcac9a73e9" + "ID": "f3865cd2-630d-47d2-9c37-6aba2edda72e" }, { "Condition": { @@ -2321,7 +2298,7 @@ "BreakpointIdentity": "caa4a42f-bff7-4989-b539-55a0d8f24d20" } ], - "ID": "d2c51339-2fb0-4a89-8d71-2aea93cbe63f" + "ID": "85cf84db-ef18-4a80-ba7c-946cae7afafb" }, { "Condition": { @@ -2358,7 +2335,7 @@ "BreakpointIdentity": "c08dc4ab-fe0e-4928-aaa7-f8470c5e15bf" } ], - "ID": "d5fd734f-89ab-4bce-9ca6-3ad3ab37691f" + "ID": "a6f97ef3-b892-4d8e-9cf7-58bf48c5a07b" }, { "Condition": { @@ -2394,19 +2371,19 @@ "BreakpointIdentity": "cc0440db-c781-4b77-b485-93fdb8d6874d" } ], - "ID": "128600b6-b1cf-47b4-b514-b45070d18e6a" + "ID": "10f0dbef-b349-4625-addc-88376353e6ec" } ], "BreakpointIdentity": "44e95042-8990-4521-9985-55bbfa92d8db" } ], - "ID": "4c67889c-e6f5-423b-8a45-c1dc71c26577" + "ID": "f20fbbfe-9b20-4888-84a8-1c89959d9002" } ], "BreakpointIdentity": "e95e5e23-18d0-4058-bc48-424a8abd2313" } ], - "ID": "e8ff7c4b-f5c0-4f9b-9c42-e338d0437516" + "ID": "660ba664-4773-4d1e-81d1-9c33947f34ad" } ], "BreakpointIdentity": "0bca50da-fc39-4ea0-acf5-515ca80b8bfc" @@ -2421,13 +2398,13 @@ "BreakpointIdentity": "06108817-3d19-41e8-a64f-b9f5ef92e2fb" } ], - "ID": "205c7d65-188b-4113-8f0f-84e39bbe1e0a" + "ID": "ca05385f-a98c-40c3-927b-d5681ee0ddae" } ], "BreakpointIdentity": "e73bda49-7ee7-4c1c-8d64-6bcce134a9de" } ], - "ID": "e9a34db0-4a8c-440e-bc23-e5b5a9814ea3" + "ID": "e052a145-84a5-4b07-94d1-0a626055d101" }, { "Condition": { @@ -2512,13 +2489,13 @@ "BreakpointIdentity": "bb2578ef-d07e-472e-af66-56480cfcadfa" } ], - "ID": "7e4240e4-614b-45d1-b7e9-f83651399f16" + "ID": "eb600172-20f2-4b8a-a45c-73703d661acf" } ], "BreakpointIdentity": "1c17b13d-b8e1-448a-be3e-900d6745a52a" } ], - "ID": "95baad7f-e4c5-4e28-b2b2-3ba73f61bff1" + "ID": "e317f435-a653-4e1f-abfc-0f8deff61662" } ], "BreakpointIdentity": "33a98260-470d-477c-a40e-ac58277d3a7b" @@ -2566,7 +2543,7 @@ "BreakpointIdentity": "38982f28-2985-4b01-be47-faa3df252fea" } ], - "ID": "5ba757f5-73a9-4174-81e9-9740402d3179" + "ID": "8ce2b53c-8675-4430-9ff6-8ee09acfaa7d" } ], "BreakpointIdentity": "495ca2c1-c930-4844-89e3-078cdcaf89e9" @@ -2600,7 +2577,7 @@ "BreakpointIdentity": "04f0cb77-3dc0-4be1-92a7-838f18561aea" } ], - "ID": "4fd7b95c-1cc7-4107-9ff1-4be56a1f092c" + "ID": "27733a7d-83a0-4f53-8fc6-8342b303c4f9" } ], "BreakpointIdentity": "7be84535-2fb7-4180-a5fb-0af9b82abed1" @@ -2649,4 +2626,4 @@ "Formula": "FGC_母版页!$C$7" } ] -}//eLCFMnqbmGXH4Tb48A43GJxVqk/c5ZDfLM31E9E+6TrxeGljnUaCF67Yebq9c4ZCUnwYmZfEE0b7vLVDZ6hoHQj9ISXd3NNUMPWc1QACHAU1cdoAj9Q0MSVpY8Ql8YC8e85y1Qu3tPDgylj39qGK/M8zvTigv73w4k2cWQWIs94TZVqenP1BN1XOQvE4UdpbVclfhxtDzYEaZMaWE8wYVDSQcfckhBQeb925q1IMjcmJ0iRHanZhmKJtVYN0EP1uPB78JQftviwFqsF/r3PhufRt3eHErS1WKeSJK9GkSW4j2v/kf7S/7Kf0WfLEY4ftHtLdJF9HFYKn5bzj268vqSOeNRTtx2/DFrkuXxZ/2d2VICjCayMcehFkaFC+LdhdH7PSWXwYijTn1ouF9czOzCZBNwZwVnhefHdz3GUHo8cB0moDlK2PBlQekgtCMFvaMF+/R925KsC2pV0w+51DzVOuJzmvTLxLw0CKTBLFaM/F4Un+ngLfeABKfNLnkk2n+w8hcNEOcrOIfI4cB42Oh6y6VMDMdxxsDJiLF51x78Mr2DNGQsWd/Mv6QdjNoP7D2c7Sy1LxbHX3lwA/+nDwqZJeFR49fK86MBjUBIsaS/8tJcycuwV5JttBfdege10DmQE6nc+oWz7U+3xEbzRLy1tzHur0fiQ/483nArgKXl/ToNrrdT2oNfDk3DbIJp0524tviCIRz38b1dfRdFZAO0WI/JH7oJrMIbrkq5PXrAhfYrCMKVgX6hrgeV5P6McwrfTEhkvhjrluIhvSSFkaKnuaZYyeDgxM9Umx6/yOiwRscfcyPSoIqSMb1cB8XYM38x4cgNTP0auSMrChiUYoWdHKrgj8MfoDAmC52JCTsfEtvovYavCrMwQ238aRcYdgRdoTlGeWAcnCGG2jRGvxIQ==|920 \ No newline at end of file +}//IwQWjQpMQAHFcHxYjPEarmMC7J5xnBMFrgdui2J/7byuxiaJEYlDmWyg0JAIK6xjOBUpgwr5tseV4AfqtwapoYbuDQzDhpHUKl5lvDXOFQUmsYTdw1Pf5CQCMtWPrSwnWU20rGOCu+YhsQriUzhpYyxvrDaam10lEokkvqd9NpbNhHm5IzhliiZDZUHTD9Y9RGxDIC/GkOYrmvTPyoi2YALxc0Xkqb/UxM2AqY5xLCIZjW6yH6YySy+LzOo2P4ZpYh2OasEkwtcUI0Ai7m7bJWx3uNqKNRizIK8gTToZgbFW5U6qkIycVWrxQXC4Fov/iatqMYL1itiv/ZyisacIQH5PjUL6bR/h8uk2U6/4L7rEJmGooLwIwt9ahjcGH8QQlupDx4DvPsgVBfzytIHxmgONF1ZmkP1GS+3/2MPvuugY+bum34jSFpswDS4m7dQyviczT5LrnH6iL0ctn8BXX4FC85anfB58N0LVLyU+6t8Zn2J42UGc920bW/D/YR1n+Gkh8tkBLgVyOOv1ESL698Mp+mzoFLlc5CYCXeo0JHyX3ex3MCvsX3lHo3i2tpz7coo83yovPljVqgSwA/xwmzDjPbB5gaYlrDp4d1XKicsrPhznJ7/ou5/38UYDsa56AB97unOZJvA0UvEkDX/iD918YPp0x1ftphB3Y2ZBQHB1ICcE2oN9+yMTXHuPMe1nRTI1Mo+wY65B+9gw8iyXTz/Aof769dKPI36NCAcHUnW5ikgmTkzom+easOg3V+Rup9zbWPGr1XeU8MaZuZurw5FAFxhTHrS8XicOBU1CHiAMnyc9O7jr4QQjsZkcEl5hM1q/K4O6/m/fy6g99sB7EtN8MKZbdSK2o8uMFwYJenDqC7/UMj8kDzlwHXy6uStUEK5st6YGykvd/IYyOjuURQ==|920 \ No newline at end of file diff --git a/Pages/502ee1db03c84e88a5a54340cf07e2c.json b/Pages/502ee1db03c84e88a5a54340cf07e2c.json index aa4eca9e..06b9ca29 100644 --- a/Pages/502ee1db03c84e88a5a54340cf07e2c.json +++ b/Pages/502ee1db03c84e88a5a54340cf07e2c.json @@ -76,7 +76,7 @@ }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 510.0, + "DesignLengthInPixel": 869.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -295,7 +295,7 @@ ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", - "ParentPageName": "我的会议", + "ParentPageName": "会议管理", "ConditionFormatRulesCollection": { "Rules": [ { @@ -335,4 +335,4 @@ "PaperSize": {}, "Margin": {} } -}//2ADwxigWI/vrArqg1lbAd3/HXDDo5pYt2T+5WLCdFv4gDnc84gUBCLpsykffYnUErZvHmumtINTEp9z/9GQFiUNdmqn/Xn/D7MZhoEUbzH/Z/rshDrlkt99NpvD73EBu2HCBP55L8zjc9ts9ukuNPUpHGd+1qguhGkkSMt+m5SXheFDJnvgWK7eO5G01+ajuKNM2oLKO9AqOyp0B9hUBj11u59TURepy7C5n3KT/r0CODgInNcGVYx/RHWs1fhXkUMH+zR0oUsdqq6cgkFOieP62rgXvk25Of2l8uTLtOgnEvSbp4lC6rfUqogp3HAg/VygBFPCRygvsbxyT72bGbwgdZNGw7NNmqTpGhJaEWqf9888uRfxeRHLp69oNnFNGnT8MoB40ITI0jnD6uEXctEdlg+C6PN7jEQE92+27Ax63l2pp66J/kMzRRKVDxdx5iifjCRoYHrE2DrR+Yct7vBcFHHNN1xKPDN415q5OjS+onW2kueHZS/sr5uWKrO0Z4/68daX5JQg4zk3tjkWdGX3kT8p0VLR1o/QzeLbwrcWKrEc5qoLmQRdm72ERHRaxNJTLF5pZdgy+F3Cp0R6OBeGFCn3jgwb9ukEwtU+9MwZ80la+DC6v4T4iStTyAWrsKIslcAeyTKwnpLQSMOoDm+Pys+ic0z3Z0M8fwdnrBMSJvbeX09X1NCkPYlnUAu/pUda848Az5u0dNXoJwox/dh3jHevkr42MHjDsjAOigNbAfqul65/xCvULuviqw7S7q7xOhXqPEJazfeFmJeO/f7hxt1jyIoIY+p34axRdXzdnI1AdR/obZlA/zLnMuCLwoZOrBMwQ3qWZdQ6x+QM1G2Vd+Ov6wYBkT6oK5NgYefDi4B2dns7GxalhlPeZxnb74SLsoi3VCpIULyNk0ZYROw==|920 \ No newline at end of file +}//pLADu69PKRIY3zqrPT3FH2cP0GQXSX78KTmGLYxE7EZXwhf47CRT+o8wzTUjp+gaU9OEO8oh4ZRGCB6WwQtS1TWxR5BqaKJdOa9BMmh+i92VJYgQqmxvzdLmMDkpr/tKeoI7dPj9Vq3+PCK8M9Mra4dLGwwXyLO7SE4p7QeBI51aPgJ4jO2re0RL/xiddcPd1WyHORMt+vSJMeAAALMHG/OLA5Xo9g97L1wU7dhfyCW6a5U82BxbgqdfILr24T2Rt7150I9elOpISrVLgcE2DFx9UW6tofiHXCZMpTdabarRwVYjMA75e3+qABOXvsckROJ7OS3uQRwhdYyP6heix7XkSrOj3D+2rLO/TjANklqLmbhuLWX9uysCMTsPgdRmXjgEPyCUAjNl35iPGlM/wmv27GL5N3zQZWcy6WBU7bcZZ3dGrPpsgHvDFhZdxGDr5yKFhLNUC0AsKJNuRvnsJgTgm/5rEPuxrXULcMXsT5s1NZZt7jn3MrF0TVVreRA3kopoVMsbe2oq4KaF8BRXI92sowR9beZhTSPMYvqG2pMdMnfDgonj8dKwie9OkLjQFnV+EYNSKRvLSJp93/5/4kcstxnt1zKhWBYnqkAwDVcUYW7IA58cokc2kDs2qIzU0s041w43drQF9jn0KTxsg0biWx9u3L/IjMILNSET2G6Vz5MiRtwU4BNmTMhCCgR9PUINaPTAiurruas/yJRZk0+HUjjsGgrlH4TTGRH/shc6fw3JxhVR9QwI5LU9KT2DjDwkOr8o7STqFptUYDfaluT7cQ/P8bjQdagyxdbf5SLbaA0HQomaLKmBj7e94LZxpwWAmCGOxUYZTMLRtqjQ41/kYb1d0tkyZCjCm6eqDEbKTlCSq6EKJdv0920JwoRsIns/Cz/5k1IkhZpP/RiVwg==|920 \ No newline at end of file diff --git a/Pages/dca212d9143944f79673fb1776be989.json b/Pages/dca212d9143944f79673fb1776be989.json index 8b7b6827..98d7685a 100644 --- a/Pages/dca212d9143944f79673fb1776be989.json +++ b/Pages/dca212d9143944f79673fb1776be989.json @@ -93,6 +93,7 @@ "1,1": { "CellType": { "$type": "ElementUI.AvatarCellType, ElementUI", + "CommandList": [], "icon": { "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", "Name": "默认头像.png" @@ -172,4 +173,4 @@ "PaperSize": {}, "Margin": {} } -}//0QJeZTJcoev7/Q8RVsq1fZq87tDFDgb+G4wX9CUbou8hkY0gTvO9g8YtsHs2eacrqYgjmAdprmldBRra57fKktYbQcq28hVipom+VRqoKCZ2fyIbZAhYdBI8swViW4xB5QTnw2NgObgIChazP6u40fRypQk8ctKrWpj8fqldSsdkdtgu8FOUdbu0XCCcuBybFu72Mjwx67fyQT370dTRjhvkzfhJ6ur/DhlpS0zl1eF8dERly3ZQpMOSqLwn2bkO6vYk+cELANejEnvsR5xUyOdZ7xLW9j8VVSGm48AzqEIOD7cMAhppjKSIARyysPa+99g/F5+SgGztgDFhQZ1CD4RflL7Cvo8gQ51Goyy1KD733oPEXbLWvXID7VRJvAcJOenAxt7/sKXr/pzXLhCALz4Dy3k4K0xJwshJBWbvVgYZvZ36b/rK3qLq82OVMICCtHl057sKCf7EkuGCIz3DK1HbijAoVOi/2t+aLg7J4Nl3eHVdpZiHx45cOXzA1VmkMnb50SVA62lWeF08LuRDfMGln2gFt8HMkkpvwU61QahJAlLc6FxS46mk6tkrQBl28sv7vSm0Nfjq5E42gUH6Ac+529xG9jdxe9HBu8v+w09+qVT8g99PAAL18TugVunw5MtOrQHfd2MXPGsp7H4XjBe30hGStOCw05b/IIJRTw7Fcn3fxNq47rE2HR4tOU/Gh4kDUmesZSTow0UXMXF35Fzt4hlXn6f2bDV8EgGFGJ85EvGqGAd9rpQ/qv9+F9vbS3iwzrucHMh81ijxghtqiP8WkpOrcxr/I0YzSGzMvz2UrFXUtLvb31twMmQyG4Olb0yV7nO3jHfNmCCy5Y0+gfBICD34FBqUvgMC3Syp64dLEbMq50HLdjT6Lwc84fdg8XNG8h/RYsXAAA7k5SpCKA==|920 \ No newline at end of file +}//y/1smwFsjdKk+svjCwls2P32dNH+1BHJ5O5CEAZciAh5twMlIqnbyA1MlpBCoLHxD/8oBOyl6NWdv5DzMNgChJrU0ZCB8d01L6+ilBH4V7NcVnzG7NvzhsqjqvSGKaSkpYreRak5PW9SZZDWRfkrzdLrlx/mmNYrXrayrNxrJRMIPAxdemLmY6SPPZ7fFOPqrel2B2GuVqLDrWlVSF9v3LQp8qlh55uYkJsAWUXPfpbZrIMdmms1T+gCnzoIgX3bX2K5pXx0FSh7YpWvgDj3UEUwzaq9TZhYmMMVOnaYdvhYDkENO3jy7FOqTSO/mfEAK7LoNljiInJkrAfEqwQvgV41Eff19EAji1ar4gQlDuyBGbmzX0437iNuEW7YIW5AUa8kYWGfUYvNhO2ewLP4rWRodfQYcEkH3DwJz4bxx/mHR6d5PQj23bh+th/Bxjp31XrJHNaXEAoQEffD0BJXb7808NDcfrCGKQRbpJ2iiRFhI5QCjEj0OdjgqJsNJy6KCK09njZGb83gH+XYQtTtV96oojOIvCHdoMve25perViLRNGCOQgJt2v+tlJ2KsEJTCbkwbKX8VEcAhyS1SxvFggxs6m/H4dmuH1xNWKlQGVSxJGzTcciA9xVC9q10b8GA01IzHNEPbjlGqE9txWFlS1d7nL6ra6tW3MGT/Yy7bHhYiR6HPJseHKqRyZCrYPbgZ6kDetgxfuidLKYX4o0+tonvfY1nzlUINcnjbvSI4r2u1mbeDQEuyZXGpjSZoFa/eSTytC2QXYjeCsgxTcKIVARWoTHEINQXgcn07xEiXczMk4e+HerYo4z2UQEFp6T9T2A4DQ10TnpPUffYGtw4T70oRVirzEcIyjXxO5q9sZ1i1KMuUDtrzJ4p89gQqEYB9ueTEEZTttsBMmj8XkFxQ==|920 \ No newline at end of file diff --git a/Pages/工作台/我的会议.json b/Pages/会议/会议管理.json similarity index 73% rename from Pages/工作台/我的会议.json rename to Pages/会议/会议管理.json index 9a63f60a..e5796f19 100644 --- a/Pages/工作台/我的会议.json +++ b/Pages/会议/会议管理.json @@ -21,6 +21,11 @@ "DesignLengthInPixel": 35.0 } }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 617.0, @@ -42,11 +47,6 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 28.0 } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } } }, "InLogicalVisibleIndexes": [ @@ -204,18 +204,10 @@ }, "29": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 200.0, - "Unit": 1 - } + "DesignLengthInPixel": 32.0 } }, - "31": { + "40": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -227,25 +219,31 @@ } } }, - "34": { + "41": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "35": { + "44": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "45": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 } } }, - "Count": 36, + "Count": 46, "DefaultSize": 32.0 }, "Values": { "1,1": "%PageTitle%", "3,1": "日期", - "3,17": "关键字", - "3,32": "发起会议" + "3,17": "人员", + "3,28": "关键字", + "3,42": "发起会议" }, "AttachInfos": { "3,3": { @@ -256,16 +254,16 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=我的会议!D4" + "SerializeProperty": "=会议管理!D4" }, "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "GetSelectedRange", "RetrunParamNames": { "StartValue": { - "SerializeProperty": "=我的会议!开始日期" + "SerializeProperty": "=会议管理!开始日期" }, "EndValue": { - "SerializeProperty": "=我的会议!结束日期" + "SerializeProperty": "=会议管理!结束日期" } }, "BreakpointIdentity": "0c657c17-c285-408c-89f5-61ae7512a8a1" @@ -300,6 +298,92 @@ } }, "3,19": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "4f3bbc08-0eb6-4828-8ace-4239f31cc83b", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "DingTalkUnionID", + "GUID": "43bc6541-b1ac-414b-85a1-2516623e66ec" + }, + "ColumnName": "value", + "Alias": "值" + }, + { + "GUID": "5645ba8c-e84d-4861-9573-e4f46857637e", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "8a44c1f7-29f2-4029-bedd-2dbf49bf96d1" + }, + "ColumnName": "label", + "Alias": "显示文本" + } + ], + "CacheSetting": { + "AllowCache": true, + "ExpiredTime": 600 + }, + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterable": true, + "filterInServer": true, + "filterInServerOptions": { + "defaultMaxOptionsCount": 10, + "maxFilterResultCount": 10, + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据", + "clearable": true + } + }, + "3,30": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [], @@ -328,7 +412,7 @@ "resize": "none" } }, - "3,32": { + "3,42": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -361,7 +445,8 @@ "Commands": [ { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PopupDisplayMode": 4, + "PopupDisplayMode": 3, + "DrawerDirection": 3, "ShowDrawerHeader": true, "PageName": "会议详情", "LoadBindingDataOption": 1, @@ -499,7 +584,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=我的会议!开始日期" + "SerializeProperty": "=会议管理!开始日期" } }, { @@ -512,7 +597,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=我的会议!结束日期" + "SerializeProperty": "=会议管理!结束日期" } }, { @@ -525,7 +610,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=我的会议!T4" + "SerializeProperty": "=会议管理!AE4" } }, { @@ -538,7 +623,10 @@ "ColumnName": "发起人", "GUID": "b48d4975-ded6-499d-aef1-be8fe195bac3" }, - "Value": "%CurrentUser.UserName%", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=会议管理!T4" + }, "LeftBracket": 1 }, { @@ -549,7 +637,10 @@ "ColumnName": "参与人", "GUID": "34d3426f-a775-4728-9725-6a146d4c0bbe" }, - "Value": "%CurrentUser.DingTalkUnionID%", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=会议管理!T4" + }, "RightBracket": 1 } ], @@ -604,18 +695,23 @@ { "FontSize": 24.0 }, + { + "FontFamily": 0 + }, { "FontSize": 13.333333333333332 }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 1 + }, { "FontFamily": 0, "FontSize": 13.333333333333332 }, { - "FontFamily": 0 - }, - { - "HorizontalAlignment": 1 + "HorizontalAlignment": 2 }, { "FontSize": 13.333333333333332, @@ -634,95 +730,136 @@ "Types": { "Strs": [ "Body", + "[AUTO]General", "Center", "black" ], "Borders": [ { - "Color": 2 + "Color": 3 } ] }, "CellStyles": { "1,1": 0, - "3,1": 1, - "3,3": 1, - "3,17": 2, - "3,18": 3, - "3,19": 1, - "3,30": 1, + "2,16": 1, + "3,1": 2, + "3,3": 2, + "3,17": 3, + "3,18": 1, + "3,19": 4, + "3,20": 1, + "3,21": 1, + "3,22": 1, + "3,23": 1, + "3,24": 1, + "3,25": 1, + "3,26": 1, + "3,28": 4, + "3,29": 1, + "3,30": 4, "3,31": 1, "3,32": 1, - "5,1": 4, - "6,1": 4, - "6,2": 4, - "6,3": 4, - "6,4": 4, - "6,5": 4, - "6,6": 4, - "6,7": 4, - "6,8": 4, - "6,9": 4, - "6,10": 4, - "6,11": 4, - "6,12": 4, - "6,13": 4, - "6,14": 4, - "6,15": 4, - "6,16": 4, - "6,17": 4, - "6,18": 4, - "6,19": 4, - "6,20": 4, - "6,21": 4, - "6,22": 4, - "6,23": 4, - "6,24": 4, - "6,25": 4, - "6,26": 4, - "6,27": 4, - "6,28": 4, - "6,29": 4, - "6,30": 4, - "6,31": 4, - "6,32": 4, - "6,33": 4, - "6,34": 4, - "7,1": 5, - "7,2": 6, - "7,3": 6, - "7,4": 6, - "7,5": 5, - "7,6": 6, - "7,7": 6, - "7,8": 6, - "7,9": 1, - "7,10": 1, - "7,11": 1, - "7,12": 1, - "7,13": 1, - "7,14": 1, - "7,15": 1, - "7,16": 1, - "7,17": 1, - "7,18": 1, - "7,19": 1, - "7,20": 1, - "7,21": 1, - "7,22": 1, - "7,23": 1, - "7,24": 1, - "7,25": 1, - "7,26": 1, - "7,27": 1, - "7,28": 1, - "7,29": 1, - "7,30": 1, - "7,31": 1, - "7,32": 1, - "7,33": 1, - "7,34": 1, - "7,35": 1 + "3,33": 1, + "3,34": 1, + "3,35": 1, + "3,36": 1, + "3,37": 1, + "3,38": 1, + "3,39": 1, + "3,40": 1, + "3,41": 2, + "3,42": 2, + "5,1": 5, + "6,1": 5, + "6,2": 5, + "6,3": 5, + "6,4": 5, + "6,5": 5, + "6,6": 5, + "6,7": 5, + "6,8": 5, + "6,9": 5, + "6,10": 5, + "6,11": 5, + "6,12": 5, + "6,13": 5, + "6,14": 5, + "6,15": 5, + "6,16": 5, + "6,17": 5, + "6,18": 5, + "6,19": 5, + "6,20": 5, + "6,21": 5, + "6,22": 5, + "6,23": 5, + "6,24": 5, + "6,25": 5, + "6,26": 5, + "6,27": 5, + "6,28": 5, + "6,29": 5, + "6,30": 5, + "6,31": 5, + "6,32": 5, + "6,33": 5, + "6,34": 5, + "6,35": 5, + "6,36": 5, + "6,37": 5, + "6,38": 5, + "6,39": 5, + "6,40": 5, + "6,41": 5, + "6,42": 5, + "6,43": 5, + "6,44": 5, + "7,1": 6, + "7,2": 7, + "7,3": 7, + "7,4": 7, + "7,5": 6, + "7,6": 7, + "7,7": 7, + "7,8": 7, + "7,9": 2, + "7,10": 2, + "7,11": 2, + "7,12": 2, + "7,13": 2, + "7,14": 2, + "7,15": 2, + "7,16": 2, + "7,17": 2, + "7,18": 2, + "7,19": 2, + "7,20": 2, + "7,21": 2, + "7,22": 2, + "7,23": 2, + "7,24": 2, + "7,25": 2, + "7,26": 2, + "7,27": 2, + "7,28": 2, + "7,29": 2, + "7,30": 2, + "7,31": 2, + "7,32": 2, + "7,33": 2, + "7,34": 2, + "7,35": 2, + "7,36": 2, + "7,37": 2, + "7,38": 2, + "7,39": 2, + "7,40": 2, + "7,41": 2, + "7,42": 2, + "7,43": 2, + "7,44": 2, + "7,45": 2 }, "SheetStyle": { "FontFamily": 0 @@ -731,33 +868,25 @@ "Spans": [ "3,1,1,2", "3,3,1,13", - "3,17,1,2", "7,1,1,4", "7,5,1,4", - "5,1,1,34", - "3,19,1,11", - "3,32,1,3" + "5,1,1,44", + "3,42,1,3", + "3,17,1,2", + "3,19,1,8", + "3,28,1,2", + "3,30,1,11" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "MasterPageName": "FGC_母版页", - "Title": "我的会议", + "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": { @@ -784,11 +913,11 @@ "CustomNames": [ { "Name": "开始日期", - "Formula": "我的会议!$B$8" + "Formula": "会议管理!$B$8" }, { "Name": "结束日期", - "Formula": "我的会议!$F$8" + "Formula": "会议管理!$F$8" } ] -}//UjDz+Rj0YSDTOr95JjEkda0zRw4r9NztRPLEjlHMErehWNNyviJqKiDOfhcVufKOv7gNyh0zQiHRb5Bz2lNP6+qp8H9d9hAmqANTa9/UeL4URio9cyHT7qoUEWlgjlTeXUgGpzP5K5fBWMyc84+7RJxPFapyQOWnKzxG98GoemT0smm36cPyn0NUasWYNz2fvqJqE3BdIxaSPTB2jwCjD/qgd4mM1/7uzAOGcREmMh3XIaCLNo1ikK/Z4ziVSEzulk4U3+gZpbdjSgfLIkRX3KX2UPbJqg+7x7Pmd0CZFFu4R+hqROp75IcggnmZwI/U2X4jr5fptT7HRwWq5bJvOBt4OOPbaD5gLTAauypmDl+tRYva3SryInbXGGSNsO1ZAzS2+aq0CZyZ5SGvJdb1dHrh1xdrBVUX7+lHp3m51OuRf4bRyaeqJxWRwAQausqnCNYydL0vPsVfqlqsnWimC5UJPxuurOpyC57/ihKFAZOR46SRMz1ov/URWxMP8J3u7V2zKJyKPX7HUNMCoimE9sz0MSpI7MaelIRXdIdFAfJy+73zq7EXRXxOW2cwy7OwiKG3EJCX80hb4oC0ccZIxJp0lmqiFByUVec/HlvBSce53ra9ZUQyBvS1Nbtao9sQzy9ORyqfFhnoHQObVykuwl+OnhVKrl6Bvw/CXWbUf0fMUK01cB6nhyOGAQsGRIPkang3FFYGa78Acr8N0m5M4YZxR67eGEPAQrw7gw3KDimktl5wCWuyWF/A068jTHok3vWIygH3WfwbwMUGBY/e0c1g5uqTk7JEfPXE9E+4LXfqxOxzPYQ9/jRbbtNXCa75V4ub15elijomEhF32QS/5Q3Iz1K2bLQ4m1XHHtP/9UawjNh5t32pvVHT4+x4U93nfwvaj2Z5SyX6wl6YT8kwxQ==|920 \ No newline at end of file +}//eo0j41NzZhaj6MOL9IN80Xqhin+tlPQx+yOFQ6577L2AMHC1nY82gX+DqFg/iKIg7nyAVN0lSwY0VnNHJoDdkOrZb2ZNYtQpZacz7HI3bGfYWt4olU5eCWjxHwJBP4eSU4IntLsMLa37o5zIXX3xBkXsKz6YVkn8wuE4g+pMIfA0rR+T2/C14La9TrrIp1JSiQbS6yws+oae5GgWFl1RtVi/mQgbP2tMGqAqjXVM+ouZYxjiMCQlHFuq/cWhdLPG1PRLjwyjE5czLlkIK2q5EqgbaXGfi8TbReWbwKgVhwszK3YO9HrgDMea17lNKa/23YkU0BZTG0gZP1XzkL14vj2vseSfARz6M4yNhDzokVYL7qdJH3rmBdWLF1wTn8xCLapAqNBylB4Bww+wtSmEmuu/TxnjJfJL8mSdtOGH46WMt+uVZUPW42DPBSGQ13wZBJyThuk8lLKc/K2DK4PN5HDznXhYnR1pZdb4D/r15TcjYW23MKLytm2sO22yN6nel3O9wZGLt/2vH5ShOarPjSYxaELfBpgVKlvAN25pLytiovCFj37lZacT4fT9+5VPTHy3FsFZPd7ogGfl3rTchQ8Jf1+9s36xpixkFk1FVk95Bw1XrYMGpaAaLJg7exIQjlHwucyjB8C4UqgdAF+xT9SN0Rxo43sOA2sDpem6A1ixIuosnxmCXRSe1GVxOgsGJ0hEKT/PkGRv+mlcbZB97iL8ZtQa430GDL8+ZzSLanSdrX8ElAW5SO6jICL4U5T9Jey6BAXDUEb+6WgZ6b9WZf3/JKhuvgukFwJV3/HHdoIZSJ/NG1+dx/2Lbq7TeqktyXK3NtRlJGbpQYGcHTdRxz0I47+NnZcdRDRzepHKqZGlxrAgja4ST6yo5r/s1Q6/RI8RC0zZshsbbGQ2eyN+GA==|920 \ No newline at end of file diff --git a/Pages/工作台/我的会议.rd b/Pages/会议/会议管理.rd similarity index 60% rename from Pages/工作台/我的会议.rd rename to Pages/会议/会议管理.rd index a9e3be49..a764076f 100644 --- a/Pages/工作台/我的会议.rd +++ b/Pages/会议/会议管理.rd @@ -1,15 +1,15 @@ { "PageType": 0, - "ColumnCount": 36, + "ColumnCount": 46, "RowCount": 8, "CustomNames": [ { "Name": "开始日期", - "Formula": "我的会议!$B$8" + "Formula": "会议管理!$B$8" }, { "Name": "结束日期", - "Formula": "我的会议!$F$8" + "Formula": "会议管理!$F$8" } ] } \ No newline at end of file diff --git a/Pages/工作台/会议详情.json b/Pages/会议/会议详情.json similarity index 74% rename from Pages/工作台/会议详情.json rename to Pages/会议/会议详情.json index ce59e888..a4dee7e0 100644 --- a/Pages/工作台/会议详情.json +++ b/Pages/会议/会议详情.json @@ -8,15 +8,20 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 24.0 } }, - "4": { + "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } }, - "5": { + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "8": { "GridRowColumnDefinition": { "DesignLengthInPixel": 771.0, "Mode": 2, @@ -28,13 +33,13 @@ } } }, - "6": { + "9": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, - "Count": 7, + "Count": 10, "DefaultSize": 32.0 }, "Cols": { @@ -168,99 +173,18 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } - }, - "26": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "27": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "28": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "29": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "30": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "31": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "32": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "33": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } - }, - "34": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "35": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "36": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "37": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "38": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "40": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "41": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } } }, - "Count": 42, + "Count": 26, "DefaultSize": 32.0 }, "Values": { "1,1": "会议ID", - "1,9": "创建人", - "1,17": "会议标题", - "1,25": "开始时间", - "1,33": "结束时间" + "1,8": "创建人", + "1,15": "会议标题", + "4,1": "开始时间", + "4,8": "结束时间", + "4,15": "关联会议" }, "AttachInfos": { "2,1": { @@ -270,7 +194,7 @@ "GUID": "1a24c847-9137-4120-b6cf-57cb521bf59f" } }, - "2,9": { + "2,8": { "BindingInfo": { "TableName": "会议记录表", "ColumnName": "FGC_Creator", @@ -281,28 +205,40 @@ } } }, - "2,17": { + "2,15": { "BindingInfo": { "TableName": "会议记录表", "ColumnName": "会议标题", "GUID": "75a6701c-dc4c-4921-845b-cf3709e73a65" } }, - "2,25": { + "5,1": { "BindingInfo": { "TableName": "会议记录表", "ColumnName": "会议开始时间", "GUID": "75ed6ad9-8150-4cee-8c4d-bce8e91e1080" } }, - "2,33": { + "5,8": { "BindingInfo": { "TableName": "会议记录表", "ColumnName": "会议结束时间", - "GUID": "e47cb192-d3b4-4367-a867-8f3db6154b44" + "GUID": "807510ab-2830-4f82-b173-5a8fea86215e" } }, - "5,1": { + "5,15": { + "BindingInfo": { + "TableName": "会议记录表", + "ColumnName": "关联钉钉会议ID", + "GUID": "46a6be37-fa33-4d82-80b7-f1bd480be0d8", + "RelationBinding": { + "RelatedTable": "会议记录表", + "RelatedColumn": "关联钉钉会议ID", + "DisplayColumn": "会议标题" + } + } + }, + "8,1": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "dca212d9143944f79673fb1776be989", @@ -405,32 +341,38 @@ "StyleDatas": { "Styles": [ { - "Foreground": 0 - }, - { - "FontFamily": 1, + "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 0, - "Formatter": 2 + "Foreground": 1 }, { - "FontFamily": 1, + "FontFamily": 0, "FontSize": 13.333333333333332 }, { - "WordWrap": true + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 1, + "Formatter": 2 }, { - "FontFamily": 1, + "FontFamily": 0, "FontSize": 13.333333333333332, "WordWrap": true }, { - "FontFamily": 1, + "FontFamily": 0, "FontSize": 13.333333333333332, "Formatter": 3, "WordWrap": true }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 3, + "HorizontalAlignment": 4, + "WordWrap": true + }, { "WordWrap": true, "BorderBottom": 0 @@ -439,183 +381,176 @@ "BorderBottom": 0 }, { - "FontFamily": 1, + "FontFamily": 0, "FontSize": 13.333333333333332, "WordWrap": true, "BorderBottom": 0 }, { - "FontFamily": 1, + "FontFamily": 0, "FontSize": 13.333333333333332, "BorderBottom": 0 }, { - "FontFamily": 1, + "FontFamily": 0, "FontSize": 13.333333333333332, "Formatter": 3, "WordWrap": true, "BorderBottom": 0 }, { - "FontFamily": 1, - "FontSize": 13.333333333333332, - "Foreground": 0 - }, - { - "HorizontalAlignment": 5 + "HorizontalAlignment": 6 } ], "Types": { "Strs": [ - "Text 1 50", "Body", + "Text 1 50", "[AUTO]General", "yyyy/m/d h:mm", + "Left", "Background 2 0", "Center" ], "Borders": [ { - "Color": 4 + "Color": 5 } ] }, "CellStyles": { "1,1": 0, + "1,2": 1, + "1,3": 1, + "1,4": 1, + "1,5": 1, + "1,6": 1, + "1,7": 1, + "1,8": 2, "1,9": 1, - "1,10": 2, - "1,11": 2, - "1,12": 2, - "1,13": 2, - "1,14": 2, + "1,10": 1, + "1,11": 1, + "1,12": 1, + "1,13": 1, + "1,14": 1, + "1,15": 2, + "1,16": 1, "1,17": 1, - "1,18": 2, - "1,19": 2, - "1,20": 2, - "1,21": 2, - "1,22": 2, - "1,23": 2, - "1,24": 2, - "1,25": 1, - "1,26": 2, - "1,27": 2, - "1,28": 2, - "1,29": 2, - "1,30": 2, - "1,33": 1, - "1,34": 2, - "1,35": 2, - "1,36": 2, - "1,37": 2, - "1,38": 2, - "1,39": 2, + "1,18": 1, + "1,19": 1, + "1,20": 1, "2,1": 3, - "2,9": 4, - "2,10": 2, - "2,11": 2, - "2,12": 2, - "2,13": 2, - "2,14": 2, - "2,17": 4, - "2,23": 2, - "2,24": 2, - "2,25": 5, - "2,33": 5, - "2,39": 5, - "3,1": 6, - "3,2": 6, - "3,3": 6, - "3,4": 6, - "3,5": 6, - "3,6": 6, - "3,7": 7, - "3,8": 7, - "3,9": 8, - "3,10": 8, - "3,11": 8, - "3,12": 8, - "3,13": 8, - "3,14": 8, - "3,15": 7, - "3,16": 7, - "3,17": 8, - "3,18": 8, - "3,19": 8, - "3,20": 8, - "3,21": 8, - "3,22": 8, - "3,23": 9, - "3,24": 9, - "3,25": 10, - "3,26": 10, - "3,27": 10, - "3,28": 10, - "3,29": 10, - "3,30": 10, - "3,31": 7, - "3,32": 7, - "3,33": 10, - "3,34": 10, - "3,35": 10, - "3,36": 10, - "3,37": 10, - "3,38": 10, - "3,39": 10, - "3,40": 7, - "4,1": 11, - "4,2": 11, - "4,3": 11, - "4,4": 11, - "4,5": 11, - "4,6": 11, - "4,7": 11, - "4,8": 11, - "4,9": 11, - "4,10": 11, - "4,11": 11, - "4,12": 11, - "4,13": 11, - "4,14": 11, - "4,15": 11, - "4,16": 11, - "4,17": 11, - "4,18": 11, - "4,19": 11, - "4,20": 11, - "4,21": 11, - "4,22": 11, - "4,23": 11, - "4,24": 11, - "4,25": 11, - "4,26": 11, - "4,27": 11, - "4,28": 11, - "4,29": 11, - "4,30": 11, - "4,31": 11, - "4,32": 11, - "4,33": 11, - "4,34": 11, - "4,35": 11, - "4,36": 11, - "4,37": 11, - "4,38": 11, - "4,39": 11, - "4,40": 11, - "5,1": 12 + "2,2": 1, + "2,3": 1, + "2,4": 1, + "2,5": 1, + "2,6": 1, + "2,7": 1, + "2,8": 3, + "2,9": 1, + "2,10": 1, + "2,11": 1, + "2,12": 1, + "2,13": 1, + "2,14": 1, + "2,15": 3, + "4,1": 2, + "4,2": 1, + "4,3": 1, + "4,4": 1, + "4,5": 1, + "4,6": 1, + "4,7": 1, + "4,8": 2, + "4,9": 1, + "4,10": 1, + "4,11": 1, + "4,12": 1, + "4,13": 1, + "4,15": 2, + "4,16": 1, + "4,17": 1, + "4,18": 1, + "4,19": 1, + "4,20": 1, + "4,21": 1, + "5,1": 4, + "5,2": 1, + "5,3": 1, + "5,4": 1, + "5,5": 1, + "5,6": 1, + "5,7": 1, + "5,8": 4, + "5,9": 1, + "5,10": 1, + "5,11": 1, + "5,12": 1, + "5,13": 1, + "5,15": 5, + "6,1": 6, + "6,2": 6, + "6,3": 6, + "6,4": 6, + "6,5": 6, + "6,6": 6, + "6,7": 7, + "6,8": 8, + "6,9": 8, + "6,10": 8, + "6,11": 8, + "6,12": 8, + "6,13": 8, + "6,14": 7, + "6,15": 8, + "6,16": 8, + "6,17": 8, + "6,18": 8, + "6,19": 8, + "6,20": 8, + "6,21": 9, + "6,22": 10, + "6,23": 10, + "6,24": 7, + "7,1": 0, + "7,2": 0, + "7,3": 0, + "7,4": 0, + "7,5": 0, + "7,6": 0, + "7,7": 0, + "7,8": 0, + "7,9": 0, + "7,10": 0, + "7,11": 0, + "7,12": 0, + "7,13": 0, + "7,14": 0, + "7,15": 0, + "7,16": 0, + "7,17": 0, + "7,18": 0, + "7,19": 0, + "7,20": 0, + "7,21": 0, + "7,22": 0, + "7,23": 0, + "7,24": 0, + "8,1": 11 }, "SheetStyle": { - "FontFamily": 1, + "FontFamily": 0, "FontSize": 13.333333333333332 } }, "Spans": [ - "5,1,1,40", + "8,1,1,24", "2,1,1,6", - "2,9,1,6", - "2,17,1,6", - "2,25,1,6", - "2,33,1,6" + "2,8,1,6", + "5,1,1,6", + "5,8,1,6", + "2,15,1,9", + "5,15,1,9" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -722,7 +657,7 @@ "BreakpointIdentity": "7fc838f6-3cfd-448d-81c6-e2db822d3cb4" } ], - "ID": "94fe17f0-dbe4-430c-98a6-f3255f68bc8c" + "ID": "343dba31-fd57-49a9-932e-c9a2aca0cb03" }, { "CommandList": [ @@ -741,7 +676,7 @@ "BreakpointIdentity": "0d6f0b83-9037-419a-bf6e-988a43d67565" } ], - "ID": "c951d1de-09ac-41e3-9fe1-2a5691333df5" + "ID": "3fa717a6-d823-4c9c-9e3f-1f06da96470b" } ], "BreakpointIdentity": "b60a25fb-79e0-464b-84bb-08f6e0498875" @@ -757,7 +692,7 @@ "BreakpointIdentity": "ac7f31ed-f2b7-492d-84b5-08f8cd1a2c1c" } ], - "ID": "5b09cf1f-4dc5-4552-8613-3158fc6d20de" + "ID": "f27a1aee-d22b-4bba-8d83-616e987d0d2c" } ], "BreakpointIdentity": "eea12303-e12a-42bc-8944-250cc30ccd8a" @@ -778,7 +713,8 @@ ] }, "RowBreakLines": [], - "RepeatRangeSettings": [] + "RepeatRangeSettings": [], + "RelatedDataTableName": "会议记录表" }, "PrintInfo": { "PaperSize": {}, @@ -791,7 +727,7 @@ }, { "Name": "会议记录", - "Formula": "会议详情!$B$6" + "Formula": "会议详情!$B$9" } ] -}///F+KZ/1eoskbwuJY+eVo/efCWkkF1lTIALrK3iKf1RslFthNtWNuXdrEUUIW8yuLDLc3cWO1vU3i1wc4hRSSq2Xw3blgVI8GHxtTDKUu116jgueCBCczI1WILntt/dbALlKnjodYaje6u1VhCtGfWaEPRTmPgB4+0pgJVcEq2+8xeSOljw1HCQ61UD72J49PYlHs/BKjTFplTeC0c4+jKxmaU5mAb5WFMAbHkUzpn5Gg8ibg0WRneUzXoHX54s0BeSuupy03LFgQ4TYPKkk9yvAtjXPfQZOpVCpKGvt6V/MnevNbKj9QWGAHU2VEQ8HdsVo89xWknZG0s7RyH/4Z571WO0Ba7ymiHJ4AeZ7nsFm359RknKhK+xdrfV39FZKMS1vkwtmgyIWmm1XYFIwQVmjKnNje1BbdzyhfMQVKmpkcPZeP4J190jQIYRA7tnRTCuhtMe2aS6qyNBfCeQAG4osQw1uoe8rGjoI7jm825/goq/iUp93rBufueuho0oFvuNiAGnxoQIoF8t9jcbZwEhJVuu1YR29J7hmxKYmirObjKEycbApNqd8wRnfsfCOhc3REyo/k/Q3E91dM5KUO70SQS9BelFUbrqlSmbfIwQaPH6FviIRZmAMdlAF0Kb6lRVlAVqAbzCShsSgn5064NTtxlIixGW3ykjEitUQtGYbTHTNe/U1FmdT4Iol/mn7PfunEZlYlQUSZoQiWQXTr/rZwKurJ25uHsLsPqHP3S6gCwJLuDqKMy+Efx4hLy2bcBACGu5Ln/UOg/K/fACkhTjn32nWgQ1uZFY28N6UytQO8BK+efrMr2UuzaaHZt2ld3CXMt6fhbIbZw6g+9yocsNqgyA1EUMCoEPPdxQlKkheKvHniOH/s8LvGPpp0WTP5GaKu2i+sE4g7Inph8EL34Q==|920 \ No newline at end of file +}//YJh/gFdqv5YW6Cm3Mrvn5AWtU6uBilRj/aliXD8NJGj5hsH+YhHEqaP7o6Jpz0f2flJaG4GUNRySZITHNcM9GetMa2skytxrMP8iwIhbf8iL7HUlniCtIGxS5BZdl8ytgJQEfD+chdvhtShzcmzMEWw1Kvzb7LWgpBe2GP69EE+i/LBoPmlHvi1YLf2fQ19bscW0gD3y4M82K8/mqJvvTD6bIpgoDo3D4P+XSKGLS2/i02FkIFRVI0A89smouI/zDxJxSCF5uGb3brrtc4MUJmdcph1XyHnjUS+b2Ih4YGH5ClnaCAtiUddrVxz1V39Riku1UifFUn+4SONdAq+AbAGLPqVsz8JVhEzh3Y2dPEN5LEtypTMDsc0/xAyrtGAfoVkF9AOTTMMsYo9EY1zo8i5ye0W381Fjb/GWLl18ofczdzX52QMu0T0JK3ZxVrf/rrN4hL6SlHFkpQjVccb+PKGaLzB2bnN/OSODBaW2lVTkGUVOG+7H0Xbr9MkL3604GW+g7N2bsnajBex1vpcwosL24/4SLDwRpQQnpwCiDJ8lAIrHqtNgctl5ff83xhcyc+zCC5qa2m5On7R7FnGh9Y5/yy/+UXDCuSPbLXGzBX1q+MSBhSSEjMaKSy4wkDXgsTMCZOtq2pv3v7ZncykbkQasHdOzwq1TyaGCtkR5NCa1ginZZp1QpOqQorggJrGsf0JfqTkM5ts4bwvDja9sJJPmcfnO4LzdV++gRStpml8/CiPDoqRcx+HH2fwSf1VWoUyuaMreHb/Ll84DoRulVXxsifaLXdSTNDBpL0cp5w4FERC/A3w2/OKInHXex/gj54ps2FuVzCv7qmmTDe2/xUXs3l48B5i5RIc0GsREmox80/PJvhR08CjCBjV29coo9TlNvT45nZuAB1PsksF6VQ==|920 \ No newline at end of file diff --git a/Pages/工作台/会议详情.rd b/Pages/会议/会议详情.rd similarity index 68% rename from Pages/工作台/会议详情.rd rename to Pages/会议/会议详情.rd index ce5a7872..b12cfb3e 100644 --- a/Pages/工作台/会议详情.rd +++ b/Pages/会议/会议详情.rd @@ -1,7 +1,7 @@ { "PageType": 0, - "ColumnCount": 42, - "RowCount": 7, + "ColumnCount": 26, + "RowCount": 10, "CustomNames": [ { "Name": "conferenceId", @@ -9,7 +9,7 @@ }, { "Name": "会议记录", - "Formula": "会议详情!$B$6" + "Formula": "会议详情!$B$9" } ] } \ No newline at end of file diff --git a/Pages/工作台/发起钉钉会议.json b/Pages/会议/发起钉钉会议.json similarity index 95% rename from Pages/工作台/发起钉钉会议.json rename to Pages/会议/发起钉钉会议.json index d1913171..5b96c716 100644 --- a/Pages/工作台/发起钉钉会议.json +++ b/Pages/会议/发起钉钉会议.json @@ -612,7 +612,7 @@ "BreakpointIdentity": "d4689739-de6c-40df-85cf-4ae41f712a8d" } ], - "ID": "1bc5189e-907d-4df0-abae-3ecf4fc861ff" + "ID": "ac9d39f9-b3d2-4c15-a58f-7856d9730271" }, { "CommandList": [ @@ -628,13 +628,13 @@ "BreakpointIdentity": "42da755d-5e1d-406f-9547-5361035a0bb5" } ], - "ID": "3568f502-293f-421d-9590-cc3685302bcc" + "ID": "c4aebf59-32d4-497e-a1c6-9554d9acfd91" } ], "BreakpointIdentity": "4c10cefe-a28f-4c58-8132-0eff5e7976f5" } ], - "ID": "8e97a4b6-d055-4e66-ba9e-4d526307738f" + "ID": "214519e1-35c6-4d2b-9771-a117d668006a" } ], "BreakpointIdentity": "4be28bf5-7693-4ae2-a6fe-0bd8f67e3e02" @@ -816,4 +816,4 @@ "Formula": "发起钉钉会议!$I$18" } ] -}//BLOneley8Svs5RgVkfc1gSifOl7a7U/ASgJvB6qO4cQUMCrHWttXq+QW6V3Tu96G30T8Jp2jRH7nJ9kY2JKHWwvDf/BgJgNGVFnJ26OYgoGr+uLpxkLECLYNNDtrKZTX0odDYwYXYR0n8/3uL/keHYjKYQzD7mH84l+Vm+dX5ZWxI+/qiW2zLdnYEZKZP6x4XMg0L1ASCouzedyN3Rp/7pYROTen/Z0RxJ9BaeviKUL6vqvehZ+yuvaebXFjzikYv0Ss/kjvPvLZQri+uIOd1Rcv6mltLdFTa0DqtCrumOGiCy0fbunk4q0RCOBowskJBXaUQAxutJ1/JcZLOrDrTJFgi2ELTPSGpndFAAYR8+ej7yaZGZE9TxBbs9NeaLssBDxSyQMjU+DMZi4MrqdqzlaoidMBVz2OqGdQnSvA/S81BY2iKfzOCBfvxEtv+1rap1aKw3woUw7AVhsx2BYt2z0tHk+GPkwKVYWr6gHHHpcDqCMh2OiXany5dKhCzGEUbm2RWth1DmuIaXCBneFzMgEDhdz53KzBri/rG28wXYFsA+g+Ga8iD8FTOtw+94cMNF6EiOAM9XEr5OFeAWb2yD6d6FZymGdNAcPuMtFciTz4N2tYIUXrQmkV0Of+pykShLZ5Q75v8yDjPDE2yBWZbOhhjcZslQTpiBn+gLJflYljS1wq94CCPiYxMaXqiCgW9gOalwqGKJA5GwSxsy8yi++KNORNsLxDogRlQiPH2XGi+dTDevbxxM8sFyxahTykQsmh4220U8FtQvt0iXfo5ouWZtvCyba5jQxsWLIxFUbOAZY/8GqcM3r/lP9YlL6boH2lk9UGSBIIynkwuA13Svnw+gQTvICLCR5xL/QKgHsbfaMlZQHDUoPnTzha9FG4VDye7/OVmcltwoFrR5fd2g==|920 \ No newline at end of file +}//01c8Gwh179LIrMxIpueMW2hfZP1VScCbrA3rj2ueqgcCJpuNGb9ov7D+HbyXJ3ZkCUNaOJhDqWZgJU8PvjjeVFxRwOyqqxg0n/Q4FrBEklz5xHlTbw6Eo5S+0kga9GIKRDiukyCjFDzQT0jVBW5qgFVMZTsO60hj7D3qelqDME/egjuHUAX6KgyWQW8wB6mIr+U63/3b+TMKlHxt65NaZa8TqXlo4E7MdkH5xxAteSMm+fQy8uIr4zSAD6tQIQ7EwnHws22N8fa3XtCNRw+3bAnguLUjPCPGlt2JwMYqAU9SljnGV9xJym099yJjrJdi62lWou1C4RngAISNR5sJlg74Isltz1+mpAIBVWWimtJJCwFlp8pqkWC16lJsmJVqSS0g0DnnldiYR5MXuH7vh6l5X/BlIDS7Cb4r6e7Yae4MLbc3HzkHcGt5fxWWWiJbjWkt2e7RuPkjWRiHMBlITRNGEI2EPsQWEe+r+osFizGEpvSYHfR1KYS/0Lx6PNyI4iqPaRf5iRlJLVeG2drkZlQLbz1qEGDlJYZuzjfT+XmIzOM0bpxu/7YLoKbVYpWQ1xDaxtXnNTLrgN5//AJfEUx2Mj85sNkX1Com6qF8J85x7to6XNPEjj94Cvr5hKHddxxyRfOvCILRASF0wBDui5qT8ok2oofunswhB9MkUVuRFqBUFxo93y1AZIrwYz9Rhn1r/rRMX3HBQOvErjwgyTz0Fef4xIsFo0YKS8ZhBkicd3twl12gMeG3f1A8b2qEdiVdjwrDHt7xTtlIHvyVguGgC7LuGWLKmd3GlFUCXcDwHxSsZTq0KP/11uAgwRIUjrTprZrOJxhzaUzcMUoE/Iaemze0YmqE2IsY8CpAKpJnm5sIGNK2zwUM3bK1Q0AbyMfjqPegTmAwFZ/xCy2vHQ==|920 \ No newline at end of file diff --git a/Pages/工作台/发起钉钉会议.rd b/Pages/会议/发起钉钉会议.rd similarity index 100% rename from Pages/工作台/发起钉钉会议.rd rename to Pages/会议/发起钉钉会议.rd diff --git a/Pages/工作台/工作台_关键信息.json b/Pages/工作台/工作台_关键信息.json index 9f77c91c..2523a2ae 100644 --- a/Pages/工作台/工作台_关键信息.json +++ b/Pages/工作台/工作台_关键信息.json @@ -143,7 +143,7 @@ "CommandList": [ { "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", - "PageName": "我的会议", + "PageName": "会议管理", "BreakpointIdentity": "2a6631a7-fdad-4aa9-ac08-ee6a08ce1bf5" } ], @@ -368,7 +368,7 @@ "BreakpointIdentity": "1725d0ef-b2c2-4a51-a16f-a5027c8313e8" } ], - "ID": "21701ad9-2edc-4610-9a26-0852c2d02a96" + "ID": "4b6c16c3-1993-43ef-991c-6e6385aa7426" } ], "BreakpointIdentity": "3c5bbe88-043f-4445-9938-50455fb27651" @@ -442,4 +442,4 @@ "Formula": "工作台_关键信息!$N$4" } ] -}//gLbiH58CNLvcpPaik2N02Bleu5PGtEVewG3HbrVof98rIpQty0rjKVnEVpayWZXMTrvGzbCTDvClp0VXeNdgzILlmVHRfeXZDqXzEt70PUFriMOcVj66jCavR+e++uNwnC/bkJHW5/yDH7CMEMDQtexB8UPv9pwkUgHLTU/P44iQ7i+TmCi6ujh7EjQy0rqS9UHXRiiOom2zjwmBngciqy3FXd5oTbPllZ2GgMr5wxyWphsdOV6+VxQptqPiee6kXaBlKnko+wBunk0L5vbVrqsqNC4bi0sZ4Mg56s4jn6BL7zKFjVwePxrFF3pXFJWicSRkn1bGJ4QHbJ7WolIkyVM8nzXne5Of5W3lAAOl8cdRnaN3Rxhh9eVUGJp8q4en/Q1/mx9CoLLqr7F6HlqtaBT7gdlwGq9bY4HpLUD2VGj/mFqtXJ/z13Oiet2/CzxsaHxzq3w2f+jCeGk89BA7nw7TzXLy+oSXv8/TftC5ZAzze0QVX2FW2ZgUemca8f73aCVzRCXb9AYvVp6WcAI5QuMs/owEF+Wn5+ZzuwJGOSxmwiDLEpzzekVnriq6Mw1sPv6m+LRI3l4wx0WDK9j2J11Gi2ZO9TQQ0R6TwXiHAlpFmdaqBMtzb1DdTBd37eXBK7SFDTd0AJUx3O02KLlQ1zQF4i2H/tWOgMdMRYxEq+jlL5i91/Rn1ZHLbUDG2hV+RlXgj6sH8hRJGEFsjivF6WBgedDoyCnEBEVqPaJXYLgYTZDYusTHIxQ2wwgFTYD7pkNxGQglThJdusNTwZuCTOT+Mzzy6mNymBfY228S+u38he70KrDKAF0LFcJVAPDjZNzZbOBSsO7VtXs/emVLUtjMrf17jPvse/Sjbn2xUqeAtCdiA8Eka7GcKRal2IbAZa1Bi+xn8k5LDF44dqsgKQ==|920 \ No newline at end of file +}//oXzuBfX41w+H2oxy1FeAjiKAIKF2jrFw3eCHynZHNpoDlSdqO0v0o7dKC52XIbFu6FLlkhcgsSIEcYAtKLhmiIN/m54ciiy06NFA96XqOylI9pCdnUkGR9ooYIWbipOql2ssqQ9rOFOd6oUkD5vh5Wv7OE8pnUyvp6HuPqMloMNvRMZ5vcePuCJT8apfGoTDk33OR+2fx79LFHUP3LvFc1E4Cg1NMMV2JXnAhagVdMCggFlVp2EotEdFIvxFRlM98rVpq8GLtE3zHAPqnBS2paSM8QSbdYm7qlWw6KobIDLO/vXC/pxnXLB39E4O4MjeFMHRI3vhjXBG9bH5ejW2c3SPsBBw0A+djIJ5tZdIHqxg1Yr8p9jDonsx8q8FOg5JxrHQWyLDgJcZd9Szcbmgp8uJymmDHck+RJ0ssKsGdWydxbdFPK6QIsSgU/n19GeggOcWqTuT1n/EE1dS6eeSA0R8okYdMwzH+3CehaALweO2FuVkl46FwoSrhTqVojImn+XkdZDNx75WpTP8549421/2dMNl1razkpVZMjkPTzPSJY6sckDYiKGZceBY+JlPeiTUp3fNIkh819nw039EZp91aFx/J0a4RA+zabc9bujTGgACRhgZzomrWOEsS6cf7xTej+Cv0vDq6V+Fecge/AUEdvambBaPgI6jg8173ZeDUm6+enrWs6BqNqZQjMmnFf6DwbKt41H20VsChbWxy0sQcRGVMuhEit8CTbgroqbkRcIGmsPlqCfMOlg+ZXajM8D3Jbi80j8y7xNMgY8ophNNIm/wEZvxO75GFrphXyGHXMU6eGc3H7zeIBhzccr7daa8Nzch70hF/We4YqCwF8IAPKE4enTd/Fs2SwWOuDHONCSFxUhjsbxeFp7SbOYPA+4S2VSk0HQKSmxFfV4xaQ==|920 \ No newline at end of file diff --git a/Tables/会议/会议记录表.json b/Tables/会议/会议记录表.json index 284d9392..27fd69be 100644 --- a/Tables/会议/会议记录表.json +++ b/Tables/会议/会议记录表.json @@ -160,6 +160,13 @@ "ForeignTable": "会议记录表", "ForeignColumn": "会议状态", "IsDetailTableRelation": true + }, + { + "PrimaryTable": "会议记录表", + "PrimaryColumn": "关联钉钉会议ID", + "ForeignTable": "会议记录表", + "ForeignColumn": "关联钉钉会议ID", + "IsDetailTableRelation": true } ], "Indexes": []