diff --git a/.collaboration b/.collaboration
index 68053ae4..317eef84 100644
--- a/.collaboration
+++ b/.collaboration
@@ -257,16 +257,7 @@
},
{
"ModuleName": "Table/汇报记录表",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T14:37:39.6646791+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\汇报\\汇报记录表.json"
- ]
+ "ModuleType": 7
},
{
"ModuleName": "Table/汇报子表",
@@ -831,17 +822,7 @@
},
{
"ModuleName": "PCPage/汇报管理",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T14:14:00.6609463+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\汇报\\汇报管理.json",
- "Pages\\汇报\\汇报管理.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "Pages/汇报/项目周报",
@@ -851,90 +832,21 @@
"ModuleName": "PCPage/项目周报详情",
"ModuleType": 1
},
- {
- "ModuleName": "Pages/汇报/日报",
- "State": 2,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T15:23:47.3436311+08:00",
- "ModuleType": 6,
- "ToRemoveFiles": [
- "Pages\\汇报\\日报"
- ]
- },
- {
- "ModuleName": "PCPage/日报首页",
- "State": 2,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T14:14:00.6604429+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\汇报\\日报\\日报首页.json",
- "Pages\\汇报\\日报\\日报首页.rd"
- ]
- },
{
"ModuleName": "PCPage/汇报详情",
- "State": 4,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T15:23:47.3442733+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\汇报\\日报\\汇报详情.json",
- "Pages\\汇报\\日报\\汇报详情.rd",
- "Pages\\484d3ed119274a60bf32f15d178cf60.json",
- "Pages\\484d3ed119274a60bf32f15d178cf60.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/汇报详情预览",
- "State": 4,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T15:23:47.3443094+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\汇报\\日报\\汇报详情预览.json",
- "Pages\\汇报\\日报\\汇报详情预览.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/导入汇报数据",
- "State": 4,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T15:23:47.3443935+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\汇报\\日报\\导入汇报数据.json",
- "Pages\\汇报\\日报\\导入汇报数据.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/日报助手",
- "State": 4,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T15:23:47.3444399+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\汇报\\日报\\日报助手.json",
- "Pages\\汇报\\日报\\日报助手.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "Pages/工时",
@@ -1282,20 +1194,7 @@
},
{
"ModuleName": "Theme",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T15:09:33.97482+08:00",
- "ModuleType": 9,
- "ToRemoveFiles": [
- "Theme\\CellTypeStyles",
- "Theme\\ListViewStyles",
- "Theme\\StyleDefaultNames",
- "Theme\\ThemeConfig",
- "Reports\\DefaultTheme.rdlx-theme"
- ]
+ "ModuleType": 9
},
{
"ModuleName": "image/内置图片",
@@ -1639,19 +1538,7 @@
},
{
"ModuleName": "CustomLibrary",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T14:47:05.1337809+08:00",
- "ModuleType": 12,
- "ToRemoveFiles": [
- "CustomLibraries.json",
- "UserFile\\BaseCss.css",
- "UserFile\\CustomFormula.js",
- "UserFile\\echart.js"
- ]
+ "ModuleType": 12
},
{
"ModuleName": "MapJsonFile",
@@ -1671,44 +1558,7 @@
},
{
"ModuleName": "Plugin",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T15:39:04.9259303+08:00",
- "ModuleType": 40,
- "ToRemoveFiles": [
- "Plugin\\Echarts图表-10_0_3_0.zip",
- "Plugin\\Editormd-6_0_102_0.zip",
- "Plugin\\Forguncy.CustomMenu.zip",
- "Plugin\\Forguncy.PassListviewDataCommand.zip",
- "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip",
- "Plugin\\JSON数据源-10_0_2_0.zip",
- "Plugin\\LottiePlayer.zip",
- "Plugin\\Notiflix-9_0_103_0.zip",
- "Plugin\\OPENAIFORGUNCY.zip",
- "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip",
- "Plugin\\SqlServerWrapper.zip",
- "Plugin\\Tiny富文本编辑器-10_0_2_0.zip",
- "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip",
- "Plugin\\加载动画-10_0_2_0.zip",
- "Plugin\\发送HTTP请求命令-10_0_2_0.zip",
- "Plugin\\增强关闭页面-9_0_6.zip",
- "Plugin\\复制到剪贴板-7_0_3_0.zip",
- "Plugin\\客户端缓存操作工具库-8_0_0_0.zip",
- "Plugin\\富文本编辑器-10_0_2_0.zip",
- "Plugin\\对象与集合操作工具-8_0_0_0.zip",
- "Plugin\\异步运行命令-9_0_103_0.zip",
- "Plugin\\支持预览的附件上传-10_0_2_0.zip",
- "Plugin\\服务端缓存操作工具库-8_0_3_0.zip",
- "Plugin\\模板引擎操作库-9_0_103_0.zip",
- "Plugin\\甘特图-10_0_2_0.zip",
- "Plugin\\用户管理命令 V2-10_0_2_0.zip",
- "Plugin\\网络操作库-9_0_102_0.zip",
- "Plugin\\设置当前行命令-10_0_2_0.zip",
- "Plugin\\设置焦点命令-10_0_2_0.zip"
- ]
+ "ModuleType": 40
},
{
"ModuleName": "PublishSetting",
@@ -1764,30 +1614,11 @@
},
{
"ModuleName": "PCPage/日报详情",
- "State": 4,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T15:23:47.3445638+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\汇报\\日报\\日报详情.json",
- "Pages\\汇报\\日报\\日报详情.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "ServerCommandPrivate/单日自动生成工作日报",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T15:31:01.5530192+08:00",
- "ModuleType": 27,
- "ToRemoveFiles": [
- "ServerCommands\\汇报\\单日自动生成工作日报.json"
- ]
+ "ModuleType": 27
},
{
"ModuleName": "ServerCommands/Gitee",
@@ -1955,102 +1786,42 @@
},
{
"ModuleName": "PCPage/个人日报列表",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T15:23:47.3437946+08:00",
"ModuleType": 1
},
{
"ModuleName": "UserControlPage/折叠卡片",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T15:09:33.9750145+08:00",
"ModuleType": 31
},
{
"ModuleName": "Image/禁止查看.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T14:20:11.8904022+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/查看.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T14:20:11.8904259+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/左箭头.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T14:20:11.890428+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/右箭头.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T14:20:11.8904306+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/向上箭头.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T14:22:03.9714189+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/向下箭头.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T14:22:03.9714213+08:00",
"ModuleType": 38
},
{
"ModuleName": "Pages/汇报/个人周报",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T15:23:39.1044871+08:00",
"ModuleType": 6
},
{
"ModuleName": "Pages/汇报/个人日报",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-15T15:23:47.3436358+08:00",
"ModuleType": 6
}
]
\ No newline at end of file
diff --git a/Pages/3609617039444daea57da1978344c4f.json b/Pages/3609617039444daea57da1978344c4f.json
new file mode 100644
index 00000000..0317b296
--- /dev/null
+++ b/Pages/3609617039444daea57da1978344c4f.json
@@ -0,0 +1,207 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 5.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 53.0,
+ "Mode": 1
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 5.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0,
+ "IsHidden": true
+ }
+ }
+ },
+ "InLogicalVisibleIndexes": [
+ 3
+ ],
+ "Count": 4,
+ "DefaultSize": 5.0
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 16.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "13": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "14": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 16.0
+ }
+ }
+ },
+ "Count": 15,
+ "DefaultSize": 32.0
+ },
+ "AttachInfos": {
+ "1,1": {
+ "CellType": {
+ "$type": "Forguncy.UserControlPageCellType, ServerDesignerCommon",
+ "UserControlPageName": "折叠卡片",
+ "CommandHandlers": [
+ {
+ "CommandName": "编辑按钮被点击",
+ "Commands": {
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "PageName": "日报详情",
+ "LoadBindingDataOption": 1
+ }
+ ],
+ "ParamProperties": {}
+ }
+ },
+ {
+ "CommandName": "删除按钮被点击",
+ "Commands": {
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "汇报记录表",
+ "UpdateType": "delete",
+ "ShowConfirm": true,
+ "ConfirmText": "您确定要删除吗？",
+ "RowsToUpdate": 1,
+ "RowsToUpdateCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "汇报记录表",
+ "ColumnName": "ID",
+ "GUID": "a1a1d0a7-6f71-4ef3-87ed-2633565a1b1f"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='3609617039444daea57da1978344c4f'!B2"
+ }
+ }
+ }
+ ],
+ "ParamProperties": {}
+ }
+ }
+ ],
+ "PropertyValues": [
+ {
+ "Name": "标题",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=TEXT('3609617039444daea57da1978344c4f'!D4,\"yyyy年mm月d日\")"
+ }
+ },
+ {
+ "Name": "标签",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='3609617039444daea57da1978344c4f'!J4&\"小时\""
+ }
+ },
+ {
+ "Name": "内容",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='3609617039444daea57da1978344c4f'!H4"
+ }
+ },
+ {
+ "Name": "日期",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='3609617039444daea57da1978344c4f'!D4"
+ }
+ },
+ {
+ "Name": "用户名",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='3609617039444daea57da1978344c4f'!L4"
+ }
+ },
+ {
+ "Name": "姓名",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='3609617039444daea57da1978344c4f'!F4"
+ }
+ }
+ ]
+ },
+ "TemplateCellSource": "ID"
+ },
+ "3,1": {
+ "TemplateCellSource": "ID"
+ },
+ "3,3": {
+ "TemplateCellSource": "开始日期"
+ },
+ "3,5": {
+ "TemplateCellSource": "汇报人姓名"
+ },
+ "3,7": {
+ "TemplateCellSource": "内容"
+ },
+ "3,9": {
+ "TemplateCellSource": "总工时"
+ },
+ "3,11": {
+ "TemplateCellSource": "汇报人"
+ }
+ },
+ "StyleDatas": {
+ "Types": {
+ "Strs": [
+ "Body"
+ ]
+ },
+ "SheetStyle": {
+ "FontFamily": 0
+ }
+ },
+ "Spans": [
+ "3,1,1,2",
+ "3,3,1,2",
+ "3,5,1,2",
+ "3,7,1,2",
+ "3,9,1,2",
+ "3,11,1,2",
+ "1,1,1,13"
+ ],
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon",
+ "ParentPageName": "个人日报列表"
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ }
+}//+4TlKjeVbO7xIMvbn4Xki3HzuKSrW3KO4OrrMd0UdMDALd+tG0H0tNMifyZxcaKsmNgga9CE86EOzCoePB0/0AGXOxJwmTr5GHqNPvT8RalD9PauHpJiVrdbp3Y3HokGAQOiQhOcCeKxTS2khHtGgQFdXECsIOEuGewcufKzOg/JiHWnA3ya7so2QzMWkDpLzgrz+WVWBLHD/Zg+LVjIf+cdMhc/WonGVWK6PNwzduZRrXOE8IjRfcyNJwjWlZPjY+D8nSG2Rs3SK+IDd06r/qHwX47zBgOgOTdVGppHZN5EFGgKpQp8PRsDxzkXYyGmV6TnlCkBu1ez5qm8Z8NTWwOPVlBGngDtRvzSdz6LbD+E6ayBvkTGYHiuRY11jiwD2gAREMCZofYK0JMWr4t0tNQDWrr9eApvDEfQTPrveLYdJiG4uQeHIJJU49MYlFDzZvfHAIBKxBP9nv9mJamfpU0ew1XF/u6YDqoTuAfGo12jA0fLtTyZ2BQMEBcE2S+Y84m0HDy/fDlGCM3/tAqCA/c1OoGTsnKJE0eeLpaFHbdSz178EARquXf6b7yPWixRJ5UKY/VuFPg6mOfQR6mEw1alrIcAktEPTFDURnTXdq/hRN8PU4LY29SlnYyCR68X8TB2d1HX88XiWSns/bf3Ct4xtCot+ArAh0UbNDZ5A3v9uqL34YZlQinJXSLGe54v+zh0tjjSRganB3OO9IyNBUgzK416AQBkVMHDS68u/lj5a3Hsk9inXkcjPNx+3duXq504EvGW13b2WRV7ApnhPM5zfVO75ts7Vc1ELvAXutGZ43sPLDFFsz0kRHfq+Tnwn5LxgJsItsIl11/ptqhd2lSDfg+jcEGr3BzQQ1jtHFvKHIaJKoPKa5VDiJpJK+sXNe0GTq1yeRh6DvCRi+63VQ==|920
\ No newline at end of file
diff --git a/Pages/3609617039444daea57da1978344c4f.rd b/Pages/3609617039444daea57da1978344c4f.rd
new file mode 100644
index 00000000..f4415e35
--- /dev/null
+++ b/Pages/3609617039444daea57da1978344c4f.rd
@@ -0,0 +1,5 @@
+{
+ "PageType": 2,
+ "ColumnCount": 15,
+ "RowCount": 4
+}
\ No newline at end of file
diff --git a/Pages/484d3ed119274a60bf32f15d178cf60.json b/Pages/484d3ed119274a60bf32f15d178cf60.json
index f20926a0..3f188087 100644
--- a/Pages/484d3ed119274a60bf32f15d178cf60.json
+++ b/Pages/484d3ed119274a60bf32f15d178cf60.json
@@ -227,7 +227,7 @@
"ShowConfirm": false
}
],
- "ID": "e5bff3ee-1cea-49aa-aa0d-7707cbfc617c"
+ "ID": "2a82b5c2-3866-4d39-9c00-e00e71aa230d"
}
]
}
@@ -762,7 +762,7 @@
"ShowConfirm": false
}
],
- "ID": "6c308cc8-8acd-4d4e-9da7-f65ea35a90e7"
+ "ID": "5b00cc12-0b84-4a8b-a96d-065450d1db15"
}
]
}
@@ -849,7 +849,7 @@
"MethodName": "ExecuteCommand"
}
],
- "ID": "7dcd2edb-413e-40e2-a3b9-a5c7f8bf1b0b"
+ "ID": "44e71673-4471-43c6-85c0-2d172aa6f0f3"
},
{
"CommandList": [
@@ -863,7 +863,7 @@
"MethodName": "ExecuteCommand"
}
],
- "ID": "8702785b-825a-4538-8a68-872400e56678"
+ "ID": "2789fa3d-73b7-40d1-b663-19a0b5fa7b42"
}
]
}
@@ -1114,4 +1114,4 @@
"PaperSize": {},
"Margin": {}
}
-}//uZiKsICT813G5FsW/FT5KEl57XGlHP4vHZMDazuox0h1sJGyC5Zm8Fu73LeKDkp4Dbror2s7D2gsl80O8DAJXLQHGY7qcQDPSILT3kphfnJ/5Jxq+5vgK5sHspVoJCIdzuzvRzTqMBoGYhUbnRdqhiQ4HB5YdZLCgxvLPrU8uGwBrsg2I90vo73AC/uPJ2Xp4f27Ju23kZ+AsFmdhG7ooK4z48eKN54blGqYAOnExs36VMMka4wULnsYYp5Uk07RbLqQwDGe3hCIWviG+2QRNFlnDs64a3ENfLIfoEY2e4B9LPzAtk7INFcRdeNu2hAZR4DYN4D9cM1M+ATVb9janlY8W0vCBRMWiJlnO5DKm7HeGGehdEbV8yc48iy9k/MKwLqIt5CJeu3zA0w8/zoV+hW3z1HyD/NlVhVkd6zuOzaj9RuCjsNkY7X08lM4i8Rr6EqH4sxKB6HpD6gA5JQmVl9ma7exzL4mhj1/pM0vC2PzOf9akgQ7U5EQpfXPPm8Ng4xEzqHahQaXOfN1xZsUr8WNYviWmlZPshExJpixEGVxyR93Wc2vX62Y6/RfkOqC1vUnQWmSbGz9uUts1+B4tpqgq4fO1Ll94w0X8MG+ZX0wagZC2b9PVsKXMsloLGqzk7TBLp7snsQYTTTiDAjWfEmSEmACGTxuZcKPtZT36VO3qStpJniuKFe6w/QQz6PZmVlKidOQjUTQFqJs1gpCTICbb1+yVFwy14Qf3gzY/hdQkF7LRYOGNkgmYEKuAm21M7BhsQnO5Etmx7eFB6NILAm7L6cMYw/4NiTEhTc12/tT2ILOBeLCxQcxtzXiLBmTiwevc62/h/iRDQD8BaEMEfW8Y14GFguVkDdsNKwZVihl0wqJTlllXLO8o1jC13ntMBAPdAOAoSZ+3MWDIRHoyw==|920
\ No newline at end of file
+}//LXA0Gu6lspDOT8cbQVRERMUTNRAHK3M+rXhTmZfBOiQ19EDVJcMVvVsnu1thHWRv484S21mVc6worQBK0LLFSYEt8Iv+88p1MzqrbKE7fSoR8b2+XBa2UHjt7YJJ59MfwLvVNY0sRZAi3mRLjogXakJbRJBzEj7Ghir/MfCf+7CJZfMKrapjRkQAlqnGube0E8Qx1XjqLzN5tfgOCsNJ4DfuR1EczoJIB38sdJC/iIar7b+nhAVfMlitfZ0bOMg34UtJNbxLv4JNaTiqAHBZYbvZCQLoSrTCxIvZlxogC9BRof6jPHgKdgwD6z7bmUuMKDxJS/wn431hv0lt7AN4psqY4JXw1ipH/YLyw22GGYyynFKA5E+QwgFMtmEOeO2ZUN5rCN1Xzm0n/lW6x5PR5vZDBGoZf2Ax2cQQmSdo+5uXycLAluN8VlGm0DXeQAKxv+Kj27NZ5kO+IeDPS0oIpqbiJ05jVBMrWv2PHROzHGDHysw2xli+xvn15mSEKQHlLqSHGHN5WN+zU4yUHJpt9LSs4iO3LAEdVK8kDWFIHZD1OsIdbbDRCHZLHpJw8bev232HzhSOiyO33rG5AP4/AVZi+IFNz4jqbVy1TkU7PzdyY0Zd/zJ+4VoYkchIAxYgDhrz4YZ8GnD45z/B0or0WOsO57EaHRjwgnTmwQVZp2HLpRP/e1PIrbIKO7zo6Qqothz2dGeo8ZlirOBrNKD4iDd1TxUM6mem0l4jUP5xzQMetHYn4IMBMQKKAtiYt7GQXeUvmOnEDOH32/eq+rq4BbZ01MISa58/R2BCJvsa8uUBzCZOJpTUAcdtGK04uivXTiE7RfsimNnDET7S6bm/yW5BmpMIsdNFG7kJqkpe6VbtJZbKGiQt+1dgl7CbZq8he3fzBuRA+KLXh6PX8dUxFA==|920
\ No newline at end of file
diff --git a/Pages/汇报/个人日报/个人日报列表.json b/Pages/汇报/个人日报/个人日报列表.json
new file mode 100644
index 00000000..01fbcfb3
--- /dev/null
+++ b/Pages/汇报/个人日报/个人日报列表.json
@@ -0,0 +1,357 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 523.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "IsHidden": true
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "IsHidden": true
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "IsHidden": true
+ }
+ }
+ },
+ "InLogicalVisibleIndexes": [
+ 1,
+ 2,
+ 3
+ ],
+ "Count": 4,
+ "DefaultSize": 32.0
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "7": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "8": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "9": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "10": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "11": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "12": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "13": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "14": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "15": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "16": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "17": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "18": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "19": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "20": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "21": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "22": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "23": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "24": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "25": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "26": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "27": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "28": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "29": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "30": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ }
+ },
+ "Count": 31,
+ "DefaultSize": 32.0
+ },
+ "AttachInfos": {
+ "0,0": {
+ "CellType": {
+ "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon",
+ "TemplatePageName": "3609617039444daea57da1978344c4f",
+ "DataSourceType": 1,
+ "DataSource": {
+ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+ "TableName": "汇报记录表",
+ "BindingInfos": [
+ {
+ "GUID": "7e9e912f-1c75-45a6-a66a-5fa3917ccad1",
+ "BindingInfo": {
+ "TableName": "汇报记录表",
+ "ColumnName": "ID",
+ "GUID": "1cb7cf92-b338-4467-b2e0-8d06669751eb"
+ },
+ "ColumnName": "ID"
+ },
+ {
+ "GUID": "b44ac180-493c-4664-8272-26421d621883",
+ "BindingInfo": {
+ "TableName": "汇报记录表",
+ "ColumnName": "开始日期",
+ "GUID": "11f6b92b-155d-459f-965e-a474b387bba1"
+ },
+ "ColumnName": "开始日期"
+ },
+ {
+ "GUID": "df8f2578-5d1b-46dc-a811-1d7cb993382e",
+ "BindingInfo": {
+ "TableName": "汇报记录表",
+ "ColumnName": "汇报人",
+ "GUID": "7905da3d-488e-4ddb-86b3-561a47bfd6cd",
+ "AttachType": {
+ "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
+ "UserColumnAttachType": 1
+ }
+ },
+ "ColumnName": "汇报人姓名"
+ },
+ {
+ "GUID": "c91b791c-e644-4284-aeeb-f32fe2fa56bb",
+ "BindingInfo": {
+ "TableName": "汇报记录表",
+ "ColumnName": "汇报人",
+ "GUID": "2cfdf1e5-f388-4477-b06b-81df137a5e31"
+ },
+ "ColumnName": "汇报人"
+ },
+ {
+ "GUID": "371331a4-3245-4ee9-b56a-1490ff37682c",
+ "BindingInfo": {
+ "TableName": "汇报记录表",
+ "ColumnName": "内容",
+ "GUID": "f1b973d3-9ff2-474d-8710-f4f059000bf8"
+ },
+ "ColumnName": "内容"
+ },
+ {
+ "GUID": "6729b996-9822-40df-8552-41f9111636cf",
+ "BindingInfo": {
+ "TableName": "汇报记录表",
+ "ColumnName": "总工时",
+ "GUID": "a6e09f94-3b6f-4c1c-bbda-7ee5ec121e53"
+ },
+ "ColumnName": "总工时"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "汇报记录表",
+ "ColumnName": "汇报类型",
+ "GUID": "c224fc66-d0bd-4914-8996-f8a31bc70e09"
+ },
+ "Value": "日报"
+ },
+ "IsListviewDataSource": true,
+ "CustomColumns": []
+ },
+ "DataSourceListviewName": "图文列表表格1",
+ "IsLoadOnDemand": true
+ }
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "FontFamily": 0,
+ "HorizontalAlignment": 1
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Body",
+ "Center"
+ ]
+ },
+ "CellStyles": {
+ "0,0": 0
+ },
+ "SheetStyle": {
+ "FontFamily": 0
+ }
+ },
+ "Spans": [
+ "0,0,1,31"
+ ],
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+ "Title": "个人日报",
+ "PageLoadedCommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+ "FunctionName": "remove",
+ "Title": "加载中"
+ }
+ ],
+ "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": "个人日报列表!$A$1"
+ }
+ ]
+}//X63lVnKrDzwbDnW/pqEG2pAAJZHMCP7Z8Hz5Dbl7u1Cp9ioWnYytSuv6p6ShR72ji9UBMNiCzXUIC3GQ9yaRoQ3yGVUrMgHUFcZIRp35YquhIGyxOXVgugzl3K4Igitqw1id19HS9tRsbSUkJ7T+E+UM86W8gMC9PFR8A5+9M/NLTJgci9GaaozLYLzMI1oweEM88YNL4mQRL6nQck4VV7u974iWyrDEPxaPQBYYCyhTA4FOd6SFN4dnmgE97qkt6YyfynXbnfU7DyIs9p/mNoeet+s7AVlwd3tY8qKZpFiEpzSxJa7Hq8tPnHNEj5nIqXpmlEyamb7uHrjBKH3p9N8bixHR6esQ2LXl7XMo9j8dPathtj2fnbdJXjhmAGUjP2xn8w0Yja+h0254De78SwshgxMsyEH7ea/f3e8GRTsaoA7J4pAILteX9yw/XuA642qjFXL8yqgZzW0TAEs0frTfN/ivuTVIYsFiI7mxYhMgnRQU8A3Lg9fflBmHQjZI3zU3icBADxekORCgP/fJjgVfck6tZL2ZgW09cXbs43OjiwASh2h9y2A887Z1VoQrFG/lgz6aEx9r8/7Rtzq8320irw27Li1Uyp5aHD6QyDU7WkM3BkuLiPV2ice2i1cMsP6PQgPshXIHypLdAZIPf8NrcFAWWVnZe3TIbv5Qm4MukbPMiK5spa5eKXM6avmMGjGl854DoTeEIiuHvHrQ+KfX9ZQuDCJUU71XJ5eivVion2FFRlE1qsiGtLu2WGkBA7/FzYDqIKQKl0X/4JuFKHVMtIBBaNIKVSrhKzbbW16hTYrVMeolraMgfXMy4ZFb3JbNfxIipiogSYQFuuwcoSdRz77O365ExsKkXSSGV1ZPUBVW1eOE/zkqkaUYVgo1R1VFW9M/IHUblzF0PtDQxQ==|920
\ No newline at end of file
diff --git a/Pages/汇报/日报/日报首页.rd b/Pages/汇报/个人日报/个人日报列表.rd
similarity index 63%
rename from Pages/汇报/日报/日报首页.rd
rename to Pages/汇报/个人日报/个人日报列表.rd
index 8236a71d..7150edac 100644
--- a/Pages/汇报/日报/日报首页.rd
+++ b/Pages/汇报/个人日报/个人日报列表.rd
@@ -1,11 +1,11 @@
-{
- "PageType": 0,
- "ColumnCount": 31,
- "RowCount": 12,
- "CustomNames": [
- {
- "Name": "个人日报表格",
- "Formula": "日报首页!$B$2"
- }
- ]
+{
+ "PageType": 0,
+ "ColumnCount": 31,
+ "RowCount": 4,
+ "CustomNames": [
+ {
+ "Name": "个人日报表格",
+ "Formula": "个人日报列表!$A$1"
+ }
+ ]
}
\ No newline at end of file
diff --git a/Pages/汇报/日报/导入汇报数据.json b/Pages/汇报/个人日报/导入汇报数据.json
similarity index 94%
rename from Pages/汇报/日报/导入汇报数据.json
rename to Pages/汇报/个人日报/导入汇报数据.json
index b71aa6ce..4afaa030 100644
--- a/Pages/汇报/日报/导入汇报数据.json
+++ b/Pages/汇报/个人日报/导入汇报数据.json
@@ -348,7 +348,7 @@
"$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon"
}
],
- "ID": "960bc5a5-99ca-4b8a-9b9f-9d00dc89397b"
+ "ID": "1316fff2-aa4a-44e6-85a9-1b39c24b1d9d"
},
{
"CommandList": [
@@ -358,7 +358,7 @@
"Message": "请至少选择一行进行导入"
}
],
- "ID": "2fb768da-ff5a-4a0e-85a4-b43669b5b090"
+ "ID": "d7216205-44e6-4d67-ae12-2585882a40e7"
}
]
}
@@ -484,7 +484,7 @@
"BindingInfo": {
"TableName": "成员计划内容合并视图",
"ColumnName": "任务ID",
- "GUID": "879bb0cb-a1a5-447f-9df9-44f5241c1d85"
+ "GUID": "598cb1e6-4a51-461f-aead-fb0c65ef626a"
},
"CellType": {
"$type": "Forguncy.DropDownListCellType, ServerDesignerCommon",
@@ -686,4 +686,4 @@
"Formula": "导入汇报数据!$D$2"
}
]
-}//QqTF2CrEzFQP5Q7ePc66nLz+j9DcZa6ED6EHkwpFLlbowt/9NxneUQsg86AFFEBl4HwrRDPwRY5FawujzXvMJrN2MNH+bCIggXUaaRrhRGPCM2Cd2eJ1Ejd7u7r9nzHSelbklHI1UrU8AlXdnLEnIJqfw1x4EnlP3KCHgdBMs102mDhWoZ7Wrn9B56C3wScaGD55V/RNFvl9/gRsktD+o6ktwW7m3srJG5ty8N/tnYvaf08C9KdG1CpqkaHmxZZLSnX0briE73Of6teCK13Y3D241yrscvJwt/Aa3Ig9sUJO4XAOJ8L4yG63CY3cs8BiSOk3SsfJAFt3nvOAm/W2Bh9N48VcVU5wzXJTXppSiSgZDBhwclBtkftzacvX4W8/XQwEnITcgKSROJdXukEAyTKltUVSt1mH1tf+/c5hsGDdYE3jrCkXM/h6H/2mOxo6zQUattEamnzumTP0p+lFs75EKVvJWFuZo0G43X9JGsv1BxOpQvJb+Rg8gEDYSYUKsb2aXvYFUL3tjltzCCLXlbCVVuc7iuevDwWJ73HZhjRDKP7PKnPuzcPU4xzzZpWWp7czf9LqqM7K5CjkOZwHR5oXTPcJh75WsTxwbcdTgz9VBFPB26lJYz1BdWQVuU6f1ppYwi9QCDmHZ96Hl+8xG7lervrjK4Nb1XbKhmkKqYLvXGL9jJ10/wz2GH+7+yJu/LZVZw5/kG/0h+S7v4l0i6vs5zfV2itmTpXuEGSZ0QoUwnHfu5baE0ItjMF0Q3XWRSKaB1923wZm4djFzMWrJ9lYmdxnj++YYGFaeeORyUKlQUIiRaIoAVTrZEryAxFhuVElCjdw9drzvb1fl7nZcNR5QHwyIo6v7tJapvceNaxrBvAwGemJZGih1qGxSLTT8xqxQpDzg2fjOCLOUTBc9g==|920
\ No newline at end of file
+}//Va6GknDlKc/apAqDsrjY9DqGA8GnoCMD+iaIAsfitcnR4EBIyHT2ywZXN+6vPEUdvpU9TEZJ1D6hYr7WzJ8jjHzig/GwZwQddeivXMeQMsECb++oTMn7yuyFkhaaz/NaHiBrkZHvIoXk0Bp1sNP3k2lUDpNFV9W4APv8R+UEwCHwzi1vJlUuEBXOgzrNWY3UdEsjUj6x8TnedHO8wFm4nHOq+TZQPKh5HVrLit1UT26D9xslae5g9aqar9Bb1xMFhCsWSjUGtwYMaovCJqNT8GgHf05wX63/4jG4VloZf8LW+mtakymPOtHYX7cK3h4R94azsixn73ZACd3fQBHEWjkHzuHp8s0kM7NyfvDLVSD0K/Xtzng72UgUce+YX2nAyf/yBUMWKdhOReNOcopYc1OrUoVNYrGO4unb2siRw8gI8UfcIPK5zJ9VeQ7baI8DE7PO5mQat/rkRhQD96KOCmJwfpUFIXX2T2PWmqNmMUH1bf0GQO622hWVrPWmmTR/pdviUbqMO5J2rmassk3Yinn9CNZCKhWYzDip1Vj8/SR5VzQWtgE8PLKTrRwVmN/XUXoYsm/3nfJx11oN+IkJU56Pw3P5TseMz+W+mC1Qs2OB/VCp3U9eScA/P4XOcmF5AOJ+WoSwz/0aCyHR46g2dPnojZVTc2C4eayvhlDxmXJpGnVPfXhkDttU2ekpGDygeI3HsV1a7yYPRkUA+zCKTzdYGtS+44hEgJOayfhuaUXwLrA4RXiYA90SpfnIQwL4Rc+tJhNXlOS3TDGCoVTmdbJFBYFoIldaONttmaZ17ieYr+okHvgnu81lTEsVre2q9TaQOi4Uz5gm2MpAWCDjKI7O4Fo4SsFaRurC0t6azLARa1zforAAhrmCLbwH0vkzdJD+N3GwPakbLM9brUWhgg==|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
similarity index 94%
rename from Pages/汇报/日报/日报助手.json
rename to Pages/汇报/个人日报/日报助手.json
index 2b8c4a52..4522f956 100644
--- a/Pages/汇报/日报/日报助手.json
+++ b/Pages/汇报/个人日报/日报助手.json
@@ -374,7 +374,7 @@
}
}
],
- "ID": "c8b1727c-4611-444a-8e30-e67f8fa62a87"
+ "ID": "fb74bd5e-9c35-4dff-9723-38eb300c4a38"
},
{
"CommandList": [
@@ -389,12 +389,12 @@
"BtnText": "知道了"
}
],
- "ID": "d11e7046-9a5d-4ebf-8124-a16e1371ec7c"
+ "ID": "127b6d10-61e0-42b1-980e-3a4f896dcfd5"
}
]
}
],
- "ID": "7792079a-cf25-4d36-ae09-4f043ada5c19"
+ "ID": "3574b7dc-9052-4cad-a078-36b17c4e186a"
},
{
"CommandList": [
@@ -409,7 +409,7 @@
"BtnText": "知道了"
}
],
- "ID": "183e2298-b5e7-4f33-824a-959104b28678"
+ "ID": "ed20939c-3e86-48e9-b66f-71124b6c62b8"
}
]
},
@@ -627,4 +627,4 @@
"Formula": "日报助手!$G$20"
}
]
-}//KOtZozQTpn/7Z2TBiIyiuvNtHqn1/Hzv0fpwQtAEvCw747lbFeGjQp3kGwhp0inXjDcx06wBur2Kr8VFa4jzQskhp1nIOKPtz4S3VqiFDKV1khbFA57fjU6YzXBHbAEQKbPCvHJ5yFb4L9iID+YUAEqT8sSZNrvOFx+bTNwP/aFEhUC4TIq5ydp/j/fh84PlXlP/FyRdHkQjq0Tf/1FP7pblwsgK5AKvpsM/iX2A5NqDm69qn7Xml60QdtLZUGRFiQIR4Soi6ZyeFfz4ziLG3fq1rHZnaSgJYXDkESoMwF7iZTULZ3l8RT6JQNsN4JyCd55KvbkLnVWbEBcqJDZNe65x3Ag8Zykx9qNjHvVykCf3F9WkBBjnBn+FE5DYBU9SS1d+khK4FCgEHhQv3GdhAsePdCwGEYeNKlF7DKXUYe6VGXSzuKgJLiQiRmUWmmPhkHnc1mnhvoMWyqIoq0wnTnBEJr3QfywsyYPPaHS422AlUNvA7wI71NgPMvCDILUMQfrNaiEfVr2i/WaaWxQiLzkdX3qiTuTbEaZ91gkonASNGxfiR9IujPZ6fjAWVltLKV7D9t72RVbPD1ClbfltBA/fUF93GTCD33VcyS8IhgXmjz2Y3hjlXdX33qJjnmRABCXD6rW0cfICMYW7NF3zvulP37E4cTJMwiWsuJl5fjwlvjNYtj+OnPtNMouU5rRen5b1EBJkQeUMTldpsF1QqpK4lKaBVTu13Aamg8jazw/RJxZVb+3jtKe+DJXK7+mCPwxChJqO1zneBsSj3+WPNrvPkddUa8MyhRvHyznmjQTZKRWeR8W/QTr8y0agtwCOt5UrJ14cWfRUKOfufXAFz2ZrkY6YzDxRgxQK1b6nRRM4ZaG+gzYAV3PA0xk6asBXtVAASAZRdEX4UWKZx4qcLg==|920
\ No newline at end of file
+}//PCWh2e41lPk9F6RoAwqqRn8DWWMQkWMBJuyVWLITPmTPkTHUZ4uJ+zHrj/ECkj4iXPl6gbkH05BMpviUNMtnwNhlaZFQOrFC3EVms7lGAnEShGEl/igCnEKxhkk6hv+NRwEqWI/otzIZ6UsY6rpcy/Uf6PCkUFVkRin9o7F95S3wD/G63OftwaOOYDcDNhxjLidsHnUKMDeegV31ezZd0dz7pYw63AKjRNyK1Stp7AmX6/g9RsX2RYmC+VBuQtyzt2SLAclDwfP6HYskLclLtA//XzUIB73eJqV0Ao0wXx2f3lhavntPPxGfQuveGrp7x/vXZg6SPFgWQ9U9pn7tLc6zjvNf1mpebE459JSnzdP/po2xmy98EwD3hqK2vOBEb9SIg0NrTPAP+gJoL9Z4t4f3Yrlg8F/GrgWnqIxlSw8a3OOmFOXFE+kiN3vzMcQeSIjmVcPAZyuApw4qrcLq7sJM9PUnXrI6m0V43sUO0GT8fW0gI5f9UF+W2mj71AIqz9fvm2bBzpZ/Q41f7RLMgzNhkMTVGU39AP/bWXGHFBGYPXLfe/3FOez/udJUKpQqKCLhAsf58N8wbV2LDCJK0+aAGffUnl7munjZjQ/woEkRviI3MvpYJPRPWe1ntLzZJh1E97W1QwU7qKJtzHZ5DBu/9cJE8NdWu5C/Hsbw8SCoeK5JB8T338havfA2SdCzhbDWv89JlvZrSOdt+/zW3WsdoPhMEwEGlmwsJLosdqDnj/thB/fMhXx96/EYh05XKqYGivDGr/ry+DI6EpOnG2UR6mnm4WI/3sIkusV7TG0VKOJvgUatNRLYh6+ernSPCdwRScY1WfanBnS8kAs//IDPpDL9DZo7ul1bawbSpcCxc+6Gop5FHDNURZdN/eTMoDnQedAszWt9FxBt8vfaMg==|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
similarity index 69%
rename from Pages/汇报/日报/日报详情.json
rename to Pages/汇报/个人日报/日报详情.json
index 5d12af88..0e8a67e4 100644
--- a/Pages/汇报/日报/日报详情.json
+++ b/Pages/汇报/个人日报/日报详情.json
@@ -8,13 +8,7 @@
},
"1": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 14.0,
- "IsHidden": true
- }
- },
- "2": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 50.0
+ "DesignLengthInPixel": 15.0
}
},
"3": {
@@ -22,6 +16,11 @@
"DesignLengthInPixel": 15.0
}
},
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
+ },
"5": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 15.0
@@ -55,11 +54,6 @@
}
},
"13": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "14": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 39.0,
"IsHidden": true
@@ -67,10 +61,9 @@
}
},
"InLogicalVisibleIndexes": [
- 1,
- 14
+ 13
],
- "Count": 15,
+ "Count": 14,
"DefaultSize": 32.0
},
"Cols": {
@@ -120,11 +113,21 @@
"DesignLengthInPixel": 32.0
}
},
+ "10": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
"11": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
},
+ "12": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
"13": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
@@ -156,57 +159,231 @@
}
},
"19": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "20": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "21": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "22": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 31.0
}
}
},
- "Count": 23,
+ "Count": 20,
"DefaultSize": 32.0
},
"Values": {
- "4,1": "汇报人：",
+ "2,1": "日期",
+ "4,1": "汇报人",
"4,4": "%CurrentUser.UserName%",
- "6,1": "昨日工时：",
- "6,20": "小时",
- "8,1": "昨日工作：",
- "11,18": "保存",
- "12,1": "*日报指的是昨日的工作总结。",
- "14,13": "%CurrentUser.UserName%",
- "14,16": "%CurrentUser.FullName%",
- "14,19": "%CurrentUser.UserName%"
+ "6,1": "工时",
+ "11,1": "*日报指的是昨日的工作总结。",
+ "11,12": "重新生成",
+ "11,16": "保存",
+ "13,5": "个人日报"
},
"Formulas": {
- "2,1": "IF(汇报日期=\"\",今日日期,汇报日期)&\"工作日报\"",
- "4,4": "IF(E5=\"\",用户名,E5)",
- "14,7": "TEXT(TODAY(),\"yyyy-mm-dd\")"
+ "2,4": "TODAY()-1",
+ "4,4": "IF(E5=\"\",用户名,E5)"
},
"AttachInfos": {
+ "2,4": {
+ "BindingInfo": {
+ "TableName": "汇报记录表",
+ "ColumnName": "开始日期",
+ "GUID": "f98552b0-a321-4bc9-b563-1378bbe602b3"
+ },
+ "CellType": {
+ "$type": "ElementUI.DatePickerCellType, ElementUI",
+ "CommandList": [],
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 4,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "date",
+ "placeholder": "请选择",
+ "startPlaceholder": "开始日期",
+ "rangeSeparator": "至",
+ "endPlaceholder": "结束日期",
+ "firstDayOfWeek": 1,
+ "DefautWeekFormat": "yyyy 第 WW 周"
+ },
+ "DataValidationInfo": {
+ "IgnoreBlank": false
+ }
+ },
"4,4": {
"BindingInfo": {
"TableName": "汇报记录表",
"ColumnName": "汇报人",
"GUID": "725c94dd-5797-482d-a9d9-4b45e706a0c9"
+ },
+ "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": "1441b171-a158-4475-b9e8-6e6c6692adaa",
+ "BindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "用户名",
+ "GUID": "3ede1e9c-0414-46db-a266-596cf9958f3d"
+ },
+ "ColumnName": "value"
+ },
+ {
+ "GUID": "41026494-131f-49d3-b30d-ed5f916bf7f0",
+ "BindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "全名",
+ "GUID": "9e121e06-1296-4fff-8e51-46008004e350"
+ },
+ "ColumnName": "label"
+ }
+ ],
+ "CustomColumns": []
+ },
+ "placeholder": "请选择",
+ "noDataText": "无数据",
+ "filterInServerOptions": {
+ "matchMethod": "contains",
+ "loadingText": "加载中"
+ },
+ "noMatchText": "无匹配数据"
+ },
+ "DataValidationInfo": {
+ "IgnoreBlank": false
}
},
- "4,20": {
+ "6,4": {
+ "BindingInfo": {
+ "TableName": "汇报记录表",
+ "ColumnName": "总工时",
+ "GUID": "08715a23-3046-4102-945c-aa7ceaa7d380"
+ },
"CellType": {
- "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "$type": "ElementUI.InputCellType, ElementUI",
+ "CommandList": [],
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 4,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "text",
+ "placeholder": "请输入",
+ "AppendText": "小时",
+ "resize": "none"
+ },
+ "DataValidationInfo": {
+ "IgnoreBlank": false
+ }
+ },
+ "8,1": {
+ "BindingInfo": {
+ "TableName": "汇报记录表",
+ "ColumnName": "内容",
+ "GUID": "67469ff5-0ac2-4a5a-836a-87f19c768ee5"
+ },
+ "CellType": {
+ "$type": "ElementUI.InputCellType, ElementUI",
+ "CommandList": [],
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 4,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "textarea",
+ "placeholder": "请输入",
+ "resize": "none"
+ },
+ "DataValidationInfo": {
+ "IgnoreBlank": false
+ }
+ },
+ "11,12": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
"CommandList": [
{
"$type": "ElementUI.Commands.ShowMessageBox, ElementUI",
@@ -313,7 +490,7 @@
{
"TargetCells": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=日报详情!E9"
+ "SerializeProperty": "=日报详情!B9"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -323,7 +500,7 @@
]
}
],
- "ID": "ea365cfd-f31d-4d11-97d8-3096e3d0fe60"
+ "ID": "a726aee6-0028-416c-b468-d89e8c8715a7"
},
{
"CommandList": [
@@ -341,89 +518,27 @@
"AdvancedSettings": {}
}
],
- "ID": "4dd07cc0-b4f7-4060-8e5b-c63b1de372da"
+ "ID": "dce2dc6b-3b15-42dc-bef3-d0868cc356ff"
}
]
}
],
- "ID": "75e2a3b3-c5a0-4b34-9c03-0e2398e4a8a4"
+ "ID": "baec5a5f-d563-4dc1-921e-d63b4d23fc50"
}
]
}
],
- "ToolTip": "由报工数据重新生成日报",
- "Size": 16,
- "ImagePath": "Application/059_refresh_3.svg",
- "BuiltIn": true,
- "UseCellForeColor": true
+ "Text": "重新生成",
+ "TemplateKey": "_RS_Information3",
+ "Icon": {
+ "Name": "Application/058_refresh_2.svg",
+ "BuiltIn": true,
+ "Color": "Background 1",
+ "UseCellTypeForeColor": true
+ }
}
},
- "6,4": {
- "BindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "总工时",
- "GUID": "08715a23-3046-4102-945c-aa7ceaa7d380"
- },
- "CellType": {
- "$type": "ElementUI.InputNumberCellType, ElementUI",
- "CommandList": [],
- "UIPermissions": [
- {
- "Scope": 2,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- },
- {
- "Scope": 1,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- }
- ],
- "min": "0.1",
- "max": "500",
- "step": 1,
- "precision": 1,
- "placeholder": "请输入",
- "controlsPosition": true
- }
- },
- "8,4": {
- "BindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "内容",
- "GUID": "67469ff5-0ac2-4a5a-836a-87f19c768ee5"
- },
- "CellType": {
- "$type": "ElementUI.InputCellType, ElementUI",
- "CommandList": [],
- "UIPermissions": [
- {
- "Scope": 2,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- },
- {
- "Scope": 1,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- },
- {
- "Scope": 4,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- }
- ],
- "type": "textarea",
- "placeholder": "请输入",
- "resize": "none"
- }
- },
- "11,18": {
+ "11,16": {
"CellType": {
"$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
"CommandList": [
@@ -453,7 +568,7 @@
"$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
"cellLocations": [
{
- "SerializeProperty": "=日报详情!E9"
+ "SerializeProperty": "=日报详情!B9"
}
]
},
@@ -487,7 +602,7 @@
"ShowConfirm": false
}
],
- "ID": "53add8e2-2ec2-49db-b535-3c502aceeec2"
+ "ID": "63f2bd68-d011-41d0-a546-3ac2c638864c"
},
{
"CommandList": [
@@ -501,62 +616,14 @@
"BindingInfo": {
"TableName": "汇报记录表",
"ColumnName": "汇报类型",
- "GUID": "40e0d5ce-b9b4-47c3-a760-6cbaabce5976"
+ "GUID": "7ff94212-1b34-46d8-8087-af885577c520"
},
- "Value": "日报"
- },
- {
- "BindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "开始日期",
- "GUID": "73a749f3-6682-43b7-99c3-60166d43d67f"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=日报详情!今日日期"
- }
- },
- {
- "BindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "截止日期",
- "GUID": "65a8cb20-cde9-449b-9c26-3e1424f92977"
- }
- },
- {
- "BindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "汇报人",
- "GUID": "4bc2c076-34d4-4158-8c32-5b26cee618c1"
- },
- "Value": "%CurrentUser%"
- },
- {
- "BindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "内容",
- "GUID": "0c6e8060-cb8a-4b55-8194-448dc44a36bd"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=日报详情!E9"
- }
- },
- {
- "BindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "总工时",
- "GUID": "17f31dda-4c40-40aa-96f4-d507d05cacd9"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=日报详情!E7"
- }
+ "Value": "个人日报"
}
]
}
],
- "ID": "612dd5b5-b060-44e7-9998-3e501fb0613c"
+ "ID": "23c1a79c-6a55-434f-8270-a95d4bd54dd3"
}
]
},
@@ -573,7 +640,7 @@
"ReloadData": true
}
],
- "ID": "80a94a82-65c6-4de0-9410-e827b3f72d97"
+ "ID": "6260bdc6-b04d-4eae-84d9-553e8afcbe0f"
},
{
"CommandList": [
@@ -588,7 +655,7 @@
"AdvancedSettings": {}
}
],
- "ID": "6db29dc5-d9dd-4e08-b27f-c1bd70c0b77e"
+ "ID": "c998072e-2d95-4b06-9b1b-bf0a65753e34"
}
]
}
@@ -604,7 +671,7 @@
"IconSize": 14.0
}
},
- "14,1": {
+ "13,1": {
"BindingInfo": {
"TableName": "汇报记录表",
"ColumnName": "ID",
@@ -642,27 +709,11 @@
"IgnoreBlank": false
}
},
- "14,4": {
+ "13,5": {
"BindingInfo": {
"TableName": "汇报记录表",
- "ColumnName": "汇报日期文本",
- "GUID": "eeecdca0-8fbe-471d-8d6e-5e1e7f093377"
- },
- "CellType": {
- "$type": "Forguncy.TextCellType, ServerDesignerCommon",
- "SavedValidators": [
- {
- "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon"
- }
- ],
- "TemplateKey": "_RS_NewLittleRoundCorner"
- }
- },
- "14,13": {
- "BindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "汇报人",
- "GUID": "4450a20c-d264-4f80-b4d1-9b6a98317ba5"
+ "ColumnName": "汇报类型",
+ "GUID": "f0b66348-67da-463e-bad1-c77768c9c1a5"
}
}
},
@@ -678,34 +729,36 @@
"FontSize": 13.333333333333332
},
{
- "FontSize": 24.0,
- "FontWeight": 2,
- "HorizontalAlignment": 3
+ "HorizontalAlignment": 2
},
{
- "HorizontalAlignment": 3
- },
- {
- "FontWeight": 2,
+ "Foreground": 3,
"HorizontalAlignment": 4
},
{
- "HorizontalAlignment": 4
- },
- {
- "FontWeight": 2
- },
- {
- "FontSize": 12.0,
- "Foreground": 5
+ "Foreground": 3,
+ "HorizontalAlignment": 2
},
{
"FontFamily": 0,
"FontSize": 13.333333333333332,
- "Formatter": 6
+ "Foreground": 3,
+ "HorizontalAlignment": 4
},
{
- "Formatter": 6
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332,
+ "HorizontalAlignment": 4
+ },
+ {
+ "FontFamily": 0,
+ "FontSize": 12.0,
+ "Foreground": 3
+ },
+ {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332,
+ "Formatter": 5
},
{
"FontSize": -1.0
@@ -715,118 +768,150 @@
"Strs": [
"Body",
"[AUTO]General",
- "Bold",
"Center",
- "Left",
"Text 1 50",
+ "Left",
"@"
]
},
"CellStyles": {
- "0,14": 0,
+ "0,11": 0,
+ "0,12": 1,
+ "0,13": 1,
+ "0,14": 1,
"0,15": 1,
"0,16": 1,
"0,17": 1,
"0,18": 1,
"0,19": 1,
- "0,20": 1,
- "0,21": 1,
- "0,22": 1,
- "2,1": 2,
- "3,1": 3,
- "3,2": 3,
- "3,3": 3,
- "3,4": 3,
- "3,5": 3,
- "3,6": 3,
- "3,7": 3,
- "3,8": 3,
- "3,9": 3,
- "3,10": 3,
- "3,11": 3,
- "3,12": 3,
- "3,13": 3,
- "3,14": 3,
- "3,15": 3,
- "3,16": 3,
- "3,17": 3,
- "3,18": 3,
- "3,19": 3,
- "3,20": 3,
- "3,21": 3,
- "3,22": 3,
- "4,1": 4,
- "4,2": 3,
- "4,3": 3,
- "4,4": 5,
- "4,22": 3,
- "5,1": 3,
- "5,2": 3,
- "5,3": 3,
- "5,4": 3,
- "5,5": 3,
- "5,6": 3,
- "5,7": 3,
- "5,8": 3,
- "5,9": 3,
- "5,10": 3,
- "5,11": 3,
- "5,12": 3,
- "5,13": 3,
- "5,14": 3,
- "5,15": 3,
- "5,16": 3,
- "5,17": 3,
- "5,18": 3,
- "5,19": 3,
- "5,20": 3,
- "5,21": 3,
- "5,22": 3,
- "6,1": 4,
- "6,2": 3,
- "6,3": 3,
- "6,4": 3,
- "6,20": 3,
- "6,21": 3,
- "6,22": 3,
- "7,1": 3,
- "7,2": 3,
- "7,3": 3,
- "7,4": 3,
- "7,5": 3,
- "7,6": 3,
- "7,7": 3,
- "7,8": 3,
- "7,9": 3,
- "7,10": 3,
- "7,11": 3,
- "7,12": 3,
- "7,13": 3,
- "7,14": 3,
- "7,15": 3,
- "7,16": 3,
- "7,17": 3,
- "7,18": 3,
- "7,19": 3,
- "7,20": 3,
- "7,21": 3,
- "7,22": 3,
- "8,1": 6,
+ "1,1": 2,
+ "1,2": 2,
+ "1,3": 2,
+ "1,4": 2,
+ "1,5": 2,
+ "1,6": 2,
+ "1,7": 2,
+ "1,8": 2,
+ "1,9": 2,
+ "1,10": 2,
+ "1,11": 2,
+ "1,12": 2,
+ "1,13": 2,
+ "1,14": 2,
+ "1,15": 2,
+ "1,16": 2,
+ "1,17": 2,
+ "1,18": 2,
+ "1,19": 2,
+ "2,1": 3,
+ "2,2": 2,
+ "2,3": 2,
+ "2,19": 2,
+ "3,1": 4,
+ "3,2": 2,
+ "3,3": 2,
+ "3,4": 2,
+ "3,5": 2,
+ "3,6": 2,
+ "3,7": 2,
+ "3,8": 2,
+ "3,9": 2,
+ "3,10": 2,
+ "3,11": 2,
+ "3,12": 2,
+ "3,13": 2,
+ "3,14": 2,
+ "3,15": 2,
+ "3,16": 2,
+ "3,17": 2,
+ "3,18": 2,
+ "3,19": 2,
+ "4,1": 5,
+ "4,2": 2,
+ "4,3": 2,
+ "4,4": 6,
+ "4,5": 1,
+ "4,6": 1,
+ "4,7": 1,
+ "4,8": 1,
+ "4,9": 1,
+ "4,10": 1,
+ "4,11": 1,
+ "4,12": 1,
+ "4,13": 1,
+ "4,14": 1,
+ "4,15": 1,
+ "4,16": 1,
+ "4,17": 1,
+ "4,18": 1,
+ "4,19": 2,
+ "5,1": 4,
+ "5,2": 2,
+ "5,3": 2,
+ "5,4": 2,
+ "5,5": 2,
+ "5,6": 2,
+ "5,7": 2,
+ "5,8": 2,
+ "5,9": 2,
+ "5,10": 2,
+ "5,11": 2,
+ "5,12": 2,
+ "5,13": 2,
+ "5,14": 2,
+ "5,15": 2,
+ "5,16": 2,
+ "5,17": 2,
+ "5,18": 2,
+ "5,19": 2,
+ "6,1": 3,
+ "6,2": 2,
+ "6,3": 2,
+ "6,4": 2,
+ "6,19": 2,
+ "7,1": 2,
+ "7,2": 2,
+ "7,3": 2,
+ "7,4": 2,
+ "7,5": 2,
+ "7,6": 2,
+ "7,7": 2,
+ "7,8": 2,
+ "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,
+ "8,1": 1,
+ "11,1": 7,
+ "11,12": 1,
+ "11,13": 1,
+ "11,14": 1,
+ "11,16": 1,
+ "11,17": 1,
"11,18": 1,
- "12,1": 7,
- "14,1": 8,
- "14,2": 1,
- "14,3": 1,
- "14,4": 9,
- "14,7": 0,
- "14,11": 1,
- "14,12": 0,
- "14,13": 1,
- "14,16": 10,
- "14,19": 1
- },
- "RowStyles": {
- "2": 10
+ "13,1": 8,
+ "13,2": 1,
+ "13,3": 1,
+ "13,4": 9,
+ "13,8": 9,
+ "13,9": 9,
+ "13,10": 9,
+ "13,11": 9,
+ "13,12": 9,
+ "13,13": 9,
+ "13,14": 9,
+ "13,15": 9,
+ "13,16": 9,
+ "13,17": 9,
+ "13,18": 9,
+ "13,19": 9
},
"SheetStyle": {
"FontFamily": 0,
@@ -834,18 +919,14 @@
}
},
"Spans": [
- "14,13,1,3",
- "14,16,1,3",
- "14,19,1,4",
- "11,18,1,4",
- "2,1,1,21",
- "14,1,1,3",
- "6,4,1,16",
- "8,4,2,18",
- "4,4,1,16",
- "4,20,1,2",
- "14,4,1,3",
- "14,7,1,3"
+ "13,1,1,3",
+ "6,4,1,15",
+ "11,16,1,3",
+ "11,12,1,3",
+ "8,1,2,18",
+ "4,4,1,15",
+ "2,4,1,15",
+ "13,5,1,3"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -872,29 +953,13 @@
"Margin": {}
},
"CustomNames": [
- {
- "Name": "汇报人",
- "Formula": "日报详情!$N$15"
- },
{
"Name": "汇报ID",
- "Formula": "日报详情!$B$15"
+ "Formula": "日报详情!$B$14"
},
{
- "Name": "用户名",
- "Formula": "日报详情!$T$15"
- },
- {
- "Name": "用户全名",
- "Formula": "日报详情!$Q$15"
- },
- {
- "Name": "今日日期",
- "Formula": "日报详情!$H$15"
- },
- {
- "Name": "汇报日期",
- "Formula": "日报详情!$E$15"
+ "Name": "报告类型",
+ "Formula": "日报详情!$F$14"
}
]
-}//JSfVQkZqZ2nc60jnnG5ynXC49ctrZ1LpLlcQc3XoiKnUyFUOeqLxs3L7Q0z6AkvjpOFOC9VszcHqX1LoWNCq9jbJoICIzzdB/zDO95/M8kSg70L1gf+Chw64EgIIyyJyB2W6+4ZugwivRzsLDIB4GB+3zAk6BI8FPC43ejCTj8XlsQKgFwqAJZlzYBDnljrU7b7ujsuHnLgiJ1N+zvMpvkXEf+CyxdmhHt3xWlCXfOTIS0kBYwRUzVu9cveeQECzsvJpkS8N955Qu5l7jbNBHxA1yQFZMxDUbbyuQWG6qrPKqQoAgNWrpbkxrpOvnh/Z/uW15ztMY9J/wVcjVG8lUnyjs4jaxjR8Xp3tkTfmXmLBpvzo9T2tWaU6qFfdbO2QCZ61tZeVF9+UKx/evd9MJ4JhGn/o0vq1PF0C3/RJ7bd10bFZ1hptkZl7MZiyTOeJDv4UJQmZ2qq6Vf4iJv6J7Y1oL6lyczIwu2NIJC8NHvysqPZuZVm3bclWfIhklmzjRAxxSfy/7s7yVu5clUxTzOWA8vgQ6frg7ZiX0PK1Gg50AWEkczBJG/d3wHaqm5bAKnfLsn/w0HZnOy649Mawi0Vwy4cnAsxwMsQRlhv5W4a0cM6/gELMetDHSRzeCI8a6mrJVfyOX6xkYYxRO4OH66JQr2d/y8BFhukRskWtoz0AcLi96bwoPVFm51bv4Tye+yklgRQJw+7eBAtpRdeST3BgM9fcE8+TD31xjpWkrn3Y1AlSzGXaAw4Sm7OECYJTTt1n5dAj5HavsPdnRLpk0dow+kIRMlG5dQLdIU47nig4ZRBX+R/UbkpM/hS+vajGEqU5DtgYpWB2k2HQGJ5cVI3TpAkyJv3iY6TEHvUUwfmYfZpRHUJXYlmKzTvPFKw8Q3PsQZDc2dkQ9TNkoP8qRA==|920
\ No newline at end of file
+}//JaOTgw1mrWbHNSdlp+MREOkAMNkrQ4ugpijUQ89sI9Oaldd90OAnvNKXLOfFVn4ylKuoWgCsUkc9ixk2kY8zuZEblz0nE/2QEGbO+a9Ug35miD7huJaJk2SsYQKVsf3fZrjonj+0jVIR03Ar6D5vM6iFpYn4YsLmbt5o096GPT1Ub+y1cmGwdAPF/4kt2N/1Vwj9fLb0H5JMbQiExRCYAynFEYxtjF5mwPwP5SgMRdFBNSnzJ0EVDz/k4DdquxJPtHyVKeONMnudUABSmDddgmo1PCbgaKUZudDBrEuLgXZzoaa6RW9XxuwecijPMFI1cVRQuxX2wV01Umjd4AP2xYkVnfZ3WTgivLVWuf4e6VgA0xZBcOMYcw8yZF/fAcnbGZPdLcGMaQbKFqN60CfWWpBf+v/ztZDh4vDyqBNgFtQv7/ZNeTcAaYKsLY9/fwGskD8WEIiZKK+2TCOgFkmi2IsEtRjXUjXsbc3GH+8eWKKPRCUWtdiBIhKIzfugrYoIKCvERICBiHq9G4pDNRY6RpC/2oJv4T2JW+tE/eTEd6tCbAdWiQQ1OVqMDGoJ68MkXNF+BfQcpTuctpmDSo2BzlnwpQk92QiFdbh/2L8weOyb3Cm97jgybcHzyYbFsylE14b7zaTL3ERKct69pDy2OCVM265M8ah0WOqZ5Q4/TXIe+hoQYKBh9yUvjRNOeJ3t2tteth5J1h4d0wZFkjEHDAI4PZhZl7FwJB6rqXgzMO3hl3RaimMdvhUB+Zk6Stuq/bXu4kqTbWVFSJr0nqTa21cg/H4z27n23iP7/xy3dZoZipBK2B3yksxJhRSZm6GaJLQvGn9XUxu2TXp1as/R2FEkpx6F7FtMR9/ewEICSWu6MA8oVgolTSG02ZhCatgAIChgjnIBc8vC0ZzpSsFhdQ==|920
\ No newline at end of file
diff --git a/Pages/汇报/个人日报/日报详情.rd b/Pages/汇报/个人日报/日报详情.rd
new file mode 100644
index 00000000..e093e61b
--- /dev/null
+++ b/Pages/汇报/个人日报/日报详情.rd
@@ -0,0 +1,19 @@
+{
+ "PageType": 0,
+ "ColumnCount": 20,
+ "RowCount": 14,
+ "Formulas": {
+ "2,4": "TODAY()-1",
+ "4,4": "IF(E5=\"\",用户名,E5)"
+ },
+ "CustomNames": [
+ {
+ "Name": "汇报ID",
+ "Formula": "日报详情!$B$14"
+ },
+ {
+ "Name": "报告类型",
+ "Formula": "日报详情!$F$14"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Pages/汇报/日报/汇报详情.json b/Pages/汇报/个人日报/汇报详情.json
similarity index 96%
rename from Pages/汇报/日报/汇报详情.json
rename to Pages/汇报/个人日报/汇报详情.json
index 19ac6c96..4a22a34f 100644
--- a/Pages/汇报/日报/汇报详情.json
+++ b/Pages/汇报/个人日报/汇报详情.json
@@ -535,7 +535,7 @@
}
}
],
- "ID": "2a9086c7-96ff-4618-8edf-3f537a0bb707"
+ "ID": "621975ce-7e13-4f8a-8ff8-e3ecae6add2c"
},
{
"CommandList": [
@@ -550,7 +550,7 @@
"BtnText": "知道了"
}
],
- "ID": "1111b541-b02d-466d-8245-44ba0f0851f8"
+ "ID": "ea9b64bc-23d2-4f16-935d-117ffe7ab10c"
}
]
},
@@ -564,7 +564,7 @@
"Title": "生成中"
}
],
- "ID": "f1a3e022-24f6-4bb4-969e-a80d420b7cbc"
+ "ID": "848b3f01-60da-491c-b65a-63eca176e096"
},
{
"CommandList": [
@@ -574,7 +574,7 @@
"Message": "请在下方编写你的工作内容，让AI帮你完成左边的日报！"
}
],
- "ID": "90bd39ce-84f3-465f-ba20-23f199e33876"
+ "ID": "2461a299-933e-4cf9-8e5c-bc858cb09b2f"
}
]
}
@@ -744,7 +744,7 @@
]
}
],
- "ID": "fdd052ed-1500-4fad-bd10-fe0013004d4c"
+ "ID": "323c8abf-cead-4c94-afba-0054c36eff1c"
},
{
"CommandList": [
@@ -759,12 +759,12 @@
"BtnText": "知道了"
}
],
- "ID": "52b610fc-2135-4f65-83b0-a875978d2827"
+ "ID": "fab65ac5-fcf9-496c-80d7-7746cfb7584e"
}
]
}
],
- "ID": "39559122-968c-4961-91f5-a53d01ea9cf3"
+ "ID": "a8d13b2e-2673-4849-9e5d-016177fdbadd"
},
{
"CommandList": [
@@ -774,7 +774,7 @@
"Message": "请选择汇报日期"
}
],
- "ID": "7dce55f0-78e9-4317-b2eb-01972b5ccbc9"
+ "ID": "0cdcbbde-edf9-41b4-8354-74aec642876b"
}
]
}
@@ -1141,7 +1141,7 @@
"ReloadData": true
}
],
- "ID": "052bba80-dcd2-4799-b1ef-3ee5d432a522"
+ "ID": "379d3a7c-106c-4f6d-afe8-1f8c476b6c90"
},
{
"CommandList": [
@@ -1156,7 +1156,7 @@
"BtnText": "知道了"
}
],
- "ID": "9a1487aa-1959-44de-9e28-0833c0870ed6"
+ "ID": "4b293704-3c73-42a9-9a89-e81ace626db1"
}
]
}
@@ -1559,4 +1559,4 @@
"Formula": "汇报详情!$B$8"
}
]
-}//0MD8he0FrORWOcibnYB1AMjp9BWrBadUMFZUeskLz8wBgM2ZuBe4lnvA4nKJcugPIK/HSGlOz50gknqfd40EjMCl8g4mGLviePJCX1TLeFw810gs5HNxDlS39I2z3rTbnYScFb+P/MoBgVzdKkQwCQ0mldE416BlSYU3sJqnHz/EM4g2BAMYedHryvTib+Q45eU8CoGt3DioA3LzAGtkRSI2rzaMmBB8zTeHjAFhS4KULfn19HqS3I8QiZSbp+Pp4veSbFpXSny4kLj0ZxJ/rWNKrVJlR6eUmrSZ4uKo9x6+1ef8vgA9tGypB0A22mz6lLsDn12XxbktSav8+AbWhDZZ/HnS0Gy3vjF7mM1pKTQIAFWJAUjO960ZNAx8YuXueD9mZ3G+Is42TwD2wKGhT5j1dISc4/US1NoQqT87OrnY6e6SZyF53FMYHl0fbbBHFGC41ioxVOP0Ye5VdGDjIBm44jMM3H/tUrK/lSwsh8Ijvf0RKkobn5QLsJhIcSONav9Tu0aYfmIjRAgITOfBvTQkUiE3QF5RI6+IpEMo+o+s8QvibXQCsrBEJ9pOXnSFn3OhGpuyIQgZw2jMTYKDGHfeOwKJT6k0bmCcyfY3Defb+qLvQWC7b4r8Bb3vgqMUIMlIsmjAsohoIoyuY2c7Kdu5RTDqsu14hQRs1xqKMPnHExfaUd6xHxc9z+joY48Am2AnrMuyuopDwo0z2t7DklV1d9AW90B6a+PDBODnYYDrF6RV3xhMUd1WhbjlgugPlKY1gquYCTI7mWcQ/J/yX1dmeuEE/Fxhxa4dwp22QHwtlVCPvhXFikhEYbTsUDGFMuQtYzDWQ/Ow9lgSwPeOz1Gnl0bwDPfg2rEgLgYThybbVXlw93udcMcU6xngK3LfW5UxFyYT8X+/hF03eE+hqQ==|920
\ No newline at end of file
+}//NIpOS0HAYg/f1raCmXBaxjdP+fqnlzuOL+YwnTRKlGQtDLV8NCa2cTply0++t6y1bMuBrg6Y0+Hqz6s6/fGQE+F6OHAPev2bLXMuIP1IdBi/GBcdXtciLr/o1jCNBbheqE/h6tB3eYvG2ANuwi6jRGXzY3PXLSvq6tCgRM4qUDEQVTE0zKcZsh6d4T/Tp3u0te30ms6XnDtz/c7ahkD8ZKHZG2sURqno3UoNfGDl1xHdn7PRTf4NTvsiIDyPkJq+1Ns9Yrlbx1xqhj/YeGJ1f6LWrpV8cfmGvSqTGNm+2o6fZ2YTl/o4L1Nj4fWexjuqb9AXMq2bTi0Ef9an2Y1mqGqkfNSdORXIrnPHTT0rMDFO152ZNdbRHUgj2NzLiovN/fxZ/A9VLWnpwLUAmSiUoy8ROWHHv7JMBZNIpBUPqRBZYTgwPhwQWQZtb4kcMBaodBqPIWMHRIERuyCfTOiOnkr04ntEDqfNB8HIb9R52cHP39xQ1iONpQJLUuycI2IlRvd56tTWCm6lmgzkk2FiKo3DtgAKdVwu0exYCR5oFqSar0bH8h3LrfiWEWbMj9PITbwABNWJyEtmU3a3BXzMiwzLh3qQwyqGc8Rexk3VlVSWHRcsMc8bUwDKOGKvWiuBLRAp9QEX/ZhkcfF0aSGsoZFQsorcs4FPNvUaSXa3XjZx5ndvqnq9vnTkPWeJgxr5vp/jIzWA6gXYr5Kb+d1QzSo7Zwqu+vw0sjKNRaETZblgbmfPRNCbf/g1OkWxJ9RZOoCOVz4j16XnqDrIXKIDdm01o5/4Gsvd5nRfxiSnB35ZR7KowZKdmz1YSCJbDbz3YSarmiV5aOFJG8xe6hu1Qr2kW2MnCC/tvEhyYib1IsFI4P7bSz7R+FPOYAkdrIwgFEqD4+32lvXRkJf6nHXKpw==|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
similarity index 100%
rename from Pages/汇报/日报/汇报详情预览.json
rename to Pages/汇报/个人日报/汇报详情预览.json
diff --git a/Pages/汇报/日报/汇报详情预览.rd b/Pages/汇报/个人日报/汇报详情预览.rd
similarity index 100%
rename from Pages/汇报/日报/汇报详情预览.rd
rename to Pages/汇报/个人日报/汇报详情预览.rd
diff --git a/Pages/汇报/日报/日报详情.rd b/Pages/汇报/日报/日报详情.rd
deleted file mode 100644
index d7c07007..00000000
--- a/Pages/汇报/日报/日报详情.rd
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "PageType": 0,
- "ColumnCount": 23,
- "RowCount": 15,
- "Formulas": {
- "2,1": "IF(汇报日期=\"\",今日日期,汇报日期)&\"工作日报\"",
- "4,4": "IF(E5=\"\",用户名,E5)",
- "14,7": "TEXT(TODAY(),\"yyyy-mm-dd\")"
- },
- "CustomNames": [
- {
- "Name": "汇报人",
- "Formula": "日报详情!$N$15"
- },
- {
- "Name": "汇报ID",
- "Formula": "日报详情!$B$15"
- },
- {
- "Name": "用户名",
- "Formula": "日报详情!$T$15"
- },
- {
- "Name": "用户全名",
- "Formula": "日报详情!$Q$15"
- },
- {
- "Name": "今日日期",
- "Formula": "日报详情!$H$15"
- },
- {
- "Name": "汇报日期",
- "Formula": "日报详情!$E$15"
- }
- ]
-}
\ No newline at end of file
diff --git a/Pages/汇报/日报/日报首页.json b/Pages/汇报/日报/日报首页.json
deleted file mode 100644
index 423d0e55..00000000
--- a/Pages/汇报/日报/日报首页.json
+++ /dev/null
@@ -1,912 +0,0 @@
-{
- "Rows": {
- "RowColumnAttachedInfos": {
- "0": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
- }
- },
- "1": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "2": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "3": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "4": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "5": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "6": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "7": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0,
- "Mode": 2,
- "MinLength": {
- "Unit": 1
- },
- "MaxLength": {
- "Value": 1.0
- }
- }
- },
- "8": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 10.0
- }
- },
- "9": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 38.0,
- "Mode": 1
- }
- },
- "10": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
- }
- },
- "11": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 29.0,
- "IsHidden": true
- }
- }
- },
- "InLogicalVisibleIndexes": [
- 11
- ],
- "Count": 12,
- "DefaultSize": 32.0
- },
- "Cols": {
- "RowColumnAttachedInfos": {
- "0": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 20.0
- }
- },
- "1": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "2": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "3": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
- }
- },
- "4": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "5": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "6": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "7": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "8": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "9": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "10": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "11": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "12": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "13": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "14": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "15": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0,
- "Mode": 2,
- "MinLength": {
- "Unit": 1
- },
- "MaxLength": {
- "Value": 1.0
- }
- }
- },
- "16": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "17": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "18": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "19": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "20": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "21": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "22": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "23": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "24": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "25": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "26": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "27": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "28": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "29": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "30": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
- }
- }
- },
- "Count": 31,
- "DefaultSize": 32.0
- },
- "AttachInfos": {
- "1,1": {
- "CellType": {
- "$type": "ElementUI.TableCellType, ElementUI",
- "ElTableName": "EL表格1",
- "RowDoubleClickCommand": {
- "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
- "Commands": [
- {
- "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand",
- "CurrentRowInfo": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "客户表",
- "ColumnName": "ID",
- "GUID": "fc1c30de-7b67-4ecc-a387-2703694f36c2"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=日报首页!行数据.ID"
- }
- }
- },
- {
- "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
- "ClosePopupCallbackCommand": {
- "Commands": [
- {
- "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
- "ConditionAndCommandPairList": [
- {
- "Condition": {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
- "cellLocations": [
- {
- "SerializeProperty": "=日报首页!是否为确定"
- }
- ]
- },
- "value": "1"
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
- "TargetPageElement": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=日报首页!B2"
- },
- "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
- "MethodName": "ResetTable",
- "ParameterValues": {
- "clearSort": true,
- "clearFilter": true
- }
- }
- ],
- "ID": "7606c42d-b0b8-4b36-abb0-aa5d20e2ffe5"
- }
- ]
- }
- ],
- "ParamProperties": {
- "IsOK": "是否为确定"
- }
- },
- "PageName": "汇报详情",
- "LoadBindingDataOption": 1
- }
- ],
- "ParamProperties": {
- "dataRow": "行数据",
- "ID0": "行数据.ID",
- "汇报日期1": "行数据.汇报日期",
- "汇报人2": "行数据.汇报人"
- }
- },
- "bindingOptions": {
- "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
- "TableName": "汇报记录表",
- "BindingInfos": [
- {
- "GUID": "6995d6bf-e729-4576-9865-6efc85187aba",
- "BindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "ID",
- "GUID": "74cb2898-29a8-4ab8-84d3-cd89bdb22a18"
- },
- "ColumnName": "ID"
- },
- {
- "GUID": "a70f65d6-f250-4335-988a-e42dc34310f9",
- "BindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "汇报日期文本",
- "GUID": "8d53193b-29cb-4b0e-a138-99090e544ca3"
- },
- "ColumnName": "汇报日期"
- },
- {
- "GUID": "c2610162-0dfa-4b02-88a5-05503a40374f",
- "BindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "汇报人",
- "GUID": "b04b432c-0d5f-4f1b-90cd-21fcdce3224b"
- },
- "ColumnName": "汇报人"
- },
- {
- "GUID": "d371ebce-2843-4539-9dd7-1d737e53c68a",
- "BindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "汇报数量",
- "GUID": "daa3fda6-8651-48ef-96e1-8608e5416350"
- },
- "ColumnName": "汇报数量"
- }
- ],
- "SqlCondition": {
- "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
- "SubConditions": [
- {
- "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
- "CompareType": 6,
- "ColumnBindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "内容",
- "GUID": "c6d185fd-a6df-402d-9787-d55341bd4dc8"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=日报首页!关键字"
- }
- },
- {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "汇报人",
- "GUID": "f18b6957-45e8-4357-b701-3a08e1e2d162"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=日报首页!汇报人"
- }
- },
- {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "CompareType": 3,
- "ColumnBindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "开始日期",
- "GUID": "a8bc25d0-697f-4742-b895-27962ea6cbd0"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=日报首页!开始日期"
- }
- },
- {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "CompareType": 5,
- "ColumnBindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "开始日期",
- "GUID": "c5bce83d-3340-4b1a-9d35-db98b753ecb2"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=日报首页!结束日期"
- }
- }
- ]
- },
- "NullFormulaValueQueryPolicy": 1,
- "OrderBySqlCondition": {
- "OrderByColumns": [
- {
- "ColumnBindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "开始日期",
- "GUID": "9d864edd-0c78-48d2-8222-22b36baabfae"
- },
- "Order": 1
- }
- ]
- },
- "CustomColumns": []
- },
- "autoGenerateColumnsByDataSource": false,
- "columns": [
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "ID",
- "label": "ID",
- "width": 60,
- "minWidth": 60,
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "type": "Default",
- "tagType": "info",
- "imgType": "cover",
- "resizable": false,
- "hide": true,
- "key": "36118757-90ba-4299-8306-c836e9bfc880",
- "UIPermissions": [
- {
- "Scope": 1,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- }
- ]
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "汇报日期",
- "sortable": true,
- "label": "汇报日期",
- "formatStr": "yyyy年MM月dd日",
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "type": "Default",
- "tagType": "info",
- "imgType": "cover",
- "filter": true,
- "multipleFilter": true,
- "key": "8dea6648-dd12-4a17-b65c-b73449a4c96d",
- "UIPermissions": [
- {
- "Scope": 1,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- }
- ]
- },
- {
- "$type": "ElementUI.ColumnSetting, ElementUI",
- "dataColumnName": "汇报人",
- "sortable": true,
- "label": "汇报人",
- "align": "center",
- "headerAlign": "center",
- "colfixed": "false",
- "type": "Default",
- "tagType": "info",
- "imgType": "cover",
- "key": "850a2074-4440-46c8-935f-a5a23e3344eb",
- "UIPermissions": [
- {
- "Scope": 1,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- }
- ]
- }
- ],
- "showActionButtons": true,
- "actionButtons": [
- {
- "$type": "ElementUI.ActionButton, ElementUI",
- "UIPermissions": [
- {
- "Scope": 2,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- },
- {
- "Scope": 1,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- }
- ],
- "type": "button",
- "Name": "编辑",
- "styleType": "Accent 1 0",
- "shape": "default",
- "Commands": {
- "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
- "Commands": [
- {
- "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand",
- "CurrentRowInfo": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "ID",
- "GUID": "89f841d0-dccd-4ec3-8234-31cc80424fab"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=日报首页!行数据.ID"
- }
- }
- },
- {
- "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
- "ShowDrawerHeader": true,
- "ClosePopupCallbackCommand": {
- "Commands": [
- {
- "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
- "ConditionAndCommandPairList": [
- {
- "Condition": {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
- "cellLocations": [
- {
- "SerializeProperty": "=日报首页!是否为确定"
- }
- ]
- },
- "value": "1"
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
- "TargetPageElement": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=日报首页!B2"
- },
- "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
- "MethodName": "ResetTable",
- "ParameterValues": {
- "clearSort": true,
- "clearFilter": true
- }
- }
- ],
- "ID": "c3d75e0a-202e-41a4-9eda-857fa808f67c"
- }
- ]
- }
- ],
- "ParamProperties": {
- "IsOK": "是否为确定"
- }
- },
- "PageName": "日报详情",
- "PassValues": [
- {
- "Source": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=日报首页!行数据.ID"
- },
- "TargetCell": {
- "SerializeProperty": "=日报详情!汇报ID"
- }
- }
- ],
- "LoadBindingDataOption": 1
- },
- {
- "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
- "ShowDrawerHeader": true,
- "ClosePopupCallbackCommand": {
- "Commands": [
- {
- "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
- "ConditionAndCommandPairList": [
- {
- "Condition": {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
- "cellLocations": [
- {
- "SerializeProperty": "=日报首页!是否为确定"
- }
- ]
- },
- "value": "1"
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
- "TargetPageElement": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=日报首页!B2"
- },
- "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
- "MethodName": "ResetTable",
- "ParameterValues": {
- "clearSort": true,
- "clearFilter": true
- }
- }
- ],
- "ID": "2c164470-5e82-4cf2-888f-3f54cca74f49"
- }
- ]
- }
- ],
- "ParamProperties": {
- "IsOK": "是否为确定"
- }
- },
- "PageName": "汇报详情",
- "LoadBindingDataOption": 1,
- "Disabled": true
- }
- ],
- "ParamProperties": {
- "dataRow": "行数据"
- }
- }
- },
- {
- "$type": "ElementUI.ActionButton, ElementUI",
- "UIPermissions": [
- {
- "Scope": 2,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- },
- {
- "Scope": 1,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- }
- ],
- "type": "button",
- "Name": "删除",
- "styleType": "Accent 5",
- "shape": "default",
- "Commands": {
- "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
- "Commands": [
- {
- "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
- "TableName": "汇报记录表",
- "UpdateType": "delete",
- "ShowConfirm": true,
- "ConfirmText": "您确定要删除吗？",
- "RowsToUpdate": 1,
- "RowsToUpdateCondition": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "ID",
- "GUID": "62d277de-3a71-4c43-a58e-eb7b006fa2f2"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=日报首页!行数据.ID"
- }
- }
- },
- {
- "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
- "Message": "操作成功"
- }
- ],
- "ParamProperties": {
- "dataRow": "行数据"
- }
- }
- }
- ],
- "sumText": "合计",
- "size": "default",
- "showSelectColumn": true
- }
- },
- "9,1": {
- "CellType": {
- "$type": "ElementUI.CellTypes.PaginationCellType, ElementUI",
- "AttachElementTable": true,
- "ElementTableName": "EL表格1",
- "pageSize": 20,
- "pagerCount": 7,
- "layout": [
- {
- "layoutItem": "prev"
- },
- {
- "layoutItem": "pager"
- },
- {
- "layoutItem": "next"
- },
- {
- "layoutItem": "jumper"
- },
- {
- "layoutItem": "->"
- },
- {
- "layoutItem": "total"
- }
- ],
- "pageSizes": [
- {},
- {
- "value": 20
- },
- {
- "value": 30
- },
- {
- "value": 40
- },
- {
- "value": 50
- },
- {
- "value": 100
- }
- ],
- "hideOnSinglePage": true
- }
- }
- },
- "StyleDatas": {
- "Styles": [
- {
- "BorderRight": 0
- },
- {
- "FontSize": 13.333333333333332
- },
- {
- "FontSize": 13.333333333333332,
- "BorderRight": 0
- }
- ],
- "Types": {
- "Strs": [
- "Background 2 0",
- "Body"
- ],
- "Borders": [
- {
- "Color": 0
- }
- ]
- },
- "CellStyles": {
- "0,30": 0,
- "1,30": 0,
- "2,30": 0,
- "3,30": 0,
- "4,30": 0,
- "5,30": 0,
- "6,30": 0,
- "7,30": 0,
- "8,30": 0,
- "9,1": 1,
- "9,29": 1,
- "9,30": 0,
- "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,
- "10,15": 1,
- "10,16": 1,
- "10,17": 1,
- "10,18": 1,
- "10,19": 1,
- "10,20": 1,
- "10,21": 1,
- "10,22": 1,
- "10,23": 1,
- "10,24": 1,
- "10,25": 1,
- "10,26": 1,
- "10,27": 1,
- "10,28": 1,
- "10,29": 1,
- "10,30": 0,
- "11,1": 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,
- "11,15": 1,
- "11,16": 1,
- "11,17": 1,
- "11,18": 1,
- "11,19": 1,
- "11,20": 1,
- "11,21": 1,
- "11,22": 1,
- "11,23": 1,
- "11,24": 1,
- "11,25": 1,
- "11,26": 1,
- "11,27": 1,
- "11,28": 1,
- "11,29": 1,
- "11,30": 2
- },
- "SheetStyle": {
- "FontFamily": 1
- }
- },
- "Spans": [
- "9,1,1,28",
- "1,1,7,29"
- ],
- "PageInfo": {
- "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
- "Title": "个人日报",
- "PageLoadedCommandList": [
- {
- "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
- "FunctionName": "remove",
- "Title": "加载中"
- }
- ],
- "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$2"
- }
- ]
-}//jsfsAkYnrLg1Ctq7ys+DYsN/KjIPNb78Bhzs7QAEXsh8PjqkldClhfjRNTJ63xxxjABgt6RSpAyOuiAVvRs/jl0wgVSZ0ERHbuINLvobVXWW46bCRloqN9ErhcZm45QPIUnWoRGYHMkZrdWoIM6e+9o8AHZLooG/hKXKBJWgUUPrdSfm3n4a12xJiEUi4arPI/qWzkL2pGJo3MRisE8FYGwTOPycPkY2g0ppTugBTMug21fi1u8JrLBGOrMV+lAbcqBgbfmUzRVlA3pPmHatJJcqvLxcMiTK65NQYQL5tnjF+A/LmGA/5csYPyVICCAYnKjqVL4jSV3O4QUG6JQkmdsLgS7t9SOfBcR+JNM8xdstvtncPJWFJk49ib4A2FZid4Gatb6iemq1e8nMkaRDQKkWyYLbkN2ck8aaM6D8e8y/Gdgv/n6nwM5LWnCTBYAkvFyhbyYJtmshHA5PZV/R8Hp4IBzpO56/kQ4wZhysyBnHDDwbMLYJwBfN11wgeKEx1WEI0dzAtBJMpFYzYJyAAF2S52cz66KGJS8a4DbJ8N3VYcS8klGbtu1x0HF63xchoGHxyQJD6MP3TboLzFQ6BpR3jp5B3P6cNx8xcTWdtfQ8a/CtUBX3ThERZ2eFW82O5lZ+8Z2qbn+Gl3W7haAMuXPF7sh7PMAhoZZgwicVEnYkbWA6EYDm13iDli1OjufcH224hMbFt5At0SwLCtGcOkGBsEY7sjQrlXnrg6YcLhi0Y7PiheRmN/GQsekB6PmFhDyjJuUgl9IUd0KFQQvKQJXvy34MAshPb38FLpoQEOUn2VHa3fEuOzQJzpb0m459JJGkIE9bGR2K5GepCbPWVczf3RO8jbUPoi5aoeCYp53VZY8dbaOPXA77vzjubKphL1b6Y/w3RtH/D4Pv5Hso1Q==|920
\ No newline at end of file
diff --git a/Pages/汇报/汇报管理.json b/Pages/汇报/汇报管理.json
index d190220d..ac8325a5 100644
--- a/Pages/汇报/汇报管理.json
+++ b/Pages/汇报/汇报管理.json
@@ -289,13 +289,38 @@
},
"Values": {
"1,1": "%PageTitle%",
+ "1,6": "个人日报",
"3,1": "关键字",
"5,1": "汇报人",
"5,15": "日期",
"7,1": "查询",
- "7,4": "重置"
+ "7,4": "重置",
+ "10,1": "个人日报列表"
},
"AttachInfos": {
+ "1,6": {
+ "CssName": "singlebox",
+ "CellType": {
+ "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon",
+ "Style": 3,
+ "CellDefaultValue": "个人日报",
+ "IsSameWidth": true,
+ "Items": [
+ {
+ "Value": "个人日报",
+ "DisplayValue": "日报"
+ },
+ {
+ "Value": "个人周报",
+ "DisplayValue": "周报"
+ },
+ {
+ "Value": "个人月报",
+ "DisplayValue": "月报"
+ }
+ ]
+ }
+ },
"1,17": {
"CssName": "toolbar toolbar-right ",
"CellType": {
@@ -345,7 +370,7 @@
},
{
"Value": "菜单1",
- "Text": "新增个人日报",
+ "Text": "新增日报",
"IconPath": "Application/001_add_1.svg",
"SelectedIconColor": "Background 1",
"SelectedIconColorUseItemColor": true,
@@ -355,55 +380,15 @@
{
"$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
"PageName": "日报详情",
- "LoadBindingDataOption": 2
- },
- {
- "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
- "ClosePopupCallbackCommand": {
- "Commands": [
- {
- "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
- "ConditionAndCommandPairList": [
- {
- "Condition": {
- "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
- "param": {
- "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
- "cellLocations": [
- {
- "SerializeProperty": "=是否为确定"
- }
- ]
- },
- "value": "1"
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
- "TargetPageElement": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=汇报管理!个人日报表格"
- },
- "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
- "MethodName": "ResetTable",
- "ParameterValues": {
- "clearSort": true,
- "clearFilter": true
- }
- }
- ],
- "ID": "0fc4e3b5-af54-47fd-8d6b-d25ad4ab3a9a"
- }
- ]
+ "PassValues": [
+ {
+ "Source": "个人日报",
+ "TargetCell": {
+ "SerializeProperty": "=日报详情!报告类型"
}
- ],
- "ParamProperties": {
- "IsOK": "是否为确定"
}
- },
- "PageName": "汇报详情",
- "LoadBindingDataOption": 2,
- "Disabled": true
+ ],
+ "LoadBindingDataOption": 2
}
],
"CanVisitRoleList": [
@@ -412,7 +397,7 @@
},
{
"Value": "菜单1",
- "Text": "新增项目周报",
+ "Text": "新增周报",
"IconPath": "Application/001_add_1.svg",
"SelectedIconColor": "Background 1",
"SelectedIconColorUseItemColor": true,
@@ -454,7 +439,7 @@
}
}
],
- "ID": "e39b9d54-4013-4d8c-9773-0791717c0082"
+ "ID": "9c04a08f-9a55-43f4-a5f0-312add25e5b3"
}
]
}
@@ -483,7 +468,6 @@
"CommandList": [
{
"$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
- "PopupDisplayMode": 4,
"PageName": "模板列表"
}
],
@@ -697,13 +681,8 @@
},
"10,1": {
"CellType": {
- "$type": "Forguncy.TabControlCellType, ServerDesignerCommon",
- "TemplateKey": "样式1",
- "Tabs": [
- "日报首页",
- "项目周报首页"
- ],
- "LazyLoading": true,
+ "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon",
+ "PageName": "个人日报列表",
"OverflowMode": 1
}
},
@@ -742,6 +721,11 @@
"FontSize": 18.666666666666664,
"FontWeight": 2
},
+ {
+ "FontFamily": 1,
+ "FontSize": 13.333333333333332,
+ "HorizontalAlignment": 3
+ },
{
"FontFamily": 1
},
@@ -752,7 +736,7 @@
{
"FontFamily": 1,
"FontSize": 13.333333333333332,
- "Formatter": 3
+ "Formatter": 4
},
{
"FontSize": 13.333333333333332
@@ -774,6 +758,7 @@
"Background 2 0",
"Body",
"Bold",
+ "Left",
"[AUTO]General"
],
"Borders": [
@@ -785,219 +770,220 @@
"CellStyles": {
"0,41": 0,
"1,1": 1,
- "1,17": 2,
+ "1,6": 2,
+ "1,17": 3,
"1,41": 0,
- "2,26": 3,
- "2,27": 2,
- "2,28": 2,
- "2,29": 3,
- "2,30": 3,
- "2,31": 3,
- "2,32": 3,
- "2,33": 3,
- "2,34": 3,
- "2,35": 3,
- "2,36": 3,
- "2,37": 3,
- "2,38": 3,
- "2,39": 3,
- "2,40": 3,
+ "2,26": 4,
+ "2,27": 3,
+ "2,28": 3,
+ "2,29": 4,
+ "2,30": 4,
+ "2,31": 4,
+ "2,32": 4,
+ "2,33": 4,
+ "2,34": 4,
+ "2,35": 4,
+ "2,36": 4,
+ "2,37": 4,
+ "2,38": 4,
+ "2,39": 4,
+ "2,40": 4,
"2,41": 0,
- "3,1": 4,
- "3,2": 2,
- "3,4": 5,
- "3,29": 5,
- "3,30": 5,
- "3,31": 5,
- "3,32": 5,
- "3,33": 5,
- "3,34": 5,
- "3,35": 5,
- "3,36": 5,
- "3,37": 5,
- "3,38": 5,
- "3,39": 5,
+ "3,1": 5,
+ "3,2": 3,
+ "3,4": 6,
+ "3,29": 6,
+ "3,30": 6,
+ "3,31": 6,
+ "3,32": 6,
+ "3,33": 6,
+ "3,34": 6,
+ "3,35": 6,
+ "3,36": 6,
+ "3,37": 6,
+ "3,38": 6,
+ "3,39": 6,
"3,41": 0,
- "4,1": 5,
- "4,2": 5,
- "4,3": 5,
- "4,4": 5,
- "4,5": 5,
- "4,6": 5,
- "4,7": 5,
- "4,8": 5,
- "4,9": 5,
- "4,10": 5,
- "4,11": 5,
- "4,12": 5,
- "4,13": 5,
- "4,14": 5,
- "4,15": 5,
- "4,16": 5,
- "4,17": 5,
- "4,18": 5,
- "4,19": 5,
- "4,20": 5,
- "4,21": 5,
- "4,22": 5,
- "4,23": 5,
- "4,24": 5,
- "4,26": 3,
- "4,27": 3,
- "4,28": 3,
- "4,29": 3,
- "4,30": 3,
- "4,31": 3,
- "4,32": 3,
- "4,33": 3,
- "4,34": 3,
- "4,35": 3,
- "4,36": 3,
- "4,37": 3,
- "4,38": 3,
- "4,39": 3,
- "4,40": 3,
+ "4,1": 6,
+ "4,2": 6,
+ "4,3": 6,
+ "4,4": 6,
+ "4,5": 6,
+ "4,6": 6,
+ "4,7": 6,
+ "4,8": 6,
+ "4,9": 6,
+ "4,10": 6,
+ "4,11": 6,
+ "4,12": 6,
+ "4,13": 6,
+ "4,14": 6,
+ "4,15": 6,
+ "4,16": 6,
+ "4,17": 6,
+ "4,18": 6,
+ "4,19": 6,
+ "4,20": 6,
+ "4,21": 6,
+ "4,22": 6,
+ "4,23": 6,
+ "4,24": 6,
+ "4,26": 4,
+ "4,27": 4,
+ "4,28": 4,
+ "4,29": 4,
+ "4,30": 4,
+ "4,31": 4,
+ "4,32": 4,
+ "4,33": 4,
+ "4,34": 4,
+ "4,35": 4,
+ "4,36": 4,
+ "4,37": 4,
+ "4,38": 4,
+ "4,39": 4,
+ "4,40": 4,
"4,41": 0,
- "5,1": 4,
- "5,2": 2,
- "5,3": 2,
- "5,4": 3,
- "5,15": 4,
- "5,16": 2,
- "5,17": 3,
- "5,29": 3,
- "5,30": 3,
- "5,31": 3,
- "5,32": 3,
- "5,33": 3,
- "5,34": 3,
- "5,35": 3,
- "5,36": 3,
- "5,37": 3,
- "5,38": 3,
- "5,39": 3,
+ "5,1": 5,
+ "5,2": 3,
+ "5,3": 3,
+ "5,4": 4,
+ "5,15": 5,
+ "5,16": 3,
+ "5,17": 4,
+ "5,29": 4,
+ "5,30": 4,
+ "5,31": 4,
+ "5,32": 4,
+ "5,33": 4,
+ "5,34": 4,
+ "5,35": 4,
+ "5,36": 4,
+ "5,37": 4,
+ "5,38": 4,
+ "5,39": 4,
"5,41": 0,
- "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,26": 3,
- "6,27": 3,
- "6,28": 3,
- "6,29": 3,
- "6,30": 3,
- "6,31": 3,
- "6,32": 3,
- "6,33": 3,
- "6,34": 3,
- "6,35": 3,
- "6,36": 3,
- "6,37": 3,
- "6,38": 3,
- "6,39": 3,
- "6,40": 3,
+ "6,1": 6,
+ "6,2": 6,
+ "6,3": 6,
+ "6,4": 6,
+ "6,5": 6,
+ "6,6": 6,
+ "6,7": 6,
+ "6,8": 6,
+ "6,9": 6,
+ "6,10": 6,
+ "6,11": 6,
+ "6,12": 6,
+ "6,13": 6,
+ "6,14": 6,
+ "6,15": 6,
+ "6,16": 6,
+ "6,17": 6,
+ "6,18": 6,
+ "6,19": 6,
+ "6,20": 6,
+ "6,21": 6,
+ "6,22": 6,
+ "6,23": 6,
+ "6,24": 6,
+ "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,
+ "6,35": 4,
+ "6,36": 4,
+ "6,37": 4,
+ "6,38": 4,
+ "6,39": 4,
+ "6,40": 4,
"6,41": 0,
- "7,1": 3,
- "7,3": 2,
- "7,4": 3,
- "7,5": 2,
- "7,6": 5,
- "7,7": 5,
- "7,8": 5,
- "7,9": 5,
- "7,10": 5,
- "7,11": 5,
- "7,12": 5,
- "7,13": 5,
- "7,14": 5,
- "7,15": 5,
- "7,16": 5,
- "7,17": 5,
- "7,18": 5,
- "7,19": 5,
- "7,20": 5,
- "7,21": 5,
- "7,22": 5,
- "7,23": 5,
- "7,24": 5,
- "7,26": 3,
- "7,27": 3,
- "7,28": 3,
- "7,29": 3,
- "7,30": 3,
- "7,31": 3,
- "7,32": 3,
- "7,33": 3,
- "7,34": 3,
- "7,35": 3,
- "7,36": 3,
- "7,37": 3,
- "7,38": 3,
- "7,39": 3,
- "7,40": 3,
+ "7,1": 4,
+ "7,3": 3,
+ "7,4": 4,
+ "7,5": 3,
+ "7,6": 6,
+ "7,7": 6,
+ "7,8": 6,
+ "7,9": 6,
+ "7,10": 6,
+ "7,11": 6,
+ "7,12": 6,
+ "7,13": 6,
+ "7,14": 6,
+ "7,15": 6,
+ "7,16": 6,
+ "7,17": 6,
+ "7,18": 6,
+ "7,19": 6,
+ "7,20": 6,
+ "7,21": 6,
+ "7,22": 6,
+ "7,23": 6,
+ "7,24": 6,
+ "7,26": 4,
+ "7,27": 4,
+ "7,28": 4,
+ "7,29": 4,
+ "7,30": 4,
+ "7,31": 4,
+ "7,32": 4,
+ "7,33": 4,
+ "7,34": 4,
+ "7,35": 4,
+ "7,36": 4,
+ "7,37": 4,
+ "7,38": 4,
+ "7,39": 4,
+ "7,40": 4,
"7,41": 0,
- "8,1": 6,
- "8,2": 6,
- "8,3": 6,
- "8,4": 6,
- "8,5": 6,
- "8,6": 6,
- "8,7": 6,
- "8,8": 6,
- "8,9": 6,
- "8,10": 6,
- "8,11": 6,
- "8,12": 6,
- "8,13": 6,
- "8,14": 6,
- "8,15": 6,
- "8,16": 6,
- "8,17": 6,
- "8,18": 6,
- "8,19": 6,
- "8,20": 6,
- "8,21": 6,
- "8,22": 6,
- "8,23": 6,
- "8,24": 6,
- "8,25": 6,
- "8,26": 6,
- "8,27": 6,
- "8,28": 6,
- "8,29": 6,
- "8,30": 6,
- "8,31": 6,
- "8,32": 6,
- "8,33": 6,
- "8,34": 6,
- "8,35": 6,
- "8,36": 6,
- "8,37": 6,
- "8,38": 6,
- "8,39": 6,
- "8,40": 7,
+ "8,1": 7,
+ "8,2": 7,
+ "8,3": 7,
+ "8,4": 7,
+ "8,5": 7,
+ "8,6": 7,
+ "8,7": 7,
+ "8,8": 7,
+ "8,9": 7,
+ "8,10": 7,
+ "8,11": 7,
+ "8,12": 7,
+ "8,13": 7,
+ "8,14": 7,
+ "8,15": 7,
+ "8,16": 7,
+ "8,17": 7,
+ "8,18": 7,
+ "8,19": 7,
+ "8,20": 7,
+ "8,21": 7,
+ "8,22": 7,
+ "8,23": 7,
+ "8,24": 7,
+ "8,25": 7,
+ "8,26": 7,
+ "8,27": 7,
+ "8,28": 7,
+ "8,29": 7,
+ "8,30": 7,
+ "8,31": 7,
+ "8,32": 7,
+ "8,33": 7,
+ "8,34": 7,
+ "8,35": 7,
+ "8,36": 7,
+ "8,37": 7,
+ "8,38": 7,
+ "8,39": 7,
+ "8,40": 8,
"8,41": 0,
- "9,40": 2,
+ "9,40": 3,
"9,41": 0,
"10,41": 0,
"11,41": 0,
@@ -1006,47 +992,47 @@
"14,41": 0,
"15,41": 0,
"16,41": 0,
- "17,1": 5,
- "17,2": 5,
- "17,3": 5,
- "17,4": 5,
- "17,5": 5,
- "17,6": 5,
- "17,7": 5,
- "17,8": 5,
- "17,9": 5,
- "17,10": 5,
- "17,11": 5,
- "17,12": 5,
- "17,13": 5,
- "17,14": 5,
- "17,15": 5,
- "17,16": 5,
- "17,17": 5,
- "17,18": 5,
- "17,19": 5,
- "17,20": 5,
- "17,21": 5,
- "17,22": 5,
- "17,23": 5,
- "17,24": 5,
- "17,25": 5,
- "17,26": 5,
- "17,27": 5,
- "17,28": 5,
- "17,29": 5,
- "17,30": 5,
- "17,31": 5,
- "17,32": 5,
- "17,33": 5,
- "17,34": 5,
- "17,35": 5,
- "17,36": 5,
- "17,37": 5,
- "17,38": 5,
- "17,39": 5,
- "17,40": 5,
- "17,41": 8,
+ "17,1": 6,
+ "17,2": 6,
+ "17,3": 6,
+ "17,4": 6,
+ "17,5": 6,
+ "17,6": 6,
+ "17,7": 6,
+ "17,8": 6,
+ "17,9": 6,
+ "17,10": 6,
+ "17,11": 6,
+ "17,12": 6,
+ "17,13": 6,
+ "17,14": 6,
+ "17,15": 6,
+ "17,16": 6,
+ "17,17": 6,
+ "17,18": 6,
+ "17,19": 6,
+ "17,20": 6,
+ "17,21": 6,
+ "17,22": 6,
+ "17,23": 6,
+ "17,24": 6,
+ "17,25": 6,
+ "17,26": 6,
+ "17,27": 6,
+ "17,28": 6,
+ "17,29": 6,
+ "17,30": 6,
+ "17,31": 6,
+ "17,32": 6,
+ "17,33": 6,
+ "17,34": 6,
+ "17,35": 6,
+ "17,36": 6,
+ "17,37": 6,
+ "17,38": 6,
+ "17,39": 6,
+ "17,40": 6,
+ "17,41": 9,
"18,41": 0
},
"SheetStyle": {
@@ -1066,9 +1052,10 @@
"5,15,1,2",
"5,4,1,10",
"5,17,1,12",
- "10,1,7,40",
"3,4,1,25",
- "1,17,1,24"
+ "1,17,1,24",
+ "10,1,7,40",
+ "1,6,1,7"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1128,4 +1115,4 @@
"Formula": "汇报管理!$B$19"
}
]
-}//+YM6SyX6BAkMdPllyjRlG8UKuVhzC/vzAfkcwXkxLbB/Oneg15DwFhl92bLQCB0UdB57KpT55q9lqMNICgz0z+0T2P/SjXGxPbC/7H4zIGCoYaLg/sB8T8Myxg35x4KL5VtxwwHKBG5S54TkDU4glr3thl/RRmNbyuhYqyOf31RgpW/r+ZYxTM1YkBfkcbS9GUcJhgiFwwlqrbLrxVbVmRDg388W0X8uNUqktKkMyFBDL7cOGpZnSdVQXr1ZR3/wQC39PmChsbv1DsOmMBGZdu3MN1UaP71dKKIOQXn+bb1T3tP4BQCIFmFcadcZ14ZuN5sYZCIx+bG+jybpYXipv+fUfb4D3RM0Lc0j919N1DiFleXhPEaOf/bapq9R85UrzApYXcJ3AX0cBNPG+QqsZccOKa6aowwDAhR+mzmtk+pADyoh0a3foR65in/HR1KQMaPXMjsz8q32O5+MS864kdzkJi+CyO/GVPrfFp8Ko5CnIqWqYHbMEXIj+2daL83uTvnDGdPHdCE02nrQ/fYb0XbkvgboWgjeBMes6I2cLEINrBPYPhbWZ7ApRPdNOnbbLucsmAo5bsA5GGMSSuqWiQ1hLxU9HBJtmgAstzQWqmvtrSvX2yewYF0P8ELQgsV8aDaBFrieMxBE6ZSRBvgc4z0QJiv3B/XsYVQPXigxE5NKXJeO/Y94X+eSoyCDzYpDA3LrDXVmiGaY1ilyf4J8paG5mdNVtW0/Z9BNklMKbiAHLjNgTjMgdMo1hc1uMPuk1sfp8v3kFqDKIr2G2gYVIriNE9Ve6emg56sMcBngL0W0rFIpNrzWsZu8no/eyTnEgfF4Sui3Oj2iQe9BIIkw2cOGpJSiq117YB/X1lpWOFsXfrlVsmVo2aCc3TQk1cYeD2BfdtyfhQKXY3zg1O0+dA==|920
\ No newline at end of file
+}//ER5dT0xrPLtQrujE/+eDOC7sJWiYARRImOqgnVj6gnaCiRxy5RPTwzSJkz6yQ5nONL8YJlqzWwhqwZVoyn6dbRAs68rKNwOVWxMFBoC1HOwBuxLQcDeg3ehSYO3lYJvBdL1gh+67yl83pO6Z/X+0zKFqeHwr7NuEr4hyi9JwCYQpCLRQ44yPThIerH2rBXwL8iU255KwSmfxLM3DW0C4V2lr75zpGqmcyLgiS8qSyjTEWrsTFDYtLbZr2/65tNicWUyDZqpje0SQFCk0QxD0k5uKlJJr5yb09+TsORpeEAdVd0ZzbT2CPPsdUqNOWBtmfQrmYYh5AT8CNfFStIstzYTxZXFPgqYOq/wKlTC/tReIDHnyqJyuVa+VWsZcefyU9AMx88oabRgW+eOMMqy95dRkbGQdxZoaKvC1CyzSFss5MnCHKM1DrpjsTa04HTUGQa+EpI7mL8sVhn72noGwHEEPNe6OzIoS4sE/PKGHZI1meABEqztR79NSF3UCPd8aMN8PSyWEBnx6jJY2S4kEJjE/L+TngVhzWpZRDwjkUIqc6JTwABJXbWDoz32iMRX9j3IwygD3oqvA9UuIE0KeE8kOXFXZ7ugPf9M0kPn0gA1f1nFRVd6kuyNCKpGZfJWNZTgrE/4jtaUnSGtbmu7d/juhR0VcF4p17crEUk4mxWBMpqTYfyzqNcJvCRoLQQ9DGrdlSxcpBCNbuhqgsQimQQXteQsGlmirWPgYJ2tT11+ic9CZwt+POe6CF8nExKnqISCyqpm96ZSNgpMI3YhJFCjvzeawySGbViEe4FAZxKAVN5y/UhUsBs5Zo5J5KQIymiEQ7r2PBqFIpISPWfKUG8VOjOufmmuawuWTjiJIEfPXm2NDFbTgIQSUANSqChTGPCdQfiJajBVEDpSUD6CJKw==|920
\ No newline at end of file
diff --git a/Plugin/PC组件包-格友工作室定制版-10_0_2_0.zip b/Plugin/PC组件包-格友工作室定制版-10_0_2_0.zip
index 0796d8e9..a365d8b6 100644
Binary files a/Plugin/PC组件包-格友工作室定制版-10_0_2_0.zip and b/Plugin/PC组件包-格友工作室定制版-10_0_2_0.zip differ
diff --git a/ServerCommands/汇报/单日自动生成工作日报.json b/ServerCommands/汇报/单日自动生成工作日报.json
index 6d523cbe..ce8a92a7 100644
--- a/ServerCommands/汇报/单日自动生成工作日报.json
+++ b/ServerCommands/汇报/单日自动生成工作日报.json
@@ -192,33 +192,26 @@
"BindingInfo": {
"TableName": "汇报记录表",
"ColumnName": "汇报类型",
- "GUID": "b3a5a232-c78d-4625-ae78-3aa6fbefcb39"
+ "GUID": "5bcbdbb2-ab07-4e79-aa69-0ec84fbe5751"
},
- "Value": "日报"
+ "Value": "个人日报"
},
{
"BindingInfo": {
"TableName": "汇报记录表",
"ColumnName": "开始日期",
- "GUID": "7d040eb3-673c-4a5b-9d4c-2d0f13dee05c"
+ "GUID": "d97fb1e2-b359-4b2e-b2c9-6238b5c6508a"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=TODAY()"
}
},
- {
- "BindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "截止日期",
- "GUID": "1ff87678-9541-442b-b47e-78f31cd11587"
- }
- },
{
"BindingInfo": {
"TableName": "汇报记录表",
"ColumnName": "汇报人",
- "GUID": "0cbf0bf4-2ff5-4be8-9e84-85b4098d9f0a"
+ "GUID": "b0f7abf6-320b-4e90-90d9-e787bcbb7a97"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -229,7 +222,7 @@
"BindingInfo": {
"TableName": "汇报记录表",
"ColumnName": "内容",
- "GUID": "b298647c-8024-4c13-b7c9-866b133897dd"
+ "GUID": "dc75653c-83a6-4142-be7e-0409f81d2f54"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -240,7 +233,7 @@
"BindingInfo": {
"TableName": "汇报记录表",
"ColumnName": "总工时",
- "GUID": "9ff2c05e-d7b4-4596-a35b-5fa377bf7447"
+ "GUID": "b204ba83-7163-4bad-b1e0-ad29580a2e17"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -250,7 +243,7 @@
]
}
],
- "ID": "6c072c5a-eff0-463d-9e68-f1e5cf82e8de"
+ "ID": "43908d25-436d-4c69-a6e9-3601f546c215"
},
{
"CommandList": [
@@ -276,25 +269,18 @@
"BindingInfo": {
"TableName": "汇报记录表",
"ColumnName": "开始日期",
- "GUID": "b99ff8ab-af7c-482c-ac31-72cc37bcb7a6"
+ "GUID": "3a31c9e2-8140-4740-8186-78fffffeee8a"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=汇报日期"
}
},
- {
- "BindingInfo": {
- "TableName": "汇报记录表",
- "ColumnName": "截止日期",
- "GUID": "153688bd-3aee-4394-b83f-a5782b86c4e1"
- }
- },
{
"BindingInfo": {
"TableName": "汇报记录表",
"ColumnName": "汇报人",
- "GUID": "d96ee4c5-981d-4035-bac9-0b93bec01517"
+ "GUID": "36bd0b71-7e49-4c55-9b9d-27caa38748bd"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -305,7 +291,7 @@
"BindingInfo": {
"TableName": "汇报记录表",
"ColumnName": "内容",
- "GUID": "9c1dff95-830b-44d2-a448-a00b4e300231"
+ "GUID": "6d1fc71a-8d21-49d0-b2cd-a9ed1cfd4b6d"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -316,7 +302,7 @@
"BindingInfo": {
"TableName": "汇报记录表",
"ColumnName": "总工时",
- "GUID": "cfb960f7-22a5-4efb-8d62-3b35f103ceb1"
+ "GUID": "18d4f23e-c763-4c4e-a151-fb4e4112fa21"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -326,17 +312,17 @@
]
}
],
- "ID": "de2eadd4-9642-49a4-99c0-b6eff3bff30c"
+ "ID": "53490be1-b27a-48ea-bf58-086ed310c298"
}
]
}
],
- "ID": "f754b2b4-6995-4438-8e89-1d3600a0b77c"
+ "ID": "9a57d033-7e24-4b02-a1a6-09dda167ada6"
}
]
}
],
- "ID": "582b025d-ca4e-4276-a182-21b31be3db98"
+ "ID": "f483d112-b146-42be-b614-f5d3951b360f"
}
]
}
diff --git a/Tables/汇报/汇报记录表.json b/Tables/汇报/汇报记录表.json
index 8524f2a3..b0e78a1e 100644
--- a/Tables/汇报/汇报记录表.json
+++ b/Tables/汇报/汇报记录表.json
@@ -1,5 +1,6 @@
{
"Name": "汇报记录表",
+ "ShowBuiltInFields": true,
"Columns": [
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
diff --git a/Theme/CellTypeStyles b/Theme/CellTypeStyles
index 75fba4d1..fa87e3d8 100644
--- a/Theme/CellTypeStyles
+++ b/Theme/CellTypeStyles
@@ -1 +1 @@
-{"Forguncy.CustomMenu.ForguncyMenuCellTypeStyleTemplateSupportAttribute":[{"Key":"横向迷你菜单","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"black","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"4px 4px 4px 4px"},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"透明菜单","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Background 1 -15","Background":"Text 1 0","BorderRadiusString":"6px 6px 6px 6px"},"HoverStyle":{"Background":"Text 1 15"},"SelectedStyle":{"FontColor":"Background 1 0","Background":"Background 2 -75"},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"FontColor":"Background 1 -15","Background":"Text 1 0","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Text 1 15"},"SelectedStyle":{"FontColor":"Background 1 0","Background":"Text 1 15"},"Transition":"0.3s"},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"BalckWhite","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","BorderTopString":"","BorderRightString":"","BorderBottomString":"","BorderLeftString":"3px solid Background_1_0","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 50"},"SelectedStyle":{"FontColor":"Accent 1 0","BorderLeftString":"3px solid Accent_1_0","Bold":true},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"流程样式","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 35","Background":"#FFECF9FF","BorderRadiusString":"0px 0px 0px 0px","Bold":true},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"Background":"Accent 1 80"},"Transition":"0.15s"},"LEVEL1":{"NormalStyle":{"FontColor":"Text 1 35","Background":"#FFF3F9FC","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"FontColor":"Accent 1 0","Background":"Background 1 0"},"Transition":"0.15s"},"LEVEL2":{"NormalStyle":{"FontColor":"Accent 1 14","Background":"Background 1","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"Background":"Accent 1 80"},"Transition":"0.15s"},"LEVEL3":{"NormalStyle":{"FontColor":"Accent 1 14","Background":"Background 1","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"Background":"Accent 1 80"},"Transition":"0.15s"}}}],"Forguncy.RepeaterCellTypeStyleTemplateSupportAttribute":[{"Key":"悬浮变灰","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 2 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"浅蓝色扁平卡片","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 2 0","BorderRadiusString":"8px 8px 8px 8px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"#FFEEEEEE","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"横向分割","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderTopString":"","BorderRightString":"","BorderBottomString":"1px solid Background_2_0","BorderLeftString":"","BorderRadiusString":"0px 0px 0px 0px"},"FocusStyle":{"BorderBottomString":"1px solid Accent_1_0"}}}},{"Key":"横排分割","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderRightString":"1px solid Background_2_0","BorderLeftString":"1px solid Background_2_0","BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"渐变卡片","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"linear-gradient(-180deg, #FFFDFBFB 0.00%, #FFEBEDEE 100.00%)","BorderString":"1px solid Background_2_0","BorderRadiusString":"10px 10px 10px 10px","BoxShadowString":"3px 3px 10px 0px #0B000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"HoverStyle":{"BorderString":"1px solid Accent_1_60","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"FocusStyle":{"BorderString":"1px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"ActiveStyle":{"MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"SelectedStyle":{"BorderString":"1px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"Transition":"0.3s"}}},{"Key":"普通_悬浮变白_","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 1 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"竖排无样式","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 2 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"BlackWhite","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderString":"2px solid Background_2_0","BorderRadiusString":"8px 8px 8px 8px","BoxShadowString":"3px 3px 5px 0px #20000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"HoverStyle":{"BoxShadowString":"5px 7px 15px 0px #17000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"FocusStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"ActiveStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"SelectedStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"Transition":"0.3s"}}},{"Key":"_RS_Static","Category":"_RS_Normal","Styles":{"TEMPLATE":{"NormalStyle":{"BorderTopString":"","BorderRightString":"","BorderBottomString":"","BorderLeftString":"3px solid Accent_1_0","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px","MarginTop":10,"MarginBottom":10},"Transition":"0.15s"}}},{"Key":"_RS_Selectable","Category":"_RS_Normal","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"4px 4px 4px 4px","BoxShadowString":"0px 0px 5px 0px Text_1_5_38","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"BoxShadowString":"0px 0px 7px 0px Accent_1_0_89"},"FocusStyle":{"BoxShadowString":"0px 0px 7px 0px Accent_1_0_165"},"ActiveStyle":{"BoxShadowString":"0px 0px 7px 0px Accent_1_0_165"},"Transition":"0.15s"}}},{"Key":"样式1","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"2px 2px 2px 2px","MarginLeft":10,"MarginRight":10,"MarginTop":10},"Transition":"0.15s"}}}],"Forguncy.ImageCellTypeStyleTemplateSupportAttribute":[{"Key":"pd_3","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px","PaddingLeft":3,"PaddingRight":3,"PaddingTop":3,"PaddingBottom":3},"HoverStyle":{"PaddingLeft":3,"PaddingRight":3,"PaddingTop":3,"PaddingBottom":3},"ActiveStyle":{"PaddingLeft":3,"PaddingRight":3,"PaddingTop":3,"PaddingBottom":3},"DisableStyle":{"PaddingLeft":3,"PaddingTop":3,"Opacity":0.43092983733916}}}},{"Key":"圆形","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"100px 100px 100px 100px","PaddingLeft":2,"PaddingRight":2,"PaddingTop":2,"PaddingBottom":2},"HoverStyle":{"PaddingLeft":2,"PaddingRight":2,"PaddingTop":2,"PaddingBottom":2},"ActiveStyle":{"PaddingLeft":2,"PaddingRight":2,"PaddingTop":2,"PaddingBottom":2},"DisableStyle":{"PaddingLeft":2,"PaddingRight":2,"PaddingTop":2,"PaddingBottom":2}}}},{"Key":"按钮图标","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Background 1 -50","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"上圆角封面","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"8px 8px 0px 0px"}}}},{"Key":"pd_10","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":10,"PaddingBottom":10}}}},{"Key":"中圆角","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"10px 10px 10px 10px"}}}},{"Key":"_RS_Mini","Category":"_RS_RecommendStyle","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Text 1 35","BorderRadiusString":"0px 0px 0px 0px","MarginLeft":16,"MarginRight":16,"MarginTop":16,"MarginBottom":16},"HoverStyle":{"FontColor":"Accent 1 40","MarginLeft":16,"MarginRight":16,"MarginTop":16,"MarginBottom":16},"ActiveStyle":{"FontColor":"Accent 1 -25","MarginLeft":16,"MarginRight":16,"MarginTop":16,"MarginBottom":16}}},"Scope":1}],"Forguncy.ButtonCellTypeStyleTemplateSupportAttribute":[{"Key":"Gitee按钮","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1 0","Background":"#FFC00000","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"20px 20px 20px 20px"},"HoverStyle":{"Background":"#FFD80000"},"FocusStyle":{"BoxShadowString":"0px 0px 1px 2px Accent_1_60"},"DisableStyle":{"Opacity":0.41848611369660227},"Transition":"0.15s"}},"StyleTemplateFashionScope":2},{"Key":"圆形按钮","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Accent 1 0","Background":"Accent 1 80 127","BorderString":"1px solid Accent_1_60","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"11px 11px 11px 11px"},"HoverStyle":{"Background":"Accent 1 80","BoxShadowString":"3px 3px 9px 0px #0D000000"},"ActiveStyle":{"Background":"Accent 1 60"},"DisableStyle":{"FontColor":"Background 1 -25","Background":"Background 1 -5","BorderString":"1px solid Background_1_-15"},"Transition":"0.15s"}},"StyleTemplateFashionScope":2},{"Key":"动态背景","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"6px 6px 6px 6px"},"DisableStyle":{"Opacity":0.445079736545843}}}},{"Key":"链接样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 0"},"Transition":"0.3s"}}},{"Key":"圆角浮动","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1 -50","Background":"Background 1 0","BorderString":"1px solid Background_2_0","BorderRadiusString":"20px 20px 20px 20px","BoxShadowString":"5px 5px 16px 0px #10000000"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"Gost","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"8px 8px 8px 8px"},"HoverStyle":{"Background":"Background 2 0"},"DisableStyle":{"Opacity":0.44507973654584293},"Transition":"0.3s"}}},{"Key":"流程样式2","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Accent 1 40","Background":"Background 1 0","BorderString":"1px solid Text_2_40","BorderRadiusString":"4px 4px 4px 4px","MarginLeft":4,"MarginRight":4,"MarginTop":4,"MarginBottom":4},"HoverStyle":{"FontColor":"Text 2 40","Background":"Accent 1 80","BorderString":"1px solid Text_2_40"},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_60"},"ActiveStyle":{"FontColor":"Background 1 0","Background":"Accent 1 40","BorderString":"1px solid Accent_1_40"},"DisableStyle":{"FontColor":"Background 1 -25","Background":"#FFFFFF","BorderString":"1px solid Background_1_-25"},"Transition":"0.15s"}}},{"Key":"流程样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1","Background":"Accent 1","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"4px 4px 4px 4px","MarginLeft":4,"MarginRight":4,"MarginTop":4,"MarginBottom":4},"HoverStyle":{"Background":"Accent 1 20"},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_40"},"ActiveStyle":{"Background":"Accent 1 -20"},"DisableStyle":{"FontColor":"#EEEEEE","Background":"Text 1 50","BorderString":"1px solid #AAAAAA"},"Transition":"0.15s"}}}],"Forguncy.HyperlinkCellTypeStyleTemplateSupportAttribute":[{"Key":"红色带背景","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"FontColor":"Accent 5 0","Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","PaddingLeft":5,"PaddingRight":5},"HoverStyle":{"Background":"Accent 5 80 51"},"DisableStyle":{"Opacity":0.41316738912675405},"Transition":"0.3s"}},"StyleTemplateFashionScope":2},{"Key":"黑色带背景","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","PaddingLeft":5,"PaddingRight":5},"HoverStyle":{"Background":"Accent 1 80 51"},"DisableStyle":{"Opacity":0.41316738912675405},"Transition":"0.3s"}},"StyleTemplateFashionScope":2},{"Key":"Gost","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"Background":"#00FFFFFF","BorderRadiusString":"5px 5px 5px 5px","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"HoverStyle":{"Background":"Background 2 0"},"Transition":"0.3s"}}}],"Forguncy.TextCellTypeStyleTemplateSupportAttribute":[{"Key":"多行输入框","Category":"_RS_Custom","Styles":{"MAIN":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","BorderString":"1px solid Background_2_-10","BorderRadiusString":"6px 6px 6px 6px","PaddingLeft":15,"PaddingRight":15,"PaddingTop":15,"PaddingBottom":15},"HoverStyle":{"BorderString":"1px solid Accent_1_40","PaddingLeft":15,"PaddingRight":15,"PaddingTop":15,"PaddingBottom":15},"FocusStyle":{"BorderString":"1px solid Accent_1_40","PaddingLeft":15,"PaddingRight":15,"PaddingTop":15,"PaddingBottom":15},"ActiveStyle":{"BorderString":"1px solid Accent_1_40","PaddingLeft":15,"PaddingRight":15,"PaddingTop":15,"PaddingBottom":15},"DisableStyle":{"FontColor":"Background 2 -50","Background":"Background 2 0","PaddingLeft":15,"PaddingRight":15,"PaddingTop":15,"PaddingBottom":15},"Transition":"0.3s"},"FGC_BUILDIN_ERROR":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"迷你输入框","Category":"_RS_Custom","Styles":{"MAIN":{"NormalStyle":{"FontColor":"Text 1 50","Background":"Background 2 0","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"20px 20px 20px 20px","PaddingLeft":5,"PaddingRight":5},"HoverStyle":{"FontColor":"Text 1 0","PaddingLeft":5,"PaddingRight":5},"FocusStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","PaddingLeft":5,"PaddingRight":5},"ActiveStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","PaddingLeft":5,"PaddingRight":5},"DisableStyle":{"PaddingLeft":5,"PaddingRight":5,"Opacity":0.500039890434274},"Transition":"0.3s"},"FGC_BUILDIN_ERROR":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"_RS_NewLittleRoundCorner","Category":"_RS_RecommendStyle","Styles":{"MAIN":{"NormalStyle":{"FontColor":"#394047","Background":"#FFFFFFFF","BorderString":"1px solid #ced4da","BorderRadiusString":"3px 3px 3px 3px","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"HoverStyle":{"BorderString":"1px solid Accent_1_0","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"FocusStyle":{"BorderString":"1px solid Accent_1_0","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"ActiveStyle":{"BorderString":"1px solid Accent_1_0","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"DisableStyle":{"FontColor":"Background 1 -25","BorderString":"1px solid Background_1_-15","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5,"Opacity":0.5},"Transition":"0.15s"},"FGC_BUILDIN_ERROR":{"NormalStyle":{"FontColor":"#394047","Background":"#FFFFFFFF","BorderString":"1px solid #ced4da","BorderRadiusString":"3px 3px 3px 3px"},"HoverStyle":{"BorderString":"1px solid Accent_1_0"},"FocusStyle":{"BorderString":"1px solid Accent_1_0"},"Transition":"0.15s"}},"StyleTemplateFashionScope":2},{"Key":"Gost","Category":"_RS_Custom","Styles":{"MAIN":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Background 2 0"},"FocusStyle":{"FontColor":"Text 1 0","Background":"Background 2 0"},"Transition":"0.3s"},"FGC_BUILDIN_ERROR":{"NormalStyle":{"BorderString":"1px solid #FFFF0000","BorderRadiusString":"5px 5px 5px 5px"}}}}],"Forguncy.ProcessPanelCellTypeStyleTemplateSupportAttribute":[{"Key":"流程样式2","Category":"_RS_Custom","Styles":{"PROCESS_PANEL":{"NormalStyle":{"FontColor":"Accent 1","Background":"Background 1","BorderString":"1px solid Accent_1","BorderRadiusString":"4px 4px 4px 4px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"HoverStyle":{"Background":"Accent 1 80","BorderString":"1px solid Accent_1","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_60","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"ActiveStyle":{"Background":"Accent 1 80","BorderString":"1px solid Accent_1","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"DisableStyle":{"FontColor":"#EEEEEE","Background":"#FFFFFF","BorderString":"1px solid Background_1_-35","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"Transition":"0.15s"}}},{"Key":"流程样式","Category":"_RS_Custom","Styles":{"PROCESS_PANEL":{"NormalStyle":{"FontColor":"Background 1","Background":"Accent 1","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"4px 4px 4px 4px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"HoverStyle":{"Background":"Accent 1 20","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_60","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"ActiveStyle":{"Background":"Accent 1 -20","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"DisableStyle":{"FontColor":"#EEEEEE","Background":"Background 1 -35","BorderString":"1px solid Background 1 -35","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"Transition":"0.15s"}}}],"Forguncy.ForguncyPivotTableCellTypeStyleTemplateSupport":[{"Key":"负荷透视表","Category":"_RS_Custom","Styles":{"WholeTable":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","BorderString":"1px solid Background_2_-25","InsideHorizontalBorderString":"1px solid Background_2_-25","InsideVerticalBorderString":"1px solid Background_2_-25","BorderRadiusString":"0px 0px 0px 0px","CellHorizontalAlignment":"Center","CellVerticalAligment":"Center","FrozenlineColor":"Background 2 -25"}},"FirstColStripe":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 2 0","BorderRightString":"2px solid Background_2_-10","BorderRadiusString":"0px 0px 0px 0px"}},"SecondColStripe":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"FirstRowStripe":{"NormalStyle":{"FontColor":"black","Background":"Background 2 0","BorderString":"1px solid Background_2_0","InsideHorizontalBorderString":"1px solid Background_2_0","InsideVerticalBorderString":"1px solid Background_2_0","BorderRadiusString":"0px 0px 0px 0px"}},"SecondRowStripe":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 2 0","BorderString":"1px solid Background_2_0","InsideHorizontalBorderString":"1px solid Background_2_0","InsideVerticalBorderString":"1px solid Background_2_0","BorderRadiusString":"0px 0px 0px 0px"}},"FirstColumn":{"NormalStyle":{"FontColor":"Text 1 0","BorderRightString":"2px solid Background_2_-10","BorderRadiusString":"0px 0px 0px 0px","CellHorizontalAlignment":"Center","CellVerticalAligment":"Center","Bold":true}},"HeaderRow":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 2 0","BorderString":"1px solid Background_2_-25","InsideHorizontalBorderString":"1px solid Background_2_-25","InsideVerticalBorderString":"1px solid Background_2_-25","BorderRadiusString":"0px 0px 0px 0px","CellHorizontalAlignment":"Center","CellVerticalAligment":"Center","Bold":true}},"SubtotalCol1":{"NormalStyle":{"FontColor":"Accent 1 0","BorderRadiusString":"0px 0px 0px 0px","Bold":true}},"SubtotalCol2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"SubtotalCol3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"SubtotalRow1":{"NormalStyle":{"FontColor":"Accent 1 0","BorderRadiusString":"0px 0px 0px 0px","Bold":true}},"SubtotalRow2":{"NormalStyle":{"FontColor":"Accent 1 0","BorderRadiusString":"0px 0px 0px 0px","Bold":true}},"SubtotalRow3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"ColSubheading1":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"ColSubheading2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"ColSubheading3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"RowSubheading1":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"RowSubheading2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"RowSubheading3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"GrandTotalColumn":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"GrandTotalRow":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 2 0","BorderString":"1px solid Background_2_-25","InsideHorizontalBorderString":"1px solid Background_2_-25","InsideVerticalBorderString":"1px solid Background_2_-25","BorderRadiusString":"0px 0px 0px 0px","Bold":true}}},"StyleTemplateFashionScope":2}],"Forguncy.TabControlCellTypeStyleTemplateSupportAttribute":[{"Key":"样式1","Category":"_RS_Custom","Styles":{"TabControlHeader":{"NormalStyle":{"FontColor":"Text 1 50","Background":"Background 1 0","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Accent 1 0"},"ActiveStyle":{"FontColor":"Accent 1 0"},"SelectedStyle":{"FontColor":"Accent 1 0","BorderBottomString":"2px solid Accent_1_0"},"Transition":"0.15s"},"TabControlContainer":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"_RS_NewFashionStyle1","Category":"_RS_RecommendStyle","Styles":{"TabControlHeader":{"NormalStyle":{"FontColor":"Text 1 50","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Accent 1 0"},"ActiveStyle":{"FontColor":"Accent 1 0"},"SelectedStyle":{"FontColor":"Accent 1 0","BorderBottomString":"2px solid Accent_1_0"},"Transition":"0.15s"},"TabControlContainer":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}}]}
\ No newline at end of file
+{"Forguncy.CustomMenu.ForguncyMenuCellTypeStyleTemplateSupportAttribute":[{"Key":"横向迷你菜单","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"black","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"4px 4px 4px 4px"},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"透明菜单","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Background 1 -15","Background":"Text 1 0","BorderRadiusString":"6px 6px 6px 6px"},"HoverStyle":{"Background":"Text 1 15"},"SelectedStyle":{"FontColor":"Background 1 0","Background":"Background 2 -75"},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"FontColor":"Background 1 -15","Background":"Text 1 0","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Text 1 15"},"SelectedStyle":{"FontColor":"Background 1 0","Background":"Text 1 15"},"Transition":"0.3s"},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"BalckWhite","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","BorderTopString":"","BorderRightString":"","BorderBottomString":"","BorderLeftString":"3px solid Background_1_0","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 50"},"SelectedStyle":{"FontColor":"Accent 1 0","BorderLeftString":"3px solid Accent_1_0","Bold":true},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"流程样式","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 35","Background":"#FFECF9FF","BorderRadiusString":"0px 0px 0px 0px","Bold":true},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"Background":"Accent 1 80"},"Transition":"0.15s"},"LEVEL1":{"NormalStyle":{"FontColor":"Text 1 35","Background":"#FFF3F9FC","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"FontColor":"Accent 1 0","Background":"Background 1 0"},"Transition":"0.15s"},"LEVEL2":{"NormalStyle":{"FontColor":"Accent 1 14","Background":"Background 1","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"Background":"Accent 1 80"},"Transition":"0.15s"},"LEVEL3":{"NormalStyle":{"FontColor":"Accent 1 14","Background":"Background 1","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"Background":"Accent 1 80"},"Transition":"0.15s"}}}],"Forguncy.RepeaterCellTypeStyleTemplateSupportAttribute":[{"Key":"悬浮变灰","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 2 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"浅蓝色扁平卡片","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 2 0","BorderRadiusString":"8px 8px 8px 8px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"#FFEEEEEE","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"横向分割","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderTopString":"","BorderRightString":"","BorderBottomString":"1px solid Background_2_0","BorderLeftString":"","BorderRadiusString":"0px 0px 0px 0px"},"FocusStyle":{"BorderBottomString":"1px solid Accent_1_0"}}}},{"Key":"横排分割","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderRightString":"1px solid Background_2_0","BorderLeftString":"1px solid Background_2_0","BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"渐变卡片","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"linear-gradient(-180deg, #FFFDFBFB 0.00%, #FFEBEDEE 100.00%)","BorderString":"1px solid Background_2_0","BorderRadiusString":"10px 10px 10px 10px","BoxShadowString":"3px 3px 10px 0px #0B000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"HoverStyle":{"BorderString":"1px solid Accent_1_60","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"FocusStyle":{"BorderString":"1px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"ActiveStyle":{"MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"SelectedStyle":{"BorderString":"1px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"Transition":"0.3s"}}},{"Key":"普通_悬浮变白_","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 1 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"竖排无样式","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 2 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"BlackWhite","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderString":"2px solid Background_2_0","BorderRadiusString":"8px 8px 8px 8px","BoxShadowString":"3px 3px 5px 0px #20000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"HoverStyle":{"BoxShadowString":"5px 7px 15px 0px #17000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"FocusStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"ActiveStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"SelectedStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"Transition":"0.3s"}}},{"Key":"_RS_Static","Category":"_RS_Normal","Styles":{"TEMPLATE":{"NormalStyle":{"BorderTopString":"","BorderRightString":"","BorderBottomString":"","BorderLeftString":"3px solid Accent_1_0","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px","MarginTop":10,"MarginBottom":10},"Transition":"0.15s"}}},{"Key":"_RS_Selectable","Category":"_RS_Normal","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"4px 4px 4px 4px","BoxShadowString":"0px 0px 5px 0px Text_1_5_38","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"BoxShadowString":"0px 0px 7px 0px Accent_1_0_89"},"FocusStyle":{"BoxShadowString":"0px 0px 7px 0px Accent_1_0_165"},"ActiveStyle":{"BoxShadowString":"0px 0px 7px 0px Accent_1_0_165"},"Transition":"0.15s"}}},{"Key":"样式1","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"2px 2px 2px 2px","MarginLeft":10,"MarginRight":10,"MarginTop":10},"Transition":"0.15s"}}}],"Forguncy.ImageCellTypeStyleTemplateSupportAttribute":[{"Key":"幽灵样式","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"black","Background":"#00FFFFFF","BorderRadiusString":"3px 3px 3px 3px","Opacity":0.8931779558145182},"HoverStyle":{"Background":"#191E1E1E"},"ActiveStyle":{"Background":"#331E1E1E"},"DisableStyle":{"Opacity":0.4445253702354941},"Transition":"0.3s"}}},{"Key":"pd_3","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px","PaddingLeft":3,"PaddingRight":3,"PaddingTop":3,"PaddingBottom":3},"HoverStyle":{"PaddingLeft":3,"PaddingRight":3,"PaddingTop":3,"PaddingBottom":3},"ActiveStyle":{"PaddingLeft":3,"PaddingRight":3,"PaddingTop":3,"PaddingBottom":3},"DisableStyle":{"PaddingLeft":3,"PaddingTop":3,"Opacity":0.43092983733916}}}},{"Key":"圆形","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"100px 100px 100px 100px","PaddingLeft":2,"PaddingRight":2,"PaddingTop":2,"PaddingBottom":2},"HoverStyle":{"PaddingLeft":2,"PaddingRight":2,"PaddingTop":2,"PaddingBottom":2},"ActiveStyle":{"PaddingLeft":2,"PaddingRight":2,"PaddingTop":2,"PaddingBottom":2},"DisableStyle":{"PaddingLeft":2,"PaddingRight":2,"PaddingTop":2,"PaddingBottom":2}}}},{"Key":"按钮图标","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Background 1 -50","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"上圆角封面","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"8px 8px 0px 0px"}}}},{"Key":"pd_10","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":10,"PaddingBottom":10}}}},{"Key":"中圆角","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"10px 10px 10px 10px"}}}},{"Key":"_RS_Mini","Category":"_RS_RecommendStyle","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Text 1 35","BorderRadiusString":"0px 0px 0px 0px","MarginLeft":16,"MarginRight":16,"MarginTop":16,"MarginBottom":16},"HoverStyle":{"FontColor":"Accent 1 40","MarginLeft":16,"MarginRight":16,"MarginTop":16,"MarginBottom":16},"ActiveStyle":{"FontColor":"Accent 1 -25","MarginLeft":16,"MarginRight":16,"MarginTop":16,"MarginBottom":16}}},"Scope":1}],"Forguncy.ButtonCellTypeStyleTemplateSupportAttribute":[{"Key":"Gitee按钮","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1 0","Background":"#FFC00000","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"20px 20px 20px 20px"},"HoverStyle":{"Background":"#FFD80000"},"FocusStyle":{"BoxShadowString":"0px 0px 1px 2px Accent_1_60"},"DisableStyle":{"Opacity":0.41848611369660227},"Transition":"0.15s"}},"StyleTemplateFashionScope":2},{"Key":"圆形按钮","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Accent 1 0","Background":"Accent 1 80 127","BorderString":"1px solid Accent_1_60","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"11px 11px 11px 11px"},"HoverStyle":{"Background":"Accent 1 80","BoxShadowString":"3px 3px 9px 0px #0D000000"},"ActiveStyle":{"Background":"Accent 1 60"},"DisableStyle":{"FontColor":"Background 1 -25","Background":"Background 1 -5","BorderString":"1px solid Background_1_-15"},"Transition":"0.15s"}},"StyleTemplateFashionScope":2},{"Key":"动态背景","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"6px 6px 6px 6px"},"DisableStyle":{"Opacity":0.445079736545843}}}},{"Key":"链接样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 0"},"Transition":"0.3s"}}},{"Key":"圆角浮动","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1 -50","Background":"Background 1 0","BorderString":"1px solid Background_2_0","BorderRadiusString":"20px 20px 20px 20px","BoxShadowString":"5px 5px 16px 0px #10000000"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"Gost","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"8px 8px 8px 8px"},"HoverStyle":{"Background":"Background 2 0"},"DisableStyle":{"Opacity":0.44507973654584293},"Transition":"0.3s"}}},{"Key":"流程样式2","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Accent 1 40","Background":"Background 1 0","BorderString":"1px solid Text_2_40","BorderRadiusString":"4px 4px 4px 4px","MarginLeft":4,"MarginRight":4,"MarginTop":4,"MarginBottom":4},"HoverStyle":{"FontColor":"Text 2 40","Background":"Accent 1 80","BorderString":"1px solid Text_2_40"},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_60"},"ActiveStyle":{"FontColor":"Background 1 0","Background":"Accent 1 40","BorderString":"1px solid Accent_1_40"},"DisableStyle":{"FontColor":"Background 1 -25","Background":"#FFFFFF","BorderString":"1px solid Background_1_-25"},"Transition":"0.15s"}}},{"Key":"流程样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1","Background":"Accent 1","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"4px 4px 4px 4px","MarginLeft":4,"MarginRight":4,"MarginTop":4,"MarginBottom":4},"HoverStyle":{"Background":"Accent 1 20"},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_40"},"ActiveStyle":{"Background":"Accent 1 -20"},"DisableStyle":{"FontColor":"#EEEEEE","Background":"Text 1 50","BorderString":"1px solid #AAAAAA"},"Transition":"0.15s"}}}],"Forguncy.HyperlinkCellTypeStyleTemplateSupportAttribute":[{"Key":"红色带背景","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"FontColor":"Accent 5 0","Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","PaddingLeft":5,"PaddingRight":5},"HoverStyle":{"Background":"Accent 5 80 51"},"DisableStyle":{"Opacity":0.41316738912675405},"Transition":"0.3s"}},"StyleTemplateFashionScope":2},{"Key":"黑色带背景","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","PaddingLeft":5,"PaddingRight":5},"HoverStyle":{"Background":"Accent 1 80 51"},"DisableStyle":{"Opacity":0.41316738912675405},"Transition":"0.3s"}},"StyleTemplateFashionScope":2},{"Key":"Gost","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"Background":"#00FFFFFF","BorderRadiusString":"5px 5px 5px 5px","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"HoverStyle":{"Background":"Background 2 0"},"Transition":"0.3s"}}}],"Forguncy.TextCellTypeStyleTemplateSupportAttribute":[{"Key":"多行输入框","Category":"_RS_Custom","Styles":{"MAIN":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","BorderString":"1px solid Background_2_-10","BorderRadiusString":"6px 6px 6px 6px","PaddingLeft":15,"PaddingRight":15,"PaddingTop":15,"PaddingBottom":15},"HoverStyle":{"BorderString":"1px solid Accent_1_40","PaddingLeft":15,"PaddingRight":15,"PaddingTop":15,"PaddingBottom":15},"FocusStyle":{"BorderString":"1px solid Accent_1_40","PaddingLeft":15,"PaddingRight":15,"PaddingTop":15,"PaddingBottom":15},"ActiveStyle":{"BorderString":"1px solid Accent_1_40","PaddingLeft":15,"PaddingRight":15,"PaddingTop":15,"PaddingBottom":15},"DisableStyle":{"FontColor":"Background 2 -50","Background":"Background 2 0","PaddingLeft":15,"PaddingRight":15,"PaddingTop":15,"PaddingBottom":15},"Transition":"0.3s"},"FGC_BUILDIN_ERROR":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"迷你输入框","Category":"_RS_Custom","Styles":{"MAIN":{"NormalStyle":{"FontColor":"Text 1 50","Background":"Background 2 0","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"20px 20px 20px 20px","PaddingLeft":5,"PaddingRight":5},"HoverStyle":{"FontColor":"Text 1 0","PaddingLeft":5,"PaddingRight":5},"FocusStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","PaddingLeft":5,"PaddingRight":5},"ActiveStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","PaddingLeft":5,"PaddingRight":5},"DisableStyle":{"PaddingLeft":5,"PaddingRight":5,"Opacity":0.500039890434274},"Transition":"0.3s"},"FGC_BUILDIN_ERROR":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"_RS_NewLittleRoundCorner","Category":"_RS_RecommendStyle","Styles":{"MAIN":{"NormalStyle":{"FontColor":"#394047","Background":"#FFFFFFFF","BorderString":"1px solid #ced4da","BorderRadiusString":"3px 3px 3px 3px","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"HoverStyle":{"BorderString":"1px solid Accent_1_0","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"FocusStyle":{"BorderString":"1px solid Accent_1_0","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"ActiveStyle":{"BorderString":"1px solid Accent_1_0","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"DisableStyle":{"FontColor":"Background 1 -25","BorderString":"1px solid Background_1_-15","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5,"Opacity":0.5},"Transition":"0.15s"},"FGC_BUILDIN_ERROR":{"NormalStyle":{"FontColor":"#394047","Background":"#FFFFFFFF","BorderString":"1px solid #ced4da","BorderRadiusString":"3px 3px 3px 3px"},"HoverStyle":{"BorderString":"1px solid Accent_1_0"},"FocusStyle":{"BorderString":"1px solid Accent_1_0"},"Transition":"0.15s"}},"StyleTemplateFashionScope":2},{"Key":"Gost","Category":"_RS_Custom","Styles":{"MAIN":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Background 2 0"},"FocusStyle":{"FontColor":"Text 1 0","Background":"Background 2 0"},"Transition":"0.3s"},"FGC_BUILDIN_ERROR":{"NormalStyle":{"BorderString":"1px solid #FFFF0000","BorderRadiusString":"5px 5px 5px 5px"}}}}],"Forguncy.ProcessPanelCellTypeStyleTemplateSupportAttribute":[{"Key":"流程样式2","Category":"_RS_Custom","Styles":{"PROCESS_PANEL":{"NormalStyle":{"FontColor":"Accent 1","Background":"Background 1","BorderString":"1px solid Accent_1","BorderRadiusString":"4px 4px 4px 4px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"HoverStyle":{"Background":"Accent 1 80","BorderString":"1px solid Accent_1","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_60","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"ActiveStyle":{"Background":"Accent 1 80","BorderString":"1px solid Accent_1","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"DisableStyle":{"FontColor":"#EEEEEE","Background":"#FFFFFF","BorderString":"1px solid Background_1_-35","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"Transition":"0.15s"}}},{"Key":"流程样式","Category":"_RS_Custom","Styles":{"PROCESS_PANEL":{"NormalStyle":{"FontColor":"Background 1","Background":"Accent 1","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"4px 4px 4px 4px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"HoverStyle":{"Background":"Accent 1 20","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_60","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"ActiveStyle":{"Background":"Accent 1 -20","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"DisableStyle":{"FontColor":"#EEEEEE","Background":"Background 1 -35","BorderString":"1px solid Background 1 -35","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"Transition":"0.15s"}}}],"Forguncy.ForguncyPivotTableCellTypeStyleTemplateSupport":[{"Key":"负荷透视表","Category":"_RS_Custom","Styles":{"WholeTable":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","BorderString":"1px solid Background_2_-25","InsideHorizontalBorderString":"1px solid Background_2_-25","InsideVerticalBorderString":"1px solid Background_2_-25","BorderRadiusString":"0px 0px 0px 0px","CellHorizontalAlignment":"Center","CellVerticalAligment":"Center","FrozenlineColor":"Background 2 -25"}},"FirstColStripe":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 2 0","BorderRightString":"2px solid Background_2_-10","BorderRadiusString":"0px 0px 0px 0px"}},"SecondColStripe":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"FirstRowStripe":{"NormalStyle":{"FontColor":"black","Background":"Background 2 0","BorderString":"1px solid Background_2_0","InsideHorizontalBorderString":"1px solid Background_2_0","InsideVerticalBorderString":"1px solid Background_2_0","BorderRadiusString":"0px 0px 0px 0px"}},"SecondRowStripe":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 2 0","BorderString":"1px solid Background_2_0","InsideHorizontalBorderString":"1px solid Background_2_0","InsideVerticalBorderString":"1px solid Background_2_0","BorderRadiusString":"0px 0px 0px 0px"}},"FirstColumn":{"NormalStyle":{"FontColor":"Text 1 0","BorderRightString":"2px solid Background_2_-10","BorderRadiusString":"0px 0px 0px 0px","CellHorizontalAlignment":"Center","CellVerticalAligment":"Center","Bold":true}},"HeaderRow":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 2 0","BorderString":"1px solid Background_2_-25","InsideHorizontalBorderString":"1px solid Background_2_-25","InsideVerticalBorderString":"1px solid Background_2_-25","BorderRadiusString":"0px 0px 0px 0px","CellHorizontalAlignment":"Center","CellVerticalAligment":"Center","Bold":true}},"SubtotalCol1":{"NormalStyle":{"FontColor":"Accent 1 0","BorderRadiusString":"0px 0px 0px 0px","Bold":true}},"SubtotalCol2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"SubtotalCol3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"SubtotalRow1":{"NormalStyle":{"FontColor":"Accent 1 0","BorderRadiusString":"0px 0px 0px 0px","Bold":true}},"SubtotalRow2":{"NormalStyle":{"FontColor":"Accent 1 0","BorderRadiusString":"0px 0px 0px 0px","Bold":true}},"SubtotalRow3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"ColSubheading1":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"ColSubheading2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"ColSubheading3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"RowSubheading1":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"RowSubheading2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"RowSubheading3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"GrandTotalColumn":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"GrandTotalRow":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 2 0","BorderString":"1px solid Background_2_-25","InsideHorizontalBorderString":"1px solid Background_2_-25","InsideVerticalBorderString":"1px solid Background_2_-25","BorderRadiusString":"0px 0px 0px 0px","Bold":true}}},"StyleTemplateFashionScope":2}],"Forguncy.TabControlCellTypeStyleTemplateSupportAttribute":[{"Key":"样式1","Category":"_RS_Custom","Styles":{"TabControlHeader":{"NormalStyle":{"FontColor":"Text 1 50","Background":"Background 1 0","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Accent 1 0"},"ActiveStyle":{"FontColor":"Accent 1 0"},"SelectedStyle":{"FontColor":"Accent 1 0","BorderBottomString":"2px solid Accent_1_0"},"Transition":"0.15s"},"TabControlContainer":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"_RS_NewFashionStyle1","Category":"_RS_RecommendStyle","Styles":{"TabControlHeader":{"NormalStyle":{"FontColor":"Text 1 50","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Accent 1 0"},"ActiveStyle":{"FontColor":"Accent 1 0"},"SelectedStyle":{"FontColor":"Accent 1 0","BorderBottomString":"2px solid Accent_1_0"},"Transition":"0.15s"},"TabControlContainer":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}}]}
\ No newline at end of file
diff --git a/UserControlPages/折叠卡片.json b/UserControlPages/折叠卡片.json
new file mode 100644
index 00000000..6321c66f
--- /dev/null
+++ b/UserControlPages/折叠卡片.json
@@ -0,0 +1,565 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0,
+ "Mode": 1
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 18.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0,
+ "IsHidden": true
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 115.0,
+ "Mode": 1,
+ "IsHidden": true
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0,
+ "IsHidden": true
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0,
+ "IsHidden": true
+ }
+ },
+ "7": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
+ }
+ },
+ "8": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0,
+ "IsHidden": true
+ }
+ },
+ "9": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0,
+ "IsHidden": true
+ }
+ }
+ },
+ "InLogicalVisibleIndexes": [
+ 3,
+ 4,
+ 5,
+ 6,
+ 8,
+ 9
+ ],
+ "Count": 10,
+ "DefaultSize": 24.0
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "7": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "8": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "9": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 16.0
+ }
+ },
+ "10": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 59.0,
+ "Mode": 1
+ }
+ },
+ "11": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "12": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 18.0
+ }
+ },
+ "13": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 59.0,
+ "Mode": 1
+ }
+ },
+ "14": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ },
+ "15": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "16": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ }
+ },
+ "Count": 17,
+ "DefaultSize": 24.0
+ },
+ "Values": {
+ "1,1": "标题文字",
+ "1,13": "标签",
+ "4,1": "内容"
+ },
+ "Formulas": {
+ "1,15": "IF(D10,C10,B10)",
+ "2,1": "SUBSTITUTE(B5,CHAR(10),\" \")"
+ },
+ "AttachInfos": {
+ "1,1": {
+ "TemplateCellSource": "标题"
+ },
+ "1,10": {
+ "CellType": {
+ "$type": "ElementUI.Tag, ElementUI",
+ "CommandList": [],
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 4,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "ColorList": [
+ {
+ "color": "Accent 1"
+ },
+ {
+ "color": "Accent 2"
+ },
+ {
+ "color": "Accent 3"
+ },
+ {
+ "color": "Accent 4"
+ },
+ {
+ "color": "Accent 5"
+ },
+ {
+ "color": "Accent 6"
+ }
+ ],
+ "separator": ",",
+ "size": "default",
+ "effect": "light",
+ "allowAdd": false,
+ "addButtonSettings": {
+ "width": 100,
+ "text": "添加标签"
+ },
+ "ReadOnly": true
+ },
+ "TemplateCellSource": "标签"
+ },
+ "1,12": {
+ "CellType": {
+ "$type": "ElementUI.AvatarCellType, ElementUI",
+ "CommandList": [],
+ "showSystemAvatar": true
+ },
+ "TemplateCellSource": "用户名"
+ },
+ "1,13": {
+ "TemplateCellSource": "姓名"
+ },
+ "1,15": {
+ "CellType": {
+ "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=折叠卡片!D10"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=NOT(折叠卡片!D10)"
+ }
+ }
+ ]
+ }
+ ],
+ "ToolTip": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=IF(折叠卡片!D10,\"收起\",\"展开\")"
+ },
+ "Size": 18,
+ "ImagePath": "右箭头.svg",
+ "UseCellForeColor": true
+ }
+ },
+ "2,1": {
+ "CssName": "ec-label"
+ },
+ "4,1": {
+ "TemplateCellSource": "内容"
+ },
+ "6,1": {
+ "CellType": {
+ "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.CallUserControlPageCommand, ServerDesignerCommon",
+ "CommandName": "编辑按钮被点击"
+ }
+ ],
+ "ToolTip": "编辑",
+ "Size": 16,
+ "TemplateKey": "幽灵样式",
+ "ImagePath": "编辑.svg",
+ "UseCellForeColor": true
+ }
+ },
+ "6,3": {
+ "CellType": {
+ "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.CallUserControlPageCommand, ServerDesignerCommon",
+ "CommandName": "编辑按钮被点击"
+ },
+ {
+ "$type": "Forguncy.Model.CallUserControlPageCommand, ServerDesignerCommon",
+ "CommandName": "删除按钮被点击"
+ }
+ ],
+ "ToolTip": "删除",
+ "Size": 16,
+ "TemplateKey": "幽灵样式",
+ "ImagePath": "回收站.svg",
+ "UseCellForeColor": true
+ }
+ },
+ "9,1": {
+ "CellType": {
+ "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "Size": 14,
+ "ImagePath": "右箭头.svg",
+ "UseCellForeColor": true
+ }
+ },
+ "9,2": {
+ "CellType": {
+ "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "Size": 14,
+ "ImagePath": "向上箭头.svg",
+ "UseCellForeColor": true
+ }
+ },
+ "9,3": {
+ "CellType": {
+ "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
+ "Caption": "展开",
+ "Style": 1,
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "Location": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=折叠卡片!4:7"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=折叠卡片!D10"
+ }
+ },
+ {
+ "Location": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=折叠卡片!3:3"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=NOT(折叠卡片!D10)"
+ }
+ }
+ ]
+ }
+ ]
+ }
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "FontSize": 14.666666666666666,
+ "FontWeight": 0
+ },
+ {
+ "HorizontalAlignment": 1
+ },
+ {
+ "FontSize": 13.333333333333332,
+ "HorizontalAlignment": 2
+ },
+ {
+ "FontSize": 13.333333333333332,
+ "Foreground": 3,
+ "TextIndent": 5,
+ "HorizontalAlignment": 4
+ },
+ {
+ "FontFamily": 5,
+ "FontSize": 12.0,
+ "Foreground": 6
+ },
+ {
+ "FontSize": 12.0,
+ "Foreground": 6
+ },
+ {
+ "FontSize": 13.333333333333332,
+ "HorizontalAlignment": 4,
+ "VerticalAlignment": 7,
+ "WordWrap": true
+ },
+ {
+ "FontFamily": 5,
+ "FontSize": 13.333333333333332,
+ "Foreground": 8
+ },
+ {
+ "FontFamily": 5,
+ "FontSize": 13.333333333333332,
+ "Foreground": 9
+ },
+ {
+ "FontFamily": 5,
+ "FontSize": 12.0,
+ "Foreground": 6,
+ "BorderBottom": 0,
+ "BorderTop": 0,
+ "BorderLeft": 0,
+ "BorderRight": 0
+ },
+ {
+ "BorderBottom": 0,
+ "BorderTop": 0,
+ "BorderLeft": 0,
+ "BorderRight": 0
+ },
+ {
+ "FontFamily": 5,
+ "FontSize": 12.0,
+ "Foreground": 6,
+ "HorizontalAlignment": 1
+ },
+ {
+ "FontFamily": 5
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Bold",
+ "Right",
+ "Center",
+ "Text 1 0",
+ "Left",
+ "Body",
+ "Text 1 50",
+ "Top",
+ "black",
+ "Accent 5 0"
+ ],
+ "Borders": [
+ {
+ "Color": 8
+ }
+ ]
+ },
+ "CellStyles": {
+ "1,1": 0,
+ "1,10": 1,
+ "1,12": 2,
+ "1,13": 3,
+ "1,15": 4,
+ "2,1": 5,
+ "4,1": 6,
+ "6,1": 7,
+ "6,3": 8,
+ "9,1": 9,
+ "9,2": 9,
+ "9,3": 10,
+ "9,4": 10,
+ "9,5": 10,
+ "9,6": 11,
+ "9,7": 12,
+ "9,8": 12
+ },
+ "SheetStyle": {
+ "FontFamily": 5
+ }
+ },
+ "Spans": [
+ "9,3,1,3",
+ "1,1,1,8",
+ "4,1,1,15",
+ "2,1,1,8"
+ ],
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon",
+ "PropertyDefinitions": [
+ {
+ "Name": "标题"
+ },
+ {
+ "Name": "标签"
+ },
+ {
+ "Name": "内容"
+ },
+ {
+ "Name": "日期"
+ },
+ {
+ "Name": "姓名"
+ },
+ {
+ "Name": "用户名"
+ }
+ ],
+ "CommandDefinitions": [
+ {
+ "Name": "编辑按钮被点击"
+ },
+ {
+ "Name": "删除按钮被点击"
+ }
+ ],
+ "MethodDefinitions": [],
+ "PageLoadedCommandList": []
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ },
+ "BackgroundPictures": [
+ {
+ "FitToBrowserWidth": true,
+ "FitToBrowserHeight": true,
+ "Name": "ae262ab1-83b7-482a-a395-f30d215fb8eb.png",
+ "DisplayName": "背景图1",
+ "PictureCommands": [
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=折叠卡片!D10"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=NOT(折叠卡片!D10)"
+ }
+ }
+ ]
+ }
+ ],
+ "StyleInfo": {
+ "CornerRadius": 9.515625000000039,
+ "Fill": "Background 1 0",
+ "StrokeDashType": 8,
+ "Stroke": "Background 1 -15",
+ "StrokeThickness": 1.0
+ },
+ "IsAutomaticStroke": false,
+ "IsAutomaticFill": false,
+ "Size": "436,275"
+ }
+ ]
+}//hxuaJI/rIqKe2jirikM9bcDIVYXHfC9mGHNS3ZQYffw9RyHNYwKSvo6QkJGq/G0JFwoar6b0xuhCv7vZnel6sfO41/5ezpAcFiryBxMmf0L07na6QIKNybdYsS65FDSBcql/kKpYjCSvnK0NxBHd2hUyyBD1rzYmJ/rNGOUbMk5j0TS+senKSDi8qzvCAT7m77nYFvLRg1NQFSZ37roD0U2odFmHhTcc8PbqSJoarBy/g8ol6BSrRqJH9PVdlr2n+NHtqHZRvWfuK9NYKUu+q4bXE2iaVSiuwNhM53/PWcRluFxGq+Z+bRR5wC2NkczuwGB470S2NM4I4s7lsOAcBoz20/NxV0+5n5uU4LV0SpnnCAJhhpYImJRGl3AnGCDWZZ3mqVtKhsr71rCWL1iCF4ywrwQPi99zqp83bAKHRz5KcBxSKJyyQG8jYc7FFFGGpjUuTna+KiBONqMdWfb+pQ7JMhu5htPZUsrQtXfVcsVvz0npv2WlWMWmJcSPThquPsXqE/N9LTlpEhbawVfBZwS/4DMw4hKa/ad7/wWyuRrFsX0RAha8JvJpQp+FoVzphL3B+tmw+nRcGgRomNUSGiz96a+LFd8iSRGLmcka1+caGBE54KRPjixyq2FXEegfV0fbPCtPvAoGv1CyXCi/tihfBNmLTdziLXiVvoQVONj3j0oEJbQjniHey9/KUP43I2czGhj/Twm/olTbiHfaidN2n0Z1yFjHluERqWggSZjKU80kb+jMcuE/hyRJMfqGjnJVW8ZEChbVmtYbaz/qV8YjjONj5e3xl5/J45NTO9A6wbJeJFi99owlO0FftlC2QvADP2lDc+NDdjjCRU9psOdbZpIxkJSb8uy/AyqNVUmLkusaEGfPCxRAHDrJf5exIuAiYU+KFqyFmB2vVpp1Hw==|920
\ No newline at end of file
diff --git a/UserControlPages/折叠卡片.rd b/UserControlPages/折叠卡片.rd
new file mode 100644
index 00000000..1342f90f
--- /dev/null
+++ b/UserControlPages/折叠卡片.rd
@@ -0,0 +1,9 @@
+{
+ "PageType": 3,
+ "ColumnCount": 17,
+ "RowCount": 10,
+ "Formulas": {
+ "1,15": "IF(D10,C10,B10)",
+ "2,1": "SUBSTITUTE(B5,CHAR(10),\" \")"
+ }
+}
\ No newline at end of file
diff --git a/UserFile/BaseCss.css b/UserFile/BaseCss.css
index 9ef4f32f..a82969e6 100644
--- a/UserFile/BaseCss.css
+++ b/UserFile/BaseCss.css
@@ -1,3 +1,8 @@
+/* 优化EL头像 */
+.el-avatar-custom div:first-child{
+ align-items: center;
+}
+
/* 优化弹出窗口背景和圆角 */
#fgc-popup-dialog{
border-radius: 8px !important;
diff --git a/image/图标/右箭头.svg b/image/图标/右箭头.svg
new file mode 100644
index 00000000..30ccc9fa
--- /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..591c7a15
--- /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..dc85b256
--- /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..befff0f1
--- /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..ec80153f
--- /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..513d44d1
--- /dev/null
+++ b/image/图标/禁止查看.svg
@@ -0,0 +1 @@
+
\ No newline at end of file