diff --git a/.collaboration b/.collaboration
index f90c59b3..c34f2764 100644
--- a/.collaboration
+++ b/.collaboration
@@ -17,29 +17,11 @@
},
{
"ModuleName": "Table/项目表",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:19:45.0466933+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\项目任务\\项目表.json"
- ]
+ "ModuleType": 7
},
{
"ModuleName": "Table/任务表",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T13:21:50.0448626+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\任务\\任务表.json"
- ]
+ "ModuleType": 7
},
{
"ModuleName": "Table/任务类型",
@@ -155,29 +137,11 @@
},
{
"ModuleName": "PCPage/项目首页",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:34:07.791172+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目首页\\项目首页.json"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目标题",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:21:18.5561771+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目首页\\项目标题.json"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "Pages/项目首页/子页面",
@@ -193,29 +157,11 @@
},
{
"ModuleName": "PCPage/任务首页",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T13:22:23.9503772+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\任务首页.json"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/任务-基本信息",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T12:29:27.1804169+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\任务-基本信息.json"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/任务-任务信息",
@@ -223,16 +169,7 @@
},
{
"ModuleName": "PCPage/任务-侧栏",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T13:48:08.6875285+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\任务-侧栏.json"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "MasterPCPage/FGC_母版页",
@@ -244,20 +181,7 @@
},
{
"ModuleName": "Theme",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T12:29:27.1801392+08:00",
- "ModuleType": 9,
- "ToRemoveFiles": [
- "Theme\\CellTypeStyles",
- "Theme\\ListViewStyles",
- "Theme\\StyleDefaultNames",
- "Theme\\ThemeConfig",
- "Reports\\DefaultTheme.rdlx-theme"
- ]
+ "ModuleType": 9
},
{
"ModuleName": "image/内置图片",
@@ -305,18 +229,7 @@
},
{
"ModuleName": "UserService",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T12:44:27.0760874+08:00",
- "ModuleType": 11,
- "ToRemoveFiles": [
- "UserServiceDB.sqlite3",
- "CloudStorageProvider\\data.json",
- "SecurityProviderV2\\data.json"
- ]
+ "ModuleType": 11
},
{
"ModuleName": "CustomLibrary",
@@ -364,30 +277,11 @@
},
{
"ModuleName": "PCPage/任务-子任务列表",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:42:06.6514604+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\任务-子任务列表.json",
- "Pages\\558ca610fafc4ffd8884b819161bfd6.json"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/任务-关联资源",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:41:15.611872+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\任务-关联资源.json"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/任务-工时",
@@ -395,17 +289,7 @@
},
{
"ModuleName": "PCPage/任务-进展",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:42:42.8511839+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\任务-进展.json",
- "Pages\\77fae08dfbac4664a299aa7ec207218.json"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "Table/任务进展",
@@ -421,137 +305,47 @@
},
{
"ModuleName": "TableView/用户信息视图",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:19:08.2790861+08:00",
"ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\用户\\用户信息视图.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/用户组织关系视图",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:19:08.2790877+08:00",
"ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\用户\\用户组织关系视图.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/角色信息视图",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:19:08.2790891+08:00",
"ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\用户\\角色信息视图.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/角色分类关系视图",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:19:08.2790909+08:00",
"ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\用户\\角色分类关系视图.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/用户角色关系视图",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:19:08.2790922+08:00",
"ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\用户\\用户角色关系视图.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/角色组织关系视图",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:19:08.2790934+08:00",
"ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\用户\\角色组织关系视图.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/角色拥有权限视图",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:19:08.279095+08:00",
"ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\用户\\角色拥有权限视图.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/组织信息视图",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:19:08.2790966+08:00",
"ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\用户\\组织信息视图.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/组织级别视图",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:19:08.2790985+08:00",
"ModuleType": 23,
- "ToRemoveFiles": [
- "Tables\\用户\\组织级别视图.json",
- "ForguncyDB.sqlite3"
- ],
"ExclusiveType": 0
},
{
@@ -568,17 +362,7 @@
},
{
"ModuleName": "PCPage/工时详情",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T12:22:14.5260304+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\工时详情.json",
- "Pages\\31a709cea02e45ad83bb92336a6d829.json"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/工时详情-列头",
@@ -610,16 +394,7 @@
},
{
"ModuleName": "ServerCommand/新增工时",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T12:34:23.3321567+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\工时\\新增工时.json"
- ]
+ "ModuleType": 15
},
{
"ModuleName": "TableView/子任务视图",
@@ -643,16 +418,7 @@
},
{
"ModuleName": "ServerCommand/修改工时",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T12:34:48.8504806+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\工时\\修改工时.json"
- ]
+ "ModuleType": 15
},
{
"ModuleName": "PCPage/新增任务",
@@ -672,16 +438,7 @@
},
{
"ModuleName": "ServerCommand/新增任务",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T12:30:53.363797+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\任务\\新增任务.json"
- ]
+ "ModuleType": 15
},
{
"ModuleName": "Image/caret-down-small.svg",
@@ -713,16 +470,7 @@
},
{
"ModuleName": "PCPage/项目菜单",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T12:54:45.3348514+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\共用\\项目菜单.json"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "Image/回收站.svg",
@@ -746,16 +494,7 @@
},
{
"ModuleName": "PCPage/项目信息",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:19:49.1388868+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目首页\\项目信息.json"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "image/图片",
@@ -779,113 +518,47 @@
},
{
"ModuleName": "Table/项目分组",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:19:08.2790789+08:00",
"ModuleType": 7,
"ExclusiveType": 0
},
{
"ModuleName": "PCPage/切换项目",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:24:39.9390611+08:00",
"ModuleType": 1
},
{
"ModuleName": "PCPage/切换任务状态",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T12:10:24.3761294+08:00",
"ModuleType": 1
},
{
"ModuleName": "ServerCommand/变更任务状态",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T12:13:20.3260788+08:00",
"ModuleType": 15
},
{
"ModuleName": "TableView/人员工时统计视图",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T12:38:09.6174929+08:00",
"ModuleType": 23
},
{
"ModuleName": "Table/项目岗位",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T12:42:02.0679703+08:00",
"ModuleType": 7
},
{
"ModuleName": "Table/任务成员表",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T12:42:50.3654873+08:00",
"ModuleType": 7
},
{
"ModuleName": "Pages/项目首页/项目配置",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T12:45:35.008036+08:00",
"ModuleType": 6
},
{
"ModuleName": "PCPage/项目配置首页",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T12:45:47.4310093+08:00",
"ModuleType": 1
},
{
"ModuleName": "PCPage/项目岗位配置",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T12:48:53.5720298+08:00",
"ModuleType": 1
},
{
"ModuleName": "PCPage/参与成员管理",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T13:48:08.6875832+08:00",
"ModuleType": 1
}
]
\ No newline at end of file
diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3
index e411ce85..e1be373b 100644
Binary files a/ForguncyDB.sqlite3 and b/ForguncyDB.sqlite3 differ
diff --git a/Pages/31a709cea02e45ad83bb92336a6d829.json b/Pages/31a709cea02e45ad83bb92336a6d829.json
index a3398f2d..45757a66 100644
--- a/Pages/31a709cea02e45ad83bb92336a6d829.json
+++ b/Pages/31a709cea02e45ad83bb92336a6d829.json
@@ -157,29 +157,101 @@
"$type": "Forguncy.ImageCellType, ServerDesignerCommon",
"CommandList": [
{
- "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
- "PopupDisplayMode": 1,
- "Placement": {
- "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!I2"
- },
- "PageName": "右键菜单1",
- "PassValues": [
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
{
- "Source": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!F6"
+ "ConfirmDialogSettings": {
+ "Title": "确认",
+ "FormulaText": "确定删除该成员所有工时记录吗？",
+ "YesButtonText": "是",
+ "NoButtonText": "否",
+ "ConfirmIcon": 1
},
- "TargetCell": {
- "SerializeProperty": "=右键菜单1!点击按钮"
- }
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
+ "ServerCommandName": "删除指定人员工时",
+ "Parameters": [
+ {
+ "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+ "ParamName": "任务ID",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!E6"
+ }
+ },
+ {
+ "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+ "ParamName": "执行人",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!D6"
+ }
+ }
+ ],
+ "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": "='31a709cea02e45ad83bb92336a6d829'!code"
+ }
+ ]
+ },
+ "value": "0"
+ },
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!msg"
+ }
+ }
+ ],
+ "ID": "92713028-6e55-4a4d-b068-c2e263413206"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy",
+ "FunctionName": "warning",
+ "Title": "温馨提示",
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!msg"
+ },
+ "BtnText": "知道了"
+ }
+ ],
+ "ID": "4c88ecc5-10f5-48cb-b09e-392fc152f991"
+ }
+ ]
+ }
+ ],
+ "ID": "3919ee2c-be9a-47b1-b524-2af339313b97"
}
]
}
],
- "ToolTip": "操作",
- "Size": 24,
+ "ToolTip": "删除",
+ "Size": 16,
"TemplateKey": "按钮图标",
- "ImagePath": "更多.svg",
+ "ImagePath": "回收站.svg",
"UseCellForeColor": true
}
},
@@ -255,6 +327,27 @@
"value": "passValue"
},
"CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "回调值",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!F6"
+ },
+ "ID": "2b75524e405743488f258c5eb7932df6"
+ },
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!F6"
+ },
+ "Value": "%Null%"
+ }
+ ]
+ },
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
"ConditionAndCommandPairList": [
@@ -272,7 +365,7 @@
"value": "编辑"
},
"CommandList": [],
- "ID": "f61d7ab1-7870-49d2-848b-d8367e6dba19"
+ "ID": "1656c802-563b-4191-bf8f-c234a0e2548a"
},
{
"Condition": {
@@ -303,7 +396,7 @@
"ColumnBindingInfo": {
"TableName": "任务工时表",
"ColumnName": "任务ID",
- "GUID": "a226691a-492d-4ea8-a107-20d50988ebea"
+ "GUID": "e86ca34b-f53d-42c9-b26b-daa68e9c07ec"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -315,7 +408,7 @@
"ColumnBindingInfo": {
"TableName": "任务工时表",
"ColumnName": "执行人",
- "GUID": "b6bc9d16-db90-430e-ac86-6b289ed7a1c2"
+ "GUID": "494e0e20-d381-4a35-8739-9bc3189e0b6c"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -326,29 +419,17 @@
}
}
],
- "ID": "8d24331f-9212-4981-8fd6-3e2ff1782028"
- }
- ]
- },
- {
- "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
- "PropertyItemsList": [
- {
- "TargetCells": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "='31a709cea02e45ad83bb92336a6d829'!F6"
- },
- "Value": "%Null%"
+ "ID": "d99c1942-4d8a-44fc-807c-7a19ec3604dc"
}
]
}
],
- "ID": "7b4303ad-8df2-44b7-81c7-6e2821ab8f5f"
+ "ID": "2e031b9a-63d2-42cb-820a-3e1f1201b73f"
}
]
}
],
- "ID": "b7ba3787-aa1b-47c3-bc37-72094c363930"
+ "ID": "3202662e-fc36-46db-a9a1-6d8229f265c3"
}
]
}
@@ -407,10 +488,15 @@
"HorizontalAlignment": 3
},
{
- "Background": 5,
"FontFamily": 0,
"FontSize": 13.333333333333332,
- "Formatter": 6
+ "Foreground": 5
+ },
+ {
+ "Background": 6,
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332,
+ "Formatter": 7
}
],
"Types": {
@@ -420,6 +506,7 @@
"General\"小时\"",
"Center",
"General",
+ "#FFFF0000",
"#FFFFFF00",
"@"
]
@@ -434,13 +521,13 @@
"1,5": 3,
"1,6": 4,
"1,7": 4,
- "1,8": 0,
+ "1,8": 5,
"2,4": 2,
"2,5": 3,
"2,6": 4,
"2,7": 4,
"2,8": 4,
- "5,5": 5,
+ "5,5": 6,
"5,6": 0,
"5,7": 0,
"5,8": 0
@@ -462,4 +549,4 @@
"PaperSize": {},
"Margin": {}
}
-}//vm/ZQx3GlOtPnmfAkM7q7IvNlKgGOvUaktHMoyUbl7UySqU7Z1yt9sMIqHqTKV53n0V3QT3YL0QjyRLt6biC8SWsRYur3tn8DmXwBT56ei0xFeMlKo9tkg2/eitvPtb+gU+6/dmnFFuIf5EyNRoQVo4lRuGFLb7fmpprmqyStRmmHTE4Wkq0fQYqoFruPN6AQI3tD/5Bqlmg1D2nl1VytGy+NMEZOapdyZdVoyqcbuDyjgmqHhad9mr65VT8sJ0fbz9RmOx3yz3t9b4RpnGOctIZsb+xKhovO3oxrWKgaEz1lhXqMmyBB0pvEMZ7+o6z0lgXZSlmqeZykfGpGMFvXgFdb5I8tR2JoWxe2UQqrbFRKATMfNTxP72VQOI4Gui2zgt5h+qj7pWx7RY91W5lUJvKFiqxPNvHLIiLRboxzWbQGGm+RKsn1bVgsSoBhFx6C1vV9XEy9AAEHoX8kIN7XweIdhDmQyibWChD6DuXyt3Ly7Pua5/jrs01ANjFCB7IC46OwaMYhqSfKmSDXN0xSNpMziAEmbIlDcJ4hj8eEQPVHI3CJ1kB+/ayvn1aRV6z3WZKe93NPeFuTHWSXL3udOcSUoG3x8d6P6plsPXZ5nwMXDnocdkDQ6f7cDsjMBGiFJdWokwzzYEU7mYF4D5kCn0gLicSPRaoagkhcpLslKMVEOAuFBB6bTvz+ECt9kl1W2PFTcZzGq0eEOZOtmflZF9P2AJ2bQsiSSXrITvCwJ7zzAa2SI2aiqA953mVeyYDgLDXaMT7ODdMTlleO0MkBpbrti+G8ZE9meZoXu22KJWTsSlC+9NqH7F5SKIj4mi0h56EMErv7hmiuyliJDj6FUB1kYPzqBVBTk1Ce2+0q0dB7IN891kNHu3LtnvYmesWv8w/12reJOUQqobsAa6uOA==|920
\ No newline at end of file
+}//OwtjwphnelLUtjqj8aKDSow9UjJJQ0L94dGn8dpVmmJKCal5pNXA1PaogKUEfBNUKkW1TOdAkHIGbeTcDEannEok1uWisYqcfOMAu3ehcYCvs2W6s3xNlyAjJKIflv00kle0PujYS3FOMCG9nJb7C5tfG5KGUDia9jWtJ1JPVlqQuSXv0gw6z1WV3TMwm+lNh4GIUz8vW2NjgkDHWP2oP/CqblzxppgOyfqQC8mBSAiY+5ZNkiuWs4GoluyT4Nu/5Bvj8/bZ8JuZT7aN0+eLpU6LEqdZno4CIhR+OQL0MKvVXD6/UYY8cozs8LMGhKRAf6Spl30Qbt5Pny7qrhkF2+atlMw+T11Q5TvWA/fjvnNvH7ZrSYN8YrHWU/qOr5AsYD7+sLylSDoQ5vLHzsybDoQ7zaWu6TS0PejbQwj6BhWgZW9CcxAZJz7vlti32yTJb39e1NH3H3n3SsHLq7srYKhWoS+LiDTFvLv6dPSsiBcNz/VmumY+s32WtkOXXItKf6UgdD98H/hvpfQR/nqQRrLOd9TjTcaQG+SGsINsfXvecBqpJsQFQIhuQl2vs/0JV54Slq991PnipjLuXlwzXFKti1O7hKgvR+G/0KTwF8mLY2gVKNrN4i8JxXjJkKDJUWQKDKYr1ONw/KJFBFZtB7lOKg7DrTdAdrlM/Nc9M4gfkByp5z/IeKPv5jdEQovbVhzi2u3fv/DjnKA+i2b7FyWVUZ5lQkk+qNWTQE0zBjJA73baqtyWQYD6RezPFuGXQYX6UAZZmcVoGDNxnYfkolmriAdszBqih4bRd9y+08PbT8Zh410u/dhfam0owQG96mou/oqi/IAy7/YxHoeQYnEMijc/JOh4rPEfAaTrI3rn02ENLqjvUhjjgcZqNUbDG2k8TcknzvmUpca/bxwKiw==|920
\ No newline at end of file
diff --git a/Pages/421cd7df876b4e64a3160223673e2ea.json b/Pages/421cd7df876b4e64a3160223673e2ea.json
new file mode 100644
index 00000000..7c64c508
--- /dev/null
+++ b/Pages/421cd7df876b4e64a3160223673e2ea.json
@@ -0,0 +1,75 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
+ }
+ },
+ "Count": 1,
+ "DefaultSize": 35.0
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 129.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
+ }
+ }
+ },
+ "Count": 3,
+ "DefaultSize": 15.0
+ },
+ "Values": {
+ "0,1": "项目名称"
+ },
+ "AttachInfos": {
+ "0,1": {
+ "TemplateCellSource": "任务状态"
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "FontSize": 13.333333333333332
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Body"
+ ]
+ },
+ "CellStyles": {
+ "0,1": 0
+ },
+ "SheetStyle": {
+ "FontFamily": 0
+ }
+ },
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon",
+ "ParentPageName": "切换任务状态"
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ }
+}//NcoRqaCh7K59xUDPFQtZxO9xUhtaO8Ls4vp2TuoS5Xuc6mbVi05TwlNwE9SVkZ0Su107HN2zZg+J5P8+tV6pMqCwWZbWBsXyVQsAHq+DtHrCvEeDeROXduTES4IPpzQ/Om0WcArBKO3LBCDYGtjtrRPISuatwu9dtMyy5chzcS916/Bizg921GJveH6I4yCrVLs6lP8B9rUNu5mslyKm3QlX7Wr2/fR7GLOFBFh9LgFfzSV3iBO/1ChvxI8J2rgCHQ95M0eD9S+wBuQ7svNwWdjkNvYHSkbwQoiBFWmTmWOdX1bag5dqk4Wu0hlVJp68UdMf5xddYiBnIHhwnOFecezUckdSPBMpn7ws6uSTAorLrjXbIZcW0nV+0ZhBI9O4tqOBEQSlqthOh5KvkwsLEtrc1Fir7aLpkv32yL3GZ+1vZ12zwnLTwlT7nXjXUDeHIbgIQSivOQBQG4xvUd1gpZURK8GKWGpk/XDxvbxFPpaUj4S5ZGpzeRfhTw+EYspFWd3oqrHhQhQC4TSnO6siTIk6Bc/zag5VLRvHxgxKxfCG1EmCkoWrdKBWqqAanEY00j83i/ChLb/nQIiCagHbAJ7XtHDnQdpaDrOf/a9238sOfd7hHYGaXZsAVIZfJWAJpSDOaSPIaaYSGP+UUm9Vm+QOdfxLu1pFQP1tQ/7Z/lY3XSDELY0Idk31Vx2y/5v6crYYZl/o0pt3Jq6QmmyDSQ2ab51v0csdfNfiIac5YRCyioMIw/8ZAFttCmhEPOcWfqR3VhD9PDdTQ8lp/j4Gx+qbnuxv/xKUg0mfpcVTIi55Ir7rHCGuNVm/XJnCKh/ypsAFg6ddnH1gOIeB+7t+5gjno/ChjxDQawtn0nx+/73EXQ26r25GVVl/lemQzytEB3G0eMJ1nREQf/uL4pY08g==|920
\ No newline at end of file
diff --git a/Pages/4d6923ff8d3742f5aeb5e04927a28f5.json b/Pages/4d6923ff8d3742f5aeb5e04927a28f5.json
new file mode 100644
index 00000000..05c88483
--- /dev/null
+++ b/Pages/4d6923ff8d3742f5aeb5e04927a28f5.json
@@ -0,0 +1,125 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0
+ }
+ }
+ },
+ "Count": 4,
+ "DefaultSize": 10.0
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 129.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ }
+ },
+ "Count": 6,
+ "DefaultSize": 15.0
+ },
+ "Values": {
+ "1,4": "项目名称",
+ "2,4": "项目简介"
+ },
+ "AttachInfos": {
+ "1,1": {
+ "CellType": {
+ "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "ImagePath": "app-logo.png"
+ },
+ "TemplateCellSource": "项目封面"
+ },
+ "1,4": {
+ "TemplateCellSource": "项目名称"
+ },
+ "2,4": {
+ "TemplateCellSource": "项目简介"
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "FontSize": 13.333333333333332
+ },
+ {
+ "FontSize": 12.0,
+ "Foreground": 0
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Background 1 -50",
+ "Body"
+ ]
+ },
+ "CellStyles": {
+ "1,4": 0,
+ "2,4": 1
+ },
+ "SheetStyle": {
+ "FontFamily": 1
+ }
+ },
+ "Spans": [
+ "1,1,2,2"
+ ],
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon",
+ "ParentPageName": "切换项目"
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ }
+}//Niy0Ea5mtX4dG/3eLn20goKi/P3duysoTzPEEiUWtkDmkOf+EaVKz+wSjY8GFRToc2bvaMjvkEu/7Ac47nwHoJu6nO0fqm+BLDlDctbo339NWjrrP8BDwkwact/dLUjdnmOu3qmtUs9YtM0nHhPpIZXcVoHvsg+sb+CoxVFC4apUrEMr+z3rjcWi+v8AC+WfFWRFp0Ekk9WyJ+e/C154KLOlnXmFPd4hLIN6WmxPmDC3h7nE27Ot+RBrCwZfV3xEAW/o6rwFx+hlUjNloTlRxvqcgwvJgSd9v1TgN43w3xcba9JXod63xPuGmqXemnWVXBYF0tKGMd0F+5tgRbNejGvpqFCjVzK0D02WZA31GxeqZbLylLB5UT8N5olQLoCSDHMfbOQToCfJnz9EtVc9ECTuDSCgo0rbNSXYHtPzUXu1ir+TuX8LG2gbMpILWDagZdZM1vpkDDyncLhbMdSffOg0J+vB3dpeNx0YasWRC3JwcYm917bK/yEoP7nQdcZuEraxa2GvtmbNImwINnhUoyxJAxGztxBuu2wo4Y8Ee+KJdbTuwJD5i3DWmz7vDPn4MTv36Edz00QxNx3xwygniDPxVpTR7lcc59eA/dzFkemyJzOQSOnukFMgWkSigWT/6XWMIri0QdnLGvMngyil3/D3T4lxPTF7Olj4g/U+XPxPP7Xzv2EGDyciI64Naw156ZsbaoMFxb9NBMjs2iVAqNdOxfEeZY3GcZ2F96zc+4az+Jj8K9F0ElK4t7IVTnreiwvS5U2sSPFXEElb+GL+wpZov+iYkQGfQZfH95bH6cUi378W2mpAwcSB4UT2b0eGiuc+mUn9+8lZ4QR5ToVMPm/nDsegY4yN7Eqcq1RqrwO8GOOy1kBz1tqE83eD93R94OG/2596iH4Kt/FahENZsw==|920
\ No newline at end of file
diff --git a/Pages/77fae08dfbac4664a299aa7ec207218.json b/Pages/77fae08dfbac4664a299aa7ec207218.json
index c8fef687..d462c7a3 100644
--- a/Pages/77fae08dfbac4664a299aa7ec207218.json
+++ b/Pages/77fae08dfbac4664a299aa7ec207218.json
@@ -3,7 +3,7 @@
"RowColumnAttachedInfos": {
"0": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 10.0
}
},
"1": {
@@ -13,28 +13,29 @@
},
"2": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 10.0
}
}
},
"Count": 3,
- "DefaultSize": 15.0
+ "DefaultSize": 10.0
},
"Cols": {
"RowColumnAttachedInfos": {
"1": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 66.0
+ "DesignLengthInPixel": 73.0,
+ "Mode": 1
}
},
"2": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 10.0
+ "DesignLengthInPixel": 14.0
}
},
"3": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 752.0,
+ "DesignLengthInPixel": 753.0,
"Mode": 2,
"MinLength": {
"Unit": 1
@@ -141,4 +142,4 @@
"PaperSize": {},
"Margin": {}
}
-}//eTyRr1l3asG2BrW3b9YUQJt3XisNh+59Zd35YfY90/Cx4rmT1BG0ifIja7QFfKMqH74nJN0YhBfEUzmHA9NlKyqnEDVodUTjkXFSB7V3LsIasFnOIn8jEH3va0Kt9b1+51iA0a5573JiLxJihqVQhW8wq0SjrsKZKftNSo3KsNhI/dXdF0nGQcfceB+y/rAT246F3IJ8xHhMtxTBdRsMfqv5byqeGV+6CXOtpspzUPyTvUIrICWAa6qw9AiFi/Mcp6LIpeVw/BzilMBmaG9dGQ8l8IDgaXK2LsmJrwxxmsgg9WaRTp1h/WqYxyCJn4T1bNSaYBeFU44zoyr8ZTwd6QcMn8dpZb+5S84C4pFEgOcHh1UBFTf8N+9mhDuQGWC9Z+0KlCbKQOYTEpx02KDgDxogHHOFQoy+73r7NswubMjZJo8xI3Gvn4Bq8rsd5DXkV2p2ChXi6e+NYODJeFOeUUttPD1sddDoPnH7Kb3tMlocPI3t9EBt7ca9OIADgWRDZPQrruB4Y1bB+VXpsZXPSVfAElmFuWuddUMjm2Xm3ZvfyMKKq2sWGXTGace6be7jt+cP4/+yQVlk97nFlH2jvh+0IrvpBG3WljlNj8dKVdCMFy1k8nULKIvX4SvhKtxqHozz8AQphXFWz5dozSE3epWsDp5EHxow+Po7SdLy+DNmQq3ZcQSfNfgRXGSFNMP/FWAv3keX7woPLqA46+m0/EEwBsvsGYeFSqWKPTxtLnYPVShEjpDZOoQS9ziBcUN8LbNxnkJHMCLtLJ4j4KA/epbBnKZuGfmJd6caC6KW31fFRzZ/ToUlqVHfahuRzu2+9gYFWSS15c2pgQvDu2zn4x+VusC/2N+ePUTcbuQOWwOX/QnGla/of9IVuvWZz0o00KcQPohndrWCGS8oLHeYcw==|920
\ No newline at end of file
+}//zxQdyOXVIOvvgJ0qCzwyJ8RUhS2Pe/BAs2OsfCjeRSt9KqNAU3P0/hPbxgkgpLjO+yx3V5xsbgnXN9JNvKO+XKEEsl5Rzfc1lYoicW67408U5r1IwAtzYqFpQQuJNciCvewIYKABQtGPONULCJ9c8GroafC4U6VzC39mZr6AUtN2T1WtTHYgR8Li9/nKBv+f/vxlM2RmWZFXyr9r+rorykfVPQUEB+3StGvi3ulUquzk+9YUpO9nJKWIQNPgwPUiDets2Mafz1cZseob8UlsQYAagWqFMTp9ujJVmox1dXfKfY1yCSbCB8Icj+Ync8mGJpLVXO2Wvg7sfRP7Ujm1X/4YI6fk0h0quKcIo5KtaKZ6Fwu4ITEERVGReHEv6S3Z61id7Ah68DV5r8GCPL26wCitQO6LN49wDzzqryz1DzMeRlRpQGMud0SiWi5EB5r4Q6ickH2k357dYz3oDsXoFwv8w9FIhDgUoHS152iLnnc+g4/VUJBET2gHYa+AwkLbl92ToAz9YcZ1WXuwD/vAaRDOPoyiS3Wpd39e9ux8A+j626Bzk0Smt3jPmMEd9c93bNvPEuOBglFF6Xi9lWpE4aliStMSLzlOajR7EWiXVlDPHcgO4+k4YfOtIsMt5/sglFzZYnQ3rfk/pe7DKFZ5s/povipsxz4HFoeN7+18gXtFlHd2vmMgYi/+8rCwKfA+AzFa5tS/G3/cSpnxcvFARsNZIf+azD815iAPFFoCLVtLRhnHxCCpxVuwu4YcJvYIzsxd9dTUlfZffimcBCHEp0MutfylUpzYnQPviIb2NT0/R+A/I4Yvk2XiVV0FmEplh87TUzkk/YIQNdiEIrNSV7XscYvgm8MOsomjv10jMwUg/Ba1cXDjEpSnxXWUWjXATwwcVOSgf7wGPQtA5QbDrA==|920
\ No newline at end of file
diff --git a/Pages/9d9faa04d5a74f1dbf8dd3b2040b6f6.json b/Pages/9d9faa04d5a74f1dbf8dd3b2040b6f6.json
new file mode 100644
index 00000000..0bc87f37
--- /dev/null
+++ b/Pages/9d9faa04d5a74f1dbf8dd3b2040b6f6.json
@@ -0,0 +1,97 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 22.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ }
+ },
+ "Count": 3,
+ "DefaultSize": 10.0
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 22.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 41.0,
+ "Mode": 1
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 7.0
+ }
+ }
+ },
+ "Count": 4,
+ "DefaultSize": 22.0
+ },
+ "Values": {
+ "1,2": "加载中"
+ },
+ "AttachInfos": {
+ "1,0": {
+ "CellType": {
+ "$type": "ElementUI.AvatarCellType, ElementUI",
+ "CommandList": [],
+ "icon": {
+ "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin",
+ "Name": "app-logo2.png"
+ }
+ },
+ "TemplateCellSource": "头像"
+ },
+ "1,2": {
+ "TemplateCellSource": "姓名"
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "FontSize": 12.0,
+ "Foreground": 0
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Text 1 50",
+ "Body"
+ ]
+ },
+ "CellStyles": {
+ "1,2": 0
+ },
+ "SheetStyle": {
+ "FontFamily": 1
+ }
+ },
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon",
+ "ParentPageName": "任务-侧栏"
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ }
+}//YeL4T+Oljwr2XCn04z2uehvWEL71dkB9ssWPEV3KHNQ8V+v6VLhiUGUSqT1zi1SB5zDXXwUFrpJE9FRgQ4+baJ1SgBoTYxgNTMnGbkNNR9XGlD1VoE1aqI9JWrRgjmXtEOrGkgNpDn915YLbzzd0uXkX9S5LAFO7GDhPDQRJ5sgNsALfXRM3kD8MC4FcZPduSgdOPyPamTGaDPCIjdXP0pfTlxsI7jtKge4e3Zcz+HoRu0w4KRoemXpgmn/gZ8QX/en3wD8fzf+qPaC9GxZ37nS1Z7I0SEB/BoRzbL6+EvIiBUn+AN2dEgDI9VINZ6frBWqi9U9gK794n7GS2omfnCxk/vOA0KzvVJ6zewTa90Iy1hk8t0PKZZVwWVTTuW20ICShL/YcFXmitCmhmThZfHkUtRHqau7QFPb911zi7YQXUl6PEQmQm3qoAtys5OjcYEpHskKlPIPWsDVZpulCWlg7DQAj+GEf3SYtHEJMXCQsGsTeOzsivEMWKyKJfMoXxmaCBkzrnXPwuQQJ5JIxsEL0GJKSK1Wfn3QkaRQfllmi8VlLzEaHzext799jLfgPQdd03gp8LVtNmvKwJ2lkEnZKfjEdXTNbdorbZQnhZnCVAJrW0As/RDJQ+2PqJ9ILxDBMGABflo06VRBA1r9Fnk3qNW29vECpFjE1qrRS+8uXJsLuc3vl+ZMKc4LpO9iDZleM8NZQWHgbpLufwvUofcJTtYo3x2pUXjNaiFSAEepW6kMFTDhF6ffediU7fmPxCL1UZ++QzoNMJPfpNu4YgdyoGRN6I0qP6AL7dA7rEm589F03eNe7uQOQy9EyaXqfYHQRqKzW+2UTZTYJlGkIwc5SbZquWsm4Y8bOTB566LZTPTGZwrzf45OAwdfAfb7Vz5E2mePHjE92FqalMwz7cw==|920
\ No newline at end of file
diff --git a/Pages/任务/任务-侧栏.json b/Pages/任务/任务-侧栏.json
index 47f8ad1e..3dfb7785 100644
--- a/Pages/任务/任务-侧栏.json
+++ b/Pages/任务/任务-侧栏.json
@@ -13,12 +13,13 @@
},
"2": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 10.0
}
},
"3": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 40.0,
+ "Mode": 1
}
},
"4": {
@@ -131,7 +132,102 @@
"1,1": "参与者 1",
"6,1": "singlebox"
},
+ "Formulas": {
+ "1,1": "\"参与者（\"&参与人数&\"）\""
+ },
"AttachInfos": {
+ "1,12": {
+ "CellType": {
+ "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "PageName": "参与成员管理",
+ "LoadBindingDataOption": 1
+ }
+ ],
+ "ToolTip": "添加",
+ "Size": 18,
+ "ImagePath": "增加.svg",
+ "UseCellForeColor": true
+ }
+ },
+ "3,1": {
+ "CellType": {
+ "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon",
+ "TemplatePageName": "9d9faa04d5a74f1dbf8dd3b2040b6f6",
+ "Command": {
+ "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "PageName": "参与成员管理",
+ "LoadBindingDataOption": 1
+ }
+ ],
+ "ParamProperties": {
+ "用户名": "用户名",
+ "姓名": "姓名",
+ "头像": "头像"
+ }
+ },
+ "DataSourceType": 1,
+ "DataSource": {
+ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+ "TableName": "任务成员表",
+ "BindingInfos": [
+ {
+ "BindingInfo": {
+ "TableName": "任务成员表",
+ "ColumnName": "参与人",
+ "GUID": "380ee008-3651-40ad-994e-f0398f4e0e4a"
+ },
+ "ColumnName": "用户名"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务成员表",
+ "ColumnName": "参与人",
+ "GUID": "a615680e-218f-4291-baf6-421ba74a50e6",
+ "AttachType": {
+ "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
+ "UserColumnAttachType": 1
+ }
+ },
+ "ColumnName": "姓名"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务成员表",
+ "ColumnName": "参与人",
+ "GUID": "109ea711-92e6-4c26-a605-07189d7d4a7f",
+ "AttachType": {
+ "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
+ "UserColumnAttachType": 5,
+ "AttachTypeTag": "头像"
+ }
+ },
+ "ColumnName": "头像"
+ }
+ ],
+ "IsListviewDataSource": true,
+ "CustomColumns": []
+ },
+ "DataSourceListviewName": "图文列表表格1",
+ "DisplayMode": 1,
+ "NoItemSetting": {
+ "NoItemImageSize": 5.0,
+ "TextForNoItem": "赶紧邀请成员加入吧~"
+ },
+ "DetailTableSetting": {
+ "$type": "Forguncy.Model.DetailListViewInfo, ServerDesignerCommon",
+ "ColumnOfDetailTable": "任务ID",
+ "MasterTable": "任务表",
+ "ColumnOfMasterTable": "ID",
+ "DataCommitType": 2
+ }
+ }
+ },
"6,1": {
"CssName": "singlebox",
"CellType": {
@@ -163,53 +259,65 @@
"FontSize": 13.333333333333332,
"Foreground": 0
},
+ {
+ "FontFamily": 1,
+ "Foreground": 2
+ },
+ {
+ "FontSize": 13.333333333333332,
+ "HorizontalAlignment": 3
+ },
{
"BorderBottom": 0
},
{
"FontSize": 13.333333333333332,
- "Foreground": 2
+ "Foreground": 5
}
],
"Types": {
"Strs": [
"Text 1 50",
+ "Body",
+ "Accent 1 0",
+ "Center",
"Background 2 0",
- "black",
- "Body"
+ "black"
],
"Borders": [
{
- "Color": 1
+ "Color": 4
}
]
},
"CellStyles": {
"1,1": 0,
- "4,0": 1,
- "4,1": 1,
- "4,2": 1,
- "4,3": 1,
- "4,4": 1,
- "4,5": 1,
- "4,6": 1,
- "4,7": 1,
- "4,8": 1,
- "4,9": 1,
- "4,10": 1,
- "4,11": 1,
- "4,12": 1,
- "4,13": 1,
- "6,1": 2
+ "1,12": 1,
+ "3,1": 2,
+ "4,0": 3,
+ "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": 3,
+ "4,11": 3,
+ "4,12": 3,
+ "4,13": 3,
+ "6,1": 4
},
"SheetStyle": {
- "FontFamily": 3
+ "FontFamily": 1
}
},
"Spans": [
- "3,1,1,12",
"6,1,1,12",
- "8,1,1,12"
+ "8,1,1,12",
+ "3,1,1,12"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -234,4 +342,4 @@
"PaperSize": {},
"Margin": {}
}
-}//DOG9GXBVJORAJjM3TypcRGbKhhHQBm8n7jN5ZyEikXbZkQ4E905d0u9ftaOVKczca/N8Y6zucsxVPOIuCDy2oPB0x1YqDvWW1aeELMQ69ANn4QUR9c6CZWeuZwhhui+9K/NfZwadtVtyXgK63f0dgad68eRw9aYl6jKMV+02X9A40oEiVXvgichbX1iij3ERPkTH2PSeKNSt4xUZutnUcok22evTMvlxL64qJLaOCnXj4uA1RtL+ILnTK9NTlqkodBKEjfpBeBf9KQ50cvii6GOBWlZHagy0C7WHMIuIo5L/fkrkCtPKyVige/bdak0aCtUvgjsqe/oGufW8R0hrdPhhTVDXDYMxBHO8LwtNNSUxbodOsdjDiZ0rmTAmRVCM31n7W0utB0MOWTkh+pxFqtGDEE485MW2d5d9Ez7Zk4cWJNNF1XqOpqX/Cz+4lsMrYcLQ/2azG5vuf18x859FsVw2rSQJEJQ8DlQbia0JWcD44zDD+nHgw2U0o+JmjcG54M9GcXL9fQfJXsukPa+gKY9PmZ8ZwlekRIr3STJUNShq2uBJxFzQF1R+FgX2Fc+m1pNbL/nDeCOibd0jgnB1V/saD7l+cFNVx9HXMbttWu2Hvq+vMFfjI9BOCNA6lDI1xrkTxmPXPcSAIaG843pJmNb/Kl23K5AmgaeDzO6jMHvhi/2d1J2lGa7OEqjx/2P6T0ASzS2Z74kS5oaV5TVBqrK9jHfWTGsIW5OIczpkM7C+7QVnN7X9LrKh9nKssqC6qpSWzQjf3XnJ0iP2TEJnKChZ1hsPhCzYrQKB2JMDGx2X3UBWnX6lP8hLGXJr/YAPtWfBrgOfCwOIwZnDZKbpqPPPY+1SSFBwpNSq7h77ze9Br6oBdea57X5GSeZyGEq7ImWZDDhGWVG2rmxGvAMqsg==|920
\ No newline at end of file
+}//hgZvxZg6dwzVmyKHHVF2SvpsX6OTLRORQon2Vtc64cUWgdxLu8ekPyzRbEmzKN+g8YAl34WJ5V2LpvKNYXQ2yONZTKtBr+d2o42SHod0Sae7kQ4nDAUPwn1BPP+Cd3n2FkshjngYFbz4ixGEMch4Nr9y3FiozFsbAF6/fdCVB9nX7FNlCZ9BDLVkaVQb2mfy56w/gixos3n33gFfmt7QiwgqqZvEvYGHKGfi9u6QyucyV7oH4U/sKCbtUPri4NrKYPBpbgIXxl5Ss1nIzWTCSmZhXnaernJWg0pZr9cNIQ94G7ltD8/nDO3rSIzRdwMR1Rn2t0Uf5K98ebmuBsT+yrs/GNM51ZLo3z+mBbiAQsQBm2OPXBObZuxdLf9AYdrONgpPFd9+pLQpAzqTfqh1kwQlnRj7ZDrdrpLoAkHyu+5zueLG5ByXz/D3eUfZFsGrmf4SnNj9n05du7OIoXMoFFcKDsTnNLYj+1MM+AmqHh8BUlYuLiAGti+easiRO8K0RqQGV3zrDv4wb/FA1G6F0CQEC4Vunk0Zr58glUVKGz7PcTxr3IxUEoWKPbTTHlBk9r3nhouWdWCmmV4oSX8yyP0VDyyaWY4IkHipmOO1bmvR4E5KQ2+QMnS+iy2anP8RiFl8522Rv8p4DxqFXUlDKNFc8t7gknaPylubJVxi/g5aYyur83v8gSKxuNvTTJI3SkdjMxX6H3rFXJI9s4zbUrusBt8+z1K7Y9BYT9LleJsx0xWuCT9cyy8rKpVPd9XxIOUryfT2md1P1mIXhIcnUcsUPX0HXsWomor/s8pDG5aPwylsy11MvUp8rwRSGt+/5tv9/T3p+dLCTTKsuEGisO9wkXRhsqEKXHG/4QEXPoRqTJWEfW1eefaEDGPKhJuDIL6ANeYV0rWdGwmmoZfUjQ==|920
\ No newline at end of file
diff --git a/Pages/任务/任务-关联资源.json b/Pages/任务/任务-关联资源.json
index 8f306739..1c9d8239 100644
--- a/Pages/任务/任务-关联资源.json
+++ b/Pages/任务/任务-关联资源.json
@@ -198,22 +198,5 @@
"PrintInfo": {
"PaperSize": {},
"Margin": {}
- },
- "BackgroundPictures": [
- {
- "Name": "03800ae4-18af-4c3c-98bb-40694b1eb80b.png",
- "DisplayName": "背景图1",
- "StyleInfo": {
- "CornerRadius": 5.0,
- "Fill": "Background 1 0",
- "StrokeDashType": 8,
- "Stroke": "Background 2 -10",
- "StrokeThickness": 1.0
- },
- "IsAutomaticStroke": false,
- "IsAutomaticFill": false,
- "Location": "24,32",
- "Size": "957,272"
- }
- ]
-}//T5A4ZMo4QlhODDin5m90+cYByCcbJb6PSaBZ1Gu06arcvLgEZJgXapgQS5oleYPh/x7+YDU37+VEfE27tS5gze5kCTJrhl9Kh5+sef/uFgDZAyO3aY5qCRAAaFJ62Pg59d6p+p8JtTq4VLw7w+GETXGUX19J1MzvqJv/5t5do3jZqvxEfMco9z36zph1hSJoKLMk1tGYFcDe9zwH/dC5R818qzS0RK28HD4HXX5zrt09d1BdmGs017HZ08bGtlLY8WCLQbbskqPN3wnsdfwUSouXk1cwUoeeOkHVM7en0kopv3rGrRki/34PNi07VlcdYSCZLIWKNvHd3TnTX+WvZJp97fXzWDx/T6PBoR7loCkbQ+oBqQkNqoqZsqQQRjQiq7388cwpClye4Ot9hk9nUxFw2EEtPoM76LOaSI6CXe43xFyHNWW4QUl5ik66sT1sNxbNPzBqWkEm+FRkoDjHsFz18w0rbwSx92t79HGvloGbZiTDw3P4ff3811sw/CBHw0BDnDVXjvTAshKoMK+LzFtNDuXvYCCxatWidmnT/+5yGWa4P6Wmfo8DTSgSZEfqFNlNZmgOCcDX0HtAH16F/A0gJ4zfmxs7+YUDzMtIgE+vmwOFcZnskHA0ZvABu8W4Yd/2oWEUgrOT+tblumWVKQovmj0ikYkFegZLdSayIZs2SflnncfhYZze49+luhgC8t0grRpdrsWI0JC6dkoYR1EaPEdXKaJgnA0tEPTzEMikhv7lfMP+LZtDLSL2XwLUX3ZxmrlkOmwGuApksd7U9Thwl9wpCNpJTEcWm0wrQObpWNfUKFgwa536Dmbc5mEB8r8D1S15uHjbwnLzHxSxLCIQKrEDxMsliJfk6nGz8mIpMHhH8DgnnlWgsJPYj851pNQzwknI0I2CK6KMPaQa8Q==|920
\ No newline at end of file
+ }
+}//mzUwj+DlEwb1T5OyGv0HJQfOLsmnbXLNz9YHXJzYe1xa8GfKuan3oQyqvx1cLUZ5NAUEe6wDgIvfa5vbHemF1wGu1aOyDta3xZIMZLX+9xOdYQNwU2bPMZnQEWKumU9SCjNXRynWIGE5ix+3Hgs4rqwN802NiutJVONTm41Es7nEZa8iI2t4QrddffzSZg4/VFH9kNYQ5bkhDXJLw0pmjH+4Tj9DZpJnY/lx3SmDr1dQjgGqeyqQRxjeWlK/mNktdyypsHRBtfGKckFW3Kpbilc0NixA/ZbRqyVW0y5xiTMuz3nXzXz4aOih/0HcjPwOZiSA0yzbMEWVQAgD1TxGsuCDqgCSKuTrKWwAJUHlpIjm05moxxLQwP7qP6Fnm6BdXzbYKtMCt6qOR9rSDEVU/zH2E+FT4gReDU6fSGTwYwxjSb7A7R9ySO3wGExNRykV8fdGqgFV125e45u8L9nSvIzClr37ANV3Kc7Wsd3c29zX/WPGXEUpJkMgoZlR88GKQHmb9twW46BNe4BqStq+5NAG30CMmNHf2DJF1cxu8ClD+f9wv0l4U2oDI2b6QDXYahHm6pn/saAPgKzbmMLiHv/ccoA/4anJ4Gwh4jG/Wdj1wIn9hIKy6zYeWrc3BaIdI9RNAkMhtVxNP3ixmGLIuYXuUN1TCh5BKMw+9pvh4gfK/tpvMcRowKnkBv7qW7p+sCDP61pzLVhx9qZIA3rmzahv0vo9IV/d7Qjjh9JZtmG/W5zOw1OjUX4cYAU+fEzR54n7iOM2ZkAsFeeDKgdHjAFWaedp4EoF7bnjEruyriB0O9vR4Ktv6gjwjlDqZK4cy0EJQs7W6unsZhPa68/WnTNGPnwjYlZxJsyybeXOP8/lfEbbGHrVkuusleP1ktZoHIfOEIaDicGkMDNOTdQDaA==|920
\ No newline at end of file
diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json
index 83fcfdb2..93023a46 100644
--- a/Pages/任务/任务-基本信息.json
+++ b/Pages/任务/任务-基本信息.json
@@ -58,14 +58,25 @@
},
"13": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 38.0
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "14": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
+ }
+ },
+ "15": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 38.0,
+ "IsHidden": true
}
}
},
"InLogicalVisibleIndexes": [
- 13
+ 15
],
- "Count": 14,
+ "Count": 16,
"DefaultSize": 15.0
},
"Cols": {
@@ -151,13 +162,15 @@
},
"Values": {
"3,1": "状态",
+ "3,2": "未开始",
"5,1": "类型",
"7,1": "执行者",
"9,1": "项目",
- "11,1": "时间"
+ "11,1": "时间",
+ "13,1": "任务预算工时"
},
"Formulas": {
- "11,2": "C14&\",\"&J14"
+ "11,2": "C16&\",\"&J16"
},
"AttachInfos": {
"1,1": {
@@ -188,13 +201,82 @@
},
"CellType": {
"$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
- "TemplateKey": "_RS_Information3",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "PopupDisplayMode": 1,
+ "Placement": {
+ "SerializeProperty": "='任务-基本信息'!C4"
+ },
+ "PageName": "切换任务状态",
+ "PassValues": [
+ {
+ "Source": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='任务-基本信息'!状态变更回调"
+ },
+ "TargetCell": {
+ "SerializeProperty": "=切换任务状态!点击按钮"
+ }
+ }
+ ]
+ }
+ ],
+ "Text": "未开始",
+ "TemplateKey": "动态背景",
"Icon": {
"Name": "未选择.svg",
"Color": "Accent 1",
"UseCellTypeForeColor": true
},
"IconSize": 14.0
+ },
+ "ConditionFormatRulesCollection": {
+ "Rules": [
+ {
+ "$type": "Forguncy.ConditionFormat.CellValueRule, ServerDesignerCommon",
+ "Operator": 3,
+ "Value1": "=\"已完成\"",
+ "StyleInfo": {
+ "Background": "Accent 1 80",
+ "Foreground": "Accent 1 0",
+ "Underline": null,
+ "Strikethrough": null
+ }
+ },
+ {
+ "$type": "Forguncy.ConditionFormat.CellValueRule, ServerDesignerCommon",
+ "Operator": 3,
+ "Value1": "=\"进行中\"",
+ "StyleInfo": {
+ "Background": "Accent 2 80",
+ "Foreground": "Accent 2 0",
+ "Underline": null,
+ "Strikethrough": null
+ }
+ },
+ {
+ "$type": "Forguncy.ConditionFormat.CellValueRule, ServerDesignerCommon",
+ "Operator": 3,
+ "Value1": "=\"未开始\"",
+ "StyleInfo": {
+ "Background": "Background 2 0",
+ "Underline": null,
+ "Strikethrough": null
+ }
+ },
+ {
+ "$type": "Forguncy.ConditionFormat.CellValueRule, ServerDesignerCommon",
+ "Operator": 3,
+ "Value1": "=\"已搁置\"",
+ "StyleInfo": {
+ "Background": "Background 2 -10",
+ "Foreground": "Text 1 50",
+ "Underline": null,
+ "Strikethrough": null
+ }
+ }
+ ]
}
},
"5,2": {
@@ -205,7 +287,33 @@
},
"CellType": {
"$type": "ElementUI.SelectCellType, ElementUI",
- "CommandList": [],
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon",
+ "contextProperty": {
+ "Display": "值变更原因"
+ }
+ },
+ "value": "userInput"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "任务表",
+ "ShowConfirm": false
+ }
+ ],
+ "ID": "94365e35-3ef9-4149-a2df-e98a44f09957"
+ }
+ ]
+ }
+ ],
"UIPermissions": [
{
"Scope": 2,
@@ -279,15 +387,37 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "执行者",
- "GUID": "ea1f4445-1160-4fc0-9a26-897cc6eee0eb",
- "AttachType": {
- "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
- "UserColumnAttachType": 1
- }
+ "GUID": "3fe2dd08-240a-4867-8a84-e0aa3bc93223"
},
"CellType": {
"$type": "ElementUI.SelectCellType, ElementUI",
- "CommandList": [],
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon",
+ "contextProperty": {
+ "Display": "值变更原因"
+ }
+ },
+ "value": "userInput"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "任务表",
+ "ShowConfirm": false
+ }
+ ],
+ "ID": "0871fd28-94ff-46fb-b542-2cf0c4f6a266"
+ }
+ ]
+ }
+ ],
"UIPermissions": [
{
"Scope": 2,
@@ -385,13 +515,9 @@
"$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
"TableName": "任务表",
"ShowConfirm": false
- },
- {
- "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
- "Message": "保存成功"
}
],
- "ID": "8a45faae-8072-4c23-984f-43b245e11b58"
+ "ID": "c55e5d4a-97b4-4e6e-8b7a-d8aa78f65319"
}
]
}
@@ -630,7 +756,7 @@
{
"TargetCells": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "='任务-基本信息'!C14"
+ "SerializeProperty": "='任务-基本信息'!C16"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -640,7 +766,7 @@
{
"TargetCells": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "='任务-基本信息'!J14"
+ "SerializeProperty": "='任务-基本信息'!J16"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -694,13 +820,224 @@
}
},
"13,2": {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "任务预算工时",
+ "GUID": "920d9962-f990-4709-873c-fed76381b5b4"
+ },
+ "CellType": {
+ "$type": "ElementUI.InputNumberCellType, ElementUI",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon",
+ "contextProperty": {
+ "Display": "值变更原因"
+ }
+ },
+ "value": "userInput"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "任务表",
+ "ShowConfirm": false
+ }
+ ],
+ "ID": "9f973b91-2a4a-47d6-bb08-94146fa29bf0"
+ }
+ ]
+ }
+ ],
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "min": "0",
+ "step": 1,
+ "precision": 1,
+ "placeholder": "请选择",
+ "controlsPosition": true
+ }
+ },
+ "15,1": {
+ "CellType": {
+ "$type": "Forguncy.TextCellType, ServerDesignerCommon",
+ "SavedValidators": [
+ {
+ "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon"
+ }
+ ],
+ "TemplateKey": "_RS_NewLittleRoundCorner",
+ "CommandList": [
+ {
+ "$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": "%Null%",
+ "compareType": 1
+ },
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon",
+ "contextProperty": {
+ "Display": "值变更原因"
+ }
+ },
+ "value": "passValue"
+ }
+ ]
+ },
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+ "Title": "加载中"
+ },
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "回调值",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='任务-基本信息'!状态变更回调"
+ },
+ "ID": "f233f0d9c8714211bef059460f93b60e"
+ },
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='任务-基本信息'!状态变更回调"
+ },
+ "Value": "%Null%"
+ }
+ ]
+ },
+ {
+ "$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.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "='任务-基本信息'!code"
+ }
+ ]
+ },
+ "value": "0"
+ },
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='任务-基本信息'!msg"
+ }
+ }
+ ],
+ "ID": "dea7a981-168a-436c-bf5c-e0535d0cc227"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy",
+ "FunctionName": "warning",
+ "Title": "温馨提示",
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "='任务-基本信息'!msg"
+ },
+ "BtnText": "知道了"
+ }
+ ],
+ "ID": "fefc6bea-e896-4d00-a71a-87383a9b80f8"
+ }
+ ]
+ }
+ ],
+ "ID": "c8864927-d70c-44cf-831d-4e69430ab258"
+ }
+ ]
+ }
+ ]
+ }
+ },
+ "15,2": {
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "开始时间",
"GUID": "c69ca5d6-30ec-40c6-a51b-00076f9abc09"
}
},
- "13,9": {
+ "15,9": {
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "结束时间",
@@ -724,6 +1061,9 @@
"FontSize": 13.333333333333332,
"Foreground": 3
},
+ {
+ "FontSize": -1.0
+ },
{
"FontFamily": 2,
"FontSize": 13.333333333333332,
@@ -736,7 +1076,14 @@
{
"FontFamily": 2,
"FontSize": 13.333333333333332,
- "Foreground": 6
+ "HorizontalAlignment": 5
+ },
+ {
+ "Background": 6,
+ "FontFamily": 2,
+ "FontSize": 13.333333333333332,
+ "Foreground": 7,
+ "Formatter": 1
},
{
"Foreground": 3
@@ -750,6 +1097,7 @@
"Text 1 50",
"[AUTO]General",
"Left",
+ "#FFFFFF00",
"Accent 4 0"
]
},
@@ -760,9 +1108,9 @@
"3,2": 1,
"3,3": 1,
"3,4": 1,
- "3,5": 1,
- "3,6": 1,
- "3,7": 1,
+ "3,5": 3,
+ "3,6": 3,
+ "3,7": 3,
"3,8": 1,
"3,9": 1,
"3,10": 1,
@@ -772,8 +1120,8 @@
"3,14": 1,
"3,15": 1,
"3,16": 1,
- "7,1": 3,
- "7,2": 4,
+ "7,1": 4,
+ "7,2": 5,
"8,0": 1,
"8,1": 2,
"8,2": 1,
@@ -792,11 +1140,11 @@
"8,15": 1,
"8,16": 1,
"9,0": 1,
- "9,1": 3,
+ "9,1": 4,
"9,2": 1,
"9,10": 1,
"10,0": 1,
- "10,1": 3,
+ "10,1": 4,
"10,2": 1,
"10,3": 1,
"10,4": 1,
@@ -812,7 +1160,7 @@
"10,15": 1,
"10,16": 1,
"11,0": 1,
- "11,1": 3,
+ "11,1": 4,
"11,2": 1,
"11,3": 1,
"11,4": 1,
@@ -829,7 +1177,7 @@
"11,15": 1,
"11,16": 1,
"12,0": 1,
- "12,1": 3,
+ "12,1": 2,
"12,2": 1,
"12,3": 1,
"12,4": 1,
@@ -846,12 +1194,32 @@
"12,15": 1,
"12,16": 1,
"13,0": 1,
- "13,1": 5,
- "13,2": 1,
- "13,9": 1
+ "13,1": 4,
+ "13,2": 6,
+ "14,0": 1,
+ "14,1": 4,
+ "14,2": 1,
+ "14,3": 1,
+ "14,4": 1,
+ "14,5": 1,
+ "14,6": 1,
+ "14,7": 1,
+ "14,8": 1,
+ "14,9": 1,
+ "14,10": 1,
+ "14,11": 1,
+ "14,12": 1,
+ "14,13": 1,
+ "14,14": 1,
+ "14,15": 1,
+ "14,16": 1,
+ "15,0": 1,
+ "15,1": 7,
+ "15,2": 1,
+ "15,9": 1
},
"ColStyles": {
- "1": 6
+ "1": 8
},
"SheetStyle": {
"FontFamily": 2,
@@ -861,13 +1229,14 @@
"Spans": [
"9,10,1,7",
"1,1,1,16",
- "13,2,1,7",
- "13,9,1,8",
+ "15,2,1,7",
+ "15,9,1,8",
"3,2,1,3",
"9,2,1,7",
"11,2,1,15",
+ "5,2,1,7",
"7,2,1,7",
- "5,2,1,7"
+ "13,2,1,15"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -892,5 +1261,11 @@
"PrintInfo": {
"PaperSize": {},
"Margin": {}
- }
-}//r8QdnPoSyU5SQO/Z3Nx+2bA8MYCuDkW7LnMjlOyLOTD/KNg5odCHVSzPW+3UsqHal9L11Pw4MLtpiXt/arrzL1uUF8+lyhLRgHHAV5iRY/fLxXcWu789cffXgifL0l5psQIvqIryTVZiKZJ2mcf8amVvRIsTgyIqdXSuejIYX/kPxuGGtGxKAvjZwoBjFxSrZUIgFUAwNciMCstE8WKjxjEbv5jyLdMqyUgov12k+9KqduPKTRAJ8YtTsWUa6eVaM7jP/xTDqm8jiZjhmPz8e1of4/1qvNO937oAnnhm3hlmWZrlGtmcars7n9iWm1HX+pgjozvMlyN934kgZ3ByyO2UHks6sGmGZf15iRbKmGXyCKDmctgtyDJIeUfSO/hb5VySIlK0+i/jTkLiT41KxAN90r5BaGazv/XyRtnlOiNxIaB8ui/PCrgjl2V4f+wtNz0JqylhYPO/kyEsJSVaLjpAypKPF0s2eUsFw4d7o0A8Qe5+rn33ndrO5y8Lu+Fz5RB300+qwa1/4+uYUVY5usbseog08KjLL7pdp4bEJMMuAnNUOQoeCGaO3cBspC4eMtRUx+Aqc24O3E7cu6LB+aJptXnaOfe3W+s0iyB5YZ26gJXAFtfZek4cKawtnd21c1Ke7+1dwaVPBCh8fxErOuqJLITuSleZ5fL1z8RNR1k+cNiaGxVEWY/91YKvZXaue91lN5BTmFSyg4/BgoSk8MLOGMHpgxobadTXDTIYyqpKEpCNVYRb/UrOoAQe9zAtpCXy0TXf3qR6rzMbtRI15O8eZuBgZcAaATae5yAOG7svZpnbwHC7EmeiS4tqkllyQS+iScZFFxpk0j2/qzHEmjtkIJg2fBy2sKaa/Cj6iZeT11B2nZPzLfYzzWlOrolzLhsGan/lpWaUeQgfULE0DQ==|920
\ No newline at end of file
+ },
+ "CustomNames": [
+ {
+ "Name": "状态变更回调",
+ "Formula": "'任务-基本信息'!$B$16"
+ }
+ ]
+}//o2x6k5AIOcTDBUhH7AQtp6OpfFj6cxpN85YFBePqPGmwEJ1bJIJUZyPD1CTzCroA5kgtj5Qlmt9PiaeuV30cw6enARnu1mhJa2QUx85CjyWInwObsHfda8bBtavYv/ffdTyyUNQz76TwUeOynsNGoiVdupUIB4bWvfFLnQyzyYiMaXPQcE5OTq6YPWfYtDzP34zl1Y9FuXczTx14B36XIgBEVDQm4uZU3xZ4r2CkOw+96c9XaEezLdTgY/Iqz0G/G1n52pJ0lQtNZqadqxEDXktbPAAjQANpSqmMi3rMUSWWNVgmCCursPpqfmP8+NpBUcplRm6G9B9QRfM84FukDtAvjkXYMG0Ui+JjQKd5yo9SDRGrz6GZyKgfzD9mqepNKuC6PH65nzuHpmBqp1vag/PvE0N/NRfJPQVLBS1LTg6TckGuADpcu5+CvWj/ysT+6BhM5K5jBh+l/q8LzeXa12atQ0OgqACgZ+erCpgWtbOKx49aIYVaU4XjsGG/HQiTRETv4zYktzRU00GPXtDyZ8RqQsknH/ku3gOGktn2OrS/i1Ad+NjjbcdIk7etLRDI2Re6djD0JE77NWSgsUwqWoruYnyS7guFRq/ExHAlicJnxC3gMyoZptYnT782x5gN/r/pYUH5JX+b+Kzer+D34bo0CNsD92/6FraWNWFttbJ/WLU27RksYc3p3FoUmYAcAfkkYBOwxRO9XFb5cfZRqNZmXDRBBzzdx/Bc25ZlNpYWmNZZhrSYvsNJBGwHX/M8oCUuOI2L0vE5u3gjPQHrCu/XUvGJ0Bii360UIOjaNR+ECRGlTsF1wnDjPS0SxEVt0lYniYlOb6YopR1IjUX+OgW4NOMYY9rwOlWmjzWVC4zcC1ESgBoVSyTTRVnR6ITgljFf355yLLEhGqUqYsEytw==|920
\ No newline at end of file
diff --git a/Pages/任务/任务-子任务列表.json b/Pages/任务/任务-子任务列表.json
index d73bbbf1..2cff0d26 100644
--- a/Pages/任务/任务-子任务列表.json
+++ b/Pages/任务/任务-子任务列表.json
@@ -8,27 +8,34 @@
},
"1": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 10.0
+ "DesignLengthInPixel": 10.0,
+ "IsHidden": true
}
},
"2": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 272.0,
- "Mode": 1
+ "Mode": 1,
+ "IsHidden": true
}
},
"3": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 10.0
+ "DesignLengthInPixel": 10.0,
+ "IsHidden": true
}
},
"4": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 28.0
+ "DesignLengthInPixel": 28.0,
+ "IsHidden": true
}
}
},
"InLogicalVisibleIndexes": [
+ 1,
+ 2,
+ 3,
4
],
"Count": 5,
@@ -332,7 +339,7 @@
]
}
],
- "ID": "0bde0caf-e25c-45de-aec1-87d294bed461"
+ "ID": "cc0c55f7-7c97-4274-81fb-238ccca79b16"
},
{
"CommandList": [
@@ -349,7 +356,7 @@
]
}
],
- "ID": "8338f50c-5d16-48a1-a3e6-49eadceecac4"
+ "ID": "6eb23f6b-816a-400a-b031-263634ba996c"
}
]
}
@@ -505,4 +512,4 @@
"Size": "940,282"
}
]
-}//zNo/v++x01p+tWtJvkxSxhChcDbf+xLgBIjbhSn9S6kJTPhUgabMkkn8p5a2jDABWcMLaHbdd9nBk4a4FhTOjXJd9qJ/ATtcTcSFqyMUvFOEKSR/DBQSRZg1zD1DHm9tWauka1ObZP4pyL4MbsyvhUUDBKZ0y6IWOg/VBDaJvdU2SbxYJJZmWclEothCYBMgoYaYBk2O5G3ONe9zVuYJhXvngdsT+vga11ZbgmD8nEX6DueL+02EGyNr7knoSgnlK89kYT+xVJN6xNs2fEpOu2glhi+ZNCioEAKH8q7Kw2DNzGO4TerXtOVZdRrW4lBifNEwtw9sfxYJKlw3Dz9QQGSYy3Wb3c/7QbeudjmTZ+mU+gam/WmH5fvf/QGimna5GKsx3uCGbhViE6dNtq33iQcZG8WmzZztZmy57F+jvu0yl8azEr5B3J3QjUeQsWf1u+K1TyTujqMn4sZpkrU9hgUChUA3U2ebUUkVCFhm3gvSUobOo+sJ47wqs+SOm67bWFJWMAgimckmwPYmQD08N71JAnaFB9F4b9T4K77IIbP3IqOck7FnkX/0W14VFPXzVgs7rX8vDCQWhNrMiwvFP5mZMCx3D8F+kZQLrHHgg1N/BPwX+wD79gteX+lq6jjVVd8F557h7uebGnaPgfL4EB0kHfsSLtWkh7gR5yXQ6BwIT+VddKTuu/zX/40KelNubGfrDgbEdd75RcoM2RoC/DJ8ko1/46MvNZzJZxelgHYA2QwOENxdos7Z6TtfsE5s2L21iEoSOx/f+Eyu9TvEtnIC30OaY2SmEaGZdQua76RpOzP/wmnlWDaYdR6upxvRtgvsH8HWv9imv4Mt/0MysFj2JvqreCdgUU5Jd03RFDmbqAjGFC3Fzw1xXbRoD+V0ZmVtWXPB7jv+mF6VXvcqgw==|920
\ No newline at end of file
+}//BQEMIOasK4DDrQGqH/Tla13DFMgkIalO1BjZl6KxYM66sDqUnxQUKdZWkCOu3U0qImrz4owgOjU428g6iz2oyb8d6bnD+ZX8oKZkfvBv1kyzBNtSA8aHzLm0Vq5yWuB7Xduu5xAlaikZ35T5A0xKJWDmen5JctYJ+O7qTT7QLjr52vxJZzp+IPrskHFD6C0WHGIinywWp/921IFZu3qsgsez/DSMKRNOJQfe9PFsoQVBTX7dpNRvtidbc2MAvQZFgfWJkB+b8kj5wwKsmyUv2hHJnGVbQIfDwtsNTLJQttn7UGrWkak0Y0/T83s+8qSbCTwc8dUokO/f0+f+hAEt98hniU+LG/p5zq6O64LciW1DzqNQPxjzvc+smapsUJVKxvRj6CEI+E/s5R/7WExXpEGJ8PnPeAikBSZrbWoC2GCXVU4/4N4BjKyitJdJY1d+TBmS25bSimtJByU0rqWP+ObRHN7vCK9rqxBvieRGaLCT4u0Zpm5QEW6yypujrTvloqfTB7n0vz/Hr1bGLApqIRkdefaBWvZX4bFtzlou6r+NdC02xBF46hwVC49Tc7tZR7Nu0iYgf8qYlxW274Zzsvmo4YgcrvWl5QRMu1unov0mioQBfXMpp9g2INYeYn2CwXKcJUypmjRKUf1Epk4j5saioXBV8rP7zIEsbe+MP4KM6P+9hott90+7lc3AkA6NiK6ilgxCfhFZbKDgBCgt5vRgUwQ/rT9N1+Yzl64vw3HNJ/13+HSuYQQ3K4ljVQTgCAu2dsEQS/VJ7UlQIQ2Il3EQKjEjzx2xGJkXvJY4xICO0Hc+WIWV6TokOBHZ4W7fMeieoxevqEFqJV14KZZuniNcKSnV5wITKaorTPbP6xWvYbarWKMMjJz9MdopkFvhkdeRI3H/z+w4WA5rIw10eg==|920
\ No newline at end of file
diff --git a/Pages/任务/任务-进展.json b/Pages/任务/任务-进展.json
index 9b970f0c..b55aef89 100644
--- a/Pages/任务/任务-进展.json
+++ b/Pages/任务/任务-进展.json
@@ -13,27 +13,22 @@
},
"2": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 26.0
+ "DesignLengthInPixel": 24.0
}
},
"3": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 10.0
- }
- },
- "4": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 272.0,
"Mode": 1
}
},
- "5": {
+ "4": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 10.0
}
}
},
- "Count": 6,
+ "Count": 5,
"DefaultSize": 10.0
},
"Cols": {
@@ -197,7 +192,7 @@
]
}
},
- "4,2": {
+ "3,2": {
"CellType": {
"$type": "Forguncy.RepeaterCellType, ServerDesignerCommon",
"TemplatePageName": "77fae08dfbac4664a299aa7ec207218",
@@ -300,33 +295,33 @@
"2,2": 0,
"2,3": 1,
"2,4": 1,
+ "3,2": 2,
"4,2": 2,
- "5,2": 2,
- "5,3": 2,
- "5,4": 2,
- "5,5": 2,
- "5,6": 2,
- "5,7": 2,
- "5,8": 2,
- "5,9": 2,
- "5,10": 2,
- "5,11": 2,
- "5,12": 2,
- "5,13": 2,
- "5,14": 2,
- "5,15": 2,
- "5,16": 2,
- "5,17": 2,
- "5,18": 2,
- "5,19": 2,
- "5,20": 2,
- "5,21": 2,
- "5,22": 2,
- "5,23": 2,
- "5,24": 2,
- "5,25": 2,
- "5,26": 2,
- "5,27": 2
+ "4,3": 2,
+ "4,4": 2,
+ "4,5": 2,
+ "4,6": 2,
+ "4,7": 2,
+ "4,8": 2,
+ "4,9": 2,
+ "4,10": 2,
+ "4,11": 2,
+ "4,12": 2,
+ "4,13": 2,
+ "4,14": 2,
+ "4,15": 2,
+ "4,16": 2,
+ "4,17": 2,
+ "4,18": 2,
+ "4,19": 2,
+ "4,20": 2,
+ "4,21": 2,
+ "4,22": 2,
+ "4,23": 2,
+ "4,24": 2,
+ "4,25": 2,
+ "4,26": 2,
+ "4,27": 2
},
"ColStyles": {
"2": 3
@@ -337,7 +332,7 @@
}
},
"Spans": [
- "4,2,1,26"
+ "3,2,1,26"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -376,7 +371,7 @@
"IsAutomaticStroke": false,
"IsAutomaticFill": false,
"Location": "24,32",
- "Size": "927,328"
+ "Size": "927,316"
}
]
-}//M1i28CuqHqwtorDMuKVPntujXJKfgNG3fCYSoMrmQQgtQAlhIT0bI/b/J4Nj4pfvBA0DQfpde36e5h1jYGtAMhcWXDXwn3dq96HNJaAINlwWfTl0b1rs/B4u0LrRk+9Av4WACAeikIjKb+AGvTpaMUXX3zfqmOqfWUMf0rmVefSqcBPknlbJvhjYDpw8MZhbtI8yAjajE6t0Ofo/wsFhVSqrGcly3W5tQMXnvanVd6ojY2zyW7uxmqmSL1+QNdXp16MQW/KYO9ZlUAEjzAXBvdwVJR5REC4ZmQxytF66MiZM4fgs0RD+JoFA/WgNzF6lKSf7x/r8+511a5piC3fwLCOz400S6H+R/5dHFtcaxqymkXxeWB9NcPO3758LuNQPJvOYqgV6NS95R+/zt+tnqiTP7unmmmc8Fd+iV6Q06muh8ksl95GD4+XBlVH1/aJdv6YgFyNzk/NP5Kx3gXl39QH2KtVQalOzTo9zRfmmFKjXInzRKsJu0JorBRj2gEH7eUd4Aym9QHjFHti9i/BlGXf63W+RXnBW/R+4kUTABPtgqkMZxifdI+3ELvKXxq41pQfHu9iL2dSqi0DBNAGtRSKs+J3k/vlrvT/CYVZT6TwIC3RPIhqMBqIyFvsSCpBa1RP+54fdl/0nwJmiBqhbqFdqMY9cdkEjc380/eGHzZyViIVAiBeBk+QbUx4oWDOxWupF3t0dQC+2GLcrryhjH3Nfx9g6L6dRV13i+xOIHGtUbRNjDDSQLjiifGryX40pHAlPytErOWfoHT5xx8tNPK+r8Ou/qB1Lag46kRAOIcVyLvPjZSpRaNclAIjRyBX5lYaC8H6KP9InRGEaIKPezUEKH5o7WUVmz8RiL8SU+iWPYfWDx80fPsmP5Etaj01Z9ArPU03/NsBhgtfSpckj+g==|920
\ No newline at end of file
+}//yymCAF+FnWUf835t8cJIiLGGR8CW1+tCtYUnj5Qww4n0ukKm86EZxAdCtcw+fcQB0cFiXCpGUvznI+9zpqcfGxH4ApJfoF15NP5Yp3KrWuna3IcpjNIdJAJS0+Gm9BYaYaP2cft111N3FMBx+zmeKmUKhL9c6r+S7EujlBcVZo81Ka/fMfVy7udQtV4O5Bzsg2QWFh0ZQVE6d6ds9vPIWcD1KTAsZ7HQ7KbSKTiLYtrAfMePc5AVSvjE0H/DQ62wuuhGP2rjAsTyuygN2BuxLQSkfoHfLI+ijgmT+T3UsvXm/EosuZs69F5CP7T+K28TCEGmpMZ5mM1VNyCpYlBjpw80lJ5wXkXbOG/EQI/Jze3+jGE+2j+ELQQCPmfaUPPApDnEIN4lwcxmS4lyFKR4CurB9r3gMzT9GgOISxo4NQAhHp2qZEi8JXpJf1aKvbbxABY9gQcO51jUgHlo5nUfOLc5zK1CKCqmmXYmdZm/2zCGbKInhvnuwektPBvfC6pUfoOA8xtuUFaRy2jQ4K/i+/cCx+ZLtjAgBmlVe6V87crya9eEAfuzrfeOo6yCDtc9XT8yySbPdCbSvdmRC8BPYyAZS/m0lOvOnbIa4HME4u1kl/FEjxuE7+vJF5ZIYgBods4r27cvHVtQiNfOQ+tIePxnNID4Vg6eBSb4HhyHAQBxQ0cqdXkaPqBVtd41JXW1tbCmmfAizXX6V/JQjk1QREO/TGCYI3Xvhhr/FNKfJaagFWLCCICdjnBmunXeoHimLtJ5dvUMgAmMjPqDnxH3Bli5xluyhCjhw/cLtywv9dhRXektMKfR72/7qbvdhklIIRNEIs2qucAulMQgrCma3gsewQamYz8VD1V+DpzHBF3Lh9CLvuLZCSkHbfEyR+La0udPHtTITamhke5ZqTEPMw==|920
\ No newline at end of file
diff --git a/Pages/任务/任务首页.json b/Pages/任务/任务首页.json
index 3d7b1e20..08ca39f8 100644
--- a/Pages/任务/任务首页.json
+++ b/Pages/任务/任务首页.json
@@ -3,17 +3,20 @@
"RowColumnAttachedInfos": {
"0": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 15.0,
+ "IsHidden": true
}
},
"1": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 32.0,
+ "IsHidden": true
}
},
"2": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0
+ "DesignLengthInPixel": 15.0,
+ "IsHidden": true
}
},
"3": {
@@ -109,7 +112,8 @@
},
"20": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 32.0,
+ "IsHidden": true
}
}
},
@@ -211,7 +215,12 @@
},
"17": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 638.0,
+ "DesignLengthInPixel": 40.0
+ }
+ },
+ "29": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 159.0,
"Mode": 2,
"MinLength": {
"Unit": 1
@@ -221,76 +230,132 @@
}
}
},
- "18": {
+ "30": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 24.0
}
},
- "19": {
+ "31": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 39.0
}
},
- "20": {
+ "32": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 38.0
}
},
- "21": {
+ "33": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 39.0
}
},
- "22": {
+ "34": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 38.0
}
},
- "23": {
+ "35": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 39.0
}
},
- "24": {
+ "36": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 38.0
}
},
- "25": {
+ "37": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 39.0
}
},
- "26": {
+ "38": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 38.0,
"Mode": 1
}
},
- "27": {
+ "39": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
},
- "28": {
+ "40": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 15.0
}
+ },
+ "18": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 40.0
+ }
+ },
+ "19": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 40.0
+ }
+ },
+ "20": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 40.0
+ }
+ },
+ "21": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 40.0
+ }
+ },
+ "22": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 40.0
+ }
+ },
+ "23": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 40.0
+ }
+ },
+ "24": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 39.0
+ }
+ },
+ "25": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 40.0
+ }
+ },
+ "26": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 40.0
+ }
+ },
+ "27": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 40.0
+ }
+ },
+ "28": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 40.0
+ }
}
},
- "Count": 29,
+ "Count": 41,
"DefaultSize": 32.0
},
"Values": {
"3,0": "任务-基本信息",
- "3,19": "任务-侧栏",
+ "3,31": "任务-侧栏",
"6,0": "任务-任务信息",
"9,0": "任务-子任务列表",
"12,0": "任务-关联资源",
"15,0": "任务-工时",
"18,0": "任务-进展",
"20,3": "任务ID：",
- "20,10": "项目ID："
+ "20,10": "项目ID：",
+ "20,17": "参与人数："
},
"AttachInfos": {
"1,1": {
@@ -359,7 +424,7 @@
"ReadOnly": true
}
},
- "1,27": {
+ "1,39": {
"CellType": {
"$type": "Forguncy.ImageCellType, ServerDesignerCommon",
"CommandList": [
@@ -380,7 +445,7 @@
"PageName": "任务-基本信息"
}
},
- "3,19": {
+ "3,31": {
"CellType": {
"$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon",
"PageName": "任务-侧栏"
@@ -429,6 +494,13 @@
"ColumnName": "ID",
"GUID": "83e8051b-34cd-41da-a2b4-9699687b73bd"
}
+ },
+ "20,18": {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "参与人数",
+ "GUID": "dd68b5dc-2111-47fc-92e0-c24293bc5265"
+ }
}
},
"StyleDatas": {
@@ -491,6 +563,12 @@
"BorderTop": 1,
"BorderRight": 1
},
+ {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332,
+ "Formatter": 5,
+ "HorizontalAlignment": 2
+ },
{
"Background": null
}
@@ -501,7 +579,8 @@
"Background 2 -10",
"Right",
"#FFFFFF00",
- "black"
+ "black",
+ "[AUTO]General"
],
"Borders": [
{
@@ -531,20 +610,34 @@
"2,15": 0,
"2,16": 0,
"2,17": 0,
- "2,18": 0,
- "2,19": 0,
+ "2,18": 1,
+ "2,19": 1,
"2,20": 1,
"2,21": 1,
"2,22": 1,
- "2,23": 0,
+ "2,23": 1,
"2,24": 1,
"2,25": 0,
- "2,26": 0,
- "2,27": 0,
- "2,28": 0,
+ "2,26": 1,
+ "2,27": 1,
+ "2,28": 1,
+ "2,29": 0,
+ "2,30": 0,
+ "2,31": 0,
+ "2,32": 1,
+ "2,33": 1,
+ "2,34": 1,
+ "2,35": 0,
+ "2,36": 1,
+ "2,37": 0,
+ "2,38": 0,
+ "2,39": 0,
+ "2,40": 0,
"3,0": 2,
- "3,18": 2,
- "3,19": 3,
+ "3,25": 2,
+ "3,29": 2,
+ "3,30": 2,
+ "3,31": 3,
"4,0": 2,
"4,1": 0,
"4,2": 0,
@@ -563,8 +656,20 @@
"4,15": 0,
"4,16": 0,
"4,17": 0,
- "4,18": 2,
- "4,19": 3,
+ "4,18": 1,
+ "4,19": 1,
+ "4,20": 1,
+ "4,21": 1,
+ "4,22": 1,
+ "4,23": 1,
+ "4,24": 1,
+ "4,25": 0,
+ "4,26": 1,
+ "4,27": 1,
+ "4,28": 1,
+ "4,29": 0,
+ "4,30": 2,
+ "4,31": 3,
"5,0": 2,
"5,1": 2,
"5,2": 2,
@@ -584,7 +689,19 @@
"5,16": 2,
"5,17": 2,
"5,18": 2,
- "5,19": 3,
+ "5,19": 2,
+ "5,20": 2,
+ "5,21": 2,
+ "5,22": 2,
+ "5,23": 2,
+ "5,24": 2,
+ "5,25": 2,
+ "5,26": 2,
+ "5,27": 2,
+ "5,28": 2,
+ "5,29": 2,
+ "5,30": 2,
+ "5,31": 3,
"6,0": 2,
"6,1": 2,
"6,2": 2,
@@ -603,8 +720,10 @@
"6,15": 2,
"6,16": 2,
"6,17": 2,
- "6,18": 2,
- "6,19": 3,
+ "6,25": 2,
+ "6,29": 2,
+ "6,30": 2,
+ "6,31": 3,
"7,0": 2,
"7,1": 0,
"7,2": 0,
@@ -623,8 +742,20 @@
"7,15": 0,
"7,16": 0,
"7,17": 0,
- "7,18": 2,
- "7,19": 3,
+ "7,18": 1,
+ "7,19": 1,
+ "7,20": 1,
+ "7,21": 1,
+ "7,22": 1,
+ "7,23": 1,
+ "7,24": 1,
+ "7,25": 0,
+ "7,26": 1,
+ "7,27": 1,
+ "7,28": 1,
+ "7,29": 0,
+ "7,30": 2,
+ "7,31": 3,
"8,0": 2,
"8,1": 2,
"8,2": 2,
@@ -644,7 +775,19 @@
"8,16": 2,
"8,17": 2,
"8,18": 2,
- "8,19": 3,
+ "8,19": 2,
+ "8,20": 2,
+ "8,21": 2,
+ "8,22": 2,
+ "8,23": 2,
+ "8,24": 2,
+ "8,25": 2,
+ "8,26": 2,
+ "8,27": 2,
+ "8,28": 2,
+ "8,29": 2,
+ "8,30": 2,
+ "8,31": 3,
"9,0": 2,
"9,1": 2,
"9,2": 2,
@@ -663,8 +806,10 @@
"9,15": 2,
"9,16": 2,
"9,17": 2,
- "9,18": 2,
- "9,19": 3,
+ "9,25": 2,
+ "9,29": 2,
+ "9,30": 2,
+ "9,31": 3,
"10,0": 2,
"10,1": 0,
"10,2": 0,
@@ -683,8 +828,20 @@
"10,15": 0,
"10,16": 0,
"10,17": 0,
- "10,18": 2,
- "10,19": 3,
+ "10,18": 1,
+ "10,19": 1,
+ "10,20": 1,
+ "10,21": 1,
+ "10,22": 1,
+ "10,23": 1,
+ "10,24": 1,
+ "10,25": 0,
+ "10,26": 1,
+ "10,27": 1,
+ "10,28": 1,
+ "10,29": 0,
+ "10,30": 2,
+ "10,31": 3,
"11,0": 2,
"11,1": 2,
"11,2": 2,
@@ -704,7 +861,19 @@
"11,16": 2,
"11,17": 2,
"11,18": 2,
- "11,19": 3,
+ "11,19": 2,
+ "11,20": 2,
+ "11,21": 2,
+ "11,22": 2,
+ "11,23": 2,
+ "11,24": 2,
+ "11,25": 2,
+ "11,26": 2,
+ "11,27": 2,
+ "11,28": 2,
+ "11,29": 2,
+ "11,30": 2,
+ "11,31": 3,
"12,0": 2,
"12,1": 2,
"12,2": 2,
@@ -723,8 +892,10 @@
"12,15": 2,
"12,16": 2,
"12,17": 2,
- "12,18": 2,
- "12,19": 3,
+ "12,25": 2,
+ "12,29": 2,
+ "12,30": 2,
+ "12,31": 3,
"13,0": 2,
"13,1": 0,
"13,2": 0,
@@ -743,8 +914,20 @@
"13,15": 0,
"13,16": 0,
"13,17": 0,
- "13,18": 2,
- "13,19": 3,
+ "13,18": 1,
+ "13,19": 1,
+ "13,20": 1,
+ "13,21": 1,
+ "13,22": 1,
+ "13,23": 1,
+ "13,24": 1,
+ "13,25": 0,
+ "13,26": 1,
+ "13,27": 1,
+ "13,28": 1,
+ "13,29": 0,
+ "13,30": 2,
+ "13,31": 3,
"14,0": 2,
"14,1": 2,
"14,2": 2,
@@ -764,7 +947,19 @@
"14,16": 2,
"14,17": 2,
"14,18": 2,
- "14,19": 3,
+ "14,19": 2,
+ "14,20": 2,
+ "14,21": 2,
+ "14,22": 2,
+ "14,23": 2,
+ "14,24": 2,
+ "14,25": 2,
+ "14,26": 2,
+ "14,27": 2,
+ "14,28": 2,
+ "14,29": 2,
+ "14,30": 2,
+ "14,31": 3,
"15,0": 2,
"15,1": 2,
"15,2": 2,
@@ -783,8 +978,10 @@
"15,15": 2,
"15,16": 2,
"15,17": 2,
- "15,18": 2,
- "15,19": 3,
+ "15,25": 2,
+ "15,29": 2,
+ "15,30": 2,
+ "15,31": 3,
"16,0": 2,
"16,1": 0,
"16,2": 0,
@@ -803,8 +1000,20 @@
"16,15": 0,
"16,16": 0,
"16,17": 0,
- "16,18": 2,
- "16,19": 3,
+ "16,18": 1,
+ "16,19": 1,
+ "16,20": 1,
+ "16,21": 1,
+ "16,22": 1,
+ "16,23": 1,
+ "16,24": 1,
+ "16,25": 0,
+ "16,26": 1,
+ "16,27": 1,
+ "16,28": 1,
+ "16,29": 0,
+ "16,30": 2,
+ "16,31": 3,
"17,0": 2,
"17,1": 2,
"17,2": 2,
@@ -824,7 +1033,19 @@
"17,16": 2,
"17,17": 2,
"17,18": 2,
- "17,19": 3,
+ "17,19": 2,
+ "17,20": 2,
+ "17,21": 2,
+ "17,22": 2,
+ "17,23": 2,
+ "17,24": 2,
+ "17,25": 2,
+ "17,26": 2,
+ "17,27": 2,
+ "17,28": 2,
+ "17,29": 2,
+ "17,30": 2,
+ "17,31": 3,
"18,0": 2,
"18,1": 2,
"18,2": 2,
@@ -843,8 +1064,10 @@
"18,15": 2,
"18,16": 2,
"18,17": 2,
- "18,18": 2,
- "18,19": 3,
+ "18,25": 2,
+ "18,29": 2,
+ "18,30": 2,
+ "18,31": 3,
"19,0": 2,
"19,1": 2,
"19,2": 2,
@@ -864,6 +1087,18 @@
"19,16": 2,
"19,17": 2,
"19,18": 2,
+ "19,19": 2,
+ "19,20": 2,
+ "19,21": 2,
+ "19,22": 2,
+ "19,23": 2,
+ "19,24": 2,
+ "19,25": 2,
+ "19,26": 2,
+ "19,27": 2,
+ "19,28": 2,
+ "19,29": 2,
+ "19,30": 2,
"20,3": 4,
"20,4": 5,
"20,5": 6,
@@ -874,31 +1109,46 @@
"20,11": 9,
"20,12": 10,
"20,13": 10,
- "20,14": 11
+ "20,14": 11,
+ "20,16": 7,
+ "20,17": 12,
+ "20,18": 9,
+ "20,19": 10,
+ "20,20": 10,
+ "20,21": 11,
+ "20,25": 12,
+ "20,29": 12
},
"RowStyles": {
- "1": 12,
- "2": 12,
- "3": 12,
- "4": 12,
- "5": 12
+ "1": 13,
+ "2": 13,
+ "3": 13,
+ "4": 13,
+ "5": 13
},
"SheetStyle": {
"FontFamily": 0
}
},
"Spans": [
- "3,0,1,18",
- "6,0,1,18",
- "9,0,1,18",
+ "3,0,1,30",
+ "6,0,1,30",
+ "9,0,1,30",
"20,4,1,4",
- "12,0,1,18",
- "15,0,1,18",
- "2,19,1,8",
+ "12,0,1,30",
+ "15,0,1,30",
+ "2,31,1,8",
"1,1,1,2",
- "18,0,1,18",
- "3,19,16,10",
- "20,11,1,4"
+ "18,0,1,30",
+ "3,31,16,10",
+ "20,11,1,4",
+ "2,17,1,13",
+ "4,17,1,13",
+ "7,17,1,13",
+ "10,17,1,13",
+ "13,17,1,13",
+ "16,17,1,13",
+ "20,18,1,4"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -944,6 +1194,10 @@
{
"Name": "项目ID",
"Formula": "任务首页!$L$21"
+ },
+ {
+ "Name": "参与人数",
+ "Formula": "任务首页!$S$21"
}
]
-}//K7hmoyKL9RhYkA7fXQ6sFNbe3NNTZU/RhqLfpX0DU28Wm4aHVvmLq4qfJwsU4PeooGCH/FD3JMNaI3BTTD/GUgR7oLXNInMbm+1wL5naUfVQ72g0iQqp8ZJ1RgS5t8qQYR+qnL6+0bFBvV5ICiOGhYZ70urK4hT9MNIy0VSOUTyhVE8Za3MFFZFibfdwzZ+Mc0OudjNHqAa9G+ESuh32VjpgSHnzullZMw7wX/Aff+bAUOTeC2MRQU4R1AWmblbKie80+1vMU8T29kmg6q/3iUvZU/kidfkhF0ytqqPCZHeyAXwj6u8aNeLPXuMPTRQ5fTjdyxZHjgAWqqonEMC5k7BqgM4AtdZC2HVBYMBFslAYW1zFmk57k6rEPV5WGxfl8LnyaxzMi5qCA0Ql8EoeDWXnILEtnJU6gPTtjt9aE3JoS1IUTtZ9ThEaJQSpmLqLk2bwmwYuBIm+TT9b+yajtSxuXtPXeqNq58RjzG5jvKJVFzT8C51Dpg+Xqcm1Nv5ybNG/idqpedliPkykdrS4IhoXsTVpuud4oBjj73KduapJx+qywTmFl7t1WAm3+Topun1gfCrchcr/PEk3zYwygYbURNB+E3JtimQbzDu/QhYmJyjUHscF1eNLhK/dAOiL9bfl8Zxbjo0iVVgLqagTWqGvF56PiMmjcDj/5fvxscTbt8G2rH8eFgQshkjaCm7etg4PB+k+epq82cpeQieSJ8BPC2NiyG3ZzFOzVMQ2m6xl8nlwcGbz4a9oqy3hm9q8PIEXDNWbhz4TEmkIUp2CxEQqRGBqVzMTd96uzaDA90Kd2IJbgXAXxYF+yP7QqznoOu8Feiidv/FqnbN1SuvkUmroUy8rg07kTJR4cQbLoRAluJsZQvY/xvAgfI0VsmBwrbvB4bSR5bc6zmEtUBLC+Q==|920
\ No newline at end of file
+}//WfhKK2FtWLAqGh749iOnMUW3KDvEh9N48QaYrCV1UdnzcguU88rGVLToHZIPSyqUnYxPujXKBwsWDlkXrcFWA80Enh8PveoSEnwpJ2vizIClaGHahkiOP0JOMrCxiGH5z+eLnKCxMOl/RReGff6OSE8YRF4ahrxcYBUs+pn3V/t/Slg6AO/6pKE3AcH+Now/dR1yPiSroC4Sa/mQCzuHk7wCBQ1N2CCNX7I3meBTQ6Le+C1rnHRMSgZHkUcemlLptyVRs5G/UGwfjrcHFlI01AzbdvLayWA3cYwStwg/XrMtKwlsreEX5lbW7EeciiG9jvs2wolR2TXlIhOZs2fCdzLtGE3cm5auotBY5NYcGTUoNBZvQpuP/OhrrJxwb97u/EWtURoJnKD86t59+AG8lXXzR3UJSfJ/YRLQ3Shry29VTx/xsguRBectb0/SKNW70TO59k72e2ZzWs6O+8PcU0tVHvFXaT1Xa172eW+rVan9iF/npKxHMh4dDMgIuQMHVdGD9sBy5dy961B9N7X0xeOV3+jbrzCWayWst3/2M7XlmmthXAVW6/IUM8tjU0AnOs9i33P5hSqFa+iwDCnxtsPhh5wzKxecM59dNfQhz/t0WqywVruoLGk5Zxd9rMCqnY5uh9gi9VwCkGIB5keu1pnntbGaB2YfInf3hltv2pcvOtCde1XFvEvvcUAnE81QnX+LckS0CzCj6UOGVGvYUb22vIBk9cUNvCIEr+f+dXDJSxhrvLjJ4yZz45xQRSUveCQo2VlQxw2FDnDQP2NWUU4b+Wk9ZnZqcuGsTiRaoJZgpHxTjhiUWjJFMH4Q/D4CFkwrBSClHZn8AoaWG2JjbotyouVqA0iBS44hI8g2ijmmMrbiv9WYCrvsLnJao/haJO88+UJUre3yMmVJIVXoMg==|920
\ No newline at end of file
diff --git a/Pages/任务/参与成员管理.json b/Pages/任务/参与成员管理.json
new file mode 100644
index 00000000..ee50ffa4
--- /dev/null
+++ b/Pages/任务/参与成员管理.json
@@ -0,0 +1,700 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 40.0
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 50.0
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 394.0
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "7": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
+ },
+ "9": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0,
+ "IsHidden": true
+ }
+ }
+ },
+ "InLogicalVisibleIndexes": [
+ 9
+ ],
+ "Count": 10,
+ "DefaultSize": 32.0
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "7": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "8": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "14": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "18": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "19": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "20": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "21": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ }
+ },
+ "Count": 22,
+ "DefaultSize": 32.0
+ },
+ "Values": {
+ "3,2": "成员",
+ "3,18": "操作",
+ "4,18": "移除",
+ "7,1": "任务时薪 > 岗位时薪 > 个人时薪",
+ "7,18": "保存"
+ },
+ "Formulas": {
+ "9,1": "TEXTJOIN(\",\",1,C5)"
+ },
+ "AttachInfos": {
+ "1,1": {
+ "CellType": {
+ "$type": "ElementUI.SelectCellType, ElementUI",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "成员",
+ "TableValue": {
+ "TableName": "用户信息视图",
+ "TableValueType": 1,
+ "BindingInfos": [
+ {
+ "BindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "用户名",
+ "GUID": "e1fa7d37-c1c6-4121-a125-69867f64c6a2"
+ },
+ "ColumnName": "用户名"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "默认时薪",
+ "GUID": "f0e3b20d-551f-4d32-8356-ef52bac312ed"
+ },
+ "ColumnName": "默认时薪"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "用户名",
+ "GUID": "84278ec7-b007-4ab7-a293-ec5daa04d12b"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=参与成员管理!B2"
+ }
+ },
+ "NullFormulaValueQueryPolicy": 0,
+ "TopCount": "1"
+ },
+ "ID": "dd07ee0ebfa54c4a972c9ff760a3dfab"
+ },
+ {
+ "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon",
+ "ListviewName": "表格1",
+ "UpdateType": 1,
+ "UpdateValues": [
+ {
+ "Column": "成员",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=参与成员管理!成员.用户名"
+ }
+ },
+ {
+ "Column": "任务时薪",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=参与成员管理!成员.默认时薪"
+ }
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=参与成员管理!B2"
+ },
+ "Value": "%Null%"
+ }
+ ]
+ }
+ ],
+ "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": [
+ {
+ "BindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "用户名",
+ "GUID": "c2737a58-4d2f-4cd7-afb6-20a40bb55ea7"
+ },
+ "ColumnName": "value"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "全名",
+ "GUID": "f81f0f2e-8c03-4768-b6b6-ed19d0ca0135"
+ },
+ "ColumnName": "label"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
+ "CompareType": 9,
+ "ColumnBindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "用户名",
+ "GUID": "227474e3-c33b-426e-8d36-cbb9f9b07772"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=参与成员管理!B10"
+ }
+ },
+ "CustomColumns": []
+ },
+ "placeholder": "请选择",
+ "noDataText": "无数据",
+ "filterInServerOptions": {
+ "matchMethod": "contains",
+ "loadingText": "加载中"
+ },
+ "noMatchText": "无匹配数据"
+ }
+ },
+ "3,1": {
+ "ListViewInfo": {
+ "Name": "表格1",
+ "TableName": "任务成员表",
+ "RowIndex": 3,
+ "ColumnIndex": 1,
+ "RowCount": 3,
+ "ColumnCount": 20,
+ "DetailListViewInfo": {
+ "ColumnOfDetailTable": "任务ID",
+ "MasterTable": "任务表",
+ "ColumnOfMasterTable": "ID",
+ "DataCommitType": 2
+ },
+ "TopCondition": null,
+ "ListViewStyleName": "_RS_NewFashionListStyle2",
+ "ShowColumnHeaderInDesigner": true,
+ "IsRowHeaderVisible": true,
+ "ShowEditStatusIcon": true,
+ "UseSimpleBar": true,
+ "AllowEditInListview": true,
+ "ColumnOperation": 2,
+ "CommitType": 1
+ }
+ },
+ "4,2": {
+ "NameUsedInJavaScript": "成员",
+ "BindingInfo": {
+ "TableName": "任务成员表",
+ "ColumnName": "参与人",
+ "GUID": "bf04a270-7a13-40cf-a184-89e979a2b374"
+ },
+ "CellType": {
+ "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon",
+ "DropdownButtonModeInListview": 1,
+ "LoadOnDemand": true,
+ "IsBounding": true,
+ "DataSource": "用户信息视图",
+ "ValueColumnBindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "用户名",
+ "GUID": "b7489ee2-703e-4478-a1d6-5d0bb309a4e6"
+ },
+ "DisplayColumnBindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "全名",
+ "GUID": "cf280296-8970-4fac-bba6-5973a30aa34f"
+ },
+ "ReadOnly": true
+ },
+ "DataValidationInfo": {}
+ },
+ "4,9": {
+ "NameUsedInJavaScript": "岗位ID",
+ "BindingInfo": {
+ "TableName": "任务成员表",
+ "ColumnName": "岗位ID",
+ "GUID": "92bb0233-a7fd-4699-805f-5cd2a94f19ea"
+ },
+ "CellType": {
+ "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon",
+ "IsBounding": true,
+ "DataSource": "项目岗位",
+ "ValueColumnBindingInfo": {
+ "TableName": "项目岗位",
+ "ColumnName": "ID",
+ "GUID": "8370ddeb-8347-47b9-a082-1852abab6a39"
+ },
+ "DisplayColumnBindingInfo": {
+ "TableName": "项目岗位",
+ "ColumnName": "岗位名称",
+ "GUID": "72e01df7-95db-4efa-b534-206683e50892"
+ },
+ "ItemsQuery": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "项目岗位",
+ "ColumnName": "项目ID",
+ "GUID": "fa869be2-89ff-45e6-9fb0-0b6a08c9267f"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=参与成员管理!项目ID"
+ }
+ },
+ "DropDownSubItems": [
+ {
+ "GUID": "b0cea181f4f84933bdb08e5b7363a57b",
+ "BindingInfo": {
+ "TableName": "项目岗位",
+ "ColumnName": "岗位名称",
+ "GUID": "ef304a5e-df18-4301-bff0-80b1c345cfc5"
+ },
+ "ColumnName": "岗位名称",
+ "Alignment": 1
+ },
+ {
+ "GUID": "b2d307de6e194734b33f324b2481848a",
+ "BindingInfo": {
+ "TableName": "项目岗位",
+ "ColumnName": "默认时薪",
+ "GUID": "f2567263-06a5-4054-9145-e3e72a65907e"
+ },
+ "ColumnName": "默认时薪",
+ "Alignment": 3,
+ "Formatter": " ¥#,##0.00_);[Red] ¥(#,##0.00)",
+ "WidthInfo": {}
+ }
+ ],
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "岗位时薪",
+ "TableValue": {
+ "TableName": "项目岗位",
+ "TableValueType": 1,
+ "BindingInfos": [
+ {
+ "BindingInfo": {
+ "TableName": "项目岗位",
+ "ColumnName": "默认时薪",
+ "GUID": "e68e991a-996a-4d15-96f2-914686c9c5aa"
+ },
+ "ColumnName": "默认时薪"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "项目岗位",
+ "ColumnName": "ID",
+ "GUID": "9348f4f7-a20c-464d-bc61-24e823d57305"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=参与成员管理!J5"
+ }
+ },
+ "NullFormulaValueQueryPolicy": 0,
+ "TopCount": "1"
+ },
+ "ID": "d437219fd5a24966adaed3856eb833c8"
+ },
+ {
+ "$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": "%Null%",
+ "compareType": 1
+ },
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=参与成员管理!岗位时薪.默认时薪"
+ }
+ ]
+ },
+ "value": "%Null%",
+ "compareType": 1
+ },
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=参与成员管理!岗位时薪.默认时薪"
+ }
+ ]
+ },
+ "value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=参与成员管理!O5"
+ },
+ "compareType": 1
+ }
+ ]
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "ConfirmDialogSettings": {
+ "Title": "确认",
+ "FormulaText": "当前岗位时薪于人员时薪不一致，是否改为岗位时薪？",
+ "YesButtonText": "是",
+ "NoButtonText": "否",
+ "ConfirmIcon": 1
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon",
+ "ListviewName": "表格1",
+ "UpdateValues": [
+ {
+ "Column": "任务时薪",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=参与成员管理!岗位时薪.默认时薪"
+ }
+ }
+ ],
+ "UpdateRowType": 3
+ }
+ ],
+ "ID": "a1a70fa4-d863-4c39-b812-6425fe9e1bfb"
+ }
+ ]
+ }
+ ],
+ "ID": "2feeba41-588b-44a5-a271-16428b246b7a"
+ }
+ ]
+ }
+ ]
+ }
+ },
+ "4,14": {
+ "NameUsedInJavaScript": "任务时薪",
+ "BindingInfo": {
+ "TableName": "任务成员表",
+ "ColumnName": "任务时薪",
+ "GUID": "7fbbe1f3-2df0-424e-ac1f-50defe5f8c8e"
+ },
+ "CellType": {
+ "$type": "Forguncy.NumberCellType, ServerDesignerCommon"
+ }
+ },
+ "4,18": {
+ "NameUsedInJavaScript": "操作",
+ "CellType": {
+ "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "任务成员表",
+ "UpdateType": "delete",
+ "ShowConfirm": true,
+ "ConfirmText": "您确定要移除该成员吗？"
+ }
+ ],
+ "Text": "移除",
+ "ClickMode": 1
+ }
+ },
+ "7,18": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "任务表",
+ "ShowConfirm": false
+ },
+ {
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "Message": "操作完成"
+ }
+ ],
+ "Text": "保存",
+ "TemplateKey": "_RS_Main1"
+ }
+ },
+ "9,5": {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "ID",
+ "GUID": "8817b380-324c-4770-9a5f-98948b913fd8"
+ }
+ },
+ "9,8": {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "项目ID",
+ "GUID": "9a14b790-cd77-4a9e-9874-993b33bd65fe"
+ }
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332,
+ "HorizontalAlignment": 1
+ },
+ {
+ "HorizontalAlignment": 1
+ },
+ {
+ "Foreground": 2,
+ "HorizontalAlignment": 1,
+ "Underline": false
+ },
+ {
+ "Foreground": 3
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Body",
+ "Center",
+ "#FFFF0000",
+ "Text 1 50"
+ ]
+ },
+ "CellStyles": {
+ "3,9": 0,
+ "3,14": 1,
+ "4,2": 0,
+ "4,9": 0,
+ "4,14": 1,
+ "4,18": 2,
+ "7,1": 3
+ },
+ "SheetStyle": {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332
+ }
+ },
+ "Spans": [
+ "1,1,1,20",
+ "4,18,1,3",
+ "9,1,1,4",
+ "4,2,1,7",
+ "4,14,1,4",
+ "9,5,1,3",
+ "4,9,1,5",
+ "9,8,1,3",
+ "3,2,1,7",
+ "3,9,1,5",
+ "3,14,1,4",
+ "3,18,1,3",
+ "5,1,1,20",
+ "7,18,1,3"
+ ],
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+ "Title": "参与成员",
+ "PageLoadedCommandList": [
+ {
+ "$type": "CloseCommand.CloseCommand, CloseCommand",
+ "PassValueBack": true,
+ "ReloadData": true,
+ "PassQueryCondition": 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": [],
+ "RelatedDataTableName": "任务成员表"
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ },
+ "CustomNames": [
+ {
+ "Name": "任务ID",
+ "Formula": "参与成员管理!$F$10"
+ },
+ {
+ "Name": "项目ID",
+ "Formula": "参与成员管理!$I$10"
+ }
+ ]
+}//IU2ndpu5qClzdtadgDZr8ueEX4s7FCNh2hvoKFuhc5pLhWTl1VQ6drPvZg+5AVBkHkpqvtr4Hj846ScCGtLmEJxzjj8TEOFku4jr9/P/550bcH4S6jJiI3miinDJKFIL1CY7V9uLBG5gTxkO/+7EZs/MsWh22X4ZM7pQbQFJ/cdz4GJhDCPzRpONDjb1LhsbtxAwG9Eq39eiw3fYYa98FaGDkx5gpagt8FtA/ftDaCv2G8zGG3DyTiXwNpKO5eQqGVXZzf5nSZshqsl+YO1dE1GFWbpM6AVIChAFIfxk1JDkIbQAlN7zYItwYs56qp8S00oB/ASHWQ5rRW4VR0sJMYHgSdiGmF6RiTudvBZDIw+r5lL0yqLu58IWIwfsN+OpfK+X6tl+p0VXFJFrWbUb7Ke0/SFrpd8NYqS4h9dG5Q26ONfvfRTmdJLWG+AIXr+nndCGEKJf0cgupUicdCTmNUhu8PGeIQ2t6ibCV/T7O8h83h7Y3tfmLGzT654Eyy4SymM3Gf4mMVSI5KKy8AijvVJiOfSzmH9Yvc7zxDFc14AIQk+UcR2ut5hXrYRu+QOs5F01eJutjk0cO0ShakTitdE+gQns6eUp9aH5aYg2/G9nm18zw1zSpiX7SDgxSIvcik8/p/NhqYzJ649TunelRdRy2wBfd/eJqyZO+G+ZxOtpGk1qX/2/5X+CNIR5M1EMWaT0l/KsiyXkhOW4A97j5YzDlY+b0eiwk2eVRvCKu6SwhsoMofJ8srvPR7ECeY4jr0YZvGie+GtKtYGvMVrBvD7GEOAgQKN4Bzb/eU/RAgZrXFTyTSBh8jBFEKjzfuWkgnS+fkwKAaG0HgieUJb07hQPpuG8OfQyJamyf7NUisbWu8FGV5yOyRodSXdzTq48TdQHrWcNb/1pQnr0mNVBfQ==|920
\ No newline at end of file
diff --git a/Pages/任务/工时详情.json b/Pages/任务/工时详情.json
index 82931642..ef00e502 100644
--- a/Pages/任务/工时详情.json
+++ b/Pages/任务/工时详情.json
@@ -219,33 +219,41 @@
},
"Values": {
"1,1": "整体进展",
- "3,1": "计划工时",
- "3,8": "实际工时",
- "3,15": "计划工时",
+ "3,1": "预算工时",
+ "3,7": "计划工时",
+ "3,12": "实际工时",
+ "3,18": "完成比例",
"6,1": "明细进展",
"7,1": "工时详情-列头",
"10,9": "计划工时",
"10,14": "实际工时"
},
"Formulas": {
- "3,17": "K4/D4*100"
+ "3,20": "O4/D4*100"
},
"AttachInfos": {
"3,3": {
"BindingInfo": {
"TableName": "任务表",
- "ColumnName": "总计划工时",
- "GUID": "e3b986b0-70cf-46c1-b94e-897c7847474d"
+ "ColumnName": "任务预算工时",
+ "GUID": "f2bfaee2-4d75-4fd3-8314-e2c50175e4ff"
}
},
- "3,10": {
+ "3,9": {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "总计划工时",
+ "GUID": "3e5fdbf2-ea31-4cd6-a674-450b4b407879"
+ }
+ },
+ "3,14": {
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "总实际工时",
"GUID": "3408ea3e-ebd0-47c2-87e7-77898ea53113"
}
},
- "3,17": {
+ "3,20": {
"CellType": {
"$type": "ElementUI.ProgressCellType, ElementUI",
"CommandList": [],
@@ -501,15 +509,18 @@
"CellStyles": {
"3,1": 0,
"3,3": 1,
- "3,8": 2,
- "3,9": 3,
- "3,10": 4,
- "3,15": 2,
- "3,16": 3,
- "3,17": 4,
- "3,18": 3,
+ "3,7": 2,
+ "3,8": 3,
+ "3,9": 4,
+ "3,10": 3,
+ "3,11": 3,
+ "3,12": 2,
+ "3,13": 3,
+ "3,14": 4,
+ "3,15": 3,
+ "3,18": 2,
"3,19": 3,
- "3,20": 3,
+ "3,20": 4,
"3,21": 3,
"3,22": 3,
"3,23": 3,
@@ -622,17 +633,27 @@
"8,1,1,25",
"12,1,1,3",
"12,4,1,3",
- "3,8,1,2",
- "3,15,1,2",
- "3,17,1,7",
"7,1,1,25",
"10,9,1,4",
"10,14,1,4",
- "3,3,1,3",
- "3,10,1,3"
+ "3,12,1,2",
+ "3,14,1,2",
+ "3,3,1,2",
+ "3,7,1,2",
+ "3,9,1,2",
+ "3,18,1,2",
+ "3,20,1,6"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+ "PageLoadedCommandList": [
+ {
+ "$type": "CloseCommand.CloseCommand, CloseCommand",
+ "PassValueBack": true,
+ "ReloadData": true,
+ "PassQueryCondition": true
+ }
+ ],
"PermissionData": {
"$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
"permissionResource": {
@@ -665,4 +686,4 @@
"Formula": "工时详情!$E$13"
}
]
-}//85x1m9iTBfUU8qlS8js9Iu+vYPAbYcn3T3Pc9LOgQ60kzMkljAR0Ow2e9j3XcWrGC+JJavpLry5RPvXaJaVSZ3JX8LrG7WzxtuYduI/yvxp3xzyoI0cG9EOt6RpAldbCNQG1a8rCxKDi5P2ucSKXQVWDwQ3YwDFc1W32Mm70ryj/CU2mceyNh8hKEiugru7X2zTY32+JtesnDnqrrZYtqWU1NxStgFofhxDcyTbxzGLUO1sHK6tJlfggWYY23LT1oVNvthJe6pSkTS6HyFTaTYHBHPAijPNgOJ9w4RzGf4YLMEauLAySMy/gswMVkyttqBReDggHeEhXFojav+n+6l2fkARnZzfmYZBeEQdy7nGcLiZfYeNuCZpIqCxWM/xD0/j5qCRrvjeTNi9xJ8o/Scp3r7Ze2laj9OGNe8Y7uKy5VNxd9Ak0eYvP2wxfW+Gb9N86ziIUZa48bRrQtE2tIhcJx1MS0ycy9kWgdqxd0nccZOxsFkZQLzApKI+0ExW40f9u7Isq/MqpKzU4tsloN87EynPwKkaQZyCe9TxoE7IR5+Y9TzcjuE5XWkxt5+PX5oUFt1hNeIvcJcl4jU4+5FcdPnFIbacMh/q2ERERHg+UvdWMnQo7p/5lwFrsSjqTKIoBx7JHVmPgkoFSYfxHtFa1iGr0QXCXvStTtdfy91WE0II60SWp6WtXEp7xjvbIZBt36yaDVDXofuglk1ezNSpTJlOwiC1ckvmWaFbWQVknByRPanZzn9CQ9BYi0sPBDaTdFixeQcwCAc1UElgi0MqZHv34x/pl0cpfAuG9DiVlft5oDCcn8t4XHhoN/7Pat6oF3VHinZ0B7bE3kHAGRivJu22/Yy6otQM0yndE8kcHYRcAleA8IotGJjDUsIuOjCDi6V2LrsEBLu3538Welg==|920
\ No newline at end of file
+}//lyijiWSbQRrkJaFCvbkaKt7WQdnhuWhWTILyQjl9lnBn/SU9a5WG2yEMEZzZkU/rzfF4TbbvYF+HvaLkGMBr6csSQSH0isrtNS/vgRjdrkyZ4TDuIb+fEAyfCyGbhBQAmS4AzHe6Ss+0rguBUDBkHKaX57UcjRvm00vkRnVZQU10GKXDoWywc2jMfMz7Cw9804WotlO7RnzIts2JuVs6b042BeZtSspNuRFAIP+r4wZ3CaZHoBR0qvjdRlT/wCPQxzx1d50rBXxKLKRpb3yHR2oiAq8bdJWNUHt/yS8eB8mhv8x9zfX6SAW1lfV6VfjUXTIn/4kPaWXWAlVB9VKbWOv5a9cEQUlkX044WrRy+4Hz2dccPTv6/CBxoAmVfK6Sgb5lSHIgtaGELdwDxdnVN3cy86eFpdjlteCk0dGul5GbBJrgqEqIAme99bV1MBcMUuxjgI4Fn7B2I+9JZUsIzhpiOjXd1MVRhwsy7eoffxhYhtqmn4kcahnqeQwQGhhdtZsnaXo0LbPIcZNeVpfBaEvbhmNjG7stPp2ErOb7mKN3W4Phc5RoBhOQ/X/boT0dtrnfLT7elfz1ivftNJvH1pyJDNd4Wq4iWhG/UTVTbePW/xihTGkE/TsviY7qQLXyZGJRc0L7BZuH3NkLxRnVjZrUakuyyh/KWCmobZYX1NTNhJ1YDOt6FigTD/L0OWStqcDfLWXbXJX2Rj3526/0IaxqMbqHXXHZ6IwXk0QXeaxbiHqD8Bi7SaXPVFgNK9T0tPtBdsiMeF7EWHIi3P1d/L7ahYg3YekeK9vHuUEMnIRr94LEKQgT50gEvsAAvnx6SXe1UKueQzHWxwqrytL7falp5o5hSInAKPGbT8fB1v5+wt0mVriDpsi8laZ86G4qk7/PaQlZGlamtprdHuweuw==|920
\ No newline at end of file
diff --git a/Pages/共用/切换任务状态.json b/Pages/共用/切换任务状态.json
new file mode 100644
index 00000000..0a7e05a4
--- /dev/null
+++ b/Pages/共用/切换任务状态.json
@@ -0,0 +1,176 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 140.0,
+ "Mode": 1
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 37.0,
+ "IsHidden": true
+ }
+ }
+ },
+ "InLogicalVisibleIndexes": [
+ 3
+ ],
+ "Count": 4,
+ "DefaultSize": 10.0
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 113.0
+ }
+ }
+ },
+ "Count": 1,
+ "DefaultSize": 113.0
+ },
+ "AttachInfos": {
+ "1,0": {
+ "CellType": {
+ "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon",
+ "TemplatePageName": "421cd7df876b4e64a3160223673e2ea",
+ "Command": {
+ "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=切换任务状态!点击按钮"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=切换任务状态!状态码"
+ }
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+ "PassValueBack": true
+ }
+ ],
+ "ParamProperties": {
+ "ID": "ID",
+ "状态码": "状态码",
+ "任务状态": "任务状态"
+ }
+ },
+ "DataSourceType": 1,
+ "DataSource": {
+ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+ "TableName": "任务状态",
+ "BindingInfos": [
+ {
+ "BindingInfo": {
+ "TableName": "任务状态",
+ "ColumnName": "ID",
+ "GUID": "473abda2-b651-4f13-b82a-c8e280b7a80f"
+ },
+ "ColumnName": "ID"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务状态",
+ "ColumnName": "状态码",
+ "GUID": "9f0e19c3-dd7f-4103-82e0-218a0fcadd11"
+ },
+ "ColumnName": "状态码"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务状态",
+ "ColumnName": "任务状态",
+ "GUID": "b419d79c-d06a-4c18-be5a-eb3ca5a2a1a4"
+ },
+ "ColumnName": "任务状态"
+ }
+ ],
+ "IsListviewDataSource": true,
+ "CustomColumns": []
+ },
+ "DataSourceListviewName": "图文列表表格1",
+ "TemplateKey": "竖排无样式"
+ }
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "FontSize": 13.333333333333332,
+ "TextIndent": 8,
+ "HorizontalAlignment": 0,
+ "Underline": false
+ },
+ {
+ "FontFamily": 1,
+ "FontSize": 13.333333333333332,
+ "TextIndent": 8,
+ "HorizontalAlignment": 2,
+ "Underline": false
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Center",
+ "Body",
+ "Left"
+ ]
+ },
+ "CellStyles": {
+ "1,0": 0,
+ "2,0": 1
+ },
+ "SheetStyle": {
+ "FontFamily": 1
+ }
+ },
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+ "PermissionData": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
+ "permissionResource": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core"
+ },
+ "permissionBindings": [
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core",
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ }
+ ]
+ },
+ "RowBreakLines": [],
+ "RepeatRangeSettings": []
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ },
+ "CustomNames": [
+ {
+ "Name": "点击按钮",
+ "Formula": "切换任务状态!$A$4"
+ }
+ ]
+}//c/cvfOVvNMWsWO02le62QFNdFmYTIN7essrH2DK6MW02UM4jLJpvY7QwMAzTeM9rUbpGS/YkqdGt3KDQX8I5YR+TrYPRPJNoowojFdGdbDXEceOT8s2hHXZudaqbGuIMJL6BQ5IN2TrR7KTnOp/yfF9Qwbnwr/HUdqXI1ORtD8hE7dhEymqKZlYCGZYGkYFuCn0N9YtyfhDnr8tFPJnIntFkReycfSZQBdHL93hqlhJ6EQsE7RvugQX1Jz0Gp1YjafNwh3/mWOgLuXy95l05XFqib1nHy+0nHalVpUHxvEeamZppI4Bz93aMUZ8ZBLruaKAkGXxTmDw4vx0zxcHWqnbiM6JiS+6hJ01fMMcZSeF2Ohgdk97L6cTnKwWQe+6MnCqmyEQdrd/b2BJqyDnT7gKcJukb4h5SRSy6w1jxecIUkQ8GKlx5Z/7im8dRU0QqwrrKctlF1PEPfq31dq0zRjlSCQFottAzow04sMoCn+d5LZj7x7jdZIViUc63GjY2zSuubX8RzEOgJIz0/Tn4S2rAFBkQR5UIptToFG4lz+mdOxphnbwA1rCROsRgJUlj2lRPOMw5YX0uCn+6LZVMzVHTAiT7DZKIH2ufu8tZ5BG0hTPo3X6YPSMKCzF35IVi9GppGFKX8+Q91TCJdrcKAMPpKc3Fwb9v6ApVVDaNOxVF5UAHUGzYRLxO5RePsMs7B3+3obgIKh3LgBk1ng1/zZZ5eqdXTqp1aKYaT2R+MzSXNvM2nX21h0Xd0O87UJOSCHeDP7j4B/EzrtNWiLEwvF+zw2GI/Q3YQRtSpY3XoGJZo8du4/PKKX1ADUg9vFgEshq+lp+/loDIIF69RtZr437vr+gM4bRMn0PEH58B5i39M/zs518kzDJ6wuqUX2n9w7KxT2LB/CDKACPKZZklzw==|920
\ No newline at end of file
diff --git a/Pages/共用/切换项目.json b/Pages/共用/切换项目.json
new file mode 100644
index 00000000..3ced1551
--- /dev/null
+++ b/Pages/共用/切换项目.json
@@ -0,0 +1,185 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 305.0,
+ "Mode": 1
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 37.0,
+ "IsHidden": true
+ }
+ }
+ },
+ "InLogicalVisibleIndexes": [
+ 3
+ ],
+ "Count": 4,
+ "DefaultSize": 10.0
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 223.0
+ }
+ }
+ },
+ "Count": 1,
+ "DefaultSize": 223.0
+ },
+ "AttachInfos": {
+ "1,0": {
+ "CellType": {
+ "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon",
+ "TemplatePageName": "4d6923ff8d3742f5aeb5e04927a28f5",
+ "Command": {
+ "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=切换项目!点击按钮"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=切换项目!ID"
+ }
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+ "PassValueBack": true
+ }
+ ],
+ "ParamProperties": {
+ "ID": "ID",
+ "项目封面": "项目封面",
+ "项目名称": "项目名称",
+ "项目简介": "项目简介"
+ }
+ },
+ "DataSourceType": 1,
+ "DataSource": {
+ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+ "TableName": "项目表",
+ "BindingInfos": [
+ {
+ "BindingInfo": {
+ "TableName": "项目表",
+ "ColumnName": "ID",
+ "GUID": "c3d81821-9f32-4033-acf3-5f69cf820b6a"
+ },
+ "ColumnName": "ID"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "项目表",
+ "ColumnName": "项目封面",
+ "GUID": "526d4fd0-69ce-4cec-ba12-83e176063060"
+ },
+ "ColumnName": "项目封面"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "项目表",
+ "ColumnName": "项目名称",
+ "GUID": "4595061a-57b9-49b5-8e33-c4ac21ad393c"
+ },
+ "ColumnName": "项目名称"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "项目表",
+ "ColumnName": "项目简介",
+ "GUID": "80aef910-5f20-48b8-9820-9635b43e7b51"
+ },
+ "ColumnName": "项目简介"
+ }
+ ],
+ "IsListviewDataSource": true,
+ "CustomColumns": []
+ },
+ "DataSourceListviewName": "图文列表表格1",
+ "TemplateKey": "竖排无样式"
+ }
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "FontSize": 13.333333333333332,
+ "TextIndent": 8,
+ "HorizontalAlignment": 0,
+ "Underline": false
+ },
+ {
+ "FontFamily": 1,
+ "FontSize": 13.333333333333332,
+ "TextIndent": 8,
+ "HorizontalAlignment": 2,
+ "Underline": false
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Center",
+ "Body",
+ "Left"
+ ]
+ },
+ "CellStyles": {
+ "1,0": 0,
+ "2,0": 1
+ },
+ "SheetStyle": {
+ "FontFamily": 1
+ }
+ },
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+ "PermissionData": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
+ "permissionResource": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core"
+ },
+ "permissionBindings": [
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core",
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ }
+ ]
+ },
+ "RowBreakLines": [],
+ "RepeatRangeSettings": []
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ },
+ "CustomNames": [
+ {
+ "Name": "点击按钮",
+ "Formula": "切换项目!$A$4"
+ }
+ ]
+}//bxIFT5ZuNojhztuzvh4feE1bE9qhVxzUhd1vhMhyABeWgEP6H0hZe7TgHNw2AEP+q5I5zwpKCZprenbV+1kU3q+dM/+2Z8EfGwrZAGq823NkEmJoUCuL9BGvvLJRFE+T2wcK/c0ROXHrsfOPUzHkKFcFXt2wa/BkgqRh3rK15hic4e4DRyDz8YAnCNSAmiA5yHy1HidbJgBLJTZ7w0ARcQdcUzIaxp7qmvdQhBqwgcqyD4sd304rgD/1UDiopoWBMWQ8SCBJbZPP1tJq8qOPS4cx+u3sb6NyATO0HLq7XvcgSWtvqnO2R8v6ZUVc+LnM1R/+OnLQRLIbidB0PPH0S3hLA0v4ofVjnwsQSD9rJadB0VuYed0+E0rZXfDprGu3M93HZAY9WvS94rqszQax1yI6YSwnQfji+qEXhYDZ+oR8vxcVt1NOKcc124AnB3XdHhPX/qV0p9kDfgo9s9OGaz8LdA0IjVtbIfv0o7k+GLvIV7dRZBwYwCu0NXywYtPuK4JilG6tD0vmcFxoawldA/Z3sR/NlbqfX3aH3Ppa9uoW8UhcU0oJ1kL03jl5q6RAiG5gwwk35i5n0onIyrZoUhIES19uHeMzy0Sd19hwRXvGHgdVbUyOETgN9QAKR35VBeTN1jtMKIaVpALIiag0+GgYeVTrfuL5M02nBKipM/Ptox3HH/NMlxiW6sB/iSnW8FwW36E76iW75GYPVoaaHrfrBwwPP+5BMxrFPZ4SzlEjpsGdFk/yAKIbUY4DImJ9f3gmY/y6VRMqS9g6GOUHpV4d/9VSqeTsqFlPNnWLDheLrdHCtRBkbKFjmda0rBOxoW63gUqd0zT7xIpNGwoRc4MoYuIfcA1si122M8ZohAQPRubw39bq7zEYRjZwNSrV5hOJUHcK/4/jKd4wFqbvzg==|920
\ No newline at end of file
diff --git a/Pages/共用/项目菜单.json b/Pages/共用/项目菜单.json
index 58498674..54c7ea39 100644
--- a/Pages/共用/项目菜单.json
+++ b/Pages/共用/项目菜单.json
@@ -72,7 +72,7 @@
},
"Values": {
"1,1": "项目信息",
- "2,1": "项目角色与权限",
+ "2,1": "项目岗位",
"3,1": "归档项目",
"4,1": "退出项目",
"5,1": "移到回收站",
@@ -137,7 +137,7 @@
"PassValueBack": true
}
],
- "Text": "项目角色与权限",
+ "Text": "项目岗位",
"TemplateKey": "链接样式",
"Icon": {
"Name": "人才.svg",
@@ -360,4 +360,4 @@
"Formula": "项目菜单!$B$9"
}
]
-}//wz77xcgWtvnJ9JQE34gwgiKO6esCDMI5PVMg4zZIRmiChov/8dPOKOjArVLkjdgblLKIt0Nc4AeeyeVCKfHLWHXTg/WzBAPtHBV6Vwy9Aao+dO5IzFxLoSvR7h5HYKCq7FZUPX9N1ZOKbKbBWs0r6PuSaIhsMsu7ei96OhVyyCbiXbcFEMf85pp861A9Tk01bzIufKa7LMXt2XLKAYRakrxe+C2Uwr4yZK13N5NqHdqr5X9XXwAClfluNuyzv0k+G1tReK1ghx6hT1K/xo3lwjbhjjYhYbJP5if/jAZxvq2l/YFuA7Pmw4JP95d6PcxXcVf9mD1ZEC9+xo1tzL9ab7y0J2n7EPnnU6Ito4Vu58suOMljbfNiVu2lHYcQWW9MBgohbi9uWn+QZZPhLY6xlW+ciRO/sTVFPBj5kL991YTqvYdEViaumoypOPSO4PvhbBnEf+Q2o1sYVBoRnKl24Zjkd1v8pPwZt9NSBgXxDbqshwPOJVo5EDMHCvwamCm86vwdH7kL7PE6HFEvjmxsUQiS8njdxBy5FK1nRY5R26MXJpS4QtQEDIH7rzaQ++Yc5JoQ8agnbABm3o8AQKqZRfhocr7kkaRam+ZJ5lnaCOQfM9cpbXAQ9iED3v6MQEqJXYowrwW/UDbHPovvCFyKAJZ8J75V08+Jk7Dz9byarSpR5lLMrqh1o3V9iscQRZx768Xw5UWN0wU0PoxkIqBIK86v9HOFh+HnxSwDbw7v0Lmh+1INdHg35/NnTD46i3tw6AWrSBCzNmm0KkXXsciDQaplFb9zzMVZG3ZgZjSmr3Wy0GPYx4whvh84zBpkv+KHvMDvqhQzJ2nC1YNqqbU9vz/HEKGNh2bzF7NfMBowslZ7CshQvNqw66Dpko+09m0WESK4IJNVkoIAOvnjxiI6DQ==|920
\ No newline at end of file
+}//KzJkvEiWHhn9jJtyZemZCM7cb/aiiQh6FShGgBqK4qZNRq8tLyJjT28i71mqZQQtZN0nu5wG7cVycB5ejHVwI7pkL+9fvNCrSgM3kItUfSKscXDXG2SH2ykFbWboex56pTii9FGKmnKangX1XenZ6puQ9S/j70cG5rxAfbBxvZ8P6Tb2cxuRKgQZr/dYQ9u2XlX7aIG6v3F56hP9AFBzRjNyKUhCttjw51b8PXqmRgpNPBokqVSP3XmlFyxQNNDZUgpXFW4qoneILuFMeq46VzfWc/aHpvohUKtIC6yqqIdb4BMFj5bFgM+LxjJpETfsjqw2NWB8Qp8zz4PNn1TM+cv54pRC/gQXq0EJYX0t2DwDLKOTEPEJnT2pNXd2ISWdyqh8Fe6RwGsLEFTLgocmv5nB5nvPTMYjeTOctIT6/PV3EyKOuOGl3nAOQCl0c55ISVpAv5BjHuAFe24W21clVUp0gueNvDyV+/Ta3USzQ/7ncOwmIlvM+zk6ItTTWc5nhuDVIDEFgxRXYz6D2n/LWw8cB6zm0B4WhoeMaarU+CQzTGGbNiQhbnAiiEc1p+4CHHrzxAaqdFmyYlnjoPVKQEvJQ9H1H4GLydAIms0HKfnyL4etHP3XsbfK8r64e4WDP3PEpXdcvtSGLXVLPK7fXoC/zxQGPsc8zNzutjrU8LopBD1tMDwqSy7C7iMv5VdqSfc3vcrvNxI5pT4VJan/6LQa/GbQNNdURfPjnJ6v0UKYnTA0ucMi5KPOEIDxmYXgohBGSkcfP0UHG2+F+UH8PnHSXJiJEuP+/DK67detDjNIRWdrqABO6fxghm9wc9h6VlZtwZ6uPQlMOv+ChGHXIa4N8/yxzPTNkrsvv6/nW5vObI/Do6GQTTTTvtBvEH1Wp613Y/Jyl8MbYAjHCmGJwg==|920
\ No newline at end of file
diff --git a/Pages/项目首页/项目信息.json b/Pages/项目首页/项目信息.json
index f0f3057c..38d21de7 100644
--- a/Pages/项目首页/项目信息.json
+++ b/Pages/项目首页/项目信息.json
@@ -33,7 +33,7 @@
},
"6": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 24.0
}
},
"7": {
@@ -46,6 +46,11 @@
"DesignLengthInPixel": 32.0
}
},
+ "9": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
"10": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
@@ -58,7 +63,7 @@
},
"12": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 24.0
}
},
"13": {
@@ -68,12 +73,12 @@
},
"14": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 118.0
+ "DesignLengthInPixel": 32.0
}
},
"15": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 24.0
}
},
"16": {
@@ -83,7 +88,7 @@
},
"17": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 118.0
}
},
"18": {
@@ -95,9 +100,19 @@
"GridRowColumnDefinition": {
"DesignLengthInPixel": 32.0
}
+ },
+ "20": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "21": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
}
},
- "Count": 20,
+ "Count": 22,
"DefaultSize": 32.0
},
"Cols": {
@@ -188,7 +203,11 @@
"10,1": "分组",
"10,8": "权限",
"11,8": "0",
- "13,1": "项目简介"
+ "13,1": "严格模式",
+ "13,8": "预算工时",
+ "14,8": "0",
+ "16,1": "项目简介",
+ "20,11": "提交"
},
"AttachInfos": {
"2,1": {
@@ -318,6 +337,11 @@
}
},
"11,1": {
+ "BindingInfo": {
+ "TableName": "项目表",
+ "ColumnName": "项目分组",
+ "GUID": "2ee0d45e-271b-4d13-a6bc-c4d8aec63370"
+ },
"CellType": {
"$type": "ElementUI.SelectCellType, ElementUI",
"CommandList": [],
@@ -335,6 +359,7 @@
]
}
],
+ "useBinding": true,
"options": [
{
"value": "黄金糕",
@@ -357,6 +382,29 @@
"label": "北京烤鸭"
}
],
+ "bindingOptions": {
+ "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+ "TableName": "项目分组",
+ "BindingInfos": [
+ {
+ "BindingInfo": {
+ "TableName": "项目分组",
+ "ColumnName": "ID",
+ "GUID": "302299f6-3179-43f5-8ace-bbce40e3848f"
+ },
+ "ColumnName": "value"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "项目分组",
+ "ColumnName": "项目分组",
+ "GUID": "f3a8134b-cbb3-4286-aec8-1eefb6ce40c7"
+ },
+ "ColumnName": "label"
+ }
+ ],
+ "CustomColumns": []
+ },
"placeholder": "请选择",
"noDataText": "无数据",
"filterInServerOptions": {
@@ -404,7 +452,69 @@
"noMatchText": "无匹配数据"
}
},
+ "13,3": {
+ "CellType": {
+ "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+ "ToolTip": "开启后，将严格控制工时，不允许超额计划",
+ "Size": 14,
+ "ImagePath": "提示.svg",
+ "UseCellForeColor": true
+ }
+ },
"14,1": {
+ "BindingInfo": {
+ "TableName": "项目表",
+ "ColumnName": "严格模式",
+ "GUID": "982f0cea-6989-4f6a-a888-78a07036387f"
+ },
+ "CellType": {
+ "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
+ "Caption": "开启严格模式",
+ "Style": 1,
+ "CommandList": []
+ }
+ },
+ "14,8": {
+ "BindingInfo": {
+ "TableName": "项目表",
+ "ColumnName": "项目预算工时",
+ "GUID": "08b4e776-8fe9-4631-bf48-fbfe48fed20f"
+ },
+ "CellType": {
+ "$type": "ElementUI.InputNumberCellType, ElementUI",
+ "CommandList": [],
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "DefaultValue": "0",
+ "min": 0,
+ "step": 1,
+ "precision": 1,
+ "placeholder": "请输入",
+ "controlsPosition": true
+ },
+ "DataValidationInfo": {
+ "NumberType": 7,
+ "FirstParamValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=IF(OR(项目信息!B15=FALSE(),项目信息!I15>0),1,0)"
+ },
+ "IgnoreBlank": false,
+ "ErrorMessage": "开启严格模式下，预算工时必须大于0"
+ }
+ },
+ "17,1": {
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目简介",
@@ -436,6 +546,28 @@
"type": "textarea",
"resize": "none"
}
+ },
+ "20,11": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "项目表",
+ "ShowConfirm": false
+ },
+ {
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "Message": "提交成功"
+ },
+ {
+ "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+ "ReloadData": true
+ }
+ ],
+ "Text": "提交",
+ "TemplateKey": "_RS_Main1"
+ }
}
},
"StyleDatas": {
@@ -448,12 +580,27 @@
"FontFamily": 0,
"FontSize": 13.333333333333332,
"Formatter": 1
+ },
+ {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332,
+ "Foreground": 2
+ },
+ {
+ "BorderBottom": 0
}
],
"Types": {
"Strs": [
"Body",
- "[AUTO]General"
+ "[AUTO]General",
+ "Text 1 50",
+ "Background 2 0"
+ ],
+ "Borders": [
+ {
+ "Color": 3
+ }
]
},
"CellStyles": {
@@ -489,7 +636,55 @@
"11,11": 0,
"11,12": 0,
"11,13": 0,
- "13,1": 1
+ "12,0": 0,
+ "12,1": 0,
+ "12,2": 0,
+ "12,3": 0,
+ "12,4": 0,
+ "12,5": 0,
+ "12,6": 0,
+ "12,7": 0,
+ "12,8": 0,
+ "12,9": 0,
+ "12,10": 0,
+ "12,11": 0,
+ "12,12": 0,
+ "12,13": 0,
+ "12,14": 0,
+ "13,0": 0,
+ "13,1": 1,
+ "13,2": 0,
+ "13,3": 2,
+ "13,4": 0,
+ "13,5": 0,
+ "13,6": 0,
+ "13,7": 0,
+ "13,8": 1,
+ "13,9": 0,
+ "13,10": 0,
+ "13,11": 0,
+ "13,12": 0,
+ "13,13": 0,
+ "13,14": 0,
+ "14,0": 0,
+ "14,1": 0,
+ "14,7": 0,
+ "14,8": 0,
+ "14,14": 0,
+ "16,1": 1,
+ "18,1": 3,
+ "18,2": 3,
+ "18,3": 3,
+ "18,4": 3,
+ "18,5": 3,
+ "18,6": 3,
+ "18,7": 3,
+ "18,8": 3,
+ "18,9": 3,
+ "18,10": 3,
+ "18,11": 3,
+ "18,12": 3,
+ "18,13": 3
},
"SheetStyle": {
"FontFamily": 0,
@@ -499,10 +694,13 @@
"Spans": [
"5,1,1,13",
"2,1,1,4",
- "11,1,1,6",
"11,8,1,6",
- "14,1,1,13",
- "8,1,1,13"
+ "17,1,1,13",
+ "8,1,1,13",
+ "11,1,1,6",
+ "20,11,1,3",
+ "14,8,1,6",
+ "14,1,1,6"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -527,4 +725,4 @@
"PaperSize": {},
"Margin": {}
}
-}//fJzAgEt+FdOeR6Rhd2WPJVdaKFWZLkHfnZBb3+76JbzJg3yKjqRcHWO+IXbxAlPXakOUXlMoP1rEEDSGWgNt3LDGNQKptv0D+FybWyMwlzo8nANOeXC6MYwG7xcm3TT1fUrd1prGCvCdyX90oJcu4A+QBI4AT/ob2Pe6sWT64+6p6VtqBJ70/FeMpUUp1pyRTY9o/+D6thhqoCzSlz36rTNLq6nRzwTdx5ITxYS98RFLBSwyn/qhYI6CT+BirzGvFkzqTw0FUn4PHTgZAshNjn6fYSDiWN2rWRqX8CBGfD8usJKbCvPA5VMc8ay4D9NVOEF5FOEfjproWSL4KFxJmE6OdmLwfDb54Nj04KRKzRslDW001WG/mb3wZSNqlheKY5OGZORINXQgVpL6gBBoDk41+SSy+PimkH0LO+5HD/Sm/p2zrzy+sAKAm32Dcq9iEy85ltJHW1B7hkwy31qqyNfnSFIrJ1r+44B3Xlb0GjbLFSRyWXeza7JP5jIKT94tzgVwGPGlIdRgZQietZJQYqqDdvTLOHc8fHJTvIFOw6w9EcsYdn9NfMpFfzK9E74ThznlbQKSj/Xb1u9X4LvfHuhJ+Nd3gio6oU9zg997D3CpstEvh37FjDe+zPpS31vufbK4TwXSfbGLpzya4djQAvPtD1bDZ8LLg4BIgW2RENKBOf6tAJQ7ABE/4iEaYdzEZNfv43dqL/7xA7c0+sill9WvTKVgYkOwp9eP58s0lC8jjLgK7OGQNG0hbG6fKheduBUDTqmy1W0ha28buzrW18BkL1Gcp5kxP6G+AHSxaqHu0e/IbvajwlQOREb4+G9rY0LHrZdg0g2YGmZ7zhslpEBItT8mxXaIuwIwFXyaGgIepDwBo27g5ZwZLl3xJQMWMjuUVecZdq6JXORdzhtGDw==|920
\ No newline at end of file
+}//v0BZFixeNqqB8sdOxxRErIjeOSTbsmzZC1Ulei2NORx2JArP2vdoTX83QJig4560m/fhXbTT8KvXMtfyZLf2dt8ni74r9jE/ZDsutSCT/39nlm+lgVyg9QSmMOlQIVe7EK6gLB3I2VWqDpBRIj3NUOb14+WiAibGsuS9/k9VGxns2iuERZ45939K3Wc0oUyW+5bWiR8as0JkjM/iOQ9jg5Rl1EH2JEslD5wyApD55LWd4iTG+38uL7IPWN48VsaZ311hD6M6UyFZ4ztfpCidGOrWLh80jb7W2qMxt/Jm5oPwRk3rH8rsrTtdN5zb7hE36f7Yt0RImo9YMSuH2eCGUcjPyAPbWLAxJqMphdmiHZxTcLniK5ONpryQpBWtYrqdL2YSwyzLUf0LgPTchp/6tebqhGWXvxA2BTvlYf4L6IloLq6S2I4NJkldiqfq8ZUxlF+HAfvVCa8M8yuvYWVfBc+p6e74Efym432r8lTLGEohXa6lLnQ1zXXztZT6AqTFFhXIPSD1OX0f6gwdVx1Hkv+LU6eUbu7W/FF4f8djBkmyfcMyYc6RtJVUuEzhqt2X9hm03ZE00OwnJZpWz2NSLA8x0vKCRyNArEhEf1QCnxPIKCKL7/1O/YMLj3PH2NibQPe2PEbGFd3OzXEy5dPqfA0jF0zbTdcYbTE5CohZ69Kb2jQTYcFuP+YcHPkpmiRDZQ890aHqAX4FB0BhjufnQ1HZ9fn2Up1NuOCdrNtZPKR1NDkVDt73UCjD+tiM0+fIR1eZcZHdyaE/TWru+QXcZoph4LeU/+pWg+riXzz130s5KKXdOtEfGGyNN9WgGYLmHkrtytNPL7mby0sYGoM/5Hv+/dX5YFPDNBtSqaE9fUShSSsEkSWlNauFrEXmBAot3+syINVJEDBs4OH1ENVIYw==|920
\ No newline at end of file
diff --git a/Pages/项目首页/项目标题.json b/Pages/项目首页/项目标题.json
index 8267ad29..8820d255 100644
--- a/Pages/项目首页/项目标题.json
+++ b/Pages/项目首页/项目标题.json
@@ -26,9 +26,17 @@
"GridRowColumnDefinition": {
"DesignLengthInPixel": 15.0
}
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 31.0
+ }
}
},
- "Count": 5,
+ "InLogicalVisibleIndexes": [
+ 5
+ ],
+ "Count": 6,
"DefaultSize": 15.0
},
"Cols": {
@@ -117,7 +125,7 @@
"DefaultSize": 10.0
},
"Values": {
- "1,5": "项目标题",
+ "1,5": "加载中...",
"1,10": "自定义",
"1,12": "菜单",
"2,5": "任务列表"
@@ -138,6 +146,12 @@
}
},
"1,3": {
+ "BindingInfo": {
+ "TableName": "项目表",
+ "ColumnName": "项目封面",
+ "GUID": "c2ee3256-3788-477f-a274-7b848bdd57df",
+ "IsImagePath": true
+ },
"CellType": {
"$type": "Forguncy.ImageCellType, ServerDesignerCommon",
"TemplateKey": "中圆角",
@@ -149,15 +163,51 @@
"BindingInfo": {
"TableName": "项目表",
"ColumnName": "项目名称",
- "GUID": "f34fcca7-ffbe-46a2-89a5-d04f414f9cb2"
+ "GUID": "4c88c968-73e2-4aae-b094-e58585fb1738"
+ },
+ "CellType": {
+ "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+ "TargetPageElement": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目标题!H2"
+ },
+ "TargetType": "Forguncy.ImageCellType, ServerDesignerCommon, Version=9.0.103.0, Culture=neutral, PublicKeyToken=967100671921c115",
+ "MethodName": "ExecuteCommand"
+ }
+ ],
+ "Text": "加载中...",
+ "ClickMode": 1
}
},
"1,7": {
"CellType": {
"$type": "Forguncy.ImageCellType, ServerDesignerCommon",
- "Size": 14,
- "ImagePath": "Arrow/301_down_arrow_5.svg",
- "BuiltIn": true,
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "PopupDisplayMode": 1,
+ "Placement": {
+ "SerializeProperty": "=项目标题!F2"
+ },
+ "PageName": "切换项目",
+ "PassValues": [
+ {
+ "Source": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目标题!项目ID"
+ },
+ "TargetCell": {
+ "SerializeProperty": "=切换项目!点击按钮"
+ }
+ }
+ ]
+ }
+ ],
+ "Size": 20,
+ "ImagePath": "caret-down-small.svg",
"UseCellForeColor": true
}
},
@@ -185,7 +235,18 @@
"Placement": {
"SerializeProperty": "=项目标题!M2"
},
- "PageName": "项目菜单"
+ "PageName": "项目菜单",
+ "PassValues": [
+ {
+ "Source": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目标题!菜单回调"
+ },
+ "TargetCell": {
+ "SerializeProperty": "=项目菜单!点击按钮"
+ }
+ }
+ ]
}
],
"Text": "菜单",
@@ -268,6 +329,132 @@
"type": "default",
"position": "top"
}
+ },
+ "5,12": {
+ "CellType": {
+ "$type": "Forguncy.TextCellType, ServerDesignerCommon",
+ "SavedValidators": [
+ {
+ "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon"
+ }
+ ],
+ "TemplateKey": "_RS_NewLittleRoundCorner",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=项目标题!M6"
+ }
+ ]
+ },
+ "value": "%Null%",
+ "compareType": 1
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon",
+ "contextProperty": {
+ "Display": "值变更原因"
+ }
+ },
+ "value": "passValue"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "事件值",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目标题!菜单回调"
+ },
+ "ID": "3108fddb6b7c44ca98935f5d4334377e"
+ },
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目标题!菜单回调"
+ },
+ "Value": "%Null%"
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=项目标题!事件值"
+ }
+ ]
+ },
+ "value": "项目信息"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "PopupDisplayMode": 2,
+ "PageName": "项目信息",
+ "LoadBindingDataOption": 1
+ }
+ ],
+ "ID": "a743dfac-f29e-4e93-8f18-1cc26bb89216"
+ },
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=项目标题!事件值"
+ }
+ ]
+ },
+ "value": "项目岗位"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "PageName": "项目配置首页"
+ }
+ ],
+ "ID": "75b5f7f5-0f1c-4bf5-bb97-91c30c34f346"
+ }
+ ]
+ }
+ ],
+ "ID": "fca1ba63-27ac-4fbb-81ae-aac1b0573fca"
+ }
+ ]
+ }
+ ],
+ "ID": "e02c384b-62d6-4692-9ce9-b97058bd6ebd"
+ }
+ ]
+ }
+ ]
+ }
}
},
"StyleDatas": {
@@ -280,12 +467,14 @@
"Foreground": 1
},
{
- "FontSize": 16.0
+ "FontSize": 16.0,
+ "HorizontalAlignment": 2,
+ "Underline": false
},
{
"FontFamily": 0,
"FontSize": 13.333333333333332,
- "Formatter": 2
+ "Formatter": 3
},
{
"FontSize": 13.333333333333332
@@ -293,13 +482,20 @@
{
"FontFamily": 0,
"FontSize": 13.333333333333332
+ },
+ {
+ "Background": 4,
+ "Formatter": 5
}
],
"Types": {
"Strs": [
"Body",
"Text 1 50",
- "[AUTO]General"
+ "Left",
+ "[AUTO]General",
+ "#FFFFFF00",
+ "@"
]
},
"CellStyles": {
@@ -324,18 +520,20 @@
"3,11": 5,
"3,12": 4,
"4,10": 0,
- "4,11": 0
+ "4,11": 0,
+ "5,11": 0,
+ "5,12": 6
},
"SheetStyle": {
"FontFamily": 0
}
},
"Spans": [
- "1,3,3,1",
"2,5,2,4",
"1,10,2,1",
"1,12,2,1",
- "1,1,3,1"
+ "1,1,3,1",
+ "1,3,3,1"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -354,10 +552,17 @@
]
},
"RowBreakLines": [],
- "RepeatRangeSettings": []
+ "RepeatRangeSettings": [],
+ "RelatedDataTableName": "项目表"
},
"PrintInfo": {
"PaperSize": {},
"Margin": {}
- }
-}//p/cLsq4fLsKbKFSTOu/nIrCLJO5aF4aWJPkT63DnX9agYa7ZAQyzd4UQTOC1M2enUkdRf7cEM+GTD75Kz02FanNXN1Ta4BTEQO7fczKaKnHCzIXtnisVhxPuLn0Cz1vMsJUad23ba8OKc2NJkxP1vQK+B1Lv3iFKL9AGCDADZ6ljyKK83u2ByxXXtPp5UyhbdZx8nonCZgizTELJY83zjFK5JFXBrD8J6dYA9Rl5BB3bSC8KlzI6MIR42SN+5P9qCkz89kFQn1MEvbXqJAg9z/JyN2BZdU4wStyLD0vVnHTkuc7JtJPjWzXqjbnSmMkuhcA3oN/P4x0M06SjA99SvDXjo+TI+Pq6jNdN5n2piacj109IOLDzvvUWuKUP2tsvwa4i+AL+QnphkKnXEmqmDyHsy4n0wOjeA6g13nF9KL8os/cjIqPi3QR/7HTKOsj79/hrlVUvrZpKxoCOQTVcTy7sdJomLSedoDHJvH52M3Wtur8RMfutD8OsqSqb+U2UPcxG4l+yQMSDUOymmWPe5j6rEx7Rcv/jZ1PM6KF/x5s2/f2Mp4kWg83tPS3JbTictKB5LWXcd+xDbM8GCLv6DpdsE+x0vz7B/jo+FJVQvb7noAtVNK6bkCCpATm+Loa1uelmCNxaqfb0xbXlbh8OKLGVfggr4dKMXUAExXFB/1hMw6phmdO+jUtTaKJMbYA+Z3tpOOp+LAg0OmJP7dvhnSU3/5YwVrVU3MFAHgJ3WkAPz4JwbfRonKOK3vhOa35TcuDNT1I18bdc80AgNxL1o86/uPc7gzvZ1JIbKL1OG4Kgr6yM/nUtP2OPie2UU9QZB0W5f14zedLs0FHUZ3ujc+7Sv4QcvjeCAOywsJNILVupKO4QPtWkC3hQxS+jcaFXGA/d1qB/hTg0LiNDAZ8uMQ==|920
\ No newline at end of file
+ },
+ "CustomNames": [
+ {
+ "Name": "菜单回调",
+ "Formula": "项目标题!$M$6"
+ }
+ ]
+}//S8+60tEF0XrfzxSXmX3bhCiEQ4Bey+MjnAqMx3NWeM+jqL3WISDiLrHQWG10CTdmZNkb7VteWVM7joEK3oJSzxSdgTPsFjWTl64ZfrwjYb3zhjYbY90AAVFoxwM5WLDMvzSLiMkW1IT814pyItumvMqOqs57xmQmgyc8nLXBMI3d34PEnJ6SKnuLBOYZzr6TTgHdI/pJv34eaEWWgZjjKhlTP5n0T9rx72cHquDgv7q84O380VvoOAYiu5BNlVjBVDMCk8RLJUNpULZH6CCjtf/AZ0sYkaurZgysTq1BE3xecwq7W1qNynP2IX4PrzwwSp4WoAfywsEOT8uAVl5URgNd64rsihy35uzbMfupZvYPph8eeacN0KqGpADl1VcwiQtgO7YFHVwpOeS5+XStgeHNv3x4N8jgT/419Rx7DCSuFHIpIVidCZi86c8QrkOQO0uVIDhSts6iEq48ZX12it56YYcjTEW/KI4eU8L3pyApPaCBkP4LIrpRzpcdeHzG49BUdXDZhfrCZRVdG/Gk2+iU82zix2Jsco9005CixJk4NgErxrXgmpe4GQF4tFopcKpntAh5alU6GLopAIIiYA+cwj6b5n0PQnaQRQ5KtVBf7vOvcTIDbkVzLNjLbJLnhKUp/lOtzbXRKw3Ao3/H+tnx0Vhkndgfta3UpsFI2QbKbtK9gF+uink6zhaI2ETsUH+3g+3ZKAvtnkqTP9L3xMaLUukwNwSh5HzMGECPuI9GvE2PV4629Mw4X1ZeCMjnrWh0/A4ULTCmntvaQT9gwDemqPykthSi0Wik6Wwex8NDjq3yDg95dAc8f1B0JiNuRSfrGDVj9aXiVtcjd9Q1TURDvX/PMUVBWffwO7QZU4MAOH6XyRqTqlT1K1hr/SZsYtgL2FAGBFSko/udQUyLsw==|920
\ No newline at end of file
diff --git a/Pages/项目首页/项目配置/项目岗位配置.json b/Pages/项目首页/项目配置/项目岗位配置.json
new file mode 100644
index 00000000..13bc8d82
--- /dev/null
+++ b/Pages/项目首页/项目配置/项目岗位配置.json
@@ -0,0 +1,337 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 40.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 47.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 226.0,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.0
+ }
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.0
+ }
+ }
+ },
+ "Count": 5,
+ "DefaultSize": 15.0
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 15.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,
+ "Mode": 2,
+ "MinLength": {
+ "Unit": 1
+ },
+ "MaxLength": {
+ "Value": 1.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
+ }
+ },
+ "13": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "14": {
+ "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": 15.0
+ }
+ }
+ },
+ "Count": 24,
+ "DefaultSize": 32.0
+ },
+ "Values": {
+ "1,19": "操作",
+ "2,19": "删除"
+ },
+ "AttachInfos": {
+ "1,1": {
+ "ListViewInfo": {
+ "Name": "表格1",
+ "TableName": "项目岗位",
+ "RowIndex": 1,
+ "ColumnIndex": 1,
+ "RowCount": 3,
+ "ColumnCount": 22,
+ "DetailListViewInfo": {
+ "ColumnOfDetailTable": "项目ID",
+ "MasterTable": "项目表",
+ "ColumnOfMasterTable": "ID",
+ "DataCommitType": 2
+ },
+ "TopCondition": null,
+ "ListViewStyleName": "_RS_NewFashionListStyle2",
+ "ShowColumnHeaderInDesigner": true,
+ "IsRowHeaderVisible": true,
+ "ShowEditStatusIcon": true,
+ "UseSimpleBar": true,
+ "ReserveStyleForBlankRow": true,
+ "PaddingBlankRow": true,
+ "AllowEditInListview": true,
+ "AllowAddNewRow": true,
+ "ShowDeleteButton": true,
+ "AllowDragFill": true,
+ "AllowDragMove": true,
+ "RowHeaderContextMenu": {
+ "ContextMenuItems": [
+ {
+ "Text": "插入",
+ "Visible": true,
+ "OperationType": 2
+ },
+ {
+ "Text": "删除",
+ "Visible": true,
+ "OperationType": 3
+ },
+ {
+ "Text": "复制并插入",
+ "Visible": true,
+ "OperationType": 4
+ }
+ ]
+ },
+ "ColumnOperation": 2,
+ "CommitType": 1
+ }
+ },
+ "2,2": {
+ "BindingInfo": {
+ "TableName": "项目岗位",
+ "ColumnName": "岗位名称",
+ "GUID": "bdc1be7d-7087-4668-b785-62a92d8ae512"
+ },
+ "CellType": {
+ "$type": "Forguncy.TextCellType, ServerDesignerCommon",
+ "SavedValidators": [
+ {
+ "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon"
+ }
+ ],
+ "WaterMark": "输入内容添加"
+ },
+ "DataValidationInfo": {
+ "IgnoreBlank": false
+ }
+ },
+ "2,9": {
+ "BindingInfo": {
+ "TableName": "项目岗位",
+ "ColumnName": "默认时薪",
+ "GUID": "bff7fd53-ad77-4c16-8699-c1a9eec2259a"
+ },
+ "CellType": {
+ "$type": "Forguncy.NumberCellType, ServerDesignerCommon",
+ "WaterMark": "留空则使用人员默认时薪"
+ },
+ "DataValidationInfo": {
+ "InputMessageTitle": "提示",
+ "InputMessage": "留空则使用该人员默认时薪"
+ }
+ },
+ "2,19": {
+ "CellType": {
+ "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon",
+ "ListviewName": "表格1",
+ "UpdateType": 2
+ }
+ ],
+ "Text": "删除",
+ "ClickMode": 1
+ }
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "FontSize": 13.333333333333332,
+ "HorizontalAlignment": 0
+ },
+ {
+ "FontSize": 13.333333333333332,
+ "Formatter": 1,
+ "HorizontalAlignment": 0
+ },
+ {
+ "FontSize": 13.333333333333332,
+ "Foreground": 2,
+ "HorizontalAlignment": 0,
+ "Underline": false
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Center",
+ "@",
+ "#FFFF0000",
+ "Body"
+ ]
+ },
+ "CellStyles": {
+ "1,2": 0,
+ "1,9": 0,
+ "1,19": 0,
+ "2,2": 1,
+ "2,9": 0,
+ "2,19": 2
+ },
+ "SheetStyle": {
+ "FontFamily": 3
+ }
+ },
+ "Spans": [
+ "3,1,1,22",
+ "2,19,1,4",
+ "2,2,1,7",
+ "2,9,1,10",
+ "1,2,1,7",
+ "1,9,1,10",
+ "1,19,1,4"
+ ],
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+ "PermissionData": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
+ "permissionResource": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core"
+ },
+ "permissionBindings": [
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core",
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ }
+ ]
+ },
+ "RowBreakLines": [],
+ "RepeatRangeSettings": []
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ }
+}//Dg8L542WKKuyqgY8TJdEucsVOqrnXSOPoZcRo0/SvzR/XZjgNFPj7bLNZMvz0nkQpUwCzuLfU6y3FA8hSpaqPV9mfC6Ezn34/LNHcT9ZiBw3WkoQAl280vOlofYhnZPiHwvnG4DMrqXt/njCL6/5XF+s9VEZUriqCJ29uWQWdiKFftZhm+IkeJxycejubSP89adUjHLd2upp+D1s/dHgXLKAYsLIR8UXdhgiwpLpYP/JkE1ew0bilQQWjMKldAsAziiz5on21LEtIYt5tgqKmpiTv7vYOAIUpZ1c5a65lYZtN0DYY6GRjZfEFSNIPiuTVFayVSmsQsElAKRaQ947wVef1FCXYwmZXj5gh4jbmhGs8tNj7K6c60JMk0kiMpWmMMI2B/I+kDRubcj5RRscxvwys3z8RPfsunq3V4PzyKZvdoQ/TSXYTPrzRnZOGnTyF1Kucyl/32DzZsCNXBq2qK5o35IQ+Zj8MqXfrrY1sEZkS7IsJ7s5G1fU9AO4meScxorlFyAoDiFgeiVho8BNvoBLxEZY5Rzp9DyPNS4OegY3V+/i9dsp5IFfsQRsuxDLhP8byWpFWz0OsuIYKv1wXbOg2F9PBkUsSezwvEnKvyXXsWIJOv/x6mY4hl54jIZI/++j0kDAX0G4nggMs39lgFfQiJV+VK9yOTxNWxruqW4YgJYBesB1wG0ATIzwAI+oXRT7aJEG3WYK+6Y6wDpXxv1K+ONo56BXwnmZjFSm/iMvUhSjigfugFcc+OpoHYBKgRgMtD0+8qQmh32YHfTBa8cdo75aXW9P0nGAGISvgIoHAnbwZt8MTVHwyrHOTrWzmf/r/az7qgxDL/RVBcIZpVEaM1BXztrB9w141YZhiF48NNTJWu/X/4pMgfUYCPUNWafMdRjBoZEUfpYhTr4JoQ==|920
\ No newline at end of file
diff --git a/Pages/项目首页/项目配置/项目配置首页.json b/Pages/项目首页/项目配置/项目配置首页.json
new file mode 100644
index 00000000..0e0b13c0
--- /dev/null
+++ b/Pages/项目首页/项目配置/项目配置首页.json
@@ -0,0 +1,353 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "7": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "8": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "9": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "10": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "11": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "12": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "13": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "14": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "15": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "16": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "17": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "18": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 24.0
+ }
+ },
+ "19": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 35.0
+ }
+ },
+ "20": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0
+ }
+ },
+ "21": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 36.0
+ }
+ },
+ "22": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 36.0
+ }
+ }
+ },
+ "InLogicalVisibleIndexes": [
+ 21,
+ 22
+ ],
+ "Count": 23,
+ "DefaultSize": 32.0
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 150.0
+ }
+ },
+ "3": {
+ "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
+ }
+ },
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 20.0
+ }
+ }
+ },
+ "Count": 29,
+ "DefaultSize": 32.0
+ },
+ "Values": {
+ "1,1": "1",
+ "19,25": "保存"
+ },
+ "AttachInfos": {
+ "1,1": {
+ "CellType": {
+ "$type": "ElementUI.TabHeader, ElementUI",
+ "ClickCommand": {
+ "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+ "TargetPageElement": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目配置首页!D2"
+ },
+ "TargetType": "Forguncy.TabControlCellType, ServerDesignerCommon, Version=9.0.103.0, Culture=neutral, PublicKeyToken=967100671921c115",
+ "MethodName": "SetActiveTabIndex",
+ "ParameterValues": {
+ "index": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目配置首页!页签编号"
+ }
+ }
+ }
+ ],
+ "ParamProperties": {
+ "itemIndex": "页签编号",
+ "itemValue": "页签值",
+ "itemText": "页签标题"
+ }
+ },
+ "DefaultValue": "1",
+ "Tabs": [
+ {
+ "Value": "1",
+ "Name": "岗位配置"
+ },
+ {
+ "Value": "2",
+ "Name": "权限配置"
+ }
+ ],
+ "type": "default",
+ "position": "left"
+ }
+ },
+ "1,3": {
+ "CellType": {
+ "$type": "Forguncy.TabControlCellType, ServerDesignerCommon",
+ "TemplateKey": "_RS_NewFashionStyle1",
+ "Tabs": [
+ "项目岗位配置"
+ ],
+ "HideHeader": true
+ }
+ },
+ "19,25": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "项目表",
+ "ShowConfirm": false
+ },
+ {
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "Message": "提交成功"
+ }
+ ],
+ "Text": "保存",
+ "TemplateKey": "_RS_Main1"
+ }
+ },
+ "21,1": {
+ "BindingInfo": {
+ "TableName": "项目表",
+ "ColumnName": "ID",
+ "GUID": "40aeaed0-0b42-4663-a66d-d7fe2293b281"
+ }
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "BorderBottom": 0
+ },
+ {
+ "Background": 1
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Background 2 0",
+ "#FFFFFF00",
+ "Body"
+ ],
+ "Borders": [
+ {
+ "Color": 0
+ }
+ ]
+ },
+ "CellStyles": {
+ "17,1": 0,
+ "17,2": 0,
+ "17,3": 0,
+ "17,4": 0,
+ "17,5": 0,
+ "17,6": 0,
+ "17,7": 0,
+ "17,8": 0,
+ "17,9": 0,
+ "17,10": 0,
+ "17,11": 0,
+ "17,12": 0,
+ "17,13": 0,
+ "17,14": 0,
+ "17,15": 0,
+ "17,16": 0,
+ "17,17": 0,
+ "17,18": 0,
+ "17,19": 0,
+ "17,20": 0,
+ "17,21": 0,
+ "17,22": 0,
+ "17,23": 0,
+ "17,24": 0,
+ "17,25": 0,
+ "17,26": 0,
+ "17,27": 0,
+ "21,1": 1
+ },
+ "SheetStyle": {
+ "FontFamily": 2
+ }
+ },
+ "Spans": [
+ "1,1,16,1",
+ "1,3,16,25",
+ "17,3,1,25",
+ "19,25,1,3"
+ ],
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+ "Title": "项目配置",
+ "PermissionData": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
+ "permissionResource": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core"
+ },
+ "permissionBindings": [
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core",
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ }
+ ]
+ },
+ "RowBreakLines": [],
+ "RepeatRangeSettings": []
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ },
+ "CustomNames": [
+ {
+ "Name": "项目ID",
+ "Formula": "项目配置首页!$B$22"
+ }
+ ]
+}//8kF7ySrTBiUJIyjnGwEjaqS88UCahLbqvxv0O+LiY0OxyNBGozHUmWkUesY4M+MnQhwoViT4FCmGRjCMpCH/70nEgY27P6VvZxTGUG2Pv6Gt/o/t/zHUCUgA/+4khd3AjuwKHVgTof0uW/JH4UQtGGgITdl4IirxbbMGRN+uyYcX6/zIqWLf/0BWprypHGBz2x0wF8JVjRqN30/bkWhytFtFXZ4E6CvFV4opjujd34So+jnnk3wUpFtWhGYR5KqJAOasCQDZj7b89mGU/ao0hDo7I0SX+p8eFvsG1XN3OFTuBKwbQdbieH/4pcaWLymf5S0cC69J7QC06mF5bqJrtQYest+FrRyf0RMvnL771MqY1Xo6u6coOtO1xAGom3OMejPj6q8vy3e+A5N2rsdBeY5VjHKAhByTCWjQL3CeUiSHJ7Cfcb4NqrCQThHJCP+KdIzrorLIOL3weOjQ7GHcwdt0qoVIcB3WbJ7wanb2JTIdM9llShFAyIhUTPqVhp0NQshNB7OGRR9h442ugpbK5hI2MvF64VuSe02QwW9eV8MM+sahzR2lDGrk7IUPe/LhCiXCIjbk0Jau3OtrO8IJtfhxHpL9NGAvxEKtyXCI7hcthvnM/sEH8IaVoYKGiUklpr5EntWLybG5OQQFPPUwJPbeN1BZnOXzUemy6EwQ81j++szgU/1baIjTENsNUmQSLlzT/Vy/4hwBzBQSYRArEX82U5GZSFjbGR4PaFBZxwOecK6DfFI6dJw8LsaLIsSifme3upCQX8qW7LPK20Al6xGr1sS22YnBQrzIZgpXIN6p3LLa0wYMdZjTWolKge0TeiFV4Z0XETbX54+e2MkBZKybWDah6WNZaAR0KMQsyalLhjmAjVmAWY7u9HGK/gSrgbEhoLtkwyVLNTmibsFWDg==|920
\ No newline at end of file
diff --git a/Pages/项目首页/项目首页.json b/Pages/项目首页/项目首页.json
index 3e83d66a..8e6ae6f8 100644
--- a/Pages/项目首页/项目首页.json
+++ b/Pages/项目首页/项目首页.json
@@ -21,7 +21,8 @@
},
"2": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 32.0,
+ "IsHidden": true
}
}
},
@@ -273,7 +274,8 @@
"0,0": {
"CellType": {
"$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon",
- "PageName": "项目标题"
+ "PageName": "项目标题",
+ "OverflowMode": 0
}
},
"1,0": {
@@ -288,6 +290,70 @@
"TableName": "项目表",
"ColumnName": "ID",
"GUID": "44b442c6-01c5-4902-a341-31cf3a3c46e2"
+ },
+ "CellType": {
+ "$type": "Forguncy.TextCellType, ServerDesignerCommon",
+ "SavedValidators": [
+ {
+ "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon"
+ }
+ ],
+ "TemplateKey": "_RS_NewLittleRoundCorner",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon",
+ "contextProperty": {
+ "Display": "值变更原因"
+ }
+ },
+ "value": "binding",
+ "compareType": 1
+ },
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+ "Title": "加载中"
+ },
+ {
+ "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand",
+ "CurrentRowInfo": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "项目表",
+ "ColumnName": "ID",
+ "GUID": "ecae9cb8-2975-4525-aa0f-baf06d5c4bf4"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目首页!项目ID"
+ }
+ }
+ },
+ {
+ "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon",
+ "JavaScript": "Forguncy.Page.reloadBindingData();\r\n",
+ "ID": "b58e3e0c63374cf2a19a70f15f0bfba1"
+ },
+ {
+ "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+ "FunctionName": "remove",
+ "Title": "加载中"
+ }
+ ],
+ "ID": "573081b4-9f68-4287-8b1e-610c4775b779"
+ }
+ ]
+ }
+ ]
+ },
+ "DataValidationInfo": {
+ "IgnoreBlank": false
}
}
},
@@ -302,10 +368,8 @@
},
{
"Background": 2,
- "FontFamily": 3
- },
- {
- "FontFamily": 3
+ "FontFamily": 3,
+ "Formatter": 4
},
{
"Background": null
@@ -316,7 +380,8 @@
"Background 2 0",
"Right",
"#FFFFFF00",
- "Body"
+ "Body",
+ "@"
],
"Borders": [
{
@@ -370,13 +435,10 @@
"0,42": 0,
"0,43": 0,
"2,1": 1,
- "2,4": 2,
- "2,5": 3,
- "2,6": 3,
- "2,7": 3
+ "2,4": 2
},
"RowStyles": {
- "0": 4
+ "0": 3
},
"SheetStyle": {
"FontFamily": 3
@@ -385,8 +447,8 @@
"Spans": [
"0,0,1,44",
"1,0,1,44",
- "2,4,1,4",
- "2,1,1,3"
+ "2,1,1,3",
+ "2,4,1,4"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -422,4 +484,4 @@
"Formula": "项目首页!$A$2"
}
]
-}//b+b/v5eZ9i87OLSHWq6PxWPqTpFCS0LQJ3rgGxCDdSkORHr/F1JWjJyG9bbDYbCI+xoKhwWke/Q9bE4hXnI9ApGM47n8ltxm+Z6cVc/93zOySZbxYWQrQijiTGzZltnDv3Gt/cra/1EKisvM0wDzGHOIhrnfZZfOq7U+TKV0Zb46PtXDyVifueYYfsnE7HyN5g1QJsZKVf6N6dtOh4F0Rt9LdOJHtiEeXdAvxzNDZcHtOoWh5cXV9Bl11GHlYhotCC/ai3idwKNhFdLtX5iSlvOgVbdKf4VZghuzpRiwrAXzVLyaDNwTjmferLflN/6/B/fQsedy4qlk2n62RDWqZRtWtkppG5VHjGVnhQMoInnPiEp0gtNloWda9oPTIxgV2yBZbYNn0bBzKpnv5Bnp8kGCHUSMlBm+l7hOZuLXB1Rzlrz9SAD10X26atm10YOPrSzYnmm9wRjbwio1EcWwLu1vLstOulgGQoGHuVNr4dD/APKUFId8l0Mzynr54NOSRmPQH0I25bglUknKqdLmTHta1/VKERRhekUElRORUt+StqdMesXEZVDvlZkk3HI9pmTFxXcVTbauwlIWa64qHHFX38Aov5Ueu5eS369x6dePsOo7HqoAr6lHfooGUwYs0o/AGfTm5E31EmuF//3GuYdahnXcI1gpy9XFeWaKVwuONWUZw7kdhO/UOfDd08Xg71gOq1p3owTf1wy3kcxfTuUIK0CRZzplAOM8ZtJdH6G/lIbwUlD8dL920U+i7XAMv3ClqrauqAJ512OT1xKaTEqFZ76Lbz3NIh517uQ8LZt1t1s5zzWbzfh5vT4IIsY4EE8vGjo//TnYRs99okoS0wlCNDpWn4bdYBaHegvDz+SbiQe9M8o2Q4uPn3eJQjiDddLq8UD0PbbSJpErNc4wmA==|920
\ No newline at end of file
+}//m2ErzpB+OOYQdBH2aQUSaBzUreUAeHlNt6OrIkQjIw20zqBK0WBs0nyCoEs4yE0lno15A/d6GFEdOU/3KcX/Mr/1a2qfXz843eImzHsMOQ48UKhiLbkwhFvHpJKulUjxiCU8xyR5mKI/pdHa1vAjokeoSJKEetkWE+1qhbhA8WBHkRBwxpAk2px6qsugmZmsS6Pug+aTQqX8ehSOo6ZokymRNbK2TejVrf/lTY8SR1gJ3+0QNM+0xAMhb4xrfLjw087MM7f3WdVu+rRvXoepRUaXWA13Gk2jL4+5+XYXbCrcdSwXbMb56OiRILDbuMshyMl8onu614SdYeCI98y0B5MteygZA1Wz8GDMiWE4nIps19cMc/4SWIy9H+A787Z4RkONGdC6hSCMVnPIrnoN2XPC/rLASHS+aZ6zvwvUgC/HEZED4Vgl+KQyr6sASta6ZS53+rLgeE7EsG4T9Wz9dR0MvSsbK9cZgOq7D7BwbwjSNW/LpSbmWjObcfa/XJ9XFiS5FF6qde5FSN0WLrpUBOaRCL03FSqEjKak/OKuT9pm9u+ZvO1ZlE2uYTUzqVDVxTMTuEhUMJzkFljQRmc1JnzoYYwv5+rbM8022CMe6fl6Axmn1ixpyxwTVuUSEIrK4KPujMlQvXcLWLC/yR1naM5CuTqIfV+Id5htziWIh86iPPhUdOWEceOkntAjdL4iL7OuJwmzL4wX7QO4Xi443aupSx3o4e0oCC3zC6gEk/8wC1AEMc5RrW1jfNPn1rDta4bGHOWZnU3pEWOvjMSv8m0TxNXjQ6etHSg0FwR+vkc6b4vwCHZLVxPmnKWqN3JOFf9Hoe4Ke9bXs+xj4CvVCL2XjhULtb1J0YS7X/TCtHxfOAJdPZoDGXhC4pbZL5RD5dtP8ab7DMNHrTJN1UJAQg==|920
\ No newline at end of file
diff --git a/Reports/DefaultTheme.rdlx-theme b/Reports/DefaultTheme.rdlx-theme
index 2ed498f8..92dc0aaf 100644
--- a/Reports/DefaultTheme.rdlx-theme
+++ b/Reports/DefaultTheme.rdlx-theme
@@ -1 +1 @@
-#000000#042531#FFFFFF#F3F3F3#1890FF#8BB73D#EBC54B#EA772A#D03736#904DA0#FFFFFF#FFFFFF微软雅黑10ptNormal微软雅黑10ptNormal
\ No newline at end of file
+#000000#042531#FFFFFF#F3F3F3#1890FF#8BC34A#EBC54B#EA772A#D03736#904DA0#FFFFFF#FFFFFF微软雅黑10ptNormal微软雅黑10ptNormal
\ No newline at end of file
diff --git a/ServerCommands/任务/变更任务状态.json b/ServerCommands/任务/变更任务状态.json
new file mode 100644
index 00000000..266ed732
--- /dev/null
+++ b/ServerCommands/任务/变更任务状态.json
@@ -0,0 +1,398 @@
+{
+ "Name": "变更任务状态",
+ "Enabled": true,
+ "Triggers": [
+ {
+ "$type": "Forguncy.ServerCommands.Models.PostRequestTrigger, ServerDesignerCommon",
+ "Permission": {
+ "PermissionData": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core",
+ "permissionResource": {
+ "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core"
+ },
+ "permissionBindings": [
+ {
+ "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core",
+ "roleNames": [
+ "FGC_LoginUser"
+ ]
+ }
+ ]
+ }
+ },
+ "Parameters": [
+ {
+ "Name": "任务ID",
+ "DataValidationInfo": {
+ "IgnoreBlank": false
+ }
+ },
+ {
+ "Name": "状态码",
+ "DataValidationInfo": {
+ "IgnoreBlank": false
+ }
+ }
+ ]
+ }
+ ],
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon",
+ "TryCommandPart": {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "任务信息",
+ "TableValue": {
+ "TableName": "任务表",
+ "TableValueType": 1,
+ "BindingInfos": [
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "任务状态",
+ "GUID": "afbdd48e-487e-440c-b59c-e565e61e9cd1"
+ },
+ "ColumnName": "任务状态"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "任务状态",
+ "GUID": "c2c55272-c31d-4118-b3a8-a8e1690ce6b5",
+ "RelationBinding": {
+ "RelatedTable": "任务状态",
+ "RelatedColumn": "状态码",
+ "DisplayColumn": "任务状态"
+ }
+ },
+ "ColumnName": "任务状态文本"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "执行者",
+ "GUID": "f650100e-6369-4760-a093-a73cb3a74f7a"
+ },
+ "ColumnName": "执行者"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "开始时间",
+ "GUID": "fb57404b-3cad-4911-9eec-6a424d3ba882"
+ },
+ "ColumnName": "开始时间"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "结束时间",
+ "GUID": "5b07138d-c511-4f69-ba7d-46c7e067ccd0"
+ },
+ "ColumnName": "结束时间"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "任务类型",
+ "GUID": "4cd38e49-3e3a-4c0d-a71d-a3db6d2d4b60"
+ },
+ "ColumnName": "任务类型"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "ID",
+ "GUID": "39e445d7-7f6a-4403-aaad-904e8e86474a"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务ID"
+ }
+ },
+ "TopCount": "1"
+ },
+ "ID": "92bcc24f55b847a9a5d795ab096048ed"
+ },
+ {
+ "$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": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务信息.任务状态"
+ },
+ "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": "0"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "任务工时",
+ "TableValue": {
+ "TableName": "任务工时表",
+ "TableValueType": 3,
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "任务ID",
+ "GUID": "484f7f7d-70e0-4450-b1b5-05e631733d79"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务ID"
+ }
+ },
+ "NullFormulaValueQueryPolicy": 0
+ },
+ "ID": "e07a763289954cb29930901258108a44"
+ },
+ {
+ "$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": "0",
+ "compareType": 2
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=\"该任务已报工，无法切换至\"&任务信息.任务状态文本&\"状态\""
+ }
+ }
+ ],
+ "ID": "57d72271-f903-47ea-88b1-772145976e08"
+ }
+ ]
+ }
+ ],
+ "ID": "1461a11a-f9bd-4d9f-a414-35b0e7471f86"
+ },
+ {
+ "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": "=任务信息.执行者"
+ }
+ },
+ "value": "%Null%"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": "任务执行者不能为空"
+ }
+ ],
+ "ID": "4381895d-aa83-45b0-b9a4-2c1ca6e8aa2b"
+ }
+ ]
+ }
+ ],
+ "ID": "2077a523-e818-4741-bf46-2836d81ad4a9"
+ },
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+ "ParamObject": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=状态码"
+ }
+ },
+ "value": "2"
+ },
+ "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": "%Null%"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": "任务执行者不能为空"
+ }
+ ],
+ "ID": "381e934c-ce36-4b13-8abd-f889ea350a9d"
+ }
+ ]
+ }
+ ],
+ "ID": "5c67b8b1-d3d0-4068-bb42-346d51d4d375"
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "任务表",
+ "ShowConfirm": false,
+ "RowsToUpdate": 1,
+ "RowsToUpdateCondition": {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "ID",
+ "GUID": "a2c10ff5-a33d-46de-b3f8-ddcfcc7948a7"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务ID"
+ }
+ },
+ "UpdateBindingValues": [
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "任务状态",
+ "GUID": "a698faf8-07b4-4e5f-ada0-dd9f31c1cdd7"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=状态码"
+ }
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "0",
+ "Message": "操作成功"
+ }
+ ],
+ "ID": "e358cd4e-0338-48cb-8b79-d474d8343331"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "0",
+ "Message": "操作成功"
+ }
+ ],
+ "ID": "a79b949e-f0ff-44e7-9685-5693135ddec8"
+ }
+ ]
+ }
+ ],
+ "ID": "c6d0246e-17fc-45bf-b64f-33954fa2971b"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon"
+ }
+ ],
+ "ID": "d6a89ce9-b9c2-4091-80a8-c431a63ae888"
+ }
+ ]
+ }
+ ]
+ },
+ "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
index ac19a28e..e2efd099 100644
--- a/ServerCommands/任务/新增任务.json
+++ b/ServerCommands/任务/新增任务.json
@@ -78,161 +78,257 @@
"TryCommandPart": {
"CommandList": [
{
- "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
- "TableName": "任务表",
- "UpdateType": "add",
- "ShowConfirm": false,
- "UpdateBindingValues": [
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "项目ID",
- "GUID": "ff76b3a3-881e-4719-a83a-14d0f634497d"
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "参与人",
+ "TableValue": {
+ "TableName": "用户信息视图",
+ "BindingInfos": [
+ {
+ "BindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "用户名",
+ "GUID": "51d4a9ca-c85c-4dd1-97d8-248303d2c5d1"
+ },
+ "ColumnName": "用户名"
},
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=项目ID"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "父任务ID",
- "GUID": "0247aa38-8c81-4940-bc75-302de35a7c4a"
+ {
+ "BindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "全名",
+ "GUID": "de53ee8c-3acf-4524-a8d4-88655d6504f3"
+ },
+ "ColumnName": "全名"
},
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=父任务ID"
+ {
+ "BindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "默认时薪",
+ "GUID": "cf38dbe9-3311-47a0-8e2b-358382d1c1e9"
+ },
+ "ColumnName": "默认时薪"
}
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "任务名称",
- "GUID": "72503d5d-bc91-4c1f-be04-a8e04c7c886d"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务标题"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "执行者",
- "GUID": "240a30c9-0088-4974-853b-e3c0a737b89c"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务标题"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "参与者",
- "GUID": "1537acb2-7621-45ad-824a-0f04bb5cfbcb"
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
+ "CompareType": 8,
+ "ColumnBindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "用户名",
+ "GUID": "b3340080-0c96-47f6-8a6c-8bb0b1db7e2c"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=参与人"
}
+ }
+ },
+ "ID": "cd95c7b64259445cb44beba6e33ffa63"
+ },
+ {
+ "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "任务表",
+ "UpdateType": "add",
+ "ShowConfirm": false,
+ "UpdateBindingValues": [
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "项目ID",
+ "GUID": "840c8c9e-c205-4aa6-8ae0-8fd2a2cf55f3"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目ID"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "父任务ID",
+ "GUID": "e2193e55-9ed2-45fe-bb4b-ed01a39e8f0e"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=父任务ID"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "任务名称",
+ "GUID": "61735f45-ac25-4b94-acd4-3e0ca04c286a"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务标题"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "执行者",
+ "GUID": "8fd4e7c3-9cc8-4820-b538-8d38ce0397ac"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=执行人"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "开始时间",
+ "GUID": "3c2005d1-3ffd-4fa3-a63e-8d730705f04a"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=开始日期"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "结束时间",
+ "GUID": "9885b0a1-c0db-4469-a016-eec2c4c185d8"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=结束日期"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "任务类型",
+ "GUID": "ed0cf347-43c6-4143-a3a0-47c6b719557b"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务类型"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "分组ID",
+ "GUID": "fce23d46-9199-4655-9ea9-208f9c858e80"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务分组"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "版本",
+ "GUID": "8db3510a-7e1c-4243-afbe-48966b63b530"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务版本"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "任务说明",
+ "GUID": "1d077053-81b2-4291-b33b-f44d29b31b27"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务说明"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "备注",
+ "GUID": "c614ca74-8059-486c-a881-a0ca4425df32"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=备注"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "工时核定方式",
+ "GUID": "956b54f8-b234-4423-8e41-f255c3feaac2"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=工时核定方式"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "任务状态",
+ "GUID": "1f8faed8-d128-4482-90c1-25e0e6cad40a"
+ },
+ "Value": "0"
+ }
+ ],
+ "ParamNameToSaveNewRowValue": "新任务"
},
{
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "开始时间",
- "GUID": "122bed43-b1c8-4082-b4a1-8e58b9f7c7a8"
+ "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon",
+ "LoopInfo": {
+ "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon",
+ "LoopCount": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=参与人"
+ },
+ "LoopItemParamName": "Item"
},
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=开始日期"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "结束时间",
- "GUID": "6c1281e9-205c-466d-94eb-8020781bbd91"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=结束日期"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "任务类型",
- "GUID": "b20ec680-9479-4d02-a930-c88311d82b6c"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务类型"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "分组ID",
- "GUID": "c2071865-f380-419e-9e77-20642d0121bc"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务分组"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "版本",
- "GUID": "32dfbe51-6077-4e79-a99b-8ac3944b0e08"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务版本"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "任务说明",
- "GUID": "3bb00b65-95b4-4d34-b640-98130db8a89c"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务说明"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "备注",
- "GUID": "262c8ecc-2af6-456d-8f28-fd14d84d5c8d"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=备注"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "工时核定方式",
- "GUID": "76825213-c1b2-43df-8521-7889a516f1f8"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=工时核定方式"
- }
- },
- {
- "BindingInfo": {
- "TableName": "任务表",
- "ColumnName": "任务状态",
- "GUID": "663d69a6-3cb7-4362-863d-284768b26135"
- },
- "Value": "0"
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+ "TableName": "任务成员表",
+ "UpdateType": "add",
+ "ShowConfirm": false,
+ "UpdateBindingValues": [
+ {
+ "BindingInfo": {
+ "TableName": "任务成员表",
+ "ColumnName": "任务ID",
+ "GUID": "9a85ad00-0b95-4ae4-8296-04862f2c8b03"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=新任务.ID"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务成员表",
+ "ColumnName": "参与人",
+ "GUID": "404fdb7a-2ecd-4db1-8b39-aec7c663bfe3"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=Item.用户名"
+ }
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务成员表",
+ "ColumnName": "任务时薪",
+ "GUID": "bea75b1c-9d0c-466e-ac27-37df94c31440"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=Item.默认时薪"
+ }
+ }
+ ]
+ }
+ ]
}
]
},
diff --git a/ServerCommands/工时/修改工时.json b/ServerCommands/工时/修改工时.json
index a31c242f..68c47396 100644
--- a/ServerCommands/工时/修改工时.json
+++ b/ServerCommands/工时/修改工时.json
@@ -75,7 +75,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "任务ID",
- "GUID": "f250f3d4-306f-4f2f-b1d3-0be7458a2623"
+ "GUID": "2a0f3989-eb4c-4880-9a84-e0bb02f0ff4f"
},
"ColumnName": "任务ID"
},
@@ -83,7 +83,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时类型",
- "GUID": "2309d652-ed06-48e9-bbf9-fb9583aca0ce"
+ "GUID": "c2159a41-2005-4c9d-9d56-6837720b58ad"
},
"ColumnName": "工时类型"
},
@@ -91,7 +91,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "任务ID",
- "GUID": "09989c87-5b7e-40eb-be4c-9ba87b32b467",
+ "GUID": "f5c955d8-221c-4d6f-9539-688cf2226c0d",
"RelationBinding": {
"RelatedTable": "任务表",
"RelatedColumn": "ID",
@@ -104,7 +104,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "任务ID",
- "GUID": "ec846c2f-3aa5-4484-95ef-1972503a07b3",
+ "GUID": "b4e60853-be38-42dc-afe4-f7952fdc738b",
"RelationBinding": {
"RelatedTable": "任务表",
"RelatedColumn": "ID",
@@ -124,7 +124,7 @@
"ColumnBindingInfo": {
"TableName": "任务工时表",
"ColumnName": "ID",
- "GUID": "cabb4369-8835-48c1-a904-84a5e39c961c"
+ "GUID": "98a8dedc-639e-4eee-b5d3-a160f03632ea"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -134,7 +134,7 @@
"NullFormulaValueQueryPolicy": 0,
"TopCount": "1"
},
- "ID": "08a93b043f414bad996c1d2f2c516c4c"
+ "ID": "37d3a730e3c443e5a0faef85944856d7"
},
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -147,7 +147,7 @@
"BindingInfo": {
"TableName": "用户信息视图",
"ColumnName": "全名",
- "GUID": "f0683fc3-36ac-4c4b-ab9a-dd9886a93fa5"
+ "GUID": "8b30a356-3f3b-4b53-8eca-8ddad3d5dc6a"
},
"ColumnName": "全名"
},
@@ -155,7 +155,7 @@
"BindingInfo": {
"TableName": "用户信息视图",
"ColumnName": "负荷",
- "GUID": "50c4d16c-d1aa-4984-9701-89ad5d48ef41"
+ "GUID": "d045ab4b-5dc9-45b0-b0fd-e0820d081760"
},
"ColumnName": "负荷"
}
@@ -165,7 +165,7 @@
"ColumnBindingInfo": {
"TableName": "用户信息视图",
"ColumnName": "用户名",
- "GUID": "d1335a82-4ec2-4bd6-8097-b8cde857970b"
+ "GUID": "4242eed5-1317-4247-85d6-487a0d28482d"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -175,7 +175,7 @@
"NullFormulaValueQueryPolicy": 0,
"TopCount": "1"
},
- "ID": "62c361ee22e4405e96f2e66576c96c73"
+ "ID": "831eeac58ef048508ca1b6a6d9a0f130"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -204,7 +204,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "总工时",
- "GUID": "f3ff96b9-45fd-4ef8-b770-a8d687a57989"
+ "GUID": "37a2654f-b7c5-4e19-a9c3-6ab16b77bbe9"
},
"ColumnName": "总工时"
}
@@ -212,24 +212,12 @@
"SqlCondition": {
"$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
"SubConditions": [
- {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "任务工时表",
- "ColumnName": "任务ID",
- "GUID": "fc31ce71-9de3-410e-9bbe-e0c4f47901b4"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=报工信息.任务ID"
- }
- },
{
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
"ColumnBindingInfo": {
"TableName": "任务工时表",
"ColumnName": "执行人",
- "GUID": "24a62ccf-962a-4f4b-b401-6ba78e64281a"
+ "GUID": "51191cba-1a0c-4290-b0e3-74d5138f35b9"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -241,7 +229,7 @@
"ColumnBindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时类型",
- "GUID": "58bd9aa1-8b1f-4302-ae42-6182aa229f65"
+ "GUID": "fc94b9e1-c61f-4d76-9ac3-e5b0f6acc74c"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -254,7 +242,7 @@
"ColumnBindingInfo": {
"TableName": "任务工时表",
"ColumnName": "ID",
- "GUID": "3f29fdbd-f187-451e-b7f7-964742413192"
+ "GUID": "2f9dd395-014a-4ae0-8e20-756d2a7c2677"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -266,7 +254,7 @@
"ColumnBindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时日期",
- "GUID": "fc7683a1-dd0d-4616-852a-bd0571eb863d"
+ "GUID": "bdccfeef-34a2-47a2-9c3c-61f97cb0867c"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -277,7 +265,7 @@
},
"NullFormulaValueQueryPolicy": 0
},
- "ID": "6f71560168554d95937ce8d8597f8d79"
+ "ID": "7176cf9473f14ad8999ca17165be68a2"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -302,10 +290,10 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=IF(OR(执行者.负荷=\"\",执行者.负荷=0,执行者.负荷>24),24,执行者.负荷)"
},
- "ID": "3315ab13956142d98db874dbb6d85684"
+ "ID": "ba90f02dc09f480d9f6bb05a0870bf01"
}
],
- "ID": "874adf86-99b3-4d05-ba83-f3a7392422f0"
+ "ID": "75c00f0b-03b1-4105-9035-39089d210515"
},
{
"CommandList": [
@@ -313,10 +301,10 @@
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "最大负荷",
"ParameterValue": "24",
- "ID": "8d185b9ac0734ccca2814b16b5b62eca"
+ "ID": "54da0c7bde46476c964ac90743685d76"
}
],
- "ID": "26ed4dcb-8918-48fb-9a3e-182863a109b0"
+ "ID": "7393f8d1-70c2-4835-b084-6eacf76487b4"
}
]
},
@@ -350,7 +338,7 @@
"ColumnBindingInfo": {
"TableName": "任务工时表",
"ColumnName": "ID",
- "GUID": "1a75f32d-f665-4ec1-838a-9fc3b661edf3"
+ "GUID": "6364508b-0430-40c8-819c-5abfd9112015"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -362,7 +350,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时日期",
- "GUID": "a7499f28-816b-4847-aaab-35b90c7ce942"
+ "GUID": "12979f18-64fe-4738-9040-962247aee8a5"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -373,7 +361,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "执行人",
- "GUID": "21b0cae0-c6d1-4e89-862f-1d3213e791d6"
+ "GUID": "86bb7645-a0c3-441e-9aec-238115c4ed87"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -384,7 +372,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "执行内容",
- "GUID": "c8a590ce-4e0d-4794-a5f5-13042a5e27f1"
+ "GUID": "dc82c110-eb9f-40b7-a4ba-a64d925f217e"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -395,7 +383,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时",
- "GUID": "1cc7e19f-312e-48a6-9cea-f19461825e84"
+ "GUID": "807fdc8e-d861-4e31-9db2-e194c40e05ee"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -410,7 +398,7 @@
"Message": "更新成功"
}
],
- "ID": "db78052b-f630-4b4a-b526-fea681effc86"
+ "ID": "f8bb6f85-bc98-42f7-a06e-7f16bc423dc9"
},
{
"CommandList": [
@@ -423,12 +411,12 @@
}
}
],
- "ID": "caa50012-ca70-4365-a388-15c10cbaef7e"
+ "ID": "1c2b1dce-073d-42a3-848e-c6ea584e5a63"
}
]
}
],
- "ID": "644a39c8-965f-4aa3-8208-5c7d0aba82b6"
+ "ID": "6235168d-f1f1-4270-bee6-a6b93e27e00e"
},
{
"CommandList": [
@@ -441,7 +429,7 @@
}
}
],
- "ID": "110c39a0-614b-4903-91ce-0289a3db5db2"
+ "ID": "0635cab1-c78a-44cb-affb-ca9c62c0b52b"
}
]
}
diff --git a/ServerCommands/工时/新增工时.json b/ServerCommands/工时/新增工时.json
index 2f52d174..9fcb581e 100644
--- a/ServerCommands/工时/新增工时.json
+++ b/ServerCommands/工时/新增工时.json
@@ -89,7 +89,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "项目ID",
- "GUID": "443f2b0d-af7e-4ac1-9c22-7a04789c5675"
+ "GUID": "36a0694f-32c4-4a5d-86b1-da1a65563db3"
},
"ColumnName": "项目ID"
},
@@ -97,7 +97,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "任务状态",
- "GUID": "32c54bbb-3010-4305-979c-afceecd898bb"
+ "GUID": "cbe473f3-ee2b-4642-aec2-84ec97ef77e4"
},
"ColumnName": "任务状态"
},
@@ -105,7 +105,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "任务状态",
- "GUID": "34e3e030-33d1-4702-b671-9d80aff1878f",
+ "GUID": "12dcebf1-d5e1-4a05-b259-3628d2003f9b",
"RelationBinding": {
"RelatedTable": "任务状态",
"RelatedColumn": "状态码",
@@ -118,7 +118,7 @@
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "执行者",
- "GUID": "f955d975-fc25-450d-a340-a0348b1770a0",
+ "GUID": "c2b0ef94-b9ac-45d8-875b-56579f08b417",
"AttachType": {
"$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
"UserColumnAttachType": 5,
@@ -126,6 +126,32 @@
}
},
"ColumnName": "执行者负荷"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "项目ID",
+ "GUID": "58da35e6-75ed-4ace-9b10-28dedc13ed08",
+ "RelationBinding": {
+ "RelatedTable": "项目表",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "严格模式"
+ }
+ },
+ "ColumnName": "严格模式"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "任务表",
+ "ColumnName": "项目ID",
+ "GUID": "f363707a-74b8-46a4-935c-ea52eeae0aab",
+ "RelationBinding": {
+ "RelatedTable": "项目表",
+ "RelatedColumn": "ID",
+ "DisplayColumn": "项目预算工时"
+ }
+ },
+ "ColumnName": "项目预算工时"
}
],
"SqlCondition": {
@@ -133,7 +159,7 @@
"ColumnBindingInfo": {
"TableName": "任务表",
"ColumnName": "ID",
- "GUID": "7a204e75-e430-43dc-9c86-429583d827aa"
+ "GUID": "a411452d-d49e-4d87-aea9-ffe528a11127"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -143,7 +169,7 @@
"NullFormulaValueQueryPolicy": 0,
"TopCount": "1"
},
- "ID": "4b2c214a5f994ff090f13264d24b40c3"
+ "ID": "2adb2826506a4367a08cea1a22dc2c88"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -161,6 +187,106 @@
"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": "=任务信息.严格模式"
+ }
+ },
+ "value": "1"
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "总计划工时",
+ "TableValue": {
+ "TableName": "任务工时表",
+ "OnlyGetValue": true,
+ "TableValueType": 0,
+ "BindingInfos": [
+ {
+ "BindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "总工时",
+ "GUID": "15a53c55-5e66-4742-a71f-1fc64e017a10"
+ },
+ "ColumnName": "总工时"
+ }
+ ],
+ "SqlCondition": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "ID",
+ "GUID": "64a6f2c9-8782-4c12-9164-b2636c815cc3"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务ID"
+ }
+ },
+ {
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "任务工时表",
+ "ColumnName": "工时类型",
+ "GUID": "c97a3bc2-1392-4cb9-8eba-7965bf4b2fe0"
+ },
+ "Value": "计划"
+ }
+ ]
+ }
+ },
+ "ID": "29d508af935d4c97a0aefdf509ff7f30"
+ },
+ {
+ "$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": 2
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "400",
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=\"计划工时总时长(\"&工时数&\"h)超过项目预算工时时长(\"&任务信息.项目预算工时&\"h)，请修改后提交！\""
+ }
+ }
+ ],
+ "ID": "6f1e3391-cb31-4999-b19c-5f912adb6a29"
+ }
+ ]
+ }
+ ],
+ "ID": "d755b8c1-d2ad-42d9-9d93-41bd67b58c39"
+ }
+ ]
+ },
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "待分配工时",
@@ -168,7 +294,7 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=工时数"
},
- "ID": "17ae0d0a18d24ffc99da37a3bea6c9ae"
+ "ID": "5b24b76c69a14a0d9031135d1f8e11ce"
},
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -177,7 +303,7 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")+1"
},
- "ID": "5d5f82547d254cbf864287ef61108e71"
+ "ID": "09b4f9a0f25c48edb56edcf77966ebee"
},
{
"$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon",
@@ -201,7 +327,7 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=开始日期+(index-1)"
},
- "ID": "3775019110024537bd38cf500a9a7c58"
+ "ID": "261d1560d2d04104b760349265aa9212"
},
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -214,7 +340,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "总工时",
- "GUID": "ce66991b-0d8e-4d0c-9d58-08670f889a3b"
+ "GUID": "39d3e8c6-b36b-4ac5-9b53-203e4f6a1c7d"
},
"ColumnName": "总工时"
}
@@ -222,24 +348,12 @@
"SqlCondition": {
"$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
"SubConditions": [
- {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "任务工时表",
- "ColumnName": "任务ID",
- "GUID": "6c5abdb9-f1f9-4f93-8966-a5de658d187e"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=任务ID"
- }
- },
{
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
"ColumnBindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时日期",
- "GUID": "1f0d5e7e-310f-4f4e-b9fc-063bab50acc0"
+ "GUID": "36e54b34-5a5a-4543-9abb-2c8602bc1d72"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -251,7 +365,7 @@
"ColumnBindingInfo": {
"TableName": "任务工时表",
"ColumnName": "执行人",
- "GUID": "ce3bfc81-bd71-4997-8575-39fba998a519"
+ "GUID": "bdd49d3f-eb98-4fc6-baee-8352828d50c7"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -263,7 +377,7 @@
"ColumnBindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时类型",
- "GUID": "11614c3e-2e4d-45a5-9893-7e2fb712f669"
+ "GUID": "619d9834-f4b6-430a-9ba8-2b32fcd82df4"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -274,7 +388,55 @@
},
"NullFormulaValueQueryPolicy": 0
},
- "ID": "a8f97b3ecff64f2183b9661fd518d352"
+ "ID": "05785ad08042483fb9e59d05853898aa"
+ },
+ {
+ "$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": "=index"
+ }
+ },
+ "value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=分配天数"
+ },
+ "compareType": 4
+ },
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "计算本次分配工时",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=ROUNDUP(工时数/分配天数,1)"
+ },
+ "ID": "727872ced2d14737b0da0bbf25b79bca"
+ }
+ ],
+ "ID": "d075d749-01ed-4381-a0b9-415105afb341"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+ "ParameterName": "计算本次分配工时",
+ "ParameterValue": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=待分配工时"
+ },
+ "ID": "7c9e9ffb15eb431aa10c0ee6fabd7454"
+ }
+ ],
+ "ID": "9c71d8e3-9dca-4bcb-9b6e-64125790b6bb"
+ }
+ ]
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -299,10 +461,10 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=IF(OR(任务信息.执行者负荷=\"\",任务信息.执行者负荷=0,任务信息.执行者负荷>24),24,任务信息.执行者负荷)"
},
- "ID": "e6c17fbe939f404a86a2202cd0fb333e"
+ "ID": "2fc4fb1e599245bdb1e65648e14ad3bd"
}
],
- "ID": "c4642a97-a10f-42d5-b742-e4abfb383a4c"
+ "ID": "2a778196-c88a-4c80-a0e9-c928865f4c2e"
},
{
"Condition": {
@@ -321,10 +483,10 @@
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "执行人负荷",
"ParameterValue": "24",
- "ID": "688762495ecf42728377db40799fedf2"
+ "ID": "d87617ab7b214ad481ebe98958a76552"
}
],
- "ID": "a6c78a62-0e06-4a39-8ffa-100924338ac1"
+ "ID": "8335a6a7-bc0e-4811-ad71-1508ae57643f"
}
]
},
@@ -333,9 +495,9 @@
"ParameterName": "预计增加后工时",
"ParameterValue": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=IF(统计工时.总工时=\"\",0,统计工时.总工时)+工时数"
+ "SerializeProperty": "=IF(统计工时.总工时=\"\",0,统计工时.总工时)+计算本次分配工时"
},
- "ID": "d99f897ea0ff419e846e224d637397f2"
+ "ID": "ee940c0f58de4d6480c109b32ec635a2"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -357,54 +519,6 @@
"compareType": 5
},
"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": "=index"
- }
- },
- "value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=分配天数"
- },
- "compareType": 4
- },
- "CommandList": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "计算本次分配工时",
- "ParameterValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=ROUNDUP(工时数/分配天数,1)"
- },
- "ID": "8f33fe4ca9764403aa6b64d560452ff2"
- }
- ],
- "ID": "3a68d9c7-f9d8-4e0d-ba86-42d4512b7c13"
- },
- {
- "CommandList": [
- {
- "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
- "ParameterName": "计算本次分配工时",
- "ParameterValue": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=待分配工时"
- },
- "ID": "e35aa196929541b980131a3874132cae"
- }
- ],
- "ID": "2515088d-3dad-4ad0-ac3d-f06e56e8edd4"
- }
- ]
- },
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "待分配工时",
@@ -412,7 +526,7 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)"
},
- "ID": "18bfc113ae4b448dbdba213446cdf103"
+ "ID": "10b16e8c91154affa858f537a7595469"
},
{
"$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
@@ -424,7 +538,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "项目ID",
- "GUID": "89a862aa-235c-4422-a18f-fcd4644b5d36"
+ "GUID": "48483244-a5f1-467f-9f33-213ccbf0765c"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -435,7 +549,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "任务ID",
- "GUID": "ba269f5e-db97-4e17-9cb8-a15f44846c81"
+ "GUID": "a81043f5-58b2-4d28-ba59-2386b7b98e45"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -446,7 +560,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时日期",
- "GUID": "c97ed24d-b14b-469b-9074-66d4ed98d5c6"
+ "GUID": "0ac58b66-e8c3-44ec-895a-2dd40d1438bb"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -457,7 +571,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时类型",
- "GUID": "48d6e343-9b6c-43b5-9778-9b868ccd55df"
+ "GUID": "0aebba8e-fef3-4471-a0b6-428a290ada8d"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -468,7 +582,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "执行人",
- "GUID": "df8c4912-a0e0-4088-a341-be55e3db2ca1"
+ "GUID": "489ed3df-150c-47ad-87c0-914630d2ca63"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -479,7 +593,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "执行内容",
- "GUID": "173e91d1-15ec-4f9a-a54e-98ddd185b4af"
+ "GUID": "806dfe71-8ceb-437d-ab2c-5b4d79adc391"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -490,7 +604,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时",
- "GUID": "2bf153a9-56fd-4599-97f4-7f317af68b46"
+ "GUID": "599e9d1f-aa89-4865-8062-de9a823bb900"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -500,7 +614,7 @@
]
}
],
- "ID": "fcf70c56-6464-42a7-8a70-825884a0ffd8"
+ "ID": "a819aec2-a9ec-45c1-ae74-432af31c0025"
},
{
"CommandList": [
@@ -513,7 +627,7 @@
}
}
],
- "ID": "f3875778-80dd-40b4-b317-4f21ef53e746"
+ "ID": "eebdd38f-929c-484b-9027-8660567f77c3"
}
]
}
@@ -527,7 +641,7 @@
"Message": "提交工时成功"
}
],
- "ID": "5abf293f-a8c6-4f12-bb5d-6e1819ef38b7"
+ "ID": "eb9e9b05-5af5-4929-9a34-fb3d4698f293"
},
{
"CommandList": [
@@ -540,7 +654,7 @@
}
}
],
- "ID": "89048532-fdfa-4235-9972-20d722f6d461"
+ "ID": "9b060da7-032d-4f17-b3c9-6fc88a586731"
}
]
}
diff --git a/Tables/任务/任务成员表.json b/Tables/任务/任务成员表.json
new file mode 100644
index 00000000..2cb920f1
--- /dev/null
+++ b/Tables/任务/任务成员表.json
@@ -0,0 +1,97 @@
+{
+ "Name": "任务成员表",
+ "Columns": [
+ {
+ "$type": "Forguncy.Model.Tables.BindingColumn, 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.Model.Tables.BindingColumn, ServerDesignerCommon",
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "Name": "任务ID",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.UserBindingColumn, ServerDesignerCommon",
+ "DatabaseColumnType": "nvarchar",
+ "MaxLength": -1,
+ "Name": "参与人",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "Name": "岗位ID",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
+ "DatabaseColumnType": "float",
+ "MaxLength": -1,
+ "Name": "任务时薪",
+ "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.UserExtraBingingColumn, ServerDesignerCommon",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_Creator"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.DateExtraBingingColumn, ServerDesignerCommon",
+ "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_CreateDate"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.UserExtraBingingColumn, ServerDesignerCommon",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_LastModifier"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.DateExtraBingingColumn, ServerDesignerCommon",
+ "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_LastModifyDate"
+ }
+ ],
+ "ExternalDatabaseInfo": {
+ "AllowModifySchema": true,
+ "ConnectionId": "业务表",
+ "SourceTableName": "任务成员表",
+ "SourceTableSchema": "dbo"
+ },
+ "PrimaryKey": [
+ "ID"
+ ],
+ "Indexes": [],
+ "Relations": [
+ {
+ "PrimarySchema": null,
+ "PrimaryTable": "任务表",
+ "PrimaryColumn": "ID",
+ "ForeignSchema": null,
+ "ForeignTable": "任务成员表",
+ "ForeignColumn": "任务ID",
+ "RelationTypeOnDelete": 0,
+ "RelationTypeOnUpdate": 0,
+ "IsDetailTableRelation": true
+ },
+ {
+ "PrimarySchema": null,
+ "PrimaryTable": "项目岗位",
+ "PrimaryColumn": "ID",
+ "ForeignSchema": null,
+ "ForeignTable": "任务成员表",
+ "ForeignColumn": "岗位ID",
+ "RelationTypeOnDelete": 0,
+ "RelationTypeOnUpdate": 0,
+ "IsDetailTableRelation": true
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Tables/任务/任务表.json b/Tables/任务/任务表.json
index 4688eb10..ee769591 100644
--- a/Tables/任务/任务表.json
+++ b/Tables/任务/任务表.json
@@ -109,6 +109,13 @@
"Name": "关联资源",
"ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
+ {
+ "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
+ "DatabaseColumnType": "float",
+ "MaxLength": -1,
+ "Name": "任务预算工时",
+ "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
{
"$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
"DatabaseColumnType": "bigint",
@@ -153,6 +160,15 @@
"DetailTableSchema": "dbo",
"Name": "总实际工时",
"ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.StatisticColumn, ServerDesignerCommon",
+ "AggregateFunction": 1,
+ "DataColumnName": "ID",
+ "DetailTableName": "任务成员表",
+ "DetailTableSchema": "dbo",
+ "Name": "参与人数",
+ "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
}
],
"ExternalDatabaseInfo": {
diff --git a/Tables/工时/人员工时统计视图.json b/Tables/工时/人员工时统计视图.json
new file mode 100644
index 00000000..820a9741
--- /dev/null
+++ b/Tables/工时/人员工时统计视图.json
@@ -0,0 +1,48 @@
+{
+ "Name": "人员工时统计视图",
+ "Columns": [
+ {
+ "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
+ "DatabaseColumnType": "nvarchar",
+ "MaxLength": -1,
+ "Name": "执行人",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
+ "DatabaseColumnType": "date",
+ "MaxLength": -1,
+ "Name": "日期",
+ "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
+ "DatabaseColumnType": "float",
+ "MaxLength": -1,
+ "Name": "计划工时",
+ "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
+ "DatabaseColumnType": "float",
+ "MaxLength": -1,
+ "Name": "实际工时",
+ "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ }
+ ],
+ "ExternalDatabaseInfo": {
+ "ConnectionId": "业务表",
+ "SourceTableName": "人员工时统计视图",
+ "SourceTableSchema": "dbo",
+ "CreateViewSql": "SELECT \r\n [执行人],\r\n cast([工时日期] as date) as 日期,\r\n SUM(CASE WHEN [工时类型] = '计划' THEN [工时] ELSE 0 END) AS [计划工时],\r\n SUM(CASE WHEN [工时类型] = '实际' THEN [工时] ELSE 0 END) AS [实际工时]\r\nFROM \r\n [dbo].[任务工时表]\r\nGROUP BY \r\n [执行人],\r\n [工时日期];",
+ "ViewInfo": {
+ "ViewName": "人员工时统计视图",
+ "IsUpdatable": true,
+ "QueryColumns": [
+ "执行人"
+ ]
+ }
+ },
+ "Indexes": [],
+ "Relations": []
+}
\ No newline at end of file
diff --git a/Tables/用户/用户信息视图.json b/Tables/用户/用户信息视图.json
index b08ca343..49c503da 100644
--- a/Tables/用户/用户信息视图.json
+++ b/Tables/用户/用户信息视图.json
@@ -57,6 +57,13 @@
"Name": "负荷",
"ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
+ {
+ "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
+ "DatabaseColumnType": "System.String",
+ "MaxLength": -1,
+ "Name": "默认时薪",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
{
"$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
"DatabaseColumnType": "System.String",
@@ -82,7 +89,7 @@
"BuiltInViewInfo": {
"ViewName": "用户信息视图",
"SourceTableName": "FGC_UserInfoTable",
- "CreateViewSql": "SELECT [FGC_UserName] AS [用户名], [FGC_FullName] AS [全名], [FGC_Email] AS [邮件], [FGC_IsEnabled] AS [有效], [FGC_Role] AS [角色], [FGC_OrganizationSuperior] AS [组织上级], [头像] AS [头像], [负荷] AS [负荷], [公司] AS [公司], [部门] AS [部门], [小组] AS [小组] FROM [FGC_UserInfoTable]",
+ "CreateViewSql": "SELECT [FGC_UserName] AS [用户名], [FGC_FullName] AS [全名], [FGC_Email] AS [邮件], [FGC_IsEnabled] AS [有效], [FGC_Role] AS [角色], [FGC_OrganizationSuperior] AS [组织上级], [头像] AS [头像], [负荷] AS [负荷], [默认时薪] AS [默认时薪], [公司] AS [公司], [部门] AS [部门], [小组] AS [小组] FROM [FGC_UserInfoTable]",
"ViewType": 1
},
"PrimaryKey": [
diff --git a/Tables/项目任务/项目分组.json b/Tables/项目任务/项目分组.json
new file mode 100644
index 00000000..174e8bd4
--- /dev/null
+++ b/Tables/项目任务/项目分组.json
@@ -0,0 +1,46 @@
+{
+ "Name": "项目分组",
+ "Columns": [
+ {
+ "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
+ "Required": true,
+ "Unique": true,
+ "AutoIncrement": true,
+ "DatabaseColumnType": "System.Int64",
+ "MaxLength": -1,
+ "Name": "ID",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
+ "DatabaseColumnType": "System.String",
+ "Name": "项目分组",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.UserExtraBingingColumn, ServerDesignerCommon",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_Creator"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.DateExtraBingingColumn, ServerDesignerCommon",
+ "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_CreateDate"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.UserExtraBingingColumn, ServerDesignerCommon",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_LastModifier"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.DateExtraBingingColumn, ServerDesignerCommon",
+ "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_LastModifyDate"
+ }
+ ],
+ "PrimaryKey": [
+ "ID"
+ ],
+ "Indexes": [],
+ "Relations": []
+}
\ No newline at end of file
diff --git a/Tables/项目任务/项目岗位.json b/Tables/项目任务/项目岗位.json
new file mode 100644
index 00000000..fffeab14
--- /dev/null
+++ b/Tables/项目任务/项目岗位.json
@@ -0,0 +1,79 @@
+{
+ "Name": "项目岗位",
+ "Columns": [
+ {
+ "$type": "Forguncy.Model.Tables.BindingColumn, 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.Model.Tables.BindingColumn, ServerDesignerCommon",
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "Name": "项目ID",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
+ "DatabaseColumnType": "nvarchar",
+ "MaxLength": -1,
+ "Name": "岗位名称",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
+ "DatabaseColumnType": "float",
+ "MaxLength": -1,
+ "Name": "默认时薪",
+ "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.UserExtraBingingColumn, ServerDesignerCommon",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_Creator"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.DateExtraBingingColumn, ServerDesignerCommon",
+ "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_CreateDate"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.UserExtraBingingColumn, ServerDesignerCommon",
+ "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_LastModifier"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.DateExtraBingingColumn, ServerDesignerCommon",
+ "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+ "Name": "FGC_LastModifyDate"
+ }
+ ],
+ "ExternalDatabaseInfo": {
+ "AllowModifySchema": true,
+ "ConnectionId": "业务表",
+ "SourceTableName": "项目岗位",
+ "SourceTableSchema": "dbo"
+ },
+ "PrimaryKey": [
+ "ID"
+ ],
+ "Indexes": [],
+ "Relations": [
+ {
+ "PrimarySchema": null,
+ "PrimaryTable": "项目表",
+ "PrimaryColumn": "ID",
+ "ForeignSchema": null,
+ "ForeignTable": "项目岗位",
+ "ForeignColumn": "项目ID",
+ "RelationTypeOnDelete": 0,
+ "RelationTypeOnUpdate": 0,
+ "IsDetailTableRelation": true
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Tables/项目任务/项目表.json b/Tables/项目任务/项目表.json
index 208ecef6..d34532f2 100644
--- a/Tables/项目任务/项目表.json
+++ b/Tables/项目任务/项目表.json
@@ -61,6 +61,13 @@
"Name": "默认工时核定方式",
"ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
+ {
+ "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
+ "DatabaseColumnType": "float",
+ "MaxLength": -1,
+ "Name": "项目预算工时",
+ "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
{
"$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
"DefaultValue": 0,
@@ -69,6 +76,14 @@
"Name": "公开",
"ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
+ {
+ "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
+ "DefaultValue": 0,
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "Name": "严格模式",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
{
"$type": "Forguncy.Model.Tables.UserExtraBingingColumn, ServerDesignerCommon",
"ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
@@ -111,6 +126,17 @@
"RelationTypeOnDelete": 0,
"RelationTypeOnUpdate": 0,
"IsDetailTableRelation": true
+ },
+ {
+ "PrimarySchema": null,
+ "PrimaryTable": "项目分组",
+ "PrimaryColumn": "ID",
+ "ForeignSchema": null,
+ "ForeignTable": "项目表",
+ "ForeignColumn": "项目分组",
+ "RelationTypeOnDelete": 0,
+ "RelationTypeOnUpdate": 0,
+ "IsDetailTableRelation": true
}
]
}
\ No newline at end of file
diff --git a/Theme/CellTypeStyles b/Theme/CellTypeStyles
index 716c9b73..f9d35ed6 100644
--- a/Theme/CellTypeStyles
+++ b/Theme/CellTypeStyles
@@ -1 +1 @@
-{"Forguncy.CustomMenu.ForguncyMenuCellTypeStyleTemplateSupportAttribute":[{"Key":"BalckWhite","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 50"},"SelectedStyle":{"FontColor":"Accent 1 0","BorderLeftString":"3px solid Accent_1_0","Bold":true},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}}],"Forguncy.RepeaterCellTypeStyleTemplateSupportAttribute":[{"Key":"普通_悬浮变白_","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 1 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"竖排无样式","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 2 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"BlackWhite","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderString":"2px solid Background_2_0","BorderRadiusString":"8px 8px 8px 8px","BoxShadowString":"3px 3px 5px 0px #20000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"HoverStyle":{"BoxShadowString":"5px 7px 15px 0px #17000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"FocusStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"ActiveStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"SelectedStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"Transition":"0.3s"}}}],"Forguncy.ImageCellTypeStyleTemplateSupportAttribute":[{"Key":"按钮图标","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Background 1 -50","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"上圆角封面","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"8px 8px 0px 0px"}}}},{"Key":"pd_10","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":10,"PaddingBottom":10}}}},{"Key":"中圆角","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"10px 10px 10px 10px"}}}}],"Forguncy.ButtonCellTypeStyleTemplateSupportAttribute":[{"Key":"链接样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 0"},"Transition":"0.3s"}}},{"Key":"圆角浮动","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1 -50","Background":"Background 1 0","BorderString":"1px solid Background_2_0","BorderRadiusString":"20px 20px 20px 20px","BoxShadowString":"5px 5px 16px 0px #10000000"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"Gost","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"8px 8px 8px 8px"},"HoverStyle":{"Background":"Background 2 0"},"DisableStyle":{"Opacity":0.44507973654584293},"Transition":"0.3s"}}}],"Forguncy.HyperlinkCellTypeStyleTemplateSupportAttribute":[{"Key":"Gost","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"Background":"#00FFFFFF","BorderRadiusString":"5px 5px 5px 5px","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"HoverStyle":{"Background":"Background 2 0"},"Transition":"0.3s"}}}],"Forguncy.TextCellTypeStyleTemplateSupportAttribute":[{"Key":"Gost","Category":"_RS_Custom","Styles":{"MAIN":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Background 2 0"},"FocusStyle":{"FontColor":"Text 1 0","Background":"Background 2 0"},"Transition":"0.3s"},"FGC_BUILDIN_ERROR":{"NormalStyle":{"BorderString":"1px solid #FFFF0000","BorderRadiusString":"5px 5px 5px 5px"}}}}]}
\ No newline at end of file
+{"Forguncy.CustomMenu.ForguncyMenuCellTypeStyleTemplateSupportAttribute":[{"Key":"BalckWhite","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 50"},"SelectedStyle":{"FontColor":"Accent 1 0","BorderLeftString":"3px solid Accent_1_0","Bold":true},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}}],"Forguncy.RepeaterCellTypeStyleTemplateSupportAttribute":[{"Key":"普通_悬浮变白_","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 1 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"竖排无样式","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 2 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"BlackWhite","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderString":"2px solid Background_2_0","BorderRadiusString":"8px 8px 8px 8px","BoxShadowString":"3px 3px 5px 0px #20000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"HoverStyle":{"BoxShadowString":"5px 7px 15px 0px #17000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"FocusStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"ActiveStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"SelectedStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"Transition":"0.3s"}}}],"Forguncy.ImageCellTypeStyleTemplateSupportAttribute":[{"Key":"按钮图标","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Background 1 -50","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"上圆角封面","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"8px 8px 0px 0px"}}}},{"Key":"pd_10","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":10,"PaddingBottom":10}}}},{"Key":"中圆角","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"10px 10px 10px 10px"}}}}],"Forguncy.ButtonCellTypeStyleTemplateSupportAttribute":[{"Key":"动态背景","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"6px 6px 6px 6px"},"DisableStyle":{"Opacity":0.445079736545843}}}},{"Key":"链接样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 0"},"Transition":"0.3s"}}},{"Key":"圆角浮动","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1 -50","Background":"Background 1 0","BorderString":"1px solid Background_2_0","BorderRadiusString":"20px 20px 20px 20px","BoxShadowString":"5px 5px 16px 0px #10000000"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"Gost","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"8px 8px 8px 8px"},"HoverStyle":{"Background":"Background 2 0"},"DisableStyle":{"Opacity":0.44507973654584293},"Transition":"0.3s"}}}],"Forguncy.HyperlinkCellTypeStyleTemplateSupportAttribute":[{"Key":"Gost","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"Background":"#00FFFFFF","BorderRadiusString":"5px 5px 5px 5px","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"HoverStyle":{"Background":"Background 2 0"},"Transition":"0.3s"}}}],"Forguncy.TextCellTypeStyleTemplateSupportAttribute":[{"Key":"Gost","Category":"_RS_Custom","Styles":{"MAIN":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Background 2 0"},"FocusStyle":{"FontColor":"Text 1 0","Background":"Background 2 0"},"Transition":"0.3s"},"FGC_BUILDIN_ERROR":{"NormalStyle":{"BorderString":"1px solid #FFFF0000","BorderRadiusString":"5px 5px 5px 5px"}}}}]}
\ No newline at end of file
diff --git a/Theme/ListViewStyles b/Theme/ListViewStyles
index 0637a088..f8dde4ff 100644
--- a/Theme/ListViewStyles
+++ b/Theme/ListViewStyles
@@ -1 +1 @@
-[]
\ No newline at end of file
+[{"Name":"_RS_NewFashionListStyle2","Group":"_RS_RecommendStyle","ColumnHeaderBack":"Background 2 0","ColumnHeaderFore":"Text 1 50","EvenRowBack":"Background 1 0 0","EvenRowFore":"Text 1 15","OddRowBack":"Background 1 0 0","OddRowFore":"Text 1 15","SelectBack":"Background 2 0 51","ColumnHeaderHighlightBack":"Background 2 0","ColumnHeaderHighlightFore":"Text 1","ColumnHeaderHoverBack":"Background 2 0","ColumnHeaderSelectBack":"Background 2 0","ColumnHeaderSelectFore":"Text 1 15","TotalRowBack":"Background 1 0 0","TotalRowFore":"Text 1 15","SelectBorder":"Accent 2 0","DirtyCellColor":"Accent 2 40","GridLineColor":"Background 2 -10","ColumnHeaderGridLineColor":"Background 2 -10","RowHeaderGridLineColor":"Background 2 -10","ColumnFilterButtonStyle":1,"ColumnFilterIconColor":"Text 1 50","OutLineColor":"Background 2 -10","RowSelectBack":"Background 2 0 204","RowHoverBack":"Background 2 0 51"}]
\ No newline at end of file
diff --git a/Theme/ThemeConfig b/Theme/ThemeConfig
index 4d302447..007f8bbc 100644
--- a/Theme/ThemeConfig
+++ b/Theme/ThemeConfig
@@ -1 +1 @@
-{"BasePathName":"13Blue","FontFamily":"微软雅黑","ThemeColors":{"Name":"自定义1","Colors":{"Name":"","ColorList":["#FFFFFFFF","#FFF3F3F3","#FF000000","#FF042531","#FF1890FF","#FF8BB73D","#FFEBC54B","#FFEA772A","#FFD03736","#FF904DA0","#00FFFFFF","#00FFFFFF"],"BackgroundColor1":"#FFFFFFFF","BackgroundColor2":"#FFF3F3F3","TextColor1":"#FF000000","TextColor2":"#FF042531","Accent1":"#FF1890FF","Accent2":"#FF8BB73D","Accent3":"#FFEBC54B","Accent4":"#FFEA772A","Accent5":"#FFD03736","Accent6":"#FF904DA0","Hyperlink":"#00FFFFFF","FollowedHyperlink":"#00FFFFFF"},"Category":"自定义"}}
\ No newline at end of file
+{"BasePathName":"13Blue","FontFamily":"微软雅黑","ThemeColors":{"Name":"pms","Colors":{"Name":"","ColorList":["#FFFFFFFF","#FFF3F3F3","#FF000000","#FF042531","#FF1890FF","#FF8BC34A","#FFEBC54B","#FFEA772A","#FFD03736","#FF904DA0","#00FFFFFF","#00FFFFFF"],"BackgroundColor1":"#FFFFFFFF","BackgroundColor2":"#FFF3F3F3","TextColor1":"#FF000000","TextColor2":"#FF042531","Accent1":"#FF1890FF","Accent2":"#FF8BC34A","Accent3":"#FFEBC54B","Accent4":"#FFEA772A","Accent5":"#FFD03736","Accent6":"#FF904DA0","Hyperlink":"#00FFFFFF","FollowedHyperlink":"#00FFFFFF"},"Category":"自定义"}}
\ No newline at end of file
diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3
index 602dd3ed..e7245360 100644
Binary files a/UserServiceDB.sqlite3 and b/UserServiceDB.sqlite3 differ