diff --git a/.collaboration b/.collaboration
index 2a2af731..1617641f 100644
--- a/.collaboration
+++ b/.collaboration
@@ -37,137 +37,47 @@
},
{
"ModuleName": "TableView/用户角色关系视图",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:16:39.4746715+08:00",
"ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\用户\\用户角色关系视图.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/组织级别视图",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:16:39.4746734+08:00",
"ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\用户\\组织级别视图.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/角色组织关系视图",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:16:39.4746745+08:00",
"ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\用户\\角色组织关系视图.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/组织信息视图",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:16:39.4746753+08:00",
"ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\用户\\组织信息视图.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/角色拥有权限视图",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:16:39.4746766+08:00",
"ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\用户\\角色拥有权限视图.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/角色信息视图",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:16:39.474678+08:00",
"ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\用户\\角色信息视图.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/用户信息视图",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:16:39.4746791+08:00",
"ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\用户\\用户信息视图.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/用户组织关系视图",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:16:39.47468+08:00",
"ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\用户\\用户组织关系视图.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/角色分类关系视图",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:16:39.4746812+08:00",
"ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\用户\\角色分类关系视图.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
@@ -224,16 +134,7 @@
},
{
"ModuleName": "Table/反馈类型表",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:45:50.9961743+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\需求反馈\\反馈类型表.json"
- ]
+ "ModuleType": 7
},
{
"ModuleName": "Table/需求反馈登记表",
@@ -277,47 +178,17 @@
},
{
"ModuleName": "Table/FGC_商品表",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:16:39.4747702+08:00",
"ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\FGC_页面模板文件夹\\联动页\\FGC_商品表.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
"ModuleName": "Table/FGC_订单记录",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:16:39.4747724+08:00",
"ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单记录.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
"ModuleName": "Table/FGC_订单明细表",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:16:39.4747748+08:00",
"ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单明细表.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
@@ -354,17 +225,7 @@
},
{
"ModuleName": "Table/message_test",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:16:39.4747776+08:00",
"ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\汇报\\message_test.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
@@ -389,16 +250,7 @@
},
{
"ModuleName": "TableView/任务平行视图",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:16:39.4747805+08:00",
- "ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\任务\\任务平行视图.json"
- ]
+ "ModuleType": 23
},
{
"ModuleName": "TableView/子任务视图",
@@ -594,45 +446,15 @@
},
{
"ModuleName": "PCPage/处理反馈工单",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T09:40:01.8517251+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目反馈\\处理反馈工单.json",
- "Pages\\项目\\项目反馈\\处理反馈工单.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/反馈与建议",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:40:50.8403752+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目反馈\\反馈与建议.json",
- "Pages\\项目\\项目反馈\\反馈与建议.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/页面反馈录入",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:40:50.840094+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目反馈\\页面反馈录入.json",
- "Pages\\项目\\项目反馈\\页面反馈录入.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "Pages/项目/项目首页",
@@ -704,17 +526,7 @@
},
{
"ModuleName": "PCPage/新增报工",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T10:47:30.4335243+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.json",
- "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/分配计划工时",
@@ -782,19 +594,7 @@
},
{
"ModuleName": "PCPage/任务列表",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T10:46:12.3331761+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json",
- "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd",
- "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json",
- "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目负荷子页面",
@@ -802,17 +602,7 @@
},
{
"ModuleName": "PCPage/项目反馈",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:58:12.6487514+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.json",
- "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目负荷",
@@ -848,17 +638,7 @@
},
{
"ModuleName": "PCPage/版本发布详情",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T11:12:30.8458594+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目首页-容器页面\\项目发布\\版本发布详情.json",
- "Pages\\项目\\项目首页\\项目首页-容器页面\\项目发布\\版本发布详情.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目发布历史",
@@ -890,19 +670,7 @@
},
{
"ModuleName": "PCPage/项目版本管理",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T11:04:29.2626339+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目首页-容器页面\\项目版本\\项目版本管理.json",
- "Pages\\项目\\项目首页\\项目首页-容器页面\\项目版本\\项目版本管理.rd",
- "Pages\\97bdc47834844e0d8f3a5aef747785e.json",
- "Pages\\97bdc47834844e0d8f3a5aef747785e.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目版本详情",
@@ -942,17 +710,7 @@
},
{
"ModuleName": "PCPage/项目标题",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:24:51.5529844+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目标题.json",
- "Pages\\项目\\项目首页\\项目标题.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目首页",
@@ -1660,47 +1418,16 @@
},
{
"ModuleName": "ServerCommandPrivate/后端新增项目反馈",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:41:19.1694136+08:00",
- "ModuleType": 27,
- "ToRemoveFiles": [
- "ServerCommands\\项目反馈\\后端新增项目反馈.json"
- ]
+ "ModuleType": 27
},
{
"ModuleName": "ServerCommand/匿名提交项目反馈",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:41:19.1694238+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\项目反馈\\匿名提交项目反馈.json"
- ]
+ "ModuleType": 15
},
{
"ModuleName": "ServerCommand/修改项目反馈状态",
"ModuleType": 15
},
- {
- "ModuleName": "ServerCommand/更新项目处理结果",
- "State": 2,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T11:18:31.6129663+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\项目反馈\\更新项目处理结果.json"
- ]
- },
{
"ModuleName": "ServerCommands/汇报",
"ModuleType": 20
@@ -1855,16 +1582,7 @@
},
{
"ModuleName": "ServerCommand/新增项目发布记录",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T11:12:30.845585+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\项目\\新增项目发布记录.json"
- ]
+ "ModuleType": 15
},
{
"ModuleName": "ServerCommand/新增或修改项目",
@@ -1964,17 +1682,7 @@
},
{
"ModuleName": "ProcessItem/反馈处理流程",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T10:48:55.8987542+08:00",
- "ModuleType": 28,
- "ToRemoveFiles": [
- "Process\\反馈处理流程.json",
- "Process\\反馈处理流程.bpmn"
- ]
+ "ModuleType": 28
},
{
"ModuleName": "ProcessItem/结算申请",
@@ -2538,39 +2246,7 @@
},
{
"ModuleName": "Upload",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T13:16:39.4752569+08:00",
- "ModuleType": 26,
- "ToRemoveFiles": [
- "Upload\\3f4beb7f-df0f-40a0-8457-c833a332f924_新生成的图片.png",
- "Upload\\443d5833-c737-4769-9a2e-104182d6e821_新生成的图片.png",
- "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.png",
- "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.small.png",
- "Upload\\6955d4b4-16ef-4ec6-87cd-d021d48c27c4_新生成的图片.png",
- "Upload\\6f34b1f7-5fa5-40fd-8cd1-103a63ff37b9_新生成的图片.png",
- "Upload\\8131abcf-935a-4aa7-b774-45523e96717c_新生成的图片.png",
- "Upload\\86eb9c3b-133d-4cb0-ba1b-06aa7189f6b7_Animation - 1718097457056.json",
- "Upload\\87a01e25-1dc0-4ebe-b4fc-e8290dd2931a_Snipaste_2024-03-07_10-50-50.png",
- "Upload\\87a01e25-1dc0-4ebe-b4fc-e8290dd2931a_Snipaste_2024-03-07_10-50-50.small.png",
- "Upload\\88aea4ae-f850-4b94-b2ca-4fb74595161c_新生成的图片.png",
- "Upload\\897e9d75-6bb0-4d81-937d-af672e7c9c49_新生成的图片.png",
- "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.png",
- "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.small.png",
- "Upload\\ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.medium.png",
- "Upload\\ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.png",
- "Upload\\ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.small.png",
- "Upload\\d5185fbc-ff70-4662-9ab0-6dd3c736ff39_新生成的图片.png",
- "Upload\\e8bc81ba-c90b-4bf3-82dd-1ca73c73d426_新生成的图片.png",
- "Upload\\ea205b17-51f0-4c25-8484-6026eeffc4fc_新生成的图片.png",
- "Upload\\ec25d4da-d567-435d-ae65-6c2c5b062c1d_新生成的图片.png",
- "Upload\\f1363a17-58ca-4373-8aea-72deeb26b1c2_深色LOGO 拷贝 3.png",
- "Upload\\f1363a17-58ca-4373-8aea-72deeb26b1c2_深色LOGO 拷贝 3.small.png",
- "Upload\\f5e49362-3d64-4cf5-b8ca-b3bb89bdd7fa_新生成的图片.png"
- ]
+ "ModuleType": 26
},
{
"ModuleName": "PublishConfiguration",
@@ -2578,46 +2254,7 @@
},
{
"ModuleName": "Plugin",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T14:08:49.4731616+08:00",
- "ModuleType": 40,
- "ToRemoveFiles": [
- "Plugin\\Echarts图表-10_0_3_0.zip",
- "Plugin\\Editormd-6_0_102_0.zip",
- "Plugin\\Forguncy.CustomMenu.zip",
- "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip",
- "Plugin\\JSON数据源-10_0_2_0.zip",
- "Plugin\\Lottie动画插图-10_0_2_0(1).zip",
- "Plugin\\Notiflix-9_0_103_0.zip",
- "Plugin\\OPENAI套件-10_0_3_0(1).zip",
- "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip",
- "Plugin\\SqlServerWrapper.zip",
- "Plugin\\Tiny富文本编辑器-10_0_2_0.zip",
- "Plugin\\UI操作工具箱-9_0_6_0.zip",
- "Plugin\\Unlayer-9_0_103_0(1).zip",
- "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip",
- "Plugin\\发送HTTP请求命令-10_0_2_0.zip",
- "Plugin\\取消当前行-9_0_103_0.zip",
- "Plugin\\增强关闭页面-9_0_6.zip",
- "Plugin\\复制到剪贴板-7_0_3_0.zip",
- "Plugin\\客户端缓存操作工具库-8_0_0_0(1).zip",
- "Plugin\\富文本编辑器-10_0_2_0.zip",
- "Plugin\\对象与集合操作工具-8_0_0_0(1).zip",
- "Plugin\\异步运行命令-9_0_103_0(1).zip",
- "Plugin\\支持预览的附件上传-10_0_2_0.zip",
- "Plugin\\服务端缓存操作工具库-8_0_3_0.zip",
- "Plugin\\模板引擎操作库-9_0_103_0.zip",
- "Plugin\\用户管理命令 V2-10_0_5_0.zip",
- "Plugin\\网络操作库-9_0_102_0.zip",
- "Plugin\\设置当前行命令-10_0_2_0.zip",
- "Plugin\\设置焦点命令-10_0_2_0.zip",
- "Plugin\\豪~豪插件合集-7_0_102_0.zip",
- "Plugin\\超哥富文本增强工具包-9_0_103_0.zip"
- ]
+ "ModuleType": 40
},
{
"ModuleName": "PublishSetting",
@@ -2641,32 +2278,14 @@
},
{
"ModuleName": "Table/发布包含反馈列表",
- "State": 3,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T10:57:30.3606334+08:00",
"ModuleType": 7
},
{
"ModuleName": "ServerCommand/项目反馈发布完毕",
- "State": 3,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T11:18:31.6129765+08:00",
"ModuleType": 15
},
{
"ModuleName": "PCPage/导入反馈",
- "State": 3,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-08-31T11:26:16.1651153+08:00",
"ModuleType": 1
}
]
\ No newline at end of file
diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3
index e8c08ad8..c1f337df 100644
Binary files a/ForguncyDB.sqlite3 and b/ForguncyDB.sqlite3 differ
diff --git a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json
index e1f443d5..68f0cf3c 100644
--- a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json
+++ b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json
@@ -155,7 +155,7 @@
]
}
],
- "ID": "59de2b74-4e92-4e2b-9ffe-50aea1eca75d"
+ "ID": "58a2b6a3-4824-4426-839e-e0127bd31700"
}
]
}
@@ -229,7 +229,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "1122009e-6d97-4ca1-883d-edfe36247490"
+ "ID": "9f7065c4-96c6-422a-b4e6-68a98f38e138"
},
{
"Condition": {
@@ -259,7 +259,7 @@
"Message": "复制成功"
}
],
- "ID": "48291281-6b16-493d-8ae3-206ac87b6118"
+ "ID": "80410acf-7612-457f-93f4-b99d81425a59"
},
{
"Condition": {
@@ -336,7 +336,7 @@
"Message": "操作成功"
}
],
- "ID": "7c5a4c17-1dde-45ac-a519-404b0ab3864d"
+ "ID": "8f365747-83f3-4890-8728-df9f54345265"
},
{
"CommandList": [
@@ -351,17 +351,17 @@
"BtnText": "知道了"
}
],
- "ID": "0189a0dc-14da-458b-8473-45549dd6b337"
+ "ID": "9a2a1572-6116-416e-b027-a0964b81a818"
}
]
}
],
- "ID": "fb12706f-c9bc-4c41-b2be-181e498e7ec3"
+ "ID": "f8d981e0-70c5-47e6-9e6c-8cc805f68ae2"
}
]
}
],
- "ID": "7ce98f72-27d1-44f1-a701-49c1b3354ac7"
+ "ID": "ee5948cb-a8cb-4481-ade7-d66d5998f48e"
}
]
}
@@ -456,4 +456,4 @@
"Size": "24,24"
}
]
-}//m97PywLzwLCEgDMm1Icw3zdYrPbkjfZdnCSIAvEeE5SMpeKUyi+5tmkRZA88WEgbLQT06HrGrhUjplxIlytO6RyqbM3yv1SZ/Z4uAArfif283ByHFqDtdT38JqPToseaheZQ1iUrIjtHfxamJVqPN9c9oVf1QkvK34kjNWCcYntnM0qM8oo3fYIWXRp1y+qSr3Mx8jCPHz9zIRsNCLd2bpu7GEV8BdMpT6F8no32v9EylFLYfMb5UbbbH/tytuGfMOk0YUQEzqCVXRUwPs14280KRSjzydzW6DuEys1ZuTKi0zRkdy2P+04ciNEuFEXwCfXRmw/jAF7uLumwnJ/1rowdENFpsq4q7Gd63Nss8XbZrcYcv1TWLEdS77a1N02uvU6wHqdXXdp67xFt2x3SsDr0dhvlS9JzMzIxdQ3I4I6CJ91ZbS1I2/ziQw400FBVOs6pQN/ns9zXfNKQkw8wPOPNFjTbIN8C6AR25QqgPj9au1oPbgl7g6RFAlABK7uM2Hs+tSlSeuF7bLGuYEsPqYG3dOgNa54iMKNTRNLx3kK/pJdhCdGKmBikndJYoobpjnS/7HMEZnBQUkvQaxnNs+t5T4EK8/p4m4OjP3LBUOwcvzwEOldqGUGacyq+TPMLwOdJOTrk0JkSrv6R6JVXoyfsmsI7BD3cSqfdmGrhnSewq21YeqoLGRaX0QgOY0jh6Txg3+jTx52sV4U4VVjFHhfaNIELjSeOVudgeoYEmEwaokao/iw49Vp9kxEQYOG29UHKoE/A7xIHvbjt4Wc7poleu8rjh3Rd1Ue2ZxeUmP/3TCXZ0YwDO9NuEsP5tKjWwxBLIh8lEuAckxiS/xxAQ51XDrj6YcO1cFbOB21YebftMX0cRsDIVWH2+QHTrdkOAxLPeRbuwgUgVMvu+c9GrA==|920
\ No newline at end of file
+}//Lye5oJ1/6jDBb33bRPuUVaFloUYwSpDdOGRykPxgOV4DFyD++d5mkt5pf16tCAIK8jUMNDfNbqjN7ayOTJiPGUD3N335+nJui1+nklUA+R2sbncvTKnZRDJ0SuTRW7zIXgfPH2gLCtZIcpk9/3PsMp8lf9WCW0FtcX+N6qs1VpAqEfCX2XsJ3q0sqYechvnzaXk96W07T7nmdsdh4srqnChynrSlL86O8+mE6wL0CjIU5oEApEm3gVIxU6AKGCnwO+LxRVt43WhV3cdjJy5cLcsz5sLgk8I7+WdFneoVbbwvJbMjIQub8rSaFQ79rtTjkCVusT1Xc6XM1s55G7IYD7HSqnHNkQrpY46TrUJSOPJpruQmsqOPR6QQU72A/X6MksPolchfcOE2nI/Fw8miA1OkhQccj8ko1KcM9iIgf9xpesxvTaW/mkeBj5ZzUsbeEzuMcgVOApum9ZWjdyyCtKcPNysNQoAY38Q1f5x70Yjwvz5somaWZenk+X+loaa1K1SBZIuTkhNkSpbO6Oz5tZMIAkPfI78lVCzXD/ZJ4rwkeuIdKdeawPyZ7s2hqZBi8PJaqjhKghsdgMnI6aUOQ8oC8r9EdFInOm+CSZVD4pel50bgYvkVYV35EF7fUEIXqIkt09XKdsZQ/uXfjE0qvGtBFGRH5RhH2pMr1lc1swoF4rU1lsAlI0Zd+5fdHaoxeCgyT2s1RFLb7GZ4/JpR93rlIDp0As3VL+g6eQhj8Ogf66jZXEM7Me2FQMLNXuAp5LXjKIrt9iCK7CQGisSVsIHWSACgW1NpRUgQUY9LTvJnXA2doUUzvMqxxdfZj6d7bNo6oJrXMlHL4E4fAUTCyfC3oiT2pt5bpPEtN2GTP7ZSQg184XbUnH0uQOLmPXCM7mnaBdhn0fb2RFoPRkvEVA==|920
\ No newline at end of file
diff --git a/Pages/项目/项目反馈/反馈与建议.json b/Pages/项目/项目反馈/反馈与建议.json
index 9c33e9e8..a9c2cf71 100644
--- a/Pages/项目/项目反馈/反馈与建议.json
+++ b/Pages/项目/项目反馈/反馈与建议.json
@@ -214,31 +214,46 @@
"DesignLengthInPixel": 15.0
}
},
- "39": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 616.0
- }
- },
- "40": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
"41": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 37.0
+ "DesignLengthInPixel": 32.0
}
},
"42": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 15.0
}
},
"43": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 616.0
+ }
+ },
+ "44": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "45": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 37.0
+ }
+ },
+ "46": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "47": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0,
"IsHidden": true
}
+ },
+ "40": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
}
},
"InLogicalVisibleIndexes": [
@@ -249,9 +264,9 @@
11,
12,
13,
- 43
+ 47
],
- "Count": 44,
+ "Count": 48,
"DefaultSize": 32.0
},
"Cols": {
@@ -430,12 +445,15 @@
"25,4": "联系方式",
"29,3": "04",
"29,4": "反馈类型",
- "31,4": 1,
"33,3": "05",
"33,4": "功能模块",
- "37,3": "06",
- "37,4": "需求描述",
- "41,15": "提交反馈"
+ "37,3": "07",
+ "37,4": "需求标题",
+ "41,3": "08",
+ "41,4": "问题描述",
+ "41,30": "请详细说明您遇到的问题",
+ "45,15": "提交反馈",
+ "47,7": 0
},
"Formulas": {
"10,2": "\"感谢您的反馈，此次工单编号为【\"&工单编号&\"】\"&CHAR(10)&CHAR(13)&\"您可以点击这里复制，以便后期查询处理进度\""
@@ -531,7 +549,7 @@
{
"TargetCells": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=反馈与建议!E36,反馈与建议!P36,反馈与建议!E40,反馈与建议!工单编号"
+ "SerializeProperty": "=反馈与建议!E36,反馈与建议!P36,反馈与建议!E44,反馈与建议!工单编号"
},
"Value": "%Null%"
}
@@ -550,7 +568,7 @@
{
"Location": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=反馈与建议!15:42"
+ "SerializeProperty": "=反馈与建议!15:46"
},
"Value": true
}
@@ -723,7 +741,6 @@
"CellType": {
"$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon",
"Style": 1,
- "CellDefaultValue": 1,
"ItemSpace": 15,
"IsBounding": true,
"DataSource": "反馈类型表",
@@ -737,9 +754,108 @@
"ColumnName": "反馈类型",
"GUID": "3d39a916-8cb9-478a-a0da-fb198ecbbbc1"
},
- "CommandList": []
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "反馈类型",
+ "TableValue": {
+ "TableName": "反馈类型表",
+ "TableValueType": 1,
+ "BindingInfos": [
+ {
+ "GUID": "307f549a-a750-4f22-b5bb-8bd78f57dc16",
+ "BindingInfo": {
+ "TableName": "反馈类型表",
+ "ColumnName": "格式模板",
+ "GUID": "fdd82109-a95e-4454-99fe-ca3d4edbd92d"
+ },
+ "ColumnName": "格式模板"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "反馈类型表",
+ "ColumnName": "ID",
+ "GUID": "7b8396f6-f2df-46b9-9cf9-e2120ba8411f"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=反馈与建议!E32"
+ }
+ },
+ "NullFormulaValueQueryPolicy": 0,
+ "TopCount": "1"
+ },
+ "ID": "6847c6caa8aa4a099a6eeea00b157a4b"
+ },
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=反馈与建议!H48"
+ }
+ ]
+ },
+ "value": "0"
+ },
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=反馈类型"
+ }
+ ]
+ },
+ "value": "%Null%",
+ "compareType": 1
+ }
+ ]
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=反馈与建议!E44"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=反馈与建议!反馈类型.格式模板"
+ }
+ },
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=反馈与建议!内容变动"
+ },
+ "Value": "0"
+ }
+ ]
+ }
+ ],
+ "ID": "8c71e1d2-07c9-4d56-957b-2a8b60635185"
+ }
+ ]
+ }
+ ]
},
- "DataValidationInfo": {}
+ "DataValidationInfo": {
+ "IgnoreBlank": false
+ }
},
"35,4": {
"CellType": {
@@ -906,8 +1022,61 @@
}
},
"39,4": {
+ "CellType": {
+ "$type": "ElementUI.InputCellType, ElementUI",
+ "CommandList": [],
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 4,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "text",
+ "maxlength": "32",
+ "showWordLimit": true,
+ "placeholder": "例如：XX列表页无法正常查询",
+ "resize": "none",
+ "clearable": true
+ },
+ "DataValidationInfo": {
+ "IgnoreBlank": false
+ }
+ },
+ "43,4": {
"CellType": {
"$type": "TinyRichEditor.TinyRichEditorCellType, TinyRichEditor",
+ "EditCommand": {
+ "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=反馈与建议!内容变动"
+ },
+ "Value": "1"
+ }
+ ]
+ }
+ ],
+ "ParamProperties": {}
+ },
"UIPermissions": [
{
"Scope": 4,
@@ -924,7 +1093,7 @@
]
}
},
- "41,15": {
+ "45,15": {
"CellType": {
"$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
"CommandList": [
@@ -989,12 +1158,20 @@
},
{
"$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
- "ParamName": "内容",
+ "ParamName": "标题",
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=反馈与建议!E40"
}
},
+ {
+ "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+ "ParamName": "内容",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=反馈与建议!E44"
+ }
+ },
{
"$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
"ParamName": "提交人",
@@ -1022,7 +1199,7 @@
{
"ResultPropertyName": "反馈编号",
"ResultTo": {
- "SerializeProperty": "=反馈与建议!D44"
+ "SerializeProperty": "=反馈与建议!D48"
}
}
],
@@ -1057,7 +1234,7 @@
{
"Location": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=反馈与建议!15:42"
+ "SerializeProperty": "=反馈与建议!15:46"
},
"Value": false
},
@@ -1071,7 +1248,7 @@
]
}
],
- "ID": "cdaa72e5-55c6-46df-b306-5ce7a89e5201"
+ "ID": "e82fd3d3-b957-4da5-8e09-a6126701dc1d"
},
{
"CommandList": [
@@ -1086,7 +1263,7 @@
"BtnText": "知道了"
}
],
- "ID": "e014f953-fdf1-4e01-8f01-6c031a5770a5"
+ "ID": "ad77409f-1c0d-4b42-ad0c-c19306da94d4"
}
]
}
@@ -1102,7 +1279,7 @@
"IconSize": 14.0
}
},
- "43,3": {
+ "47,3": {
"BindingInfo": {
"TableName": "需求反馈登记表",
"ColumnName": "工单编号",
@@ -1201,6 +1378,12 @@
"FontFamily": 3,
"HorizontalAlignment": 11
},
+ {
+ "FontFamily": 3,
+ "FontSize": 13.333333333333332,
+ "Foreground": 5,
+ "HorizontalAlignment": 11
+ },
{
"FontFamily": 3,
"FontSize": 13.333333333333332
@@ -1888,6 +2071,7 @@
"36,33": 1,
"37,0": 1,
"37,1": 1,
+ "37,2": 1,
"37,3": 10,
"37,4": 15,
"37,5": 1,
@@ -1922,8 +2106,8 @@
"38,0": 1,
"38,1": 1,
"38,2": 1,
- "38,3": 1,
- "38,4": 1,
+ "38,3": 10,
+ "38,4": 15,
"38,5": 1,
"38,6": 1,
"38,7": 1,
@@ -1956,12 +2140,120 @@
"39,0": 1,
"39,1": 1,
"39,2": 1,
- "39,3": 1,
- "39,4": 12,
+ "39,3": 10,
+ "39,4": 15,
"39,31": 1,
"39,32": 1,
"39,33": 1,
- "41,15": 17
+ "40,0": 1,
+ "40,1": 1,
+ "40,3": 14,
+ "40,4": 12,
+ "40,5": 12,
+ "40,6": 12,
+ "40,7": 12,
+ "40,8": 12,
+ "40,9": 12,
+ "40,10": 12,
+ "40,11": 12,
+ "40,12": 12,
+ "40,13": 12,
+ "40,14": 12,
+ "40,15": 12,
+ "40,16": 12,
+ "40,17": 12,
+ "40,18": 12,
+ "40,19": 12,
+ "40,20": 12,
+ "40,21": 12,
+ "40,22": 12,
+ "40,23": 12,
+ "40,24": 12,
+ "40,25": 12,
+ "40,26": 12,
+ "40,27": 12,
+ "40,28": 12,
+ "40,29": 12,
+ "40,30": 12,
+ "40,31": 1,
+ "40,32": 1,
+ "40,33": 1,
+ "41,0": 1,
+ "41,1": 1,
+ "41,3": 10,
+ "41,4": 15,
+ "41,5": 1,
+ "41,6": 1,
+ "41,7": 1,
+ "41,8": 1,
+ "41,9": 1,
+ "41,10": 1,
+ "41,11": 1,
+ "41,12": 1,
+ "41,13": 1,
+ "41,14": 1,
+ "41,15": 1,
+ "41,16": 1,
+ "41,17": 1,
+ "41,18": 1,
+ "41,19": 1,
+ "41,20": 1,
+ "41,21": 1,
+ "41,22": 1,
+ "41,23": 1,
+ "41,24": 1,
+ "41,25": 1,
+ "41,26": 1,
+ "41,27": 1,
+ "41,28": 1,
+ "41,29": 1,
+ "41,30": 17,
+ "41,31": 1,
+ "41,32": 1,
+ "41,33": 1,
+ "42,0": 1,
+ "42,1": 1,
+ "42,2": 1,
+ "42,3": 1,
+ "42,4": 1,
+ "42,5": 1,
+ "42,6": 1,
+ "42,7": 1,
+ "42,8": 1,
+ "42,9": 1,
+ "42,10": 1,
+ "42,11": 1,
+ "42,12": 1,
+ "42,13": 1,
+ "42,14": 1,
+ "42,15": 1,
+ "42,16": 1,
+ "42,17": 1,
+ "42,18": 1,
+ "42,19": 1,
+ "42,20": 1,
+ "42,21": 1,
+ "42,22": 1,
+ "42,23": 1,
+ "42,24": 1,
+ "42,25": 1,
+ "42,26": 1,
+ "42,27": 1,
+ "42,28": 1,
+ "42,29": 1,
+ "42,30": 1,
+ "42,31": 1,
+ "42,32": 1,
+ "42,33": 1,
+ "43,0": 1,
+ "43,1": 1,
+ "43,2": 1,
+ "43,3": 1,
+ "43,4": 12,
+ "43,31": 1,
+ "43,32": 1,
+ "43,33": 1,
+ "45,15": 18
},
"SheetStyle": {
"FontFamily": 3
@@ -1971,7 +2263,7 @@
"14,2,1,30",
"3,28,1,3",
"9,2,1,30",
- "43,3,1,4",
+ "47,3,1,4",
"3,24,1,3",
"12,15,1,4",
"10,2,1,30",
@@ -1982,10 +2274,12 @@
"35,15,1,16",
"35,4,1,10",
"31,4,1,27",
- "39,4,1,27",
- "41,15,1,5",
+ "43,4,1,27",
+ "45,15,1,5",
"15,5,1,24",
- "2,3,2,10"
+ "2,3,2,10",
+ "39,4,1,27",
+ "47,7,1,3"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -2044,7 +2338,7 @@
]
}
],
- "ID": "367dfd1f-0f48-4215-abcb-321b942675f1"
+ "ID": "eb9234fa-3998-4abe-b246-e333f5730ec9"
},
{
"CommandList": [
@@ -2189,7 +2483,7 @@
]
}
],
- "ID": "8653dc15-9aea-4e9a-91e0-b156728691ff"
+ "ID": "7a9fc5a3-c7e7-451f-9281-12451ad2d282"
},
{
"Condition": {
@@ -2228,7 +2522,7 @@
]
}
],
- "ID": "2fd837a1-867f-4857-87e0-cd56217e5664"
+ "ID": "43339751-5c4f-4116-842e-fc894d7795cb"
},
{
"CommandList": [
@@ -2293,7 +2587,7 @@
]
}
],
- "ID": "f6c15a28-6686-4d43-9ece-16d45d2057d7"
+ "ID": "8bdd534a-b26c-4872-a678-e7f2c8189686"
}
]
},
@@ -2331,7 +2625,7 @@
]
}
],
- "ID": "cfcdbc1e-1811-46c8-bfa2-1e3f9fb959e4"
+ "ID": "c0995b98-7578-49d5-9ef7-1c7c67640f8d"
}
]
},
@@ -2343,12 +2637,12 @@
}
}
],
- "ID": "55c08d31-b30f-4b3d-93f1-821eeec70942"
+ "ID": "a4940c17-fb0a-4749-b475-e411bf841065"
}
]
}
],
- "ID": "eda94ba1-c6fe-472d-9527-856fc56650cc"
+ "ID": "132fc1c7-d07d-419f-bc4b-cb5465ea2e8c"
}
]
}
@@ -2406,7 +2700,7 @@
"Fill": null
},
"IsAutomaticFill": false,
- "Size": "1088,2062"
+ "Size": "1088,2176"
},
{
"Name": "32d5b7c1-e508-4376-b0be-202944370f5e.png",
@@ -2421,7 +2715,7 @@
"IsAutomaticStroke": false,
"IsAutomaticFill": false,
"Location": "64,15",
- "Size": "960,2047",
+ "Size": "960,2161",
"BoxShadowString": "5 5 0 8 #09000000"
},
{
@@ -2443,7 +2737,11 @@
},
{
"Name": "工单编号",
- "Formula": "反馈与建议!$D$44"
+ "Formula": "反馈与建议!$D$48"
+ },
+ {
+ "Name": "内容变动",
+ "Formula": "反馈与建议!$H$48"
}
]
-}//D9BSTvXkQOZCMOqXPy8SMkBeINSdp7zzsp8+kxyurVDMcOu4QIEKARSJIsv+qEeU5qJZFf57tu0g/mG+lmjXLEiTmCtGRE+ThmUZ7JphFLgm61ZLC4tprJYL0KMmZPX7Ud/Wmyq86x6HPC5C+gTE9yAUhm2vlUG/77faQIv888Z3N4KZKcfYYjUayldCyuV6a0x8O8OQzkH+J7Jlo2JPBjAoSSgoRWESjNZaVTweqmmGWlK3HCrgmHWeEXWSdVuM2aUf3p3fGqVm7x86nprLQ5WVjrOUZqOKDHqqFsyoaHIwuZyAEK9URkPx0xq5/MpgAhuVZZ5c51ACmngnlwpPW/KQrMuEcnnYgh4lvStE/Twg1IxbFxOQWr/eNNVtZfL6CowvGeR5iz27Sc0nj4a+Ln5WyxBUhJSoKmN6IZHL4Svbh7v3f9ENtqLL4rMa6becwXdona42NcRw9BIomad9/UWnAHGpHTU+qIf36lGpVjChptJhQvMyzN/iAeMiPOFWgdCXV3XmdaxQWUO0LSMb67TA1Zb2tS17sYqkNygbO+vyEEzcr3ue6SyQZHb+ZO9ZjvUXJz5mBdnDkvy4CjmcOGn3hqYBnzIHDS14VBnAJEen7ubJUbCY0E02OJBBGAY2x7sU/OAlXZzRfcyz2OqBlZQXsK+M6StMFoNiN8fyMG8u3CzKIfatVKldkUEZT+ULeIXslaiDxYwSQr4/+xuNBLHX5jKAJsqlfrHm858t+9VK206xJmbABiRS7NyLPN+ao1GkADy7YEu1wC6zc8pCJt28NuZ9m7tPg+kHIY4wQkbB3oEkFyvzTUl5WSdwThX4j7zcCRmuUl8UBY0q3CyA/k3HH/bwm8iPQ0tst1riM4CrH8P6De/Qt/f3cbi1zdLv/qjDVmJP7sm1s++qSaJwLw==|920
\ No newline at end of file
+}//CxGBlmrU18wS3g27AOkp8D5w090E/cyHF5+dQusIANuFU76W/VWLbtrtPng7v6uSbDwhwzzuUa8r+vRqmtX9cQFEFFFzxZ6FNmPpDloq5+UoLrG3h5SeC3t1tP0/hlUtH3WItQyJINyqGwRp2QPwqNEJ3q2VKdoxecGROBEOytaLHyfuWEQrEj+Fx5EDh68B3xwWjXfL9EmFEgjdKtUqQQNf1UfDRcSPGz7T5dsNUW8ZE7le7jT6BFkj4zIgLjUo6zkxBmcOZDVLuoRGGY2GNXbXX+aOfVS4tdwzH9HRObA8NB940dIzakTEIPC4sedh43krlZb3dNgA2L43znmSOjluQV0b6f2vqhLf+/U+HPcRGv6G28LsVywIT0pRYUKn2TsrgPaGcOgDv9A0hm3/RtGVdgYtJTDpDHMzwVxsbuHIlBYoHP4dQ8HA0zfQjGWE0eWWt+TYP+zYSQc1DmGkJu8XQ5anlGlMVBdTum8eXipNsFQ29oKnvxW2QvqKpygMamgRLu8ws4RgyJVSLSFyBJiInjL3sORiKIX/To4zhQyHg6CEpnT29tb2VxzLD9Q0TPKNMLMKdJr/7svaKlZ1PAUJRlwM2BFgT1VNQbq2LJfB+wy0TSMSJ4nbbQAPhKMbqszxpkwiNnpniM8Dp8LIzJfw3zThjUdFUOmHc+i50kSlB0qnf954hV9h1vuzCIFZHrBk+sl1XDaAkqR59RTTRzwLvlhSUZBKKyOIk8RDhQ6Cot4ELLqGwsNr0dWNVwaIaX3NZt5NtzAtjCcA7uQAZq0adAI+fNmki4bOTy7GyWgPEZE3Zhynk3BJ3d9rkyKm4v+duPTGr8/0oJ2gFSxlmkKOEQfoYUt6kL75bTPgEpen7MFX3NZFy6zHqHUluyuYgi9GU9CL04pqZxxZY5/QHQ==|920
\ No newline at end of file
diff --git a/Pages/项目/项目反馈/反馈与建议.rd b/Pages/项目/项目反馈/反馈与建议.rd
index 12cf79fa..4dba7a9c 100644
--- a/Pages/项目/项目反馈/反馈与建议.rd
+++ b/Pages/项目/项目反馈/反馈与建议.rd
@@ -1,7 +1,7 @@
{
"PageType": 0,
"ColumnCount": 34,
- "RowCount": 44,
+ "RowCount": 48,
"Formulas": {
"10,2": "\"感谢您的反馈，此次工单编号为【\"&工单编号&\"】\"&CHAR(10)&CHAR(13)&\"您可以点击这里复制，以便后期查询处理进度\""
},
@@ -12,7 +12,11 @@
},
{
"Name": "工单编号",
- "Formula": "反馈与建议!$D$44"
+ "Formula": "反馈与建议!$D$48"
+ },
+ {
+ "Name": "内容变动",
+ "Formula": "反馈与建议!$H$48"
}
]
}
\ No newline at end of file
diff --git a/Pages/项目/项目反馈/处理反馈工单.json b/Pages/项目/项目反馈/处理反馈工单.json
index fcfef416..2bdaedc1 100644
--- a/Pages/项目/项目反馈/处理反馈工单.json
+++ b/Pages/项目/项目反馈/处理反馈工单.json
@@ -902,9 +902,10 @@
"MethodName": "Refresh"
}
],
- "ID": "bf381347-4c37-40a2-a9e2-568e0d0c400c"
+ "ID": "c71e92fb-9cb9-4c91-8559-712d2887a2cc"
}
- ]
+ ],
+ "Disabled": true
}
]
}
@@ -1269,4 +1270,4 @@
"Formula": "处理反馈工单!$B$15"
}
]
-}//KYh/e8nTn5n9FyqIB7c6w94PdbDtjfqlbAHsiWg56t8fu8cZQq+Bm/xcP3d7UBWVJGBbsnKrzgbMqZlgoG+f3NXwE8n7Kc5SfKPgVw7btl3jGowkiUq2YCqUkdQrSR7fCl97FSXPs225kpoPN9UJUpDZ9yE6u3gwMW0ug6aLmf8S0ffBMrze21Fsr3ipzUaZNNRsZ1jUxFM7b21ORJLcsUTLDQdyIz+TadFJJVZI5bCHp+bHTeuC2+vTvYryv0yfVMsmEZhNwRHoLr4GEbPEC+Cjk4wvvOZpvq3n/IpPYSbepdPzzAOsc3CPdsBqJOUgYIjsmtogUqvr1ZfAJmXH14e5aVJTgZgI9uw23njNjIvHyFa8teqoLHnkYA3H+VK2AmlipAsh89cfGyHSBXyckaPst990/olXzIM0DzXetskVLz09S9j9CvudSbDi1PCy4OpjrIEYn4XdvPomt8Efpw5xphaAAZM9b9CGtcrW5XImO34XrbZfplwOFUlR6DlQ0SOGBbsnH5EyprZCu4G39uhaVvbFD8ZLEUAZyIyC1NvTw0kvWX2qsVcIOQ1+uzy4QiASffikr8YsNLrddCr4yXAc0gbWupchAWTt/JEB1uiEN19TPp1AURoC0NB4RhrxFk30uxpGPUxT4UMSAbtGNrKSz5UJAkQiKUjQNjoWVW2YJ83Dkjcb5/sgtU/YE0+uz2X4QOJ75+970QNJk/qn0Z+yEEOjcXH/kPx9kW7ai6wno3NA8kMdoo8+QNKFmG3p44FElQuj39vqjVQaIkwdEGe8W0/wuw6SDPkLC356ZPguU/ez012jH8w/Zmt1BBSIvG6a8+lB2LwtDnU/jcY6Bu3bAiq1n0umpEIUbhDOdZW9ws1q/VbV6zNsbL4IrMzpT6u+N3dDTW9RfHauGRFHBA==|920
\ No newline at end of file
+}//6nekJwrhLRtqGu06yCSv5Hwqp3keLa+AkaWgrddwmNbrHUHN4N09g35MzZ9iK7NLOMFOJBP+VdaVqbyo+S0ixn4V2pUJoXnSTW1+5n2Jd5+VVmxR5OHopklg43ybpsCr17Xgd9EkHoJA5l2gdGER15R2zJ0S/8GeutYSh+H17LRajmtHUJGlvBuQZbSWZB0MguR+RQMslE9i/wupad8gkDKkuOYvow2DTb0TRy6D556eUxZ3p7E2LLw+eT+V0GAoLCXy07C9tGLOWkdDYfXwpmwT9ysiMyUf5J1KskV4HB5Z8MQmV8J8ZUou4co/g9yJlEG8FMejGpXuC8gqiK4AJiOcNFpPQfHLVf7HPoHOa3rjJ+blklaDYe/osAqg7gDkCwRg3MXkGZbDRZ0bjL1MhW66McrSueoN/3zJrgHVevBRpxXWh+xkpmVrWjlMw7+XgYPkDislpI+mNInLQkf3R39phZdDAJyHejvnreGQoSor/EpMoerOD356rf8oldZhwCkWrEg1JTBKxggiQJrJYnsgVzD4/erxcpFwgOBCE05S9sEeFFkQ9GpJ6a9bW7dDbqzeK1yMBIwJY1QeEVEpaC4dP4xkOGnosxr59PgC8HKDiOuifOaM339p5yvdGNVSj7JAIbfZaNZ34tBN4oJ9OaLopKpdvWeATkzQw+1ym2yFk3H7BGwQfQ38yhPvll5b2sk0P7HSYuQAlh5rqDMmsXXJsE2vGC8iCXbTI9A+NUk9j5oNZoJd5GZh4c4/Z9YQFON5/RLnbbeeakktEGpM6Y0Q8Hm71hkPKQ1+4uV268JEt807IpElkI9g2fLDO2VzVDqidihM/O97FJib5eIFu7blUO6RGnzm1yZtPd2Q1wS4bJx2gkWJSr079wDPtVkKWsT33dtpPOLCAmi7vihsOQ==|920
\ No newline at end of file
diff --git a/Pages/项目/项目反馈/页面反馈录入.json b/Pages/项目/项目反馈/页面反馈录入.json
index 4fa0f1ec..110808e3 100644
--- a/Pages/项目/项目反馈/页面反馈录入.json
+++ b/Pages/项目/项目反馈/页面反馈录入.json
@@ -864,6 +864,10 @@
"SerializeProperty": "=页面反馈录入!功能说明"
}
},
+ {
+ "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+ "ParamName": "标题"
+ },
{
"$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
"ParamName": "内容",
@@ -918,7 +922,7 @@
"ReloadData": true
}
],
- "ID": "fad5aa3b-454e-449f-88fb-30a27932e8cc"
+ "ID": "d80167b0-aed4-4d7d-8bef-fd6a8b151a89"
},
{
"CommandList": [
@@ -933,7 +937,7 @@
"AdvancedSettings": {}
}
],
- "ID": "637aaee3-db42-441b-9cde-cc6cd326ad28"
+ "ID": "2e6996ea-cf74-4cd2-9ef5-8013a73b1212"
}
]
}
@@ -1438,4 +1442,4 @@
"Formula": "页面反馈录入!$D$18"
}
]
-}///0DGOTIop1Bvzo5TRD7WnVo4EDQ+zAii1zqRK8tyMrNcw9SodCcuC81nQi5Z4uLo5Q/4vMdMxxdVGqgo56lnXz+tIxBNHJz8YS0Eu724QKsOnvXicfjrkZDN506uwXuSx/H9pZIdHks4MvI+oXtL0RWyityUQJwwfhBsHKgaPoBoxzW+TLoB0TnIgPfaekjm0iqQEGAAIwP4E/MS/ydxbJqQfARPUU8rCz0B/dTQO/TfYINJEAtzxcBCZKf6SqBWPN6iQ/LSNpi+SdsJjliyg8ZwYEVaGcbAeMdH+E62ToBT3OC2sQk2Ajgmmzmr5yiATbOZfLc62e2XumnZ2pvUMc9YSXrsgD9geFLkLykyTyNamEOaNkA/haou/mlTfKgSf4o84KUsazdr7DExVXQlHUfNzsvbMlfrAEiKc6NuMMWe/HxZedjSbY8hXjNQfIkJS+h9Tka6c5kb4qr621oymxWaLx6vhsskEEyeUa2VOpkxe/OVZVvrxLu3hzhkU2l3P9ICTtlMV+npBdKvpzFbjgncJFuER3aVqySfRaNKA3icCA3zB2KJVr1qENYasfcPIlY/tuB8znDpdTWRyOXK2s0fE/EY8iYX12Xbt/8+YOdsvXjXz7m/A6tPx2qbkOp1GG5pF/mUp0TMupvtucd8b/y6uiuiutBBR2WuFCggv+uok89cunpXWJCPwOh2hKrq/31E4/diL6eTaLFRGBvEqwRa4EEL5IdpYc3BoVSVJzgCaP62b1x2jiiSPtLLxP0NZt+n1pRe7i8FMjnfWoXEW6hL8CkQtMyXh2ApMga0PJgyTAqhGmki5PCUpoxFjz1me/eDWIuzy3MSPfyAqT7hMIIuQXcYu0QRN/RVEw6o+7sZ7chdNXRjy/w7/mDJ1PiW7fyLmK1YFF0i4TLFNVw4rg==|920
\ No newline at end of file
+}//YbLWsAHohP+2Pe8iTIO3heSQ67R6Eaee7hzUjRH7kXW5AZTLH0KaOCPKxfWU6z7e562/pOmPkUOyvc9iR7/5IkO8EKATdJy4wpK2UWqC25NtJXBIxWxCy7yufZoepJxxYOd9OyaTXg6elnlvS9gFJKSxAGvXekCETUwn1AIwMZ4cy1yw3+HiPkF7YSIz8XbOwSqBkx0+WlZzI0wl7LXdsDJOHadOIVvbtlJGC3OHouKL7EleX6IHs1M27Bx2sovMyfk5ESFverFwSBGTYIjhatjPyZGjOoZwOZBjk9VRwPfVXB5gDJMY3oy5cW9yoWjO4Y2xlxSXfDQbXNtgPZPMAsNBa20AWLRwAuQep/qerAA2LEBRLxLPTUKmRPmcN2JTu3qrF4vmqMdw1MmlAkLEf7byBAcHBJnpk8Nt56Ivi1RbzzBN5sAUqmqvX48zqY2T350p1WFeMc7YoyhFNxKSb2sDkXbZskZ/HxGSHwQmaJ88TzYvOZVdTFSOxtMpSPTRtHhGMnRtaWNiIVhaKjSMRdLej6jdp1stPEq5btINGIjeLJPWp1RlLmz8GERIab6uaCkgbTnCmhV9zgI//4RshUt6+wEgv+WUCtt+EWfKW+CiwjwBTmuxjhHojxJppLOKbcA5nGAAzUvpB8PRRpV8AuCjucjjP38kkYiQA8YOz9eY5jgkeN05MY/plFghhSvCrBwy6XQ9Ab5j3CctlqNMSeRpUYzTkERGjrJrLYPzKOFy94kuIrqws/CQKvRkh7u7urIEPypJRYp2IcsNaeQvpVGRg4849d00meKwGSBk6p1M4sQbxwDpEqaETKAzZaWKiv2FxJdXVfYrZnIY+sxEG2xfKxCRQ1iXYMUpDOh7aFydPvAfesz1EQYz/vIZ1PzN20xWvnlLk/SSw/14/YhR+Q==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json
index 557616d8..95ea16d6 100644
--- a/Pages/项目/项目首页/项目标题.json
+++ b/Pages/项目/项目首页/项目标题.json
@@ -262,7 +262,7 @@
]
}
],
- "ID": "1953b3e0-77b0-42e1-af38-4026eefc9eb2"
+ "ID": "634ae43f-7b8c-4b39-944e-cb0884c106c1"
}
]
}
@@ -484,7 +484,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "96c25c75-e58c-4591-abba-f231b5c9f39e"
+ "ID": "685469d9-e499-412e-91f3-915ade2801b0"
},
{
"Condition": {
@@ -506,7 +506,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "39ef7140-3117-46b0-8c0b-be443de6781e"
+ "ID": "6d3b7b6f-ccf0-4c9a-9e75-778b505f1fde"
},
{
"Condition": {
@@ -553,7 +553,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "ea0da165-acb0-497f-be49-f377be01e2b1"
+ "ID": "02031dac-88b9-49bf-8cce-774e095db974"
},
{
"CommandList": [
@@ -563,12 +563,12 @@
"Message": "只允许项目经理进行申请"
}
],
- "ID": "6114c7fe-83e4-4ebb-8e39-6979161b8078"
+ "ID": "355cdde4-017d-46fa-afc0-a248705b768b"
}
]
}
],
- "ID": "5d996e5a-b971-4202-9c99-0f59a4137f84"
+ "ID": "ad49d37d-ad45-464f-a273-03237cba0afd"
},
{
"Condition": {
@@ -604,7 +604,7 @@
"Message": "操作完成"
}
],
- "ID": "c309617b-b18e-498b-a170-7d67211b926b"
+ "ID": "62e4ae96-c0a5-40f2-9621-246597363d32"
},
{
"Condition": {
@@ -700,12 +700,12 @@
"IsOpenInNewTab": true
}
],
- "ID": "6c7f3dc2-080e-4121-b579-ed7918ead985"
+ "ID": "ebc953b2-5013-435a-bfef-f0a3615df450"
}
]
}
],
- "ID": "1ddb7687-57dc-4b63-9a87-ba321641d7e6"
+ "ID": "db9ca073-74fc-4059-a3ca-8bcd60df2ab4"
},
{
"CommandList": [
@@ -715,12 +715,12 @@
"Message": "当前项目未开启收集需求功能，请开启后分享！"
}
],
- "ID": "11d69954-314d-4284-b05b-e6c9eb28e4ab"
+ "ID": "25c6516d-fea2-4dfa-bcf5-72465fb22fb2"
}
]
}
],
- "ID": "c8f6c342-b77e-4b17-a4f6-c9abc184936f"
+ "ID": "21ad0999-4f3d-4b14-a3e0-a9d89abca466"
},
{
"Condition": {
@@ -753,7 +753,7 @@
"LoadBindingDataOption": 2
}
],
- "ID": "ade9a330-4842-4ecf-b238-0b351575e982"
+ "ID": "b098c267-9591-4c22-b62d-3093c5e7645c"
},
{
"Condition": {
@@ -775,7 +775,7 @@
"Message": "暂未开放该功能"
}
],
- "ID": "d4d0718f-375f-4b76-a491-d990c30ddd0f"
+ "ID": "aa3782cb-7a60-49bc-93a2-cb653b79684c"
},
{
"Condition": {
@@ -793,6 +793,8 @@
"CommandList": [
{
"$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "PopupDisplayMode": 4,
+ "ShowDrawerHeader": true,
"PageName": "版本发布详情",
"PassValues": [
{
@@ -808,12 +810,12 @@
"LoadBindingDataOption": 2
}
],
- "ID": "14bb1a28-ec10-42d7-a24f-35525f8721c6"
+ "ID": "b43c9d94-8aed-4c8c-9ade-9315a63417ca"
}
]
}
],
- "ID": "d9b55de6-5f89-46d6-af50-090386af2827"
+ "ID": "4c805b53-d50d-47cb-9e38-3dd857268bb9"
}
]
}
@@ -887,7 +889,7 @@
]
}
],
- "ID": "d59ac7e6-20d8-4e80-9fcc-bf6a6267b691"
+ "ID": "04599a7a-d9bf-4624-9ed1-bc16ab92c766"
}
]
}
@@ -1123,4 +1125,4 @@
"Formula": "项目标题!$F$2"
}
]
-}//I26/lJPsYZNPe3YHpHu8917eUav+Y65lz2/i3w4aYqasLf3T2w/6vdN1rRI60RT8Ty+gtH9Y0gMCZVIV8FVVJw/bECSoLKcVyAX5PF/Qc3sGh+XRYjWV1SvXvX7h5WMOeCwXQ0WTpz3YbDTOi/VLJvbfAnh4B6t4kbPC4vnKVxfAZxhNdaCNPBuq6Y4RkkG9DluS743QQANxNJjb4JwaUPYbVpwxkdrgWGV/0bV2DCBVK0s0832L+h9D66UgYNTezD+dIxxbSX1QAnQIJ/BVUh0VFxf42mdPjA7y60E2UoHwH1LC0UWXEIQVHeVbmFJkdnkN44BdRqmkya3zjNVxyDsxTfNC4nvHlFPaPhCT4pcE2EY5c0l1q/PLUcuxHWFMGCtyNKnbLydLvit/lK7ygpKjKavsFzr+9SYf85uk4TFhEOGSA5gdAqsTrvA57wXK/k1Mlgv9wwYNChG2hzuA0XEgjh9ytysCrN5gkStLUVuYN0/0bYXb+CWJa8z09q/+ZFRbAiYMworUBF+3XyG3sleAh2j+XFwhKLhlIqdqCoTB3GJJwA3c08Ez3/JDnYNNxrsgkMuTJ235XfFbjdjPJOyZbsvs8Vhc+kVfzp0m1tXHVBRLyQFBkegapIVyPGCa0t7vr+e1jxTnuwkDi+jYa5zPltNBuFqhB3yXCa4NQwnou+BvypryVMsZ6c812OPvJzn1REH1FpTlx3A2pltx7N65oOzK3+lfZwlZfFgkA0I2jLQSim1vVf06sgbq9F29M+oZRaMSYPmicQ0YENfbD/qwHMnf0M553HSziePTrXk6eigFANIHUTF2MJGMZwkhOwQ97+4D8lHPcpjzSsNegzQ/hZRRIV1CmcbzCStr53VrpYz9WNFyRafuHAqFTRv74Iwo2+iZFipJXPElAPxtIw==|920
\ No newline at end of file
+}//TgFY8KXLPyWQHl18p7lHYSHWG5JgPhSrsXnoxG1yitako6aI7wc4N0ZQ2z4hPtuqCg2sIn0dtfnUJ0PYffoUbHfFYZ75iXYKh26Vy82DSvLbx4BcxxJN9spUJq/jj1AYiaPAU3p4P87anHP/OCdOwZDdqjmRDp6OpuZfWCQpzuC6jrS1uj+TqkatkPzDZeuJma7mrLIuqHtSTnV0REUAMjwk9WTtUyb5JGfNvFfINm9NHgRFIZVKG36mr+tC5LV5sEPX7oUo4yP0Xc7YzyrfT/uRPaT2kMq1qMF2qkCBg4LtlmcC6ORCP4YK3oUiYiXtqqqy/p7FsLK5GQ0pd5XQIUZxL+zBUoH2g2THTpCRNIaByyDUEo2XKtQFsCW5eb9mdaJkC2wGRqxhE7ksUpE73EkpV+CIW/z9SREPHsPEqdaFJRtC+C3V/a9JGxEdfijlV3OJ8uWNO92ahBdM+TldFc/prfWpJqAgja/Sy3gxqzsK7XDcPY0vGCjD/Czs2pE4K1G6ZRhcuJQNBkg21TmrcrVQTuQnR+pbsLqoda1oZiv0peRPt7nkCBhHDDtd10ZbqqP3Xbj5tRD6SPlyRJ0QFwGuNde4WwkfAtFKks0Eyg9Aa6PjlD8PsySwLfqw48h9Nfvc0aYk3OgDZNRGyhioKCnpjGST1TKSSIb8F+p5Fkjs2BHBjxMU8xrVer9tzrm7WpoqLS9n9HFZZoKJVoLK6ZzrlWmOdl9yXqjkCdX97kZMcELkAzFQyEKsHPmf7KZx1nhssBvzDGdShbv11sNvvNQmYH6wyMttSRU/afESBrl+apNnF7TR75e0c68EyhWLbIAICRJEzjUDqsE0flUmC26PAEsXZ04s3OcfIbAEvV6pQFMsvM+ukF/mMlDpgjsoEz2lNZVBIN4T5wTa1lzj5w==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json
index 755408b1..0be9cf4c 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json
@@ -661,7 +661,7 @@
}
}
],
- "ID": "e49e6c21-5fe5-4b8f-ba61-3c65cedb3fdf"
+ "ID": "317fa44c-b529-4143-8178-d6adca846a9f"
},
{
"CommandList": [
@@ -673,12 +673,12 @@
}
}
],
- "ID": "7655fe72-7710-482e-9875-a577adebc158"
+ "ID": "d7e78847-5030-4d48-823e-19fe61b9d145"
}
]
}
],
- "ID": "c12218e3-13d9-43ad-942d-ae969c2ffec5"
+ "ID": "64f48c53-d5d0-415d-aaa8-0cf8cb8ebbe9"
}
]
},
@@ -743,7 +743,7 @@
"LoadBindingDataOption": 2
}
],
- "ID": "3431a1f3-3c39-4173-827e-774813724c85"
+ "ID": "2b14a78c-bf52-45ed-b185-e57e24dca537"
},
{
"CommandList": [
@@ -758,12 +758,12 @@
"BtnText": "知道了"
}
],
- "ID": "c6d68038-bbcf-4b36-8ddf-6bc8e8faff63"
+ "ID": "79bf3a0a-cdd6-4bf7-a46e-ab13f6758189"
}
]
}
],
- "ID": "73254201-7e23-45b2-ba9b-975b43b31f8d"
+ "ID": "aa3ed659-7b22-4b1f-9116-22aa35d3c1e8"
},
{
"CommandList": [
@@ -785,12 +785,12 @@
]
}
],
- "ID": "582e3836-54f7-46a1-8e52-a5040a55c49b"
+ "ID": "82e7733f-1df8-4440-b6a4-379c69d3aac0"
}
]
}
],
- "ID": "47d4634f-82b9-4e59-a750-382174a1b4ad"
+ "ID": "0655e4f0-a229-4464-b109-1965546daa45"
},
{
"CommandList": [
@@ -805,12 +805,12 @@
"LoadBindingDataOption": 1
}
],
- "ID": "79dc7e02-05fc-435c-8aaa-34ff98be19d3"
+ "ID": "b194031c-c8e5-49e7-819b-5fdf4252807a"
}
]
}
],
- "ID": "fc723a0a-f087-49fd-9203-7e8c29400906"
+ "ID": "bb17caf2-20e3-4dd4-b811-136411c075b0"
},
{
"CommandList": [
@@ -820,7 +820,7 @@
"Message": "只有该项目管理员可新增任务"
}
],
- "ID": "ec237d2b-40bc-4845-ae73-9ca70d313f25"
+ "ID": "03b7792b-ccdf-4f57-8f47-77dcf4d34b65"
}
]
}
@@ -1309,6 +1309,21 @@
}
}
},
+ {
+ "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand",
+ "CurrentRowInfo": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "ID",
+ "GUID": "f7a9426e-ff4d-46af-98d0-30d9c3f9b23b"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务列表!行数据.value"
+ }
+ }
+ },
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
"ConditionAndCommandPairList": [
@@ -1368,7 +1383,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "c3cc8d40-5dbd-4e1f-bfbf-df4e1245ceb6"
+ "ID": "d5bc115a-aa14-47d5-8b08-814d4597d447"
},
{
"CommandList": [
@@ -1378,12 +1393,12 @@
"Message": "你尚未成为该任务参与人，不能报工"
}
],
- "ID": "064c03c5-8c5a-4f96-8bae-b2a5f2d25126"
+ "ID": "61d80c47-e819-44bc-8992-51ec3b8d3bdb"
}
]
}
],
- "ID": "187dbea3-43ca-4eb0-8d7b-2d884c30f25e"
+ "ID": "e9ba1809-7c63-4f3c-9636-0ef10d4863af"
},
{
"Condition": {
@@ -1409,7 +1424,7 @@
}
}
],
- "ID": "ab06f5cb-d894-4bd5-906e-8c6d3925b15e"
+ "ID": "1f5b1c69-ae66-4ac2-9de6-454b4fbfa6f9"
},
{
"CommandList": [
@@ -1448,12 +1463,12 @@
"LoadBindingDataOption": 1
}
],
- "ID": "90b936a8-764a-4134-a9e6-4cc33511d73d"
+ "ID": "567bb9e3-6b98-4358-8696-35f1662ec152"
}
]
}
],
- "ID": "f93fa7dd-6be6-4eaa-9de2-e62b9ef64058"
+ "ID": "6cf16244-60c6-49ff-a1b2-2f832f8f1dba"
}
]
}
@@ -1922,4 +1937,4 @@
"Formula": "任务列表!$I$13"
}
]
-}//RnshkwD3r911LEdmwQkqvU5FDgShx8dk6hfoihy67ECajb238NSABLTSeHG7hUlwbQ5fUb32fjQ25YBiR4p/cn0tL2F/3O0kHocWIzHoy4HmLQRB0AJVsJTmn8iS3i2y2+kqmmHdOrtoxiBkbFTAH/yI0tadL/1H6hIeFL4///n5Y7FM5+2nB71N8U1D5zsGofC4uY+R9Dt7XYEhw9pHgH7ZoaYKaexJJnzLRxvU9023vIWkbKQpcXk45y8lJN0Ujvqvr2GTx2Noc8KFWIVhQi396gq/WoMia2Qz/Lb16dyNPdCuQoB382VaPu/B3IADltpKQKTwaJ6sDIezuod/RN44nsRKp6nU9sKwRSBKE1f8YPOQllmkpGTtiM7SdAAdSurUDkao872SYeqRpraTXhksQr0NUKwyvRd/RE6zhEXVsBPJoL5gU5gsQGaadbpZyJjr9AOWFuE4v9EiaYlI8AdkkanbeKoN1vdjWw8ip68H8BtK13Pb07XRfzQ/Xm6A7OLxwc4mi+t8yphftnDpgtOnbmbL7u+wx1vA7hCdy40DCqenukrPnMUjoEyp7CZ3cDuN7coJS6Z9oGmgsjr87imlYQZygbhNC8k8iYsHHDcD8uIYNjJAeI2zw3ow6edqoEqbs6Qe1sCGrGQdzRlJ4yYZrfV9u3mB7showOgEjdQFo/xc4Aal8XcK3newEhjts+zMXMECm5+BUG5ZKLM5ceqh2crNCcfFV9DLiJ2/Zq+uPpxqKMANT3reoBRmJvPGApVtilY/oNzw6PrmJYgiD5lMtur6o7qRlvLT6QEzbMooDfmTZk4HUyazLuqTflXZtUdrWJM+kMmEmjm6no4HC0FTyM7pZbQbf3jXaEf3NdRGoMcqixnuMInba2aFWFiqdMgcUceAhBEK6C0uQcgHjg==|920
\ No newline at end of file
+}//N2pIWuymaY+e9rpixM1PzQPJyVoX3SYnzc3uSqY3wgwxXevMaG54rsYs/8mUhMurwvJiXbraz6gEUtAI54SwEiVGrFMrlIlbcREsciV7IfXKBed9vYLVUJ+ZbukUEz+5Px/R8WFwXY9oCKVvm7W7mQcpbCp0rqkefwN3iGfJAxzgFDv+xgaXaQ8U2ZaZQrxQgOMdBx6O4qyYHpGYhMdGjpRXeb3YvQmB1AC1MersQoUHyvpmjEEAZFO39h81Qg5oqGyM5mM5a39EvHJvARwqibARx8S3Vj/i4r+8rqB1szMU63+RVTn+wD1/gU70Q/rF0bECNJJAu9HosrO5r6tNqVTI7V5lqRlUGjEfqd43iZ9XkIcoEpz5bCFDXizCssk54sc1XBymvAfUgdatFJiFX73gzFNdam6unqFEhmhF9G4XTFXjQ+mebaotQ9c7kfzVB0coVXvDQoixMwV6zxwT/JVNr7ty1OznYASC02snSE3Vugc42thLPAOPeI0K1hRTj4RVYMXNod6gkf72Zsb3CBGXtmVByMZwFwg54CbEARsDWA/L1J/MN3q7Q7xZlWixMQtPIqcV28NScBZ8fawImBwpXm5Cc26AQAJ7NbA4UrwGBDuB5pK9YvQHUNshed7K407/Yx6ib6H1LtKUnSmzonnvamKmPDpokdoEnLA8PuqVINo6nNpDnFT0JWQ4jC9bunOK66CgnCnBrlOq+4XxkuLHHmmHK3ySKWFKR/aqBxsISSdY4YHs9bfE6PJt6eF5ExOwwPqRCBCjjyFIDhEqoemPfYkUsB/KPyEhFYJNJIBHw2WqNbl5xuQHjkIw0AuTiTvXUeXz9U3LUEfeHVkFHvy5ELDrTpqaX1szZNnlR5Qy1uoArv/Ngaq1wR+BkoBjOG+VvRoiajoO/rwWOrv/jg==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json
index 56890422..09581902 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json
@@ -570,7 +570,7 @@
]
}
],
- "ID": "de036e68-da51-4d38-aaa8-322218fde1b3"
+ "ID": "1cbc3ef7-5807-46eb-84de-7841d420f99b"
}
]
}
@@ -707,7 +707,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "e7173fa8-5158-4733-a953-db7e600aec2c"
+ "ID": "1f45f090-e7e9-4c3f-9e6e-84dcb829581e"
},
{
"CommandList": [
@@ -819,7 +819,7 @@
}
}
],
- "ID": "a564a559-ae40-44d9-aa0a-1176b56605b7"
+ "ID": "7ea8b19c-20e6-4238-891a-431aee2ecb22"
}
]
},
@@ -833,7 +833,7 @@
"Title": "加载中"
}
],
- "ID": "e94f8735-9a96-4efd-9d46-ba09731b6934"
+ "ID": "b206260a-637b-441d-be61-eb50663b8c19"
}
]
}
@@ -844,7 +844,10 @@
"Name": "gitee.svg"
},
"IconSize": 14.0
- }
+ },
+ "RulesGuidList": [
+ "bd4478c9-d394-4be8-b601-d18f68a38429"
+ ]
},
"22,1": {
"CellType": {
@@ -1153,7 +1156,7 @@
"ReloadData": true
}
],
- "ID": "c0765565-921e-4de6-99cf-5291c8f3f8f4"
+ "ID": "78368f13-c76f-4017-818a-7284774803ea"
},
{
"CommandList": [
@@ -1168,12 +1171,12 @@
"BtnText": "知道了"
}
],
- "ID": "b5813127-6a85-4851-aec1-b29c6d0a415e"
+ "ID": "7c406259-22f0-4dc8-99aa-876b16831354"
}
]
}
],
- "ID": "dbbd3d1a-df2c-4b56-9d49-a96130665c0b"
+ "ID": "b2f588cf-9f02-4daa-89fa-51b63d52ed80"
}
]
}
@@ -1259,7 +1262,7 @@
]
}
],
- "ID": "4677615a-c3d0-4882-89f7-bb6ba8af0b55"
+ "ID": "6b1382c7-28eb-4888-a48a-4437f52c6e32"
},
{
"CommandList": [
@@ -1274,7 +1277,7 @@
"BtnText": "知道了"
}
],
- "ID": "89a37a13-768b-4cb6-9de0-8b38b32ed686"
+ "ID": "037ec484-9cf0-40be-9b7e-cf10836f0347"
}
]
}
@@ -1686,7 +1689,7 @@
]
}
],
- "ID": "b4930ddd-4a85-4388-89f3-cc09b1484baf"
+ "ID": "c94b98b7-79e0-479b-a449-52200ca0673b"
},
{
"CommandList": [
@@ -1703,7 +1706,7 @@
]
}
],
- "ID": "1492558e-515d-4901-8c86-3a8aa3a8e991"
+ "ID": "d39b59bb-8e3b-4315-8403-888d28c58d0d"
}
]
}
@@ -1724,7 +1727,26 @@
},
"RowBreakLines": [],
"RepeatRangeSettings": [],
- "RelatedDataTableName": "任务平行视图"
+ "RelatedDataTableName": "任务平行视图",
+ "ConditionFormatRulesCollection": {
+ "Rules": [
+ {
+ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+ "Formula": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=OR(ISBLANK(新增报工!版本ID),ISBLANK(新增报工!分支名称))"
+ },
+ "GUID": "bd4478c9-d394-4be8-b601-d18f68a38429",
+ "StyleInfo": {
+ "Underline": null,
+ "Strikethrough": null
+ },
+ "IsDisabled": false,
+ "IsInvisible": true,
+ "IsReadOnly": false
+ }
+ ]
+ }
},
"PrintInfo": {
"PaperSize": {},
@@ -1772,4 +1794,4 @@
"Formula": "新增报工!$B$30"
}
]
-}//IKaD0/paZy5As0qfLRjGNbClt7HaLFLrG5ok4YoQTO2P8RMF5qwEC8hjHxXp8PJvLKlYhb1oU7cn9Go3TfHU83/oEg3fxQcC17b4IauBeEoH2V1VLO5HVJjBSOD7JR/L4I3rx3j61LVy2Dd373wIa3+pVyie5bCMoaCPXcBGIZDLnbDGV8xADSoOMUuiPE1Xmyp5pTuxlLAFC/r1coeYAE1Ll14joakZs2nobKutJfNDYCQu51uBA2AifYHpd2ZDUGRCPSMgGp07d5xUNke02rkQJzC0ON4I0qM9twIhWjB8b5HmTvbQEM/v5P6w0qbyRGYXwfUii4uM1Aw6vtbiuv1luXGdd8bijlpFkR7MPkwi7m/zf34tjzvw+vqH1vDDkblI6P6u2EFMmxY1ADhpz3F++znSE3cBiHRBbuBn5Nc1cszBiSMcwUXfUgd1UzSCORb5Z0O4+YgfZj6BvniWpHEbzEFRmV6pBB87+kVWHxz9YosWQ1cGJ4PMISGDrzJbO6Qz65MGSfSz1NYsNmUAq3weA2zLznQ7ZMtAl7Rr/huERO7SHN9UytsH3DLb7WZkiSLgyh1hHntImGh6ai74DWUOOW9HtNEAKzycec8qxRjwwYhx0edT1ZVinur3N0MfObKSumpMZS68/0RFpbAIviRBAU+F6U/uTnTvfP/7cfSuehO6mNnNRIy9WOlATmZyzmq6umPoa/RCT+/S92oPKGbwnFla+QpVMoAY8ijb7zGHqBuHV+NWeJvIr5QnIdKc20+wZHWOURheBtit+A4xiD5vY7TIiKlkVN635FLvGZd2x4qn6FS0rmBeGjLKUIHUkmi/2reT6PwkJD8XheyDcA4xOaJHNJv4sci4oXGzOrWqxJ2DdetNYJDm9DKF0PWb5vFVvsX1JidBxTbPlNZJ5g==|920
\ No newline at end of file
+}//udWlRG5tDz8T7owlZI/M6nwYLnFijtqEdZ10iM0ocEK+vS5RaWj6O0Q3XczdIrax4Quy3EQpo+I7UpyBw1FDrTpKslGXEIYOAA/Y42HI6kJwHEJrViECljbQU5ya6f61x6WzZHh3Ce8wh9VXfR2Tzs3IQJ7YJ3UaqCuaU1u/sCOZtPTk8Bwpsi1D1Wzo2ZovtFDoUR8rBax5Gb2+bNL4zlK+v4WBFMlXl76j7cQFjQAIwWzmoG6UCNNfkzqpfgNIP6zOCh+HEwLtk2PfWEO2Es97QYm3Cun/Qx6GAzSXBa8hqg3YdjEAU7gMs8PpT11tIvjBSxa/ZQ2IS3zyH8kvAnw/8c9rPzU+jM1dytLnYo6XX0mB+ReZvox6pwg3sxeStOz23dFqeaj25uqOcqrSRPr6bOhegMjvvOfrwUqhB38tgBvKSyHc16UDxmPEoGIgxoIEnHeojqi92ABupdohu5lnPqWmP8AZmKZc/wdXxaJLL/vqOBXqYjK8bP/wizwwms4GRkGx1xhO0TyTAlGsWaHRgXrf6fDhhTv9eY0ACHf9SJVxJ5qaBlJ2R4+n/Vd9IhiVnudwyRN9vcTyUPTrhE7RpJpslk36/9p2n378b5+gIrTaFcfTFtLk+Ql5ifUHNaa9fDFouM+Qk1pWTf9m42yWlC/NtBuaKY/pe4l2gPsublQkjhM4ZHUQjGhqKPpT/s9a31jcaeIpptH767dDMHusTUoXXpgp9gCZ9Rl4Ehfrjvi3eBgRWc1h8ZvqY1Re2aBRYTE/jLRVu1z9++OfGaiqFKoQcSKSxIVSZJrBtPHUhMy8mt5koNNBbomidV9MufAlVO/muu67FWGRDgGq/d8oHw7jhpJAv8nuydhfRn69oew6Nv/oBXugJnlciUNtx5WVAI9PVgbZO+kH/ifHaQ==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json b/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json
index 83fb2233..433fd26e 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json
@@ -741,6 +741,15 @@
}
},
"ColumnName": "状态"
+ },
+ {
+ "GUID": "9932e11d-91f8-454a-add3-907a5e619ca2",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "流程实例ID",
+ "GUID": "c692a250-b863-4c11-a354-0c3211aef39c"
+ },
+ "ColumnName": "流程实例ID"
}
],
"SqlCondition": {
@@ -1087,6 +1096,29 @@
]
}
]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "流程实例ID",
+ "label": "流程实例ID",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "resizable": false,
+ "showOverflowTooltip": false,
+ "hide": true,
+ "key": "7ab62f70-9832-48b5-b257-6363804d95f4",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
}
],
"showActionButtons": true,
@@ -1129,9 +1161,53 @@
}
}
},
+ {
+ "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand",
+ "CurrentRowInfo": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "ACT_HI_PROCINST_View",
+ "ColumnName": "ID_",
+ "GUID": "9bf5bb5b-5153-49f7-8913-d1b1d56c75f7"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目反馈!行数据.流程实例ID"
+ }
+ }
+ },
+ {
+ "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand",
+ "CurrentRowInfo": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "ACT_RU_TASK_View",
+ "ColumnName": "PROC_INST_ID_",
+ "GUID": "267b0f18-305c-4c80-ac36-a2949605dfcf"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目反馈!行数据.流程实例ID"
+ }
+ },
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "ACT_RU_TASK_View",
+ "ColumnName": "ASSIGNEE_",
+ "GUID": "08ed755f-582a-4bd7-bbe7-ef13c0b8d8d5"
+ },
+ "Value": "%CurrentUser.UserName%"
+ }
+ ]
+ }
+ },
{
"$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
- "PopupDisplayMode": 4,
+ "PopupDisplayMode": 2,
"ShowDrawerHeader": true,
"PageName": "处理反馈工单",
"LoadBindingDataOption": 1
@@ -1291,4 +1367,4 @@
"PaperSize": {},
"Margin": {}
}
-}//bYLhGhnKXsBaXzOUVoq2DjTYzRVPZt1XjTjOxte85i2w8hVACRG4kDk2yP4/PP1JXykSA2ILMfqFo5OoOUt6z12EvHxmaU1UuGYLrJBpyrW1Q23neaA27KlKhONtngJBnFdNpQ5aHq+XQ7J+oPU1dKYBjtCFlnzSfJDSEae3buuxpJBnG95K4/qnGuxEAOhKtL4CYtafqEwduXv3uCL9E1DoB5FqTND7xko8QsmBMBN4ZmUrVrLPiJisPSBSNGVcS/1GD6IkuzNNfMQK1sP0CWg57yk30WxyEbUHwRFRWtWbXIdfbLfbL2Glm1L4ZNqFStYHbvV5xX3CXXERgVxLGY83cP/iLSxplD1TikuQJRmXhOS7fi77GcSohJuDC3NzQYlArLrCXKyh2yr+lPZfKe/zz7MF9DCYke0atmOMqHhEsoFD7i6nHpdUo5BkpOtqrztXqLrcDtwLRsCqeR+GHXkmCH4HOVYWy0nUG/MQ9lc30OUIhz58xpyK6sr5qrxNcKHwHwkA7Kf1TRo0p80Lq1oAbEOlHEi8WlFLBF9gCusXZJzuaX7SDGGLYl48g0mV6BavOKCqQv+8hdvvyxFYt8Ji1WtodS0f7X1KnKed73sDsNOnKq/kcxHLF6ItroTtlrtZlID7xSOBilYErm82syrOxcJ9mlRqxolWCxUpHWCPFi6QDSZWyL6SPZZXHhTRjdhVtm0gFEEjIQI3dTkxtlNRgnOe+X5JvDtvI7+Jrea0506IIt4I61m+5Of462dDjF4s03qcq6epbS6LU2qZ4+rSOCvZkjSBfdJDTKJS+1x9pDdzVhfdlRHv23MvtqK/T4ZScuv5NcxQ3AhQFvEmGPjabPk+iQbbmBhRy2bnsrA8vEhF9yusmr9dFRDx0AsN7+OtC7kJKf6iboA13mXsqw==|920
\ No newline at end of file
+}//nR8jkfzRpd3SgH+JtVFAoc8S9YE0dSRcHwR3Fe+gck+dd4vIPKrQEmMObyPUdEHsJV5yElyLFrgv3FpKK2Flp0i0vCAloTzfuT2A2a8nc2kdj9OYlkTeS5j7454NCXVOh2tLUffeDt0AE6syvE2Fdy+hfOSG7yX2uSl/+HMvLtN2FEYuJ2GDPTJhzkZ0tI+0H9DGwaV3V0foZ7M3lPXOF05ebAHhAGBUssbMvXTMm2F0/oYVL3874KJvr/m0GpflKXgfgmb/XudKImsIMs3Fn1upPWNbpgAbNrWAADlhv+yOZbClLTbpVVSRybD28Ho/zo/NIj0uLv83Ht7dHGIMZcSD11CYkUKMt2xQox+4hvsdn1izXXiK9b6txcRBLuzz2GoSi9w79nax3cyQhY0USIe2jAtnzWwdJOmVHYgv0G0LlFsfahfdvzJ5w2C4NXMfs7Ipao6Ih0MGbes/Ske8G2OmbTJRUKP0NglkbM7Cuk3HiAd6veP4/zmoJoMLNbZgN2hPXefZ2mYCxRiPppPoZi+GdsOsyOKJlYA7A2XEqXT5BwMoKUcQAMZ8hXwV100pSRFpFzqgVOhHMWY64dl/nU00ELKS69e2mXkDtchw4/JVDtLkZypCkYkAdsKHJKbpbY1NqYVc9jbDYjxPph/hJCr14b4qTzQLfyGsLviaDmaUgFW0ETbsDUsdgcRRip2+gMsjIRFrB/FGK/C/J9g7Bs7wXx7+YEyJ0sGc3HKhucHzhXQA+NKP5H45Kmj+TAXxQ5odLM3NzpKYyhlj2sapwGbXGDrwsmtf4oUFxLXuaYDEM2XkLBY+Bh2dyhBz96tF3vgZIlDvCpE0Jh0+FikYCRP2wxF2stDPC0L0jxHN7YkrUqxo22Mo17RMnnQQCjLlFNLjNmInhUOv5ngdwnrMKw==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目发布/导入反馈.json b/Pages/项目/项目首页/项目首页-容器页面/项目发布/导入反馈.json
new file mode 100644
index 00000000..19e63730
--- /dev/null
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目发布/导入反馈.json
@@ -0,0 +1,828 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 40.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 647.0
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 50.0
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 38.0,
+ "IsHidden": true
+ }
+ }
+ },
+ "InLogicalVisibleIndexes": [
+ 6
+ ],
+ "Count": 7
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.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
+ }
+ },
+ "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
+ }
+ },
+ "16": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "17": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "28": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "29": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "30": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "31": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "32": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "33": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "34": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "35": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "36": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "37": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "38": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ }
+ },
+ "Count": 39,
+ "DefaultSize": 32.0
+ },
+ "Values": {
+ "1,34": "导入选中反馈"
+ },
+ "Formulas": {
+ "6,4": "ODATA(\"项目表?$select=项目名称&$filter=ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)&\"&$top=1\")",
+ "1,1": "项目名称&\"反馈列表\""
+ },
+ "AttachInfos": {
+ "1,34": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+ "TargetPageElement": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=导入反馈!B4"
+ },
+ "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
+ "MethodName": "GetSelectedRow",
+ "RetrunParamNames": {
+ "SelectedRow": {
+ "SerializeProperty": "选择行"
+ }
+ }
+ },
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=导入反馈!选择行.length"
+ }
+ ]
+ },
+ "value": "0",
+ "compareType": 2
+ },
+ "CommandList": [
+ {
+ "$type": "CollectionOperationKit.ClientSideArrayOp, CollectionOperationKit",
+ "Operation": 16,
+ "InParamaterName": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=导入反馈!选择行"
+ },
+ "OperationParamaterAName": ",",
+ "OperationParamaterBName": "ID",
+ "OutParamaterName": "ID字符串"
+ },
+ {
+ "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+ "ClosePopupReturnValues": [
+ {
+ "Name": "选中反馈ID",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=导入反馈!ID字符串"
+ }
+ }
+ ]
+ }
+ ],
+ "ID": "f808af38-b649-420f-9413-286132d2c835"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+ "ClosePopupResult": 1
+ }
+ ],
+ "ID": "96d68463-8c54-4f04-aa45-773bd7c67ec6"
+ }
+ ]
+ }
+ ],
+ "Text": "导入选中反馈",
+ "TemplateKey": "_RS_Main1",
+ "Icon": {
+ "Name": "增加.svg",
+ "Color": "Accent 1",
+ "UseCellTypeForeColor": true
+ }
+ }
+ },
+ "3,1": {
+ "CellType": {
+ "$type": "ElementUI.TableCellType, ElementUI",
+ "ElTableName": "EL表格1",
+ "bindingOptions": {
+ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+ "TableName": "需求反馈登记表",
+ "BindingInfos": [
+ {
+ "GUID": "69f1cd79-a1a2-4580-9931-b860a00cf529",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "ID",
+ "GUID": "895c5e39-3687-4a3c-9b09-771420f29e33"
+ },
+ "ColumnName": "ID"
+ },
+ {
+ "GUID": "d080b4a0-697a-4811-b238-ec55ab711b38",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "工单编号",
+ "GUID": "97b24e23-738b-48d7-9adf-19b0cdcdf9e9"
+ },
+ "ColumnName": "工单编号"
+ },
+ {
+ "GUID": "85815cb5-bf69-484e-8b1e-bdbbbd8c6641",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "关联任务",
+ "GUID": "c064735c-fc3c-444f-a683-1afac8b48dda",
+ "RelationBinding": {
+ "RelatedTable": "任务平行视图",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "任务名称"
+ }
+ },
+ "ColumnName": "任务名称"
+ },
+ {
+ "GUID": "558fc501-3a41-4121-95e4-b87c6dc1d3a2",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "反馈类型",
+ "GUID": "5a4ad4fe-b477-4f79-a7f1-0ad71f1ba1b1",
+ "RelationBinding": {
+ "RelatedTable": "反馈类型表",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "反馈类型"
+ }
+ },
+ "ColumnName": "反馈类型"
+ },
+ {
+ "GUID": "55a79428-47d6-470b-bb7f-fe9e20bfe547",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "标题",
+ "GUID": "0461bf40-d6c6-4a13-9c3a-342843e8e42b"
+ },
+ "ColumnName": "标题"
+ },
+ {
+ "GUID": "92fcfc2b-3302-44c6-8073-81729f84c1f8",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "功能",
+ "GUID": "f25bc6e9-5222-4245-a6cd-23718f384de1"
+ },
+ "ColumnName": "功能"
+ },
+ {
+ "GUID": "abd906d5-dcfe-44b1-a208-cb63c2f25824",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "内容",
+ "GUID": "e3ef0715-39a3-4c2a-8a1f-87af3a5c1d19"
+ },
+ "ColumnName": "内容"
+ },
+ {
+ "GUID": "26b6d508-19a2-4159-9f33-86e09b2be17b",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "提交人",
+ "GUID": "a687e051-d94e-4fe1-8ddf-eddddc7ef63d"
+ },
+ "ColumnName": "提交人"
+ },
+ {
+ "GUID": "eb3c4c36-54a6-4b8b-88e2-5a3009f45445",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "联系方式",
+ "GUID": "9b3c02b6-a984-4029-bac9-06069593f8cc"
+ },
+ "ColumnName": "联系方式"
+ },
+ {
+ "GUID": "b2d8d671-000d-4311-bb66-b0091966147c",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "FGC_CreateDate",
+ "GUID": "1dd659e8-647e-4011-bf38-53f4a0f1af53"
+ },
+ "ColumnName": "提交日期"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "项目ID",
+ "GUID": "14f33c8a-d184-43d8-962e-773ebe47d6e0"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=导入反馈!项目ID"
+ }
+ },
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "状态",
+ "GUID": "bc636b2d-4923-458f-9d52-831b3d927d67"
+ },
+ "Value": "3"
+ },
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "关联任务",
+ "GUID": "9b06de6c-9437-4cb8-89a1-97d70533f1a9",
+ "RelationBinding": {
+ "RelatedTable": "任务平行视图",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "版本"
+ }
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=导入反馈!版本ID"
+ }
+ }
+ ]
+ },
+ "NullFormulaValueQueryPolicy": 1,
+ "OrderBySqlCondition": {
+ "OrderByColumns": [
+ {
+ "ColumnBindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "开始处理时间",
+ "GUID": "b09343ab-9e96-49bc-8211-e6e225fb1565"
+ },
+ "Order": 1
+ }
+ ]
+ },
+ "CustomColumns": []
+ },
+ "autoGenerateColumnsByDataSource": false,
+ "columns": [
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "ID",
+ "label": "ID",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "resizable": false,
+ "showOverflowTooltip": false,
+ "hide": true,
+ "key": "7d70c5f1-7599-4a5c-bc76-b8b9927c2258",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "工单编号",
+ "label": "工单编号",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "7e79f95f-ed3b-42e5-9630-d1781dbe92f3",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "任务名称",
+ "label": "任务名称",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "842619f9-3163-487a-a08c-e9a17af5f0fb",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "反馈类型",
+ "label": "反馈类型",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "629b289e-6919-4981-8da9-36b77a10cdee",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "标题",
+ "label": "标题",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "f61d1b8f-d914-493f-bae2-db8cc130ce77",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "功能",
+ "label": "功能",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "a363475a-aa0d-433a-9c20-7199e9c21ac0",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "内容",
+ "label": "内容",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "1052ec7d-9237-46ff-8713-f3980e2b1f45",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "提交人",
+ "label": "提交人",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "904e15b7-12a8-443c-94e3-e56c2a7dcb27",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "联系方式",
+ "label": "联系方式",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "0e345528-1c3f-48d9-86eb-aed10b46809a",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "提交日期",
+ "label": "提交日期",
+ "formatStr": "yyyy/MM/dd",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "c2371ca6-03f9-4a31-81d0-e587e9beb4a6",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ }
+ ],
+ "actionButtons": [
+ {
+ "$type": "ElementUI.ActionButton, ElementUI",
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "button",
+ "Name": "编辑",
+ "shape": "default"
+ },
+ {
+ "$type": "ElementUI.ActionButton, ElementUI",
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "button",
+ "Name": "删除",
+ "styleType": "Accent 5",
+ "shape": "default"
+ }
+ ],
+ "sumText": "合计",
+ "size": "default",
+ "showSelectColumn": true
+ }
+ },
+ "4,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
+ }
+ ]
+ }
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "FontSize": 18.666666666666664
+ },
+ {
+ "FontSize": 13.333333333333332
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Body"
+ ]
+ },
+ "CellStyles": {
+ "1,1": 0,
+ "1,34": 1
+ },
+ "SheetStyle": {
+ "FontFamily": 0
+ }
+ },
+ "Spans": [
+ "3,1,1,37",
+ "6,1,1,3",
+ "4,1,1,37",
+ "6,4,1,6",
+ "1,34,1,4",
+ "6,10,1,4"
+ ],
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+ "PermissionData": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
+ "permissionResource": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core"
+ },
+ "permissionBindings": [
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core",
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ }
+ ]
+ },
+ "RowBreakLines": [],
+ "RepeatRangeSettings": []
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ },
+ "CustomNames": [
+ {
+ "Name": "项目ID",
+ "Formula": "导入反馈!$B$7"
+ },
+ {
+ "Name": "项目名称",
+ "Formula": "导入反馈!$E$7"
+ },
+ {
+ "Name": "版本ID",
+ "Formula": "导入反馈!$K$7"
+ }
+ ]
+}//qcpIGTulljYSk/jSx2+f4EhlNCnZpomiZKiTqZ41v3NJbyqgWBpDIKyrVGqM0SN4ASYWEKloY0PSvdBQsAMxqO5BySVJmTHy0wfdxPMCsxrgxzZfpHcQniXOBy6h/APHzg8iPF19xuQkjH0cj2iMzuOKTuc7fc26YkQELyercb/rUQekdU0dat0Q1ftqD++ZYwmPZp0goU+fvO7s3I/wpyj3SWNn/q0EMEE53VQ7Flk+u8FRmStJjJL/KcXVaXybVBs/rDOHj3fGYpcYqoOIJa4WZWQSHbTSLVTdWEDmnZawp9mQw0qrBd7nu+KfTNDk9ydMD5CxhcR96eUYkqBm3zf7knD6TKL+mxFFU+akEszuOa0HVoZVSZXDou9+XSuqZiMW90fi2H7KdcPEz+sx14gxgGseUUYDDx5Btt6iAldYiilEbxLjUt8mwJm0liH0IUhmDzk/vxfrVZLL85g9cfNv17zbTl8dIFP/SJQzkfVP+UCi5JLncFig1JxBiU8xlZwkBfIKBsMG/AemNeMlGBVfcq9vHNtUdPm1uNwFqzowzZ49GzFefxVliUlUh2nHajaMf4g1U9MzpNe9iGJ/38UsfUYW9f41V/seIxAnaGADf5h3g0hxpZYIho5AjKxqWTsv1Wq+NEQBN42CIUFUOzwFUJB3xYa7N7IoJmVoGuZr/nZMtpiTwY++10Cf2qPfHXGJx+sng8jBfoqwzeWv5qZTuxtMZ0yj7u3QMsmDJHhDLO/j5ghdxlDR0hreWbj1HYJ9Qmnyd9bGZZ2qfFMEb733dI5d8qNNyv6SHmNw1UIHRCWTyTNK2h4XPlqbKGsdCPvVk1iLZ1u30iWoCGmFigRaq/Wc35Ne4Gd+KDGIexIpXKpPPBZbScn/XXC05QccCM7LHV9oe0nzWuCX3yb5bA==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目发布/导入反馈.rd b/Pages/项目/项目首页/项目首页-容器页面/项目发布/导入反馈.rd
new file mode 100644
index 00000000..6d2de8a8
--- /dev/null
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目发布/导入反馈.rd
@@ -0,0 +1,23 @@
+{
+ "PageType": 0,
+ "ColumnCount": 39,
+ "RowCount": 7,
+ "Formulas": {
+ "6,4": "ODATA(\"项目表?$select=项目名称&$filter=ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)&\"&$top=1\")",
+ "1,1": "项目名称&\"反馈列表\""
+ },
+ "CustomNames": [
+ {
+ "Name": "项目ID",
+ "Formula": "导入反馈!$B$7"
+ },
+ {
+ "Name": "项目名称",
+ "Formula": "导入反馈!$E$7"
+ },
+ {
+ "Name": "版本ID",
+ "Formula": "导入反馈!$K$7"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json b/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json
index fee68dc5..65ef395b 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json
@@ -31,29 +31,58 @@
"DesignLengthInPixel": 35.0
}
},
- "9": {
+ "6": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 24.0
}
},
- "10": {
+ "7": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
},
+ "8": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ },
+ "9": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 324.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "10": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
"11": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 454.0
+ "DesignLengthInPixel": 32.0
}
},
"12": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 10.0
}
},
"13": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 454.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
}
},
"14": {
@@ -62,31 +91,26 @@
}
},
"15": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 42.0
+ }
+ },
+ "16": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "17": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0,
"IsHidden": true
}
- },
- "6": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
- }
- },
- "7": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
- }
- },
- "8": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
- }
}
},
"InLogicalVisibleIndexes": [
- 15
+ 17
],
- "Count": 16,
+ "Count": 18,
"DefaultSize": 32.0
},
"Cols": {
@@ -126,11 +150,6 @@
"DesignLengthInPixel": 32.0
}
},
- "11": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
"12": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
@@ -156,72 +175,91 @@
"DesignLengthInPixel": 32.0
}
},
- "19": {
+ "17": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
},
- "20": {
+ "21": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
},
- "23": {
+ "22": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
},
- "24": {
+ "30": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
},
- "25": {
+ "32": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
},
- "26": {
+ "33": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "34": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
},
- "27": {
+ "35": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
},
- "28": {
+ "36": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
},
- "29": {
+ "37": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "38": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
}
},
- "Count": 30,
+ "Count": 39,
"DefaultSize": 32.0
},
"Values": {
"1,1": "所属项目",
- "1,16": "所属版本",
+ "1,17": "所属版本",
"4,1": "发布人",
- "4,16": "评审人",
- "5,16": "%CurrentUser.UserName%",
- "7,1": "发布版本号",
- "10,1": "发布内容",
- "10,25": "从反馈中导入",
- "13,1": "删除",
- "13,19": "取消",
- "13,26": "保存"
+ "4,9": "评审人",
+ "4,17": "发布版本号",
+ "5,1": "%CurrentUser.UserName%",
+ "5,9": "%CurrentUser.UserName%",
+ "7,1": "关联客户反馈",
+ "7,34": "从反馈中导入",
+ "11,1": "发布内容",
+ "11,34": "从反馈生成",
+ "15,31": "删除",
+ "15,35": "保存"
},
"Formulas": {
- "5,16": "IFERROR(ODATA(\"项目表?$select=项目经理&$filter=ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)),\"\")",
- "15,4": "IFERROR(ODATA(\"项目发布记录?$select=发布版本号&$filter=项目ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)&\" and 版本ID eq \"&IF(ISBLANK(版本ID),\"null\",版本ID)&\"&$top=1&$orderby=发布时间 desc\"),\"\")",
- "7,16": "最近版本号"
+ "1,26": "最近版本号",
+ "17,4": "IFERROR(ODATA(\"项目发布记录?$select=发布版本号&$filter=项目ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)&\" and 版本ID eq \"&IF(ISBLANK(版本ID),\"null\",版本ID)&\"&$top=1&$orderby=发布时间 desc\"),\"\")",
+ "5,9": "IFERROR(ODATA(\"项目表?$select=项目经理&$filter=ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)),\"\")"
},
"AttachInfos": {
"2,1": {
@@ -308,7 +346,7 @@
"IgnoreBlank": false
}
},
- "2,16": {
+ "2,17": {
"BindingInfo": {
"TableName": "项目发布记录",
"ColumnName": "版本ID",
@@ -430,6 +468,7 @@
]
}
],
+ "DefaultValue": "%CurrentUser.UserName%",
"useBinding": true,
"options": [
{
@@ -487,7 +526,7 @@
"noMatchText": "无匹配数据"
}
},
- "5,16": {
+ "5,9": {
"BindingInfo": {
"TableName": "项目发布记录",
"ColumnName": "评审人",
@@ -568,7 +607,7 @@
"noMatchText": "无匹配数据"
}
},
- "8,1": {
+ "5,17": {
"BindingInfo": {
"TableName": "项目发布记录",
"ColumnName": "发布版本号",
@@ -602,18 +641,664 @@
},
"DataValidationInfo": {
"IgnoreBlank": false
- }
+ },
+ "RulesGuidList": [
+ "fd4fb4d7-d294-4341-ba84-e534078f1b46"
+ ]
},
- "10,25": {
+ "7,34": {
"CellType": {
- "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=版本发布详情!版本ID"
+ }
+ ]
+ },
+ "value": "%Null%",
+ "compareType": 1
+ },
+ "CommandList": [
+ {
+ "$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.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=版本发布详情!反馈ID列表"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=版本发布详情!选中反馈ID"
+ }
+ }
+ ]
+ }
+ ],
+ "ID": "9bd6b156-6011-4bdc-91d2-a5be2b8b8961"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+ "TargetPageElement": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=版本发布详情!B10"
+ },
+ "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
+ "MethodName": "ResetTable",
+ "ParameterValues": {
+ "clearSort": true,
+ "clearFilter": true
+ }
+ }
+ ],
+ "ID": "380d031f-89cf-44b2-9b7c-096d203f3994"
+ }
+ ]
+ }
+ ],
+ "ParamProperties": {
+ "IsOK": "是否为确定",
+ "选中反馈ID": "选中反馈ID"
+ }
+ },
+ "PageName": "导入反馈",
+ "PassValues": [
+ {
+ "Source": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=版本发布详情!项目ID"
+ },
+ "TargetCell": {
+ "SerializeProperty": "=导入反馈!项目ID"
+ }
+ },
+ {
+ "Source": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=版本发布详情!版本ID"
+ },
+ "TargetCell": {
+ "SerializeProperty": "=导入反馈!版本ID"
+ }
+ }
+ ]
+ }
+ ],
+ "ID": "628fdb9b-8ad5-4e9f-bf63-f26a6c3503d8"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+ "TargetPageElement": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=版本发布详情!版本ID"
+ },
+ "TargetType": "ElementUI.SelectCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
+ "MethodName": "Focus"
+ }
+ ],
+ "ID": "ba0a2788-202d-4968-b7fe-a3ac059f5570"
+ }
+ ]
+ }
+ ],
"Text": "从反馈中导入",
- "ClickMode": 1,
- "IsInvisible": true,
- "TemplateKey": "_RS_Main"
+ "TemplateKey": "_RS_Main3",
+ "Icon": {
+ "Name": "退出.svg",
+ "Color": "Accent 1",
+ "UseCellTypeForeColor": true
+ },
+ "IconSize": 14.0
}
},
- "11,1": {
+ "9,1": {
+ "CellType": {
+ "$type": "ElementUI.TableCellType, ElementUI",
+ "ElTableName": "EL表格1",
+ "bindingOptions": {
+ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+ "TableName": "需求反馈登记表",
+ "BindingInfos": [
+ {
+ "GUID": "10b3fc4d-a45f-4d66-9fa9-da387e47345e",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "ID",
+ "GUID": "fddc82a7-bf44-404d-b72d-cd2139839e02"
+ },
+ "ColumnName": "ID"
+ },
+ {
+ "GUID": "b84158d8-b317-4fc4-93dd-4c4a86f7df3a",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "工单编号",
+ "GUID": "2c04b8af-7c32-4372-9d7b-38a4804f2ca2"
+ },
+ "ColumnName": "工单编号"
+ },
+ {
+ "GUID": "a1452c76-aaad-4749-965e-363127ec9203",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "关联任务",
+ "GUID": "bd352b88-28d6-492a-ba79-2aba19ef8826",
+ "RelationBinding": {
+ "RelatedTable": "任务平行视图",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "任务名称"
+ }
+ },
+ "ColumnName": "任务名称"
+ },
+ {
+ "GUID": "aca60cff-5c43-4806-9850-1c12d0201f17",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "反馈类型",
+ "GUID": "354b9bb3-87d3-4e5e-a490-503b621ee444",
+ "RelationBinding": {
+ "RelatedTable": "反馈类型表",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "反馈类型"
+ }
+ },
+ "ColumnName": "反馈类型"
+ },
+ {
+ "GUID": "0c8b4d6a-8e82-4d98-8809-f94842860d31",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "标题",
+ "GUID": "5fd5b2e4-1840-4b75-89b3-e6fd9d8147bd"
+ },
+ "ColumnName": "标题"
+ },
+ {
+ "GUID": "dbe0f9cd-cdfe-4de2-a568-665c992f8348",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "功能",
+ "GUID": "566cecfa-4b17-4d7f-90a2-f221336f31b8"
+ },
+ "ColumnName": "功能"
+ },
+ {
+ "GUID": "1ef1af72-086a-4096-a672-d069cd9ff504",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "内容",
+ "GUID": "660909de-a1bf-4f6b-8091-ae1ae2c70246"
+ },
+ "ColumnName": "内容"
+ },
+ {
+ "GUID": "8217cc34-ae81-49ce-a73a-9c3f360d9403",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "提交人",
+ "GUID": "3c8620a9-3a00-4273-9cc2-b25afa552b72"
+ },
+ "ColumnName": "提交人"
+ },
+ {
+ "GUID": "b039d72a-1321-4ceb-bd52-4575ba04ab76",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "处理人",
+ "GUID": "b235c38a-7bf9-4b01-9d20-4d19b888cb1d",
+ "RelationBinding": {
+ "RelatedTable": "用户信息视图",
+ "RelatedColumn": "用户名",
+ "DisplayColumn": "全名"
+ }
+ },
+ "ColumnName": "处理人"
+ },
+ {
+ "GUID": "4f0e3b43-5683-4329-a014-4c26f3ad3a8c",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "FGC_CreateDate",
+ "GUID": "a8313347-2a76-4198-849a-e7c281e7bbd5"
+ },
+ "ColumnName": "提交日期"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
+ "CompareType": 8,
+ "ColumnBindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "ID",
+ "GUID": "78a7157a-6b39-4526-829c-cf4f24e48b3c"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=版本发布详情!反馈ID列表"
+ }
+ },
+ "OrderBySqlCondition": {
+ "OrderByColumns": [
+ {
+ "ColumnBindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "FGC_CreateDate",
+ "GUID": "481826e5-786c-47cb-b0be-2b4a0c23b4e2"
+ },
+ "Order": 1
+ }
+ ]
+ },
+ "CustomColumns": []
+ },
+ "autoGenerateColumnsByDataSource": false,
+ "columns": [
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "ID",
+ "label": "ID",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "resizable": false,
+ "showOverflowTooltip": false,
+ "hide": true,
+ "key": "bee67718-afcb-472a-ab07-147b3194e978",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "工单编号",
+ "label": "工单编号",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "b00199c1-ebbe-4481-b12d-c521cae937e6",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "任务名称",
+ "label": "任务名称",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "e526f987-e3ea-4913-bc7a-67b5228307c7",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "反馈类型",
+ "label": "反馈类型",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Tag",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "abe0c4e6-cad7-4fad-ae3e-f1fde1f89a1a",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "标题",
+ "label": "标题",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "a241779e-0c2c-4f7e-8244-8baf9ccd5d01",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "功能",
+ "label": "功能",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "92a1d935-ec5b-443d-978d-388bb4d90667",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "内容",
+ "label": "内容",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "key": "853b8762-a137-4712-86ea-a2d07758c4c1",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "提交人",
+ "label": "提交人",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "1f629554-3e36-4e0e-b2aa-4ca502787616",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "处理人",
+ "label": "处理人",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "c6c899dc-d064-4ff9-b6b6-0a8da60dda84",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ },
+ {
+ "$type": "ElementUI.ColumnSetting, ElementUI",
+ "dataColumnName": "提交日期",
+ "label": "提交日期",
+ "formatStr": "yyyy年MM月dd日",
+ "align": "center",
+ "headerAlign": "center",
+ "colfixed": "false",
+ "type": "Default",
+ "tagType": "info",
+ "imgType": "cover",
+ "showOverflowTooltip": false,
+ "key": "2e9473df-c864-42e2-92d9-9137135bfba0",
+ "UIPermissions": [
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ]
+ }
+ ],
+ "actionButtons": [
+ {
+ "$type": "ElementUI.ActionButton, ElementUI",
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "button",
+ "Name": "编辑",
+ "shape": "default"
+ },
+ {
+ "$type": "ElementUI.ActionButton, ElementUI",
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "button",
+ "Name": "删除",
+ "styleType": "Accent 5",
+ "shape": "default"
+ }
+ ],
+ "sumText": "合计",
+ "size": "small"
+ }
+ },
+ "11,34": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+ "TargetPageElement": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=版本发布详情!B10"
+ },
+ "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
+ "MethodName": "GetSourceData",
+ "RetrunParamNames": {
+ "SourceData": {
+ "SerializeProperty": "反馈数据源"
+ }
+ }
+ },
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=版本发布详情!反馈数据源.length"
+ }
+ ]
+ },
+ "value": "0",
+ "compareType": 2
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "生成内容",
+ "ID": "fe804635779343db9e19cff12197be45"
+ },
+ {
+ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+ "TargetPageElement": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=版本发布详情!项目ID"
+ },
+ "TargetType": "ElementUI.SelectCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
+ "MethodName": "GetSelectedText",
+ "RetrunParamNames": {
+ "SelectedText": {
+ "SerializeProperty": "项目名称"
+ }
+ }
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "版本号",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=版本发布详情!R6"
+ },
+ "ID": "aae4c031702e46fba13b1da44bb18a3d"
+ },
+ {
+ "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon",
+ "JavaScript": "var data = Forguncy.CommandHelper.getVariableValue(\"反馈数据源\");\r\nvar version = Forguncy.CommandHelper.getVariableValue(\"版本号\");\r\nvar projectName = Forguncy.CommandHelper.getVariableValue(\"项目名称\")\r\nvar str = data.map((item, index) => {\r\n return `${item[\"反馈类型\"]}：${item.标题}；`\r\n}).join('')\r\nvar content = \"\";\r\nvar title = \"\" + projectName + ' ' + version + \"版本更新日志\" + \"\";\r\nvar html = title + \"\" + content\r\nForguncy.CommandHelper.setVariableValue(\"生成内容\",html);\r\n",
+ "ID": "9e48025ea0524ee9b6cb68b239e4bdfe"
+ },
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=版本发布详情!B14"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=版本发布详情!生成内容"
+ }
+ }
+ ]
+ }
+ ],
+ "ID": "c6c8c412-51a3-4cc4-97ce-f6984e988a76"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "FourStandardStyle": "warning",
+ "Message": "请先导入客户反馈"
+ }
+ ],
+ "ID": "172950d0-d6c5-46ad-960e-9bf047a03da7"
+ }
+ ]
+ }
+ ],
+ "Text": "从反馈生成",
+ "TemplateKey": "_RS_Main3",
+ "Icon": {
+ "Name": "收起2.svg",
+ "Color": "Accent 1",
+ "UseCellTypeForeColor": true
+ },
+ "IconSize": 14.0
+ }
+ },
+ "13,1": {
"BindingInfo": {
"TableName": "项目发布记录",
"ColumnName": "发布内容",
@@ -623,7 +1308,7 @@
"$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor"
}
},
- "13,1": {
+ "15,31": {
"CellType": {
"$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
"CommandList": [
@@ -657,7 +1342,7 @@
"ReloadData": true
}
],
- "ID": "8ac7727b-4513-44bc-878d-25b32b658abb"
+ "ID": "16e1b1a1-77e9-4f47-b731-4b3b95f3d5d3"
}
]
}
@@ -669,21 +1354,7 @@
"835c1bc8-b4b6-4dbf-a330-eae59d90ed4a"
]
},
- "13,19": {
- "CellType": {
- "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
- "CommandList": [
- {
- "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
- "ClosePopupResult": 1
- }
- ],
- "Text": "取消",
- "TemplateKey": "_RS_Information3",
- "IconSize": 14.0
- }
- },
- "13,26": {
+ "15,35": {
"CellType": {
"$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
"CommandList": [
@@ -729,7 +1400,7 @@
"ParamName": "版本号",
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=版本发布详情!B9"
+ "SerializeProperty": "=版本发布详情!R6"
}
},
{
@@ -745,7 +1416,7 @@
"ParamName": "发布内容",
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=版本发布详情!B12"
+ "SerializeProperty": "=版本发布详情!B14"
}
},
{
@@ -755,6 +1426,14 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=NOW()"
}
+ },
+ {
+ "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+ "ParamName": "反馈ID列表",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=版本发布详情!反馈ID列表"
+ }
}
],
"ResultErrorCodeTo": {
@@ -795,7 +1474,7 @@
"ReloadData": true
}
],
- "ID": "45dd608c-94e8-44f2-878b-e28592a98d68"
+ "ID": "02d73ccd-1316-44d0-99fb-3481fc0cc133"
},
{
"CommandList": [
@@ -810,12 +1489,12 @@
"BtnText": "知道了"
}
],
- "ID": "113315b1-318b-4d47-8bdb-c569570d4cda"
+ "ID": "3fe5ca38-a441-4ee5-a4d5-b616164f5424"
}
]
}
],
- "ID": "64e9ed00-b48c-4e80-97b5-9495cac019b1"
+ "ID": "921fc7df-bb82-4993-8a67-a4335c224df2"
},
{
"CommandList": [
@@ -833,7 +1512,7 @@
"ReloadData": true
}
],
- "ID": "58ebd1d3-9349-436f-b45e-9a7f96d41c04"
+ "ID": "94bd3c51-5cbc-4c84-9460-65671052d6aa"
}
]
}
@@ -849,7 +1528,7 @@
"IconSize": 14.0
}
},
- "15,1": {
+ "17,1": {
"BindingInfo": {
"TableName": "项目发布记录",
"ColumnName": "ID",
@@ -875,6 +1554,11 @@
"Formatter": 3,
"HorizontalAlignment": 4
},
+ {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332,
+ "HorizontalAlignment": 5
+ },
{
"FontFamily": 0,
"FontSize": 13.333333333333332,
@@ -892,32 +1576,39 @@
"[AUTO]General",
"Accent 1 0",
"\"当前版本号：\"@",
- "Right"
+ "Right",
+ "Center"
]
},
"CellStyles": {
- "1,16": 0,
"1,17": 0,
"1,18": 0,
- "1,19": 1,
- "1,20": 1,
+ "1,19": 0,
+ "1,20": 0,
"1,21": 1,
"1,22": 1,
"1,23": 1,
"1,24": 1,
"1,25": 1,
- "1,26": 1,
+ "1,26": 2,
"1,27": 1,
"1,28": 1,
- "2,16": 1,
- "2,19": 1,
- "2,20": 1,
- "2,23": 1,
- "2,24": 1,
- "2,25": 1,
- "2,26": 1,
- "2,27": 1,
- "2,28": 1,
+ "1,29": 1,
+ "1,30": 1,
+ "1,31": 1,
+ "1,32": 1,
+ "1,33": 1,
+ "1,34": 1,
+ "1,35": 1,
+ "1,36": 1,
+ "1,37": 1,
+ "2,17": 1,
+ "2,32": 1,
+ "2,33": 1,
+ "2,34": 1,
+ "2,35": 1,
+ "2,36": 1,
+ "2,37": 1,
"4,0": 1,
"4,1": 0,
"4,2": 1,
@@ -927,72 +1618,39 @@
"4,6": 1,
"4,7": 1,
"4,8": 1,
- "4,9": 1,
- "4,10": 1,
- "4,11": 1,
- "4,12": 1,
+ "4,9": 0,
+ "4,10": 0,
+ "4,11": 0,
+ "4,12": 0,
"4,13": 1,
"4,14": 1,
"4,15": 1,
- "4,16": 0,
+ "4,16": 1,
"4,17": 0,
- "4,18": 0,
+ "4,18": 1,
"4,19": 1,
- "4,20": 1,
- "4,21": 1,
- "4,22": 1,
- "4,23": 1,
- "4,24": 1,
- "4,25": 1,
- "4,26": 1,
- "4,27": 1,
- "4,28": 1,
- "4,29": 1,
+ "4,30": 1,
+ "4,31": 1,
+ "4,32": 1,
+ "4,33": 1,
+ "4,34": 1,
+ "4,35": 1,
+ "4,36": 1,
+ "4,37": 1,
+ "4,38": 1,
"5,0": 1,
"5,1": 1,
- "5,2": 1,
- "5,3": 1,
- "5,4": 1,
- "5,5": 1,
- "5,6": 1,
+ "5,9": 1,
+ "5,10": 1,
"5,11": 1,
"5,12": 1,
"5,13": 1,
"5,14": 1,
"5,15": 1,
"5,16": 1,
- "5,29": 1,
- "6,0": 1,
- "6,1": 1,
- "6,2": 1,
- "6,3": 1,
- "6,4": 1,
- "6,5": 1,
- "6,6": 1,
- "6,7": 1,
- "6,8": 1,
- "6,9": 1,
- "6,10": 1,
- "6,11": 1,
- "6,12": 1,
- "6,13": 1,
- "6,14": 1,
- "6,15": 1,
- "6,16": 1,
- "6,17": 1,
- "6,18": 1,
- "6,19": 1,
- "6,20": 1,
- "6,21": 1,
- "6,22": 1,
- "6,23": 1,
- "6,24": 1,
- "6,25": 1,
- "6,26": 1,
- "6,27": 1,
- "6,28": 1,
- "6,29": 1,
- "7,0": 1,
+ "5,17": 1,
+ "5,30": 1,
+ "5,38": 1,
"7,1": 0,
"7,2": 1,
"7,3": 1,
@@ -1008,30 +1666,162 @@
"7,13": 1,
"7,14": 1,
"7,15": 1,
- "7,16": 2,
+ "7,16": 1,
+ "7,17": 1,
+ "7,18": 1,
+ "7,19": 1,
+ "7,20": 1,
+ "7,21": 1,
+ "7,22": 1,
+ "7,23": 1,
+ "7,24": 1,
+ "7,25": 1,
+ "7,26": 1,
+ "7,27": 1,
+ "7,28": 1,
"7,29": 1,
- "8,0": 1,
- "8,1": 1,
+ "7,30": 1,
+ "7,31": 1,
+ "7,32": 1,
+ "7,33": 1,
+ "7,34": 3,
+ "7,35": 1,
+ "7,36": 1,
+ "7,37": 1,
+ "8,1": 0,
+ "8,2": 1,
+ "8,3": 1,
+ "8,4": 1,
+ "8,5": 1,
+ "8,6": 1,
+ "8,7": 1,
+ "8,8": 1,
+ "8,9": 1,
+ "8,10": 1,
+ "8,11": 1,
+ "8,12": 1,
+ "8,13": 1,
+ "8,14": 1,
+ "8,15": 1,
+ "8,16": 1,
+ "8,17": 1,
+ "8,18": 1,
+ "8,19": 1,
+ "8,20": 1,
+ "8,21": 1,
+ "8,22": 1,
+ "8,23": 1,
+ "8,24": 1,
+ "8,25": 1,
+ "8,26": 1,
+ "8,27": 1,
+ "8,28": 1,
"8,29": 1,
- "10,0": 1,
- "10,1": 0,
- "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": 3,
- "10,29": 1,
- "13,19": 0,
- "13,20": 1,
- "13,23": 1,
- "15,4": 4
+ "8,30": 1,
+ "8,31": 1,
+ "8,32": 1,
+ "8,33": 1,
+ "8,34": 4,
+ "8,35": 4,
+ "8,36": 4,
+ "8,37": 4,
+ "9,1": 1,
+ "9,2": 1,
+ "9,3": 1,
+ "9,4": 1,
+ "9,5": 1,
+ "9,6": 1,
+ "9,7": 1,
+ "9,8": 1,
+ "9,9": 1,
+ "9,10": 1,
+ "9,11": 1,
+ "9,12": 1,
+ "9,13": 1,
+ "9,14": 1,
+ "9,15": 1,
+ "9,16": 1,
+ "9,17": 1,
+ "9,18": 1,
+ "9,19": 1,
+ "9,20": 1,
+ "9,21": 1,
+ "9,22": 1,
+ "9,23": 1,
+ "9,24": 1,
+ "9,25": 1,
+ "9,26": 1,
+ "9,27": 1,
+ "9,28": 1,
+ "9,29": 1,
+ "9,30": 1,
+ "9,31": 1,
+ "9,32": 1,
+ "9,33": 1,
+ "9,34": 1,
+ "9,35": 1,
+ "9,36": 1,
+ "9,37": 1,
+ "11,0": 1,
+ "11,1": 0,
+ "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": 1,
+ "11,31": 1,
+ "11,32": 1,
+ "11,33": 1,
+ "11,34": 3,
+ "11,35": 1,
+ "11,36": 1,
+ "11,37": 1,
+ "11,38": 1,
+ "12,0": 1,
+ "12,1": 0,
+ "12,15": 1,
+ "12,16": 1,
+ "12,17": 1,
+ "12,18": 1,
+ "12,19": 1,
+ "12,20": 1,
+ "12,21": 1,
+ "12,22": 1,
+ "12,23": 1,
+ "12,24": 1,
+ "12,25": 1,
+ "12,26": 1,
+ "12,27": 1,
+ "12,28": 1,
+ "12,29": 1,
+ "12,30": 1,
+ "12,31": 1,
+ "12,32": 1,
+ "12,33": 1,
+ "12,34": 3,
+ "12,35": 3,
+ "12,36": 3,
+ "12,37": 3,
+ "12,38": 1,
+ "15,31": 1,
+ "15,32": 1,
+ "15,33": 1,
+ "15,34": 1,
+ "15,35": 1,
+ "15,36": 1,
+ "15,37": 1,
+ "17,4": 5
},
"SheetStyle": {
"FontFamily": 0,
@@ -1039,19 +1829,21 @@
}
},
"Spans": [
- "2,1,1,13",
- "2,16,1,13",
- "10,25,1,4",
- "13,26,1,3",
- "13,19,1,5",
- "13,1,1,3",
- "15,1,1,3",
- "5,1,1,13",
- "5,16,1,13",
- "8,1,1,28",
- "15,4,1,8",
- "7,16,1,13",
- "11,1,1,28"
+ "2,1,1,14",
+ "17,1,1,3",
+ "17,4,1,9",
+ "13,1,1,37",
+ "5,9,1,7",
+ "17,13,1,6",
+ "9,1,1,37",
+ "7,34,1,4",
+ "11,34,1,4",
+ "15,35,1,3",
+ "15,31,1,3",
+ "2,17,1,13",
+ "5,17,1,13",
+ "5,1,1,7",
+ "1,26,1,4"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1104,6 +1896,22 @@
"IsDisabled": false,
"IsInvisible": false,
"IsReadOnly": false
+ },
+ {
+ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+ "Formula": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=ISBLANK(版本发布详情!版本ID)"
+ },
+ "Priority": 2,
+ "GUID": "fd4fb4d7-d294-4341-ba84-e534078f1b46",
+ "StyleInfo": {
+ "Underline": null,
+ "Strikethrough": null
+ },
+ "IsDisabled": true,
+ "IsInvisible": false,
+ "IsReadOnly": false
}
]
}
@@ -1119,15 +1927,19 @@
},
{
"Name": "版本ID",
- "Formula": "版本发布详情!$Q$3"
+ "Formula": "版本发布详情!$R$3"
},
{
"Name": "ID",
- "Formula": "版本发布详情!$B$16"
+ "Formula": "版本发布详情!$B$18"
},
{
"Name": "最近版本号",
- "Formula": "版本发布详情!$E$16"
+ "Formula": "版本发布详情!$E$18"
+ },
+ {
+ "Name": "反馈ID列表",
+ "Formula": "版本发布详情!$N$18"
}
]
-}//Opumf94yo5nmPf4BIMk/Tuqp+lkHaA7ugJfIwoLGCsBojWzAPxQjp2Byszo5iKPXUyZIIeUCaIVYGzMkPIR6EJ6DRKUNdZNIpDoP780y0tcQGOPe7vPXV3E/3Xm9OZ+4Nnm8O0M88zDWMIVXryrJaZM1fgdFWnX2Y772aLCA1+c57BgVYtFZQVrL29Pp7cD+SC1vCF6zjek7bFGjCNZQZbMVs+PjDE8ukfjunctGNVfh65bh0eI0S+FuvvY9dSU/h5hOyPPNkgX3kbU2Ikk3rAca+5YFb/wFnwkcFLV41YD8CUX3TIkQG1I7BkoNcJAEcELfTmHMfmSsX8xqsvW0p26tBPTW8ygnTPRMKfpNHgZz9r8yoKoxmOulQlIlSzKGmP66yx754vNaDiK4hog3RIflkV0Wuochs48RDC38piBgVGhizv47+GEbqF+sGIPZUfxlkGr396qd07n3654JRxeZaEN/ZF8LczpGS9gMVJwORxvDughlM53923yau1d2ukkk1sqdkSZXucqDzstDVKV6Gmk3FYR9l7FV1JBG3BUMMXgB8s/ATIC9+2MRzSWhwuCnhcXznxX+iGOLRZTH7ICxyk1uoFkySqrmQuT4VAE6+FKSL7UGMy1i+Q2Y2EX488yrAwdm47xQ+lDh0palR0p3DtdZv577ZUJYZAG9vs+vB5jIA7IIyxm2GOmaGpKyI26thtyahhWwzEVOv9nONBH/dpMfvPLZY4l1B8XKPCOXAj6sMnJF1CZ0ZMzsuuQ6f7mlE/g5aiouYHXPog+L445G39I3gr6Ur50W5h5AyFD3BLjBRwA7QmsxqZxIW35sYfSmOaiAHmZNglkzRRV9dSt8/qVQLAvhxy4j73FXy/k80XjqZQgci9kAqE6F+w2D+4qky1rjuNV+nazfaewGKA==|920
\ No newline at end of file
+}//BJvxbNHsOwD6ueDvcdLSId1JTT3iVdUfcTYrAleFx6RsGfxarmkNDHYaIpWbwJCQ1VD7o1Lc+qeG3oEvBWNyqR1BwbAcM/hbFBKXYjBmFoWOFvRm8LdG1I0yJZcFu7SRQVjX+DkibfqPgB2lYkLfxfF/c6m2onBkwtTDssZ6F7RMFgfT/pQ1+c+SkzDbNVg64t2Fb2ETz02iQFiYP9tDGFkjMHOKUWsMxitj4Zlaq4JxjSUATu4HSB95AELMdVSpswD+/K7OXHb/KRaO4h/UP29wuADks2OD4MC++ejpIbfUu4Oqu95pggqaZkYCDzcQ7aI0TdPUP2Z2BA4/SkW3ZK26Ls6JFCfz3juIqS2M9oIP6B/7mkJ0rOtdQ01RfUF6eIKOrlRMMUEHqGWg/A/mumYpg7UnOJ2MenmbDYszIaEucqNeivNpROv/wYD90GYRdTKqmrJhGLnBGUE0oD90n+ZY8rlubYwnVk6PSayciTld+/V8X2ThP2MgSW9shZFeGCbHzSKrW8woui7ny/vm629iYXz6omlR3k1o2r4l5eiVR+N/xgoEF+zMOXQk5cQdGe1WMhZNUKVuLbpg4jFCCHf6dWk/zs89stgkKA0ouKXc1+HZ3xWbVzmOlTz+D4ZvXw4tZkRP+pHY6nFSH2UhJTmXDwllSa7zfld4hhqHL9MRBBhlK8pG33U4TjAilQ0YUVDRUNFecPhy2T9n9UvjsLqjIgGoZyxvFYmrSKnyJLhb8aKj52EAy7d+uvmszxNKSrjb7azWCc3OwXUZpGw9FYskQap2clbJxPNd2UXzUhcmnX/paV9bo4PoC95jbtarZbXy0fI3HxElGleR3JFkRqX2GxXGe4kwydyzth9mSYzfrym8bm+Qqo9Xi0jcYQaNkE5E0RPH95a7krGYjAkbZA==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.rd b/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.rd
index 3a213d32..11349759 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.rd
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.rd
@@ -1,11 +1,11 @@
{
"PageType": 0,
- "ColumnCount": 30,
- "RowCount": 16,
+ "ColumnCount": 39,
+ "RowCount": 18,
"Formulas": {
- "5,16": "IFERROR(ODATA(\"项目表?$select=项目经理&$filter=ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)),\"\")",
- "15,4": "IFERROR(ODATA(\"项目发布记录?$select=发布版本号&$filter=项目ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)&\" and 版本ID eq \"&IF(ISBLANK(版本ID),\"null\",版本ID)&\"&$top=1&$orderby=发布时间 desc\"),\"\")",
- "7,16": "最近版本号"
+ "1,26": "最近版本号",
+ "17,4": "IFERROR(ODATA(\"项目发布记录?$select=发布版本号&$filter=项目ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)&\" and 版本ID eq \"&IF(ISBLANK(版本ID),\"null\",版本ID)&\"&$top=1&$orderby=发布时间 desc\"),\"\")",
+ "5,9": "IFERROR(ODATA(\"项目表?$select=项目经理&$filter=ID eq \"&IF(ISBLANK(项目ID),\"null\",项目ID)),\"\")"
},
"CustomNames": [
{
@@ -14,15 +14,19 @@
},
{
"Name": "版本ID",
- "Formula": "版本发布详情!$Q$3"
+ "Formula": "版本发布详情!$R$3"
},
{
"Name": "ID",
- "Formula": "版本发布详情!$B$16"
+ "Formula": "版本发布详情!$B$18"
},
{
"Name": "最近版本号",
- "Formula": "版本发布详情!$E$16"
+ "Formula": "版本发布详情!$E$18"
+ },
+ {
+ "Name": "反馈ID列表",
+ "Formula": "版本发布详情!$N$18"
}
]
}
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目版本/项目版本管理.json b/Pages/项目/项目首页/项目首页-容器页面/项目版本/项目版本管理.json
index 9cc7baa3..fd4dfaff 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/项目版本/项目版本管理.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目版本/项目版本管理.json
@@ -911,7 +911,7 @@
}
}
],
- "ID": "74d587e1-95f6-428f-8365-3fe79d0af97c"
+ "ID": "0e1ce2fc-de1a-4503-90b2-cbf6437a3976"
}
]
}
@@ -1187,4 +1187,4 @@
"Formula": "项目版本管理!$G$9"
}
]
-}//qUHtLK20xgiaX8nDUybHV8FgaW/C1lbtEplH3aPJT2MX41FLXGzrB3KB5TD/NATFfb/0aZ7CNSn9IClqKx0CJM8Zl/Gnj0sPSpcbTUqnqndKlucpOZbp6DbtyqdZqN6xmYIDm6Gg3op4PYdGVsN6qKDQimhpZAfIxM2/+wVFL82TKzhp3z49WZxyrZWNs3RQqWDwqSSE6OjzJEuD5zcyWKx230RjDhYIORugRk5glHebxWXCIOsz26Ija8xVbX/CpaW93N450i6LllTJqzWxor/o0qMlVzbOmLklLxsZ48kJedyYqLiuQyIK7HWZLj+UuQO5N25MoIkDrZVW92umqqnPd/6qoZcX9x3tcQisPUPD9L8XZFqQWBxI24jeFwBGKjOyJMua/HQiauFCyJEPG90HkjqfE00737frUkZEsDK+ugNkJsmhzjWHG266a4Q8ZAxG0xXsIRxiWME2oQFVcaDIDQQmZncS0FUGk4kOJ4k6gFzzgJ7qjURS4muk4gl5GT/ZvStBHduIWhhLZkYVnUtLuziD+NOSjkz33JGnL4+SppkQYGad2JRpvWwCJlcjgTUsNhtMHyPYrvpEVoFoBw41TyeES9Tlf4OT9gYxE8IrFZEHw0WcHfRVF0L0PYRJJwizNRJrUdjOW67Qncmzur27XOIA/pc7WGjx3z1uHlbm5fV6EJaduF6t/ylkFKmmIxUfTOjno/ek5J/Z9bETcFIKUV0tjTrfslK0F+PcjO1qRSzXKxaXi0BW8zjw9iOkdRDkwB9OsF6KJ2N5mtAnhL7GGE65cc+9Vhi3nYeT6x/BY6gnfO4y1PL8oABYCKthQ1cjLLmgxvKGCxX7ubyo98wiu6wfuzm06NvDitL8KYWdHquyzqMPHnAYlEGoti+S0EoNENVSu1ml3t5B8c82kg==|920
\ No newline at end of file
+}//VnyR3LTxd+6kxvX6wQtQv+KI1B7HGS4vugdiyBtUbXkb6aqpd/mqZIdUl8ZghLIlzIykXI1mn7wQxxS0lB2cswxnyICpqah2kvVCerQe+X5XPZ9NhvWejYUfnecJFGr+TfhlWTcjbeStdV4j9Dzp9Ykl9sA7UslsGqND2rolwePhO3JNzMou0a3jLZBBbB+/nA112QGQWoU2gywPhwbRsGW1SZJDMs99AmfLNKbSfYbNP8yijupXWfK+MHnapMDmS8TTpn0zzB9jmPfAFfTO1a0uSX//yZQ1IJlDMt4MkJLVXO1d3bvbS3BKvijyv+c7cLUDWeBDaoJKCByyJdmg72lCyJH64XDN9RdtamMaNjl5PlocGm7D9k0aft9eO4pUPorVkwPAuTlmzqUoQgrm57QDP/kxZynvbXlo79DyKErStu+oP+K1H73vrnE7QtajBLkSh1bBschZd3xWkuQt7jFrdbiElMUzOHbJE7EhtoW806lywZsXXSw0XaYX75I6u3oGmOPTxD/6Fu3BhLBlAHOUov9oUHtn5G8med9qpNS3TGvh92sEMCERN+ro3aP1IEwtdaGYYcw/DlrbkuUXG9v1E3LTaoP5XyDVFPPhGfhbDwU8vlXNrn79RgIYj+p79ooFXy8CQ6NuXRHCCBwalIHW5N73FZIdvJP4OKV13wQd01LhMLqfE8d+dHgjFFA52CUGmhUYkNbzFWJx0HPMnfqjzpc+CYnuoY+HpPZ5cPbnXisDO+1nIcCqIqG5oVTleLtcoCGE8xKi6zhbEzT3M0yvi0FOLOk8e+LHrgmuzJdvH17DYJTt02PLyr6S+sxcZbHhsGcz4kLjM3wlNdUCMvJJcqXqbZu8SNKqeG3F2uc2EEysDvBgyGwOz6EQeUUP8dyWzJjMY2lQVNz/M9x8ow==|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 1a8adb37..4ed71525 100644
Binary files a/Plugin/PC组件包-格友工作室定制版-10_0_2_0.zip and b/Plugin/PC组件包-格友工作室定制版-10_0_2_0.zip differ
diff --git a/Process/反馈处理流程.bpmn b/Process/反馈处理流程.bpmn
index 6a962c88..d730c6f3 100644
--- a/Process/反馈处理流程.bpmn
+++ b/Process/反馈处理流程.bpmn
@@ -4,7 +4,7 @@
处理用户提交的需求反馈
-
+
@@ -14,7 +14,7 @@
-
+
Flow_1919cz7
_8c854f9d-40d8-4aed-acb1-6778e09b2e08
@@ -26,7 +26,7 @@
- Flow_13qnftb
+ Flow_09gp50l
@@ -35,35 +35,35 @@
-
+
_8c854f9d-40d8-4aed-acb1-6778e09b2e08
- Flow_0e920z7
+ Flow_0b772fu
${nrOfCompletedInstances/nrOfInstances == 1}
-
-
-
-
-
-
+
-
+
- Flow_0e920z7
- Flow_13qnftb
+ Flow_0b772fu
+ Flow_09gp50l
- ${nrOfCompletedInstances/nrOfInstances == 1}
+ ${nrOfCompletedInstances > 0}
-
+
+
+
+
+
+
@@ -71,18 +71,18 @@
-
+
-
+
+
+
+
+
-
-
-
-
@@ -98,16 +98,16 @@
-
+
-
+
-
+
diff --git a/ServerCommands/项目/新增项目发布记录.json b/ServerCommands/项目/新增项目发布记录.json
index f7956cff..7f99d490 100644
--- a/ServerCommands/项目/新增项目发布记录.json
+++ b/ServerCommands/项目/新增项目发布记录.json
@@ -56,6 +56,10 @@
"DataValidationInfo": {
"IgnoreBlank": false
}
+ },
+ {
+ "Name": "反馈ID列表",
+ "DataValidationInfo": {}
}
]
}
@@ -69,7 +73,7 @@
"TableValueType": 1,
"BindingInfos": [
{
- "GUID": "d716ec59-a03a-4c4f-8135-dff3ff28bf43",
+ "GUID": "343d9a24-396f-4eb5-9538-776ed4c810e0",
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目状态",
@@ -92,7 +96,7 @@
},
"NullFormulaValueQueryPolicy": 0
},
- "ID": "5dab3fb9a681415b99f64200ab84bfa1"
+ "ID": "a66561b0a1ac4f6d8a16b68b3c686bb1"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -119,7 +123,7 @@
"TableValueType": 1,
"BindingInfos": [
{
- "GUID": "045e05de-9121-49de-8679-b3de9096e54f",
+ "GUID": "7a0e7a39-d01a-408b-9da3-c48801db0561",
"BindingInfo": {
"TableName": "项目版本",
"ColumnName": "版本名称",
@@ -141,7 +145,7 @@
}
}
},
- "ID": "3416908ef31a4e73b1785cee422ef189"
+ "ID": "3f90c5eb3b89426f935cd981c5e5d65f"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -197,7 +201,7 @@
},
"NullFormulaValueQueryPolicy": 0
},
- "ID": "680811f5daaa4a1d8eacd23b503d4fed"
+ "ID": "e9e9861d7b5a4ac8931eb2f81698e287"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -228,7 +232,7 @@
"BindingInfo": {
"TableName": "项目发布记录",
"ColumnName": "项目ID",
- "GUID": "7d966506-9eb7-419c-bf77-085ec11cb7b5"
+ "GUID": "ae6a806c-06a0-4ae6-9dc8-dbf072f05fcd"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -239,7 +243,7 @@
"BindingInfo": {
"TableName": "项目发布记录",
"ColumnName": "版本ID",
- "GUID": "9ff3ac72-1720-4839-873e-7f9b03a7becb"
+ "GUID": "5b8e8557-6600-4a89-85b7-449accab97f3"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -250,7 +254,7 @@
"BindingInfo": {
"TableName": "项目发布记录",
"ColumnName": "发布版本号",
- "GUID": "06581d8c-9962-42b5-af49-fa03b1e9cc64"
+ "GUID": "46745493-fe87-47c1-aba6-f7a78fc680c9"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -261,7 +265,7 @@
"BindingInfo": {
"TableName": "项目发布记录",
"ColumnName": "发布人",
- "GUID": "6a36add2-a256-4231-9315-75bf07f0ae71"
+ "GUID": "aaeb5ea9-e946-4056-a459-d700b3e971d1"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -272,7 +276,7 @@
"BindingInfo": {
"TableName": "项目发布记录",
"ColumnName": "发布时间",
- "GUID": "222add61-f491-444c-9731-c9d0284fc961"
+ "GUID": "bf63cc70-c20a-4bec-9132-a0f44f7cda69"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -283,14 +287,15 @@
"BindingInfo": {
"TableName": "项目发布记录",
"ColumnName": "发布内容",
- "GUID": "ba627a4e-168c-4587-bd7d-9a0723d0d8c2"
+ "GUID": "7136dfb7-4a71-465a-9dc3-95d3965089df"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=发布内容"
}
}
- ]
+ ],
+ "ParamNameToSaveNewRowValue": "新记录"
},
{
"$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
@@ -333,7 +338,7 @@
"BindingInfo": {
"TableName": "项目动态",
"ColumnName": "项目ID",
- "GUID": "5a3eacc4-5cee-408a-b06e-9911e9bcc724"
+ "GUID": "08d37580-c55e-47b3-858d-656ece1f4069"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -344,7 +349,7 @@
"BindingInfo": {
"TableName": "项目动态",
"ColumnName": "项目动态",
- "GUID": "d14bc793-5a01-4605-b01a-76900e9465b8"
+ "GUID": "ec3f9c51-3e1c-4806-8feb-3113ecba0fec"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -355,7 +360,7 @@
"BindingInfo": {
"TableName": "项目动态",
"ColumnName": "执行人",
- "GUID": "9e56f7ea-82eb-4457-bf64-f7145ff7c7d7"
+ "GUID": "19875403-43ae-4535-a93a-1068836f8742"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -366,7 +371,7 @@
"BindingInfo": {
"TableName": "项目动态",
"ColumnName": "类型",
- "GUID": "780475ea-a2ef-4ebe-a46e-bdbac7a6ded6"
+ "GUID": "08593f1f-60fc-49e9-abc3-158dabe59d2e"
},
"Value": "3"
}
@@ -374,13 +379,66 @@
}
]
},
+ {
+ "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
+ "Operation": 17,
+ "OperationParamaterAName": ",",
+ "OperationParamaterBName": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=反馈ID列表"
+ },
+ "OutParamaterName": "反馈ID数组"
+ },
+ {
+ "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon",
+ "LoopInfo": {
+ "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon",
+ "LoopCount": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=反馈ID数组"
+ },
+ "LoopItemParamName": "当前反馈ID"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
+ "ServerCommandName": "项目反馈发布完毕",
+ "Parameters": [
+ {
+ "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+ "ParamName": "反馈ID",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=当前反馈ID"
+ }
+ },
+ {
+ "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+ "ParamName": "发布记录ID",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=新记录.ID"
+ }
+ }
+ ],
+ "ResultErrorCodeTo": {
+ "SerializeProperty": "code"
+ },
+ "ResultMessageTo": {
+ "SerializeProperty": "msg"
+ },
+ "RefreshAfterFinish": true,
+ "CheckDataValidation": true
+ }
+ ]
+ },
{
"$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
"ErrorCode": "0",
"Message": "新增成功"
}
],
- "ID": "b1a6eb96-7fd5-4a7e-932a-2bb690010ff5"
+ "ID": "0d82b1a4-7017-4096-a33d-9b60b723366f"
},
{
"CommandList": [
@@ -390,12 +448,12 @@
"Message": "该版本号已被使用，请更换版本号后重试！"
}
],
- "ID": "d142d95c-5c50-494f-9897-3cccebec18a6"
+ "ID": "42f54ae1-82f5-4fc2-84ca-d18e8d8ce62f"
}
]
}
],
- "ID": "1c1d75be-6567-4902-98cf-6fb6997fcb24"
+ "ID": "330816b9-bbed-476a-a509-e38e97140f2d"
},
{
"CommandList": [
@@ -405,12 +463,12 @@
"Message": "版本不存在，请重新指定要发布的版本"
}
],
- "ID": "5e7db63d-2be3-4fd5-93b9-2d8f1d9af786"
+ "ID": "a8cbc44f-16a1-4c54-aaa5-41990c9a20ba"
}
]
}
],
- "ID": "33c577a2-d8ac-42c5-b023-f64edc8a4d61"
+ "ID": "10395fca-a6e0-4100-a076-92f839468977"
},
{
"CommandList": [
@@ -420,7 +478,7 @@
"Message": "项目不存在"
}
],
- "ID": "9e6a267c-2d3a-4691-ab57-fb1dfa7ca588"
+ "ID": "8e44474f-aa11-4385-9c80-02b29a8d20d7"
}
]
}
diff --git a/ServerCommands/项目反馈/匿名提交项目反馈.json b/ServerCommands/项目反馈/匿名提交项目反馈.json
index e2be72ce..0592840d 100644
--- a/ServerCommands/项目反馈/匿名提交项目反馈.json
+++ b/ServerCommands/项目反馈/匿名提交项目反馈.json
@@ -43,6 +43,12 @@
"IgnoreBlank": false
}
},
+ {
+ "Name": "标题",
+ "DataValidationInfo": {
+ "IgnoreBlank": false
+ }
+ },
{
"Name": "内容",
"DataValidationInfo": {
@@ -91,6 +97,14 @@
"SerializeProperty": "=反馈类型"
}
},
+ {
+ "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+ "ParamName": "标题",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=标题"
+ }
+ },
{
"$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
"ParamName": "功能",
diff --git a/ServerCommands/项目反馈/后端新增项目反馈.json b/ServerCommands/项目反馈/后端新增项目反馈.json
index 0d5a0099..c722eb58 100644
--- a/ServerCommands/项目反馈/后端新增项目反馈.json
+++ b/ServerCommands/项目反馈/后端新增项目反馈.json
@@ -21,6 +21,12 @@
"IgnoreBlank": false
}
},
+ {
+ "Name": "标题",
+ "DataValidationInfo": {
+ "IgnoreBlank": false
+ }
+ },
{
"Name": "功能",
"DataValidationInfo": {
@@ -55,7 +61,7 @@
"TableValueType": 1,
"BindingInfos": [
{
- "GUID": "8df9b983-2ce9-4dc2-922a-f679e38bf456",
+ "GUID": "ce362c20-c1ef-4689-aa2e-83441cd4ef50",
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目名称",
@@ -64,7 +70,7 @@
"ColumnName": "项目名称"
},
{
- "GUID": "3beb936c-5a81-4e85-9165-f3158a094755",
+ "GUID": "8b842fb8-31e3-4017-857e-b9ef48a0436b",
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目状态",
@@ -73,7 +79,7 @@
"ColumnName": "项目状态"
},
{
- "GUID": "c729914e-cb52-44c4-8595-bf88e8d87859",
+ "GUID": "675e27bf-42ed-4ccb-bce7-9888c4e2de73",
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目经理",
@@ -82,7 +88,7 @@
"ColumnName": "项目经理"
},
{
- "GUID": "0f0551a1-7e0d-440e-aa95-31e52c6c696b",
+ "GUID": "cfea2e79-3062-4891-9f47-e9e5ac6ec208",
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "开启反馈收集",
@@ -106,7 +112,7 @@
"NullFormulaValueQueryPolicy": 0,
"TopCount": "1"
},
- "ID": "d4ef55e776e9446c95834eccd85916b4"
+ "ID": "43b38f6aeac7476aa59f776442997b4a"
},
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -206,10 +212,10 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=任务.任务名称"
},
- "ID": "412896d3dfd84eb99ee27643e7072235"
+ "ID": "65851cf1cc2c4aea8f0bffa89bc51c81"
}
],
- "ID": "b9751d0b-79f8-49ba-a0b4-f7a15f0805bd"
+ "ID": "7c9e1197-fa39-4838-97ed-f9f91a3db834"
},
{
"CommandList": [
@@ -220,10 +226,10 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=功能"
},
- "ID": "5d68cbd5ae5d4d22ab061cf3659420f9"
+ "ID": "241b7726859442948ac5735d8e62f67b"
}
],
- "ID": "0a4b2b11-ec7a-4c79-9874-fa12cae499e0"
+ "ID": "74459173-20fa-46b8-ada7-d795ac43a3f5"
}
]
},
@@ -303,7 +309,7 @@
"TableValueType": 1,
"BindingInfos": [
{
- "GUID": "8d9b41cf-2e2f-405b-aa8d-2f0ff4767ce9",
+ "GUID": "e3ecae0f-5c8b-4ebb-9ce4-fd868347a3a5",
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "任务负责人",
@@ -326,7 +332,7 @@
},
"NullFormulaValueQueryPolicy": 0
},
- "ID": "6b1db8e1bcf94f3bb92538b031528faa"
+ "ID": "fd2822da1de64295b72c009c01587d94"
},
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -335,10 +341,10 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=任务.执行者"
},
- "ID": "1b3ebac6a8cb4ec095b12bf8e5c4115e"
+ "ID": "109c2c792f3140fcb18391d665ba6466"
}
],
- "ID": "4357a526-702d-4aa2-84b7-04099614bc36"
+ "ID": "c612e453-c66e-49ae-b555-981c6b67c2e8"
},
{
"CommandList": [
@@ -349,10 +355,10 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=项目.项目经理"
},
- "ID": "06423efe302442ee9dbab0c23a871517"
+ "ID": "c294a5b08553459f94f2a11f8d1ed02c"
}
],
- "ID": "ce25444f-dd67-4dcb-be41-5c064f262db1"
+ "ID": "35c28655-5fbd-4ec6-83fe-9757eb3af4eb"
}
]
},
@@ -376,10 +382,10 @@
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "处理人",
"ParameterValue": "Administrator",
- "ID": "4f2a2cbe59474a5889ba4e89ea6fe69f"
+ "ID": "299f253110674735a00ec8d2450d5a25"
}
],
- "ID": "a15a4301-3b02-4786-b3b5-db6ff3a86562"
+ "ID": "fb43b7b4-a70b-4a61-8d77-70c5e2bac747"
}
]
},
@@ -393,7 +399,7 @@
"BindingInfo": {
"TableName": "需求反馈登记表",
"ColumnName": "项目ID",
- "GUID": "4b0e5810-794e-47d7-af1f-d46167b725df"
+ "GUID": "c4a7621f-f4b2-4ed4-9a7b-2f2f6985dfa3"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -404,18 +410,18 @@
"BindingInfo": {
"TableName": "需求反馈登记表",
"ColumnName": "标题",
- "GUID": "65dc7a0b-e9a7-4614-badf-6c6b6845dfbf"
+ "GUID": "2700e224-5778-4d2f-b4e2-c8afea2c3cee"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=提交人&\"提交的关于\"&关联任务&\"的\"&反馈类型表.反馈类型&\"类反馈\""
+ "SerializeProperty": "=标题"
}
},
{
"BindingInfo": {
"TableName": "需求反馈登记表",
"ColumnName": "关联任务",
- "GUID": "204dd7ef-7640-40a1-85a3-15a9c072b94d"
+ "GUID": "accbc5de-6f9e-465a-842f-11770f884c71"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -426,7 +432,7 @@
"BindingInfo": {
"TableName": "需求反馈登记表",
"ColumnName": "反馈类型",
- "GUID": "48e90a59-4660-4c24-a05a-699ddec465bb"
+ "GUID": "6fd4371b-1d2e-4eb4-af62-e642f1903071"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -437,7 +443,7 @@
"BindingInfo": {
"TableName": "需求反馈登记表",
"ColumnName": "功能",
- "GUID": "8ce66810-d524-4a14-aed0-137b5c725a77"
+ "GUID": "4399135f-68de-4356-8e9e-8c3fb579c7ff"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -448,7 +454,7 @@
"BindingInfo": {
"TableName": "需求反馈登记表",
"ColumnName": "内容",
- "GUID": "921d5203-cf29-4ef0-87a8-7e93b36b0ecd"
+ "GUID": "28d26108-9623-40ca-9616-2a3607a0a009"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -459,7 +465,7 @@
"BindingInfo": {
"TableName": "需求反馈登记表",
"ColumnName": "提交人",
- "GUID": "7e70ea7b-e675-46f1-bf27-6a825309e8d1"
+ "GUID": "044775b2-b29e-422b-baa0-7f922c495423"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -470,7 +476,7 @@
"BindingInfo": {
"TableName": "需求反馈登记表",
"ColumnName": "联系方式",
- "GUID": "b0588348-5809-4dfd-833d-691a51a1882b"
+ "GUID": "fb21cb0b-4000-40f9-9824-245ac8384174"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -481,7 +487,7 @@
"BindingInfo": {
"TableName": "需求反馈登记表",
"ColumnName": "处理人",
- "GUID": "2c08cf16-8f5d-48a4-b6d2-bcd8d1be8333"
+ "GUID": "016aef9d-118b-4781-867a-0acfe696fd08"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -492,7 +498,7 @@
"BindingInfo": {
"TableName": "需求反馈登记表",
"ColumnName": "状态",
- "GUID": "b4f0a058-9c6d-4b69-8b1b-8d3d141feb7b"
+ "GUID": "cb4b3bcb-c93d-4543-803c-a74b7593b764"
},
"Value": "0"
}
@@ -504,7 +510,7 @@
"ProcessDefinitionResourceName": "反馈处理流程",
"ProcessInstanceName": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=提交人&\"提交的关于\"&获取任务描述&\"的\"&反馈类型表.反馈类型&\"工单\""
+ "SerializeProperty": "=标题"
},
"SelectedTable": "需求反馈登记表",
"RowsToUpdate": 1,
@@ -541,7 +547,7 @@
]
}
],
- "ID": "6c1147ab-171c-44a6-895f-bee729119bce"
+ "ID": "bd8aa459-3dc2-4aa4-abf4-249a50c5ab9c"
},
{
"CommandList": [
@@ -556,7 +562,7 @@
]
}
],
- "ID": "7285bf04-39e4-4643-89a2-a04ecd10d571"
+ "ID": "0bb8d9bf-8a26-412d-9103-1d73562ee7bf"
}
]
}
diff --git a/ServerCommands/项目反馈/更新项目处理结果.json b/ServerCommands/项目反馈/更新项目处理结果.json
deleted file mode 100644
index a22d401d..00000000
--- a/ServerCommands/项目反馈/更新项目处理结果.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
- "Name": "更新项目处理结果",
- "Enabled": true,
- "Triggers": [
- {
- "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon",
- "Permission": {
- "PermissionData": {
- "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core",
- "permissionResource": {
- "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core"
- },
- "permissionBindings": [
- {
- "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core",
- "roleNames": [
- "FGC_LoginUser"
- ]
- }
- ]
- }
- },
- "Parameters": [
- {
- "Name": "反馈ID",
- "DataValidationInfo": {
- "IgnoreBlank": false
- }
- },
- {
- "Name": "内容",
- "DataValidationInfo": {}
- }
- ]
- }
- ],
- "Commands": [
- {
- "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
- "TableName": "需求反馈登记表",
- "ShowConfirm": false,
- "RowsToUpdate": 1,
- "RowsToUpdateCondition": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "需求反馈登记表",
- "ColumnName": "ID",
- "GUID": "f8a30342-a9a4-4c45-8b0f-ddadbcc20b03"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=反馈ID"
- }
- },
- "UpdateBindingValues": [
- {
- "BindingInfo": {
- "TableName": "需求反馈登记表",
- "ColumnName": "处理结果",
- "GUID": "78e1ee6e-8504-4bdc-a37d-1e2af52caf38"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=内容"
- }
- }
- ]
- },
- {
- "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
- "ErrorCode": "0",
- "Message": "更新成功"
- }
- ]
-}
\ No newline at end of file
diff --git a/ServerCommands/项目反馈/项目反馈发布完毕.json b/ServerCommands/项目反馈/项目反馈发布完毕.json
new file mode 100644
index 00000000..4cfd0af1
--- /dev/null
+++ b/ServerCommands/项目反馈/项目反馈发布完毕.json
@@ -0,0 +1,315 @@
+{
+ "Name": "项目反馈发布完毕",
+ "Enabled": true,
+ "Triggers": [
+ {
+ "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon",
+ "Permission": {
+ "PermissionData": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core",
+ "permissionResource": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core"
+ },
+ "permissionBindings": [
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core",
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ }
+ ]
+ }
+ },
+ "Parameters": [
+ {
+ "Name": "反馈ID",
+ "DataValidationInfo": {
+ "IgnoreBlank": false
+ }
+ },
+ {
+ "Name": "发布记录ID",
+ "DataValidationInfo": {}
+ }
+ ]
+ }
+ ],
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "发布记录",
+ "TableValue": {
+ "TableName": "项目发布记录",
+ "TableValueType": 1,
+ "BindingInfos": [
+ {
+ "GUID": "2ec2937f-48bb-4820-be19-040b325359af",
+ "BindingInfo": {
+ "TableName": "项目发布记录",
+ "ColumnName": "发布人",
+ "GUID": "0262ad21-b9e2-49dd-969b-0a4c6c571d3b"
+ },
+ "ColumnName": "发布人"
+ },
+ {
+ "GUID": "bf3903bf-7623-46ac-bdda-ce932a406af8",
+ "BindingInfo": {
+ "TableName": "项目发布记录",
+ "ColumnName": "发布版本号",
+ "GUID": "f9928713-f411-480c-a3a1-9ffe5c2dae2d"
+ },
+ "ColumnName": "发布版本号"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "项目发布记录",
+ "ColumnName": "ID",
+ "GUID": "2f1f1ab3-500b-48f1-8e31-e135fd89b2db"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=发布记录ID"
+ }
+ },
+ "NullFormulaValueQueryPolicy": 0,
+ "TopCount": "1"
+ },
+ "ID": "6fd2f71394ad48dbbdee95fceef674ae"
+ },
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+ "ParamObject": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=发布记录"
+ }
+ },
+ "value": "%Null%",
+ "compareType": 1
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "发布人",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=发布记录.发布人"
+ },
+ "ID": "a8212128e87840c6b9f71d7db340bc70"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "版本号",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=发布记录.发布版本号"
+ },
+ "ID": "3d39fdb6823c4b2c88327d421be8fb59"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "生成备注",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=\"已在\"&发布记录.发布版本号&\"版本中更新\""
+ },
+ "ID": "c5d1b35cbecd48c4830c87ca41d97fe7"
+ }
+ ],
+ "ID": "80820ebb-5964-401e-ac0b-2ea81e7614e8"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "发布人",
+ "ParameterValue": "%CurrentUser%",
+ "ID": "baf7115159d74f30ae11ffee5d9ab09a"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "版本号",
+ "ID": "0c427e757e5b4ff7ab031709afee8733"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "生成备注",
+ "ParameterValue": "已更新到最新版本",
+ "ID": "97e61e61a28148f2b4a6e008cf628e9f"
+ }
+ ],
+ "ID": "8536b815-04c7-4a9e-b386-70827bf01a2a"
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "反馈记录",
+ "TableValue": {
+ "TableName": "需求反馈登记表",
+ "TableValueType": 1,
+ "BindingInfos": [
+ {
+ "GUID": "2c7e1160-0c40-488f-b9f7-01a35256c58a",
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "流程实例ID",
+ "GUID": "d2f60bed-e24c-48ef-8d1f-860c88d42ff3"
+ },
+ "ColumnName": "流程实例ID"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "ID",
+ "GUID": "09c19253-53b1-41af-8e05-9381f55ee3d9"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=反馈ID"
+ }
+ },
+ "NullFormulaValueQueryPolicy": 0,
+ "TopCount": "1"
+ },
+ "ID": "1a898e13b5974c0ca783a9fc84b8e67b"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "运行任务列表",
+ "TableValue": {
+ "TableName": "ACT_RU_TASK_View",
+ "BindingInfos": [
+ {
+ "GUID": "20f0eb88-7b3d-4eb2-af95-7fabfa53ac51",
+ "BindingInfo": {
+ "TableName": "ACT_RU_TASK_View",
+ "ColumnName": "ID_",
+ "GUID": "ad0eb1ec-daaf-4c4a-91a0-07e63b4814aa"
+ },
+ "ColumnName": "ID"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "ACT_RU_TASK_View",
+ "ColumnName": "PROC_INST_ID_",
+ "GUID": "da37052c-aa22-4f81-b9e1-8f15f75352b8"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=反馈记录.流程实例ID"
+ }
+ },
+ "NullFormulaValueQueryPolicy": 0,
+ "OrderBySqlCondition": {
+ "OrderByColumns": [
+ {
+ "ColumnBindingInfo": {
+ "TableName": "ACT_RU_TASK_View",
+ "ColumnName": "CREATE_TIME_",
+ "GUID": "165a0af0-c9f9-4425-94b1-780bfbf3fa9e"
+ },
+ "Order": 1
+ }
+ ]
+ }
+ },
+ "ID": "6ffe89ac260943f394e2efef7dcfa88d"
+ },
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "需求反馈登记表",
+ "ShowConfirm": false,
+ "RowsToUpdate": 1,
+ "RowsToUpdateCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "ID",
+ "GUID": "f8a30342-a9a4-4c45-8b0f-ddadbcc20b03"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=反馈ID"
+ }
+ },
+ "UpdateBindingValues": [
+ {
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "发布记录ID",
+ "GUID": "3678bcf7-3656-4490-b402-ed593584521a"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=发布记录ID"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "处理结果",
+ "GUID": "0eadf6f0-9ea6-4727-9146-7a402013c86c"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=生成备注"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "需求反馈登记表",
+ "ColumnName": "状态",
+ "GUID": "3ede0188-f163-4cd5-bce5-733e9a6762d1"
+ },
+ "Value": "4"
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon",
+ "LoopInfo": {
+ "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon",
+ "LoopCount": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=运行任务列表"
+ },
+ "LoopItemParamName": "Item"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ProcessTaskCommand, ServerDesignerCommon",
+ "TaskId": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=Item.ID"
+ },
+ "CustomOperationName": "完成更新",
+ "Operator": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=发布人"
+ },
+ "Comment": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=生成备注"
+ }
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "0",
+ "Message": "更新成功"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Tables/任务/任务平行视图.json b/Tables/任务/任务平行视图.json
index 0dc50d32..c0430e02 100644
--- a/Tables/任务/任务平行视图.json
+++ b/Tables/任务/任务平行视图.json
@@ -663,6 +663,7 @@
},
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "Required": true,
"DatabaseColumnType": "int",
"MaxLength": -1,
"Name": "成员数量",
@@ -670,6 +671,7 @@
},
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "Required": true,
"DatabaseColumnType": "nvarchar",
"MaxLength": -1,
"Name": "任务成员",
@@ -724,7 +726,7 @@
"ConnectionId": "业务表",
"SourceTableName": "任务平行视图",
"SourceTableSchema": "dbo",
- "CreateViewSql": "WITH [任务递归CTE] AS (-- CTE to gather all tasks and their child tasks\r\n\tSELECT\r\n\t\tt.ID,\r\n\t\tt.[父任务ID],\r\n\t\tt.[任务预算工时],\r\n\t\tCAST ( t.ID AS VARCHAR ( MAX ) ) AS TaskPath,\r\n\t\t0 AS Depth \r\n\tFROM\r\n\t\t任务表 t \r\n\tWHERE\r\n\t\tt.[父任务ID] IS NULL\r\n\t\t\r\n\t\tUNION ALL\r\n\tSELECT\r\n\t\tt.ID,\r\n\t\tt.[父任务ID],\r\n\t\tt.任务预算工时,\r\n\t\tCAST ( cte.TaskPath + '->' + CAST ( t.ID AS VARCHAR ( 50 ) ) AS VARCHAR ( MAX ) ) AS TaskPath,\r\n\t\tcte.Depth + 1 AS Depth \r\n\tFROM\r\n\t\t任务表 t\r\n\t\tINNER JOIN [任务递归CTE] cte ON t.[父任务ID] = cte.ID\r\n\t),\r\n\t汇总工时 AS (-- Gather plan hours and actual hours from 任务工时表\r\n\tSELECT\r\n\t\t[任务ID],\r\n\t\tSUM ( CASE WHEN 工时类型 = '计划' THEN 工时 ELSE 0 END ) AS 计划工时汇总,\r\n\t\tSUM ( CASE WHEN 工时类型 = '实际' THEN 工时 ELSE 0 END ) AS 核定工时汇总,\r\n\t\tSUM ( CASE WHEN 工时类型 = '实际' THEN 上报工时 ELSE 0 END ) AS 实际工时汇总,\r\n\t\tSUM (CASE WHEN 工时类型 = '实际' THEN [时薪单价]*[提成系数]*[工时] ELSE 0 END) AS 收益汇总\r\n\t \r\n\tFROM\r\n\t\t任务工时表 \r\n\tGROUP BY\r\n\t\t[任务ID] \r\n\t),\r\n\t任务汇总 AS (-- Sum up task hours with recursive sum of child tasks\r\n\tSELECT\r\n\t\tcte.ID,\r\n\t\tISNULL( SUM ( c.任务预算工时 ), 0 ) AS 子任务分配工时 \r\n\tFROM\r\n\t\t[任务递归CTE] cte\r\n\t\tLEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID AND c.[任务状态]>=1\r\n\tGROUP BY\r\n\t\tcte.ID \r\n\t),\r\n-- \t子任务核定工时汇总 AS (\r\n-- SELECT\r\n-- cte.ID,\r\n-- ISNULL(SUM(汇总.核定工时汇总), 0) AS 子任务核定工时汇总\r\n-- FROM\r\n-- [任务递归CTE] cte\r\n-- LEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID\r\n-- LEFT JOIN 汇总工时 汇总 ON c.ID = 汇总.[任务ID]\r\n-- GROUP BY\r\n-- cte.ID\r\n-- ),\r\n-- 子任务实际工时汇总 AS (\r\n-- SELECT\r\n-- cte.ID,\r\n-- ISNULL(SUM(汇总.实际工时汇总), 0) AS 子任务实际工时汇总\r\n-- FROM\r\n-- [任务递归CTE] cte\r\n-- LEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID\r\n-- LEFT JOIN 汇总工时 汇总 ON c.ID = 汇总.[任务ID]\r\n-- GROUP BY\r\n-- cte.ID\r\n-- ),\r\n\t任务成员 AS ( \r\n\tSELECT \r\n\t[任务ID],\r\n\tSTRING_AGG ([任务成员],',') AS 任务成员,\r\n\tcount(*) AS [成员数量] \r\n\tFROM [任务成员表] \r\n\tGROUP BY [任务ID] \r\n\t)\r\n-- Final view definition\r\nSELECT\r\n t.*,\r\n (CASE WHEN t.[任务状态]>=1 THEN t.任务预算工时 ELSE 0 END )AS 总分配工时,\r\n --ISNULL(汇总.计划工时汇总, 0) + ISNULL(任务汇总.子任务分配工时, 0) AS 已分配工时,\r\n\t\t(CASE WHEN 项目.[工时分配方式]=3 THEN ISNULL(汇总.核定工时汇总, 0) ELSE ISNULL(汇总.计划工时汇总, 0) END) + ISNULL(任务汇总.子任务分配工时, 0) AS 本任务已分配工时,\r\n\t\t--ISNULL(任务汇总.子任务分配工时, 0) AS 子任务已分配工时,\r\n t.任务预算工时 - (CASE WHEN 项目.[工时分配方式]=3 THEN ISNULL(汇总.核定工时汇总, 0) ELSE ISNULL(汇总.计划工时汇总, 0) END) + ISNULL(任务汇总.子任务分配工时, 0) AS 可分配工时,\r\n --ISNULL(汇总.核定工时汇总, 0) + ISNULL(子任务核定工时汇总.子任务核定工时汇总, 0) AS 总核定工时,\r\n\t\tISNULL(汇总.核定工时汇总, 0) AS 本任务核定工时,\r\n\t\t--ISNULL(子任务核定工时汇总.子任务核定工时汇总, 0) AS 子任务核定工时,\r\n --(t.任务预算工时 - ISNULL(汇总.核定工时汇总, 0) - ISNULL(任务汇总.子任务分配工时,0)) AS 可核定工时,\r\n\t\t(t.任务预算工时 - (CASE WHEN 项目.[工时分配方式]=3 THEN ISNULL(汇总.核定工时汇总, 0) ELSE ISNULL(汇总.计划工时汇总, 0) END) + ISNULL(任务汇总.子任务分配工时, 0)) AS 本任务可核定工时,\r\n\t\t--ISNULL(任务汇总.子任务分配工时, 0) - ISNULL(子任务核定工时汇总.子任务核定工时汇总, 0) AS 子任务可核定工时,\r\n --ISNULL(汇总.实际工时汇总, 0) + ISNULL(子任务实际工时汇总.子任务实际工时汇总, 0) AS 实际工时,\r\n\t\tISNULL(汇总.实际工时汇总, 0) AS 本任务实际工时,\r\n\t\t--ISNULL(子任务实际工时汇总.子任务实际工时汇总, 0) AS 子任务实际工时,\r\n\t\tISNULL(汇总.收益汇总, 0) AS 已消耗成本,\r\n 成员.[成员数量],\r\n 成员.[任务成员]\r\nFROM\r\n 任务表 t\r\n LEFT JOIN 汇总工时 汇总 ON t.ID = 汇总.[任务ID]\r\n LEFT JOIN 任务汇总 任务汇总 ON t.ID = 任务汇总.ID\r\n --LEFT JOIN 子任务核定工时汇总 子任务核定工时汇总 ON t.ID = 子任务核定工时汇总.ID\r\n --LEFT JOIN 子任务实际工时汇总 子任务实际工时汇总 ON t.ID = 子任务实际工时汇总.ID\r\n LEFT JOIN 任务成员 成员 ON t.ID = 成员.[任务ID]\r\n\t\tLEFT JOIN [项目表] 项目 ON t.[项目ID] = 项目.ID;",
+ "CreateViewSql": "WITH 任务汇总 AS ( \r\n SELECT \r\n t.[ID] AS 任务ID, \r\n t.[父任务ID], \r\n SUM(CASE WHEN w.[工时类型] = '计划' THEN w.[工时] ELSE 0 END) AS 计划工时汇总, \r\n SUM(CASE WHEN w.[工时类型] = '实际' THEN w.[工时] ELSE 0 END) AS 核定工时汇总, \r\n SUM(CASE WHEN w.[工时类型] = '实际' THEN w.[上报工时] ELSE 0 END) AS 实际工时汇总, \r\n SUM(CASE WHEN w.[工时类型] = '实际' THEN w.[时薪单价] * w.[提成系数] * w.[工时] ELSE 0 END) AS 收益汇总 \r\n FROM \r\n [dbo].[任务表] t \r\n LEFT JOIN \r\n [dbo].[任务工时表] w ON t.[ID] = w.[任务ID] \r\n GROUP BY \r\n t.[ID], t.[父任务ID] \r\n), 子任务预算 AS ( \r\n SELECT \r\n t.[父任务ID] AS 任务ID, \r\n SUM(t.[任务预算工时]) AS 子任务预算工时 \r\n FROM \r\n [dbo].[任务表] t \r\n WHERE \r\n t.[父任务ID] IS NOT NULL \r\n GROUP BY \r\n t.[父任务ID] \r\n), 成员统计 AS ( \r\n SELECT \r\n t.[任务ID], \r\n COUNT(DISTINCT t.[任务成员]) AS 成员数量, \r\n STUFF(( \r\n SELECT DISTINCT ',' + tm.[任务成员] \r\n FROM [dbo].[任务成员表] tm \r\n WHERE tm.[任务ID] = t.[任务ID] \r\n FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 1, '') AS 任务成员 \r\nFROM \r\n [dbo].[任务成员表] t \r\nGROUP BY \r\n t.[任务ID]\r\n) \r\nSELECT \r\n t.*, \r\n CASE WHEN t.[任务状态] >= 1 THEN t.[任务预算工时] ELSE 0 END AS 总分配工时, \r\n CASE WHEN p.[工时分配方式] = 3 THEN ISNULL(w.[核定工时汇总], 0) ELSE ISNULL(w.[计划工时汇总], 0) END + ISNULL(c.[子任务预算工时], 0) AS 本任务已分配工时, \r\n CASE \r\n WHEN p.[工时分配方式] = 3 \r\n THEN CASE \r\n WHEN t.[任务预算工时] - ISNULL(w.[核定工时汇总], 0) - ISNULL(c.[子任务预算工时], 0) < 0 THEN 0 \r\n ELSE t.[任务预算工时] - ISNULL(w.[核定工时汇总], 0) - ISNULL(c.[子任务预算工时], 0) \r\n END \r\n ELSE CASE \r\n WHEN t.[任务预算工时] - ISNULL(w.[计划工时汇总], 0) - ISNULL(c.[子任务预算工时], 0) < 0 THEN 0 \r\n ELSE t.[任务预算工时] - ISNULL(w.[计划工时汇总], 0) - ISNULL(c.[子任务预算工时], 0) \r\n END \r\n END AS 可分配工时, \r\n ISNULL(w.[核定工时汇总], 0) AS 本任务核定工时, \r\n CASE \r\n WHEN p.[工时分配方式] = 3 \r\n THEN CASE \r\n WHEN t.[任务预算工时] - ISNULL(c.[子任务预算工时], 0) - ISNULL(w.[核定工时汇总], 0) < 0 THEN 0 \r\n ELSE t.[任务预算工时] - ISNULL(c.[子任务预算工时], 0) - ISNULL(w.[核定工时汇总], 0) \r\n END \r\n ELSE CASE \r\n WHEN t.[任务预算工时] - ISNULL(c.[子任务预算工时], 0) - ISNULL(w.[计划工时汇总], 0) < 0 THEN 0 \r\n ELSE t.[任务预算工时] - ISNULL(c.[子任务预算工时], 0) - ISNULL(w.[计划工时汇总], 0) \r\n END \r\n END AS 本任务可核定工时, \r\n ISNULL(w.[实际工时汇总], 0) AS 本任务实际工时, \r\n ISNULL(w.[收益汇总], 0) AS 已消耗成本, \r\n ISNULL(m.[成员数量], 0) AS 成员数量, \r\n ISNULL(m.[任务成员], '') AS 任务成员 \r\nFROM \r\n [dbo].[任务表] t \r\nLEFT JOIN \r\n 任务汇总 w ON t.[ID] = w.[任务ID] \r\nLEFT JOIN \r\n 子任务预算 c ON t.[ID] = c.[任务ID] \r\nLEFT JOIN \r\n [dbo].[项目表] p ON t.[项目ID] = p.[ID] \r\nLEFT JOIN \r\n 成员统计 m ON t.[ID] = m.[任务ID];",
"ViewInfo": {
"ViewName": "任务平行视图",
"QueryColumns": [
diff --git a/Tables/需求反馈/反馈类型表.json b/Tables/需求反馈/反馈类型表.json
index 3fb9bda7..7d252814 100644
--- a/Tables/需求反馈/反馈类型表.json
+++ b/Tables/需求反馈/反馈类型表.json
@@ -18,6 +18,13 @@
"Name": "反馈类型",
"ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "nvarchar",
+ "MaxLength": -1,
+ "Name": "格式模板",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
{
"$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon",
"ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
diff --git a/Tables/项目/发布包含反馈列表.json b/Tables/项目/发布包含反馈列表.json
new file mode 100644
index 00000000..33fed656
--- /dev/null
+++ b/Tables/项目/发布包含反馈列表.json
@@ -0,0 +1,90 @@
+{
+ "Name": "发布包含反馈列表",
+ "Columns": [
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "Required": true,
+ "Unique": true,
+ "AutoIncrement": true,
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "Name": "ID",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "Name": "项目ID",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "Name": "发布记录ID",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "Name": "反馈ID",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_Creator"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon",
+ "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_CreateDate"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_LastModifier"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon",
+ "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_LastModifyDate"
+ }
+ ],
+ "ExternalDatabaseInfo": {
+ "DataBaseType": "6db454c0-531c-4395-9122-921a18942902",
+ "AllowModifySchema": true,
+ "ConnectionId": "业务表",
+ "SourceTableName": "发布包含反馈列表",
+ "SourceTableSchema": "dbo"
+ },
+ "PrimaryKey": [
+ "ID"
+ ],
+ "Relations": [
+ {
+ "PrimaryTable": "项目平行视图",
+ "PrimaryColumn": "ID",
+ "ForeignTable": "发布包含反馈列表",
+ "ForeignColumn": "项目ID",
+ "IsDetailTableRelation": true
+ },
+ {
+ "PrimaryTable": "项目发布记录",
+ "PrimaryColumn": "ID",
+ "ForeignTable": "发布包含反馈列表",
+ "ForeignColumn": "发布记录ID",
+ "IsDetailTableRelation": true
+ },
+ {
+ "PrimaryTable": "需求反馈登记表",
+ "PrimaryColumn": "ID",
+ "ForeignTable": "发布包含反馈列表",
+ "ForeignColumn": "反馈ID",
+ "IsDetailTableRelation": false
+ }
+ ],
+ "Indexes": []
+}
\ No newline at end of file