diff --git a/.collaboration b/.collaboration
index 2e36241a..7f7c81fc 100644
--- a/.collaboration
+++ b/.collaboration
@@ -466,19 +466,7 @@
},
{
"ModuleName": "PCPage/FGC_审批记录",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T10:23:09.183409+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\流程页面文件夹\\FGC_审批记录.json",
- "Pages\\流程页面文件夹\\FGC_审批记录.rd",
- "Pages\\a9dda523558c44c189c02319d3d55b4.json",
- "Pages\\a9dda523558c44c189c02319d3d55b4.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "Pages/流程页面文件夹_手机版",
@@ -530,21 +518,7 @@
},
{
"ModuleName": "PCPage/项目列表",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T09:35:35.2012376+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目列表.json",
- "Pages\\项目\\项目列表.rd",
- "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.json",
- "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.rd",
- "Pages\\b90932e038f94707b54e571ff7cd84d.json",
- "Pages\\b90932e038f94707b54e571ff7cd84d.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目成员详情",
@@ -584,19 +558,7 @@
},
{
"ModuleName": "PCPage/任务列表",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T08:11:01.5856671+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json",
- "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd",
- "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json",
- "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目工时",
@@ -718,17 +680,7 @@
},
{
"ModuleName": "PCPage/任务首页",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T08:43:03.4240162+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\任务首页.json",
- "Pages\\任务\\任务首页.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/任务部分",
@@ -736,35 +688,11 @@
},
{
"ModuleName": "PCPage/任务-侧栏",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T10:24:31.8704706+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\任务-侧栏.json",
- "Pages\\任务\\任务-侧栏.rd",
- "Pages\\9d9faa04d5a74f1dbf8dd3b2040b6f6.json",
- "Pages\\9d9faa04d5a74f1dbf8dd3b2040b6f6.rd",
- "Pages\\b522ad93131845cf87553eda79dfd25.json",
- "Pages\\b522ad93131845cf87553eda79dfd25.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/任务-基本信息",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T08:43:03.4244875+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\任务-基本信息.json",
- "Pages\\任务\\任务-基本信息.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/任务-任务信息",
@@ -776,35 +704,11 @@
},
{
"ModuleName": "PCPage/任务-子任务列表",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T08:11:01.5853395+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\任务-子任务列表.json",
- "Pages\\任务\\任务-子任务列表.rd",
- "Pages\\558ca610fafc4ffd8884b819161bfd6.json",
- "Pages\\558ca610fafc4ffd8884b819161bfd6.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/任务-工时",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T08:43:03.4242733+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\任务-工时.json",
- "Pages\\任务\\任务-工时.rd",
- "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json",
- "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/任务-进展",
@@ -820,17 +724,7 @@
},
{
"ModuleName": "PCPage/新增任务",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T08:32:46.4139774+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\新增任务.json",
- "Pages\\任务\\新增任务.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/新增进展",
@@ -1062,17 +956,7 @@
},
{
"ModuleName": "MasterPCPage/FGC_母版页",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T08:19:32.5645636+08:00",
- "ModuleType": 3,
- "ToRemoveFiles": [
- "MasterPages\\FGC_母版页.json",
- "MasterPages\\FGC_母版页.rd"
- ]
+ "ModuleType": 3
},
{
"ModuleName": "MasterPages/流程母版页面文件夹",
@@ -1088,31 +972,11 @@
},
{
"ModuleName": "UserControlPage/评论组件",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T10:31:36.9210311+08:00",
- "ModuleType": 31,
- "ToRemoveFiles": [
- "UserControlPages\\评论组件.json",
- "UserControlPages\\评论组件.rd"
- ]
+ "ModuleType": 31
},
{
"ModuleName": "UserControlPage/发表评论组件",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T08:46:33.0773696+08:00",
- "ModuleType": 31,
- "ToRemoveFiles": [
- "UserControlPages\\发表评论组件.json",
- "UserControlPages\\发表评论组件.rd"
- ]
+ "ModuleType": 31
},
{
"ModuleName": "UserControlPage/收益数据横幅",
@@ -1142,19 +1006,6 @@
"ModuleName": "ServerCommand/修改任务预算工时",
"ModuleType": 15
},
- {
- "ModuleName": "ServerCommand/新增任务",
- "State": 2,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T08:25:05.7710098+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\任务\\新增任务.json"
- ]
- },
{
"ModuleName": "ServerCommand/移除任务成员",
"ModuleType": 15
@@ -1713,46 +1564,7 @@
},
{
"ModuleName": "Plugin",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T11:02:44.5025701+08:00",
- "ModuleType": 40,
- "ToRemoveFiles": [
- "Plugin\\Echarts图表-10_0_3_0.zip",
- "Plugin\\Editormd-6_0_102_0.zip",
- "Plugin\\Forguncy.CustomMenu.zip",
- "Plugin\\Forguncy.PassListviewDataCommand.zip",
- "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip",
- "Plugin\\JSON数据源-10_0_2_0.zip",
- "Plugin\\Lottie动画插图-10_0_2_0.zip",
- "Plugin\\Notiflix-9_0_103_0.zip",
- "Plugin\\OPENAI套件-10_0_3_0.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\\xTools快速开发工具包-9_0_4_0(1).zip",
- "Plugin\\加载动画-10_0_2_0.zip",
- "Plugin\\发送HTTP请求命令-10_0_2_0.zip",
- "Plugin\\增强关闭页面-9_0_6.zip",
- "Plugin\\复制到剪贴板-7_0_3_0.zip",
- "Plugin\\客户端缓存操作工具库-8_0_0_0.zip",
- "Plugin\\富文本编辑器-10_0_2_0.zip",
- "Plugin\\对象与集合操作工具-8_0_0_0.zip",
- "Plugin\\异步运行命令-9_0_103_0.zip",
- "Plugin\\支持预览的附件上传-10_0_2_0.zip",
- "Plugin\\服务端缓存操作工具库-8_0_3_0.zip",
- "Plugin\\模板引擎操作库-9_0_103_0.zip",
- "Plugin\\甘特图-10_0_2_0.zip",
- "Plugin\\用户管理命令 V2-10_0_2_0.zip",
- "Plugin\\网络操作库-9_0_102_0.zip",
- "Plugin\\设置当前行命令-10_0_2_0.zip",
- "Plugin\\设置焦点命令-10_0_2_0.zip",
- "Plugin\\豪~豪插件合集-7_0_102_0.zip"
- ]
+ "ModuleType": 40
},
{
"ModuleName": "PublishSetting",
@@ -2156,19 +1968,7 @@
},
{
"ModuleName": "PCPage/选择图标",
- "State": 1,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T09:30:44.3486763+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\共用\\选择图标.json",
- "Pages\\共用\\选择图标.rd",
- "Pages\\724528b5f0ca4bf3b5886ccd98103fe.json",
- "Pages\\724528b5f0ca4bf3b5886ccd98103fe.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "ServerCommand/删除项目分组",
@@ -2182,38 +1982,12 @@
"ModuleName": "PCPage/项目审批历史",
"ModuleType": 1
},
- {
- "ModuleName": "ProcessItem/任务分配流程",
- "State": 2,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T08:36:16.1085609+08:00",
- "ModuleType": 28,
- "ToRemoveFiles": [
- "Process\\任务分配流程.json",
- "Process\\任务分配流程.bpmn"
- ]
- },
{
"ModuleName": "ServerCommand/任务发起流程前校验",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T08:32:46.4135411+08:00",
"ModuleType": 15
},
{
"ModuleName": "ProcessItem/新增任务流程",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T08:36:16.1085681+08:00",
"ModuleType": 28
},
{
@@ -2228,42 +2002,18 @@
},
{
"ModuleName": "ServerCommand/发起任务流程",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T10:00:32.992088+08:00",
"ModuleType": 15
},
{
"ModuleName": "Pages/邮件模板",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T10:32:35.8313289+08:00",
"ModuleType": 6
},
{
"ModuleName": "PCPage/模板编辑器",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T10:32:48.2794451+08:00",
"ModuleType": 1
},
{
"ModuleName": "Table/邮件模板表",
- "State": 3,
- "LockedBy": {
- "UserName": "超哥",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-06-17T10:36:57.7469979+08:00",
"ModuleType": 7
}
]
\ No newline at end of file
diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json
index fe20c4ff..82704c7a 100644
--- a/MasterPages/FGC_母版页.json
+++ b/MasterPages/FGC_母版页.json
@@ -553,7 +553,7 @@
"plainText": false,
"showOnlyTheLastOne": false,
"rtl": false,
- "clickToClose": false,
+ "clickToClose": true,
"closeButton": false,
"pauseOnHover": true,
"success": {
@@ -1050,4 +1050,4 @@
"Formula": "FGC_母版页!$B$2"
}
]
-}//6sFRPChj2VtdHov+b0qrEKQKHcuEpeKfNVDT6dVNAkXRoELFAzZ6Dvv8uzL/vauAWGqCIZtiN2qs47dwS+vj2hNGRKyS0JARI8shKnMzZYtK6JaCOUe6bEiThbER+TfD9SYPEFZjrytdVGLcZLkCJB0uX37jLEhlo+yqUC2a7LerofDtvlCtl5Kemuhyh3ZiZpzswDUKniUDli+J+mEOQTlzEFKFy6yN3rNEQ8nBpU0XoQQsgFYzgRXqyhI2UykJ1YBloUKevdvskbHfPMQrOFDYfgvNvIg9wEekeTRBGafJBgpa0uhDJBMRm1lwjV4yULxgU81G1QjGYCwqU847OEK7NOYLUXIfXyCOS5ZyCT5U0siHDedBzilh9bu35k7vnwXj04y3RecXRiTsC5WxONe+a/eF6CR0LvQhgfV1jWnNGDbYTQWlUcHZPeyhMC/we8Q90ZXuyb3ZSig8L4tz1btKWFXnSDOioppRbjPsYv4vkhKPH0iMmgOltsL5lRtIU6A4p75BZNySJlI3pVx6eJCb5iQirnjOi5L/EUUEI8p/7/YOGn4SKJVwVgzLYQL89tYHKRgZS3EWzXWAbnT9Az9PBaL1TCHZkeV5og5Zxf5/PQinTgKURy71NqovqljlnZU7nmOk6wZW0IU/+94L07I2WjbZ9uLf1x5VTxEK5dmWfnCeCOp+YjmKLf2OBqPx7H4hha1Jyv6GQm9+z4LUsfR5fMUKMtCKRlk2pTBJO5ACR+2BKsA8EUTmyXJ9IWTgd9B+irKQRuCg6DSMBxH/63Ghf3L+zhON6CcQDxh0QLDXSXz1e4pcr6wu4/9zQf1b3NCvRJzX4n/8XrQA0fvrQ8j3pfDwULMYlJ/8ctBxAsD10r/iQJr6lgXCp8BUWUAXRp4TqFsbHOmxlCw1Ve4QVQ==|920
\ No newline at end of file
+}//DvFeXtvXMrglvsEgDc1dCQXLXEjV6XZ+LWBYONRHvKDSPyrn2Z0PDPOORf1KmiQP5D0cAEhayUwNQjPMcVUpo43NHzzyMaLZG3lMm2OPoPlsRZE3QPv4NBPJ8vOy2buGWpeXDiEW1/CJxAdlNyWOQa7b0AWzkGBEpGwVILQ+j+L8VSBgc9ktoiKf/nNYFhXtFFjnhGnEjVvhmHop0BAeMd4uz9+fk8FGjrvJbcuY4WJGZxGcNpYOv/wcTmHrxACfKkxr7twrQGFDIE2Fau12oa5XHkNHo9JqRH/LGPg308YMtOTrdHLqBQseEl1ktnEyw8D0JT5uNNf4NOzO+hTLXAHdfG0Vs3B7tSmX525mylFGVZdGVK1PZEYqQjuHrmVe3HR80kEN0axSnMSWmS14ZdzWqet4dpMWqTZBMqhd1GVXMcSyDa0cH7WozD+gTZXzJGPMizDD5t6pdw075xV6slSgN5C6tSeUNrDwwExdu1hTHL/T3W7oQlGJZwjC83BvW/biRCwkoxEMDhvDI6CeUNIBMnNEbCqXHKkD1MbOiT5ewP/CR+z1br/BydF5OQ2wQUzzapt90DnwdrRL/Vr9R8CoH2zMou5DqDsbkf8mdYhhtsCVum3L8Ld3qUJPFT/XS0P1NiTNQAQauYsjAQloeua4IY6CRPykapVUYlX+rl5C4Obiqto2P+zoV5fz+NSbrjVnD9U4qUao4B6EHFbb/33ZFnmbFOAW+oHFprZUs9QXAX1pspkPU/VMvWGJ7l+EYijGaUUrJskjPKv9Z54nKEJeYtoGQc48tC5MM0Tor15LlrAyZSAK0d3H8oODBJtHpuhvXdHj9/Di+iIr9o2cblE0pHBliezDye2og7rj2QFZPgvgOqJZdSjuM8Fdj3+pgsBUNDnrCUb7gI7eB+LC3A==|920
\ No newline at end of file
diff --git a/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json b/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json
index 938f71ae..78b6cb93 100644
--- a/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json
+++ b/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json
@@ -15,9 +15,17 @@
"GridRowColumnDefinition": {
"DesignLengthInPixel": 10.0
}
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 23.0
+ }
}
},
- "Count": 3,
+ "InLogicalVisibleIndexes": [
+ 3
+ ],
+ "Count": 4,
"DefaultSize": 10.0
},
"Cols": {
@@ -123,10 +131,35 @@
"TableName": "项目分组",
"ShowConfirm": false,
"CheckDataValidation": false,
- "ReloadAfterSucceed": false
+ "RowsToUpdate": 1,
+ "RowsToUpdateCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "项目分组",
+ "ColumnName": "ID",
+ "GUID": "b8213434-845b-4b7b-a05a-9f07ff2ed539"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='8ee6eff0b74d43ef8e54cd3ef782f76'!C4"
+ }
+ },
+ "UpdateBindingValues": [
+ {
+ "BindingInfo": {
+ "TableName": "项目分组",
+ "ColumnName": "图标",
+ "GUID": "eadb0287-00af-4b05-96a0-99f7df96dfc6"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='8ee6eff0b74d43ef8e54cd3ef782f76'!选择图标"
+ }
+ }
+ ]
}
],
- "ID": "4803ed7c-ceb2-4b7d-bc6e-760d9710d24d"
+ "ID": "0d414999-c155-4be7-8d6a-278b0317f2da"
}
]
}
@@ -201,7 +234,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "ea25a584-5f4a-495a-bcca-cb458eda1697"
+ "ID": "09a48dd1-a1bb-434b-b43a-ca7bccb9a2f9"
},
{
"Condition": {
@@ -231,7 +264,7 @@
"Message": "复制成功"
}
],
- "ID": "30a0ec9c-9a78-4e0d-9ccb-0bfea495d045"
+ "ID": "dd94df67-e789-49a2-b662-8af4a0f87df5"
},
{
"Condition": {
@@ -308,7 +341,7 @@
"Message": "操作成功"
}
],
- "ID": "91d20802-3f39-4058-a172-4047479dc700"
+ "ID": "58f28864-2c1d-415c-90b0-d878bca8b645"
},
{
"CommandList": [
@@ -323,17 +356,17 @@
"BtnText": "知道了"
}
],
- "ID": "6137c7d9-03bb-4be2-b231-ebadcd2bf77a"
+ "ID": "7f3b18c7-f985-4508-acf3-f7a20bdd92a8"
}
]
}
],
- "ID": "bdb5a9f7-8dbf-4839-85f0-6592b0eacd9b"
+ "ID": "c9d1b17e-a85b-421e-8721-d5cfe6ade893"
}
]
}
],
- "ID": "3cc6eb75-1e8a-4cf1-82f4-68f98f9175f1"
+ "ID": "a5c86070-88a2-4517-b8c0-89fd85de62bb"
}
]
}
@@ -351,6 +384,9 @@
"ImagePath": "更多.svg",
"UseCellForeColor": true
}
+ },
+ "3,2": {
+ "TemplateCellSource": "ID"
}
},
"StyleDatas": {
@@ -402,4 +438,4 @@
"PaperSize": {},
"Margin": {}
}
-}//b04FJ4fG83tfyM7U2BNAZ4OiKRFT6bODDELqBczwFN9grql5dEvqMptjHTihohuuvGHchT4MKRtvjM/cjemtblajaUHvpm5sialtaEJrgQ0FCcIYiP1ukDppSoX9Qaq+1g4UTuMbbYIC4jJ2gL0gA2bVNy/xrqTdUQbPo/eWAXBp97V/rpj+FpNQ3n8cfIxWddeGV2IGI9M5EvGGxNXFNxE6Cm8pAlJvHHkCu+zp+RmCvOQPihStcOeWYnra1MwM0CU9GZ3r1/QIoAD5xcAfjLQqdqJ5SYHVF6GagCy7Z4eZ36uqNoNnK6IuDJtqzNo+EvRqmOXYIrwnvXza+/rzPGMTpdPyYZM5DdqwU4Qp+J3d16xcsFDXylCv+6zTYS3wj7NOiN33j6BLatSdE2hD0FnC5tLirRoaPT6QhDCm/7HbnM3nO8TXL7pUITx1rdaJmhzeuoEFR6dorM4iz93YkJsWYPxF45X+i5XsV11dxrsk/t71ZGdi+iHkRnEz0Wy+IYTw9U2CQmAGES3CJTrwSDo07cROD6Js5SO0ZEHHVLhFPxyQguWFT49U62INGX3XSDoz0Edt6BpHbaFkS0ZSuRtujDELmErKCUVW6mbNs0PXb0U5/kRRzbzvykeXrrG60z2xOMuWEE9cxqInPY+Zty045qUZtviD4lknUnVzw2yAWd3Q+JdqXUMvyPGzt9IGLGyJ7DNwLgL2c/1cmCuXDEew7QFB6SvRwXYJ4yW5TURsP9M7RafKcxNRlJTJJaB2+nus9x1Ag8uSjSsmG7mi5N3cZ/nTRoev9IADoppXSDG7c8nFyD3QJBCh3uKjMzNjnKOQ+AqBeYUa59keIwEe1Lq6Eot2Sz3lOKKA263CkQB12zPagl6GcGVrZ2Hx9HKWpLE6MfrdmdTnxn41ydlAyA==|920
\ No newline at end of file
+}//SYbsBvg5NyFxiz4BLd7PYcBWETnOxlc8N1MZ2SjMDq6OjrGLiKpKFb0QUSnQl9h3J32l4FqlJ4vsF/JBTc6jHjvgE+L89Uhx8dvcHfVyQBX1br9xrjU3DD7hZtYNnZgsg74zsA7a0CkNqWGUb9cHozzNerue8/pYlAija+nDFQluByTbFyqK4xEzhTlho1zidbNn3v2LsRmYfhGeWR0/4qyQz7wxh6WE1sQqZL47K8khrwrSqx2sK8QaN8RsUoWPrZ2x+zIP/yQ2cWsliy0D307KwuplVGHR+8xxWDQrfECir3nc/+oSViPue7JdJTrP9blvmdT+cHcE34cYvauxPG+pWTxx38JKLY6khkX6vwogNMfMo34YGRtBH6LsAN6MpzpSAvP7GMES9Nq1dhgHlCTpBTFUVcX143kKwCr+25eiix3oDHzNuKj1GqxG28GA1UK2yR8dtgRiRWjw8zgyojEYmDSjiC+1E0mSlY8M20IA0A+0MYc4t79pBCt4if8ZjqMiVeoXR2S+raFSYA38PgPW7Q/slYzDUHbsmPpBjxHx22JI3yNMGpa4LZuoEaRqyfZaIjjb/e5pmKpgL7+a2cMTzOmXO3dgso8UC3RhlqyFL2Gmj6E88mZ1haklwDii0PWDqwnyHEierAtIGAIkkJeQVa8kYJWFOw1n9NEFecHoA9FIkzMt0oE6SPeyuwPMlAqwtI5qK4u5cVtq79ko5choZxR1TeSzzm5d4tGL4a9hJ0ZxNKc1vqBDPBs7m+Jd4nD035mQ38r81HA0JqThomSubJAejJoH0SjJIAU9NqIqXpQxmCxton+cyBMIZbqn6PpCdkzWDeAaFFk0Z2yrBFHie4q2Y27MIw2x4M7JGQsu6wrvfOoxIrO5AS40+rcM3hAPtH1qap4td7pLml0eQw==|920
\ No newline at end of file
diff --git a/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.rd b/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.rd
index b761ba53..ad4c0293 100644
--- a/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.rd
+++ b/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.rd
@@ -1,5 +1,5 @@
{
"PageType": 2,
"ColumnCount": 6,
- "RowCount": 3
+ "RowCount": 4
}
\ No newline at end of file
diff --git a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json
index 6ba9418f..05233082 100644
--- a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json
+++ b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json
@@ -145,7 +145,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "20cdffc9-8ee4-4e72-967b-cfe2a392e21a"
+ "ID": "42a933ef-8d31-4558-8d3b-78bd50adde81"
},
{
"CommandList": [
@@ -157,12 +157,12 @@
"ConfirmText": "您确定要删除吗？"
}
],
- "ID": "142017ac-ceb3-4829-bff4-a5aad576f15a"
+ "ID": "0503a68d-8e13-4de2-a826-08856de4f141"
}
]
}
],
- "ID": "aafb5ec3-57e2-4c86-bfdc-5429d8b5616d"
+ "ID": "8f951977-12d6-4a39-9be7-3508514b2623"
}
]
}
@@ -230,4 +230,4 @@
"PaperSize": {},
"Margin": {}
}
-}//HZUAxh4UXmMDypPYEZFiVRIAdeGIzCJqVTSbfN2OkAVpz+eHMF15dTO843YZnRqXVm/f3J/VknUqM/wMvzkX2EFWpaQ/OfH7Eh1e+9T02URBbq1eRn3ZxLDca2QXHOJGh3SzaW3GiUXaLvYwSXVxPjsYuUt+j6w2y5vKJVGKTPRzIa46UyzlAoDZ7toTPrSa3AFpZ8OJgvLcN04mRBQoq5Nl87AtqRjMF9osRNs8PDk4SuwyFX+lWdsBqsQGmgURHbpPwzajbEaDTFQNaZex0x2j7mVIoVtEZSf+0gMG076XTjl2DUejdffe1hmoytkIRJ9JKsR1z4Nca0Je0BJouOnGjhXBtgvvk/MFWltzYFFGy0nRNjjBmLbCS8zitkv8Pf92KJ1oY6qoaTrKjIxXIem+iROcZUn1UJs2uj0dXYAGqsBJfGOZqCKR2qYMs/FvWtYCKd+68Oocf0r/3+Pr8mse3vfx8w5ensomF/korkW/3YupFVIK/qguhCcd1d1VVNDwZZfsAtlUyCFjfCs44NnqEueMbvDj7GRROi78+2Tt0t/iklaA6GpmAG9L/t3Rf10Y6ABqjOm9iO0GHmJAKLXRp9aFaXuDEtE1ZUx5liihhIm0Hid/5rrQOyHNbYcK9I1F6A83XdpUEz7R0Qag8ircBrmov11qSY73K2vfQD1c6AuaLEdQwKzGQhkp9h53HJ43Fyl9rLVIdDsfGGOx/cIcpX9MHt38uBoD92+rjIAU9UwCPFC21z9bNCSsz1RdNJr1OhPR9ihAp+uYgY02FC2fLN1Q2D0bxEj35CYZvrflXKgDKeazqU+eq52jsFUtt4FOdm6n+oElByl+PukI4L/x6ONQ47eS+Cq3+Na6I20F/LDyPRJwGfM94ZrXwis4eC571YCp9YgEyrM9xPb6UQ==|920
\ No newline at end of file
+}//JqMkUo11WLT8lV7nuydaZtF0iWoymvArpEVXFzBTavqYp2sA8n90tjE7NQWLsfSerZtK6aMGEwbaKFODoF8/0AEIjsgu75tgEHWZ9gnCFQEucD91qTTRoJPsqG8a7Q1yaABK+DltaJjhFur/Tpm13uSmtzanBkLZbhrwYHnjo4ThWtiUZXfyy89Xyo1P82wRUFpYwzAqw8CS9TsXONsBv7dQOQRrd4dF2SnWKGqRVMCMqLY6GBC/zWKltKSB5Ca+yKPpGif8p4zFyNXv8MadAnZ2eTmTEjBfray7DQ8FRvcG9F4EYSo3lK+q+P7GXNEtz4PH5bNcNzbn/fqyKS92g6TgsoO7Vtrjkl3pdWrajMJ14FZ5t/x7nYtVJ1He056aF4Pemmyx5k5nWh7sShQCLc5rCjG353MLd0JzoHr6aXgTPAnAeIWosY9yty81W3NXvFGBhjTHkXLe4xF52eRJCPDy4RFzkpLhs26yiN+a6mWCSlJ/0UqqPnex8udEfxaEnwJW1TijF5l8PyYChDo2+r5xealoCWxnaspIipF/G3azwg+lkdMgXXeIrMG1vLFBixVcWOnQShWewQ5pPjMrqMRQMXu/V6+lOSXHilBiQ7NQ/pUWmUMqHlIlw5rslpNLA1M/fZFNJgVkRBgi23+B1QRC3p83NqMt/Vb9hA+TEzLp2a0dFNzIdYsSZg5j1Hmo8bXwxcfVfTjLiX3y5hJWccTaB2UkgkpoCNaW8P+wuntzTrDGTmL0UtwLDRZlPmPGmJd3UiNl11sQKjCVFvd1CCgj41mXHsKURIpDqjzHXCgCCmMx3/LJDbL/FV5TM7Lr4nFW4/nClTJ5xxeYMuEyNEZGJmP2okQvsuFFkUPmJFOlPGz2/ROz3YfScvwyLh48c+Sd2n/lg/AAui6vodyy8Q==|920
\ No newline at end of file
diff --git a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json
index d044a53d..0dacda30 100644
--- a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json
+++ b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json
@@ -127,10 +127,35 @@
"TableName": "项目任务分组",
"ShowConfirm": false,
"CheckDataValidation": false,
- "ReloadAfterSucceed": false
+ "RowsToUpdate": 1,
+ "RowsToUpdateCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "项目任务分组",
+ "ColumnName": "ID",
+ "GUID": "cda1f1c2-e08c-47ba-a094-a7ab70161dc6"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=a3c94948c8a24e6a9d63fc05ebfd71f!C4"
+ }
+ },
+ "UpdateBindingValues": [
+ {
+ "BindingInfo": {
+ "TableName": "项目任务分组",
+ "ColumnName": "图标",
+ "GUID": "a1c47385-7352-44b5-91d0-a016100bc732"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=a3c94948c8a24e6a9d63fc05ebfd71f!选择图标"
+ }
+ }
+ ]
}
],
- "ID": "1eb962f4-0bcc-4c71-96f3-c2865988e99a"
+ "ID": "457534b1-16cb-48f5-9147-710798b13929"
}
]
}
@@ -204,7 +229,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "54d7fcae-6f8f-4968-92a5-f6264adc50be"
+ "ID": "4b93fb91-b81a-4b9d-b615-baffae6ebc2b"
},
{
"Condition": {
@@ -234,7 +259,7 @@
"Message": "复制成功"
}
],
- "ID": "0451c209-cb2e-4f0b-a783-84d5587ab924"
+ "ID": "2702288b-0b5e-4a7e-8baa-b8d2333afa44"
},
{
"Condition": {
@@ -311,7 +336,7 @@
"Message": "操作成功"
}
],
- "ID": "95e274a7-9e35-4008-9834-49639273d300"
+ "ID": "ba2bf5d0-8835-419b-bd37-9ffcf57ede9b"
},
{
"CommandList": [
@@ -326,17 +351,17 @@
"BtnText": "知道了"
}
],
- "ID": "68e68cfd-6caf-4dc2-b635-4b5b6aed24fb"
+ "ID": "69f3d9e8-3260-4d5e-ac92-d575b1709df3"
}
]
}
],
- "ID": "7bd03b3a-91d1-46c4-94e2-d2e13bf1b24b"
+ "ID": "8856075b-9adf-41fa-a852-61d9916aa010"
}
]
}
],
- "ID": "694fea46-f843-47b9-b95e-7e46eda4e86c"
+ "ID": "bae66faa-1b8e-4f24-bba0-08e37b5b846c"
}
]
}
@@ -411,4 +436,4 @@
"Size": "24,24"
}
]
-}//fP4OzPS6IgdaQi3d8zX8NzDFrFvNcu99jr6Ci8u8w28Ar7Yov2DV4DgSKhZIeTiBVV/Bsh+7fyYLAYGhGU9Cc/kjIyd5F53fpLGbfa5WkX+3C+5Qh/Gcts03+lm1lelee7wnZuDKQSHr9eEOSIzgfjlVZGFclA8Pui8RiRJRqySRJcTdVSVcqldq3tjnam4F1JjNVvSK6X1YULTf+H143ZiGi7axvVHFCwnfEV3QAABH6Gh7eKJJfZJ2XSyuIgGlqnilm34kekLSDrbsvXftwwj+sYunQUjzHP9jvTdFzkYTycLRN8Sno42DqWamMuDh6JM8EPfo8xaDPCISie+4o0tuqyoiQLDgty2aZSjK5h8/coKyxKKuIHMx0YG+8or05gtKxTfne8zaRe/XmpZHWjzKGOjPB//qVmoAZF7VGOicCE/yK74BSDJ7GMd2UJfeUaqJbwM8dUR8q0PkvEi/aMSDIT4CMLC7zHp1PkUnz6C8RTh2YoHChMve6VdLLCEKx7dZrYHE9UClMA+3SdITyJ9oK5xH8iQpp4rhTcfDXRTITptT3F5Fhe9jUtuPnGl0RXZ8aMgDCN/MBkDFrQwqP1lh/MU8kqSUT3rPoA0zs41/LJtcNHlq0x62KUT4PMzTmqp43PJjxG/cwTRAlYDl+P3giGJgLNgA2Iv36Ey9m/P5t7qnhw7tgR9k8EtNTJngi/XpeVZ/kzqH22tNwXilsxrdGDmQvgB1TDgglIiwt5DVKQMMxrK1dBHjscrKsevGzNzbP4+bO7Lzm3ufDk3pwK8ZIQIAXt0LZLvYDdl6xz5CjKr3Famgleb7O6i8tU8TSosyFlZ+cgP2P06hggT1jCDDrQuYoUx30LygqeQVHwhZWosPCv5UY6YMJYs1cFIFu0yOaum4lRdRKxr3yzqgSw==|920
\ No newline at end of file
+}//ILQfIT5DPfcGydsV6+KHwYjkwUwLtdtGCTKgn1Yqxin2nr4/WgkWDFDWRB61TmY3L61ozNIfugc5sroNsMoib0PB8ba2WE9GctV4wk6IoBXFUbNTl33pvoXckmMFqaNtJ23wBTGH4Ri1mzgK8jJ/1RWAWM4gfIf7UREIkW7msDtNNh4e8ONHiyoBPccdYB0RNbjXbcS1Mz9Ecex8m1su7JE1Qm/JnqUfirgYjd38QbDE6x/G/P6IQNpjezBClNsc1StCoGm7TAyXCRhsBIHZCIDY+XB710C4z5s2bUHjSVGxJX8RCTRcKiVlBn+0Mh9FPNh5z2jSGOoRqNOKhX1HEnWd7sSd0WmQV13NWd7OTPPKD4J/UA5lY6sl1mOae4vw3yADmgZLY/+VEIsE4+NWclD7Lmpm6QshsgmolhaKdCS5K0YWgMnVPTpkAzmgKhxkRjeRon4R90P4AIISE/Fn5Duxx/ZSyFwNmmT7uiRZ2V4xwaTvU5fmtvvlibHov5NbywONh1kl/O4WmP/sXoN8cgv3FxnvGfph97juPsdGxjm62N2mMY1yJJGimgKbyxwBq/NdtNQnKlxYRg+wllI/H5QYWNynOvn5tW+E5av37iUAVDeTnfncq8ISIauf/6QRRPz5VjKHXJ4jCe1LvLYWB87QcCHFzs6lypbstrEwUffTkB/U5zO6Qo7nGWTfUB6NuSl+Iur6CR5NaRC9EnAUSykybkq5mTFlpIlswLVrYJoEBXVZee1NxfJaxiW8xBZbZy6BoI2xCiZNdRNPpDsHcOI82iP/0MfcxKAm+tI6+IvmdVNCoTz7zK4yOz8wWLCOJQTkVRc77x+MZDEq8a+mkvxx9CCkwLpczZbVvC3DuTWJ98hDxddgUX8jSaq60wgNduHQ18iRAXHeUCK1JkRLHw==|920
\ No newline at end of file
diff --git a/Pages/a9dda523558c44c189c02319d3d55b4.json b/Pages/a9dda523558c44c189c02319d3d55b4.json
index 17509feb..677fcae3 100644
--- a/Pages/a9dda523558c44c189c02319d3d55b4.json
+++ b/Pages/a9dda523558c44c189c02319d3d55b4.json
@@ -45,6 +45,30 @@
"DesignLengthInPixel": 8.0
}
},
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "11": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
"12": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 8.0
@@ -266,4 +290,4 @@
"PaperSize": {},
"Margin": {}
}
-}//DAu/LTBqIKykAo2P2Vu03rUmwceSWXYtE/ptfFN3nEpIj3fFFCavMScgJ5bsxTsurOiv2RQaIoQWWoulREnWRY0XvRbGOYTWYCeSB3nds9DAD1OHzP+qTdfMhGcF8F1QGpvrEtoBeHfc5p89y7ch9scD6tmYRXi2b3CBXURM3qAp3rG6nT2gY6Gn8bhgArndSDX6r7kTgHWqOtwLgZMlprPfWqYFX4S57dPa4xMZRGtASv+7JRzkUpkQtqtdwrCkmdxA1K4kllOXHGLzUOHWQ1iAc55u90etVeVt1iOcI5IhvJRWcSQllqk30q8VQXS29F4elV+bU7/JEL43dJ4VpatI2RggCjf1FlQ9Fc8nfriOMtNWrj1K28M1NXGFYNLFCxRqj0h+OAfuYN0CDmaNkNyAl4+qOwcmDFQMRCsAbFc8NTJWk9KldTtJ0vqIDFKAEUWEa99w4cc8eYteN11w4SIAgL0yhrCbJiql/HbDPP6BLsTtUoQ5tSkhkaAmjVk5Lbk6EvfHQZSn1JV+f1l9iivDu4SpswepdXaaAdsPKfhfbVd/F4D531M4ZQM7gnoUnr2r4g+2L0mva0v5X8ir/smLyFfgot8F5D6nKninLodWMhspLRXm5QW+cqNDnq2IgQ2zi3sdKoLezZSvKGLxPjpZaJnWCCgP23MuJtW7qN2Mzb6XZxcer5DlcFw6A3+7iCWLliLSeUZh4PK0tyGq86MEvwTW5pou22moCzgYN33pZo5jTirIqJ+lg3xdGElnLXL2gZQEKZGagkje8H7i4XvNvq9oRmoM+n6rYvCukabGK8yGtInAOoREMMl9ifYj2sg+OCjX93UEb033hQycWusFOeZKit9k6vyJG6wnGLe25NUjkObEHo8kPR4XzpkhmCpEy0yMPiKWbHp2l+23zg==|920
\ No newline at end of file
+}//p7Dwe9hKii4Oulq1SoChihG10t+qxFlscGj1bJGxXvbnIWMxgSXPKsVfplv6WIveh8OaPASzOYoMwn5mVqI1zjfbHFbuzZ+RptFwUlnEEsnjY56m9RkGO0W79zMs8N4+LGJn7QkV8nYDHNELuchKa86DDsCkiM/oQrLjH03nSMK0ZCybMTv4QKvdybuNwfAd4TwlFwlaguKdhC7u2W2zHzvn9jsDIoyJ99VsldNVh/8vYeKTEqFWhfDf5dBSNYRFsW/Ki5awOrB1ZTCmT/qqqy28piygFzKGOUnDQqE25JaZdHGcy9lvCgbKhJZCDjmcO9n6BKlRh8kX5NaIQhe8w3SU2YGZfphIgvn9hgEf4gDsWu1np+expjok58+8Vtiq4qHGhWEkUC+1dX2WcZUNt4KN1C8kYKZ2H46/VtfWfCPQuZGwt76/rGEZDZ+nG7fyVblPGm1fZNzQoWRr5JQ5RVPNNosuofYr84SWnCZnOFn5WrJR4zd5r35OVQF8S5fwFLXjkjYTwqdcsOW3bIWq6N9R15AifWVxP4r5K3A0ckwInHZhzOjrcQnTxT90h/Nfs0L6bELHtJQNQJrzMHfg0uKcEi3kGh3nV7ONrpLIhcKFMVNs8CUvWOJm9UBUHTFNYL01vqPck87GhcgqNF518E0n6aF50W3O7G6YGZD4IKg/djhhiNSn6QW8EbM2Do6Yo6PKCR91HTaQdhsKJZdqLoIrNulx/VzcZ5hvbeRqpiRDSQlWTI1/uzj7RW5+/HS51c+A+DTvw6yCIyZ9mxS+TLF+PtrIAIGg3iwAWmTeyNyciKU9ysCuFqv0emY1ayyUKzGHZIGhEO9d4SeG/9qVzLdFYaBm8gHrviwPFpwN07+CNQfPMlpaaSThOcLosBQS9JTG/JfaEAtliM4DbrYsRg==|920
\ No newline at end of file
diff --git a/Pages/任务/任务-侧栏.json b/Pages/任务/任务-侧栏.json
index 7df3b552..57fdc844 100644
--- a/Pages/任务/任务-侧栏.json
+++ b/Pages/任务/任务-侧栏.json
@@ -73,7 +73,7 @@
"RowColumnAttachedInfos": {
"0": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
+ "DesignLengthInPixel": 20.0
}
},
"1": {
@@ -120,7 +120,7 @@
},
"10": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
+ "DesignLengthInPixel": 20.0
}
}
},
@@ -283,7 +283,7 @@
"ID": "ead92b1c9df1498883eaa4adeefb5174"
}
],
- "ID": "6524612f-768f-47fe-8efd-53ec1ba63f73"
+ "ID": "e44d8cd8-6285-4834-83d1-a22f351df720"
},
{
"Condition": {
@@ -315,7 +315,7 @@
"ID": "3b696050194144c7a51203d042e4e1cf"
}
],
- "ID": "58b40ced-1365-47f1-8838-38821543f547"
+ "ID": "89f5b4b1-ba65-43a5-a367-f45e5b4e21cd"
},
{
"CommandList": [
@@ -325,7 +325,7 @@
"ID": "ebac52583bc449c5a4388b99e7f43d75"
}
],
- "ID": "27241dad-710c-47f7-a728-294340c83609"
+ "ID": "d688228b-b6ca-4c1d-b952-6e60f4436568"
}
]
}
@@ -614,7 +614,7 @@
}
}
],
- "ID": "39fb0522-dd45-4cee-854a-e191f7c8bd81"
+ "ID": "9f1bdd48-b5d2-4edc-81c1-272a412faf66"
},
{
"CommandList": [
@@ -627,7 +627,7 @@
}
}
],
- "ID": "53252ecc-8150-495f-b92c-b6ef74fab579"
+ "ID": "e92436f4-f4e4-4e33-a2d4-ba15270dbb0b"
}
]
}
@@ -754,4 +754,4 @@
"Formula": "'任务-侧栏'!$B$9"
}
]
-}//TzlAZ1/5UJRY+Uy5AOgop07miABXlE7cxVkD8eKTtq6gIbVgANdu202YFSHp7XmPQDIWREj1kzcKsZZGfYBjMoP9yvSUkrtwTNsrtcB4NVmgbnYNB1peF7YcH5v8jkTQcmOHC59KQMAZM9Q0wD9zAxTNq3DY4rSZOrUaboABQEFhhS8QXQy4U1IUyiwBoXECBuFF2bvy1E3Wlg3jmuKVcnGKihaF9q8AkXnJAvvIkf8mUxe8+wzU3D9iyhZ1JYDrxw9lF1HjxfLTknWqMJw+2uqMKUjU3LFhHlNyBXhXr3ZrUJETxUvCZd/DFrOO7t1063DoJmFBCtDF5+/4Sx8Dbvyb6fnUmeN15GcV/za4tVXK0m2CKS80L+6/EcNhUcFF19kDTRWJLHWlEQQw9MUW3G4aHXbedn1uOZTjwDCSDp0QJTR2J4bRmku9QeGsY/D6Zrolas2ZWXwTW9eoYodvVp1HuYN54abaRty48HKgH32ce0mitexH34HggRFUCFgcOxy5PLJbnudoA2Et1rAoZ4e1xhfKXlaZwHpIHQXNrL1GS9kuLcnlqMS1Go/51q5WLmfUIWS6jUa/LNOZNKwwwTiQV73Rp/NOBb9C2phHImyw/i+y9D6Kv0mfJ7ecgFHcZ10w9w8oGP9EIU8dqj8XM9lPz9/FZ/gAkuTZ56tmbBEfS8cwqUi0kNqNkJbBu9lYramaqXOaRXugZZoGA0jJvDOxJX9T6mMUU6bHCtrYTQp/YCXEtR3X7Uej+HCTN/VUnWa7TtejR9ADRejbGBYfWjzuElR0JRyQapvnK6OooLJxrvU463YUT6uy18kxK66HIqj2V+ZvRmKRt0l+CIUnKRVblLs/vmryUZmGg69r9L5J0HscUWyjPqA1FSFVVJ+uVdQGuZsuu7LTbid92/PDmA==|920
\ No newline at end of file
+}//i8Q5oA3+n94yoh9lIZhRrum2ofgpmbn7pay49UilbCV5U7+BMLS8t+i/nsx/zbf5dA55cppda8+500KyPV4psbBNJwYlmEoioSNArV1BDqpzl/MVN2g8m7bkw4STL2MKH5mLhUVArIJ41afjs8Y5UOZuavqdUM55TvaztaQTtJCJX+ZVsyLDDXTLL9bcd1/WqRoxoivWHjmZ6J0TM7J2Zn0H5lqbqK8NDsV/a+D9v1L9NUaet/zlDGJc4WzyG9tzePSPThzMNYDBD9C6HwSoIKvh82WT0mef6SVvpGAZbvVX8T/a1D6aNVibnvFLq2RAmL/KcSkmMrRXFE3c2H6VKRTJAF3tCqq5ERowoZ1Ec8LUBc8aFbRU4XGiDNDkVgrnFtjT01wEr9Ky4JHoYvIi6aXzucN2ks52z1qXI1nAi8JVG4r+8TdoDcjwjCdkRYdf82zDoq3Ecqldes8Tb3Lz/rehPN5ikPrHVnxz3SMG9ZnR6mwFDomCA7d5vUa0eUz8+prwMw4VP7uqBxINKSqWv9+GVrd0aXYchAl5tQW7cCD6/JjqapME1Bf5ahN4lvUPurkLIDVCQp0TJVKu+Kbi3awO38w+mbnTrMzAgtZw9Fjx06V43ynJ761BlOi66y13+VLro2UEesQu/dOd2WDTGdpRiq6VkCRQI5GPnGrQD2WElObf6MVnfy+vWIHkLWoDFL/ghafSv89y4jsRvdfmpj+XJH8dxPURaPTkQUpQXU4uYai7Eb1/QsRh27wDv1/yeQa+/NP4UfIL4KZELbTraOXKBouj+8rcxL3OHaOxZzMCS1ZYs1o7nvYtxoIxBixDNMQKpe+DWhC06PoaM2wERQ49ygXraqYA580E025CGGxmXfc4ALwpt0obB0lnmZ9hZ+zJJSh5UBJUqLGzX88NSg==|920
\ No newline at end of file
diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json
index 710acff0..2ab0bebe 100644
--- a/Pages/任务/任务-基本信息.json
+++ b/Pages/任务/任务-基本信息.json
@@ -172,17 +172,9 @@
"GridRowColumnDefinition": {
"DesignLengthInPixel": 76.0
}
- },
- "20": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
}
},
- "InLogicalVisibleIndexes": [
- 19
- ],
- "Count": 21,
+ "Count": 20,
"DefaultSize": 32.0
},
"Values": {
@@ -196,7 +188,6 @@
},
"Formulas": {
"11,2": "C16&\",\"&J16",
- "1,18": "IF(折叠全部,\"展开全部\",\"折叠全部\")",
"13,17": "C14-任务总计划工时"
},
"AttachInfos": {
@@ -235,120 +226,13 @@
"ShowConfirm": false
}
],
- "ID": "fb3d6dfc-f14c-4a59-8bcd-c7856becfb2c"
+ "ID": "389a2c17-b6fe-4c76-b673-7a0953af18ac"
}
]
}
]
}
},
- "1,18": {
- "CellType": {
- "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
- "CommandList": [
- {
- "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
- "PropertyItemsList": [
- {
- "TargetCells": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "='任务-基本信息'!折叠全部"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=NOT('任务-基本信息'!折叠全部)"
- }
- }
- ]
- }
- ],
- "TemplateKey": "Gost"
- }
- },
- "1,19": {
- "CellType": {
- "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
- "CommandList": [
- {
- "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
- "PropertyItemsList": [
- {
- "TargetCells": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "='任务-基本信息'!收起侧栏"
- },
- "Value": "0"
- }
- ]
- },
- {
- "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
- "PropertyItemsList": [
- {
- "Location": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "='任务-基本信息'!U:U"
- },
- "Value": true
- },
- {
- "Location": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "='任务-基本信息'!T:T"
- },
- "Value": false
- }
- ]
- }
- ],
- "ToolTip": "展开",
- "Size": 18,
- "ImagePath": "收起.svg",
- "UseCellForeColor": true
- }
- },
- "1,20": {
- "CellType": {
- "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
- "CommandList": [
- {
- "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
- "PropertyItemsList": [
- {
- "TargetCells": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "='任务-基本信息'!收起侧栏"
- },
- "Value": "1"
- }
- ]
- },
- {
- "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
- "PropertyItemsList": [
- {
- "Location": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "='任务-基本信息'!U:U"
- },
- "Value": false
- },
- {
- "Location": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "='任务-基本信息'!T:T"
- },
- "Value": true
- }
- ]
- }
- ],
- "ToolTip": "收缩",
- "Size": 18,
- "ImagePath": "展开1.svg",
- "UseCellForeColor": true
- }
- },
"3,2": {
"BindingInfo": {
"TableName": "任务表",
@@ -364,69 +248,31 @@
"$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
"CommandList": [
{
- "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
- "PopupDisplayMode": 1,
- "Placement": {
- "SerializeProperty": "='任务-基本信息'!C4"
- },
- "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": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
- "Title": "加载中"
- },
- {
- "$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": "状态码",
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "='任务-基本信息'!状态码"
- }
- }
- ],
- "ResultErrorCodeTo": {
- "SerializeProperty": "code"
- },
- "ResultMessageTo": {
- "SerializeProperty": "msg"
- },
- "RefreshAfterFinish": true,
- "CheckDataValidation": true
- },
- {
- "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
- "FunctionName": "remove",
- "Title": "加载中"
- },
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
+ "tableData": {
+ "TableName": "任务表",
+ "ColumnName": "任务状态",
+ "GUID": "a47aa4a3-dc7e-4597-8272-f1c80a90b59e"
+ }
+ },
+ "value": "2",
+ "compareType": 3
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "PopupDisplayMode": 1,
+ "Placement": {
+ "SerializeProperty": "='任务-基本信息'!C4"
+ },
+ "ClosePopupCallbackCommand": {
+ "Commands": [
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
"ConditionAndCommandPairList": [
@@ -437,51 +283,123 @@
"$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
"cellLocations": [
{
- "SerializeProperty": "='任务-基本信息'!code"
+ "SerializeProperty": "=是否为确定"
}
]
},
- "value": "0"
+ "value": "1"
},
"CommandList": [
{
- "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
- "Message": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "='任务-基本信息'!msg"
- }
- }
- ],
- "ID": "a9950383-8996-4153-b723-d0ea4bc1eb3a"
- },
- {
- "CommandList": [
+ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+ "Title": "加载中"
+ },
{
- "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy",
- "FunctionName": "warning",
- "Title": "温馨提示",
- "Message": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "='任务-基本信息'!msg"
+ "$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": "状态码",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='任务-基本信息'!状态码"
+ }
+ }
+ ],
+ "ResultErrorCodeTo": {
+ "SerializeProperty": "code"
},
- "BtnText": "知道了"
+ "ResultMessageTo": {
+ "SerializeProperty": "msg"
+ },
+ "RefreshAfterFinish": true,
+ "CheckDataValidation": true
+ },
+ {
+ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+ "FunctionName": "remove",
+ "Title": "加载中"
+ },
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "='任务-基本信息'!code"
+ }
+ ]
+ },
+ "value": "0"
+ },
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='任务-基本信息'!msg"
+ }
+ }
+ ],
+ "ID": "860f440f-ea95-4000-8282-6a46ef5444ea"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy",
+ "FunctionName": "warning",
+ "Title": "温馨提示",
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='任务-基本信息'!msg"
+ },
+ "BtnText": "知道了"
+ }
+ ],
+ "ID": "cedb1913-85b9-4669-b1e6-d422cdfa6c6c"
+ }
+ ]
}
],
- "ID": "5c3d02a6-6e00-437d-8a2b-1d819785f9c7"
+ "ID": "f8a3c9e3-d420-4671-aebf-bae51bdfff69"
}
]
}
],
- "ID": "620eb1ab-4654-4626-adb2-f13d1feab4b3"
- }
- ]
- }
- ],
- "ParamProperties": {
- "IsOK": "是否为确定"
+ "ParamProperties": {
+ "IsOK": "是否为确定"
+ }
+ },
+ "PageName": "切换任务状态"
+ }
+ ],
+ "Comments": "小于进行中",
+ "ID": "9f234940-ff3b-405a-9b0a-f160431d96c5"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "FourStandardStyle": "warning",
+ "Message": "任务尚未审批完成，不可修改状态"
+ }
+ ],
+ "ID": "128baf3c-54ba-4d40-8f53-77fe343f34af"
}
- },
- "PageName": "切换任务状态"
+ ]
}
],
"Text": "未开始",
@@ -557,7 +475,7 @@
]
}
],
- "ID": "5c54336e-f31e-46bc-aa53-05198126c0bf"
+ "ID": "64c2289b-9919-4489-8a4b-c09504fdedd7"
}
]
}
@@ -690,7 +608,7 @@
]
}
],
- "ID": "dde5cc70-3c9c-4746-8a4f-83302c03704d"
+ "ID": "a958d541-52b1-4aae-9b9a-78034364aff1"
}
]
}
@@ -798,7 +716,7 @@
"ShowConfirm": false
}
],
- "ID": "d36894ce-fcf2-4e02-8b93-06febced6c1d"
+ "ID": "dfaaf66a-3963-490c-beb2-d3a3ad5caf9f"
}
]
}
@@ -835,7 +753,7 @@
"ShowConfirm": false
}
],
- "ID": "ebc047f9-d543-465f-964d-a69d607d4c7e"
+ "ID": "7cc265a3-4cfe-477e-ba38-2c7802a51de4"
}
]
}
@@ -970,7 +888,7 @@
]
}
],
- "ID": "e80a0044-b973-43e7-ad07-91d31ad3e273"
+ "ID": "4b4dca07-420b-4831-8040-2a7a766c6961"
}
]
}
@@ -1139,7 +1057,7 @@
]
}
],
- "ID": "affc17d2-e5e0-4884-8fef-d770a49cf993"
+ "ID": "154c2bfd-8358-47f5-9f46-a8eef1f5d98a"
}
]
}
@@ -1278,12 +1196,12 @@
"BtnText": "知道了"
}
],
- "ID": "f678c2f0-8fdd-4316-bf66-f862582d730b"
+ "ID": "1d66bdb1-50f2-439e-b0f1-e2efc7f7ee9f"
}
]
}
],
- "ID": "622eb8af-9cf5-453a-8f6b-6ce1f5a2a5e1"
+ "ID": "5105aaae-a69b-4ed2-b4a2-9b610d29518c"
}
]
}
@@ -1331,43 +1249,39 @@
"Foreground": 0,
"Formatter": 1
},
- {
- "FontSize": 13.333333333333332,
- "Formatter": 2
- },
- {
- "FontFamily": 3,
- "FontSize": 13.333333333333332,
- "Foreground": 4
- },
- {
- "FontFamily": 3,
- "FontSize": 13.333333333333332
- },
{
"FontSize": -1.0
},
{
- "FontFamily": 3,
- "FontSize": 13.333333333333332,
- "Foreground": 4,
- "Formatter": 5
+ "FontFamily": 2,
+ "FontSize": 13.333333333333332
},
{
- "HorizontalAlignment": 6
+ "FontFamily": 2,
+ "FontSize": 13.333333333333332,
+ "Foreground": 3
},
{
- "FontFamily": 3,
+ "FontFamily": 2,
"FontSize": 13.333333333333332,
- "HorizontalAlignment": 6
+ "Foreground": 3,
+ "Formatter": 4
},
{
- "FontFamily": 3,
+ "HorizontalAlignment": 5
+ },
+ {
+ "FontFamily": 2,
"FontSize": 13.333333333333332,
- "Foreground": 4,
- "Formatter": 7,
+ "HorizontalAlignment": 5
+ },
+ {
+ "FontFamily": 2,
+ "FontSize": 13.333333333333332,
+ "Foreground": 3,
+ "Formatter": 6,
"TextIndent": 10,
- "HorizontalAlignment": 6,
+ "HorizontalAlignment": 5,
"WordWrap": true
},
{
@@ -1375,14 +1289,13 @@
"Foreground": null
},
{
- "Foreground": 4
+ "Foreground": 3
}
],
"Types": {
"Strs": [
"black",
"@",
- "General",
"Body",
"Text 1 50",
"[AUTO]General",
@@ -1394,161 +1307,152 @@
"1,1": 0,
"1,17": 0,
"1,18": 1,
- "1,19": 2,
- "1,20": 2,
- "3,0": 3,
- "3,1": 2,
- "3,2": 3,
- "3,3": 3,
- "3,4": 3,
- "3,5": 4,
- "3,6": 4,
- "3,7": 4,
- "3,8": 3,
- "3,9": 3,
- "3,10": 3,
- "3,11": 3,
- "3,12": 3,
- "3,13": 3,
- "3,14": 3,
- "3,15": 3,
- "3,16": 3,
- "3,17": 3,
- "3,18": 3,
- "3,19": 3,
- "3,20": 3,
- "7,1": 5,
- "7,2": 6,
- "7,10": 6,
- "8,0": 3,
- "8,1": 2,
- "8,2": 3,
- "8,3": 3,
- "8,4": 3,
- "8,5": 3,
- "8,6": 3,
- "8,7": 3,
- "8,8": 3,
- "8,9": 3,
- "8,10": 3,
- "8,11": 3,
- "8,12": 3,
- "8,13": 3,
- "8,14": 3,
- "8,15": 3,
- "8,16": 3,
- "8,17": 3,
- "8,18": 3,
- "8,19": 3,
- "8,20": 3,
- "9,0": 3,
- "9,1": 5,
- "9,2": 3,
- "9,10": 3,
- "9,17": 3,
- "9,18": 3,
- "9,19": 3,
- "9,20": 3,
- "10,0": 3,
- "10,1": 5,
- "10,2": 3,
- "10,3": 3,
- "10,4": 3,
- "10,5": 3,
- "10,6": 3,
- "10,7": 3,
- "10,8": 3,
- "10,10": 3,
- "10,11": 3,
- "10,12": 3,
- "10,13": 3,
- "10,14": 3,
- "10,15": 3,
- "10,16": 3,
- "10,17": 3,
- "10,18": 3,
- "10,19": 3,
- "10,20": 3,
- "11,0": 3,
- "11,1": 5,
- "11,2": 3,
- "11,3": 3,
- "11,4": 3,
- "11,5": 3,
- "11,6": 3,
- "11,7": 3,
- "11,8": 3,
- "11,9": 3,
- "11,10": 3,
- "11,11": 3,
- "11,12": 3,
- "11,13": 3,
- "11,14": 3,
- "11,15": 3,
- "11,16": 3,
- "11,17": 3,
- "11,18": 3,
- "11,19": 3,
- "11,20": 3,
- "12,0": 3,
- "12,1": 2,
- "12,2": 3,
- "12,3": 3,
- "12,4": 3,
- "12,5": 3,
- "12,6": 3,
- "12,7": 3,
- "12,8": 3,
- "12,9": 3,
- "12,10": 3,
- "12,11": 3,
- "12,12": 3,
- "12,13": 3,
- "12,14": 3,
- "12,15": 3,
- "12,16": 3,
- "12,17": 3,
- "12,18": 3,
- "12,19": 3,
- "12,20": 3,
- "13,0": 3,
- "13,1": 5,
- "13,2": 7,
- "13,17": 8,
- "14,0": 3,
- "14,1": 5,
- "14,2": 3,
- "14,3": 3,
- "14,4": 3,
- "14,5": 3,
- "14,6": 3,
- "14,7": 3,
- "14,8": 3,
- "14,9": 3,
- "14,10": 3,
- "14,11": 3,
- "14,12": 3,
- "14,13": 3,
- "14,14": 3,
- "14,15": 3,
- "14,16": 3,
- "14,17": 3,
- "14,18": 3,
- "14,19": 3,
- "14,20": 3,
- "15,0": 3,
- "15,1": 9,
- "15,2": 3,
- "15,9": 3,
- "15,17": 3,
- "15,18": 4,
- "15,20": 3
+ "1,19": 1,
+ "3,0": 2,
+ "3,1": 3,
+ "3,2": 2,
+ "3,3": 2,
+ "3,4": 2,
+ "3,5": 1,
+ "3,6": 1,
+ "3,7": 1,
+ "3,8": 2,
+ "3,9": 2,
+ "3,10": 2,
+ "3,11": 2,
+ "3,12": 2,
+ "3,13": 2,
+ "3,14": 2,
+ "3,15": 2,
+ "3,16": 2,
+ "3,17": 2,
+ "3,18": 2,
+ "3,19": 2,
+ "7,1": 4,
+ "7,2": 5,
+ "7,10": 5,
+ "8,0": 2,
+ "8,1": 3,
+ "8,2": 2,
+ "8,3": 2,
+ "8,4": 2,
+ "8,5": 2,
+ "8,6": 2,
+ "8,7": 2,
+ "8,8": 2,
+ "8,9": 2,
+ "8,10": 2,
+ "8,11": 2,
+ "8,12": 2,
+ "8,13": 2,
+ "8,14": 2,
+ "8,15": 2,
+ "8,16": 2,
+ "8,17": 2,
+ "8,18": 2,
+ "8,19": 2,
+ "9,0": 2,
+ "9,1": 4,
+ "9,2": 2,
+ "9,10": 2,
+ "9,17": 2,
+ "9,18": 2,
+ "9,19": 2,
+ "10,0": 2,
+ "10,1": 4,
+ "10,2": 2,
+ "10,3": 2,
+ "10,4": 2,
+ "10,5": 2,
+ "10,6": 2,
+ "10,7": 2,
+ "10,8": 2,
+ "10,10": 2,
+ "10,11": 2,
+ "10,12": 2,
+ "10,13": 2,
+ "10,14": 2,
+ "10,15": 2,
+ "10,16": 2,
+ "10,17": 2,
+ "10,18": 2,
+ "10,19": 2,
+ "11,0": 2,
+ "11,1": 4,
+ "11,2": 2,
+ "11,3": 2,
+ "11,4": 2,
+ "11,5": 2,
+ "11,6": 2,
+ "11,7": 2,
+ "11,8": 2,
+ "11,9": 2,
+ "11,10": 2,
+ "11,11": 2,
+ "11,12": 2,
+ "11,13": 2,
+ "11,14": 2,
+ "11,15": 2,
+ "11,16": 2,
+ "11,17": 2,
+ "11,18": 2,
+ "11,19": 2,
+ "12,0": 2,
+ "12,1": 3,
+ "12,2": 2,
+ "12,3": 2,
+ "12,4": 2,
+ "12,5": 2,
+ "12,6": 2,
+ "12,7": 2,
+ "12,8": 2,
+ "12,9": 2,
+ "12,10": 2,
+ "12,11": 2,
+ "12,12": 2,
+ "12,13": 2,
+ "12,14": 2,
+ "12,15": 2,
+ "12,16": 2,
+ "12,17": 2,
+ "12,18": 2,
+ "12,19": 2,
+ "13,0": 2,
+ "13,1": 4,
+ "13,2": 6,
+ "13,17": 7,
+ "14,0": 2,
+ "14,1": 4,
+ "14,2": 2,
+ "14,3": 2,
+ "14,4": 2,
+ "14,5": 2,
+ "14,6": 2,
+ "14,7": 2,
+ "14,8": 2,
+ "14,9": 2,
+ "14,10": 2,
+ "14,11": 2,
+ "14,12": 2,
+ "14,13": 2,
+ "14,14": 2,
+ "14,15": 2,
+ "14,16": 2,
+ "14,17": 2,
+ "14,18": 2,
+ "14,19": 2,
+ "15,0": 2,
+ "15,1": 8,
+ "15,2": 2,
+ "15,9": 2,
+ "15,17": 2,
+ "15,18": 1
},
"ColStyles": {
- "1": 10
+ "1": 9
},
"SheetStyle": {
- "FontFamily": 3,
+ "FontFamily": 2,
"FontSize": 13.333333333333332
}
},
@@ -1564,7 +1468,7 @@
"7,2,1,7",
"7,10,1,7",
"13,2,1,15",
- "13,17,1,3"
+ "13,17,1,2"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1670,4 +1574,4 @@
"Formula": "'任务-基本信息'!$B$2"
}
]
-}//T3ZY77ipjgge9i/Hyw2GFFDLsimCAjhowcMSXPBki/EVNIVtKv6p3rjJmz0nZeaioJYnKMbd0I+ro6sYS5zxhj9RMclPcWfMvMTdRM/8onwJ1oiKjW/iQg8GhTx3/dxTgyjsOYqkd5f93WLEPyftrW6d+Q9wcxwrLIh/F7oBttPfrutEnde6kk4Tso5TfvCO5YcoPzbctf/V4kj1CAOK5DLV/Fbqd/D0AKukXOhppxRvN1G1xwCzsHJD4OlY1+LyHvaX49IdKF4b3u4I3GTb6O7bQU5MkJOTvmgtPk1l3hp1vYPXhCd5W04dRdrZFR5jQRYn/LVvctH29Ig/01ACW1a9df3hRraW3wy2kQmpIzEUu0OdfTSb2bQ2TKRryBX08g2BZaT9K0ZjJDGXhasvhgen2PulkbQgp+mF3Q/sNEnT+nzinFV8oKEu4Y9x8pZKKSVM7ayn+Cr0uYHjNVKuOTKHOkSQXQRXHn3vThpyevzczkShVa1J4LdAq/PgpI7kb4SI0us7mGmzh+WPxsA3VGiBlCvK54zF0vpJgnPIOF1PyuuEV5FJMf2VGs0xsX5JXLhXH4sy0uNZ4ggl3d7qcBKfe2H5YPGiGVMcg1CWdcILh8D0bRZYeak/HOdSsJszXbFu6eHCCIEIGZy5NNf+IhvUd+YaN6FvCb0imu3aC/8rWu0Ko/YYXD0YAoKdiFef6l5QlTcmEwWKjuFrScNuJYNT3RIBpCbAT+9WRbxImSb/zdpJMKyFHsvk1G9Qxd6lVXfYAOkuYr+aGQEpJ815dS/BckccQPop2LVJwP6vC/zWWGaQyqxlrxDmh5UwPTOcNuFg+bcrWV7e4hdIbI9SHsvesP0a8pmstWDTxfGsSYqC7Y/Ly9K3h4+W6XY0wcupGZeetp9LhBwWzJMsYDY2Wg==|920
\ No newline at end of file
+}//s6+rkQFrX0iJ/zNwGbrKtDvrnJRrsp2GzGytpbPNBCXgOBU21jutM8Pl+/WdLtzM0J1fVUaEeJxTbWbj374MAgNQWu6JBwxVcbiIynlwSMBy3FWSf/vvITHFDdVqAZ26Zl130TQGHx48CvgayK9MN39P5OKBVlGicYLU2DNiLZutdlV8wq058/4JsE+3g+ueoYYMwbHoMWJ5ddZCsSqIvBo6h7FFrVqhaQIcE7v8KfqWcpNZJuukMHvL5nIz/nZGChtwwDqSnNmmmQQcHTfbPzHKMceDguNe35e5jgMOpuXyABGxS0pKOJGOzka2sQAk8bvsDR2nyIUm0SOWmAAtFqG+uOjXHHvFyDjZG5wguhWDgSFmerhiyDc4ieluQ0P934eLaS+mFUr5kCRfxyJHJfAU66Bk6GAJIun+UptnLGbvkHOVzTmOPgwNSCrvc5A0Z3TrC/mHbYr3l9oG0g/Lah2MBx3twwyyKZJcTciS9WxmwybOAb6qHjOchF1iBn3JQ5A/fFDvktjp2f52NOqx4EQEOyvw1n1xMNBl8PtFBpbwS251aLKSliCZj5KdHKuV0VLQ6KdfiteFFo7WbX/h4x+fL8fYQtnbf9eWDNxGx6nX3KXi6ms2TR5+CBDw+ToqBC40+Vv0HqwGlnUx4O/WnhoxLrD2FjbjMaqKqZY26ridHgFMj/8UIf0tekwA/IMKIkz2id1xMkzuJj5Xi514Tr0LxvlSkdsHW9xeKTCRY/bRrHMdw+gfYH0jYEzoExWy3hDENQPU5vnNHtNy4535mQnMN3QphQgsod6kAN+0XAlx1BvT/uzdnGTKQxPB+fWXGCYFSPcq2MDL4ZjUL6xlGIOAvPCZHmZYdgiBWtu+w2+Jui8t2ZD9p/X6iyy2QlXgU4c1z7DURckNrbs5k9ARpw==|920
\ No newline at end of file
diff --git a/Pages/任务/任务-基本信息.rd b/Pages/任务/任务-基本信息.rd
index 0d831443..a4559874 100644
--- a/Pages/任务/任务-基本信息.rd
+++ b/Pages/任务/任务-基本信息.rd
@@ -1,10 +1,9 @@
{
"PageType": 0,
- "ColumnCount": 21,
+ "ColumnCount": 20,
"RowCount": 16,
"Formulas": {
"11,2": "C16&\",\"&J16",
- "1,18": "IF(折叠全部,\"展开全部\",\"折叠全部\")",
"13,17": "C14-任务总计划工时"
},
"CustomNames": [
diff --git a/Pages/任务/任务-子任务列表.json b/Pages/任务/任务-子任务列表.json
index e0d60014..072b01c8 100644
--- a/Pages/任务/任务-子任务列表.json
+++ b/Pages/任务/任务-子任务列表.json
@@ -180,7 +180,7 @@
"SerializeProperty": "='任务-子任务列表'!C6"
},
"TargetCell": {
- "SerializeProperty": "=新增任务!B18"
+ "SerializeProperty": "=新增任务!B16"
}
},
{
@@ -189,7 +189,7 @@
"SerializeProperty": "='任务-子任务列表'!F6"
},
"TargetCell": {
- "SerializeProperty": "=新增任务!J15"
+ "SerializeProperty": "=新增任务!J13"
}
},
{
@@ -198,7 +198,7 @@
"SerializeProperty": "='任务-子任务列表'!I6"
},
"TargetCell": {
- "SerializeProperty": "=新增任务!J18"
+ "SerializeProperty": "=新增任务!J16"
}
},
{
@@ -619,4 +619,4 @@
"Formula": "'任务-子任务列表'!$R$6"
}
]
-}//2b1gxBgbaZiq3RKHT9SnoiCjsgVsACuvF5unGO6ILKDFGltJuGYfgffRgIl4Wjk0TJlC7i3hX0GC8qPeQ4x+Y2g4S4wRNcd/7obOTH9Nz8IiekZqJUPfEQwUEt+FRF0F1SxWUF8LWXVNdjI3bcMoqmSdR1ofTEIMie48JOqQN4xhNG6JbG8Dwg+r9/nybfdsAqKc+u6dHVuqD3vB0Gd2jrqPTgW81gwquYLNL/5zltjvLkfnXzbfc/M3r9Dr00rNMZ3Z3+LS3LpzbZxnU1l505Fyqfe+otWHa/i1OneNFOITo+gB0+eo1PrUABtXTyLzFioao3CMdumJyzI0WlPTJEqI8JkT1mdEAgf8feAqElsV7ZiDQwOEgCXLBTqzt3JYk4fe+moj3ous+JgU8aYQEpY9rhunj87fdHbqBkMhSMZD8QAVHd0AYk5PHUQZRWefiiuetz/WmKP6m/qZfS0uiXGbynyb0Y4y00m04ZBYzZwIxq7TdzPY1oWnkxZeL99YCrnTWHoVnfOsCQoXhUcrQgI872rk3+OmUHpTGhf5M/KTAbohKt6dQ0xPjPZxDtvok4NEIQToB1dzMr4kqMYa0jucKEf+2sjNekNkR0x/NpeynnyX6bcNYYNCCkAS3+MvIC9gJCl3w8O4wa8Dhl8c9r7QJ0m882YmNynYb0O0XKr3wVDp73xBVY+lSMetIzVwpz2ITB8qx5DEVsiy5BOXGhbiF4GekIEl/y18Dcd4cF2sgv/SW7z7tK4GEHCILTQSD0a1z9M1S/ixRChQI6gymloFK4HqNBNEknIaJ7ghtcWn13czZKe8BziaWmQ+rR1K4f9EV7GspmiVSJ4XPeBID2s7D0bpYFsxa8A6Nms1/MuflQz9ywUiJu9jQm/yLEZRcUz2KHWmVV+fCBtaaI7RVQ==|920
\ No newline at end of file
+}//gMFoDWK0haeMh1RARdraLCG4+gyVw24LDJycrqIxWfhmZQNgp9WxBoHbBdDK/jgywt8RcP1xap6CVmB5GNJvMDXEhgGq413azF3LHhUzu2hMFrHCra4CSiu+YCw3jxVqDiSEClnXI861CINq0jVrr63XsIURI78ZJEgdv6ABW4HuvdbS3UFxit+x13kxCXGS5zPm4Lgzpb0q1QtHkK2V6gk+VD2UkHbOHZ9/LvPot2PsACqMEaUivFRo7BhdAmufCtnS5fWamgGEYrxO49CSNJNd0Z9H22PXI8RMFEs+21JGAB8EzF1GjTRwLNTh0HPI0o+pt1sUMTpyGWrL8G1jdSE8EMJvXQ+SM1svBaRVUoH2I/IrX9n+qufyedT5dwrbOIE09kSa518VCLXNer5ILordDNup/eCOfvqr1R+GmOqT+TH01kOl77L2/U7zVVI0T2QcZShpQ04m1RJBIOIFySJCtr2tbQ7u7GCyRVhFn8YFndxOTqFPLEJsiIBLWlcDYD7N/ROcwJoSXzwdR82cZKd3K5S96xL5716minCQFAM2Pb4fB+rUsP/81oD9QD6EyByB+5COT7GgWNgqfssAPAO+t4jSSAyH/Zd+ByHWLCTfZC0i8wwU6lcNUBD5uZ2no30u7v2s/9a7qxr5Y2Khu4Kp5li2TTmCbWuGqNvHf78jGslTWCFqCI8UbTS9CAM6KzxlBzzXQFnGNTIf9CjcjuD2HBCxGah66BrQapu2zL5wcFtOkAcOz5RBqQgXOKsF9cRrXIrBEvDYCHmFxA8QifKByjFoXUpw12siR40Ucrab11aSvEmgIHSujnN0CsvMkvmVBtPzIMZSIVMMgYlRxDGKgcNxTvnM1I/F7OxVsFhduYrZP6swEJeA0I6NjS2Z54aLFaLM15z4GZ3lSnt4aw==|920
\ No newline at end of file
diff --git a/Pages/任务/任务-工时.json b/Pages/任务/任务-工时.json
index 6dc7dcfc..86b0544a 100644
--- a/Pages/任务/任务-工时.json
+++ b/Pages/任务/任务-工时.json
@@ -315,7 +315,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "02986f2e-aec8-4359-b33d-60edc5f83b8b"
+ "ID": "4ecfdb77-9f96-4ba4-9f20-cb26096f70a8"
},
{
"CommandList": [
@@ -354,12 +354,12 @@
"LoadBindingDataOption": 1
}
],
- "ID": "2eb2e698-d30f-464b-b003-ec311a093f38"
+ "ID": "26f39a41-9ff2-4251-9f45-76a0154b4aa6"
}
]
}
],
- "ID": "99e190f4-6cc8-46b6-ab2a-760aad045f78"
+ "ID": "b60b21f9-4094-4207-a8b6-3c66366bc507"
}
]
}
@@ -396,7 +396,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "e18f49b3-b1f3-452f-a95c-159a9ff57ee9"
+ "ID": "922ae99b-774c-497e-93e3-7a7a94f7cf00"
},
{
"CommandList": [
@@ -435,12 +435,12 @@
"LoadBindingDataOption": 1
}
],
- "ID": "2c8f4979-d7bf-4e97-afc3-bb1f89f57ee9"
+ "ID": "0c466a4b-c681-4d65-8f9a-09dbe0587043"
}
]
}
],
- "ID": "506ac5b9-6a62-4561-81c6-b16d075676ee"
+ "ID": "767f3c1b-f3eb-4f06-a7d7-5bed3c8fb3e0"
}
]
}
@@ -493,7 +493,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "bc3503fc-3129-49e2-9331-07970ff9c9a0"
+ "ID": "f3768eb3-a955-4f07-9fa5-cf6b64330bfc"
},
{
"CommandList": [
@@ -532,12 +532,12 @@
"LoadBindingDataOption": 1
}
],
- "ID": "403144ce-d299-4a52-bdfa-f396697c1feb"
+ "ID": "6bc27d41-2183-4b41-bf7e-d20e31a802e6"
}
]
}
],
- "ID": "90f18155-5597-45fb-abe4-2acdde9b9543"
+ "ID": "e0393c64-4783-4980-aeb2-2e4b1168d2f5"
}
]
}
@@ -582,7 +582,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "ae3176d6-21e3-46a7-97b2-a164fcae96c0"
+ "ID": "4b74aee9-7c86-4a31-8702-56790d405b59"
},
{
"CommandList": [
@@ -621,12 +621,12 @@
"LoadBindingDataOption": 1
}
],
- "ID": "3dc38bb6-fd93-4e35-89dc-653741910be3"
+ "ID": "e8aa96b6-1690-4d41-a51d-6e7b81979483"
}
]
}
],
- "ID": "2a6f1b88-e2d2-46a7-a856-e8b9cc5d8dca"
+ "ID": "f55596d2-e1fb-4e8a-bb9c-8fbd817d6efc"
}
]
}
@@ -857,7 +857,7 @@
]
}
],
- "ID": "9e7265d0-097b-4cf7-8d6a-5067c9e7541c"
+ "ID": "ca255523-f688-445b-ad51-5403b7075808"
},
{
"CommandList": [
@@ -877,7 +877,7 @@
]
}
],
- "ID": "3d5909c7-557e-4a55-92b7-04b86066943d"
+ "ID": "a0b457eb-2363-447f-9bda-c3c6c8c7a1b4"
}
]
}
@@ -1204,4 +1204,4 @@
"Formula": "'任务-工时'!$V$14"
}
]
-}//3tucIAIdXup8AtDfGKzXTSY89likhpecgaHNjPw4I99O4VhuzEt9Isi8az5HlEuCHvfe2Vm7EW5yBQSLzGUrqpWl5M1N4hc/fQ/ct38UFaV25SG4kl74/9HG/FxUjSaYQ9EXbzBq3BzdU2dBQcd85/OEmoWQJWaPb/B3x6WN2w4QpVpiLbrWRY6oIeDDXoAjLj1Gvj72mmZRaludZ3r2fUnHnvccYMDJv9MhSQTyOK62OefqepYHA/z8zdy6XkMdP2mbncBRsXNI2UJTsI+ewypIltC+yUgrHsebe6Bi7r1p9rF4JqcQUE90b+v0kP5iyfX/adWHZdR9WcRnhJKXwYleMaCdU7eTHWGXLh5sqqvj2CLVqsoBfuL+24kQVTwQdgzZS2gI03cZObLPBDkUYpYQI8miRROQuIBfY+l38v4JypJG2zdFJwvLpDDLisStg0gNysrOZ/aM9Rn27xA+dMQ6iylrZJXNf6IYrVSoThB7TXgfEHUs6yWUwgB4rkNIhFi8WBNLqbepR07VN8GzbNm28Xs10FDCThxeAEYU2ooswZ+ksW7+TJAeDVuYd6uU1Nntz9offYH+SUO5jyrAoQz2yjiZeocdjvAgAPGmBHsZcNHNOASH6caCmXWdy9Khd1pUEozIdWLTxElJ5nX5ci/B6O++rzWKYg+znQl/cEnMjqCkkvp3rKnMgpEiZzFjDzglo+hqQBLBSitItxJhSQyJJ1bXJyxk9FvtVPeXAC93k4/MTuVmEY/ZdoVF8Wd1urqSEqFMO232cI7Vl1Sn0ia0tUIBjqyICfrpI7Lz0YCSJA/FZJoyetEuV4Sl+5BaM3OajfHZUGvCPdV95e/4iir+sCunDz6n+dYw/KHq6bVoRwVCkggF6OJpY+QIgbZkh1UJ6NLR9rjMqwVSu0RgOQ==|920
\ No newline at end of file
+}//yEgkSTF/WhFJGr8FNpArBgtNri4KdUpRBliuPxAhUUimaY4Ve3YEKDOHS8NBcd+2bOrIjfPjFlUpKLc/sNPzG3W9rTkLQMcO/B6cf5mEM90EF2KIKoXnYjRMLYYMzys2Vv5iKQQfT2Erghhq1YSslmVEy0+UG4LT1SqFVAqaW/Ifv+eUjcVv+ZosKDURkFVaUqldvODSQOGpqnqkFria2LEDFKaYsFEJB2sEJrqxJl+bidwZTHY8/kmtWqhy+MXnoxFRJ6PAbTJ5T0S+AGKmKN1cB9hYEX+z17b9oouHL3YoQyA/JwVW7D/93Zijsz8aEG7vY8UBg25kkq1iM7XHVpOgNJnV2v2DezEvBVv80dFZcA5rSRdg9pNjhfiKJ+fqiGirQaLzT2hJVqJwyODBBrKy5kcO5esq1TnSSA+t3rylMJm6z+LBgg/As/TR7mCR4bOFQ9m2Y06SwEUGnhzZdFhntzjjxcQXoxSgeVNRy+knFrVHfOXLg9asbktKBWDtIixSwnao6YALu+fKuZozmDSNcRWe8GcQCKUmynhzhGdlHjMJlFUuIHD1PRIE9Q7aFFWM+5nU43ChF8VPtrkPVKB5gonHDINAyPCU8e/r7jAUTkaemXHWUOeN1Dm8Z2Ok71AQ04KXSPWD2SpnlXqXV9aEgPilqtHQcaUdFey/UJDlAaK75Ixy4AD7dUTAFwtT62teoyE5IWh5neVzH64dNI57kYSuMgS5e8bNbgUwlZFkf8Rrnr5uC3XieRZU52QP2QeRgpiA3aOFqg0AQBUxN2ckYxZBqk1gCwIaBWJOuxNzwQXN92dy+DnRxrwMzt1Gzgr0B3rsdMooCS2lHxWX9p0fmVIRmzfAlastMTKsuXUHiPyczfbXuzyRHPZZEKvDDBaiutrYXZrAPmq7sSU/0Q==|920
\ No newline at end of file
diff --git a/Pages/任务/任务首页.json b/Pages/任务/任务首页.json
index 95da21dd..93eb9b4c 100644
--- a/Pages/任务/任务首页.json
+++ b/Pages/任务/任务首页.json
@@ -1,19 +1,27 @@
{
"Rows": {
"RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
+ }
+ },
"1": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0,
- "IsHidden": true
+ "DesignLengthInPixel": 40.0
}
},
"2": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0,
- "IsHidden": true
+ "DesignLengthInPixel": 16.0
}
},
"3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 16.0
+ }
+ },
+ "4": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 807.0,
"Mode": 2,
@@ -25,15 +33,9 @@
}
}
},
- "4": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
- }
- },
"5": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0,
- "IsHidden": true
+ "DesignLengthInPixel": 15.0
}
},
"6": {
@@ -41,16 +43,21 @@
"DesignLengthInPixel": 32.0,
"IsHidden": true
}
+ },
+ "7": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "IsHidden": true
+ }
}
},
"InLogicalVisibleIndexes": [
- 1,
- 2,
- 5,
- 6
+ 6,
+ 7,
+ 8
],
- "Count": 7,
- "DefaultSize": 15.0
+ "Count": 9,
+ "DefaultSize": 32.0
},
"Cols": {
"RowColumnAttachedInfos": {
@@ -116,16 +123,6 @@
"DesignLengthInPixel": 32.0
}
},
- "11": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "12": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
"13": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
@@ -161,12 +158,12 @@
"DesignLengthInPixel": 32.0
}
},
- "22": {
+ "20": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
},
- "23": {
+ "21": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
@@ -178,37 +175,103 @@
},
"25": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 16.0
+ "DesignLengthInPixel": 32.0
}
},
"26": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ },
+ "27": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "28": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 16.0
+ }
+ },
+ "29": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 16.0
+ }
+ },
+ "30": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 400.0
}
+ },
+ "31": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 16.0
+ }
}
},
- "Count": 27,
+ "Count": 32,
"DefaultSize": 32.0
},
"Values": {
- "0,26": "任务-侧栏",
- "1,22": "审批历史",
- "3,0": "任务部分",
- "5,3": "任务ID：",
- "5,7": "项目ID：",
- "5,15": "参与人数：",
- "5,19": false,
- "5,23": true,
- "6,1": "工时分配方式：",
- "6,7": "总计划工时：",
- "6,13": "流程ID"
+ "0,30": "任务-侧栏",
+ "3,30": "任务-侧栏",
+ "4,0": "任务部分",
+ "6,3": "任务ID：",
+ "6,7": "项目ID：",
+ "6,17": "参与人数：",
+ "6,21": false,
+ "6,25": true,
+ "7,1": "工时分配方式：",
+ "7,7": "总计划工时：",
+ "7,15": "流程ID",
+ "7,23": "刷新任务"
+ },
+ "Formulas": {
+ "1,27": "IF(收起侧栏,AB8,Z8)"
},
"AttachInfos": {
- "0,26": {
+ "0,30": {
"CellType": {
- "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon",
- "PageName": "任务-侧栏",
- "OverflowMode": 1
+ "$type": "ElementUI.TabHeader, ElementUI",
+ "ClickCommand": {
+ "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务首页!AE4"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务首页!页签值"
+ }
+ }
+ ]
+ }
+ ],
+ "ParamProperties": {
+ "itemIndex": "页签编号",
+ "itemValue": "页签值",
+ "itemText": "页签标题"
+ }
+ },
+ "DefaultValue": "任务-侧栏",
+ "Tabs": [
+ {
+ "Value": "任务-侧栏",
+ "Name": "评论"
+ },
+ {
+ "Value": "FGC_审批记录",
+ "Name": "审批"
+ }
+ ],
+ "type": "default",
+ "position": "top",
+ "stretch": true
}
},
"1,1": {
@@ -217,7 +280,70 @@
"PreCommands": [
{
"$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
- "Title": "加载中"
+ "Title": "加载中",
+ "VBalidate": true
+ },
+ {
+ "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
+ "ServerCommandName": "任务发起流程前校验",
+ "Parameters": [
+ {
+ "$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.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=任务首页!code"
+ }
+ ]
+ },
+ "value": "0",
+ "compareType": 1
+ },
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "FourStandardStyle": "failure",
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务首页!msg"
+ }
+ },
+ {
+ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+ "FunctionName": "remove",
+ "Title": "加载中",
+ "VBalidate": true
+ },
+ {
+ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon"
+ }
+ ],
+ "ID": "b3c6a9fb-0b26-4812-ac25-705a121e5dd6"
+ }
+ ]
}
],
"PostCommands": [
@@ -244,61 +370,263 @@
]
}
},
- "1,22": {
+ "1,13": {
+ "CssName": "toolbar toolbar-right ",
"CellType": {
- "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
- "CommandList": [
+ "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu",
+ "TemplateKey": "横向迷你菜单",
+ "Items": [
{
- "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
- "PopupDisplayMode": 4,
- "DrawerDirection": 3,
- "ShowDrawerHeader": true,
- "PageName": "FGC_审批记录"
+ "Value": "菜单1",
+ "Text": "刷新任务",
+ "IconPath": "Application/057_refresh_1.svg",
+ "SelectedIconColor": "Background 1",
+ "SelectedIconColorUseItemColor": true,
+ "IconColorUseItemColor": true,
+ "IsOldMenuPath": false,
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+ "TargetPageElement": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务首页!刷新任务"
+ },
+ "TargetType": "Forguncy.ButtonCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115",
+ "MethodName": "ExecuteCommand"
+ }
+ ],
+ "CanVisitRoleList": [
+ "FGC_LoginUser"
+ ]
+ },
+ {
+ "Value": "展开/收起全部",
+ "Text": "展开/收起全部",
+ "IconPath": "查看.svg",
+ "IsBuiltInIconPath": false,
+ "SelectedIconColor": "Background 1",
+ "SelectedIconColorUseItemColor": true,
+ "IconColor": "Accent 1",
+ "IconColorUseItemColor": true,
+ "IsOldMenuPath": false,
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务首页!折叠全部"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=NOT(任务首页!折叠全部)"
+ }
+ }
+ ]
+ }
+ ],
+ "CanVisitRoleList": [
+ "FGC_LoginUser"
+ ]
+ },
+ {
+ "Value": "发起流程",
+ "Text": "发起流程",
+ "IconPath": "Application/156_processCentre_1.svg",
+ "SelectedIconColor": "Background 1",
+ "SelectedIconColorUseItemColor": true,
+ "IconColorUseItemColor": true,
+ "IsOldMenuPath": false,
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
+ "tableData": {
+ "TableName": "任务表",
+ "ColumnName": "流程实例ID",
+ "GUID": "66961b79-4deb-42be-9f09-3ce48aa2bf8e"
+ }
+ },
+ "value": "%Null%",
+ "compareType": 1
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "PopupDisplayMode": 3,
+ "DrawerDirection": 3,
+ "ShowDrawerHeader": true,
+ "PageName": "FGC_审批记录"
+ }
+ ],
+ "ID": "a2314d6f-f2a3-4d3f-8491-88aa19237d55"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
+ "ServerCommandName": "发起任务流程",
+ "Parameters": [
+ {
+ "$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.OperateCellTypeCommand, ServerDesignerCommon",
+ "TargetPageElement": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务首页!刷新任务"
+ },
+ "TargetType": "Forguncy.ButtonCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115",
+ "MethodName": "ExecuteCommand"
+ },
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=任务首页!code"
+ }
+ ]
+ },
+ "value": "0"
+ },
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务首页!msg"
+ }
+ }
+ ],
+ "ID": "0263d36e-0ce8-4d6b-9c04-be2685f3d372"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "FourStandardStyle": "failure",
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务首页!msg"
+ }
+ }
+ ],
+ "ID": "18a43a66-b8e0-42f3-ad21-3ec1e374e38f"
+ }
+ ]
+ }
+ ],
+ "ID": "20a8ac8e-d144-4b8c-b460-67a01c316a91"
+ }
+ ]
+ }
+ ],
+ "CanVisitRoleList": [
+ "FGC_LoginUser"
+ ]
}
],
- "Text": "审批历史",
- "TemplateKey": "链接样式",
- "Icon": {
- "Name": "Application/156_processCentre_1.svg",
- "BuiltIn": true,
- "Color": "Background 1",
- "UseCellTypeForeColor": true
- },
- "IconSize": 14.0
- },
- "RulesGuidList": [
- "083ef244-f290-450a-aec4-bca83595e44a"
- ]
+ "Orientation": 0,
+ "MenuLevelsStyle": [
+ {
+ "FontSize": 13.333333333333332,
+ "Bold": false,
+ "Height": 32.0,
+ "IconHeight": 14.0,
+ "IconWidth": 14.0
+ }
+ ]
+ }
},
- "3,0": {
+ "1,27": {
+ "CellType": {
+ "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务首页!收起侧栏"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=NOT(任务首页!收起侧栏)"
+ }
+ }
+ ]
+ }
+ ],
+ "ToolTip": "展开",
+ "Size": 14,
+ "ImagePath": "展开1.svg",
+ "UseCellForeColor": true
+ }
+ },
+ "3,30": {
+ "CellType": {
+ "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon",
+ "PageName": "任务-侧栏",
+ "OverflowMode": 1
+ }
+ },
+ "4,0": {
"CellType": {
"$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon",
"PageName": "任务部分",
"OverflowMode": 1
}
},
- "5,4": {
+ "6,4": {
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "ID",
"GUID": "2c5a4904-3a02-4c35-9080-be6d81c7674b"
}
},
- "5,10": {
+ "6,10": {
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "ID",
"GUID": "83e8051b-34cd-41da-a2b4-9699687b73bd"
}
},
- "5,16": {
+ "6,18": {
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "参与人数",
"GUID": "dd68b5dc-2111-47fc-92e0-c24293bc5265"
}
},
- "5,19": {
+ "6,21": {
"CellType": {
"$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
"Caption": "收起侧栏",
@@ -310,11 +638,11 @@
{
"Location": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务首页!AA:AA"
+ "SerializeProperty": "=任务首页!AD:AE"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=NOT(任务首页!T6)"
+ "SerializeProperty": "=NOT(任务首页!V7)"
}
}
]
@@ -322,7 +650,7 @@
]
}
},
- "5,23": {
+ "6,25": {
"CellType": {
"$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
"CellDefaultValue": true,
@@ -397,7 +725,7 @@
]
}
},
- "6,4": {
+ "7,4": {
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "项目ID",
@@ -409,14 +737,14 @@
}
}
},
- "6,10": {
+ "7,10": {
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "总计划工时",
"GUID": "66115867-4c74-4e00-9197-9b03a2a24e92"
}
},
- "6,16": {
+ "7,18": {
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "流程实例ID",
@@ -442,14 +770,52 @@
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务首页!Q7"
+ "SerializeProperty": "=任务首页!流程ID"
}
}
+ },
+ {
+ "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand",
+ "CurrentRowInfo": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "ACT_HI_TASKINST_View",
+ "ColumnName": "PROC_INST_ID_",
+ "GUID": "52a1aa00-cef1-43ab-a810-4843bee71872"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务首页!流程ID"
+ }
+ },
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "ACT_HI_TASKINST_View",
+ "ColumnName": "ASSIGNEE_",
+ "GUID": "2a1525c1-8090-40da-91c9-1b0b1ce447f2"
+ },
+ "Value": "%CurrentUser.UserName%"
+ }
+ ]
+ }
+ },
+ {
+ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+ "TargetPageElement": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务首页!B2"
+ },
+ "TargetType": "Forguncy.ProcessPanelCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115",
+ "MethodName": "Refresh"
}
]
}
},
- "6,19": {
+ "7,21": {
"CellType": {
"$type": "Forguncy.ImageCellType, ServerDesignerCommon",
"ToolTip": "展开",
@@ -458,7 +824,7 @@
"UseCellForeColor": true
}
},
- "6,22": {
+ "7,22": {
"CellType": {
"$type": "Forguncy.ImageCellType, ServerDesignerCommon",
"ToolTip": "折叠",
@@ -466,40 +832,119 @@
"ImagePath": "收起2.svg",
"UseCellForeColor": true
}
+ },
+ "7,23": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+ "Title": "加载中"
+ },
+ {
+ "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon",
+ "JavaScript": "Forguncy.Page.recalc();\r\nForguncy.Page.reloadBindingData();\r\n",
+ "ID": "8e45cfc63efd4a619b60ffad6e35ec0e"
+ },
+ {
+ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+ "TargetPageElement": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务首页!B2"
+ },
+ "TargetType": "Forguncy.ProcessPanelCellType, ServerDesignerCommon, Version=10.0.3.0, Culture=neutral, PublicKeyToken=967100671921c115",
+ "MethodName": "Refresh"
+ },
+ {
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "Message": "刷新成功"
+ },
+ {
+ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+ "FunctionName": "remove",
+ "Title": "加载中"
+ }
+ ],
+ "Text": "刷新任务",
+ "TemplateKey": "_RS_Success3"
+ }
+ },
+ "7,25": {
+ "CellType": {
+ "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "ToolTip": "展开",
+ "Size": 14,
+ "ImagePath": "展开1.svg",
+ "UseCellForeColor": true
+ }
+ },
+ "7,27": {
+ "CellType": {
+ "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "ToolTip": "展开",
+ "Size": 14,
+ "ImagePath": "收起.svg",
+ "UseCellForeColor": true
+ }
}
},
"StyleDatas": {
"Styles": [
+ {
+ "BorderRight": 0
+ },
{
"Background": null,
- "FontFamily": 0,
- "FontSize": 14.67,
- "BorderLeft": 0
+ "FontFamily": 1,
+ "FontSize": 14.67
},
{
"FontSize": 16.0
},
{
- "FontFamily": 0,
+ "FontFamily": 1
+ },
+ {
+ "FontFamily": 1,
"FontSize": 13.333333333333332,
"Foreground": 2
},
{
- "FontFamily": 0,
- "FontSize": 13.333333333333332
+ "Foreground": 3,
+ "HorizontalAlignment": 4
},
{
- "FontFamily": 0,
+ "FontFamily": 1,
+ "FontSize": 13.333333333333332,
+ "Foreground": 3,
+ "BorderRight": 0
+ },
+ {
+ "FontFamily": 1,
"FontSize": 13.333333333333332,
"Foreground": 3
},
{
- "BorderLeft": 0
+ "FontFamily": 1,
+ "BorderBottom": 0
+ },
+ {
+ "BorderBottom": 0
+ },
+ {
+ "FontFamily": 1,
+ "BorderBottom": 0,
+ "BorderRight": 0
+ },
+ {
+ "FontFamily": 1,
+ "BorderRight": 0
},
{
"Background": null,
- "FontFamily": 0,
- "FontSize": 14.67
+ "FontFamily": 1,
+ "FontSize": 14.67,
+ "BorderRight": 0
},
{
"FontSize": 13.333333333333332,
@@ -507,26 +952,26 @@
},
{
"Background": 5,
- "FontFamily": 0,
+ "FontFamily": 1,
"BorderTop": 1,
"BorderLeft": 1,
"BorderRight": 1
},
{
- "FontFamily": 0,
+ "FontFamily": 1,
"BorderTop": 1,
"BorderLeft": 1,
"BorderRight": 1
},
{
- "FontFamily": 0,
+ "FontFamily": 1,
"FontSize": 13.333333333333332,
"HorizontalAlignment": 4,
"BorderLeft": 1
},
{
"Background": 5,
- "FontFamily": 0,
+ "FontFamily": 1,
"BorderBottom": 1,
"BorderTop": 1,
"BorderLeft": 1
@@ -536,41 +981,51 @@
"BorderTop": 1
},
{
- "FontFamily": 0
- },
- {
- "FontFamily": 0,
+ "FontFamily": 1,
"FontSize": 13.333333333333332,
"Formatter": 7,
"HorizontalAlignment": 4
},
+ {
+ "FontFamily": 1,
+ "FontSize": 13.333333333333332,
+ "Formatter": 7,
+ "HorizontalAlignment": 4,
+ "BorderRight": 0
+ },
{
"FontSize": 12.0
},
{
"Background": 5,
- "FontFamily": 0
+ "FontFamily": 1
},
{
"Background": 5,
- "FontFamily": 0,
+ "FontFamily": 1,
"Formatter": 8
},
{
- "FontFamily": 0,
+ "FontFamily": 1,
"FontSize": 13.333333333333332,
"Foreground": 9,
"Formatter": 7,
"HorizontalAlignment": 10
},
+ {
+ "FontFamily": 1,
+ "FontSize": 13.333333333333332,
+ "Formatter": 7,
+ "HorizontalAlignment": 10
+ },
{
"Background": null
}
],
"Types": {
"Strs": [
+ "Background 1 -15",
"Body",
- "Background 2 -10",
"Accent 3 0",
"Text 1 50",
"Right",
@@ -583,7 +1038,7 @@
],
"Borders": [
{
- "Color": 1
+ "Color": 0
},
{
"Color": 6
@@ -591,95 +1046,165 @@
]
},
"CellStyles": {
- "0,26": 0,
- "1,1": 1,
- "1,22": 2,
- "1,23": 3,
- "1,24": 3,
- "1,25": 4,
- "1,26": 5,
- "2,26": 5,
- "3,0": 6,
- "3,25": 6,
- "3,26": 5,
- "4,0": 6,
- "4,1": 6,
- "4,2": 6,
- "4,3": 6,
- "4,4": 6,
- "4,5": 6,
- "4,6": 6,
- "4,7": 6,
- "4,8": 6,
- "4,9": 6,
- "4,10": 6,
- "4,11": 6,
- "4,12": 6,
- "4,13": 6,
- "4,14": 6,
- "4,15": 6,
- "4,16": 6,
- "4,17": 6,
- "4,18": 6,
- "4,19": 6,
- "4,20": 6,
- "4,21": 6,
- "4,22": 6,
- "4,23": 6,
- "4,24": 6,
- "4,25": 6,
- "5,3": 7,
- "5,4": 8,
- "5,5": 9,
- "5,6": 9,
- "5,7": 10,
- "5,10": 11,
- "5,11": 12,
- "5,12": 12,
- "5,14": 13,
- "5,15": 14,
- "5,16": 11,
- "5,17": 12,
- "5,25": 14,
- "6,1": 15,
- "6,4": 11,
- "6,5": 12,
- "6,6": 12,
- "6,7": 10,
- "6,8": 13,
- "6,9": 13,
- "6,10": 16,
- "6,16": 17,
+ "0,28": 0,
+ "0,30": 1,
+ "0,31": 1,
+ "1,1": 2,
+ "1,13": 3,
+ "1,26": 4,
+ "1,27": 5,
+ "1,28": 6,
+ "1,29": 7,
+ "1,31": 1,
+ "2,0": 8,
+ "2,1": 9,
+ "2,2": 9,
+ "2,3": 9,
+ "2,4": 9,
+ "2,5": 9,
+ "2,6": 9,
+ "2,7": 9,
+ "2,8": 9,
+ "2,9": 9,
+ "2,10": 9,
+ "2,11": 9,
+ "2,12": 9,
+ "2,13": 9,
+ "2,14": 9,
+ "2,15": 9,
+ "2,16": 9,
+ "2,17": 9,
+ "2,18": 9,
+ "2,19": 9,
+ "2,20": 9,
+ "2,21": 9,
+ "2,22": 9,
+ "2,23": 8,
+ "2,24": 8,
+ "2,25": 8,
+ "2,26": 9,
+ "2,27": 9,
+ "2,28": 10,
+ "2,29": 3,
+ "3,0": 3,
+ "3,23": 3,
+ "3,24": 3,
+ "3,25": 3,
+ "3,28": 11,
+ "3,29": 3,
+ "3,30": 3,
+ "3,31": 3,
+ "4,0": 1,
+ "4,28": 12,
+ "4,29": 1,
+ "4,31": 3,
+ "5,0": 1,
+ "5,1": 1,
+ "5,2": 1,
+ "5,3": 1,
+ "5,4": 1,
+ "5,5": 1,
+ "5,6": 1,
+ "5,7": 1,
+ "5,8": 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,17": 1,
+ "5,18": 1,
+ "5,19": 1,
+ "5,20": 1,
+ "5,21": 1,
+ "5,22": 1,
+ "5,23": 1,
+ "5,24": 1,
+ "5,25": 1,
+ "5,26": 1,
+ "5,27": 1,
+ "5,28": 12,
+ "5,29": 1,
+ "6,3": 13,
+ "6,4": 14,
+ "6,5": 15,
+ "6,6": 15,
+ "6,7": 16,
+ "6,10": 17,
+ "6,11": 18,
+ "6,12": 18,
+ "6,13": 18,
+ "6,14": 18,
+ "6,16": 3,
+ "6,17": 19,
+ "6,18": 17,
"6,19": 18,
- "6,20": 18,
- "6,21": 18,
- "6,22": 18,
- "6,25": 14
+ "6,28": 20,
+ "6,29": 19,
+ "7,1": 21,
+ "7,4": 17,
+ "7,5": 18,
+ "7,6": 18,
+ "7,7": 16,
+ "7,8": 3,
+ "7,9": 3,
+ "7,10": 22,
+ "7,18": 23,
+ "7,21": 24,
+ "7,22": 24,
+ "7,23": 25,
+ "7,25": 3,
+ "7,26": 3,
+ "7,27": 3,
+ "7,28": 20,
+ "7,29": 19,
+ "8,9": 3,
+ "8,10": 3,
+ "8,11": 3,
+ "8,12": 3,
+ "8,13": 3,
+ "8,14": 3,
+ "8,18": 23,
+ "8,19": 23,
+ "8,21": 24,
+ "8,22": 24,
+ "8,23": 25,
+ "8,24": 25,
+ "8,25": 3,
+ "8,26": 3,
+ "8,27": 3,
+ "8,28": 19,
+ "8,29": 19
},
"RowStyles": {
- "3": 19
+ "4": 26
},
"SheetStyle": {
- "FontFamily": 0
+ "FontFamily": 1
}
},
"Spans": [
- "5,4,1,3",
- "5,10,1,3",
- "5,16,1,2",
- "1,1,1,12",
- "3,0,1,26",
- "0,26,4,1",
- "5,19,1,4",
- "5,23,1,2",
"6,4,1,3",
- "6,1,1,3",
- "6,10,1,3",
- "5,7,1,3",
+ "6,10,1,5",
+ "6,18,1,2",
+ "6,21,1,4",
+ "6,25,1,3",
+ "7,4,1,3",
+ "7,1,1,3",
+ "7,10,1,5",
"6,7,1,3",
- "1,22,1,3",
- "6,13,1,3",
- "6,16,1,2"
+ "7,7,1,3",
+ "7,15,1,3",
+ "7,18,1,2",
+ "7,23,1,2",
+ "0,30,2,1",
+ "3,30,2,1",
+ "4,0,1,29",
+ "1,1,1,9",
+ "1,13,1,13"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -713,23 +1238,7 @@
"RowBreakLines": [],
"RepeatRangeSettings": [],
"ConditionFormatRulesCollection": {
- "Rules": [
- {
- "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
- "Formula": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务首页!$Q$7=\"\""
- },
- "GUID": "083ef244-f290-450a-aec4-bca83595e44a",
- "StyleInfo": {
- "Underline": null,
- "Strikethrough": null
- },
- "IsDisabled": false,
- "IsInvisible": true,
- "IsReadOnly": false
- }
- ]
+ "Rules": []
}
},
"PrintInfo": {
@@ -739,39 +1248,47 @@
"CustomNames": [
{
"Name": "参与人数",
- "Formula": "任务首页!$Q$6"
+ "Formula": "任务首页!$S$7"
},
{
"Name": "工时分配方式",
- "Formula": "任务首页!$E$7"
+ "Formula": "任务首页!$E$8"
},
{
"Name": "任务总计划工时",
- "Formula": "任务首页!$K$7"
+ "Formula": "任务首页!$K$8"
},
{
"Name": "任务ID",
- "Formula": "任务首页!$E$6"
+ "Formula": "任务首页!$E$7"
},
{
"Name": "上箭头",
- "Formula": "任务首页!$W$7"
+ "Formula": "任务首页!$W$8"
},
{
"Name": "收起侧栏",
- "Formula": "任务首页!$T$6"
+ "Formula": "任务首页!$V$7"
},
{
"Name": "下箭头",
- "Formula": "任务首页!$T$7"
+ "Formula": "任务首页!$V$8"
},
{
"Name": "项目ID",
- "Formula": "任务首页!$K$6"
+ "Formula": "任务首页!$K$7"
},
{
"Name": "折叠全部",
- "Formula": "任务首页!$X$6"
+ "Formula": "任务首页!$Z$7"
+ },
+ {
+ "Name": "刷新任务",
+ "Formula": "任务首页!$X$8"
+ },
+ {
+ "Name": "流程ID",
+ "Formula": "任务首页!$S$8"
}
]
-}//ardsBgBSWVNGDzr+nYFTVvhfOZzaqtlXI2Hilg5xnd5xl2OaWFlq1gUi1wsRdQ6ii5IlyfOgW4aMx9isYwsBzgzZKiYbztpAVf1224Q8ljSAPqmOVFSoFjFQ7EQnbVvmpvyyqwZCWdePqiQSB+USXw4YXZVqssknY3OV9OmkI44OtrVxedlTVOa+fFJ4LQbWh57P4Gu1mR0OyWZ4vxaX4qMEixYeknVV3kmHFynNfm3tE8hryb+QYHLG8OADSTGeZc8sixbbJ0mPNGPOLwIOL708vYSu32+g270kivqV11ApmXLPKFp8p1MlxsFnOreZfyYRybJNAPPRnfCfSxqODkrNs7/EoqkKp3+lUeAYdNWbzPE61QyxYzyH3tw+pVkEOUZXg0FUySvNVPT2fFsmNyZmZomrBhi8UJkfXtc9M9jszn2IDt1lqbenUl0AnrzcoBtVf7evziMRFEzOcVED2EIhcg05mP5klY+oNgNMbOmH4bbB6AuvemQ1kAJG/FXdD8h7qLo8miUxvtzFcLGMPDC9B6iWg59PCynIPgRm/ZBEstRFxvFtcHTGO1nb/6F4v8Me3GyueghGn/WYCYAPJy3KHvMzKCNhDcTWdj9NokddVreq8zfx2/Nr8umHmVoHdI3SdrEmAnq3HZ4nRCQSOGSz30sXZgnjCE6J/srT/vQ+J7yJPJJsSgllKMte3PY7CUFxcnSOj92Ipyhit7u5BpeQjCPg/SjvAHQRYUsdnfZKYwZPS/nY4IDughv7zYgETyA0Tqq64Qt+oXzAJ0/9c3gSWiDebQvrg1UNGk5X+hAkANUMSlqojNoRDuJeU9yDZe0zqildBxP4SmJdBGJ51gcaegwL+anIEdVHxZg2HgkeXpBUuf2DqOJFHVi2KGYtAWPH42+ZboZjtADfvWrnAg==|920
\ No newline at end of file
+}//aYvkPoJqE386TPNQ3/184Fm/GdGnrqEfCwOwgmlvinw0r3KKaovIDG/RuvrR5iQDAJkQ8S3YjuW4Aw2bsiOfnpzVfIUjsqZgCHMvcRydCmf782XQZV9CTVNGN11IQ7RB3ofLC1xXvh0A7ZORdste8XOF7Wg34vzy2MlddzQCXf9qnzuL9RQXdEula8nxlK2o8wzubCUcolIb6W82a0Olce+04Ecnf/teSyC8zNviUpser/nuogmih6XyTgbW088yY4uo9GnqiqU3S1YDSB3hB1rrCuQgWMWyowFzFsQADQw0I3HnYH2/+gFdvgNYRuN3MMpqLlVRoEzq5k7Om1LQh7A0C/RlKgRxqu4romccqVwj47Uli0hM6nTaoVnVt3SsVC3AXnYmxaBLh4lPDBLFSSEkO1zGPHsQMN7LjTWIFPR39k6UgYUeWw6MJovl0sDt3CkW3Ap4+Og1E8TjjITt7tSkPC9MmRBPBSC5vJs/Mg0wCd9l5lxBmKa+JraKBD4W7CNJ+HjuVpKYTmbZb6yJp8TUxQWWBztg1WvfCJVmynRCMVxhj0lbdnj2cN4j+rAB856NJeaiHnUMnfNdon1RXDuZjyq/esb2bzvny4oWOSTfAHwj4fJbABaElDbbtGt73h2NHEyuxxCc2nOTWfQq1H3yfcEMMuqlZvNemBmZWi/TXfqz5DymuIUtaWsmDafcFoJk02X1pcdUsCfmp4lWNrTvocthlRXUBeygZdh6KC9TpIChSy1wMTp9fzQts5PerQ5fWZOYXBCtGBkIoDYRPFGurrx5KRp074OxKH1DyKuPNtN08h0GjcQ/tQ7Kwq1ayCwxCN4mQUKFBWg6RxE6LOtkFvMrR9aYNE2yQ636jqsAproIDbv94/9vRZPdLgG8fwgNQmeY9ccOb7ugHXDuYQ==|920
\ No newline at end of file
diff --git a/Pages/任务/任务首页.rd b/Pages/任务/任务首页.rd
index 99575ef9..eaf58c45 100644
--- a/Pages/任务/任务首页.rd
+++ b/Pages/任务/任务首页.rd
@@ -1,43 +1,54 @@
{
"PageType": 0,
- "ColumnCount": 27,
- "RowCount": 7,
+ "ColumnCount": 32,
+ "RowCount": 9,
+ "Formulas": {
+ "1,27": "IF(收起侧栏,AB8,Z8)"
+ },
"CustomNames": [
{
"Name": "参与人数",
- "Formula": "任务首页!$Q$6"
+ "Formula": "任务首页!$S$7"
},
{
"Name": "工时分配方式",
- "Formula": "任务首页!$E$7"
+ "Formula": "任务首页!$E$8"
},
{
"Name": "任务总计划工时",
- "Formula": "任务首页!$K$7"
+ "Formula": "任务首页!$K$8"
},
{
"Name": "任务ID",
- "Formula": "任务首页!$E$6"
+ "Formula": "任务首页!$E$7"
},
{
"Name": "上箭头",
- "Formula": "任务首页!$W$7"
+ "Formula": "任务首页!$W$8"
},
{
"Name": "收起侧栏",
- "Formula": "任务首页!$T$6"
+ "Formula": "任务首页!$V$7"
},
{
"Name": "下箭头",
- "Formula": "任务首页!$T$7"
+ "Formula": "任务首页!$V$8"
},
{
"Name": "项目ID",
- "Formula": "任务首页!$K$6"
+ "Formula": "任务首页!$K$7"
},
{
"Name": "折叠全部",
- "Formula": "任务首页!$X$6"
+ "Formula": "任务首页!$Z$7"
+ },
+ {
+ "Name": "刷新任务",
+ "Formula": "任务首页!$X$8"
+ },
+ {
+ "Name": "流程ID",
+ "Formula": "任务首页!$S$8"
}
]
}
\ No newline at end of file
diff --git a/Pages/任务/新增任务.json b/Pages/任务/新增任务.json
index cacb4f63..4561f44e 100644
--- a/Pages/任务/新增任务.json
+++ b/Pages/任务/新增任务.json
@@ -33,85 +33,70 @@
},
"6": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 24.0
}
},
"7": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
+ "DesignLengthInPixel": 24.0
}
},
"8": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
+ "DesignLengthInPixel": 32.0
}
},
"9": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0
+ "DesignLengthInPixel": 35.0
}
},
"10": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 15.0
}
},
"11": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
+ "DesignLengthInPixel": 32.0
}
},
"12": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 35.0
}
},
"13": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 15.0
}
},
"14": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
+ "DesignLengthInPixel": 32.0
}
},
"15": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 35.0
}
},
"16": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 15.0
}
},
"17": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 35.0
+ "DesignLengthInPixel": 32.0
}
},
"18": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
- }
- },
- "19": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "20": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 35.0
}
},
- "24": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "25": {
+ "22": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0,
"IsHidden": true
@@ -119,9 +104,9 @@
}
},
"InLogicalVisibleIndexes": [
- 25
+ 22
],
- "Count": 26,
+ "Count": 23,
"DefaultSize": 32.0
},
"Cols": {
@@ -203,17 +188,12 @@
},
"15": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 16.0
+ "DesignLengthInPixel": 24.0
}
},
"16": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "17": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 24.0
}
},
"18": {
@@ -221,54 +201,71 @@
"DesignLengthInPixel": 32.0
}
},
- "19": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0,
- "IsHidden": true
- }
- },
"20": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 24.0,
- "IsHidden": true
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "21": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
}
},
"22": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 346.0
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "23": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "24": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "25": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "26": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
}
}
},
- "Count": 26,
+ "Count": 30,
"DefaultSize": 32.0
},
"Values": {
- "1,21": "任务说明",
- "1,23": "编辑",
+ "1,17": "任务说明",
+ "1,27": "编辑",
+ "3,13": false,
"5,1": "任务执行人",
"5,5": "%CurrentUser.UserName%",
- "7,1": "任务成员",
- "10,1": "计划日期",
- "13,1": "所属项目",
- "13,9": "任务分组",
- "13,17": "添加",
- "13,21": "备注",
- "13,23": "编辑",
- "16,1": "任务类型",
- "16,9": "任务版本",
- "16,17": "添加",
- "19,1": "预算工时",
- "23,1": false,
- "23,12": "取消",
- "23,16": "提交"
+ "8,1": "计划日期",
+ "11,1": "所属项目",
+ "11,9": "任务分组",
+ "11,13": "添加",
+ "11,17": "备注",
+ "11,27": "编辑",
+ "14,1": "任务类型",
+ "14,9": "任务版本",
+ "14,13": "添加",
+ "17,1": "预算工时",
+ "20,22": "关闭",
+ "20,26": "提交"
},
"Formulas": {
- "1,1": "IFERROR(\"所属任务：\"&ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")",
- "11,1": "J26&\",\"&M26",
- "23,1": "项目是否开启反馈收集"
+ "3,13": "项目是否开启反馈收集",
+ "9,1": "J23&\",\"&M23",
+ "1,1": "IFERROR(\"所属任务：\"&ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")"
},
"AttachInfos": {
- "1,23": {
+ "1,27": {
"CellType": {
"$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
"CommandList": [
@@ -280,7 +277,7 @@
{
"Source": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!V4"
+ "SerializeProperty": "=新增任务!R4"
},
"TargetCell": {
"SerializeProperty": "=MD编辑器!编辑器"
@@ -331,7 +328,17 @@
"IgnoreBlank": false
}
},
- "3,21": {
+ "3,13": {
+ "CellType": {
+ "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
+ "Caption": "公开",
+ "Style": 1
+ },
+ "RulesGuidList": [
+ "d04a43e1-1794-4325-8b78-0c1d63a8f074"
+ ]
+ },
+ "3,17": {
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "关联资源",
@@ -427,107 +434,7 @@
"IgnoreBlank": false
}
},
- "7,5": {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "参与人列表",
- "GUID": "03579a4d-765f-4162-a2d0-df23104e9868"
- },
- "CellType": {
- "$type": "ElementUI.SelectCellType, ElementUI",
- "CommandList": [],
- "UIPermissions": [
- {
- "Scope": 2,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- },
- {
- "Scope": 1,
- "AllowRoles": [
- "FGC_Anonymous"
- ]
- }
- ],
- "useBinding": true,
- "options": [
- {
- "value": "黄金糕",
- "label": "黄金糕"
- },
- {
- "value": "双皮奶",
- "label": "双皮奶"
- },
- {
- "value": "蚵仔煎",
- "label": "蚵仔煎"
- },
- {
- "value": "龙须面",
- "label": "龙须面"
- },
- {
- "value": "北京烤鸭",
- "label": "北京烤鸭"
- }
- ],
- "bindingOptions": {
- "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
- "TableName": "项目成员表",
- "BindingInfos": [
- {
- "GUID": "305c57fe-535d-43a1-bc1c-5bfabd1bddad",
- "BindingInfo": {
- "TableName": "项目成员表",
- "ColumnName": "ID",
- "GUID": "97355a2f-5dda-4fc3-8c22-221502b2e4d2"
- },
- "ColumnName": "value"
- },
- {
- "GUID": "af412e41-00dc-4332-8e5f-cfae6481d72f",
- "BindingInfo": {
- "TableName": "项目成员表",
- "ColumnName": "项目成员",
- "GUID": "1233b94b-b2b3-4ea0-a489-7dffcaf49d3d",
- "AttachType": {
- "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
- "UserColumnAttachType": 1
- }
- },
- "ColumnName": "label"
- }
- ],
- "SqlCondition": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "项目成员表",
- "ColumnName": "项目ID",
- "GUID": "234f88d3-398d-4e82-8f9d-21b7339b6fb2"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!项目ID"
- }
- },
- "CustomColumns": []
- },
- "placeholder": "请选择",
- "noDataText": "无数据",
- "multiple": true,
- "collapseTags": true,
- "filterable": true,
- "filterInServerOptions": {
- "matchMethod": "contains",
- "loadingText": "加载中"
- },
- "noMatchText": "无匹配数据",
- "clearable": true
- }
- },
- "11,1": {
+ "9,1": {
"CellType": {
"$type": "ElementUI.DatePickerCellType, ElementUI",
"CommandList": [
@@ -535,16 +442,16 @@
"$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
"TargetPageElement": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!B12"
+ "SerializeProperty": "=新增任务!B10"
},
"TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
"MethodName": "GetSelectedRange",
"RetrunParamNames": {
"StartValue": {
- "SerializeProperty": "=新增任务!J26"
+ "SerializeProperty": "=新增任务!J23"
},
"EndValue": {
- "SerializeProperty": "=新增任务!M26"
+ "SerializeProperty": "=新增任务!M23"
}
}
}
@@ -578,7 +485,7 @@
"DefautWeekFormat": "yyyy 第 WW 周"
}
},
- "13,17": {
+ "11,13": {
"CellType": {
"$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
"CommandList": [
@@ -607,13 +514,13 @@
"$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
"TargetPageElement": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!J15"
+ "SerializeProperty": "=新增任务!J13"
},
"TargetType": "ElementUI.SelectCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
"MethodName": "ReloadBindingItems"
}
],
- "ID": "cb170c63-2a60-418e-87ca-be45e0d34111"
+ "ID": "51f17049-559a-4d3b-9bb0-3bbae6c93bda"
}
]
}
@@ -642,7 +549,7 @@
"TemplateKey": "_RS_Main"
}
},
- "13,23": {
+ "11,27": {
"CellType": {
"$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
"CommandList": [
@@ -654,7 +561,7 @@
{
"Source": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!V15"
+ "SerializeProperty": "=新增任务!R13"
},
"TargetCell": {
"SerializeProperty": "=MD编辑器!编辑器"
@@ -668,7 +575,7 @@
"TemplateKey": "_RS_Main"
}
},
- "14,1": {
+ "12,1": {
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "项目ID",
@@ -745,14 +652,13 @@
"matchMethod": "contains",
"loadingText": "加载中"
},
- "noMatchText": "无匹配数据",
- "IsDisabled": true
+ "noMatchText": "无匹配数据"
},
"DataValidationInfo": {
"IgnoreBlank": false
}
},
- "14,9": {
+ "12,9": {
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "分组ID",
@@ -844,7 +750,7 @@
"noMatchText": "无匹配数据"
}
},
- "14,21": {
+ "12,17": {
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "备注",
@@ -856,7 +762,7 @@
"ReadOnly": true
}
},
- "16,17": {
+ "14,13": {
"CellType": {
"$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
"CommandList": [
@@ -885,13 +791,13 @@
"$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
"TargetPageElement": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!J18"
+ "SerializeProperty": "=新增任务!J16"
},
"TargetType": "ElementUI.SelectCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
"MethodName": "ReloadBindingItems"
}
],
- "ID": "27bde735-8d7c-4b5f-b572-22481611bfda"
+ "ID": "d0347c44-cd37-4b40-8136-4bf6907a8c0f"
}
]
}
@@ -920,7 +826,7 @@
"TemplateKey": "_RS_Main"
}
},
- "17,1": {
+ "15,1": {
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "任务类型",
@@ -1003,7 +909,7 @@
"IgnoreBlank": false
}
},
- "17,9": {
+ "15,9": {
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "版本",
@@ -1094,11 +1000,9 @@
},
"noMatchText": "无匹配数据"
},
- "DataValidationInfo": {
- "IgnoreBlank": false
- }
+ "DataValidationInfo": {}
},
- "20,1": {
+ "18,1": {
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "任务预算工时",
@@ -1133,17 +1037,7 @@
"IgnoreBlank": false
}
},
- "23,1": {
- "CellType": {
- "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
- "Caption": " 在反馈中显示",
- "Style": 1
- },
- "RulesGuidList": [
- "d04a43e1-1794-4325-8b78-0c1d63a8f074"
- ]
- },
- "23,12": {
+ "20,22": {
"CellType": {
"$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
"CommandList": [
@@ -1151,166 +1045,39 @@
"$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon"
}
],
- "Text": "取消",
+ "Text": "关闭",
"TemplateKey": "_RS_Information3"
}
},
- "23,16": {
+ "20,26": {
"CellType": {
"$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
"CommandList": [
{
- "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
- "Title": "加载中",
- "VBalidate": true
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "任务表",
+ "UpdateType": "add",
+ "ShowConfirm": false,
+ "UpdateBindingValues": [
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "任务状态",
+ "GUID": "9b8c535f-08bc-4e52-85f8-6b9a1d248ac8"
+ },
+ "Value": "0"
+ }
+ ]
},
{
- "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
- "TargetPageElement": {
+ "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon",
+ "ProcessDefinitionResourceName": "新增任务流程",
+ "ProcessInstanceName": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!B12"
+ "SerializeProperty": "=新增任务!B4"
},
- "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
- "MethodName": "GetSelectedRange",
- "RetrunParamNames": {
- "StartValue": {
- "SerializeProperty": "开始日期"
- },
- "EndValue": {
- "SerializeProperty": "结束日期"
- }
- }
- },
- {
- "$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"
- }
- },
- {
- "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
- "ParamName": "任务标题",
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!B4"
- }
- },
- {
- "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
- "ParamName": "执行人",
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!F6"
- }
- },
- {
- "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
- "ParamName": "成员ID数组",
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!F8"
- }
- },
- {
- "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
- "ParamName": "开始日期",
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!开始日期"
- }
- },
- {
- "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
- "ParamName": "结束日期",
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!结束日期"
- }
- },
- {
- "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
- "ParamName": "任务分组",
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!J15"
- }
- },
- {
- "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
- "ParamName": "任务类型",
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!B18"
- }
- },
- {
- "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
- "ParamName": "任务版本",
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!J18"
- }
- },
- {
- "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
- "ParamName": "预算工时",
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!B21"
- }
- },
- {
- "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
- "ParamName": "任务说明",
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!V4"
- }
- },
- {
- "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
- "ParamName": "收集反馈",
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!B24"
- }
- },
- {
- "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
- "ParamName": "备注",
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!V15"
- }
- }
- ],
- "ResultErrorCodeTo": {
- "SerializeProperty": "code"
- },
- "ResultMessageTo": {
- "SerializeProperty": "msg"
- },
- "RefreshAfterFinish": true,
- "CheckDataValidation": true
- },
- {
- "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
- "FunctionName": "remove",
- "Title": "加载中"
+ "SelectedTable": "任务表",
+ "ReturnResultName": "发起流程结果"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -1322,41 +1089,53 @@
"$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
"cellLocations": [
{
- "SerializeProperty": "=新增任务!code"
+ "SerializeProperty": "=发起流程结果.ID"
}
]
},
- "value": "0"
+ "value": "%Null%",
+ "compareType": 1
},
"CommandList": [
{
"$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
- "Message": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!msg"
- }
+ "Message": "操作完成"
},
{
"$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
- "ReloadData": true
+ "ReloadData": true,
+ "ClosePopupReturnValues": [
+ {
+ "Name": "任务ID",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=新增任务!任务ID"
+ }
+ },
+ {
+ "Name": "关联页面",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=新增任务!发起流程结果.Page"
+ }
+ }
+ ]
}
],
- "ID": "ae5ccb4e-c837-454b-9734-8544aeb08459"
+ "ID": "120f3a33-2a91-4f30-a3eb-d3c0ff96562f"
},
{
"CommandList": [
{
- "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy",
- "FunctionName": "warning",
- "Title": "出现异常",
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "FourStandardStyle": "warning",
"Message": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!msg"
- },
- "BtnText": "知道了"
+ "SerializeProperty": "=新增任务!发起流程结果.ErrorMessage"
+ }
}
],
- "ID": "2b108829-d338-4474-8413-a5faf526fc20"
+ "ID": "75a3ac10-f2d5-4728-98c1-3da4747d5c26"
}
]
}
@@ -1365,33 +1144,40 @@
"TemplateKey": "_RS_Main1"
}
},
- "25,1": {
+ "22,1": {
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "父任务ID",
"GUID": "cccaa787-e255-4f32-baf9-5a3d1b09189a"
}
},
- "25,4": {
+ "22,4": {
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "开启反馈收集",
"GUID": "3263091d-059c-4ef5-9f1c-7a8608944b1c"
}
},
- "25,9": {
+ "22,9": {
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "开始时间",
"GUID": "08a3389e-19f7-4a8a-b81f-6d9330d273d1"
}
},
- "25,12": {
+ "22,12": {
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "结束时间",
"GUID": "7dd99afa-ad0d-475a-aefe-e560f30fcb1f"
}
+ },
+ "22,15": {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "ID",
+ "GUID": "ab7e6f36-abc4-48e6-a075-cf361ca3bf6c"
+ }
}
},
"StyleDatas": {
@@ -1421,6 +1207,12 @@
{
"Formatter": 6
},
+ {
+ "FontFamily": 2,
+ "FontSize": 13.333333333333332,
+ "Foreground": 7,
+ "HorizontalAlignment": 8
+ },
{
"FontFamily": 2,
"FontSize": 13.333333333333332,
@@ -1513,11 +1305,19 @@
},
"CellStyles": {
"1,1": 0,
- "1,19": 1,
- "1,21": 2,
+ "1,15": 1,
+ "1,17": 2,
+ "1,18": 3,
+ "1,19": 3,
+ "1,20": 3,
+ "1,21": 3,
"1,22": 3,
- "1,23": 4,
+ "1,23": 3,
"1,24": 3,
+ "1,25": 3,
+ "1,26": 3,
+ "1,27": 4,
+ "1,28": 3,
"2,1": 5,
"2,2": 5,
"2,3": 5,
@@ -1532,228 +1332,204 @@
"2,12": 5,
"2,13": 5,
"2,14": 5,
- "2,15": 5,
- "2,16": 5,
- "2,17": 5,
- "2,18": 5,
- "2,19": 1,
- "3,19": 1,
- "3,21": 6,
- "3,22": 7,
- "3,23": 7,
+ "2,15": 1,
+ "3,13": 6,
+ "3,15": 1,
+ "3,17": 7,
+ "3,18": 8,
+ "3,19": 8,
+ "3,20": 8,
+ "3,21": 8,
+ "3,22": 8,
+ "3,23": 8,
"3,24": 8,
- "4,19": 1,
- "4,21": 9,
- "4,24": 1,
- "5,1": 10,
- "5,5": 11,
- "5,19": 1,
- "5,21": 9,
- "5,24": 1,
- "6,1": 10,
- "6,2": 10,
- "6,3": 10,
- "6,5": 11,
- "6,6": 11,
- "6,7": 11,
- "6,8": 11,
- "6,9": 11,
- "6,10": 11,
- "6,11": 11,
- "6,12": 11,
- "6,13": 11,
- "6,14": 11,
- "6,15": 11,
- "6,16": 11,
- "6,17": 11,
- "6,18": 11,
- "6,19": 1,
- "6,21": 9,
- "6,24": 1,
- "7,1": 10,
- "7,2": 3,
- "7,3": 3,
- "7,4": 3,
- "7,5": 11,
- "7,19": 1,
- "7,21": 9,
- "7,24": 1,
- "8,1": 12,
- "8,2": 12,
- "8,3": 12,
- "8,4": 13,
- "8,5": 14,
- "8,6": 14,
- "8,7": 14,
- "8,8": 14,
- "8,9": 14,
- "8,10": 14,
- "8,11": 14,
- "8,12": 14,
- "8,13": 14,
- "8,14": 14,
- "8,15": 14,
- "8,16": 14,
- "8,17": 14,
- "8,18": 14,
- "8,19": 1,
- "8,21": 9,
- "8,24": 1,
- "9,19": 1,
- "9,21": 9,
- "9,24": 1,
- "10,1": 10,
- "10,10": 3,
- "10,11": 3,
- "10,12": 3,
- "10,13": 3,
- "10,14": 3,
- "10,19": 1,
- "10,21": 9,
- "10,24": 1,
+ "3,25": 8,
+ "3,26": 8,
+ "3,27": 8,
+ "3,28": 9,
+ "4,15": 1,
+ "4,17": 10,
+ "4,28": 1,
+ "5,1": 11,
+ "5,5": 12,
+ "5,15": 1,
+ "5,17": 10,
+ "5,28": 1,
+ "6,1": 13,
+ "6,2": 13,
+ "6,3": 13,
+ "6,4": 14,
+ "6,5": 15,
+ "6,6": 15,
+ "6,7": 15,
+ "6,8": 15,
+ "6,9": 15,
+ "6,10": 15,
+ "6,11": 15,
+ "6,12": 15,
+ "6,13": 15,
+ "6,14": 15,
+ "6,15": 1,
+ "6,17": 10,
+ "6,28": 1,
+ "7,15": 1,
+ "7,17": 10,
+ "7,28": 1,
+ "8,1": 11,
+ "8,10": 3,
+ "8,11": 3,
+ "8,12": 3,
+ "8,15": 1,
+ "8,17": 10,
+ "8,28": 1,
+ "9,1": 12,
+ "9,15": 1,
+ "9,17": 16,
+ "9,18": 14,
+ "9,19": 14,
+ "9,20": 14,
+ "9,21": 14,
+ "9,22": 14,
+ "9,23": 14,
+ "9,24": 14,
+ "9,25": 14,
+ "9,26": 14,
+ "9,27": 14,
+ "9,28": 17,
+ "10,15": 1,
"11,1": 11,
- "11,19": 1,
- "11,21": 15,
- "11,22": 13,
- "11,23": 13,
- "11,24": 16,
- "12,19": 1,
- "13,1": 10,
- "13,2": 3,
- "13,3": 3,
- "13,4": 3,
- "13,5": 3,
- "13,6": 3,
- "13,9": 2,
- "13,10": 3,
- "13,11": 3,
- "13,12": 3,
- "13,13": 3,
- "13,14": 3,
- "13,17": 17,
- "13,18": 3,
- "13,19": 1,
- "13,21": 2,
- "13,22": 3,
- "13,23": 4,
- "13,24": 3,
- "14,1": 11,
- "14,9": 11,
- "14,19": 1,
- "14,21": 6,
- "14,22": 7,
- "14,23": 7,
- "14,24": 8,
- "15,19": 1,
- "15,21": 9,
- "15,24": 1,
- "16,1": 2,
- "16,2": 3,
- "16,3": 3,
- "16,4": 3,
- "16,5": 3,
- "16,6": 3,
- "16,9": 2,
- "16,10": 3,
- "16,11": 3,
- "16,12": 3,
- "16,13": 3,
- "16,14": 3,
- "16,17": 18,
- "16,19": 1,
- "16,21": 9,
- "16,24": 1,
- "17,1": 11,
- "17,9": 11,
- "17,19": 1,
- "17,21": 9,
- "17,24": 1,
- "18,19": 1,
- "18,21": 9,
- "18,24": 1,
- "19,1": 2,
- "19,2": 3,
- "19,3": 3,
- "19,4": 3,
- "19,5": 3,
- "19,6": 3,
- "19,19": 1,
- "19,21": 9,
- "19,24": 1,
- "20,1": 11,
- "20,19": 1,
- "20,21": 15,
- "20,22": 13,
- "20,23": 13,
- "20,24": 16,
- "21,1": 14,
- "21,2": 14,
- "21,3": 14,
- "21,4": 14,
- "21,5": 14,
- "21,6": 14,
- "21,7": 14,
- "21,8": 14,
- "21,9": 14,
- "21,10": 14,
- "21,11": 14,
- "21,12": 14,
- "21,13": 14,
- "21,14": 14,
- "21,15": 14,
- "21,16": 14,
- "21,17": 14,
- "21,18": 14,
- "21,19": 14,
- "21,20": 14,
- "21,21": 14,
- "21,22": 14,
- "21,23": 14,
- "21,24": 14,
- "22,1": 3,
- "22,2": 3,
- "22,3": 3,
- "22,4": 3,
- "22,5": 3,
- "22,6": 3,
- "22,7": 3,
- "22,8": 3,
- "22,9": 3,
- "22,10": 3,
- "22,11": 3,
- "22,12": 3,
- "22,13": 3,
- "22,14": 3,
- "22,15": 3,
- "22,16": 3,
- "22,17": 3,
- "22,18": 3,
- "22,19": 3,
- "22,20": 3,
- "22,21": 3,
- "22,22": 3,
- "22,23": 3,
- "22,24": 3,
- "23,1": 11,
- "23,7": 11,
- "23,8": 11,
- "23,9": 11,
- "23,10": 11,
- "23,11": 11,
- "23,12": 19,
- "23,13": 3,
- "23,14": 3,
- "23,15": 3,
- "23,16": 19,
- "23,17": 3,
- "23,18": 3,
- "23,21": 11,
- "23,22": 11,
- "25,1": 20,
- "25,4": 21,
- "25,15": 21,
- "25,16": 21,
- "25,17": 21
+ "11,2": 3,
+ "11,3": 3,
+ "11,4": 3,
+ "11,5": 3,
+ "11,6": 3,
+ "11,9": 2,
+ "11,10": 3,
+ "11,11": 3,
+ "11,12": 3,
+ "11,13": 18,
+ "11,14": 3,
+ "11,15": 1,
+ "11,17": 2,
+ "11,18": 3,
+ "11,19": 3,
+ "11,20": 3,
+ "11,21": 3,
+ "11,22": 3,
+ "11,23": 3,
+ "11,24": 3,
+ "11,25": 3,
+ "11,26": 3,
+ "11,27": 4,
+ "11,28": 3,
+ "12,1": 12,
+ "12,9": 12,
+ "12,15": 1,
+ "12,17": 7,
+ "12,18": 8,
+ "12,19": 8,
+ "12,20": 8,
+ "12,21": 8,
+ "12,22": 8,
+ "12,23": 8,
+ "12,24": 8,
+ "12,25": 8,
+ "12,26": 8,
+ "12,27": 8,
+ "12,28": 9,
+ "13,15": 1,
+ "13,17": 10,
+ "13,28": 1,
+ "14,1": 2,
+ "14,2": 3,
+ "14,3": 3,
+ "14,4": 3,
+ "14,5": 3,
+ "14,6": 3,
+ "14,9": 2,
+ "14,10": 3,
+ "14,11": 3,
+ "14,12": 3,
+ "14,13": 19,
+ "14,15": 1,
+ "14,17": 10,
+ "14,28": 1,
+ "15,1": 12,
+ "15,9": 12,
+ "15,15": 1,
+ "15,17": 10,
+ "15,28": 1,
+ "16,15": 1,
+ "16,17": 10,
+ "16,28": 1,
+ "17,1": 2,
+ "17,2": 3,
+ "17,3": 3,
+ "17,4": 3,
+ "17,5": 3,
+ "17,6": 3,
+ "17,15": 1,
+ "17,17": 10,
+ "17,28": 1,
+ "18,1": 12,
+ "18,15": 1,
+ "18,17": 16,
+ "18,18": 14,
+ "18,19": 14,
+ "18,20": 14,
+ "18,21": 14,
+ "18,22": 14,
+ "18,23": 14,
+ "18,24": 14,
+ "18,25": 14,
+ "18,26": 14,
+ "18,27": 14,
+ "18,28": 17,
+ "19,7": 12,
+ "19,8": 12,
+ "19,9": 12,
+ "19,10": 12,
+ "19,11": 12,
+ "19,17": 12,
+ "19,18": 12,
+ "19,19": 12,
+ "19,20": 12,
+ "19,21": 12,
+ "19,22": 20,
+ "19,23": 3,
+ "19,24": 3,
+ "19,25": 3,
+ "20,7": 12,
+ "20,8": 12,
+ "20,9": 12,
+ "20,10": 12,
+ "20,11": 12,
+ "20,17": 12,
+ "20,18": 12,
+ "20,19": 12,
+ "20,20": 12,
+ "20,21": 12,
+ "20,22": 20,
+ "20,25": 3,
+ "20,26": 20,
+ "20,27": 3,
+ "20,28": 3,
+ "21,7": 12,
+ "21,8": 12,
+ "21,9": 12,
+ "21,10": 12,
+ "21,11": 12,
+ "21,17": 12,
+ "21,18": 12,
+ "21,19": 12,
+ "21,20": 12,
+ "21,21": 12,
+ "21,22": 20,
+ "21,23": 3,
+ "21,24": 3,
+ "21,25": 3,
+ "22,1": 21,
+ "22,4": 22
},
"SheetStyle": {
"FontFamily": 2,
@@ -1761,32 +1537,30 @@
}
},
"Spans": [
- "1,1,1,18",
+ "1,1,1,14",
"5,1,1,3",
- "1,23,1,2",
- "13,23,1,2",
- "21,19,1,2",
- "11,1,1,18",
- "16,17,1,2",
- "13,17,1,2",
- "7,1,1,3",
- "23,1,1,6",
- "25,4,1,4",
- "25,1,1,3",
- "14,1,1,6",
- "3,1,1,18",
- "5,5,1,14",
- "7,5,1,14",
- "25,9,1,3",
- "25,12,1,3",
- "14,9,1,10",
- "17,1,1,6",
- "17,9,1,10",
- "20,1,1,18",
- "3,21,9,4",
- "14,21,7,4",
- "23,16,1,3",
- "23,12,1,3"
+ "1,27,1,2",
+ "11,27,1,2",
+ "9,1,1,14",
+ "14,13,1,2",
+ "11,13,1,2",
+ "22,4,1,4",
+ "22,1,1,3",
+ "12,1,1,6",
+ "5,5,1,10",
+ "22,9,1,3",
+ "12,9,1,6",
+ "15,1,1,6",
+ "15,9,1,6",
+ "18,1,1,14",
+ "3,17,7,12",
+ "12,17,7,12",
+ "22,12,1,3",
+ "3,1,1,12",
+ "3,13,1,2",
+ "20,26,1,3",
+ "20,22,1,3",
+ "22,15,1,4"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1818,7 +1592,7 @@
"MethodName": "Focus"
}
],
- "ID": "e3ef9e5d-62b5-4a7f-8b4f-d8d8c3d7e922"
+ "ID": "cc2e9c58-6a58-47bb-b261-c239090ea557"
},
{
"Condition": {
@@ -1845,14 +1619,14 @@
{
"Location": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新增任务!19:21"
+ "SerializeProperty": "=新增任务!17:19"
},
"Value": true
}
]
}
],
- "ID": "a3ac75f0-a600-483b-a1e6-94fe2ad5c17a"
+ "ID": "b4c5aece-cf4d-424c-98cc-c27dbb6c8ad2"
}
]
}
@@ -1901,15 +1675,19 @@
"CustomNames": [
{
"Name": "父任务ID",
- "Formula": "新增任务!$B$26"
+ "Formula": "新增任务!$B$23"
},
{
"Name": "项目ID",
- "Formula": "新增任务!$B$15"
+ "Formula": "新增任务!$B$13"
},
{
"Name": "项目是否开启反馈收集",
- "Formula": "新增任务!$E$26"
+ "Formula": "新增任务!$E$23"
+ },
+ {
+ "Name": "任务ID",
+ "Formula": "新增任务!$P$23"
}
]
-}//MNJh8pkl9IOYsSTjNC8heQmTP7zSursIQq9DJo0xbjsHWRdjLUuQKbo3eaz4liZiEvHgr2SUKaIQSbyvrKJvgSmVuO2AWvRlC4ts6Kx9L2cMk0H98CxWsBaa1R2bLLwIn7FUjXxZJ7e4W1oEXEXhQs3zM+COCWaCxZRKDV1WD2nMq9CMCu51FoYYXKPkOLc+Od2lKoVNQtlc1KsGFo+8UOAXORsMz7CjP3wL+GTKVJiUDrgbi8krAq79ETcGcDz5rxNQ23AQ82FBnsOzw/FVvmhxXApSh8KleplJ1v/Jyh1Alu8HkQHMBYOJ2CLlOBsAaI4LEcI6NITqsH7HOah/8XjjElcpNimY8zvIUES34y8EN2eikURF4fxFOnf7Sh6EgvwIg3ey//dtnnos8OULjROb99Z0FEKyFh5C6aRwME4qd/NzWB3CFKMYCAogaTSdwOvYx0qSZeGaS3+o1mXVAAl1mdj5qFE0mIsaRf8Q1mXMJnCWtUj+tlcKV0075dTQYDiSE+QkSxambzn+ffTNF8W3rZzXaBeL8Of1oHRREGUuAUoSbUKNEfqmF06kiIvI9B1nhrsZCvOXBB2eT60eMTWmsA6UGjWFBcc2Gv38laX8+KjcfbM1VRWgJ6mJ7TWVB/nKsipLdMkXtGo9s7T5AJ/A6//leH2yCYUvdl10uzBF7sDjwUbnVjID0Y6ZdEl8eyDHzBljxWZJYyy/EftGPCpLxN9VR0jIdR/ATiSjDFqbsjO4NVYNPxo9+REuK8PAT0oKqExHHTD3MTwXe6X1Efj+i9KIU366QrdvguDAHydYW0qvUOfbiBG/tqz4U7JK726GdhunYx86zU/NjBiEDAKEjGOsRGv9T5IA+Dav+c4uzTegYCHht7vrxvmIosRbpBzrcPht4Z3ZeRfuauezMQ==|920
\ No newline at end of file
+}//JZgLQc7iWjq/9Ut3CFEYtRXyt2aFonSsXtpupaPrYagfpkPiFVvgxiBiE5kiVBdxUiwCZzH9ZOMbjYh4h22FBbjejL60Y9DtyLxT9urTgJ38ycjux/x++KJQ2jKtA+Xv8UouUekjKFZ1xFBPolk38xvIzzZ01+6ZttZ8UPEcuPELjXJONDUf7Qs4W1mm8ZDvbW3IZxhYkZBSWy7S4rfutRu+X/tHhRaaXtC8L2WoMxXq/VZgNt+sY1hIq3c6wuRYG/ODjEr6xKtbhTmTGW4f+RsZxRLQp/NBpQZB1Ua4SbkhKO2T6TJ9DHO5POB18m6TLfNQGBNvOKWnJyIYGqH8n58tVal6gRQLrHP7yeJSaURU5GQWd0rwhdzkorglmPvb4idfRPIejQ/uQlJZbh9XzU2SdRxT8kUbTWB1NHL747SFi46lKZuXocdHTYQgTbPPCNbJfs/+fpVj2Rl7rkWg+lRQ93tziRN38aLL3V+yLsvdVrSYNfZAqVWRhGpvlaQTXKd70ftoMfxlAhN/pcvRH6tIXQczNvJvk2DC9/mHCROMphH4hFmNPSmtpRSQx9IB40Hbj/50AWBxUCHMJAxvndTzwckLhLCyKYl8gH2WXAzMpbq3x5WOdveSsYHLgGbrquWfEkAELYzFcAA64qCtNw6I7Q3IxUDxSjENT9PD0wmJb0SNBvWYToHMSqE2j8aex0rd8EfKE6jOGOKGoyb0wmWiTQZpgBbxezNBSNaIi/KUibpdMCIGwTwUqLzAFZT6Ve1NgX50PNBGmoxQ1+xC1Jq9FRkF1kVKMNonrxpUcnm4uXruyVcCzbp6hp3q1p6zOzjn7uXVYU5js5g4irDpwvCMYbggZ7QIAPHvZjbJKrupu7ttQJvjUhV0oyls/Qh9LV5K86s/DA1Z5H70Dg9P4Q==|920
\ No newline at end of file
diff --git a/Pages/任务/新增任务.rd b/Pages/任务/新增任务.rd
index 93afe415..8691ecc2 100644
--- a/Pages/任务/新增任务.rd
+++ b/Pages/任务/新增任务.rd
@@ -1,24 +1,28 @@
{
"PageType": 0,
- "ColumnCount": 26,
- "RowCount": 26,
+ "ColumnCount": 30,
+ "RowCount": 23,
"Formulas": {
- "1,1": "IFERROR(\"所属任务：\"&ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")",
- "11,1": "J26&\",\"&M26",
- "23,1": "项目是否开启反馈收集"
+ "3,13": "项目是否开启反馈收集",
+ "9,1": "J23&\",\"&M23",
+ "1,1": "IFERROR(\"所属任务：\"&ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")"
},
"CustomNames": [
{
"Name": "父任务ID",
- "Formula": "新增任务!$B$26"
+ "Formula": "新增任务!$B$23"
},
{
"Name": "项目ID",
- "Formula": "新增任务!$B$15"
+ "Formula": "新增任务!$B$13"
},
{
"Name": "项目是否开启反馈收集",
- "Formula": "新增任务!$E$26"
+ "Formula": "新增任务!$E$23"
+ },
+ {
+ "Name": "任务ID",
+ "Formula": "新增任务!$P$23"
}
]
}
\ No newline at end of file
diff --git a/Pages/共用/选择图标.json b/Pages/共用/选择图标.json
index b752fc15..20c40c99 100644
--- a/Pages/共用/选择图标.json
+++ b/Pages/共用/选择图标.json
@@ -22,16 +22,26 @@
}
},
"4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ },
+ "5": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 24.0
}
}
},
- "Count": 5,
+ "Count": 6,
"DefaultSize": 24.0
},
"Cols": {
"RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0
+ }
+ },
"1": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
@@ -77,11 +87,6 @@
"DesignLengthInPixel": 32.0
}
},
- "0": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 20.0
- }
- },
"10": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 20.0
@@ -123,9 +128,123 @@
"Name": "搜索.svg",
"Color": "Text 1 50"
},
- "resize": "none"
+ "resize": "none",
+ "clearable": true
}
},
+ "1,9": {
+ "CellType": {
+ "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "ElementUI.Commands.ShowMessageBox, ElementUI",
+ "Title": "添加表情",
+ "Message": "请填写表情描述，用逗号分割",
+ "Type": "success",
+ "ConfirmButtonText": "确定",
+ "ShowCancelButton": true,
+ "CancelButtonText": "取消",
+ "ShowClose": false,
+ "DialogResult": "按钮结果",
+ "AdvancedSettings": {
+ "ShowInput": true,
+ "InputPlaceholder": "请输入",
+ "InputBoxResult": "表情描述",
+ "Center": true
+ }
+ },
+ {
+ "$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": "=按钮结果"
+ }
+ ]
+ },
+ "value": "confirm"
+ },
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=表情描述"
+ }
+ ]
+ },
+ "value": "%Null%",
+ "compareType": 1
+ }
+ ]
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "EmojiTable",
+ "UpdateType": "add",
+ "ShowConfirm": false,
+ "UpdateBindingValues": [
+ {
+ "BindingInfo": {
+ "TableName": "EmojiTable",
+ "ColumnName": "Emoji",
+ "GUID": "410e0612-7099-4ab7-8f93-61d4feeb4da7"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=选择图标!B2"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "EmojiTable",
+ "ColumnName": "Description",
+ "GUID": "9c510f36-2dbf-4f4c-9af8-6f6a437a63c0"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=选择图标!表情描述"
+ }
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=选择图标!B2"
+ },
+ "Value": "%Null%"
+ }
+ ]
+ }
+ ],
+ "ID": "599bd815-b23c-41b4-a896-47740da458db"
+ }
+ ]
+ }
+ ],
+ "ToolTip": "添加",
+ "Size": 18,
+ "ImagePath": "增加.svg",
+ "UseCellForeColor": true
+ },
+ "RulesGuidList": [
+ "cf7cff7f-81b5-46fc-9dc2-3f90d6c97089"
+ ]
+ },
"3,1": {
"CellType": {
"$type": "Forguncy.RepeaterCellType, ServerDesignerCommon",
@@ -166,17 +285,35 @@
}
],
"SqlCondition": {
- "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
- "CompareType": 6,
- "ColumnBindingInfo": {
- "TableName": "EmojiTable",
- "ColumnName": "Description",
- "GUID": "3aae46fc-b36b-49ce-8fb1-2c080f81ef2e"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=选择图标!B2"
- }
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
+ "CompareType": 6,
+ "ColumnBindingInfo": {
+ "TableName": "EmojiTable",
+ "ColumnName": "Description",
+ "GUID": "3aae46fc-b36b-49ce-8fb1-2c080f81ef2e"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=选择图标!B2"
+ }
+ },
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "EmojiTable",
+ "ColumnName": "Emoji",
+ "GUID": "f2005ed8-67f9-4b58-a4c4-5be22cf43528"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=选择图标!B2"
+ }
+ }
+ ],
+ "RelationType": 1
},
"NullFormulaValueQueryPolicy": 1,
"CacheSetting": {
@@ -188,7 +325,6 @@
},
"DataSourceListviewName": "图文列表表格2",
"IsLoadOnDemand": true,
- "LoadOnDemandCount": 20,
"DisplayMode": 2,
"TemplateKey": "幽灵按钮"
}
@@ -205,18 +341,23 @@
},
{
"FontFamily": 0,
- "Foreground": 1,
- "Formatter": 2,
- "HorizontalAlignment": 3
+ "Foreground": 1
},
{
"FontFamily": 0,
- "Foreground": 1
+ "Foreground": 2,
+ "Formatter": 3,
+ "HorizontalAlignment": 4
+ },
+ {
+ "FontFamily": 0,
+ "Foreground": 2
}
],
"Types": {
"Strs": [
"Body",
+ "Accent 1 0",
"black",
"[AUTO]General",
"Center"
@@ -236,14 +377,7 @@
"0,10": 0,
"1,0": 0,
"1,1": 1,
- "1,2": 0,
- "1,3": 0,
- "1,4": 0,
- "1,5": 0,
- "1,6": 0,
- "1,7": 0,
- "1,8": 0,
- "1,9": 0,
+ "1,9": 2,
"1,10": 0,
"2,0": 0,
"2,1": 0,
@@ -257,7 +391,7 @@
"2,9": 0,
"2,10": 0,
"3,0": 0,
- "3,1": 2,
+ "3,1": 3,
"3,2": 0,
"3,3": 0,
"3,4": 0,
@@ -266,18 +400,29 @@
"3,7": 0,
"3,8": 0,
"3,9": 0,
- "3,10": 3,
+ "3,10": 4,
"4,0": 0,
- "4,1": 0,
- "4,2": 0,
- "4,3": 0,
- "4,4": 0,
- "4,5": 0,
- "4,6": 0,
- "4,7": 0,
- "4,8": 0,
- "4,9": 0,
- "4,10": 0
+ "4,1": 3,
+ "4,2": 3,
+ "4,3": 3,
+ "4,4": 3,
+ "4,5": 3,
+ "4,6": 3,
+ "4,7": 3,
+ "4,8": 3,
+ "4,9": 3,
+ "4,10": 4,
+ "5,0": 0,
+ "5,1": 0,
+ "5,2": 0,
+ "5,3": 0,
+ "5,4": 0,
+ "5,5": 0,
+ "5,6": 0,
+ "5,7": 0,
+ "5,8": 0,
+ "5,9": 0,
+ "5,10": 0
},
"SheetStyle": {
"FontFamily": 0
@@ -285,7 +430,7 @@
},
"Spans": [
"3,1,1,9",
- "1,1,1,9"
+ "1,1,1,8"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -304,10 +449,29 @@
]
},
"RowBreakLines": [],
- "RepeatRangeSettings": []
+ "RepeatRangeSettings": [],
+ "ConditionFormatRulesCollection": {
+ "Rules": [
+ {
+ "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon",
+ "Formula": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=选择图标!$B$2=\"\""
+ },
+ "GUID": "cf7cff7f-81b5-46fc-9dc2-3f90d6c97089",
+ "StyleInfo": {
+ "Underline": null,
+ "Strikethrough": null
+ },
+ "IsDisabled": true,
+ "IsInvisible": false,
+ "IsReadOnly": false
+ }
+ ]
+ }
},
"PrintInfo": {
"PaperSize": {},
"Margin": {}
}
-}//uqYFbafbXMUT/GVUv0XL9qolIeStbg1vkG00/FXT/q/lghC3js28UDQTaGT75dkwch7oEEmyHIkTVk9HWO9Kv+wRp2rrACwUbXUtlLGAlyqKhEXevm9o6Vy6Q4zLBqm4IRg7FOrb9b+IpuloZOTG+gwiEYbZOGc8I3ogvGKCXxeC4rJ7Jvj6mSGarVvs+4PElMje4mtZYa8Fiu75WMSFgYein71tegW8t6LyJ7n4eAS9aIzs4YSoQCVEI07STdKjPEtV2+HEm17ssSerOblmRQiw4EY3UJIm4H/A/wwOvNRzz/nM7ROB/Ny5T+pz4ObStBARiEJE85oqO/HZUa2Io8sNLTLeIMBxYgmg3xD5kv1/4KMp1hv/QW6oyJZur41uJkeuknr37mp65a2VTmeX0N7At8gPMaz2ofDTsv9dDimiypKCuC7rN4J+cplVbC9Hrk2eqzBr0g67o4ZV6RkePit0XP3d8NZDa+uNB1Ywm+0uWWSdBfwiDnc0n4SDJhpUp3b0Ht1On0vMkJldnEVpin9Kj78Ksqb4/nj5XAfCEOk647/IBTv4A210K1vdPo3wX8Pk9AKzgpGhwPdWSPUjfUcybS5VTwLgIOP2N94maIH0JAmrgcOzuJvFHePTJwzyzbExkIMFhJf177mWs+qwaUQkXVZ6mSXrK1v1xkyl0MJxrPG2sjDW8jl6aYNC6HA3l/H3o2ILNsvRRd7ZJVx+AIWIN89BycM3q3uv2SEO+upmd/TpkKUbaNnDs9qnGB0xJkJsXhfZpwCNrxgPKSl5FxIX8TxYr96DIKEN+m9+3vJV0qUKiwOeSk63KhiX37RSQIHDyBBZXT+uH9oMhE1tHy0VGn7uStpQArScJ+wWyUIPtS9+HXRJIjMLyzTitp7xxBnnjqUrBBX6UD8bp28FDw==|920
\ No newline at end of file
+}//2hMal8pKPW0Hc64v6VxWYoQXhXvk0i4w9JHEgYeq3I6WHCNYDkw6dCp8lZdsSuClfeMAxRWPUsRYRVXC9OhSUzKdxk/2/cdzi1vP/iWYwwvZJyPgdPyifLDiIugk+PnCexsTZlK5H+Gve+JfNMIkr0rrvEhpOnNQZPqalHIdRHbxFPQBWnb2tyaWEFTpUl8oRYtjud2O8icLbdhjSUZ8LRUpqRJzv+vUMH6r0iLgYjngrHNFN6ExH41BXGPMBz+7B7tEfNK/hMwXNwGqkvU+qts1QUkfj7rUKDWFJua7tjrC99948METTfbSF4KM8/8CpMrFYFOTXU7h62pVxk52hlpMENk7pydPqRpmQ6kU5cZpe8SoyBZJiPB+JJVbAOLzkytttVIZ4DPlYpBZMwuaePB7pqlLwZtfIU42CTShb291Nrfz8t1+VytBfHu9MEoCDyb6sWSihyFEzGoWGemisIyTkYSaSWdSvjAH+PnsFsPZlUGvw0a9PORDoYKYLzP4OvdnpSwKg+aRuj0dEFi5ewynyjpshlLXyf2TzgsXOhHoQOIpsJirdGifyWStbmS1TMpPaVFT/FwyNRGkOIMr0wCVFI9ZYacmVlWy6968JZqOl8KD2xRhBo6+jPhyLrzTQmLH9EyaeLJmArzfHZAbwctB6ZCQW51AsG+H9oCBGr3PUMImYFjuCev2dfwnCzeOMCkRvE7ZTHTXY8/Dbjdcrhn4s5d3ppCcWt/aKq5w2J9YdcxqwcwnaqIBDkkk34U2r58ZdlAvyToDoGnSNQ03zepUCDlzuk2zZWJY4buLyir/PpGSEuITVUjh4DnQ5otwNaWN/X8ZW9N6zU7+Xm4F5szx7HTJPHN0vEvF6mwtf5J/1uWPgUAgaVaXXc0G2/r3luHNLHxjlsxhNrcp6A+8JQ==|920
\ No newline at end of file
diff --git a/Pages/共用/选择图标.rd b/Pages/共用/选择图标.rd
index c4c92ebb..c66f627f 100644
--- a/Pages/共用/选择图标.rd
+++ b/Pages/共用/选择图标.rd
@@ -1,5 +1,5 @@
{
"PageType": 0,
"ColumnCount": 11,
- "RowCount": 5
+ "RowCount": 6
}
\ No newline at end of file
diff --git a/Pages/流程页面文件夹/FGC_审批记录.json b/Pages/流程页面文件夹/FGC_审批记录.json
index 2e73fd4a..caa01a41 100644
--- a/Pages/流程页面文件夹/FGC_审批记录.json
+++ b/Pages/流程页面文件夹/FGC_审批记录.json
@@ -3,12 +3,12 @@
"RowColumnAttachedInfos": {
"0": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 20.0
+ "DesignLengthInPixel": 16.0
}
},
"1": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 30.0
+ "DesignLengthInPixel": 20.0
}
},
"2": {
@@ -304,6 +304,12 @@
}
}
},
+ "28": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0,
+ "IsHidden": true
+ }
+ },
"29": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 20.0,
@@ -316,6 +322,12 @@
"IsHidden": true
}
},
+ "31": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0,
+ "IsHidden": true
+ }
+ },
"32": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 20.0,
@@ -345,33 +357,10 @@
"DesignLengthInPixel": 20.0,
"IsHidden": true
}
- },
- "37": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 20.0,
- "IsHidden": true
- }
- },
- "38": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 20.0,
- "IsHidden": true
- }
- },
- "39": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 20.0,
- "IsHidden": true
- }
- },
- "40": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 20.0,
- "IsHidden": true
- }
}
},
"InLogicalVisibleIndexes": [
+ 28,
29,
30,
31,
@@ -379,13 +368,9 @@
33,
34,
35,
- 36,
- 37,
- 38,
- 39,
- 40
+ 36
],
- "Count": 41
+ "Count": 37
},
"Cols": {
"RowColumnAttachedInfos": {
@@ -431,7 +416,14 @@
},
"8": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 20.0
+ "DesignLengthInPixel": 20.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
}
},
"9": {
@@ -472,12 +464,13 @@
"1,9": "查看流程图"
},
"Formulas": {
- "29,1": "IF(ISBLANK(B33),IF(ISBLANK(B36),B39,B36),B33)"
+ "28,1": "IF(ISBLANK(B31),IF(ISBLANK(B33),B35,B33),B31)"
},
"AttachInfos": {
"1,1": {
"CellType": {
"$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "Size": 14,
"ImagePath": "Application/157_historyvis_1.svg",
"BuiltIn": true,
"Color": "#FF828282"
@@ -497,7 +490,7 @@
{
"Source": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=FGC_审批记录!B30"
+ "SerializeProperty": "=FGC_审批记录!B29"
},
"TargetCell": {
"SerializeProperty": "=FGC_流程追踪!A1"
@@ -653,7 +646,7 @@
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=FGC_审批记录!B30"
+ "SerializeProperty": "=FGC_审批记录!B29"
}
},
"OrderBySqlCondition": {
@@ -678,21 +671,21 @@
"TemplateKey": "_RS_Static"
}
},
- "32,1": {
+ "30,1": {
"BindingInfo": {
"TableName": "ACT_HI_PROCINST_View",
"ColumnName": "ID_",
"GUID": "a5c029ab-2520-4be9-bc42-d826538b6d3b"
}
},
- "35,1": {
+ "32,1": {
"BindingInfo": {
"TableName": "ACT_RU_TASK_View",
"ColumnName": "PROC_INST_ID_",
"GUID": "685f5133-0523-4d1f-b66b-b177ec376138"
}
},
- "38,1": {
+ "34,1": {
"BindingInfo": {
"TableName": "ACT_HI_TASKINST_View",
"ColumnName": "PROC_INST_ID_",
@@ -711,7 +704,7 @@
},
{
"FontFamily": 0,
- "FontSize": 16.0,
+ "FontSize": 14.666666666666666,
"FontWeight": 1,
"Foreground": 2,
"TextIndent": 5,
@@ -1006,20 +999,16 @@
"27,11": 6,
"27,12": 6,
"27,13": 6,
- "28,1": 7,
- "28,2": 7,
- "28,3": 7,
- "28,4": 7,
- "28,5": 7,
- "28,6": 7,
- "28,7": 7,
- "28,8": 7,
- "28,9": 7,
- "28,10": 7,
- "28,11": 7,
- "28,12": 7,
- "28,13": 7,
- "29,0": 3,
+ "28,0": 3,
+ "28,1": 0,
+ "28,2": 0,
+ "28,3": 0,
+ "28,4": 0,
+ "28,10": 0,
+ "28,11": 0,
+ "28,12": 0,
+ "28,13": 0,
+ "28,14": 3,
"29,1": 0,
"29,2": 0,
"29,3": 0,
@@ -1029,7 +1018,7 @@
"29,12": 0,
"29,13": 0,
"29,14": 3,
- "30,1": 0,
+ "30,1": 8,
"30,2": 0,
"30,3": 0,
"30,4": 0,
@@ -1038,20 +1027,16 @@
"30,12": 0,
"30,13": 0,
"30,14": 3,
- "31,1": 4,
- "31,2": 4,
- "31,3": 4,
- "31,4": 4,
- "31,5": 4,
- "31,6": 4,
- "31,7": 4,
- "31,8": 4,
- "31,9": 4,
- "31,10": 4,
- "31,11": 4,
- "31,12": 4,
- "31,13": 4,
- "32,1": 8,
+ "31,1": 0,
+ "31,2": 0,
+ "31,3": 0,
+ "31,4": 0,
+ "31,10": 0,
+ "31,11": 0,
+ "31,12": 0,
+ "31,13": 0,
+ "31,14": 3,
+ "32,1": 0,
"32,2": 0,
"32,3": 0,
"32,4": 0,
@@ -1073,11 +1058,6 @@
"34,2": 0,
"34,3": 0,
"34,4": 0,
- "34,5": 4,
- "34,6": 4,
- "34,7": 4,
- "34,8": 4,
- "34,9": 4,
"34,10": 0,
"34,11": 0,
"34,12": 0,
@@ -1091,48 +1071,7 @@
"35,11": 0,
"35,12": 0,
"35,13": 0,
- "35,14": 3,
- "36,1": 0,
- "36,2": 0,
- "36,3": 0,
- "36,4": 0,
- "36,10": 0,
- "36,11": 0,
- "36,12": 0,
- "36,13": 0,
- "36,14": 3,
- "37,1": 0,
- "37,2": 0,
- "37,3": 0,
- "37,4": 0,
- "37,5": 4,
- "37,6": 4,
- "37,7": 4,
- "37,8": 4,
- "37,9": 4,
- "37,10": 0,
- "37,11": 0,
- "37,12": 0,
- "37,13": 0,
- "37,14": 3,
- "38,1": 0,
- "38,2": 0,
- "38,3": 0,
- "38,4": 0,
- "38,10": 0,
- "38,11": 0,
- "38,12": 0,
- "38,13": 0,
- "38,14": 3,
- "39,1": 0,
- "39,2": 0,
- "39,3": 0,
- "39,4": 0,
- "39,10": 0,
- "39,11": 0,
- "39,12": 0,
- "39,13": 0,
- "39,14": 3
+ "35,14": 3
},
"SheetStyle": {
"FontFamily": 0,
@@ -1144,10 +1083,10 @@
},
"Spans": [
"3,1,24,13",
- "29,1,2,13",
+ "28,1,2,13",
+ "30,1,2,13",
"32,1,2,13",
- "35,1,2,13",
- "38,1,2,13",
+ "34,1,2,13",
"1,9,1,5",
"1,2,1,7"
],
@@ -1165,4 +1104,4 @@
"PaperSize": {},
"Margin": {}
}
-}//ixBxX2FiADpU+RCQK8n1z9bqrhzcHGbwXdgWEwK+lfg1N/5h88rDAbcRAl7eSH467Nnk4SKk4q6xZimWyPeDkFJI8C77VhbI/Gt2gF59eLlZuuIPpCGATr43VT18vaK4YvYCdJDBT0N9JJjivXk55YbC+gmP/E8EZ1+qS2Ubut8slelLtftj/hOP/fsbkg/pZJmb/vzZOQ7wjJhRTETwMIJgvzrr3+YpaO6gKMWpEdXjSRJdFT5GGf4wSKJAc68Y9+NDJyfzwFfgMHXlhOg8ajDc9boS0Ko1vz3BQuV76Ps6CLdC02Tqgb+3pf0JhTtYlUzmvHphs5EqZiEwQ6reBI8gcJ2uJrqzo26Zo9AyIQ3UPgaHY8mVHI3Tc1NTsHS4N+lDk4WDk8718J9mqXcK6WrZYAwJ1+wMNJmc4m4uK4Gk1//R5DX3cLvx/OKh1mNVoPHFib0I7zwIFOrKvOccdeP/2/i4x+HEIJ0s9PQ9SV4uhdoCPj+9u0UGqZyAO33MR4KwwuWk045LvuPmjJP9nQHR8NodomJrx6jeWY8xFTxZvZPw/srpBbHJSdrFQokVDZPvCUboeBii8fXyZD1uRA+EThc9zxflptNHdq7DJTd+RQ5yAd40QuZyd7lI0/W+cTetV6hT9QEKygZebEgg7sOc32BgFdOR9ovNw+wd1weDAgMUHmlqa4CIcHpdcoHQ6iiMeYFC12wbpTPEC/MXUgo91D5AqmzPEhAArDv/SwVNs9zCXSO45zr0hoRBrrZR60n1B4oi7W5DBMPnJyXtpQ8/VyF111IVY795z8y5/M2aL2ExN9fpddOf/DQNVpkkQKf9Pjr8xQKXPogMPRGBbOHajpttzWiCqzqoRVOT+gUX3WUfvZZrDXg5ytCOAlx94lFXLF0ZBbAXT7WR+rtBug==|920
\ No newline at end of file
+}//dL0J2kr7yQ/li74fhXvuDQ9XYOvE0VRsZPdt7hE47s9K7NAyFNnuOMhF/7By0C3MaVJpd7OPglwcH1+6tUCk/oWu+U82WPy3NN7ye7GrXbQcdLZsetED8A69xZELmySzjb2TzxzrsGmnbSGWz2ypr8bki13ht8fEcZRCz2Ckzg3v6fhRQcrSI6XEZrP9j6MU/XVl356PIScgUDLBo6qVALefcuh9VF1TSG4r33iz/LJAjEQJU93ulLx+G+powTQtH17B/fE+TJ8QoKG++503RyrhzqLkxudxQJF3ZiPFg7bo3bZ92hZOCDZhP1h9+h9JMPghBzMkM5RZjSDpcTtfHGBP5o4eK8xPxm+gcJHlYxA4ac3AQlZ93USubu4NSzXtbAw0CRRDdoBKJXQrz0QxbYs8aDpOFqZxdvL3r0IgFhirj80tsJIIh7G8PmXiRH7u8cv7UMCw+rC008so7tZBHLyn/2/gLMZZ+lnFtakQwCO+AhefanfMs9KRRcv8ByWUwT7l8z84CbprTpBjDQQHjqq5s57B45tyJGyl1xcsn53VN18VaJ1R/orrAkCGh4Idub9mYQW7fFb6Aos3TWMVAK7xb/F6bJvMT7PP+cVt4ylTv4lUqxls8tiuTI6n/p4ktFSRFob6fx50Q9ABKzaouj0ZbztVxxRiDEH7z5TFmYPit5qqEoDG5PthuUPnZWJKFds4VrSflERhT6LsU6eNBYbmoqaMDg5ROFrOjF+NA3KWGtnPEotl5TT8dod3kDS5XUsHQ+kaxLlGSwU92Y/PuqEsVAT5Ud5IdZszIdAfQWplWCKMxVZ3SB4akH4mrryqls0sXEQO+3TOJZyb8WrclavamSg2wyk9TSAHG7RbzVGboLeJLDnq51bX9480CVR5im5brvnsV70T/wn1UcZseA==|920
\ No newline at end of file
diff --git a/Pages/流程页面文件夹/FGC_审批记录.rd b/Pages/流程页面文件夹/FGC_审批记录.rd
index b6d3a68d..261d54ea 100644
--- a/Pages/流程页面文件夹/FGC_审批记录.rd
+++ b/Pages/流程页面文件夹/FGC_审批记录.rd
@@ -1,8 +1,8 @@
{
"PageType": 0,
"ColumnCount": 15,
- "RowCount": 41,
+ "RowCount": 37,
"Formulas": {
- "29,1": "IF(ISBLANK(B33),IF(ISBLANK(B36),B39,B36),B33)"
+ "28,1": "IF(ISBLANK(B31),IF(ISBLANK(B33),B35,B33),B31)"
}
}
\ No newline at end of file
diff --git a/Pages/邮件模板/模板编辑器.json b/Pages/邮件模板/模板编辑器.json
new file mode 100644
index 00000000..215442b9
--- /dev/null
+++ b/Pages/邮件模板/模板编辑器.json
@@ -0,0 +1,293 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 580.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 16.0
+ }
+ }
+ },
+ "Count": 5
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 16.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,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "15": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "16": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "17": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "18": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "19": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "20": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "21": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "22": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "23": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "24": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "25": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "26": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "27": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "28": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "29": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "30": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "31": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "32": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "33": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "34": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 16.0
+ }
+ }
+ },
+ "Count": 35,
+ "DefaultSize": 32.0
+ },
+ "Values": {
+ "1,1": "%PageTitle%",
+ "1,31": "保存"
+ },
+ "AttachInfos": {
+ "1,31": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "Text": "保存",
+ "TemplateKey": "_RS_Main1",
+ "Icon": {
+ "Name": "Application/067_save_4.svg",
+ "BuiltIn": true,
+ "Color": "Background 1",
+ "UseCellTypeForeColor": true
+ },
+ "IconSize": 14.0
+ }
+ },
+ "3,1": {
+ "CellType": {
+ "$type": "UnlayerEditorPlugin.EmailEditorCelltype, UnlayerEditorPlugin",
+ "Mode": "email",
+ "Theme": "classic_light",
+ "DockAlign": "right",
+ "ImgSaveMode": "BASE64",
+ "accept": ".xbm,.tif,.jfif,.ico,.tiff,.gif,.svg,.jpeg,.svgz,.jpg,.webp,.png,.bmp,.pip,.apng,.pjpeg,.avif"
+ }
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "FontSize": 18.666666666666664
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Body"
+ ]
+ },
+ "CellStyles": {
+ "1,1": 0
+ },
+ "SheetStyle": {
+ "FontFamily": 0
+ }
+ },
+ "Spans": [
+ "3,1,1,33",
+ "1,31,1,3"
+ ],
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+ "ShouldCheckDirty": true,
+ "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": {}
+ }
+}//QkcZqp+Whvwuip5kwkIbfRUqKMa6En+Quo3k6VBGqyHjNcBxIIrMBhMlQLkjcBO+cYycy8W5awYpSEqDUB1sXJCp5aX1TTtcXip2QUFb090t7q7JMdcDo76dUnIMC/lFmvYSMqty6RTZwlzviIRaP/BO/cWJS/fQOPE/iSBlgrF+GdhTP7XOG3/lOQoETrRwiZOhC8eBJBtRo9B+cH5+vGTzZ+5EMSFlrAlT71h7Q9DpOYjeuS+mfQhzPoqUnuvARRI7HOdDIZJfIp4LC/r8PrV2u9CR77Dsrr+W+MRzZ7h7OvLDD4EVTslJeCxzsq6e0jvkqaZj6Q86qn6TFAhToZTMTY3zrR1KOL5yQomEbYLnV18/u0EIZsnKwH4MNHdi5q3HTrO4JkCMavukfFPJYa2UVbqzpniQmdL3ozi6LquXuCLErVzcl3iVN2bWkNvqnuXOUkFSMy4+1utEoo/8JWp5hQKFBRt5AFc6zlHXbFuWVrC+aewZGA+JIfz/Z8ihuWXeR/UK8Cp0sCvBGNsG/qh88b9CGio+GMP1PQwstw7q1LE110aR3ajWG2c3UK7yfxlUlgh4ITNTEgTt+k6WnBDIqhhNu8d6VAEzc8Cfbq7eGdZb/ZEMn1WVJVNMUv1CGb4q+j6ywOgp/L45DRmP5b7O/Ds8109Oe9tjx5f9tPa8NTahLGGsLetAe72TJZkHWPa1WrZYHHgSFq+yDO/I3cRUHV4h3SIsxkAjNdhteo7OOBVJvnK07C4akZQZ7dDNeEmLh5fzfjmV6nOzYvKyPvUmRn9f3BclnuDDyI1f2o+7UD6isIM6rZpzuqGoKW9Gvt6WTnHfg8e9tvfALTMXytMs5FtWQVLbIhKmOVSdv4mKnD9Z6PQpWG8mICrgAvrr+dX6sjJJZlxCZ9vkn2kOHA==|920
\ No newline at end of file
diff --git a/Pages/邮件模板/模板编辑器.rd b/Pages/邮件模板/模板编辑器.rd
new file mode 100644
index 00000000..c0899235
--- /dev/null
+++ b/Pages/邮件模板/模板编辑器.rd
@@ -0,0 +1,5 @@
+{
+ "PageType": 0,
+ "ColumnCount": 35,
+ "RowCount": 5
+}
\ No newline at end of file
diff --git a/Pages/项目/项目列表.json b/Pages/项目/项目列表.json
index 3b915e63..0443b802 100644
--- a/Pages/项目/项目列表.json
+++ b/Pages/项目/项目列表.json
@@ -482,12 +482,12 @@
]
}
],
- "ID": "114414d0-3a78-4bdd-a59b-0dd6a7e94e0d"
+ "ID": "ce37c046-d681-424f-8bbd-395de9173500"
}
]
}
],
- "ID": "cdf35dca-a953-4c7b-a85a-83b8e3b57f04"
+ "ID": "d4a6fdf4-7cea-48bb-be3a-373424c6e9c9"
}
]
}
@@ -1009,7 +1009,7 @@
]
}
],
- "ID": "68359f4d-c910-47e0-b6df-09f10e5f8390"
+ "ID": "1e4af744-5d8e-4179-bbd3-1029169031b5"
},
{
"CommandList": [
@@ -1022,7 +1022,7 @@
"LoadBindingDataOption": 2
}
],
- "ID": "5150e030-7ba3-4cf0-917c-6b17a1672161"
+ "ID": "8d01eead-f414-4f5d-83be-f1deb856f893"
}
]
}
@@ -1637,4 +1637,4 @@
"Formula": "项目列表!$B$15"
}
]
-}//uJwCa0R7bxBE+DqaZsR8dEfMjUut/78tj0J1DNUkBtM+XmqQDumiyipUwMFEABkvnv+/VWUeaYBxWi1PzJ2FCWhsQyA1fHm2y6Wx6qPMjZMtOtb09PLPZ0NS1zjv1dPPqEVLtmzVQpYFvyaYMN9KWYG8uYXJmmeE15Sono+mle4/aVVhDz6CX+3eIKT5yLGrBp5GX3zU9Yho84x5f5t2ZTQKE5wO9bhXPtp+xMFPZDPeyAiPplgGgjDHrQJJT/x4g5X2yG+uB5FlIdkOBwcitXMxAptuc9CDKLs9qZQbzjqMdJ9HzUL0v4efNjiqBhr+53MnEk4yGnPM4GaDgZvOQxQaM77lkVU9MBPU5kxc7Joq4tELpOftioHJmkOHoJG17gaqyUconuiPU4fm/cHrgGoJ1toTRfqlRHB4IOxFiSz94KCscSswLpAvRR3tqtiQmQ8oWPQ9Z6fJlqAtn3XzsAYPpWynuv9NAvVPm7yYVI8rBaugeFRqe4BpI4MIj6N2K3odtXfJ8s8fJyJF1x+nDooc1+WeSDOggtT23OiXIzofuApPYHIkn9c+/hSRUyY6OHlfAT2laEq1uPTIMFSpsM1HXQdW+GDTVg7dWBqIiTx6i1YZxI6QHw+5wO3rareucyLWZ4Ig7vRzrufg36Tv1YtWm/+9P4mUv9fCoIEHuwmzfVSk4XEVFdqw96gFziM/pAqJcGE53dBX1QtuQ1KARzZ8UV29l1pONwRZQoOuMzS7IyAM7I+QNQ6Z5X7+tSr2KhKaB0QGCJ9p5gXwWg7apVkowdG8xbFEbZ9on1d7ckL0Uab+bQ6i1NTGRmBeX8nNj2Frio/ZXpZPkjsQAALf/9cpmcxhUxRHXoPEwAmWjCo2eWTgVFNlZR7RMaEikZDLeaIjduPleyGllvZlovJVeQ==|920
\ No newline at end of file
+}//MeqKO73Blg+sNNcuHaXiT9Vo+I7dmICZkHAgYq5Ezun13ETqwdvoxKIk04wsS8EiIzBm4pTnDr1fhr7d62gq9g+3xqmD70F7yOxjZKWfgmfaKwguGBei5Ng9XERhA6o0Igp4sBLC/jVQ711rIvOoZs5NReIvyN+f8sMsqJtY3HjJHEI3P2Rh5aqQ33nfPVkd5jUw/38teRr5d1TcZFVzD08jo7ON1LirmSB38rkQgeV9nhDjdyNdossWAdIRZ+Um+Kz3N7nhC6N56WIpuBUxFrg/fpMEzST4+Zr/QREEjQxAOeXAWEgFsJnTjhMNTvesm7ecmuc3vOB2cU+XwqjV4OSeF4G+TjTZg93kFolDsxgQVt+qa2PRYWOBbAVczEBZyEwZPIIf9nrp2A9fS/e6uzMn+Gq9zzJ0oQgYE5O8cbS06DV3gcfmGWMXM1q1CXB5DVgAeZuIlmqs6SmfHhklRUTHb8dLxB5z5nV7/I7TfoROX6B9bjS7pnZ1q4SFjb9aGRI5MVPqH474s3WS7os1jeU+XLXr2nePZT21WjNLe47W7/kVWMV5PEx38uNgZSPopbweUNKog/BEj7tiKe6Jy5ul04vuJVJn5OGJMl/UgNBfdz4OOdIajekIZ3F0ZugYxZ3+Ao2ORTT8gXifMJD6Q8ve4gf0ScG9wYikO6KSzfFDfPVHAJMhLkfXhfLPHYwqOE2UEds2oB9Log0CnL+Y0XQfWzxFeX+Rg6JfemeluH+VcYyIC/OPmnHxo01Fe9ubCj2UBLmGbI8AvYE9bfo5VpKXf/fLa1x4FABe6ueYOiCa8J7v2d7Cz91dse5u3BLTGS9hlUNLFYgXgWuSoeawr7lwAR3toeMGzVyf3hu4VKLMfQxfxmnkZbAwa7FOJQKirgn14HQS8pn56rR3FZOtaw==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json
index 20e56377..735c7739 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json
@@ -465,7 +465,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "a471446d-c08a-4fbe-98da-37fe374c2836"
+ "ID": "082f1ee9-0a8d-4329-9234-c1b4ef838e29"
},
{
"Condition": {
@@ -499,12 +499,66 @@
]
}
],
- "ID": "ee87f9d8-369a-401d-b0a6-3100b7e9abae"
+ "ID": "a5ab82f0-8cc1-498e-920e-93f3eaa13843"
},
{
"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": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+ "Title": "加载中"
+ },
+ {
+ "$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon",
+ "ShareCommandContainerRefer": {
+ "ShareCommandContainerID": "fb580c25-10dd-4f22-8d8b-580f1b78aab8"
+ },
+ "Params": [
+ {
+ "ParamReferObject": {
+ "ParamID": "6a721307-5546-48b1-944e-d04195469758",
+ "ShareCommandContainerReferObject": {
+ "ShareCommandContainerID": "fb580c25-10dd-4f22-8d8b-580f1b78aab8"
+ }
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务列表!任务ID"
+ }
+ }
+ ]
+ }
+ ],
+ "ID": "e4cfe992-75f1-4e59-a472-0a86b688c1ea"
+ }
+ ]
+ }
+ ],
+ "ParamProperties": {
+ "IsOK": "是否为确定",
+ "任务ID": "任务ID"
+ }
+ },
"PageName": "新增任务",
"PassValues": [
{
@@ -519,7 +573,7 @@
]
}
],
- "ID": "a9ce731d-bf5e-4910-82da-10bc857f16fb"
+ "ID": "2df17b4d-dc95-4c98-ac8a-f3c9337a0bd9"
}
]
}
@@ -987,7 +1041,7 @@
"LoadBindingDataOption": 1
}
],
- "ID": "36f12191-034f-4d47-a258-4f6a89676452"
+ "ID": "c2a9545e-0d4f-463a-a501-f9f0125fe783"
},
{
"CommandList": [
@@ -1026,12 +1080,12 @@
"LoadBindingDataOption": 1
}
],
- "ID": "044bbf79-2737-4cae-9cb8-09efa0e805a1"
+ "ID": "35a40881-1f1d-4341-98f1-32fb033bc582"
}
]
}
],
- "ID": "2251e56f-8a8c-4b70-ae64-4e71e21b05f3"
+ "ID": "ecb7c9d3-cd75-4ccc-8a9a-411b683407ba"
}
]
}
@@ -1359,4 +1413,4 @@
"Formula": "任务列表!$B$4"
}
]
-}//Q3xnfcdjQxcoorXw+7gnZXvoV7gBNg1BdlZ6ZiRUbnEcxVZcNHUkrKz0FXxtfTl2+9+pVC6V41up3oKxXGlTH3o+rruNcUVJt4c+6juftVl05bNvM0rDQeky5EW0A4busR+HvFxNWP885Bhay9PIPkI8DavhXiwKFwNn7gSHctAn7cvDu1ERIg6H5h0f0OC3vnGBVD5vVM7cuPAo1yaO5uttPN3c207QNzRAMVcp/IdOx9erdORVeD/AtH4OQrMHxoN8kWJnuGs2ypOBkTx0/vVN3c18MuoBuOSFWWoILoRM27YHogxtAb0SR0FSwkBw9pM2MMRvr24tpyXK+VKXUBiKPRV35W1gH/HCM50x1YEiUUvhKsdzdkciPMSK0KS7NKF2WXZLXsitsnSXOcgaUzDYfLNWDilNgrfiFJHA9SLOkMEfM0tvjdaFV+0Kw6GBWcbPhmbsfa4Y96MB2eEfVtLmpTPqtMSRX/HJ6MW5UN+yiP+obso/bWMiVNHVMyDZ5ArtHa7jXOuJ6aUBYssHnnNJQb6k4caJu/+kBwfDpaTNbiQeu4Ly1AoRkOsvmM+U6W7YiEFvleMU+gOaPYO42DyNBZkqCnuemXMWdQ/KDPjAF1Dv/uJtCuxe8HFurcjRJ0xKI3ymu+bD5ZH2VJ3qzqGhw2ZAUuClqqb+su4EGnsoNZseC2rsg3JCMIt5pLuipV9U96wrrmchzPM3s/5fESnO5JkxLSKsOvj7z2SZGZVLZ/cGv1LRBeZaRfMXPHl7EfbAvI8XLUW4oumyYskwK1reHKBQAi/EpwvOSfhrJKingbtnNKtWhh4gpVo6MP1KP7qelrYapLIwifURJlGsF8a+kVN2UETbIG+JJ19COs5NHQJr+Qjazt2lwxkv9Zrg11zJciGEW+XhQoCVRbcLFg==|920
\ No newline at end of file
+}//kwLCNG5vArySKv6yjru7o7mr1rEqPm9qI5WZjV4VEH1DjnVWhxbrdbTNA3PJ2kyVVTW4CK2lM1a/WLP08XhlkmTCOB56r3ASLyj7yFPedWdifKY75l+pz5Y1ycQ36xNKjYn1X/0T2p+0ACTZ5dUP9/Sswd3mqzhiiZuYWSCZvjSI2N+ECP5OIrw1TSgdwcG+lp9XFjmKMJTid8HkPYnUY/WrnGREOEpdspB5YTyUU8wD/fDpYOpbF0rBIh8J9/eA+iYqLn23h+kt7HuUZQDiJIt8dwF197VhF4HM/aTe+4d4UqSGguEoau6uVmrQo9h8ZuLUbzurW9+fF+aYFAP6r8EFBen4TO86X2z9fF3SwOg6Wov4fR0IhPAFLMiQGHRYzmTaV/qi9nFOwsRAG1IFnQnubC+jfjbr3/fjNloew8fYYH4nQKjw50INIO9e9x8A7TCPBye1g1nZbhJlkubY+X9M4JqOk4a3AXJTxo8YxWeg94moJY0KmLccZxyGY0ruiHFeWs4RUiyqLzvaBLfzeSWHnAegLbI+sug1/vyTi3tb1kwV3Sn6Wmfws7XjIDsz9vsI+sDCkLHXIpGLuHqmxivFwmS3ghfMiQ9m38KqhsnBs6yJb8i8Z05utpz9DAPO+px85TNojNxJ2DN3lk/1OHCvNhTcfAsF4/7hCUYrNAaMlGgvaXM5d+YwtUJuKJXWbnLZ0YLzo+Qw0tPOE70TR/2LWC++9iU1tfcBb8NgT9gkR1HZImfSK/zeueObomy1ChjN1ZW8sQSQLlJ1nM6Z062cNYFBpGjqpKqD9NfToSLkCbXzgzs96AwoSUZNturGaPcSks48qa+iPI2oiLIUR2VHFHTpXB9p1qsm1OFJEZkHoiSUqN9T0FnVDZJSpTVGsbN/gkPEYgjEj8PCSaGDJA==|920
\ No newline at end of file
diff --git a/Plugin/Unlayer-9_0_103_0(1).zip b/Plugin/Unlayer-9_0_103_0(1).zip
new file mode 100644
index 00000000..fcc29ef4
Binary files /dev/null and b/Plugin/Unlayer-9_0_103_0(1).zip differ
diff --git a/Process/任务分配流程.bpmn b/Process/新增任务流程.bpmn
similarity index 62%
rename from Process/任务分配流程.bpmn
rename to Process/新增任务流程.bpmn
index e3e0c184..80353ca3 100644
--- a/Process/任务分配流程.bpmn
+++ b/Process/新增任务流程.bpmn
@@ -4,7 +4,7 @@
-
+
@@ -14,18 +14,17 @@
-
+
_4f4ab1b2-ce52-46c6-bcc8-52c43b0c4a9f
- Flow_1cryizq
- _9fac5c71-636e-41e6-915a-49a1e7b67072
+ Flow_0otbu5x
-
+
- _9fac5c71-636e-41e6-915a-49a1e7b67072
- Flow_1yepfaf
+ Flow_0otbu5x
+ Flow_1bfvbmv
${nrOfCompletedInstances > 0}
@@ -34,77 +33,33 @@
- Flow_07xobdn
+ Flow_1bfvbmv
-
+
-
+
- ${sequenceFlowResolver.getConditionResult(execution,'_9fac5c71-636e-41e6-915a-49a1e7b67072')}
-
+
-
+
- Flow_1yepfaf
- Flow_07xobdn
- Flow_1cryizq
-
-
-
-
-
- ${sequenceFlowResolver.getConditionResult(execution,'Flow_1yepfaf')}
-
-
-
-
-
- ${sequenceFlowResolver.getConditionResult(execution,'Flow_07xobdn')}
-
-
-
-
-
- ${sequenceFlowResolver.getConditionResult(execution,'Flow_1cryizq')}
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
@@ -125,14 +80,11 @@
-
+
-
+
-
-
-
\ No newline at end of file
diff --git a/Process/任务分配流程.json b/Process/新增任务流程.json
similarity index 96%
rename from Process/任务分配流程.json
rename to Process/新增任务流程.json
index f6c1a8cb..b438f3bb 100644
--- a/Process/任务分配流程.json
+++ b/Process/新增任务流程.json
@@ -1,5 +1,5 @@
{
- "Name": "任务分配流程",
+ "Name": "新增任务流程",
"PermissionData": {
"$type": "Forguncy.RbacPermission.Core.Impl.BpmProcess.BpmProcessPermissionData, Forguncy.RbacPermission.Core",
"permissionResource": {
diff --git a/ServerCommands/任务/任务发起流程前校验.json b/ServerCommands/任务/任务发起流程前校验.json
new file mode 100644
index 00000000..fe785656
--- /dev/null
+++ b/ServerCommands/任务/任务发起流程前校验.json
@@ -0,0 +1,492 @@
+{
+ "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
+ }
+ }
+ ]
+ }
+ ],
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon",
+ "TryCommandPart": {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "任务信息",
+ "TableValue": {
+ "TableName": "任务表",
+ "TableValueType": 1,
+ "BindingInfos": [
+ {
+ "GUID": "4c1c012a-0ad0-4338-9430-f1b70ac7a764",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "项目ID",
+ "GUID": "50961c18-f454-469e-ae8f-eb11862b1148"
+ },
+ "ColumnName": "项目ID"
+ },
+ {
+ "GUID": "3026ea11-e179-43fe-a731-1f3acd8031cf",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "父任务ID",
+ "GUID": "d043ddbd-c8a3-4a31-a47e-bcdac7551398"
+ },
+ "ColumnName": "父任务ID"
+ },
+ {
+ "GUID": "dc74514b-fa27-45ec-b5a9-349e11ddb9fb",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "项目ID",
+ "GUID": "a6f8cca7-5575-4839-9365-ffebe1facca9",
+ "RelationBinding": {
+ "RelatedTable": "项目表",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "ID",
+ "NextRelationBinding": {
+ "RelatedTable": "View_项目统计信息",
+ "RelatedColumn": "项目ID",
+ "DisplayColumn": "项目预算工时"
+ }
+ }
+ },
+ "ColumnName": "项目预算工时"
+ },
+ {
+ "GUID": "c646f8aa-9325-4c7f-9a46-94c95431c000",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "项目ID",
+ "GUID": "69975d40-afe9-4bc8-b156-b06f8e589350",
+ "RelationBinding": {
+ "RelatedTable": "项目表",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "ID",
+ "NextRelationBinding": {
+ "RelatedTable": "View_项目统计信息",
+ "RelatedColumn": "项目ID",
+ "DisplayColumn": "已分配任务工时"
+ }
+ }
+ },
+ "ColumnName": "已分配任务工时"
+ },
+ {
+ "GUID": "3d5bcd8b-de08-4dab-aa99-10b672410d22",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "项目ID",
+ "GUID": "3256ecff-7321-48f2-9e3e-5aefeaac7b90",
+ "RelationBinding": {
+ "RelatedTable": "项目表",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "项目经理"
+ }
+ },
+ "ColumnName": "项目经理"
+ },
+ {
+ "GUID": "57be8a25-ac7d-4f4c-b0cc-5fefcfdb476e",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "项目ID",
+ "GUID": "3b610fae-f462-4d6d-ba6e-e6b24dfce8af",
+ "RelationBinding": {
+ "RelatedTable": "项目表",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "工时分配方式"
+ }
+ },
+ "ColumnName": "工时分配方式"
+ },
+ {
+ "GUID": "683595d8-69c4-47e0-8f9f-bb05e7732a15",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "任务预算工时",
+ "GUID": "2d53d463-1d5c-4117-aa9a-796165ad9c89"
+ },
+ "ColumnName": "任务预算工时"
+ },
+ {
+ "GUID": "34ff6d56-84e4-4f3f-a6f9-7528e5968792",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "项目ID",
+ "GUID": "b688b437-4733-4102-9763-f9dee3d372cd",
+ "RelationBinding": {
+ "RelatedTable": "项目表",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "严格模式"
+ }
+ },
+ "ColumnName": "严格模式"
+ },
+ {
+ "GUID": "10ec1395-5a81-4cbc-acd8-8d1ef6996c99",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "执行者",
+ "GUID": "3f7a6d55-8578-48be-b14a-ba4a6e17f266"
+ },
+ "ColumnName": "执行者"
+ },
+ {
+ "GUID": "40f27bbb-15e6-4e5b-8b04-41454bab1753",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "任务类型",
+ "GUID": "050b2a2a-e802-4280-bc06-10d5e76c4e35"
+ },
+ "ColumnName": "任务类型"
+ },
+ {
+ "GUID": "98dd52fd-9eef-4268-9769-5bee88e24f8b",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "版本",
+ "GUID": "1fa6cc05-da37-4315-b822-951a8b751213"
+ },
+ "ColumnName": "版本"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "ID",
+ "GUID": "ae5a57e8-074d-401e-9d6b-c85747f92057"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务ID"
+ }
+ },
+ "NullFormulaValueQueryPolicy": 0,
+ "TopCount": "1"
+ },
+ "ID": "991ad217c6604c978bfc5749b20e6e33"
+ },
+ {
+ "$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%"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": "当前项目未指定项目经理，请指定后再试"
+ }
+ ],
+ "ID": "bcf16cb9-2079-423a-a1b6-33293e2f563e"
+ }
+ ]
+ },
+ {
+ "$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%"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": "请指定任务执行者"
+ }
+ ],
+ "ID": "deb73d93-205e-463a-8d34-5b5bfb1477e9"
+ }
+ ]
+ },
+ {
+ "$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%"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": "请指定任务类型"
+ }
+ ],
+ "ID": "20c338d7-189f-4ec9-8fe0-7f69ab5ba813"
+ }
+ ]
+ },
+ {
+ "$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%"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": "请为任务指定版本"
+ }
+ ],
+ "ID": "91321071-f269-486e-8efc-434263349f4e"
+ }
+ ]
+ },
+ {
+ "$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": "1"
+ },
+ "CommandList": [
+ {
+ "$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": "=任务信息.父任务ID"
+ }
+ },
+ "value": "%Null%"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "预算工时上限",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务信息.项目预算工时-任务信息.已分配任务工时"
+ },
+ "ID": "ff74d835958740a18c9a43517e5fe004"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "层级",
+ "ParameterValue": "1",
+ "ID": "2a21b817513b444c9cb3a0316de2a9cc"
+ }
+ ],
+ "ID": "c519e38d-63bd-4a93-a2bf-6f4b2c414c9f"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "父任务",
+ "TableValue": {
+ "TableName": "任务表",
+ "TableValueType": 1,
+ "BindingInfos": [
+ {
+ "GUID": "6760dadc-d949-4b45-ae70-50c034c806de",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "层级",
+ "GUID": "71447dd9-ed15-40d3-8c95-35af02be1228"
+ },
+ "ColumnName": "层级"
+ },
+ {
+ "GUID": "eb1e2579-cb27-4219-8c94-c22b985b827f",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "任务预算工时",
+ "GUID": "f2ea1508-f30e-412f-a345-3ede9d6c420d"
+ },
+ "ColumnName": "任务预算工时"
+ },
+ {
+ "GUID": "435b9b45-862d-4a31-91e3-5b4e9ce75489",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "总计划工时",
+ "GUID": "1d7f0d26-c3c4-4fd5-9d35-d8c6775d2e75"
+ },
+ "ColumnName": "总计划工时"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "ID",
+ "GUID": "a11173ee-ce04-46d5-a2fe-57bac8f3d19f"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务信息.父任务ID"
+ }
+ },
+ "NullFormulaValueQueryPolicy": 0,
+ "TopCount": "1"
+ },
+ "ID": "a772fe34c2594bce9ced25c057497185"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "预算工时上限",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=父任务.任务预算工时-父任务.总计划工时"
+ },
+ "ID": "1f803427f50543e3bbc7d34be52ae616"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "层级",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=父任务.层级+1"
+ },
+ "ID": "18d496286fcd41938205ec186b6d6fb4"
+ }
+ ],
+ "ID": "4afddd1e-6ec5-43b3-bd8a-62b9d375d848"
+ }
+ ],
+ "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限"
+ },
+ {
+ "$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": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=预算工时"
+ },
+ "compareType": 4
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=IF(任务信息.父任务ID>0,\"预算工时超标：父任务可只配计划工时不足，请修改后提交！\",\"预算工时超标：项目可只配计划工时不足，请修改后提交！\")"
+ }
+ }
+ ],
+ "ID": "04713767-c4db-4ac2-a6d2-8c9fd52d435e"
+ }
+ ]
+ }
+ ],
+ "ID": "8cf18dc0-128a-476c-b041-a5be5f57bc47"
+ }
+ ],
+ "Comments": "校验工时情况是否通过"
+ },
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "0",
+ "Message": "任务校验通过"
+ }
+ ]
+ },
+ "CatchCommandPart": {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=ExceptionCode"
+ },
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=ExceptionMessage"
+ }
+ }
+ ]
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/ServerCommands/任务/发起任务流程.json b/ServerCommands/任务/发起任务流程.json
new file mode 100644
index 00000000..423c0cda
--- /dev/null
+++ b/ServerCommands/任务/发起任务流程.json
@@ -0,0 +1,407 @@
+{
+ "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
+ }
+ }
+ ]
+ }
+ ],
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon",
+ "TryCommandPart": {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "任务",
+ "TableValue": {
+ "TableName": "任务表",
+ "TableValueType": 1,
+ "BindingInfos": [
+ {
+ "GUID": "29ef26eb-d840-4c9a-9c95-7fb94555e468",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "任务名称",
+ "GUID": "23b7dbfa-171e-4463-a302-07dcc9e15141"
+ },
+ "ColumnName": "任务名称"
+ },
+ {
+ "GUID": "455904f9-0302-4dba-bbb7-9ca41568b71a",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "执行者",
+ "GUID": "a1fbd5f9-b9e7-48e1-ba59-913b1aee850d"
+ },
+ "ColumnName": "执行者"
+ },
+ {
+ "GUID": "30cf70fc-ce55-4877-85d9-ee42f17546d5",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "项目ID",
+ "GUID": "2dcf421f-4618-413d-873f-88bb355c8d8e",
+ "RelationBinding": {
+ "RelatedTable": "项目表",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "项目经理"
+ }
+ },
+ "ColumnName": "项目经理"
+ },
+ {
+ "GUID": "5078d1a6-51b3-4c5a-87a8-4bb42d3bc3c4",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "项目ID",
+ "GUID": "6209726f-6934-4ee5-b1ad-98534c6bfa4f",
+ "RelationBinding": {
+ "RelatedTable": "项目表",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "项目状态"
+ }
+ },
+ "ColumnName": "项目状态"
+ },
+ {
+ "GUID": "6cde8ce1-69da-4f09-95af-5f939077380d",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "任务状态",
+ "GUID": "023c19f4-f67f-4a16-ad52-7047a5897f4b"
+ },
+ "ColumnName": "任务状态"
+ },
+ {
+ "GUID": "9425dcd6-ee84-4cff-8cb0-32f8e2b5ef9b",
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "流程实例ID",
+ "GUID": "eb2c2ccd-767e-4d72-a9e7-fb88915964bd"
+ },
+ "ColumnName": "流程实例ID"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "ID",
+ "GUID": "4c5addad-85da-4ff4-8b0c-2fe87e45f6ba"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务ID"
+ }
+ },
+ "TopCount": "1"
+ },
+ "ID": "3d8ab8d2f0924421bdd75fb25888a8d5"
+ },
+ {
+ "$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.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+ "ParamObject": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务.项目状态"
+ }
+ },
+ "value": "2",
+ "compareType": 1
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+ "ParamObject": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务.任务状态"
+ }
+ },
+ "value": "0"
+ },
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+ "ParamObject": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务.任务状态"
+ }
+ },
+ "value": "-1"
+ }
+ ],
+ "RelationType": 1
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon",
+ "ProcessDefinitionResourceName": "新增任务流程",
+ "ProcessInstanceName": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务.任务名称"
+ },
+ "SelectedTable": "任务表",
+ "RowsToUpdate": 1,
+ "RowsToUpdateCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "ID",
+ "GUID": "5890a609-fa92-4828-958b-5b13d2752057"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务ID"
+ }
+ },
+ "ReturnResultName": "发起流程结果"
+ },
+ {
+ "$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": "=任务.流程实例ID"
+ }
+ },
+ "value": "%Null%",
+ "compareType": 1
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "查找任务",
+ "TableValue": {
+ "TableName": "ACT_HI_TASKINST_View",
+ "TableValueType": 1,
+ "BindingInfos": [
+ {
+ "GUID": "a2b011dc-2a16-473b-b3b9-bde26f13bddc",
+ "BindingInfo": {
+ "TableName": "ACT_HI_TASKINST_View",
+ "ColumnName": "ID_",
+ "GUID": "d0536ada-ff9c-4df5-b489-a0684ae8005a"
+ },
+ "ColumnName": "ID"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "ACT_HI_TASKINST_View",
+ "ColumnName": "PROC_INST_ID_",
+ "GUID": "ce528664-a069-42b1-b4cf-26f468c181cc"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=发起流程结果.ID"
+ }
+ },
+ "TopCount": "1",
+ "OrderBySqlCondition": {
+ "OrderByColumns": [
+ {
+ "ColumnBindingInfo": {
+ "TableName": "ACT_HI_TASKINST_View",
+ "ColumnName": "START_TIME_",
+ "GUID": "c84da339-3220-4914-9160-e9893d78bfcf"
+ },
+ "Order": 1
+ }
+ ]
+ }
+ },
+ "ID": "df4ba27143da4ef1926f2b05f3ad6c05"
+ },
+ {
+ "$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.ProcessTaskCommand, ServerDesignerCommon",
+ "TaskId": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=查找任务.ID"
+ },
+ "CustomOperationName": "提交",
+ "Operator": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务.执行者"
+ },
+ "Comment": "系统自动提交"
+ },
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "0",
+ "Message": "发起流程成功！"
+ }
+ ],
+ "ID": "538a870c-2dbd-457c-8376-cdd65a13778e"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "0",
+ "Message": "发起流程成功，请在任务首页手动提交！"
+ }
+ ],
+ "ID": "686eac20-159f-47b3-af18-98b561a23926"
+ }
+ ]
+ }
+ ],
+ "ID": "b0afa112-c3bf-436e-8825-7ca3c4ea827a"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": "发起流程失败"
+ }
+ ],
+ "ID": "28d09d00-0c63-411d-9671-d9638d8dea95"
+ }
+ ]
+ }
+ ],
+ "ID": "0db22abd-802d-4a9a-82d2-a4916ff55327"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": "当前任务状态不允许发起申请！"
+ }
+ ],
+ "ID": "3d464f63-1e9b-4b73-befc-de21f74f4c38"
+ }
+ ]
+ }
+ ],
+ "ID": "25f8696e-7e2d-49f4-86ef-2328e2871047"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": "当前项目已不在进行中状态，无法提交任务！"
+ }
+ ],
+ "ID": "82f89f99-1a71-4c38-ad54-5f4e2a48f03d"
+ }
+ ]
+ }
+ ],
+ "ID": "bc582f6e-8cf5-474b-8183-43f925a4937c"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": "任务不存在"
+ }
+ ],
+ "ID": "baf44142-3577-44d7-a831-1077b74eeb08"
+ }
+ ]
+ }
+ ]
+ },
+ "CatchCommandPart": {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=ExceptionCode"
+ },
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=ExceptionMessage"
+ }
+ }
+ ]
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/ServerCommands/任务/新增任务.json b/ServerCommands/任务/新增任务.json
deleted file mode 100644
index dc2781cb..00000000
--- a/ServerCommands/任务/新增任务.json
+++ /dev/null
@@ -1,919 +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": "父任务ID",
- "DataValidationInfo": {}
- },
- {
- "Name": "任务标题",
- "DataValidationInfo": {
- "IgnoreBlank": false
- }
- },
- {
- "Name": "执行人",
- "DataValidationInfo": {}
- },
- {
- "Name": "成员ID数组",
- "DataValidationInfo": {}
- },
- {
- "Name": "开始日期",
- "DataValidationInfo": {}
- },
- {
- "Name": "结束日期",
- "DataValidationInfo": {}
- },
- {
- "Name": "任务分组",
- "DataValidationInfo": {}
- },
- {
- "Name": "任务类型",
- "DataValidationInfo": {}
- },
- {
- "Name": "任务版本",
- "DataValidationInfo": {}
- },
- {
- "Name": "预算工时",
- "DataValidationInfo": {}
- },
- {
- "Name": "任务说明",
- "DataValidationInfo": {}
- },
- {
- "Name": "收集反馈",
- "DataValidationInfo": {}
- },
- {
- "Name": "备注",
- "DataValidationInfo": {}
- }
- ]
- }
- ],
- "Commands": [
- {
- "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon",
- "TryCommandPart": {
- "CommandList": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "项目统计",
- "TableValue": {
- "TableName": "View_项目统计信息",
- "TableValueType": 1,
- "BindingInfos": [
- {
- "GUID": "eb0e2733-cab5-46e5-9a71-a6c0c06a64d7",
- "BindingInfo": {
- "TableName": "View_项目统计信息",
- "ColumnName": "项目ID",
- "GUID": "2034ef31-0cc6-4b1f-8509-345a85d550c4",
- "RelationBinding": {
- "RelatedTable": "项目表",
- "RelatedColumn": "ID",
- "DisplayColumn": "项目经理"
- }
- },
- "ColumnName": "项目经理"
- },
- {
- "GUID": "a2ea47d0-850d-46fa-a000-6778dabf41dc",
- "BindingInfo": {
- "TableName": "View_项目统计信息",
- "ColumnName": "项目ID",
- "GUID": "8be465f9-1173-4551-ba9c-8077e9e1068a",
- "RelationBinding": {
- "RelatedTable": "项目表",
- "RelatedColumn": "ID",
- "DisplayColumn": "严格模式"
- }
- },
- "ColumnName": "严格模式"
- },
- {
- "GUID": "11caee44-d58a-4170-bd43-a87e850252e9",
- "BindingInfo": {
- "TableName": "View_项目统计信息",
- "ColumnName": "项目预算工时",
- "GUID": "c3f88088-ff8f-4ba4-b4b8-0b9b680f51b1"
- },
- "ColumnName": "项目预算工时"
- },
- {
- "GUID": "4bf2aa08-e266-4579-a82f-501fb8455316",
- "BindingInfo": {
- "TableName": "View_项目统计信息",
- "ColumnName": "已分配任务工时",
- "GUID": "ec163591-391a-496f-b95b-2b30be766815"
- },
- "ColumnName": "已分配任务工时"
- }
- ],
- "SqlCondition": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "View_项目统计信息",
- "ColumnName": "项目ID",
- "GUID": "f6308398-2aec-4b4a-9e2a-ec524facb605"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目ID"
- }
- },
- "TopCount": "1"
- },
- "ID": "bdd4321c439e40139d19baeb5c4269d0"
- },
- {
- "$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": "1"
- },
- "CommandList": [
- {
- "$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": "=父任务ID"
- }
- },
- "value": "%Null%"
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "预算工时上限",
- "ParameterValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目统计.项目预算工时-项目统计.已分配任务工时"
- },
- "ID": "9dce806ffef440e7b85e5861422b0269"
- },
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "层级",
- "ParameterValue": "1",
- "ID": "289bf7d065ed4d829192ec2cfcd1aff9"
- }
- ],
- "ID": "cc68789f-08b0-4fa6-a1ef-d8ff4f599946"
- },
- {
- "CommandList": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "父任务",
- "TableValue": {
- "TableName": "任务表",
- "TableValueType": 1,
- "BindingInfos": [
- {
- "GUID": "4220f490-afe2-402e-bd98-a653a2aea5f0",
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "层级",
- "GUID": "71447dd9-ed15-40d3-8c95-35af02be1228"
- },
- "ColumnName": "层级"
- },
- {
- "GUID": "8dadbb8e-0c03-4e6e-8851-50c04726233c",
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "任务预算工时",
- "GUID": "f2ea1508-f30e-412f-a345-3ede9d6c420d"
- },
- "ColumnName": "任务预算工时"
- },
- {
- "GUID": "1c8bc67f-a6be-4284-b183-031402f0c0ac",
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "总计划工时",
- "GUID": "1d7f0d26-c3c4-4fd5-9d35-d8c6775d2e75"
- },
- "ColumnName": "总计划工时"
- }
- ],
- "SqlCondition": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "任务表",
- "ColumnName": "ID",
- "GUID": "a11173ee-ce04-46d5-a2fe-57bac8f3d19f"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=父任务ID"
- }
- },
- "NullFormulaValueQueryPolicy": 0,
- "TopCount": "1"
- },
- "ID": "0cb2c214b7bd4342b32ca610904d9cd0"
- },
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "预算工时上限",
- "ParameterValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=父任务.任务预算工时-父任务.总计划工时"
- },
- "ID": "fb21eb10cb6c45faa4f7f1f93def7cf5"
- },
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "层级",
- "ParameterValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=父任务.层级+1"
- },
- "ID": "cbfea9db3fa545839e30188fb7c9dfba"
- }
- ],
- "ID": "d3139f10-cd54-42de-8c03-c565033d980b"
- }
- ],
- "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限"
- },
- {
- "$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": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=预算工时"
- },
- "compareType": 4
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
- "ErrorCode": "400",
- "Message": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=IF(父任务ID>0,\"预算工时超标：父任务可只配计划工时不足，请修改后提交！\",\"预算工时超标：项目可只配计划工时不足，请修改后提交！\")"
- }
- }
- ],
- "ID": "b9f39510-1b0d-4666-b3c2-3854a8607477"
- }
- ]
- }
- ],
- "ID": "74a1d017-09a1-41ad-b923-cc81d39fe37d"
- }
- ]
- },
- {
- "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon",
- "CommandList": [
- {
- "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
- "TableName": "任务表",
- "UpdateType": "add",
- "ShowConfirm": false,
- "UpdateBindingValues": [
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "项目ID",
- "GUID": "4591d628-7cff-49e1-9a02-835c93cd83b4"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目ID"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "父任务ID",
- "GUID": "7c7599bc-e14f-4fee-a7b6-6f3e63fc0a81"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=父任务ID"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "任务名称",
- "GUID": "70479fde-ceb9-432f-ab11-b9e201e53452"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务标题"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "执行者",
- "GUID": "fe1b1ef8-b4cc-4ec5-9607-ed79af9eee62"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=执行人"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "开始时间",
- "GUID": "bd91151c-ab05-4c2f-960c-9a995ac74696"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=开始日期"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "结束时间",
- "GUID": "f3b150ce-78ee-4e9a-92b3-341a86a973b8"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=结束日期"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "任务类型",
- "GUID": "952fffb6-c470-4cee-b86a-75f36212dd02"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务类型"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "分组ID",
- "GUID": "a34aca75-9d7c-423f-ae22-eca9bcb8b784"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务分组"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "版本",
- "GUID": "69965d07-acb5-446d-b82b-974551f2f83b"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "任务说明",
- "GUID": "872f6ea6-9484-4846-b268-ceda654333f8"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务说明"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "备注",
- "GUID": "0d19d5f4-5452-4b46-9935-3ec880c5002e"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=备注"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "层级",
- "GUID": "fb08986f-e8fc-4f81-b5d3-5af4f2c842d4"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=层级"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "任务预算工时",
- "GUID": "ce9c89dc-183d-41de-8115-bd04207bd3c4"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=预算工时"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "任务状态",
- "GUID": "e745c5f9-9101-4ff2-98c0-7a247bfda7aa"
- },
- "Value": "0"
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "进度",
- "GUID": "67710ba6-e18a-4789-92c8-1a74f9fe8bb9"
- },
- "Value": "0"
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "收集反馈",
- "GUID": "eed842c2-50bc-4645-b865-1aa2894a3674"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=收集反馈"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "功能名称",
- "GUID": "b6600f24-bc37-49e7-8f4b-9c41b7602444"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务标题"
- }
- }
- ],
- "ParamNameToSaveNewRowValue": "新任务"
- },
- {
- "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
- "TableName": "项目动态",
- "UpdateType": "add",
- "ShowConfirm": false,
- "UpdateBindingValues": [
- {
- "BindingInfo": {
- "TableName": "项目动态",
- "ColumnName": "项目ID",
- "GUID": "31eb548b-adb3-48be-9d21-8a3b2b108e5b"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目ID"
- }
- },
- {
- "BindingInfo": {
- "TableName": "项目动态",
- "ColumnName": "项目动态",
- "GUID": "2a172271-2baa-4386-a99b-a87f099d2e7a"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=\"新增任务[\"&任务标题&\"]\""
- }
- },
- {
- "BindingInfo": {
- "TableName": "项目动态",
- "ColumnName": "执行人",
- "GUID": "8094c996-c8cc-4d1e-bd80-b4b5d43227d4"
- },
- "Value": "%CurrentUser%"
- }
- ]
- },
- {
- "$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": "=成员ID数组"
- }
- },
- "value": "%Null%",
- "compareType": 1
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "项目成员数组",
- "TableValue": {
- "TableName": "项目成员表",
- "BindingInfos": [
- {
- "GUID": "8db255a5-9c7d-4684-93e6-592173e1c6c8",
- "BindingInfo": {
- "TableName": "项目成员表",
- "ColumnName": "ID",
- "GUID": "b72cf0b4-c471-44fa-b47b-a534a09cde3e"
- },
- "ColumnName": "ID"
- },
- {
- "GUID": "984f27e6-fd7d-41d5-8120-3af19b959bb1",
- "BindingInfo": {
- "TableName": "项目成员表",
- "ColumnName": "项目成员",
- "GUID": "f0d91e3d-8562-4bca-bb0f-4e9d7afd4d55"
- },
- "ColumnName": "项目成员"
- }
- ],
- "SqlCondition": {
- "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
- "CompareType": 8,
- "ColumnBindingInfo": {
- "TableName": "项目成员表",
- "ColumnName": "ID",
- "GUID": "9ac991d2-282b-43bb-bef9-a0b00a6be7e3"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=成员ID数组"
- }
- }
- },
- "ID": "44e1c4fa720445809ff43c066c0f47b9"
- },
- {
- "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon",
- "LoopInfo": {
- "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon",
- "LoopCount": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目成员数组"
- },
- "LoopItemParamName": "Item"
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
- "TableName": "任务成员表",
- "UpdateType": "add",
- "ShowConfirm": false,
- "UpdateBindingValues": [
- {
- "BindingInfo": {
- "TableName": "任务成员表",
- "ColumnName": "项目ID",
- "GUID": "c8bb32b5-4044-4c3f-b3f0-35999adceeca"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目ID"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务成员表",
- "ColumnName": "任务ID",
- "GUID": "51f4dfe8-cf9b-409b-880c-4cb56d2dac53"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新任务.ID"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务成员表",
- "ColumnName": "项目成员ID",
- "GUID": "85f0dc19-b87c-41fd-a580-014ab998bc60"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=Item.ID"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务成员表",
- "ColumnName": "参与人",
- "GUID": "c26e130d-b353-47b9-92c4-7e8615c3f6ac"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=Item.项目成员"
- }
- }
- ]
- }
- ]
- }
- ],
- "ID": "bec25113-44bd-4d82-97ce-95fd7d0d88fd"
- }
- ]
- }
- ]
- },
- {
- "$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": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=执行人"
- }
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
- "TableName": "任务表",
- "ShowConfirm": false,
- "RowsToUpdate": 1,
- "RowsToUpdateCondition": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "任务表",
- "ColumnName": "ID",
- "GUID": "e6b219e9-9009-4421-b6aa-0713c9772f99"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新任务.ID"
- }
- },
- "UpdateBindingValues": [
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "任务状态",
- "GUID": "e6e8b427-3747-4bbb-827b-87c08314fbd4"
- },
- "Value": "2"
- }
- ]
- }
- ],
- "ID": "4c0c29d2-8fdc-4fe4-9f57-b99a9ce37352"
- },
- {
- "CommandList": [
- {
- "$type": "Forguncy.Model.ProcessStartCommand, ServerDesignerCommon",
- "ProcessDefinitionResourceName": "任务分配流程",
- "ProcessInstanceName": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务标题"
- },
- "SelectedTable": "任务表",
- "RowsToUpdate": 1,
- "RowsToUpdateCondition": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "任务表",
- "ColumnName": "ID",
- "GUID": "52e9bb6c-ca24-4679-ace6-9dc6dc05272f"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=新任务.ID"
- }
- },
- "Initiator": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=执行人"
- },
- "ReturnResultName": "发起流程结果"
- },
- {
- "$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": "=发起流程结果.ID"
- }
- },
- "value": "%Null%",
- "compareType": 1
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "查找任务",
- "TableValue": {
- "TableName": "ACT_RU_TASK_View",
- "TableValueType": 1,
- "BindingInfos": [
- {
- "GUID": "21325c47-6da6-4dd7-8cb8-b64561090a1f",
- "BindingInfo": {
- "TableName": "ACT_RU_TASK_View",
- "ColumnName": "ID_",
- "GUID": "c935de77-cd56-4102-9a40-a306f3c2f21f"
- },
- "ColumnName": "ID"
- }
- ],
- "SqlCondition": {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "ACT_RU_TASK_View",
- "ColumnName": "PROC_INST_ID_",
- "GUID": "43f10c5c-ae7d-4360-a074-6b7cd28e3f5e"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=发起流程结果.ID"
- }
- },
- "TopCount": "1",
- "OrderBySqlCondition": {
- "OrderByColumns": [
- {
- "ColumnBindingInfo": {
- "TableName": "ACT_RU_TASK_View",
- "ColumnName": "CREATE_TIME_",
- "GUID": "71619b71-9d7c-46b6-9d9c-79db69560c17"
- },
- "Order": 1
- }
- ]
- }
- },
- "ID": "19e25811a64e447fb46b9e15100876f0"
- },
- {
- "$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.ProcessTaskCommand, ServerDesignerCommon",
- "TaskId": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=查找任务.ID"
- },
- "CustomOperationName": "提交",
- "Operator": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=执行人"
- },
- "Comment": "系统自动提交"
- }
- ],
- "ID": "d8e4f9b8-7380-43e1-8692-5635ba606b65"
- },
- {
- "CommandList": [
- {
- "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
- "ErrorCode": "400",
- "Message": "任务创建成功，请前往待办提交审批！"
- }
- ],
- "ID": "9385d55b-e6c4-43ee-897d-d04e172ae85f"
- }
- ]
- }
- ],
- "ID": "34814cb9-e373-4aad-aceb-be97ef5f1878"
- },
- {
- "CommandList": [
- {
- "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
- "ErrorCode": "400",
- "Message": "任务创建成功，发起流程失败！"
- }
- ],
- "ID": "5eb3bc06-917e-4dfb-a05c-3de4c4302ba1"
- }
- ]
- }
- ],
- "ID": "51acacd6-441f-44b5-8e6d-858c0e65ed5a"
- }
- ]
- },
- {
- "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
- "ErrorCode": "0",
- "Message": "新增任务成功！"
- }
- ]
- },
- "CatchCommandPart": {
- "CommandList": [
- {
- "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
- "ErrorCode": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=ExceptionCode"
- },
- "Message": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=ExceptionMessage"
- }
- }
- ]
- }
- }
- ]
-}
\ No newline at end of file
diff --git a/Tables/邮件模板表.json b/Tables/邮件模板表.json
new file mode 100644
index 00000000..4b669351
--- /dev/null
+++ b/Tables/邮件模板表.json
@@ -0,0 +1,75 @@
+{
+ "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",
+ "Required": true,
+ "DatabaseColumnType": "nvarchar",
+ "MaxLength": -1,
+ "Name": "模板名称",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "nvarchar",
+ "MaxLength": -1,
+ "Name": "设计模板",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+ "DatabaseColumnType": "nvarchar",
+ "MaxLength": -1,
+ "Name": "HTML模板",
+ "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",
+ "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"
+ ],
+ "Indexes": []
+}
\ No newline at end of file
diff --git a/UserControlPages/发表评论组件.json b/UserControlPages/发表评论组件.json
index f66dfecd..4456a258 100644
--- a/UserControlPages/发表评论组件.json
+++ b/UserControlPages/发表评论组件.json
@@ -32,12 +32,19 @@
},
"5": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 18.0
}
},
"6": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 7.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
}
},
"7": {
@@ -63,13 +70,13 @@
9
],
"Count": 10,
- "DefaultSize": 15.0
+ "DefaultSize": 10.0
},
"Cols": {
"RowColumnAttachedInfos": {
"0": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 32.0
}
},
"1": {
@@ -88,11 +95,6 @@
}
},
"4": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "5": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0,
"Mode": 2,
@@ -104,6 +106,11 @@
}
}
},
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
"6": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
@@ -113,38 +120,49 @@
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
- },
- "8": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
- }
- },
- "9": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
- }
}
},
- "Count": 10,
+ "Count": 8,
"DefaultSize": 32.0
},
"Values": {
- "7,6": "发送"
+ "7,5": "发送"
},
"AttachInfos": {
- "1,1": {
+ "1,0": {
"CellType": {
- "$type": "Forguncy.MultilineTextBox, ServerDesignerCommon",
- "WaterMark": {
+ "$type": "ElementUI.InputCellType, ElementUI",
+ "CommandList": [],
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 4,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "textarea",
+ "placeholder": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=IF(ISBLANK(发表评论组件!B10),\"请输入评论\",\"回复：\"&发表评论组件!B10)"
+ "SerializeProperty": "=IF(ISBLANK(发表评论组件!A10),\"请输入评论\",\"回复：\"&发表评论组件!A10)"
},
- "CommandList": []
+ "resize": "none"
},
- "DataValidationInfo": {},
"TemplateCellSource": "默认内容"
},
- "4,1": {
+ "4,0": {
"CellType": {
"$type": "FilePreviewer.FilePreviewer, FilePreviewer",
"UIPermissions": [
@@ -183,7 +201,7 @@
},
"TemplateCellSource": "默认附件"
},
- "7,1": {
+ "7,0": {
"CellType": {
"$type": "Forguncy.ImageCellType, ServerDesignerCommon",
"CommandList": [
@@ -191,7 +209,7 @@
"$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
"TargetPageElement": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=发表评论组件!B5"
+ "SerializeProperty": "=发表评论组件!A5"
},
"TargetType": "FilePreviewer.FilePreviewer, FilePreviewer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null",
"MethodName": "Upload"
@@ -202,15 +220,70 @@
"ImagePath": "图片.svg"
}
},
- "7,2": {
+ "7,1": {
"CellType": {
"$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "PopupDisplayMode": 1,
+ "Placement": {
+ "SerializeProperty": "=发表评论组件!B8"
+ },
+ "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": "=发表评论组件!A2"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=发表评论组件!A2&发表评论组件!选择图标"
+ }
+ }
+ ]
+ }
+ ],
+ "ID": "1b816291-417f-46a2-b2d9-92c75f4c0a80"
+ }
+ ]
+ }
+ ],
+ "ParamProperties": {
+ "IsOK": "是否为确定",
+ "选择图标": "选择图标"
+ }
+ },
+ "PageName": "选择图标"
+ }
+ ],
"ToolTip": "表情",
"Size": 18,
"ImagePath": "成功.svg"
}
},
- "7,3": {
+ "7,2": {
"CellType": {
"$type": "Forguncy.ImageCellType, ServerDesignerCommon",
"CommandList": [
@@ -220,28 +293,28 @@
{
"TargetCells": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=发表评论组件!B2"
+ "SerializeProperty": "=发表评论组件!A2"
},
"Value": "%Null%"
},
{
"TargetCells": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=发表评论组件!B5"
+ "SerializeProperty": "=发表评论组件!A5"
},
"Value": "%Null%"
},
{
"TargetCells": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=发表评论组件!B10"
+ "SerializeProperty": "=发表评论组件!A10"
},
"Value": "%Null%"
},
{
"TargetCells": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=发表评论组件!D10"
+ "SerializeProperty": "=发表评论组件!C10"
},
"Value": "%Null%"
}
@@ -253,7 +326,7 @@
"ImagePath": "垃圾桶.svg"
}
},
- "7,6": {
+ "7,5": {
"CellType": {
"$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
"CommandList": [
@@ -296,45 +369,37 @@
"TemplateKey": "_RS_Main3"
}
},
- "9,1": {
+ "9,0": {
"TemplateCellSource": "回复对象姓名"
},
- "9,3": {
+ "9,2": {
"TemplateCellSource": "回复对象ID"
}
},
"StyleDatas": {
"Styles": [
- {
- "FontSize": 13.333333333333332,
- "Formatter": 0,
- "VerticalAlignment": 1,
- "WordWrap": true
- },
- {
- "Foreground": 2
- },
- {
- "FontFamily": 3,
- "Foreground": 2
- },
{
"FontSize": 13.333333333333332
},
{
- "FontSize": 12.0,
- "Foreground": 4
+ "Foreground": 0
+ },
+ {
+ "FontFamily": 1,
+ "Foreground": 0
},
{
- "Background": 5,
"FontSize": 12.0,
- "HorizontalAlignment": 6
+ "Foreground": 2
+ },
+ {
+ "Background": 3,
+ "FontSize": 12.0,
+ "HorizontalAlignment": 4
}
],
"Types": {
"Strs": [
- "@",
- "Top",
"Text 1 50",
"Body",
"Accent 4 0",
@@ -343,29 +408,29 @@
]
},
"CellStyles": {
- "1,1": 0,
- "7,1": 1,
+ "1,0": 0,
+ "7,0": 1,
+ "7,1": 2,
"7,2": 2,
- "7,3": 2,
- "7,6": 3,
- "8,1": 1,
- "8,2": 2,
- "8,3": 4,
- "8,6": 3,
- "8,7": 3,
- "8,8": 3,
- "9,1": 5
+ "7,5": 0,
+ "8,0": 1,
+ "8,1": 2,
+ "8,2": 3,
+ "8,5": 0,
+ "8,6": 0,
+ "8,7": 0,
+ "9,0": 4
},
"SheetStyle": {
- "FontFamily": 3
+ "FontFamily": 1
}
},
"Spans": [
- "7,6,1,3",
- "4,1,1,8",
- "1,1,2,8",
- "9,1,1,2",
- "9,3,1,3"
+ "7,5,1,3",
+ "4,0,1,8",
+ "9,0,1,2",
+ "9,2,1,3",
+ "1,0,2,8"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon",
@@ -420,7 +485,7 @@
{
"TargetCells": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=发表评论组件!D10"
+ "SerializeProperty": "=发表评论组件!C10"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -430,7 +495,7 @@
{
"TargetCells": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=发表评论组件!B10"
+ "SerializeProperty": "=发表评论组件!A10"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -443,7 +508,7 @@
"$type": "SetFocusCommand.SetFocusCommand, SetFocusCommand",
"TargetCell": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=发表评论组件!B2"
+ "SerializeProperty": "=发表评论组件!A2"
}
}
]
@@ -501,7 +566,7 @@
]
}
],
- "ID": "16723adc-d110-4872-bb4b-3f224edbc718"
+ "ID": "d1dc8e82-8da3-4c96-a498-fc65731b1b75"
}
]
}
@@ -516,21 +581,5 @@
"PrintInfo": {
"PaperSize": {},
"Margin": {}
- },
- "BackgroundPictures": [
- {
- "Name": "f820e389-b9ca-4507-bacb-13a1c61e3d4a.png",
- "DisplayName": "背景图1",
- "StyleInfo": {
- "CornerRadius": 6.401041666666067,
- "Fill": "Background 1 0",
- "StrokeDashType": 8,
- "Stroke": "Background 2 0",
- "StrokeThickness": 1.0
- },
- "IsAutomaticStroke": false,
- "IsAutomaticFill": false,
- "Size": "271,203"
- }
- ]
-}//wqCQPove0jDoxbPmR1tCilTfWTcjI1QntAdSSEnvqpBq8X0K4KIgKeddf3uJfkGQ+NYcuKFjh2fD7oRE+1SVkU98D4DOpLqXXhL3hQ0M1paXTsklU3RY/pJaw39qYgqyNQeHV4b0K9BG76Q3c4B9OMtrtoglBF2gEqFOLshXds0u7MleYtgzRTEo1220SeyFTTJknPLxNxCCdq9ZeMh/RyL17KGiGKplQBBEOpsptb71r4WQ/cAyOeSKSDyxIBYus6BpjrwXUeW3jFkAsyPLyLfjEBh2DXgbv5ylK5p5pt4qKnoz6mT2kYliDN1vclhZyJSQKJ5lnOJYY/HWkNnHf1C8DVAoGdWdVy28PC927AlC405nU8bXYFZhWpGuoTHX+uCam6+GezFzz0t1rkMXBVFP0S8jD7Q1IBaPJ//tyagJ58gYIIMcSPOLIE4pNkkv6/ua0xvghQEwuIOPSJf3BK18WzFawHpM0hoexJWfQ6kY/vzEkd8b9AsctDf/0fBxnBUYjl4ynQcTa/6JRn7MmrnlPORZZbwb1mZdiO21Kz8hc2CZuvnUizS70Vzpqss0IGpQfeUcp+z6fozvBuvUtIeCjlpl28puV3DTmLmM9dGDW24CtEMHSy299yceAWALnMRKzUGmi3d74ZqyKcf7lGMA3FICWU/0YmZvGpEc8HkmRo4rsqqJiKIZaELsHK6F/reqZD1btXA8f57xO6t5XkJfW6Tt4AMFZf9+84mdNq6dC+TkxM1NGtyYLespPqCxNiEKEl1OH9r/13rk2wwODtq6FlKkUFogwKmaAlAYl6rrb+dtq0tBUS43Uw+fZ+KZU7mCbU2Gs3fNITERCV9ZEutjPJD2skUTx5QQaGQHGfWLNIkaR60QoIaGof5jE1AyBxCasp3jZFLuma1YpZ35gg==|920
\ No newline at end of file
+ }
+}//lBNupAwoheGLHnueI/SHrIxos/YmAZRHEQgTg0y9il6eVe1k2t4Saor63e2GKLG94Cc3kBFJhDvdtC068OA1Z/fFhRuhFsP0ayY4TFkrLiaev+V/X8aNuWVVm2cBsHHuIlhth0IpV+imtduULNKYN6U+uiPARUtdKgi7epzCyWQEP0lPDTP/VZXGh/hYEzY60AJCmGfsE9uoSfDaTixgw6fjMXg/0+teNE3X2MA123dHvhpQErx0+/kCWwvPjzR5TxkjZypkTRrzdEbCYmmDxak2NLLuUNA4lJ/Sv5L+ID6A+KEehg34SLeFFVwO+ww9IUOblMNO67EawsNijRnVkBvrE0LKKUkFaLUaJ4KPzxNYvcC4dajJ5ns0NsX1+HrtK2LABXzK4RRecW4W6QFeatLegSW/L8zYlKYcLNtlnDvqRJ1c33ARAORaMclgtz4lJZE4pWLl4QimnkUPrEvBGj3iY3AexrnKyT8liyEC1QbT4t/gIINe2LPJLQl7oV/9KRAWSB0yw0W4QdDDRfORetSZiesweFFZ3Se28hU6/7OTXLtTf0QbNmtaHyful44N2NiDdjwz6glJgFl6dzIAJHw4pYZkVzpTyK+bilyfZ4Ncw3RNrCWV9yeKSfNSaw9m0Mf07fPNg5LHHc/+to2elUDmF+lsi29ZRGfcbi+zHNP+kST3wmFW0v4iTWnYDhUVM+CRRkzAmSXIVXwTo5jsggHzFh+lOVxPzUBUbIuwgTLWpugDhOGubhNx88/CjFwMMGCsOFHTXYL3iSWXao8/wFw7sQ9jfpFNsrczGCw5Q4LFwd8Liu9v+7lwsyY1/cxXE6Q0dFzRgMQSXfdntzxn3kr/AvDQ1QUi0iEpT1Gxguv8JEHIy24xD9lyH7UPkRiyNgrGvQuvNzxIxkRfqlTL6Q==|920
\ No newline at end of file
diff --git a/UserControlPages/发表评论组件.rd b/UserControlPages/发表评论组件.rd
index a18afeab..d7a1c720 100644
--- a/UserControlPages/发表评论组件.rd
+++ b/UserControlPages/发表评论组件.rd
@@ -1,5 +1,5 @@
{
"PageType": 3,
- "ColumnCount": 10,
+ "ColumnCount": 8,
"RowCount": 10
}
\ No newline at end of file
diff --git a/UserControlPages/评论组件.json b/UserControlPages/评论组件.json
index f6a7a842..aedf45be 100644
--- a/UserControlPages/评论组件.json
+++ b/UserControlPages/评论组件.json
@@ -55,20 +55,15 @@
"RowColumnAttachedInfos": {
"0": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 20.0
}
},
"1": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 20.0
- }
- },
- "2": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 10.0
}
},
- "3": {
+ "2": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 248.0,
"Mode": 2,
@@ -80,11 +75,16 @@
}
}
},
- "4": {
+ "3": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 10.0
}
},
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0
+ }
+ },
"5": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 20.0
@@ -104,28 +104,18 @@
"GridRowColumnDefinition": {
"DesignLengthInPixel": 20.0
}
- },
- "9": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 20.0
- }
- },
- "10": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
- }
}
},
- "Count": 11
+ "Count": 9
},
"Values": {
- "1,3": "用户名",
- "1,5": "刚刚",
- "3,3": "xxxxxxxxxxx",
- "6,7": "回复"
+ "1,2": "用户名",
+ "1,4": "刚刚",
+ "3,2": "xxxxxxxxxxx",
+ "6,6": "回复"
},
"AttachInfos": {
- "1,1": {
+ "1,0": {
"CellType": {
"$type": "ElementUI.AvatarCellType, ElementUI",
"CommandList": [
@@ -151,7 +141,7 @@
},
"TemplateCellSource": "用户名"
},
- "1,3": {
+ "1,2": {
"CellType": {
"$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
"CommandList": [
@@ -175,13 +165,13 @@
},
"TemplateCellSource": "姓名"
},
- "1,5": {
+ "1,4": {
"TemplateCellSource": "时间"
},
- "3,3": {
+ "3,2": {
"TemplateCellSource": "内容"
},
- "5,3": {
+ "5,2": {
"CellType": {
"$type": "FilePreviewer.FilePreviewer, FilePreviewer",
"UIPermissions": [
@@ -221,7 +211,7 @@
},
"TemplateCellSource": "附件"
},
- "6,7": {
+ "6,6": {
"CellType": {
"$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
"CommandList": [
@@ -297,36 +287,36 @@
]
},
"CellStyles": {
- "1,3": 0,
- "1,5": 1,
- "1,7": 2,
- "1,9": 2,
- "3,3": 3,
- "3,7": 3,
- "3,9": 3,
+ "1,2": 0,
+ "1,4": 1,
+ "1,6": 2,
+ "1,8": 2,
+ "3,2": 3,
+ "3,6": 3,
+ "3,8": 3,
+ "4,2": 3,
"4,3": 3,
"4,4": 3,
"4,5": 3,
"4,6": 3,
"4,7": 3,
"4,8": 3,
- "4,9": 3,
- "5,3": 3,
+ "5,2": 3,
+ "6,2": 3,
"6,3": 3,
"6,4": 3,
"6,5": 3,
- "6,6": 3,
- "6,7": 4
+ "6,6": 4
},
"SheetStyle": {
"FontFamily": 8
}
},
"Spans": [
- "3,3,1,7",
- "1,5,1,5",
- "6,7,1,3",
- "5,3,1,7"
+ "3,2,1,7",
+ "1,4,1,5",
+ "6,6,1,3",
+ "5,2,1,7"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon",
@@ -424,7 +414,7 @@
]
}
],
- "ID": "2a0df8a4-d118-4c25-99ec-5c5c6eb6ea7f"
+ "ID": "4350894f-ddfb-4af3-be33-d1997b20f6ae"
}
]
}
@@ -440,4 +430,4 @@
"PaperSize": {},
"Margin": {}
}
-}//xoAoqO0Kdc3CXjpzf8qxv7qiTnVnMGms6q0wEDUY2rdhJCfhLOG0a0HPh0ejjkHkJT2/GycSWLZcjXbkPtJuZXbT7RJd3TV6VWwk6rFsL7yPHn5mCoKzv6wG+/ogfzKtcF5+aVcL+AT310D3SbfC2IA9mZhVyK327rBwIDYL4q1yZ2+Nht/JlOfYaLmpNrye0uHBu3pLc2XS9ySmIO5Sn2ahMWTGgAMS9YaW+9BkCF+L4M9Le/xBzn2+wNUrNM7hDsurdaNDRSlgBIlp3pbB4shHjxNUxFN3IfEN+xP/YX8FNRb7mf2ZOqBYnovoYLXN0j9n6lztQDcjI85LonYTF0tWcVbk+jYKVCX+YNpvGwlQd5Hnqx2uV+LjWdO4rPCMDDc+G7DeShv1Ym+lvuxSfMA8ZgZhS0LdEm2iJVQ5/jPEMjXtgSbv8gwtifH0bY0AlHtB9p1dtBrc73BgiKAh/HF7LE7GT2NCwpYK5WrW2wRuGwo3uyHzUd7y/igJhMbG+Pc1PEn0qRwWQrQeKgxYnr/V8yNge54VyzjkA0V54atoHM4v6mB4WCGtdBY1XrKRClIiCZtrk9ps5X/eH9htk1nPvazhKDOANeAcrrlQglKJcVrI2XXBoB6KKMOozD0IJnWpt9fXGuDyFFJXdiaGzLdaIKwSPQz+SyusI0eKTp2Z0MxmrV5Y4Od3HWwtC6c3BBI77B0Ry963wpG7A/SNK4V5haoXApnj5MlDkmUpxviyRNDQeRTcGJnB6gyaiEiidfEVl4S2Q+IJWGS9xuCE02n6Spxk3vhJJJhouzhex2/LsQKtn1fz352cx+kA/LmqdMSO2PyDYJdUjZREqd6kRjxA3qh7r66mzVrQX4qVqDjdqA4YAw40hA5CpVdGipRH8BIEGvKLfAt/1Vd1NUxNSg==|920
\ No newline at end of file
+}//+FbNpyFzxTdImbDybDr4PdrKDvhoLXBwZiuUEXtr0xEMuQyzpp9VrpAOJqJEghiqcKDEgYoctCzmLPiZlZIFF84z1nVoVyVq7BcOQWF/r/VEMrr8bV4KpMwFPnOAvedYlFShmwqBzXZq0YUAmxKRXDKIesoULoOh27TQuq4x2yl3aE/WI3jdeh0NA3j59KcnjNTjnDSTafOe+lHPIgXlSm9ywLzgUGlYZ2N3EC+DfvVqGbrWC+6lGYBY/ASHd2vjSp+XWW9EfZO6p3y6SwxGFyIEc+Ih2PVvpAX4NEebxCQzAB1ZPUGfWEuSqE0l7zyJQq5XEjKDsJid3me//4EW7Ro2ozp2fff6fONdOcphzDKw0tXLh1fTTK3rTSlVsMFtmQovF5yKzvP9/FFAWN1gyiutObUatyoZD8ImN+S15KfgOfg8XBO5Iu7H3DuwGBIsxaNUKs3JbtYT6Pt3ReoKE/69KPLgHvA51jb57BO4QHpCnxCG5K5SAMBasU/3cEnG2WdaQ+2bUG3HzLppSa4g/wdS85fIiqcpmwTJTl2XPrwk8sqw1GGriY46Ew56GveRH0auT2oXfajLnTZ4sDiSAnidkCxHIkfuncPmChb3t71lqt8VGTpp66ZQsyuJUAyN1ChZ9F4o83iKPaDk9qfqZTwpxe1W1qY2K6La08l/ZuSIWNzYU/Sx2QBGzA6h0lNKTcZ7pwB2Ugc3qS3r/tOMmkPxWQ2C6ZycOrs4ArDDjJoBVL2SGjamIWks4OoFZaNLzCYgIw/Q3QhMPo7PFLTvsWF+FyHGAkUt9pjEEc/t6DC8j+hOeKJ0MO3QJSMY3cUhb0fcJ01+UiDUPSv7eqHmEVfGS2/UHeQ8PtMxuV3/v2wBGbzZ9UeckRVGqMx9H5SoYs3XyV5jN9eYtDAy0JJ9BQ==|920
\ No newline at end of file
diff --git a/UserControlPages/评论组件.rd b/UserControlPages/评论组件.rd
index 88ab2d30..efa0f5c6 100644
--- a/UserControlPages/评论组件.rd
+++ b/UserControlPages/评论组件.rd
@@ -1,5 +1,5 @@
{
"PageType": 3,
- "ColumnCount": 11,
+ "ColumnCount": 9,
"RowCount": 8
}
\ No newline at end of file