diff --git a/.collaboration b/.collaboration
index 0e302c8e..0f390586 100644
--- a/.collaboration
+++ b/.collaboration
@@ -702,17 +702,7 @@
},
{
"ModuleName": "PCPage/项目标题",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-11-10T21:06:45.394174+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目标题.json",
- "Pages\\项目\\项目首页\\项目标题.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目审批历史",
@@ -1096,17 +1086,7 @@
},
{
"ModuleName": "PCPage/项目菜单",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-11-10T21:32:28.6304361+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\共用\\项目菜单.json",
- "Pages\\共用\\项目菜单.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/HTML详情",
@@ -1150,17 +1130,7 @@
},
{
"ModuleName": "PCPage/发起钉钉项目会议",
- "State": 4,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-11-10T21:19:05.7222008+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\共用\\发起钉钉项目会议.json",
- "Pages\\共用\\发起钉钉项目会议.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/富文本编辑器",
@@ -1812,16 +1782,7 @@
},
{
"ModuleName": "ServerCommandPrivate/订阅钉钉回调事件",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-11-10T21:19:05.7222626+08:00",
- "ModuleType": 27,
- "ToRemoveFiles": [
- "ServerCommands\\钉钉\\订阅钉钉回调事件.json"
- ]
+ "ModuleType": 27
},
{
"ModuleName": "ServerCommand/创建任务审批待办",
@@ -1829,16 +1790,7 @@
},
{
"ModuleName": "ServerCommand/创建项目视频会议",
- "State": 4,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-11-10T21:19:05.7219163+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\钉钉\\创建项目视频会议.json"
- ]
+ "ModuleType": 15
},
{
"ModuleName": "ServerCommandPrivate/初始化钉钉配置",
@@ -2530,51 +2482,7 @@
},
{
"ModuleName": "Plugin",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-11-10T21:37:16.5235359+08:00",
- "ModuleType": 40,
- "ToRemoveFiles": [
- "Plugin\\Echarts图表-10_0_102_0.zip",
- "Plugin\\Editormd-6_0_102_0.zip",
- "Plugin\\Forguncy.CustomMenu.zip",
- "Plugin\\JSON 序列化和反序列化-10_0_102_0.zip",
- "Plugin\\JSON数据源-10_0_102_0.zip",
- "Plugin\\Lottie动画插图-10_0_2_0.zip",
- "Plugin\\Notiflix-9_0_103_0.zip",
- "Plugin\\OPENAI套件-10_0_5_0.zip",
- "Plugin\\PC组件包-ElementPlus-10_0_102_0.zip",
- "Plugin\\SqlServerWrapper.zip",
- "Plugin\\Tiny富文本编辑器-10_0_102_0.zip",
- "Plugin\\UI操作工具箱-9_0_103_0.zip",
- "Plugin\\Unlayer-9_0_103_0.zip",
- "Plugin\\xTools快速开发工具包-9_0_4_0.zip",
- "Plugin\\内容编辑器-9_0_103_0.zip",
- "Plugin\\加载动画-10_0_102_0.zip",
- "Plugin\\发送HTTP请求命令-10_0_102_0.zip",
- "Plugin\\取消当前行-9_0_103_0.zip",
- "Plugin\\增强关闭页面-9_0_6.zip",
- "Plugin\\复制到剪贴板-7_0_3_0.zip",
- "Plugin\\客户端缓存操作工具库-8_0_0_0.zip",
- "Plugin\\富文本编辑器-10_0_102_0.zip",
- "Plugin\\对象与集合操作工具-8_0_0_0.zip",
- "Plugin\\应用服务器操作工具集合-8_0_3_0.zip",
- "Plugin\\异步运行命令-9_0_103_0.zip",
- "Plugin\\支持预览的附件上传-10_0_102_0.zip",
- "Plugin\\服务端缓存操作工具库-8_0_3_0.zip",
- "Plugin\\标签页和打开标签命令-10_0_102_0.zip",
- "Plugin\\模板引擎操作库-9_0_103_0.zip",
- "Plugin\\用户管理命令 V2-10_0_102_0.zip",
- "Plugin\\网络操作库-9_0_102_0.zip",
- "Plugin\\设置当前行命令-10_0_102_0.zip",
- "Plugin\\设置焦点命令-10_0_102_0.zip",
- "Plugin\\读取管理控制台日志-10_0_5_0.zip",
- "Plugin\\豪~豪插件合集-7_0_102_0.zip",
- "Plugin\\钉钉SDK2.0-10_0_5_0.zip"
- ]
+ "ModuleType": 40
},
{
"ModuleName": "PublishSetting",
@@ -2582,92 +2490,38 @@
},
{
"ModuleName": "PCPage/选择参会成员",
- "State": 3,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-11-10T21:16:18.9702594+08:00",
"ModuleType": 1
},
{
"ModuleName": "Image/视频会议3.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-11-10T21:32:12.5826955+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/视频会议2.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-11-10T21:32:19.096069+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/视频会议.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-11-10T21:32:19.0960724+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/操作-发放审批.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-11-10T21:33:31.5295906+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/发布.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-11-10T21:34:08.0775215+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/邀请.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-11-10T21:35:02.1885688+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/预算申请.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-11-10T21:35:32.1721502+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/名片,角色,用户信息,岗位维护_jurassic.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-11-10T21:36:06.8755764+08:00",
"ModuleType": 38
}
]
\ No newline at end of file
diff --git a/Pages/0fc62e2b756949678106d2a2a72a491.json b/Pages/0fc62e2b756949678106d2a2a72a491.json
new file mode 100644
index 00000000..ec06ceae
--- /dev/null
+++ b/Pages/0fc62e2b756949678106d2a2a72a491.json
@@ -0,0 +1,146 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 26.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 21.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
+ }
+ }
+ },
+ "Count": 4,
+ "DefaultSize": 15.0
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 12.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 296.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
+ }
+ }
+ },
+ "Count": 7,
+ "DefaultSize": 15.0
+ },
+ "AttachInfos": {
+ "1,1": {
+ "CellType": {
+ "$type": "ElementUI.AvatarCellType, ElementUI",
+ "CommandList": [],
+ "showSystemAvatar": true
+ },
+ "TemplateCellSource": "项目成员"
+ },
+ "1,3": {
+ "TemplateCellSource": "项目成员_全名"
+ },
+ "1,5": {
+ "CellType": {
+ "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.DeleteRecordCommand, ServerDesignerCommon",
+ "ShowConfirm": false,
+ "BreakpointIdentity": "e3b31c72-21c6-476f-90c7-5a7184065e2c"
+ }
+ ],
+ "ToolTip": "移除",
+ "Size": 18,
+ "ImagePath": "回收站.svg",
+ "UseCellForeColor": true
+ }
+ },
+ "2,3": {
+ "TemplateCellSource": "岗位名称"
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "FontSize": 12.0,
+ "Foreground": 0
+ },
+ {
+ "FontSize": 12.0,
+ "Foreground": 1
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Accent 4 60",
+ "Text 1 50",
+ "Body"
+ ]
+ },
+ "CellStyles": {
+ "1,5": 0,
+ "2,3": 1
+ },
+ "SheetStyle": {
+ "FontFamily": 2
+ }
+ },
+ "Spans": [
+ "1,5,2,1",
+ "1,1,2,1"
+ ],
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon",
+ "ParentPageName": "发起钉钉项目会议"
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ }
+}//4TMSesL8Vgp8mU36kyRTcCzo+xz9UnWUkP5PhSoqxrtGLZCCKw4q5+NkqyP7AQpZyTC6sz5sOKFRexz+f+/Ox1AeaspWSF+zmPK/l+BCg5i6WPkGulrMT+XpsI/Qf35LLw7rVw6GfWCj5uQwOE1b5khudde/2gTqqnQPkfFQbGGvmCjIK5CHe/3c7Iv5JONp2FMLq53dIGF+XbQzR5vc9HwclHHQwowVncKC3p6X59WM/z5iE+afrGDBeFB0rARUb6ZL529KI1Zv7JyEUkhROe0VM829CT63hPFlgEX1Zh4wXQWmUrMa5VB1Hi/HHUKTXnlpoD/GRILjpR2M6A+OJxhC67bXkWmHWwYzxS0MDslxTAuiZDWFke1AINFNn41PuOVU0y9vnKAca4oKgMLlhQdHBfhODmGsWr+N7SF6mGBWN8RvCS8xFV7JRU1SG3W0NGyFtbLbH5DUnqTCjoD8cNId6R07Z8SvFdkU+enq82BW8hlCCKs1GbVg1UiEXxWuBQKG8/7RP+Eg34OaYipU0hb2CO1k88HNeIhuDohvsR+t5wdqIXTVSKuId5Gk4+PjFbkjc5F328dvcKBsZMb/f+X3Zbp1rMXBMvamcOINnroixNEN3OaPQYpb4YrIYxfozZbJ5DGNL7mXQY8koQQsU/ib4OzxoiNF/7TBszq4AoB1bOgfoihSXYQ3kS3wCa21XajQeb3g4MxagwFTXTsUqe0OHoBTYQfqkqaZXRH8dCD4y0+V3gvrVqZzsVfgNgNXy8DOOYGawFKnS5X5UL+k4qk/hqwmaepBMgqicn4dlIVHobYyoWhAnMLNWx+Uwqk4H1nTcOcr3VJueFyEAYtWf2e/tz96MfUc4D4n6f8WEXT6d/EDLTTOSz1MVQEDBX8Y1twQbmPQ20tYMR7FZv4lPg==|920
\ No newline at end of file
diff --git a/Pages/0fc62e2b756949678106d2a2a72a491.rd b/Pages/0fc62e2b756949678106d2a2a72a491.rd
new file mode 100644
index 00000000..d8c8d52d
--- /dev/null
+++ b/Pages/0fc62e2b756949678106d2a2a72a491.rd
@@ -0,0 +1,5 @@
+{
+ "PageType": 2,
+ "ColumnCount": 7,
+ "RowCount": 4
+}
\ No newline at end of file
diff --git a/Pages/e58b161ccf7d4429955ac9e5e68d551.json b/Pages/e58b161ccf7d4429955ac9e5e68d551.json
new file mode 100644
index 00000000..addb19cf
--- /dev/null
+++ b/Pages/e58b161ccf7d4429955ac9e5e68d551.json
@@ -0,0 +1,101 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 25.0
+ }
+ }
+ },
+ "Count": 4
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 37.0
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 13.0
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 736.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ }
+ },
+ "Count": 7
+ },
+ "AttachInfos": {
+ "1,1": {
+ "CellType": {
+ "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
+ "Style": 1
+ },
+ "TemplateCellSource": "Fgc-Listview-Selection-State-Column"
+ },
+ "1,3": {
+ "CellType": {
+ "$type": "ElementUI.AvatarCellType, ElementUI",
+ "CommandList": [],
+ "showSystemAvatar": true
+ },
+ "TemplateCellSource": "用户名"
+ },
+ "1,5": {
+ "TemplateCellSource": "全名"
+ },
+ "2,5": {
+ "TemplateCellSource": "角色"
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "Foreground": 0
+ },
+ {
+ "FontSize": 12.0,
+ "Foreground": 1,
+ "HorizontalAlignment": 2
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "black",
+ "Text 1 50",
+ "Left",
+ "Body"
+ ]
+ },
+ "CellStyles": {
+ "1,5": 0,
+ "2,5": 1
+ },
+ "SheetStyle": {
+ "FontFamily": 3
+ }
+ },
+ "Spans": [
+ "1,3,2,1",
+ "1,1,2,1"
+ ],
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon",
+ "ParentPageName": "选择参会成员"
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ }
+}//ydutxQWNZmS7ahk7BrzSQZidGTek5VBck/05vgshWgXqge3okTA77gj2eOoguzuXdKrBo558p8MCZzgS95QAkG9Ys6pd/xc54GdmGsxhj/LkzA1Tw9TLlmeIUi8856dAOnH4OhU/24qa+kFH9iffQcfmi4ydZWNTX/4PqCmPrUPKVp2/VZvuZlXgVCYc58EIIdULVTT7ZcIaBsO99YKoY+L6EyPzslQbbjAD8IFmsPhdx3Sz5b2PNvFTLsrzQwmmcjnu8outAg30x7og2Xi7A7/SWa6y6hJ8vcSM/fX0CtjzLHoQEooHwDC/wsslx8g3OMGyCJs0mXgr2KgO2c+5bYN6cB/B95fEGyyW7jZO5rwd+wws5XzbLKfJJz+We9uPww+7RpIrHff0j4x2AgL5AnRIaD81Y0McNA+DDGrV3AxTYbDw19rSuyTkUeEHxN7GTZtULUlhwKsCorexzp2Le7LnIzgl/zcyNdSVnGNR3ugkZSQBpyUWqNci4izkweg9vjCkWVvM+Ih7DdOlXSNkR9P+JXB+Tx3NePRhr5+7Lvb887ELxMuzBq9QVb0tfNLIJ9PZCwGMER0NRFKgAuJBBks6YqU/MsX1nbcE7tfyIQHi5yNb9QalUrzvtx3Kx3I4rVgxot7J8r351oIL+XgYPEpdd2hG/4O4Z7qCn+5aVsCtmOi7hT2686FBFQ+s2gJxCkiACCwqqmztV1jREd+4iMUuMTZAFWAty9RlMO51Bbrst/Yj9jgwuGG7Oomen8G+TRgFYJs2o1NoIaMBIY7efPlUbAu+iwZjSzRkabk8uvYOtwBjybXpXYe8K/On++hPz5cJQ45n3g9JWxjBCZ9MuQRA4lBUc8/8crao1B2cvVPbwMszWXXgJw9lbUEiC5HV+KbYRBhfluDHPfskMEuo8g==|920
\ No newline at end of file
diff --git a/Pages/e58b161ccf7d4429955ac9e5e68d551.rd b/Pages/e58b161ccf7d4429955ac9e5e68d551.rd
new file mode 100644
index 00000000..d8c8d52d
--- /dev/null
+++ b/Pages/e58b161ccf7d4429955ac9e5e68d551.rd
@@ -0,0 +1,5 @@
+{
+ "PageType": 2,
+ "ColumnCount": 7,
+ "RowCount": 4
+}
\ No newline at end of file
diff --git a/Pages/共用/项目菜单.json b/Pages/共用/项目菜单.json
index b8011c46..12adb45a 100644
--- a/Pages/共用/项目菜单.json
+++ b/Pages/共用/项目菜单.json
@@ -142,7 +142,7 @@
"Text": "项目岗位",
"TemplateKey": "链接样式",
"Icon": {
- "Name": "人才.svg",
+ "Name": "名片,角色,用户信息,岗位维护_jurassic.svg",
"Color": "Accent 1",
"UseCellTypeForeColor": true
},
@@ -170,7 +170,7 @@
"Text": "预算申请",
"TemplateKey": "链接样式",
"Icon": {
- "Name": "时间.svg",
+ "Name": "预算申请.svg",
"Color": "Accent 1",
"UseCellTypeForeColor": true
},
@@ -198,7 +198,7 @@
"Text": "邀请反馈",
"TemplateKey": "链接样式",
"Icon": {
- "Name": "简介.svg",
+ "Name": "邀请.svg",
"Color": "Accent 1",
"UseCellTypeForeColor": true
},
@@ -226,7 +226,7 @@
"Text": "发布更新",
"TemplateKey": "链接样式",
"Icon": {
- "Name": "增加.svg",
+ "Name": "发布.svg",
"Color": "Accent 1",
"UseCellTypeForeColor": true
},
@@ -254,8 +254,7 @@
"Text": "提交立项",
"TemplateKey": "链接样式",
"Icon": {
- "Name": "Application/156_processCentre_1.svg",
- "BuiltIn": true,
+ "Name": "操作-发放审批.svg",
"Color": "Accent 1",
"UseCellTypeForeColor": true
},
@@ -283,8 +282,7 @@
"Text": "发起会议",
"TemplateKey": "链接样式",
"Icon": {
- "Name": "Application/008_add_file_3.svg",
- "BuiltIn": true,
+ "Name": "视频会议3.svg",
"Color": "Accent 1",
"UseCellTypeForeColor": true
},
@@ -464,4 +462,4 @@
"Formula": "项目菜单!$B$3"
}
]
-}//1kYL9kLyyyBOavSIzBtk/hzeYHihpG6MutwWKMesD2JlVpC5ruJ/Yc5TcEggux0Cd+yhB0ylzvUwI84aNiaS9VHcacVIcGSRZtupslynYGc7uZfFQIeAGMfk5MK9vLmPJmMGgF/ps8t46qK/c220BGx1LTUwdrjAkPY+troXagTYrTAi2H74tyyaCLnXvKBgvXY/vnz+3h7ZhxDxwF8U+1n3S2zhFUO1M8na3y0eOD+/3QSG9tQXkBj+XCZf6T7Pxarfwk+uS4WFSvbKOI7MEjgyYR36skhfzyX5nNeM3uKOquOekLaEz1Jmzil/70XNVwbjlDNjd6quYoW1BXyP5x4VCeusVmzBLSrA7+Fe5Sc0SW+7MaPt8WHjCfOkE6Segu4O3MdwPQus5WsuLzpIJInxexDcuaB50/zgBl8MBQakFx7Nvi2cjL7/rfKQaDdni6ogYeChCBNLPdYbVhkFTzVfmk1ZTSnEUFkKAiAQjP81UUBMd/hZXUsckcmETeZ1oi7Du7Xd2pRrIyb1LNfrcVsOdafy80JZt/JZnbvkZNl4j6ZqmuPwTveN2x2WjjJPgsc4l/MhpajR9+tDX0IuBuK50mLqDMZJleRa6kGfBbx6eGTngf4juf7lEpnAZw0LgKxWl2wRVuuPtLtBtyqR7n/TiWIpag+BnGIucmZREQbu6ugoozCe3BCCFmKIZHY3oOrQHZh2KzUmyMi31YncT3rzfVHYbRsNYPlcYbjIPtvymWOkc4hXQlXdztSCK7iByjMx0gSxMGWXAhcgKEumRr1h0w9/yNG3KUHFQdCLz7Dg4AiKuaig5gWZsf3hT9Fkl7XbOf3K3KFJ0Cp+FuMJHCWIHLNgk8mOormP1qW2bsu93TFiN7xAEf5h+VPH7EsgGQys1WwZ7qhMWaxvJWa87g==|920
\ No newline at end of file
+}//vzwrXYTSwFiPh1JU4vtKJ0uwMsPah4UF3osFkJri5+WArHwyXvJ1vPkJn5XSSg3FTJxy/PBPo/MN4GfzCZ5wrnUkld2zgDdyqnZGMKe8EaOZdFLkrVszuQPLqxf6SeYBiMOSAF3vtHoRgljgirn/d8E+QqLyddiKimj+xYR9NbBzL3bkVwC1gyTv5MU9YdwiBGL/39J97GFUkeIk565WFiWkEdeXUeHbIBeWQ+4NxcuGBQq6PQSqK5zylBdtHdXCsIFFLpaJTjGFm2gngeQ06Y9MNJ6YxIZ3sL6+9tsdC0mgZXilPPX4e+5B+Y4crmMVMjf0q0RbCLUb/3peO+NFWxM6gEl0XDycqIi2a6sIiBST8yQEXTizqh6X89nxn8YorfHhKQJxcGMcbdkBKIrmOB6ZwpMoZiRkbtwrN6+IAikBk5DKaPvi4P3teHF6q5cusEPboAYZkPFK+UcJtbGuMhLt2R3iGKXb2VoNDMd4Iz8/rIKZ1DiubhlJbFbddO5KepfRFhrKPUpKujyGeu2Xge63J4CyrU96Wid/enCITME8SLIswRvYoG/gY2d4qzXYmhqPXNKWnMt8HMI+aNuUbJKbRTC6AvrOrx2YItCJs+7f0PzLA+6IjwA6KQ3nIEVqOdLfHtSLnpfxr9WUnTGj0L22y+si363G/rar4CHwUD75sVTlpMyIkPkHM75V1a82m+SuWkeg/lu9Ft/OpQ2XYDRHrr3HtGW09BOhz/vZ3P262jvt0IUN/Zzyes/X7De6bBCThUFODsLTyposvpeRydJ5D6Wlzxjy9wvftsC/0QQPKAM/L37JLP1V0VBwdTM4MeYwEIGeYc2QtzvsDAiR6rPNqbgEsyNHp47ymb666xzo5uRRWgxTnr+HMBZqsD/2lKAuBDQmO+tYZE36lgo15A==|920
\ No newline at end of file
diff --git a/Pages/共用/发起钉钉项目会议.json b/Pages/项目/发起钉钉项目会议.json
similarity index 65%
rename from Pages/共用/发起钉钉项目会议.json
rename to Pages/项目/发起钉钉项目会议.json
index 63f0c593..10b632e5 100644
--- a/Pages/共用/发起钉钉项目会议.json
+++ b/Pages/项目/发起钉钉项目会议.json
@@ -43,22 +43,23 @@
},
"8": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
+ "DesignLengthInPixel": 10.0
}
},
"9": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
+ "DesignLengthInPixel": 377.0,
+ "Mode": 1
}
},
"10": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
+ "DesignLengthInPixel": 24.0
}
},
"11": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
+ "DesignLengthInPixel": 32.0
}
},
"12": {
@@ -68,19 +69,41 @@
},
"13": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 35.0
}
},
"14": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "15": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
+ },
+ "16": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "17": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
}
},
"InLogicalVisibleIndexes": [
- 14
+ 17
],
- "Count": 15,
+ "Count": 18,
"DefaultSize": 32.0
},
"Cols": {
@@ -154,11 +177,6 @@
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
- },
- "14": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
}
},
"Count": 15,
@@ -168,11 +186,11 @@
"1,1": "会议主题",
"4,1": "会议类型",
"5,1": "沟通会议",
- "7,1": "会议设置",
- "8,1": 0,
- "9,1": 0,
- "10,1": 1,
- "12,1": "发起钉钉项目会议"
+ "7,1": "参会人员",
+ "11,1": "会议设置",
+ "12,1": 0,
+ "13,1": 1,
+ "15,1": "发起钉钉项目会议"
},
"Formulas": {
"2,1": "会议主题&会议类型"
@@ -270,28 +288,138 @@
"clearable": true
}
},
- "8,1": {
+ "7,13": {
"CellType": {
- "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
- "Caption": " 邀请三经理一起参会",
- "Style": 1
+ "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "xTools.Commands.xGetTableSelectRows, xTools",
+ "TableName": "图文列表表格1",
+ "ToParameter": "选择行",
+ "BreakpointIdentity": "908b8e49-79c9-482a-bce3-efcba09abd3c"
+ },
+ {
+ "$type": "CollectionOperationKit.ClientSideArrayOp, CollectionOperationKit",
+ "Operation": 16,
+ "InParamaterName": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=发起钉钉项目会议!选择行"
+ },
+ "OperationParamaterAName": ",",
+ "OperationParamaterBName": "项目成员",
+ "OutParamaterName": "项目成员数组",
+ "BreakpointIdentity": "b483bcef-277e-4621-a1b4-36a162c30d70"
+ },
+ {
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "PageName": "选择参会成员",
+ "PassValues": [
+ {
+ "Source": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=发起钉钉项目会议!项目成员数组"
+ },
+ "TargetCell": {
+ "SerializeProperty": "=选择参会成员!排除成员"
+ }
+ }
+ ],
+ "LoadBindingDataOption": 1,
+ "BreakpointIdentity": "91bcecb0-d147-4a72-a486-0f4b4a3a5e32"
+ }
+ ],
+ "ToolTip": "添加人员",
+ "Size": 18,
+ "ImagePath": "增加.svg",
+ "UseCellForeColor": true
}
},
"9,1": {
+ "CellType": {
+ "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon",
+ "TemplatePageName": "0fc62e2b756949678106d2a2a72a491",
+ "DataSourceType": 1,
+ "DataSource": {
+ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+ "TableName": "项目成员表",
+ "BindingInfos": [
+ {
+ "GUID": "548d162f-85f2-4370-9041-e3fd783deacd",
+ "BindingInfo": {
+ "TableName": "项目成员表",
+ "ColumnName": "项目成员",
+ "GUID": "efc4bf4e-9851-4704-852e-16842d2d4c65"
+ },
+ "ColumnName": "项目成员"
+ },
+ {
+ "GUID": "af54473f-2d34-4ea5-a5b5-1a5a760f1564",
+ "BindingInfo": {
+ "TableName": "项目成员表",
+ "ColumnName": "项目成员",
+ "GUID": "7d62a008-5c4e-4653-ad3c-16d8b3fec4db",
+ "AttachType": {
+ "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
+ "UserColumnAttachType": 1
+ }
+ },
+ "ColumnName": "项目成员_全名"
+ },
+ {
+ "GUID": "b88a30fc-59c5-4655-bbe6-60c5aa8e0c24",
+ "BindingInfo": {
+ "TableName": "项目成员表",
+ "ColumnName": "岗位ID",
+ "GUID": "3b0a6371-6ebc-4d44-a25a-cb81bd0cd678",
+ "RelationBinding": {
+ "RelatedTable": "项目岗位",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "岗位名称"
+ }
+ },
+ "ColumnName": "岗位名称"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "项目成员表",
+ "ColumnName": "项目ID",
+ "GUID": "40916105-02ad-400e-9a87-f61698663ef1"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=发起钉钉项目会议!项目ID"
+ }
+ },
+ "NullFormulaValueQueryPolicy": 1,
+ "IsListviewDataSource": true,
+ "CustomColumns": [
+ "项目成员",
+ "项目成员_全名",
+ "岗位名称"
+ ]
+ },
+ "DataSourceListviewName": "图文列表表格1",
+ "TemplateKey": "竖排横线分割",
+ "CommitDataWithCommand": true
+ }
+ },
+ "12,1": {
"CellType": {
"$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
"Caption": " 开启云录制",
"Style": 1
}
},
- "10,1": {
+ "13,1": {
"CellType": {
"$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
"Caption": " 会议时间到期自动重拉会议",
"Style": 1
}
},
- "12,1": {
+ "15,1": {
"CellType": {
"$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
"CommandList": [
@@ -339,20 +467,12 @@
"SerializeProperty": "=发起钉钉项目会议!B3"
}
},
- {
- "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
- "ParamName": "邀请三经理",
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=发起钉钉项目会议!B9"
- }
- },
{
"$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
"ParamName": "开启云录制",
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=发起钉钉项目会议!B10"
+ "SerializeProperty": "=发起钉钉项目会议!B13"
}
},
{
@@ -360,8 +480,19 @@
"ParamName": "自动拉会",
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=发起钉钉项目会议!B11"
+ "SerializeProperty": "=发起钉钉项目会议!B14"
}
+ },
+ {
+ "$type": "Forguncy.Model.RequestServerCommandListviewParam, ServerDesignerCommon",
+ "ParamName": "参会人员",
+ "ListviewName": "图文列表表格1",
+ "Columns": [
+ {
+ "ArrayItemName": "用户名",
+ "Column": "项目成员"
+ }
+ ]
}
],
"ResultErrorCodeTo": {
@@ -419,7 +550,7 @@
"BreakpointIdentity": "d4689739-de6c-40df-85cf-4ae41f712a8d"
}
],
- "ID": "69b2cda5-6811-4487-8f90-c493024cdc87"
+ "ID": "1038feb8-006c-4e93-9741-3a976d053f46"
},
{
"CommandList": [
@@ -435,13 +566,13 @@
"BreakpointIdentity": "42da755d-5e1d-406f-9547-5361035a0bb5"
}
],
- "ID": "1e6f668f-d744-400c-aaae-a14febf487c5"
+ "ID": "a926877d-4d3c-4486-a226-01e124d6a089"
}
],
"BreakpointIdentity": "4c10cefe-a28f-4c58-8132-0eff5e7976f5"
}
],
- "ID": "c73b8136-f32a-4320-a6a5-0f3d14c8adad"
+ "ID": "7d83e6fd-94ae-4161-bace-9f30bd7c6a65"
}
],
"BreakpointIdentity": "4be28bf5-7693-4ae2-a6fe-0bd8f67e3e02"
@@ -455,6 +586,13 @@
"UseCellTypeForeColor": true
}
}
+ },
+ "17,1": {
+ "BindingInfo": {
+ "TableName": "项目表",
+ "ColumnName": "ID",
+ "GUID": "d9d6d8bf-2d0d-4713-a85c-2a146e0e0ec5"
+ }
}
},
"StyleDatas": {
@@ -473,14 +611,20 @@
"Formatter": 2
},
{
- "FontSize": 13.333333333333332
+ "FontFamily": 1,
+ "FontSize": 13.333333333333332,
+ "Foreground": 0
+ },
+ {
+ "HorizontalAlignment": 3
}
],
"Types": {
"Strs": [
"Text 1 50",
"Body",
- "[AUTO]General"
+ "[AUTO]General",
+ "Center"
]
},
"CellStyles": {
@@ -502,55 +646,57 @@
"4,14": 1,
"5,0": 1,
"5,1": 2,
- "5,14": 1,
- "7,0": 1,
+ "5,14": 2,
"7,1": 2,
- "7,2": 1,
- "7,3": 1,
- "7,4": 1,
- "7,5": 1,
- "7,6": 1,
- "7,7": 1,
- "7,8": 1,
- "7,9": 1,
- "7,10": 1,
- "7,11": 1,
- "7,12": 1,
- "7,13": 1,
- "7,14": 1,
- "8,0": 1,
- "8,1": 3,
- "8,14": 1,
- "9,0": 1,
- "9,1": 1,
- "9,2": 1,
- "9,3": 1,
- "9,4": 1,
- "9,5": 1,
- "9,6": 1,
- "9,7": 1,
- "9,8": 1,
- "9,9": 1,
- "9,10": 1,
- "9,11": 1,
- "9,12": 1,
- "9,13": 1,
- "9,14": 1,
- "10,0": 1,
- "10,1": 1,
- "10,2": 1,
- "10,3": 1,
- "10,4": 1,
- "10,5": 1,
- "10,6": 1,
- "10,7": 1,
- "10,8": 1,
- "10,9": 1,
- "10,10": 1,
- "10,11": 1,
- "10,12": 1,
- "10,13": 1,
- "10,14": 1
+ "7,13": 3,
+ "8,1": 2,
+ "8,13": 3,
+ "9,1": 4,
+ "11,0": 1,
+ "11,1": 2,
+ "11,2": 1,
+ "11,3": 1,
+ "11,4": 1,
+ "11,5": 1,
+ "11,6": 1,
+ "11,7": 1,
+ "11,8": 1,
+ "11,9": 1,
+ "11,10": 1,
+ "11,11": 1,
+ "11,12": 1,
+ "11,13": 1,
+ "11,14": 1,
+ "12,0": 1,
+ "12,1": 1,
+ "12,2": 1,
+ "12,3": 1,
+ "12,4": 1,
+ "12,5": 1,
+ "12,6": 1,
+ "12,7": 1,
+ "12,8": 1,
+ "12,9": 1,
+ "12,10": 1,
+ "12,11": 1,
+ "12,12": 1,
+ "12,13": 1,
+ "12,14": 1,
+ "13,0": 1,
+ "13,1": 1,
+ "13,2": 1,
+ "13,3": 1,
+ "13,4": 1,
+ "13,5": 1,
+ "13,6": 1,
+ "13,7": 1,
+ "13,8": 1,
+ "13,9": 1,
+ "13,10": 1,
+ "13,11": 1,
+ "13,12": 1,
+ "13,13": 1,
+ "13,14": 1
},
"SheetStyle": {
"FontFamily": 1,
@@ -559,12 +705,12 @@
},
"Spans": [
"2,1,1,13",
- "8,1,1,13",
- "10,1,1,13",
- "12,1,1,13",
+ "13,1,1,13",
+ "15,1,1,13",
"5,1,1,13",
- "14,2,1,3",
- "9,1,1,13"
+ "12,1,1,13",
+ "9,1,1,13",
+ "17,1,1,4"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -584,24 +730,25 @@
]
},
"RowBreakLines": [],
- "RepeatRangeSettings": []
+ "RepeatRangeSettings": [],
+ "RelatedDataTableName": "项目表"
},
"PrintInfo": {
"PaperSize": {},
"Margin": {}
},
"CustomNames": [
+ {
+ "Name": "会议类型",
+ "Formula": "发起钉钉项目会议!$B$6"
+ },
{
"Name": "会议主题",
- "Formula": "发起钉钉项目会议!$C$15"
+ "Formula": "发起钉钉项目会议!$C$18"
},
{
"Name": "项目ID",
- "Formula": "发起钉钉项目会议!$B$15"
- },
- {
- "Name": "会议类型",
- "Formula": "发起钉钉项目会议!$B$6"
+ "Formula": "发起钉钉项目会议!$B$18"
}
]
-}//8QE4yCkrkVoZNoRyGx7VR7CMrL7b8WizoCH/7feifG25//XZMWAT7Czu73+qyNM1beA7wDqU04nz54KwIkdEe4DR86drAKzCDYAcGEBU3ZZU8xMrJf7O8x/Q0jV4IosALtpaCXTROmyeJCyGI1U/ewaYw/aH/W5WodQDVn437U4ioMj3sZ2VtNzFRYILzOD2ZDihB7FrUbHYza56NVDL9I2Li3Us3I+UJzClcj1QClM2ADf8TvN19DEdgRlVyD0ko/wz5c5EIxOmA6zeNLZF0YS76m3H/wCMe0BWOd0pDOyGXnKvdtneDaKbShOz2PNWwR51WdKZsS8HmkIT2/phBUrzB6yX0ktmBMSGwFv5GesfmlTP8+9AUg311yoUUmxOVOshCEicB4O2eiFxObag3b4rha0kD8QfV7isHxZ3xvu4w6Yqk3qvr+5ues89qTQwu7613EdsgP7W4JcUSJn4eeZ4T2DI+e0o2+AzhAE+6wQfaT686GkI2DEDyXC+W3gB55ViKI7wJHoguczq34Qlp6NTi+3wM+wnKyYLwkDUy2fP1aoiAjjONlE0vqbRmX4un+qGjCHClMCYW6okJ0Ma4HZ8n0p2NlhG/rbeVOceciJv8jUkMyNIU+SnT4b130NHILKbQV9rFzdic8M7mntHJCT2gqzF4rmyIaomxZkDZZ9m4gxjQPyHTZRMhWf1QokAybqJbZO8zFbRHNMeUJcAI8ig3Zz71+Ejgiuc/Aucns0Y/PQ51wGG7FABNGgzQ7ScIXtDNxrwUL+nmJiWu7+Q9hs3Lm/2b8yAW8Ueqk3u7KOca4+8m1cQLxUZlbokIasDgWfYhv8VIMEPvcfYUzCUXQzGy7nAR91N5p0aKczIkpzNEThzTvJbG7VyQ6OLb5fdjZHaTetdJol0iZig3sTMEQ==|920
\ No newline at end of file
+}//YPtlqLoPkyMU5n7Q9zTDluoiSmKKBvAR9T/cf7w0ZpiDKfvpNfq9UoDGZ65P2L1s7QiD59Zg8hnvszAC/uEmru9Nkznjqu3656+Wrb7ijnKmZN69lmmA0CacZKssvmPbym0jHp7cC9Sr6BbOdiWylyWTR0Oye/WAhYRhCz1S8De2w/9MpFo65yCXR2ur6HTHMRqAy3WENGCLne4OK+8JMuOKJnNITx1aVtR6vtwZIsNu/xUk3bSc+XHuuVjyJ1brdtVp8o9+RVyiCoq7d1I6ucXZEwwMNrfRVjsbUMGA+8mQEHzbakPHsWOJmszewhUlWmmCLsB3d26MGtXZ57eC6K79AOaoXQDNPhrwPMSDjjpRopadvyhZDURKM8aVOZBpWvjzQQRJ5lQJMtgnkBsd+6MomaC1/oFFWGYGPhyZw1qICdgv0DJJktDAoWiiB1KnTMHlp0mFJwuec6Yb23fiOuYpcqkEA/eY/03VwuK/eRRdh3BtJHO+p05E24GU3Xgv/wZ8EtQnaOBDdkiELnqi66k4q//tvJ9+dtKOIqUzsDm3MikUl4glh85UiRim1pIwc3d7lgxzFrm9PTlFNC5KObO6Ay+38fWpKBfExtseKshAsKZK4Woj829DcfAbvNw1k2wfCYzupD0q0QzAhXcgbLkNTlaDnGsT2qMZyVzhx9jv4nlatxGUJOcFCmDDPrqay5RYpelt8gX8icjRDg+qLIYjBcSCz5oaL+xYnC9hCZ34q34LTbn4k0c9QKihxSaRjXli/ScfQX/5XVIRsjOKlIreIM5AvyajCxSV8JJzInj5nlSg3BdEkV5Z9wcgLjGTj5uAj2EOECD5eh//oqk/F06L8vOwlVYgApOyGAG5bAJgBOFUFh1Bw8kJe6k9YqEGNmYpJshReA1320/4PfGO0Q==|920
\ No newline at end of file
diff --git a/Pages/共用/发起钉钉项目会议.rd b/Pages/项目/发起钉钉项目会议.rd
similarity index 71%
rename from Pages/共用/发起钉钉项目会议.rd
rename to Pages/项目/发起钉钉项目会议.rd
index ba617834..cf120e3a 100644
--- a/Pages/共用/发起钉钉项目会议.rd
+++ b/Pages/项目/发起钉钉项目会议.rd
@@ -1,22 +1,22 @@
{
"PageType": 0,
"ColumnCount": 15,
- "RowCount": 15,
+ "RowCount": 18,
"Formulas": {
"2,1": "会议主题&会议类型"
},
"CustomNames": [
+ {
+ "Name": "会议类型",
+ "Formula": "发起钉钉项目会议!$B$6"
+ },
{
"Name": "会议主题",
- "Formula": "发起钉钉项目会议!$C$15"
+ "Formula": "发起钉钉项目会议!$C$18"
},
{
"Name": "项目ID",
- "Formula": "发起钉钉项目会议!$B$15"
- },
- {
- "Name": "会议类型",
- "Formula": "发起钉钉项目会议!$B$6"
+ "Formula": "发起钉钉项目会议!$B$18"
}
]
}
\ No newline at end of file
diff --git a/Pages/项目/选择参会成员.json b/Pages/项目/选择参会成员.json
new file mode 100644
index 00000000..24677038
--- /dev/null
+++ b/Pages/项目/选择参会成员.json
@@ -0,0 +1,295 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 538.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 29.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 42.0
+ }
+ }
+ },
+ "InLogicalVisibleIndexes": [
+ 5
+ ],
+ "Count": 6,
+ "DefaultSize": 32.0
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "21": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "22": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "23": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "24": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "25": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "26": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "27": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "28": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0
+ }
+ }
+ },
+ "Count": 29,
+ "DefaultSize": 32.0
+ },
+ "Values": {
+ "3,18": "关闭",
+ "3,24": "确认"
+ },
+ "AttachInfos": {
+ "1,1": {
+ "CellType": {
+ "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon",
+ "TemplatePageName": "e58b161ccf7d4429955ac9e5e68d551",
+ "DataSourceType": 1,
+ "DataSource": {
+ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+ "TableName": "用户信息视图",
+ "BindingInfos": [
+ {
+ "GUID": "da6b31a5-9165-4efd-b7ac-0c3b6f13bf9c",
+ "BindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "用户名",
+ "GUID": "e4d98629-9e9e-4995-bfe8-d00c89aa5551"
+ },
+ "ColumnName": "用户名"
+ },
+ {
+ "GUID": "78bbac76-5376-40da-a15c-5a45832e07ae",
+ "BindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "全名",
+ "GUID": "14fe5794-f68a-4520-b7e6-4abd9adae86a"
+ },
+ "ColumnName": "全名"
+ },
+ {
+ "GUID": "3e815e8b-fef7-4f76-bbab-49c1430ed836",
+ "BindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "角色",
+ "GUID": "ef633b7d-8b44-4d4e-8454-78ac470b07b1"
+ },
+ "ColumnName": "角色"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
+ "CompareType": 9,
+ "ColumnBindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "用户名",
+ "GUID": "6015b51d-9db2-4924-b1db-7aca548a0b41"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=选择参会成员!排除成员"
+ }
+ },
+ "NullFormulaValueQueryPolicy": 1,
+ "IsListviewDataSource": true,
+ "CustomColumns": [
+ "用户名",
+ "全名",
+ "角色"
+ ]
+ },
+ "DataSourceListviewName": "图文列表表格1",
+ "TemplateKey": "竖排横线分割"
+ }
+ },
+ "3,18": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "Text": "关闭",
+ "TemplateKey": "_RS_Information3"
+ }
+ },
+ "3,24": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "PassListviewDataCommand.PassListviewDataCommand, PassListviewDataCommand",
+ "PassRowMode": 1,
+ "ImportMode": 1,
+ "PassValueItems": [
+ {
+ "SourceCell": "用户名",
+ "TargetCell": "项目成员",
+ "IsPrimaryKey": true
+ },
+ {
+ "SourceCell": "全名",
+ "TargetCell": "项目成员_全名"
+ },
+ {
+ "SourceCell": "角色",
+ "TargetCell": "岗位名称"
+ }
+ ],
+ "Source": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=选择参会成员!B2"
+ },
+ "Target": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=发起钉钉项目会议!B10"
+ },
+ "BreakpointIdentity": "90840e7b-1604-462f-a327-c8aa0de85a7d"
+ },
+ {
+ "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+ "BreakpointIdentity": "a0cf3906-8ac8-4e1e-bb42-ad33c56adaaf"
+ }
+ ],
+ "Text": "确认",
+ "TemplateKey": "_RS_Main1"
+ }
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "HorizontalAlignment": 0
+ },
+ {
+ "FontFamily": 1,
+ "Formatter": 2
+ },
+ {
+ "FontFamily": 1
+ },
+ {
+ "Background": 3,
+ "FontSize": 13.333333333333332,
+ "Foreground": 4
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Center",
+ "Body",
+ "[AUTO]General",
+ "#FFFFFF00",
+ "black"
+ ]
+ },
+ "CellStyles": {
+ "1,1": 0,
+ "1,24": 0,
+ "1,26": 0,
+ "1,27": 0,
+ "3,18": 1,
+ "3,19": 2,
+ "3,20": 2,
+ "3,21": 2,
+ "4,18": 1,
+ "4,19": 1,
+ "4,20": 1,
+ "4,21": 1,
+ "5,1": 3
+ },
+ "SheetStyle": {
+ "FontFamily": 1
+ }
+ },
+ "Spans": [
+ "1,1,1,27",
+ "3,24,1,4",
+ "3,18,1,4",
+ "5,1,1,4"
+ ],
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+ "PermissionData": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
+ "permissionResource": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core"
+ },
+ "permissionBindings": [
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core",
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ }
+ ]
+ },
+ "RowBreakLines": [],
+ "RepeatRangeSettings": []
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ },
+ "CustomNames": [
+ {
+ "Name": "排除成员",
+ "Formula": "选择参会成员!$B$6"
+ }
+ ]
+}//04+6KEb4LvtDaRv/EdndmnBMbvhnh3RlxYpXhsmOTRkNzQqsuLVzTEW4L7V1DVX2snQwCf1zdOb2v42yniGE5RDS9jfDHC4vIbUisOuMBqO1eLn1Q4VlLr+IUTO1ZoFrHWH78tBm39Yo5JREtReE1bGMXDtFNmw4S6xgkSFdWRjTKgwQIgqVCDk4NuKoIeYiSTcWfSCquBHsLaidFuz8SMxgdeI0XDLA5ntOSDE5z9DOzKwKaP1iCDRUfaZmXeCvOCZJ0pY8gFLvNi74zRi47FeDBdbK9KBhrI36KXLJ6zZdTtdS1hIBLkzZ2A/3IzBb0fTCF6Ero7WlZ67OeKkMnYBlyBp3WNS8rvC/yCs2fkostg19gg9HbkxspP2iovbd3BWdSMn8xzW2pDNrI18cy0JC2QaWYmqs03gf7/aWr4FB8fxXZkkKk72nPgsEVkhlxwo3rlLugSeT1mu80A0jhynMYr6TeaMH6oqXxDwh61Y6uns7N3PD002aq2Zb6GBJZ/aIzqHMbG4sC5AQEoIfw8i3G/ezlX1uGBn9uE0xU6KG9+FtXDm25VxWI03z1Q+5t+5+MT9sjBK69mW+R/vJr9tQWVqhcRUrEzcWoAZJz6qNPYMgoIZGIk9rK6zJoAOl1POB0PWTkBPJ9k3oT3AXqxjNYA52lHRrudAbis72CEP4MB1iklsSRNcmZa36n0vCYODj2szya0nq1anM4EF8jR/EZRrgqIz8t8ifHQ+NGWatc8v/RZX7a1kAYQSj+okXLrHSApzbNpRF75QYhVZJbzUlt4102PRoW3PxTHPgnUkNyLCC7STLinVlVBHj/kMF7ErFJUm97RGYeqOaeZRLuiSCGYvnSlA3+12aGmKOEdqoFRldGrQffSEJBy/Vw68+unK7p4hC+/Ze8SmcDKub3Q==|920
\ No newline at end of file
diff --git a/Pages/项目/选择参会成员.rd b/Pages/项目/选择参会成员.rd
new file mode 100644
index 00000000..3afa89bb
--- /dev/null
+++ b/Pages/项目/选择参会成员.rd
@@ -0,0 +1,11 @@
+{
+ "PageType": 0,
+ "ColumnCount": 29,
+ "RowCount": 6,
+ "CustomNames": [
+ {
+ "Name": "排除成员",
+ "Formula": "选择参会成员!$B$6"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json
index 2266fef4..1c801b80 100644
--- a/Pages/项目/项目首页/项目标题.json
+++ b/Pages/项目/项目首页/项目标题.json
@@ -8,7 +8,7 @@
},
"1": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
+ "DesignLengthInPixel": 30.0
}
},
"2": {
@@ -258,7 +258,7 @@
"BreakpointIdentity": "93ac0fbb-69f7-4710-8707-64e964e081dc"
}
],
- "ID": "33459670-4490-49c3-a5be-2f395c8c0e2a"
+ "ID": "7feffdfe-b67d-418a-8181-b9230ae03dfc"
}
],
"BreakpointIdentity": "b0a3b176-ed6d-44a3-a416-9360c0ff8e94"
@@ -486,7 +486,7 @@
"BreakpointIdentity": "7e0822bf-35cd-4983-9935-b4f09f551a2b"
}
],
- "ID": "76d12ebd-e54c-4c52-b2e2-668a03b6cf6b"
+ "ID": "3329ecce-546f-4f54-8e3c-af4d33ff6f62"
},
{
"Condition": {
@@ -509,7 +509,7 @@
"BreakpointIdentity": "09c0e29b-5a2c-4206-a4f5-919eec7cb09e"
}
],
- "ID": "d6616d6d-ac45-4390-bb26-88b5681524c4"
+ "ID": "8a03e0b8-3604-4a16-8aea-c0d2109a4419"
},
{
"Condition": {
@@ -559,7 +559,7 @@
"BreakpointIdentity": "b01dae39-d21c-45d1-a85e-f4a255964a77"
}
],
- "ID": "3a8eca15-d1c2-4e07-910c-4ca2fd3754dd"
+ "ID": "05a2d834-aa20-4e66-8a3d-4bfcd31ae73f"
},
{
"CommandList": [
@@ -570,13 +570,13 @@
"BreakpointIdentity": "ba2732d6-0520-4256-ad76-1d97e4c5320a"
}
],
- "ID": "9dbbcb5b-921f-4f94-9d64-3896ef0dc5de"
+ "ID": "c88bfa0c-d5e4-4a91-9f66-32d8e7846af1"
}
],
"BreakpointIdentity": "8feab600-304e-43f2-b5f0-3932e63e5285"
}
],
- "ID": "4e1d4f06-1ba8-4c67-9506-2768eb121958"
+ "ID": "02323650-9747-43dc-b251-ec82c095fc46"
},
{
"Condition": {
@@ -644,13 +644,13 @@
"BreakpointIdentity": "edb5f15a-41f3-448a-bd18-10fec354b0c9"
}
],
- "ID": "3a940d12-4a55-4eb1-96d2-7db5c30c765d"
+ "ID": "0a25e3f1-5a47-4ea3-af6e-7724999b7bc7"
}
],
"BreakpointIdentity": "30bbdf92-551f-47ad-806f-9f7f4794a52b"
}
],
- "ID": "16e02c6d-928a-4cbe-a3eb-4d396a8cbfab"
+ "ID": "983abbf9-17d7-49cb-abef-5ddc730eb5cc"
},
{
"Condition": {
@@ -752,13 +752,13 @@
"BreakpointIdentity": "3d653eb8-a9fc-4a44-bd99-6f6c67f75d1c"
}
],
- "ID": "9b2dc063-4cbc-4ea5-a3e8-9c9f0c2705f8"
+ "ID": "defd61e9-1de4-4de4-80d3-bcd7a9d634b7"
}
],
"BreakpointIdentity": "d8ae111b-2b83-43da-8ba0-1ea6b03bc8e2"
}
],
- "ID": "a81f55c7-3360-431a-a33d-533cf5b49f29"
+ "ID": "9b6024e9-5fed-4421-9b95-170b581d49f9"
},
{
"CommandList": [
@@ -769,13 +769,13 @@
"BreakpointIdentity": "756ed293-76b8-496d-aa1a-5e1bf3fc076d"
}
],
- "ID": "aa465686-f588-4efb-bac5-5b8b28fcd307"
+ "ID": "c8b6ca4b-6e4f-41ab-86ca-09ac3cb66fc6"
}
],
"BreakpointIdentity": "95af4ff9-cddf-4f43-8d75-6b2c931bc6fd"
}
],
- "ID": "2c0f94c5-55b1-4336-8b28-a9b2e773e29f"
+ "ID": "652e3718-84ff-4506-a986-b9d3b3f77e7f"
},
{
"Condition": {
@@ -809,7 +809,7 @@
"BreakpointIdentity": "910a7066-07af-4af4-a44c-3799fd68ebd1"
}
],
- "ID": "6248bb0c-f9db-4c9c-85e2-6050edb6eec4"
+ "ID": "d77f66be-f6a6-4dc7-8a8b-ed39f377ca10"
},
{
"Condition": {
@@ -832,7 +832,7 @@
"BreakpointIdentity": "c5dc9a3a-dcb5-4534-85ad-8ae1954da410"
}
],
- "ID": "674a92f4-0c10-4cbe-9dc8-e6585e01770e"
+ "ID": "52992ba5-837b-4aff-bf79-aacc7c92adca"
},
{
"Condition": {
@@ -868,7 +868,7 @@
"BreakpointIdentity": "466ce9bd-3dc9-4afe-afa7-2df4fe5f7e23"
}
],
- "ID": "019c5d58-3cd0-49ba-81bf-93ab480be40b"
+ "ID": "a51f9312-46a9-4be9-9c22-ba589907a194"
},
{
"Condition": {
@@ -999,13 +999,13 @@
"BreakpointIdentity": "60997118-26bf-44ce-bc0f-b1531de0e9b9"
}
],
- "ID": "5fda6c1a-0afa-41a5-91c5-0856bf538b7c"
+ "ID": "3c5bb0a6-c848-4b49-99be-5cdaddf11716"
}
],
"BreakpointIdentity": "dce59186-3abb-4231-b4e8-842ec301da20"
}
],
- "ID": "1db8ea35-ca60-4ecf-a398-cfa71423bd37"
+ "ID": "c43c9d16-1ba6-41a2-bd73-3ce8a6f1f38d"
},
{
"CommandList": [
@@ -1019,13 +1019,13 @@
"BreakpointIdentity": "0edb8222-5ce0-4e3b-92cb-b32a92078fe7"
}
],
- "ID": "d064d4b0-d139-4307-aa63-aa5ecb22615a"
+ "ID": "27250549-8eaa-45a6-987a-8212c1c8e948"
}
],
"BreakpointIdentity": "8b1853ee-7a60-442a-b1eb-b5017d21a08d"
}
],
- "ID": "83b46b79-99f6-4cb8-bfd5-d15b99eecb3d"
+ "ID": "74638e55-7e0a-4b39-b7f3-d575ea2e92fe"
},
{
"CommandList": [
@@ -1036,13 +1036,13 @@
"BreakpointIdentity": "1852f4a1-cb35-4e85-95a3-9e1615ed8beb"
}
],
- "ID": "476c89e5-8f91-4367-87cb-d419bec21e43"
+ "ID": "142e3d73-ef70-4c9b-ab11-3ea867250b3e"
}
],
"BreakpointIdentity": "4e529179-17b8-49f1-a0a4-13304e269271"
}
],
- "ID": "522abeed-41dc-4b6c-8039-182384548bf5"
+ "ID": "fc7d88f9-d5a4-4dde-a374-7803a5df96cb"
},
{
"Condition": {
@@ -1060,7 +1060,9 @@
"CommandList": [
{
"$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
- "PopupDisplayMode": 2,
+ "PopupDisplayMode": 3,
+ "DrawerDirection": 3,
+ "ShowDrawerHeader": true,
"PageName": "发起钉钉项目会议",
"PassValues": [
{
@@ -1085,13 +1087,13 @@
"BreakpointIdentity": "5a7bca19-6bac-4c68-b0da-be6c272ee4a7"
}
],
- "ID": "d66133e1-02ce-477b-bb3c-5dbd626eeabf"
+ "ID": "61a3c09f-bcc2-42d5-a308-2e480a15737f"
}
],
"BreakpointIdentity": "8620f105-6edb-408a-8dde-f6b4e17a99a9"
}
],
- "ID": "43bd4295-879d-4783-a336-e868b098c22d"
+ "ID": "804dc4ff-0a7f-410c-bc87-7d2d967191b8"
}
],
"BreakpointIdentity": "132d40ba-1042-4a52-a632-f30e854ca2ef"
@@ -1103,6 +1105,7 @@
}
},
"PageName": "项目菜单",
+ "LoadBindingDataOption": 1,
"BreakpointIdentity": "41894c0a-5dfc-4770-8788-6c7b6f400921"
}
],
@@ -1169,7 +1172,7 @@
"BreakpointIdentity": "1b7ef161-545b-4885-9fe4-53e7edad5e25"
}
],
- "ID": "a2a35dbc-db80-461c-aac9-9041e9e5a87d"
+ "ID": "d05749b0-fc60-460b-bb09-0d942c5391e6"
}
],
"BreakpointIdentity": "aa963409-8fa1-4eb6-b070-48ff6d05409f"
@@ -1406,4 +1409,4 @@
"Formula": "项目标题!$F$2"
}
]
-}//UEtialUVcRcDN76drw+302GbIvgLtDzgK93Z2zENYytB4BQeWXMEi9C4i4heRjzovfK5bkBe3CuATGebcLFySmFfvVwgvjfTKq6Vsg0EiRMj1mUoy5S6WuQRIB6ohVWa4dVm0yPeI4l/Afm8O8+dKYffluNs8ZB98Hqf0TxbGGEBdeJFvY1OQ22QwHJgD7sTruJophD6dOGZlLJBsRlIAD8jMRLJ9r9MCXV9IfgI266JtNm/tbhwd0XvOW7tPcu7sBAgDdUmaFBiFLgymO5IMXqL6EZFDDSdSC9YE08SxhSOmaa5ukKun+t3Dh3MfRhWiYi4P7ePUaEnVcnbu3e0k+3QoI54frQeq0hm3EGveDk99xoX9l4ROtYQ8d6/QA/vD+Z2VP6s+Z+88CzC5V/SolVQSz7lFzmOGVFqMQvuz/G3GDfXtRDfxqfsdNOyB6OyI8abUKqKAJ8LaPJmDn4ogX2hjHdPoi+rov3J9d+J/ilJmFkku27JRs8iUb6lMcUE/HhdwdORjlaqIH+AOnDOk4blB37CTa6Ie84bd2kzSXEeoOVjOowb1r4+21XfO30IY9PPOOzlDGa1JN6j88RX09I2840c7qoiJh4XrOaJnuDPfMPoPYLXTocX1AVcV1YfqCVntWpGZUyHVggMPGSvCgelKBEiYElg+3uaQsSpOqr9W3KRBiJjA28uxnDHnHPwEa4k0MkdIh/RJ9lABJPjcgK4aypwRbkkns5bgcQxIwf+I3zwDhllqB1CY7Tjbm2WGEtgvMKGGGV/WnmP7GhC/Rt1vZ4n3fmWnWx33KgM6DgR5IoCnhUingoAIH4jcK+EWP0+QJFluDjleKilDqlV8pRlAS4Y2R/v0pxX93LJSWG6Bur5JrYtkrKv8mOodhGkVwKTZ4uwf3nwA3PygxC+Bw==|920
\ No newline at end of file
+}//kplQBq8SaybPbaUGWgeOZaEBlfg8S5zkpe/AH7fWBGjdtjIyK31SWehJgeAKwSNmdcM6x1YyWjuIoNzV0p3eBz+WP3v0cN7zPbX15f8+vkNEwC3MhEvPM77y/KS4UZW8dfq0ekMUu0xKGFKpOx6tS6laLbOxRW7uklcbffDAui/AXbL+p8tkfwe6f4Q+V/3Hea8XJk7lRobv/yvRWcqmZbqdaeBsUC78ufEM19WT4c3+ykXcgT7cP9elsDyzZQHcKMqQJ3KNNZtTacYTSe3T1buW3I932QS3J0SLRxDGP/bIsnT/LB97ILN/WEuP44FMk7SQuH2eX3k3rHgCUm/gzgcunbhSHqgqmhRxsBb3UoDyHacLQ41AIkewO6FPtynCZR4dLjJIwBSYEWD7O2VUYSeutz71ULrJj8sBDk0OC4C+ZUlXRPTUNK0GIsQtA9OwJVj6WhO3APbBFmv8R2vYxHpJ1Va8Utn9zAn2+WUxV5WujGa/3VuXdu/SPewijIuX84CvArQWXStj0SgEh2KkP68/u3aCGtmxEaYveHLU2nlQka1Q32FUAdNwxK41f4YrH/74V1r0c9ohb+5Iviae7FBMBOTVkt75Ew0LEYBhgCsXlq826Hee41FVwBsXKxdQjhTIT5aklL8iEKw2MIMpA58/QG56bewY+Shje8AV+0x/vSPjY/PiG7YqJXmICd+0AmyOhZbCoFNwvLjADvIqKmxB13eA/acmaw/6Ez66hqNMt+BKmwBsm4mKuYMSURfH71M1CIPGivUWVheMOc83rhd60PkGT/+PqQItwf37l9QDhYSPbQ/dxwvBj2ZT6inFKPhSr3W9Rkop+tIPMMJdDg1ZUtWtF395yJafu+hx/PrWO078cG1559y1E9QzumFSGehIGh4mQ+Invi6gEAcNCA==|920
\ No newline at end of file
diff --git a/Plugin/PC组件包-ElementPlus-10_0_102_0.zip b/Plugin/EL插件102版本.zip
similarity index 59%
rename from Plugin/PC组件包-ElementPlus-10_0_102_0.zip
rename to Plugin/EL插件102版本.zip
index 1380e776..50993b3d 100644
Binary files a/Plugin/PC组件包-ElementPlus-10_0_102_0.zip and b/Plugin/EL插件102版本.zip differ
diff --git a/Plugin/Forguncy.PassListviewDataCommand.zip b/Plugin/Forguncy.PassListviewDataCommand.zip
new file mode 100644
index 00000000..f0fbfc87
Binary files /dev/null and b/Plugin/Forguncy.PassListviewDataCommand.zip differ
diff --git a/ServerCommands/钉钉/订阅钉钉回调事件.json b/ServerCommands/钉钉/订阅钉钉回调事件.json
index 4c7ee3b7..5d7ad679 100644
--- a/ServerCommands/钉钉/订阅钉钉回调事件.json
+++ b/ServerCommands/钉钉/订阅钉钉回调事件.json
@@ -340,7 +340,7 @@
]
},
"Comments": "会议创建事件",
- "ID": "03acda4e-1919-4bd4-936f-8cb4fe3a0b56"
+ "ID": "bed0f054-1793-4c2a-bdc3-fb2c87a4e5a0"
},
{
"$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
@@ -475,14 +475,6 @@
"SerializeProperty": "=会议信息.会议标题"
}
},
- {
- "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
- "ParamName": "邀请三经理",
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=会议信息.邀请三经理"
- }
- },
{
"$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
"ParamName": "开启云录制",
@@ -498,6 +490,10 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=会议信息.自动拉会"
}
+ },
+ {
+ "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+ "ParamName": "参会人员"
}
]
},
@@ -528,7 +524,7 @@
}
]
},
- "ID": "1368fca1-c9cd-4acc-bc84-e38122119ca7"
+ "ID": "e95314cb-22d2-48d0-8c2d-3087af670d60"
}
]
},
@@ -536,7 +532,7 @@
}
]
},
- "ID": "d6a819ce-c9c4-43f5-9503-78280c0376f2"
+ "ID": "e9bf5e61-943d-4267-8e39-37fab4a7a86f"
}
]
},
@@ -544,7 +540,7 @@
}
]
},
- "ID": "103a4dc6-3261-4415-a6f2-23884c56570b"
+ "ID": "e6a34c02-50f0-497c-b9c0-7b9cb674efbe"
}
]
},
@@ -553,7 +549,7 @@
]
},
"Comments": "会议状态变更",
- "ID": "dea696bc-d004-4d46-b811-842e5ec803db"
+ "ID": "fb9f4efe-1edc-4696-8be3-06013f271273"
}
]
},
diff --git a/ServerCommands/钉钉/创建项目视频会议.json b/ServerCommands/项目/创建项目视频会议.json
similarity index 65%
rename from ServerCommands/钉钉/创建项目视频会议.json
rename to ServerCommands/项目/创建项目视频会议.json
index 9bcde2dd..2c5728ba 100644
--- a/ServerCommands/钉钉/创建项目视频会议.json
+++ b/ServerCommands/项目/创建项目视频会议.json
@@ -49,14 +49,6 @@
"$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon"
}
},
- {
- "$type": "Forguncy.SaveLoad.PostRequestParameterSaveData, ServerDesignerCommon",
- "Name": "邀请三经理",
- "DataValidationInfo": {
- "$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon"
- },
- "TestData": "0"
- },
{
"$type": "Forguncy.SaveLoad.PostRequestParameterSaveData, ServerDesignerCommon",
"Name": "开启云录制",
@@ -70,6 +62,27 @@
"DataValidationInfo": {
"$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon"
}
+ },
+ {
+ "$type": "Forguncy.SaveLoad.PostRequestParameterSaveData, ServerDesignerCommon",
+ "Type": 1,
+ "ArrayParamItems": {
+ "$type": "System.Collections.Generic.List`1[[Forguncy.SaveLoad.ParameterItemSaveData, ServerDesignerCommon]], System.Private.CoreLib",
+ "$values": [
+ {
+ "$type": "Forguncy.SaveLoad.ParameterItemSaveData, ServerDesignerCommon",
+ "Name": "用户名",
+ "DataValidationInfo": {
+ "$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon",
+ "IgnoreBlank": false
+ }
+ }
+ ]
+ },
+ "Name": "参会人员",
+ "DataValidationInfo": {
+ "$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon"
+ }
}
]
},
@@ -95,7 +108,7 @@
"$values": [
{
"$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
- "GUID": "d6d8059a-6bb0-406d-9f9e-e6a6e914e613",
+ "GUID": "ae136e45-f8f3-4bc0-a6c0-a984db108d46",
"BindingInfo": {
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "项目表",
@@ -103,39 +116,6 @@
"GUID": "6cdf5178-317e-4abd-8460-d2a8e91d4069"
},
"ColumnName": "项目名称"
- },
- {
- "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
- "GUID": "00884853-c2b8-4434-84bb-b62dec34770e",
- "BindingInfo": {
- "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
- "TableName": "项目表",
- "ColumnName": "项目经理",
- "GUID": "3da4b8e9-f98b-4d59-b28c-a987fc95d3f9"
- },
- "ColumnName": "项目经理"
- },
- {
- "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
- "GUID": "874fecc1-51d5-4cc1-b15d-0c85db7c2d1f",
- "BindingInfo": {
- "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
- "TableName": "项目表",
- "ColumnName": "商务经理",
- "GUID": "a66149c3-2d31-43ef-a7e2-9c75075a49b7"
- },
- "ColumnName": "商务经理"
- },
- {
- "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
- "GUID": "f76467c1-0a55-4ed5-84a8-c60d5ffc9890",
- "BindingInfo": {
- "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
- "TableName": "项目表",
- "ColumnName": "客服经理",
- "GUID": "80a12bdd-428f-458e-96a6-84b39f66cf42"
- },
- "ColumnName": "客服经理"
}
]
},
@@ -155,7 +135,7 @@
"NullFormulaValueQueryPolicy": 0,
"TopCount": "1"
},
- "ID": "b9a63039c2c74068bbafa81cde6e0a71",
+ "ID": "beeb0b13abc0431e9c9bd8cd0550eb20",
"BreakpointIdentity": "92d6e0fd-72bc-460a-9236-ba42bd42e3fe"
},
{
@@ -180,45 +160,6 @@
"CommandList": {
"$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib",
"$values": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "项目成员",
- "TableValue": {
- "$type": "Forguncy.Model.Commands.ParameterTableValue, ServerDesignerCommon",
- "TableName": "项目成员表",
- "BindingInfos": {
- "$type": "System.Collections.Generic.List`1[[Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon]], System.Private.CoreLib",
- "$values": [
- {
- "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon",
- "GUID": "b103b742-7377-4b38-98e4-f55568095a70",
- "BindingInfo": {
- "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
- "TableName": "项目成员表",
- "ColumnName": "项目成员",
- "GUID": "6327b287-d657-407c-8ade-82a8da5c4b6e"
- },
- "ColumnName": "项目成员"
- }
- ]
- },
- "SqlCondition": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
- "TableName": "项目成员表",
- "ColumnName": "项目ID",
- "GUID": "34bf798b-74dd-4c85-90e8-89aac6f8feef"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目ID"
- }
- }
- },
- "ID": "929f95b206954614b2f1a598b2b41aee",
- "BreakpointIdentity": "718e8b00-62ee-46c8-9408-6eb46aa8e237"
- },
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
"ConditionAndCommandPairList": {
@@ -232,7 +173,7 @@
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
"ParamObject": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目成员.Count"
+ "SerializeProperty": "=参会人员.Count"
}
},
"value": "0",
@@ -245,129 +186,11 @@
"$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
"InParamater": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目成员"
- },
- "Operation": 18,
- "OperationParamaterAName": "项目成员",
- "OperationParamaterBName": "项目成员",
- "OutParamaterName": "项目成员数组",
- "BreakpointIdentity": "df0ec6d1-c20e-4e85-8a4f-12a50999ea1d"
- }
- ]
- },
- "ID": "8c4a65a8-cc38-478d-9496-140fd82aa446"
- }
- ]
- },
- "BreakpointIdentity": "b956dc17-b334-416e-82bb-03937fba8a37"
- },
- {
- "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
- "ConditionAndCommandPairList": {
- "$type": "System.Collections.Generic.List`1[[Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon]], System.Private.CoreLib",
- "$values": [
- {
- "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
- "Condition": {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
- "ParamObject": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=邀请三经理"
- }
- },
- "value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=TRUE()"
- }
- },
- "CommandList": {
- "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib",
- "$values": [
- {
- "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
- "InParamater": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目成员数组"
- },
- "Operation": 4,
- "OperationParamaterAName": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目信息.项目经理"
- },
- "OperationParamaterBName": "项目成员",
- "OutParamaterName": "项目成员数组",
- "BreakpointIdentity": "1e60dfd3-aac4-4277-803f-9b3369cdc501"
- },
- {
- "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
- "InParamater": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目成员数组"
- },
- "Operation": 4,
- "OperationParamaterAName": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目信息.商务经理"
- },
- "OperationParamaterBName": "项目成员",
- "OutParamaterName": "项目成员数组",
- "BreakpointIdentity": "fee477fc-ff27-44b9-a5b9-6b799520dd45"
- },
- {
- "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
- "InParamater": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目成员数组"
- },
- "Operation": 4,
- "OperationParamaterAName": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目信息.客服经理"
- },
- "OperationParamaterBName": "项目成员",
- "OutParamaterName": "项目成员数组",
- "BreakpointIdentity": "48d26467-3fc2-4865-92d0-1d8eaf332698"
- }
- ]
- },
- "ID": "4538e7a2-aca9-4934-b180-bbde91b4a34f"
- }
- ]
- },
- "BreakpointIdentity": "c97f59c0-543f-4a08-984c-ee39c914f7bb"
- },
- {
- "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
- "ConditionAndCommandPairList": {
- "$type": "System.Collections.Generic.List`1[[Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon]], System.Private.CoreLib",
- "$values": [
- {
- "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
- "Condition": {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
- "ParamObject": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目成员数组.Count"
- }
- },
- "value": "0",
- "compareType": 2
- },
- "CommandList": {
- "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib",
- "$values": [
- {
- "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
- "InParamater": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目成员数组"
+ "SerializeProperty": "=参会人员"
},
"Operation": 16,
"OperationParamaterAName": ",",
+ "OperationParamaterBName": "用户名",
"OutParamaterName": "参会人",
"BreakpointIdentity": "481f11f1-a708-43a2-98ab-1608290c4fb3"
},
@@ -375,7 +198,7 @@
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "当前用户",
"ParameterValue": "%CurrentUser%",
- "ID": "541717b1a1534329be707bc7de15f593",
+ "ID": "55a553cc142043369c51b0f75f201911",
"BreakpointIdentity": "fedb9d66-b60e-4f89-bf8f-f5b60abd91fe"
},
{
@@ -385,7 +208,7 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=IF(会议标题=\"\",项目信息.项目名称&\"项目沟通会议\",会议标题)"
},
- "ID": "6a7ad9af2dd04febbf2a455dbca829b5",
+ "ID": "e6ce2438ce8645e4a9b560530765020d",
"BreakpointIdentity": "3fb2ff75-5fae-406e-b580-088d675924a3"
},
{
@@ -419,7 +242,7 @@
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "会议记录表",
"ColumnName": "会议业务类型",
- "GUID": "72ee523b-3f0d-41cb-96a1-5374e2fbe9dc"
+ "GUID": "62f54880-cb00-432e-80fb-ad7f35049baf"
},
"Value": "0"
},
@@ -429,7 +252,7 @@
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "会议记录表",
"ColumnName": "钉钉会议ID",
- "GUID": "7cb7480a-1a2b-46c9-9307-3e8712c5e09d"
+ "GUID": "e7647db4-a0df-4682-a48b-90a32a42fe3f"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -442,7 +265,7 @@
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "会议记录表",
"ColumnName": "发起人",
- "GUID": "b4f5b725-cb33-4845-9a47-97c3363d8c5d"
+ "GUID": "17e71522-e06a-4ca3-8a02-17aab9f5cbc5"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -455,7 +278,7 @@
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "会议记录表",
"ColumnName": "参与人",
- "GUID": "d18221e5-f4b7-4fcd-b853-e7cbf12b5faa"
+ "GUID": "bbdcd346-1e1e-4f8e-8515-3b2261ede380"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -468,7 +291,7 @@
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "会议记录表",
"ColumnName": "会议标题",
- "GUID": "ba9ef815-e51c-4872-9596-049b3d72c252"
+ "GUID": "a9c9feb1-31a1-4380-81f7-ea5e5d79334f"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -481,7 +304,7 @@
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "会议记录表",
"ColumnName": "自动拉会",
- "GUID": "af18afcb-bbcc-49c0-95a0-984b0a320592"
+ "GUID": "793de123-8715-4270-b2bc-7bbba760fbbc"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -494,7 +317,7 @@
"$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess",
"TableName": "会议记录表",
"ColumnName": "会议状态",
- "GUID": "9252fa7c-274e-4390-8372-d7b74a9a459f"
+ "GUID": "741b92e2-b9fe-4118-9491-0cc2bc9ce40b"
},
"Value": "1"
}
@@ -562,7 +385,7 @@
}
]
},
- "ID": "13a194c5-df89-4a47-b95a-757ec60a65d8"
+ "ID": "079322e1-6a96-44f0-85f7-e9f3653bb39b"
}
]
},
@@ -589,7 +412,7 @@
}
]
},
- "ID": "481376a7-399a-490e-a721-f7a9305de4d9"
+ "ID": "8c6efedc-056f-4c6b-8967-93250e5375fe"
}
]
},
@@ -597,7 +420,7 @@
}
]
},
- "ID": "6c9bd8df-6deb-4f1b-8e50-b926bf16b27a"
+ "ID": "d3fddcda-623a-41f8-aa50-41633a67a100"
}
]
},
diff --git a/image/项目图标/发布.svg b/image/项目图标/发布.svg
new file mode 100644
index 00000000..0fc132d8
--- /dev/null
+++ b/image/项目图标/发布.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/项目图标/名片,角色,用户信息,岗位维护_jurassic.svg b/image/项目图标/名片,角色,用户信息,岗位维护_jurassic.svg
new file mode 100644
index 00000000..0decf193
--- /dev/null
+++ b/image/项目图标/名片,角色,用户信息,岗位维护_jurassic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/项目图标/操作-发放审批.svg b/image/项目图标/操作-发放审批.svg
new file mode 100644
index 00000000..67ae4865
--- /dev/null
+++ b/image/项目图标/操作-发放审批.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/项目图标/视频会议.svg b/image/项目图标/视频会议.svg
new file mode 100644
index 00000000..1953f364
--- /dev/null
+++ b/image/项目图标/视频会议.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/项目图标/视频会议2.svg b/image/项目图标/视频会议2.svg
new file mode 100644
index 00000000..56dd8185
--- /dev/null
+++ b/image/项目图标/视频会议2.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/项目图标/视频会议3.svg b/image/项目图标/视频会议3.svg
new file mode 100644
index 00000000..b7cebe63
--- /dev/null
+++ b/image/项目图标/视频会议3.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/项目图标/邀请.svg b/image/项目图标/邀请.svg
new file mode 100644
index 00000000..886fafad
--- /dev/null
+++ b/image/项目图标/邀请.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/项目图标/预算申请.svg b/image/项目图标/预算申请.svg
new file mode 100644
index 00000000..090c0d17
--- /dev/null
+++ b/image/项目图标/预算申请.svg
@@ -0,0 +1 @@
+
\ No newline at end of file