diff --git a/.collaboration b/.collaboration index bcd088d8..0e9e3ef7 100644 --- a/.collaboration +++ b/.collaboration @@ -13,16 +13,7 @@ }, { "ModuleName": "Table/任务表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:49:34.7358564+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\任务\\任务表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/任务进展", @@ -30,16 +21,7 @@ }, { "ModuleName": "TableView/子任务视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:46:47.0267057+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\任务\\子任务视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Tables/字典表", @@ -119,137 +101,47 @@ }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:46:47.0267245+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-05T18:46:47.0267265+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-05T18:46:47.02673+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-05T18:46:47.026732+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-05T18:46:47.0267332+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-05T18:46:47.0267345+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-05T18:46:47.0267357+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-05T18:46:47.0267377+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-05T18:46:47.0267393+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -266,17 +158,7 @@ }, { "ModuleName": "Table/项目分组", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:46:47.0267412+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目分组.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -293,16 +175,7 @@ }, { "ModuleName": "Table/项目表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:49:17.8126245+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目预算变动表", @@ -318,17 +191,7 @@ }, { "ModuleName": "PCPage/修改报工", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:25:46.492627+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时\\修改报工.json", - "Pages\\任务\\工时\\修改报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增报工", @@ -340,19 +203,7 @@ }, { "ModuleName": "PCPage/任务-侧栏", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:52:27.4718308+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-侧栏.json", - "Pages\\任务\\任务-侧栏.rd", - "Pages\\9d9faa04d5a74f1dbf8dd3b2040b6f6.json", - "Pages\\9d9faa04d5a74f1dbf8dd3b2040b6f6.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-关联资源", @@ -360,17 +211,7 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:26:32.597264+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-基本信息.json", - "Pages\\任务\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-子任务列表", @@ -378,19 +219,7 @@ }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:30:15.995138+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-工时.json", - "Pages\\任务\\任务-工时.rd", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-进展", @@ -402,17 +231,7 @@ }, { "ModuleName": "PCPage/参与成员管理", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:54:33.7610249+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\参与成员管理.json", - "Pages\\任务\\参与成员管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/工时详情-列头", @@ -440,63 +259,15 @@ }, { "ModuleName": "PCPage/切换任务状态", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:27:15.5217427+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\共用\\切换任务状态.json", - "Pages\\共用\\切换任务状态.rd", - "Pages\\421cd7df876b4e64a3160223673e2ea.json", - "Pages\\421cd7df876b4e64a3160223673e2ea.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/切换项目", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:23:18.0575369+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\共用\\切换项目.json", - "Pages\\共用\\切换项目.rd", - "Pages\\4d6923ff8d3742f5aeb5e04927a28f5.json", - "Pages\\4d6923ff8d3742f5aeb5e04927a28f5.rd" - ] - }, - { - "ModuleName": "PCPage/右键菜单1", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:30:15.9947793+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\共用\\右键菜单1.json", - "Pages\\共用\\右键菜单1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目菜单", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:19:07.4391195+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\共用\\项目菜单.json", - "Pages\\共用\\项目菜单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/内建手机页面", @@ -572,17 +343,7 @@ }, { "ModuleName": "PCPage/FGC_修改用户信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:50:48.2450673+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\内建页面\\FGC_修改用户信息.json", - "Pages\\内建页面\\FGC_修改用户信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_忘记密码", @@ -762,19 +523,7 @@ }, { "ModuleName": "PCPage/项目列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:30:15.9950234+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目列表.json", - "Pages\\项目首页\\项目列表.rd", - "Pages\\b90932e038f94707b54e571ff7cd84d.json", - "Pages\\b90932e038f94707b54e571ff7cd84d.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目审批", @@ -782,17 +531,7 @@ }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:16:19.8024286+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目标题.json", - "Pages\\项目首页\\项目标题.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目首页", @@ -816,19 +555,7 @@ }, { "ModuleName": "UserControlPage/工时记录列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:30:15.9950672+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\工时记录列表.json", - "UserControlPages\\工时记录列表.rd", - "Pages\\36d33d0079644f28b16bd0fec90394c.json", - "Pages\\36d33d0079644f28b16bd0fec90394c.rd" - ] + "ModuleType": 31 }, { "ModuleName": "ServerCommands/任务", @@ -884,16 +611,7 @@ }, { "ModuleName": "ShareCommandContainer/发起预算申请", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:21:24.8338789+08:00", - "ModuleType": 36, - "ToRemoveFiles": [ - "ShareCommandContainers\\发起预算申请.json" - ] + "ModuleType": 36 }, { "ModuleName": "ShareCommandContainer/跳转当前项目", @@ -905,17 +623,7 @@ }, { "ModuleName": "ProcessItem/预算申请", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:21:00.7658671+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\预算申请.json", - "Process\\预算申请.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "ApplicationSetting", @@ -923,20 +631,7 @@ }, { "ModuleName": "Theme", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:39:26.9044218+08:00", - "ModuleType": 9, - "ToRemoveFiles": [ - "Theme\\CellTypeStyles", - "Theme\\ListViewStyles", - "Theme\\StyleDefaultNames", - "Theme\\ThemeConfig", - "Reports\\DefaultTheme.rdlx-theme" - ] + "ModuleType": 9 }, { "ModuleName": "image/内置图片", @@ -1104,18 +799,7 @@ }, { "ModuleName": "UserService", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:51:15.7615345+08:00", - "ModuleType": 11, - "ToRemoveFiles": [ - "UserServiceDB.sqlite3", - "CloudStorageProvider\\data.json", - "SecurityProviderV2\\data.json" - ] + "ModuleType": 11 }, { "ModuleName": "CustomLibrary", @@ -1131,14 +815,7 @@ }, { "ModuleName": "Upload", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:46:47.0267908+08:00", - "ModuleType": 26, - "ToRemoveFiles": [] + "ModuleType": 26 }, { "ModuleName": "PublishConfiguration", @@ -1154,22 +831,10 @@ }, { "ModuleName": "PCPage/编辑删除菜单", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:30:15.994793+08:00", "ModuleType": 1 }, { "ModuleName": "PCPage/编辑删除页面", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:39:26.9045462+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index 1ce5d540..6202008c 100644 Binary files a/ForguncyDB.sqlite3 and b/ForguncyDB.sqlite3 differ diff --git a/Pages/36d33d0079644f28b16bd0fec90394c.json b/Pages/36d33d0079644f28b16bd0fec90394c.json index 1e492451..e14bdbd9 100644 --- a/Pages/36d33d0079644f28b16bd0fec90394c.json +++ b/Pages/36d33d0079644f28b16bd0fec90394c.json @@ -21,18 +21,9 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 21.0, - "IsHidden": true - } } }, - "InLogicalVisibleIndexes": [ - 4 - ], - "Count": 5, + "Count": 4, "DefaultSize": 10.0 }, "Cols": { @@ -86,18 +77,88 @@ "Placement": { "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!C2" }, - "PageName": "右键菜单1", - "PassValues": [ - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!B5" - }, - "TargetCell": { - "SerializeProperty": "=右键菜单1!点击按钮" + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=是否为确定" + } + ] + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!选择项" + } + ] + }, + "value": "编辑" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 2, + "PageName": "修改报工", + "LoadBindingDataOption": 1 + } + ], + "ID": "97d51a4a-aaf3-49da-93d3-1781751e35cf" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!选择项" + } + ] + }, + "value": "删除" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务工时表", + "UpdateType": "delete", + "ShowConfirm": true, + "ConfirmText": "您确定要删除吗？" + } + ], + "ID": "798ad8bb-d619-4c44-becb-ac9e0cbee475" + } + ] + } + ], + "ID": "0ca4f386-ca16-475d-98fa-431d0502837c" + } + ] } + ], + "ParamProperties": { + "IsOK": "是否为确定" } - ] + }, + "PageName": "编辑删除页面" } ], "ToolTip": "操作", @@ -109,144 +170,6 @@ }, "2,1": { "TemplateCellSource": "执行内容" - }, - "4,1": { - "CellComment": { - "Comments": "弹出菜单点击后传值" - }, - "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": "='36d33d0079644f28b16bd0fec90394c'!B5" - } - ] - }, - "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.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!B5" - } - ] - }, - "value": "编辑" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!B5" - }, - "Value": "%Null%" - } - ] - }, - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PopupDisplayMode": 2, - "PageName": "修改报工", - "LoadBindingDataOption": 1 - } - ], - "ID": "78de8493-fffd-4e9b-9e8a-362fcfc2c29a" - }, - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!B5" - } - ] - }, - "value": "删除" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务工时表", - "UpdateType": "delete", - "ShowConfirm": true, - "ConfirmText": "您确定要删除吗？" - }, - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='36d33d0079644f28b16bd0fec90394c'!B5" - }, - "Value": "%Null%" - } - ] - } - ], - "ID": "62203ce8-22ca-40f3-aec9-391dcfa1de22" - } - ] - } - ], - "ID": "a585fc0f-948f-43ab-9a9d-9d8ab182e864" - } - ] - } - ], - "ID": "be6730bc-8793-465e-929f-87ffba039b3a" - } - ] - } - ] - } - }, - "4,2": { - "TemplateCellSource": "ID" } }, "StyleDatas": { @@ -264,10 +187,6 @@ "HorizontalAlignment": 2, "VerticalAlignment": 3, "WordWrap": true - }, - { - "Background": 4, - "Formatter": 5 } ], "Types": { @@ -276,8 +195,6 @@ "Background 1 -50", "Left", "Top", - "#FFFFFF00", - "@", "Body" ] }, @@ -285,11 +202,10 @@ "1,1": 0, "1,2": 1, "2,1": 2, - "2,2": 2, - "4,1": 3 + "2,2": 2 }, "SheetStyle": { - "FontFamily": 6 + "FontFamily": 4 } }, "PageInfo": { @@ -300,4 +216,4 @@ "PaperSize": {}, "Margin": {} } -}//xmunurzsk/dfkejkhZ+aCc2B5gaqnBdwtuwqXrNEUCtFXYQzW5KCWTOnujWSWVpL4hngnlGrFwaZ/o0YzxM1wb8HjtaeUHrCVtZaU7eWR8mzTChVYkxfesZSZiHYUhVnlq5TDmx11HDn6G34yNpYBZ9NXcv5ZrsWTyPz3cxx+z0uWgRVI9JIBJHIbjS5mC/2Kbi13r4NEm0132ApVyMpCyvYY5AD/Bw1QY36JAVFJo0m5/fFB99YBq8yANg5Is/fhLHALOoQgUmU58jD+M5EFLxv1O4l+f0lmw3NXMZ40ni/bxMdX52aGv02k7u5EdkU0xuAX7K9ti7dZofuofWjgSSGqigI0+pdLEcmnBDa4eDjk43VLfunZqHoEgWBsVQQOfeegsGuirBK4+4VbX1WNbV0GkTEEWLRT4ij5EfbwTutMYuDxs+CBO/DvT8OJ8JHT3Y1fYqgOrkOHGVYEim/tNHh8J6J+dkk91HN6ZjnOt4akm0czedyXdvkH5mOgjzpeP1ObCbcANCtLMsJn86tPLR4pews17AOEbowNxX0Du9BECCKKsNbVPZUJ2C+Gp8PFdUZlDJWXTDLTLKHjuiFuFotb4xEq7QWpMA6wv4/SqWquMn5V5Ojnl7W0rtLcfFEhPYvQ91UTAsCBL+bPzJaMM0MxygfiDc25iwMpDm/DbXev80+NG0TYMZQ9RN/dY+cvis9ZACT8K39JUZM+b1UPAX2A1bbseUZUWeEpB8cbiIhlcs7Eg0X6oMU95CVKeqdlPGuhoGGHsWT1EbNpDnfFB3jEAuHmJ6u75WjoeFIfF1SKWkNvHR4hYv/jpeHipo+tFy/pwUBJG7UbD+4DVK2jEpKUCA6Ygf2tuNN6GlAFnxemFvuBiSYsLihc4JebFzYHYBb3Yp4eDDw0pK6t873jg==|920 \ No newline at end of file +}//i1Y8vldMjVAgOKlQk0Il6lhIQxsg23Oi5Yw0E70bvNnpC35QOsmB8xtt2uIOdwu8R6Y7bGB2Sh0bqBnJMM0Rzq2ihTErSy7vSou0r4ftloJTG61bkz4qyITMrx2+tymcNj1B90DuJNcw0FEfbdk+bjH4bArYS0gGuSCNQfd7AgIA4R9vNUjsVeon9ax8uuKQjGqcZsFEXxKRR2SXI4FEPeqOuxMRmvyIY6EibosAgqt/dKHmI98qfGTg9x1UEZrofq3jG7mud5N9aryJPabzM4L2oEVEquZySCER1cD0KBWys+nzXEvB3HV8lThgj3i3auym9HEk/nkqTd2uEIwJZGLhdNIxlfsltl5aqx1/cL8h5uEiPU3q+MyvbidX5Ntb8qbbNMwGX1EKnVUa0eJ5OB2zwv5qB4DXuNnGSBPEwQ+7NoIuTZiJoIc3A1Et/5CKzQu4wuxSiIR8BlG0V/KJfoFyIMp1w/4MhtTNPzL7FjXQURYxuhupik8REihHTT4UjJPdG4jZRbOX7Tr/5yhib8hQW2yeevCaOHJVMjtQSJy2mRLv1rLkb4/K0k3kWhSSz0S2M3SoSxadZTC7RlMD0uR4lADwDLgOGhKYw0aa/uQSAeqWVH8cvTI2CW03n62CWw2Abilr7ai3taEeM+IaqN6lhBIvtWwfp+RZJkwbsQuPhq9SnbxZa9+q0YAB8fJSy4kLxZV3slFxgHAMYPa6/hrlku/zxx0++sfmba3JVGT2dSqVQjjz+nV76SxJsbdfyXMXmC6eJAjbSk91cg4tc57X+g4ey76Qxpn1uEsTWBlAadt/qvqEcuKEVw8Og7klbKvldpQFTawcw1osvCurQ8ZbuunHO/AFHoWvC8cNdBsn8y1bbwILgoLtmBXXTEwjxWsdMT3NGn2w1CAkCLR0og==|920 \ No newline at end of file diff --git a/Pages/36d33d0079644f28b16bd0fec90394c.rd b/Pages/36d33d0079644f28b16bd0fec90394c.rd index f97f728a..8b8e787f 100644 --- a/Pages/36d33d0079644f28b16bd0fec90394c.rd +++ b/Pages/36d33d0079644f28b16bd0fec90394c.rd @@ -1,5 +1,5 @@ { "PageType": 2, "ColumnCount": 4, - "RowCount": 5 + "RowCount": 4 } \ No newline at end of file diff --git a/Pages/4d6923ff8d3742f5aeb5e04927a28f5.json b/Pages/4d6923ff8d3742f5aeb5e04927a28f5.json index 5b75d694..c927b161 100644 --- a/Pages/4d6923ff8d3742f5aeb5e04927a28f5.json +++ b/Pages/4d6923ff8d3742f5aeb5e04927a28f5.json @@ -8,12 +8,12 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 19.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 16.0 } }, "3": { @@ -34,20 +34,15 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 35.0 } }, "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, - "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } }, - "4": { + "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 129.0, "Mode": 2, @@ -59,31 +54,35 @@ } } }, - "5": { + "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } } }, - "Count": 6, + "Count": 5, "DefaultSize": 15.0 }, "Values": { - "1,4": "项目名称", - "2,4": "项目简介" + "1,3": "项目名称", + "2,3": "项目简介" }, "AttachInfos": { "1,1": { "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", - "ImagePath": "app-logo.png" + "$type": "ElementUI.AvatarCellType, ElementUI", + "icon": { + "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", + "Name": "app-logo3.png" + }, + "shape": 1 }, "TemplateCellSource": "项目封面" }, - "1,4": { + "1,3": { "TemplateCellSource": "项目名称" }, - "2,4": { + "2,3": { "TemplateCellSource": "项目简介" } }, @@ -104,15 +103,15 @@ ] }, "CellStyles": { - "1,4": 0, - "2,4": 1 + "1,3": 0, + "2,3": 1 }, "SheetStyle": { "FontFamily": 1 } }, "Spans": [ - "1,1,2,2" + "1,1,2,1" ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", @@ -122,4 +121,4 @@ "PaperSize": {}, "Margin": {} } -}//Xn8CwXXFaX6c8IljFgjqhjK7vyDx4TSjzui3F6FOfoyeU4jrWN76JFNmH8p9qqCyQ8hHNRvmGXCA3PSdpNHMr0ufcT5PvDIBMdIYp/EnF57ln3sgaXIwtSbW4C7OFCYykYzAgp9p+Ma2lbs34u7BDyrdmwD5dcS6pcp5u3fP+QhMQARS7JvYgcI8O4YR/SX84X1yNu/5RZg7Zs+wv7LL/aM7+LvE3K6oTraOfdmTk3SmiNe3zuM2ZDaJctuDpr8xDi4SWj+9taO4XtjjApYGMgZACCUphYlu8+nj6omujk0Rn0n/1U52dO7u/umVFxAzoJ8S1dhHwKGZDlIYuElbiPJWZsb7ORe7pkvYctAcfcmvR8iJBDSPiBEDrZPdyfqjv12RAVdaB5ArSbNPE1Ar/BHuxb0SDadHjqdyHwNIXaOe8pQupY9mctf6lRXBoqs/AJtabEMpOy9eypELAmkNO9gU5iRr2f2pJ0SYKT+6apnkR4G4e1ELrEiwlNVzFpP/lX+FEC0uyV7puLYXqd9DrgLElW77kXoiri4Qk4tibvXAikgiuSDrX/IvShLsb8eI/V7gMzKcApBxDFuMYQUvGTmUmmTZBpoVip7GcNAix8FXoIMOhzpTULjFF4uTNXxnAxKkt7mgN+1hPZ4kI17PJP8VlOLm1HzslFxV0Nz+sdE0uZWiZcTnKZ0kt+LqjjkqZBw9YIJyN2Pc24mNkzrjlQ8rWZn49Vm9qrGtg7WtUV85p+a/A+HzISNgzoB3Nxhjr8DF34NPP3/Nv+KAcTLuQYe0itvRr9P6+cmsfZ23PooQ+Dm0EAE6aG9gtjApaI8gVF8CkuFULSfZ1LXgtERrx92Xfmz9/fbPaEKz3v6D+YVbNguQBapcutwba+juPeUgIX0kdZG3U3XBX5jZfKiG/A==|920 \ No newline at end of file +}//CODty0MTh1ExKwEflJ2r0AsaAJHRrPOoB95t5DHWjjDtE7P0K3NY9hNqgye0jZ8xUk8EgZzFkUFdCgcnROlVl2A8mXLdPlvtlQNM7Y63OPXXuDywW4NrxF6FbxMjIsn0z0OasDZqwhjLegESgHFG5gj0L23cZUuTxOip2+B6w1ZGSezh/2i3vLbEAj0MXf6oz2aTuxZrwQMLl0ufIujjTmzRSqQP73bCGvj1LDc1xwwrJYoZjK2tPejzXlNSdEJSQ38wOYT3t7g1xTU6bvVGIWQb+LxO3MfKvSQlsVWSAnaGXVLISLelgELRupT8udlnnDkx1YNrZOTNuWVgyf4oEvJ4zVWuOMbP5GKpN/F2wPhyCTT7EtqTC+NPwwSpYd5OHIajFsHtlXp0EV5+WS8cpO9Knh1hq9wiGGAJVyyBWpVZfhn5Jd7htsDlOakYoB3QhbsmfzzNPuoEtGlhOo8rtXSg00Nvq9mJGaCvFNwV56ey9ONSBsGjERdybFL/Xi9m5RPTaU81/mHtkgLjry6USgfNb3lcpR/EBC/dHnBQxV+FG4mile0LNNJ//vVWGFSYdRAM9H6BM81Ee+utG+0iWKbnDaHoIT72P7fwICYNpFSJ9xYaKDTRjV59nT2lCX6wxCuyfqvAht7XCtk138gGqyls0lMqoRcNyeJBc26IgAOBIF02szqXdsS6vFwpTXC3TUZDTk4dHKtE5TtMlAbidWaeH5cyiZv3lucxdkjryHdK3oBosTpYKU9pDFOkqQj7UEzf38lRjvQ3kIXoIZqZ+89qk5XUfFQFg0TRfCH2+1wmtW+Q2O+2fFtxuIAYqTsJNsbF0yhlLpFeumgTm8oMJHORzi7PL3YQ4r5ZkbXiKhfMj05XYpGvdAPWWlMF5ODhCMoBrgvDElwl/Z7g00MUJg==|920 \ No newline at end of file diff --git a/Pages/4d6923ff8d3742f5aeb5e04927a28f5.rd b/Pages/4d6923ff8d3742f5aeb5e04927a28f5.rd index ad4c0293..a746586f 100644 --- a/Pages/4d6923ff8d3742f5aeb5e04927a28f5.rd +++ b/Pages/4d6923ff8d3742f5aeb5e04927a28f5.rd @@ -1,5 +1,5 @@ { "PageType": 2, - "ColumnCount": 6, + "ColumnCount": 5, "RowCount": 4 } \ No newline at end of file diff --git a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json index 3adb380d..a2f139cb 100644 --- a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json +++ b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json @@ -24,7 +24,8 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 33.0 + "DesignLengthInPixel": 33.0, + "IsHidden": true } } }, @@ -102,18 +103,76 @@ "Placement": { "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!E2" }, - "PageName": "右键菜单1", - "PassValues": [ - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!E5" - }, - "TargetCell": { - "SerializeProperty": "=右键菜单1!点击按钮" + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=是否为确定" + } + ] + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='94f8bae36aee4ae7aec2a063ca731b1'!选择项" + } + ] + }, + "value": "编辑" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "修改报工", + "LoadBindingDataOption": 1 + } + ], + "ID": "42473bf6-ea3d-404b-a025-1c341cefda83" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务工时表", + "UpdateType": "delete", + "ShowConfirm": true, + "ConfirmText": "您确定要删除吗？" + } + ], + "ID": "320039fe-a586-4979-bccf-43da3e66fdd3" + } + ] + } + ], + "ID": "88aaf3e0-cac6-42a6-8548-f74aac6077d6" + } + ] } + ], + "ParamProperties": { + "IsOK": "是否为确定", + "选择项": "选择项" } - ], + }, + "PageName": "编辑删除页面", "LoadBindingDataOption": 2 } ], @@ -126,17 +185,6 @@ }, "2,3": { "TemplateCellSource": "执行内容" - }, - "4,4": { - "CellType": { - "$type": "Forguncy.TextCellType, ServerDesignerCommon", - "SavedValidators": [ - { - "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" - } - ], - "TemplateKey": "_RS_NewLittleRoundCorner" - } } }, "StyleDatas": { @@ -154,16 +202,6 @@ "HorizontalAlignment": 2, "VerticalAlignment": 3, "WordWrap": true - }, - { - "Background": 4, - "FontFamily": 5, - "FontSize": 12.0, - "Foreground": 1, - "Formatter": 6, - "HorizontalAlignment": 2, - "VerticalAlignment": 3, - "WordWrap": true } ], "Types": { @@ -172,19 +210,16 @@ "Text 1 50", "Left", "Top", - "#FFFFFF00", - "Body", - "@" + "Body" ] }, "CellStyles": { "1,3": 0, "1,4": 1, - "2,3": 2, - "4,4": 3 + "2,3": 2 }, "SheetStyle": { - "FontFamily": 5 + "FontFamily": 4 } }, "PageInfo": { @@ -195,4 +230,4 @@ "PaperSize": {}, "Margin": {} } -}//bv39SahNT/rRDJNWafjEubDYuxAsxoO1KZcIbEbrhpp1HBPMUBNfqJIepILg8ItqJKSpsVPvj+v4hTYAiCWvbyd4JcttBkEB/dBO1p3cRRKWHDi+5QHKB389raLIZt2eC4U2MXiACm7LFgRKSieO1E/6FAAlWt1Z/NTYKHEhXPT92jVGQSbiV1aeJvcEBuny3YwV9l7wCfhqRXAXdeZHPc/JidlIwxA1BLRpK2afpcT9oFRN038zKllCcEwZKKt9zAWIEuYcwoj1mVb+s/hvzxtpwAdF731LNs8/phOakyjiQaADRDF7wooCHk9rzD5sw7goDBshyC2NGXWjvBiz5G61KvcFIL886IsIvVQbqTN+aKC1C8OlJ3F9P9cI6W8YOZrqRmzkUF8w1MmLIi/pw6OnJHfeAmv+/FkZpRF4wgiR4VzBmHxF/Ycg8vyEBUfHZrMdek2HEpb8u2WR56QOnaDGPsy8w4Qrbo/GkKYEmtHS4UWkV6UDW4AqSR1flswVG+OCNdNrLw+9WdO0v9Qy61wdw3H29epZ3TZFUf+f3GQoB/ojq7e3XlyCzrvmH0ygvoQQe61N58JlZyNgFKggL+4Z6iweKfqiLnJYMsSl9kOcL1VaFVr0+dus6xl0gEBa5ctwdp0Q9J5/P7gy5YkYoLpdWPVX+bamMj6WzM05dAvvHNYlCaL3Q4HBgzdhQNMBfw7J1S69EeMsNnUFcxc7+xqcLiWpsQTizPP0HNmujNQyeDdGViBqVpMJgoSm0feWMujEIgg/0DhQA2NkA2izZI0aZlTaMfl6WvXAtl+VkukC7WPBnuQVF4fowMvxXOnYzPi+oucQ3bAcFcq2cE4nNbMm5icHZEd8ZS8r3FzVUyFnDs9DIbJ7YS9XQGLEj/n66s8YKm4qSfZGBZFn7VBwCg==|920 \ No newline at end of file +}//j4t4xpLQTm4XjZT7S+Pv17FZ7ME8spOWAPJICYzHCJ1FP8WtnDXPGwOlykDd8h57ANdpXBQlqjpi5+612VWJlX1ckKLV9wBV2vWEaolehn4Hxnmi/whjr4VVDk7/GleFSdBtkvP7OlvQBREGfOecHQ8TPZrdVqY7lRzMSYgL8pJxeFA3XgblEtBiE8Hh3i3ZujMXV0LqgGXuY8VXqyBArZO/OHQDnT9/F+rqDXzNR/MEO5bwnthCT4c3rzcIwC0JM3IZLuLomLGsYv9uemUsoC14AwEPnPk+PyvgAi2pD5XgcjXniweArj7CkvX9fgPu4scGVmGObKA5l+RzX3sYwvZ7iJIC0q4OFE9I3aDTUwKzPMS7YSiVmI0MeqIKctHfuyiIhyeIt4fhy1zUgB3IQMEyroNggk3LMBP3FIXc4+V2bZAM9LU7tjl+ur3y863m8kn5eggm/AWm65Qq7o3FQ1nKwbl83UE8u8JBVJxgvsJniSbX62GvwLaDVy2u8FrFfE0/j804zRxWzwfEdZfaHcuw1suGg88YDmJNfRQKjc6guHFRt5DU/ZeotSILMy6Vu87kiCTPDv+I6TlGoXaj8hWXOhJ11u+oezilwaqotquTbFg9KTsr9NGcCa99WcRs2KaiTyWx9WGNplfRNS1wBE+CPllr/pN5zI1iI4FFhTFj3pytzcTsJRk2gW7aM1Nsr+kVxhHulyzx7hibcGDKnV6Xpff/FISNCuG3Cru0WM0md4ee8Eo8rUX3dKlxLnTJjod1+fIxWPJymbP7C0GH6C9ZzsTqLghVZdpNPffftJpHWm+ZtaSXYL6JTSggufE70IYSwMX9lcVPtfb4sS6PYqJCQ+lz0wvF7sddZwJ4J4QiMkBLHsiWjkudVqeeTMMWqkC3aOgDf1osu840jtyiBQ==|920 \ No newline at end of file diff --git a/Pages/9d9faa04d5a74f1dbf8dd3b2040b6f6.json b/Pages/9d9faa04d5a74f1dbf8dd3b2040b6f6.json index 21ccc867..2e26c193 100644 --- a/Pages/9d9faa04d5a74f1dbf8dd3b2040b6f6.json +++ b/Pages/9d9faa04d5a74f1dbf8dd3b2040b6f6.json @@ -34,7 +34,7 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 41.0, + "DesignLengthInPixel": 52.0, "Mode": 1 } }, @@ -55,12 +55,9 @@ "CellType": { "$type": "ElementUI.AvatarCellType, ElementUI", "CommandList": [], - "icon": { - "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", - "Name": "app-logo2.png" - } + "showSystemAvatar": true }, - "TemplateCellSource": "头像" + "TemplateCellSource": "用户名" }, "1,2": { "TemplateCellSource": "姓名" @@ -69,21 +66,26 @@ "StyleDatas": { "Styles": [ { + "FontFamily": 0, "FontSize": 12.0, - "Foreground": 0 + "Foreground": 1 + }, + { + "FontSize": 13.333333333333332 } ], "Types": { "Strs": [ - "Text 1 50", - "Body" + "Body", + "Text 1 50" ] }, "CellStyles": { - "1,2": 0 + "1,0": 0, + "1,2": 1 }, "SheetStyle": { - "FontFamily": 1 + "FontFamily": 0 } }, "PageInfo": { @@ -94,4 +96,4 @@ "PaperSize": {}, "Margin": {} } -}//9QKxPWMum28YHfR33MHLKi6yb6jdsmfs4E76CfDKlUynXyszhM19JeXni6eS139V5JizpAzKM2ddfHoenq8WQGxNWVe3w8LdbkrlwkPdntdR9Swb7Z0nwcCytSE1Zr6kAlAxeNZthj7UXs8PSQ3Q6K+R/lD6Td3lVoxDv22l19GOqOGfpeyKDUhGHwMKfK522hk91qO2JqBjE3fVCUEvPyLOgTnUT/Qoo9+gX/oZ4+zPXCCjw+tFZyUJ7qnyFOgul0bDgR4kumhItL82SzYrdrgjSok/vl7PlYPR7Ovbr4UNbVzWe60pDZaKBrrhvVr/rwulDoXQijyZTZ9t+zId/DtLmWemePjYJ8Sqx5sxh95YJL33iMv6+GTCwKx7WR/nX59u5L1n3G28rp8y4goK4LcYrBTyD2n9MKK8yo7PgzXvVA9ZrUGoT4Xkjx3WopCtanWZfJweUeJERCfA00BPdFyF82lxY1koWR3hJ4xlYMpqVv5zInkODDjk+cuppgV5TFyII0ao+ecQNPe6Iqz8hoeR6L/WXMbZ0uQDLieCoadY4U1xjnRPMt1CRIgJjjwHNnFuuj2YX1er2Y46QXB0vwSOAPi+TfE2wwOySPtTHguaeZvMgdhJ9R935j4Ae1Nbe9EvNl/ztBMkI+rEjEuf/C0DoGp9LZW6e43WXXc7Apl8ZjDyQpNC7VmidBObZTNXaRsUqUiXSaix+eSb8Mr9kGTzrdtYSyC7pbfEmVG/zTbnoIqDGlVNVY5g2LJhDBTjMYEDswMx5U5h79y9GZ0Gxg6/26AnY40ztcaOePGCnSHzRlm85lNn5meG8zcOcpjgAAqDeK06s0UPFLZgHOQTzfIprS28C7Th54W6QbMLL5bnpxrxpqgGpCzIisRoeyJYDN1IOYbOGxKWneFO4JJq1A==|920 \ No newline at end of file +}//K2stV+wQ1luCG4lCN0o/D2bZo8CuOW35fITRzFL68DlP3DYsdhVcPLS438qvC19E2kAAdb8igkez0791Yfve62IxSgWxGbBXFCzvp0WwBgURJ4iAyMGpqMxxqOJzQ3M5ZJVv3r0rQndw6qcz9omC+BK066JGFR59SPJcUJbHMmM+/cBPyBofuvIbm2Yuk0x8dS2nMxVj2TeMlVhWEbyVBHfG/F4CmPpMvSzc0QhJ66tS50kML6gCXbRIu3wnNJQUzttfhYs5ROUWdfOUgFY/zQzXnl4DFFQt/HZUr5oEzcerFOaad7kE7c9GUGLhWN193iUuB06ZE+Jrd+VnhtFtxoT/RszK/D3e2MHLGzg3V3t9bfUJ+EHKlM4N9gEz7ygBdtniP0P2oHFhPM+NBx3jH9XNtBIJIk1vS9MlO/4Skv2nWDWNpCF2mFbR5UKCtzC/DV7sc3efKTtUxjsm9YhU+0sfqHBO0xLBMlqmkZ5QcxTIRptPvv9FLL9H01fXMEJutTUy5/lmtd2ldxh52WS2NNcRb4VbPES6DSwmn9L+lCckfkmGgT90W2KooySQESv59GywMoV5dCy5t/RVaVuv+gCZmQArTCzkHPybCbG63cZP49JSmgJiPLBxmxoPbvlSAP2xjcmeUMjA86eqVn1/T90aTmAN3qduxxE2dsTeEisI5G5ekZD6W5g1TGA9uyYUakyGUyhS6M5cchp4EwV2KDDHusrjabi1V63TZrmqMrJhUhYmyDSZMjfEPO51mgS+wDzzNUsTRRvFh3/gOvGiTwzvN1g5EVrjKfmFM4E7Dp+GkjUV92C4zh3xQmICxe7VtwEurLKTO/iC6GZ5VI2TRo59JtlwLz/nYnThqxb8UUIIph6t+NEbJg8nYnAbi9J64BSqgHG93fobLQ4aC1GAxQ==|920 \ No newline at end of file diff --git a/Pages/b90932e038f94707b54e571ff7cd84d.json b/Pages/b90932e038f94707b54e571ff7cd84d.json index c185f47e..78065912 100644 --- a/Pages/b90932e038f94707b54e571ff7cd84d.json +++ b/Pages/b90932e038f94707b54e571ff7cd84d.json @@ -136,7 +136,7 @@ } } ], - "ID": "681bdd5b-7508-43e9-91f6-6ce873ba4ffc" + "ID": "9016b27f-6105-44de-92fe-bfc24736fce9" }, { "Condition": { @@ -218,7 +218,7 @@ } } ], - "ID": "f4a3bc04-bb38-4d95-9e50-370829f4a5f0" + "ID": "e57643cd-4cb2-4dc3-98e6-ff1f80e2a23d" }, { "CommandList": [ @@ -228,17 +228,17 @@ "Message": "无删除该项目权限" } ], - "ID": "1b6d9fd3-837c-4923-b2a0-2ca9be22db8a" + "ID": "6ac0801e-7009-4d0c-99c9-57dc4bbdc1bf" } ] } ], - "ID": "54fc6ebd-4c00-40ed-b96c-267f763e0ee9" + "ID": "f4514737-1cfd-41c0-98ac-2e604d064bb9" } ] } ], - "ID": "ec477724-fbd1-4bcc-9daf-6e81471450a7" + "ID": "8552871b-e6dd-4150-92a6-aaed711794f9" } ] } @@ -305,22 +305,176 @@ "Placement": { "SerializeProperty": "=b90932e038f94707b54e571ff7cd84d!C3" }, - "PageName": "右键菜单1", - "PassValues": [ - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=b90932e038f94707b54e571ff7cd84d!B5" - }, - "TargetCell": { - "SerializeProperty": "=右键菜单1!点击按钮" + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=是否为确定" + } + ] + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=b90932e038f94707b54e571ff7cd84d!选择项" + } + ] + }, + "value": "编辑" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon", + "ShareCommandContainerRefer": { + "ShareCommandContainerID": "26f70fca-3984-43f6-a8a2-143eb5d48c1d" + }, + "Params": [ + { + "ParamReferObject": { + "ParamID": "4eb86791-f7de-426d-a433-ddfb616e730e", + "ShareCommandContainerReferObject": { + "ShareCommandContainerID": "26f70fca-3984-43f6-a8a2-143eb5d48c1d" + } + } + } + ] + } + ], + "ID": "ce0c3583-b2d3-45e6-b8f0-44b7c84f99da" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=b90932e038f94707b54e571ff7cd84d!选择项" + } + ] + }, + "value": "删除" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "项目经理", + "GUID": "1afadd5b-cf71-4c7c-ac28-eb41831509fd" + } + }, + "value": "%CurrentUser.UserName%" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon", + "currentUserProperty": { + "UserProperty": "用户名" + } + }, + "value": "Administrator" + } + ], + "RelationType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Confirm_Command, Notiflix_Forguncy", + "Title": "提示", + "Message": "确认将此项目移到回收站吗？", + "Answer": "我已确认", + "OklButton": "确认", + "CancelButton": "取消", + "OkButtonCommand": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目表", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "删除", + "GUID": "aace6039-c9b7-4203-b106-44d7074056ef" + }, + "Value": "1" + } + ] + } + ], + "ParamProperties": { + "context": "上下文", + "inputContent": "用户输入内容" + } + } + } + ], + "ID": "80e87aba-689d-4988-b05a-d24d9dda8717" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "无删除该项目权限" + } + ], + "ID": "fb1fac4b-ff4b-429e-b1e0-1dbd163c7705" + } + ] + } + ], + "ID": "254a001b-9e47-4125-9ba3-ed575e15d910" + } + ] + } + ], + "ID": "3b5e071f-ebd6-4289-a7d7-0de35669dd44" + } + ] } + ], + "ParamProperties": { + "IsOK": "是否为确定", + "选择项": "选择项" } - ] + }, + "PageName": "编辑删除页面" } ], "Location": "173,109", "Size": "17,18" } ] -}//Ni1AAx54rPLnaQ27mSE1PkgVn8xr3uAcbZZQvJJdR4o+Y/w5sKrk3m09aEqK6xcnjaw4utsGAlmzCM50lSykWW1OlxR7PUOPKY+PvGrvR08EL1EbljZezBb9bsJc4za0oA5lxPUY2K+mwRzE2gBDtefzq4yxOHwDPxv1kwF8goOwf7XSqFBRNFTnAcjhVFFTXNTH2HBA2G3SM/8FXPT7uaQiGyEI0ADbIGBIRbJJ8Jh79gvmOrvM3y2EYdFXy2AoI0NLA+xvVY4BPOKXEIt6FdGsdRTUxMzNUhRMZRp9lIGrgmz9qvzs+iMUiQvp7XlPqzSDZrD3pORLcwo4R2YYdywrSzRXUi0vKWvOf7zVIV+cDDQ0dRObfwrb9bb3dNLnzOXmwHGD75URObTUYkhZXpCX6fetiwaUnoy/9DcxFwtQm7zDChz8JKPe8I7yD5ZEd8rEGSNT2t2etmUswf2xu/tMaw5UN+MtmpiDF+eEQwHA+af+NKN/akPZ9PhI9BXwCTxKamPpIDkDaDvzACScvwcNoq965hX9ng3jtuisZhsyBM2DsqyQK92DWWw7PiUf82/cfSNNKNq331JFZJzBoQQ8rxr3btNbGRTSpoSD4soGYTkFEDwxsl55UsK6ehXzUbm9rjg3DZQbeocJL+kvR6rVKbe5U04fAB8Aga/S44tzgmdHDO2l/RjumVzduopcCuqKzWWCtUJz2tqYSlSK4Oj9I/Vb7AjOHAT8DXdlZpsC2i+83NVlk8V9MLY3aDqJOwBHFoQZBR1t11y8kJCHA+5mpPfkGvhWvrD3EiKojTiPTp/r0K7caWH8V6RruZgaT9UA0Opf7CBVVWnLgt1Aij8Yv6eAWDqZ/3opLKBBlufFWlV4gf2jt8exmIW2p80et1t5ZlD2ZiPryC9nFhYZwA==|920 \ No newline at end of file +}//YIGE/G//NAvnXdQfvD8H7rcf6olYdu7xI6eMbv5cxvzrXc0P7Qtxv2mIVVr9yr1+WsrVYvD0dBWgQ/aHBpm2/vuXik6puvJoXOE5UvA30ksitE0MAFhaGrUMscKBl46I+8CgnhYhOueSHuF3FFcvhxSDt7l+QSOM1gZt3XnHhb5u+5CAxBwdsgbw57ggI6DzzOrn/HaIa4BG+7mEY6EpLkLwbMQANMTGNlizHkUGPZEyQ7gap8ZPhNpzlRLtd1XyuTehqGdzdJMoOVVlKMPUrpG3db/KAXthzQcmpnQC7/aZPA5l9KOE+119Iqy9EExeEQx0RPtood7NjX5ZM4gtdD0DF00DPTijE5C6VJNNcgDdizac2eUZTCJ4wdQDj1OyDdsp97eVs+ZVeaAN2rod6IlXpN7IYCHKClivWsoUzGZMf9KTtBYShcHDO8I4UG2gWEOQryxObAPp8ZTdE60h+6nv6HtH+qNvp/cjb/rLvdZWcneTyTFAERtWB6QnHs7F2w4qJhCPQ5zLgBBSdeeGk6bhwQO3C6R6mBiUrq5690X1Y1mvFXB+aN2tbQhtCHn39Ugdp7FgR7PADAmWBr76FzKFNXSebnWD4IMQIPa0eiZKz7hzGZx8fZ7OsDZJgexywQ/zs3uMJSU5MVBYSCmTSYKiqctGMLX4deIIlzpOSm+Z3hiapIwL6JAnjpVUKK5Sy2vhXmpZelxwJ+r8MPdma9M/w2zZARTut3zbIKaQHEbblOo8rdx9GFAMJ/BhdjbCKHLonUJ5WdcsAUQELt9tTE/2ndzeJB8VSahyqEZnP7saegajXwNW+rug2n/wAA4QWYQDyUG/gvJjNd0mbwIdjaxBMOUxbP4qBWNGEtckNDv38f2F57VUgogfvKj244kZFM0Ad0tK+5jAx0yKBLVoMw==|920 \ No newline at end of file diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json index 9c2a830a..023bac96 100644 --- a/Pages/任务/任务-基本信息.json +++ b/Pages/任务/任务-基本信息.json @@ -208,18 +208,119 @@ "Placement": { "SerializeProperty": "='任务-基本信息'!C4" }, - "PageName": "切换任务状态", - "PassValues": [ - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!状态变更回调" - }, - "TargetCell": { - "SerializeProperty": "=切换任务状态!点击按钮" + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=是否为确定" + } + ] + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "变更任务状态", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "任务ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!任务ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "状态码", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!状态码" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='任务-基本信息'!code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!msg" + } + } + ], + "ID": "390ca23d-a543-49a8-9e98-8f56372b4a4b" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='任务-基本信息'!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "7aaf1c56-7985-4003-bfe8-7482431854fd" + } + ] + } + ], + "ID": "72ddc6fc-8ed2-4495-aeda-61bb03b100f4" + } + ] } + ], + "ParamProperties": { + "IsOK": "是否为确定" } - ] + }, + "PageName": "切换任务状态" } ], "Text": "未开始", @@ -268,7 +369,7 @@ "ShowConfirm": false } ], - "ID": "73773a04-bd0d-4afc-b009-8af56e306a73" + "ID": "bce74ed2-98f6-4b4b-8b08-9672319d384c" } ] } @@ -372,7 +473,7 @@ "ShowConfirm": false } ], - "ID": "387d0cf7-8ca4-4f45-8bc9-2abe4e0bc0fc" + "ID": "4ede87ab-cd93-41fc-927c-5c82758fe6e0" } ] } @@ -478,7 +579,7 @@ "ShowConfirm": false } ], - "ID": "06b2ff13-ea59-48ec-abc8-a3c75bf2191b" + "ID": "674852fb-e38f-42db-b3a7-33b83976546c" } ] } @@ -515,7 +616,7 @@ "ShowConfirm": false } ], - "ID": "61b94651-0766-4632-80b3-e2c54e3adcce" + "ID": "f4a163f3-4727-4bf3-b822-6449cee3cf1e" } ] } @@ -621,7 +722,7 @@ "ShowConfirm": false } ], - "ID": "205ecc32-6205-4db9-89d2-28e84ba64b5d" + "ID": "02442f29-660b-4f31-8b83-44776fddd3a3" } ] } @@ -775,7 +876,7 @@ "ShowConfirm": false } ], - "ID": "818f30e1-eb17-4942-9a20-1eff9d8a4dd3" + "ID": "c084ab9d-b917-4273-ae58-977f64bef54a" } ] } @@ -839,7 +940,7 @@ "ShowConfirm": false } ], - "ID": "65abc0bc-b211-4151-9a8a-89ffeed00871" + "ID": "c8766a39-a132-4b87-8222-110d61c78bfd" } ] } @@ -865,161 +966,6 @@ "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": "6f556d2d54004012aea37561bee799fb" - }, - { - "$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": "744c85e5-4c2c-4782-bcf6-5fcab4cdd3e5" - }, - { - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "warning", - "Title": "温馨提示", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-基本信息'!msg" - }, - "BtnText": "知道了" - } - ], - "ID": "ab59d87a-210f-4fa2-b5f8-d855541b0537" - } - ] - } - ], - "ID": "327d5578-8d4c-4b49-a4fc-5a363a8c9a7b" - } - ] - } - ] - } - }, "15,2": { "BindingInfo": { "TableName": "任务表", @@ -1069,11 +1015,8 @@ "HorizontalAlignment": 5 }, { - "Background": 6, - "FontFamily": 2, - "FontSize": 13.333333333333332, - "Foreground": 7, - "Formatter": 1 + "FontSize": -1.0, + "Foreground": null }, { "Foreground": 3 @@ -1086,9 +1029,7 @@ "Body", "Text 1 50", "[AUTO]General", - "Left", - "#FFFFFF00", - "Accent 4 0" + "Left" ] }, "CellStyles": { @@ -1313,4 +1254,4 @@ "Formula": "'任务-基本信息'!$B$16" } ] -}//IUU6naUUMpjHoknKTJ5z/xqwB7hRMGrdSdbhHvotFG/QxXriK7lBJve0kJ1Wc/fTlGrZHyDxfOrNBOzzno+2Vn2ITN8hxauc0OegfQ91p3dVm1Js4ttTlUsooWwvap2HohLvX5FfVK+4A7Gv2oEPjxUbFfrvrjt898vQg4wPtHYoCJyXsho4ZPa+z8izh64UbOTr1w0YlVCVpvEnhyd2TerOZbWbkTJVjj1vtYFTtwj4D8Y6M1CMuqP58FEyMXgLGLhxxtH41A+zzaajJNeD3rYmqxpW/b6m4ZwPxESz7eZ+l6td971DNwETBVLp2brgm43ta8YPqYu5J6wJl3oPuy0QX/Mq6wPEasie/90zlZwDKGPa9mUKrSX9ioLwhQILl9npPjsXsdP1N76zFAiyT8TIqeQLsV1OHEnaejSJhMwZ+XPjd42bBgV7S0SreVNL76IDO/bLDIvl/72C/gPX9ctwHq7lyVcbqF4lHAjgNiLQaTrMGghD3UNtZ7vqKr2jhCVtmO21+owdoRtB32RVzDqAe0UQl+bwnWzi6sh8wgrHUsTcEVQ3xB/g3yJWAlA9yCpudQJb19LwOB7PvGUbVNe8+VaEgNWyENebKV6L7qzQc6wvz0jpgf5hAvvGdZbqKrL6JCuQQZR4RCSbrfhcebDAawlXfrNFjiuxdp7vc03DQTokKQZCvOPxW6FMBkrpIwjNHMBRAfbMz1mQaw54/bonozRqZgsYopdvalYvDznoF7JPSsxEFfdyGI8E94klFGar3gfAXfmkRYDYeLolxVIBXUqL35VcMAr9AW4Nk2DenViXttmR7ux7w4DP0xXpQhmfIdJsRWFv0ynRPgxElDSXIR8uPGXA8WYalArVyxmYG13C3lQSc/51kBMCpvEToJnouktlsTLAg2EtKLSNyg==|920 \ No newline at end of file +}//4n90wdRA1AavxkzTneVX9hr0DAJFygKpzfa/tjsNEQFlJ7WGv+DpuEc4oMXJg6xZcVF/8cMx5LE01tIa0tDm91qdhA18kRW8/To9vevQMx/BwCyHariSGCSY5Fl55AS+Da3gHtGSKN+1h1+aAu9Z2rsZm3CAWQ3Ih6vy/Xmb0bZG2uGpFdA9tDQjYOd6YzeGNhi9Ypra6hi/ITQWpsWqnDll7d/ZXzCOOjCnSIg86MehfY64It8VdtBkuw1R+cn6rt7fVf4n9sb8XVDtKfEkKLbqwKIa80pV6L5o5fWv0HF+LEVQqa8dcojk9NwCdkTSMdpRrD13Rp+osbgdSou/ew4Azqksvvm6dUZS4xFqqJqP7qhw0yLPFXMo/QIWPhmfmw9IV9MGIrebqze4xbztvmYAXKKymV5e5PuPU8PSBHMomGu5qDd4msWGB0BlWjNcSkUifG9U5oDneMwZrBatgPGvJx0ap2Ky4uDgbYQ7r16Z6z6wkOz4QTpsi7A5JCOXQKecNaasu/OqfCqvdfK4aX1cAP43NRMC1ljafQPjPeBGPlvYniYucxNmQPYiA6wqte+MC54ByK8SzoeKTVNOedXj+clUVnPkcjsamDtPSftz6ygYPuoPsjhlTJ/l32qRqISeykuU+mUxQZAQksmuT3mLL3p+tblArfGEKO2E1YIryotqoWm7JUr0dFjfp0pOI4EhSNXAklK4q2jw8BeSqSjdsX30JD2kAOQ8nkE8dc9j/EeeQErm7gY1pyCQUJTfhFkHUzOipMuFKoZAEPAtvoHhixPcKjD7I8UizXMTrYpcDCHnW6X9602yZOwYJjrkonnUoqPFt/hASIKIK9yjp4nnJeRYY2uAoGEXoinnYbskvoeh8I8NXIVryboyZTVJX1gJNryo8u5SCz3kwH7S2A==|920 \ No newline at end of file diff --git a/Pages/任务/参与成员管理.json b/Pages/任务/参与成员管理.json index fc700d69..d658822d 100644 --- a/Pages/任务/参与成员管理.json +++ b/Pages/任务/参与成员管理.json @@ -238,7 +238,7 @@ ] } ], - "ID": "52d54f39-a0d5-432f-9667-aa8c019f891c" + "ID": "b7477635-5154-4872-bb8d-58a6d892f410" }, { "CommandList": [ @@ -250,7 +250,7 @@ "BtnText": "知道了" } ], - "ID": "16c468db-ff4a-42c6-895d-a14fc52a2b2b" + "ID": "9a103b19-dec1-41b9-8078-2f015da3a78c" } ] }, @@ -338,6 +338,7 @@ "SerializeProperty": "=参与成员管理!B10" } }, + "NullFormulaValueQueryPolicy": 1, "CustomColumns": [] }, "placeholder": "请选择", @@ -379,7 +380,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "bf04a270-7a13-40cf-a184-89e979a2b374" + "GUID": "00a3da47-5f44-41ea-bc29-c0aeff935fa2" }, "CellType": { "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon", @@ -406,7 +407,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "岗位ID", - "GUID": "92bb0233-a7fd-4699-805f-5cd2a94f19ea" + "GUID": "281a95fc-48ed-4a44-9b90-095cadc63253" }, "CellType": { "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon", @@ -605,12 +606,12 @@ "UpdateRowType": 3 } ], - "ID": "c2ad723a-eb64-4c92-9fd7-84a67a649162" + "ID": "a8a27c0b-8852-4d00-9118-5514a0cf9ea1" } ] } ], - "ID": "057f2f57-4910-413d-b192-fa36011a8bf6" + "ID": "9be4719b-2262-4a29-b4c3-088e42a01edd" } ] } @@ -823,4 +824,4 @@ "Formula": "参与成员管理!$I$10" } ] -}//g9AAzlY1lfhoVrchKBk/kXQQ1rnVdcsFhnqRfvWPm1LpB3AiSCsLGC//Jxif88Yy2CYQQXyYwjxiMxSkCOddvDEkK9SN9t+lWuj2tCx3y/+eqjUPeMKyr9Cl6GkHdlGSBVMrwP+IQFTyx1JdQ1h+d5hJ8fzBcohHncPxdC+JsS25XhPIj87zhKfJCmBm2F858TBUwxhE0Rw0dQVOAH+HFJfc/bFSs2yxQ5t3qs+Uh46FHAq5xVcUzyAcJDYMHVwrCj24nXmqcg7Bg1r8EI3ns0kNq+B8tZMJU8eQu98ybjr4+TsaPUJ4vhwwSBlkIqHDUZpRMpmhE1tGX9MqXdozlYiNnfrJ1jwSW1XqWUgziy0XLrIXCfrTz5i8MhMcDBsdLjqYddxWhY7aov4m9nou2oHA+Yso7wZfuYZQoEkhQcbg4uhjxnmroodSv6UZNfyFDT28VHQmoXY+8oG3VB6Xjr1p9yDCGBAVDfNCPlP2tnrH2PQ7rRO9wVsdVXeudDpgm44HmfthiujKTROmBTQI45kgoxX0BZ510nvB1oc8qHQEv8Yxy2p8Tir/U2fytR9rqbRoAt+WlYmSlwgdcclIPBhSbuPGsbUxZTr3IN5tP0bB59XCKPPrjlM3Nwf+3WwjRxE5eiIEAK6UotHe9wYRCoNti42fBv8Pqle3AZPh7PnQ67uLJHAEs9ieQRt8RpkDoa/sZ/iumsADukLu/6on4vCR2jWJw9FqB2Kzdfgnepnv8p5axaUblJGb2joPex6ek4aaFdrVXubW3Ubs7TWzuDY7c95aZwP1lZwOhGZoHfrFi7CGdhk+4OytySwNeX6Gz70o7zrG3HK2drxLs8RIhxvuN5ajDF5Wk6pGws65X+q7b4Hb9dCJb861URBwnZl7JRtn4N3VABW25YFWOBpuyg==|920 \ No newline at end of file +}//8npsW2H8REjwQCYR70bt3DHbT8A7p/8wEsTDkNuQjUfHS76az8ws/g8+PVdl9TA3m0mgxP7zokVqtczJs5biv+b9Y+CDR0C38wHAi7MYr3d1J3tBKGMYBB16XboRpR4DRNGtuzvLQ5nttX4KagPEcsJPiEEWMZ7em8ErPbmBUV41C9FiF6eZ9cEHFT4MPW2xw114fpMAH2EpAf/0y3+rD7SMLSRj8ZEZtjauc1REBL76kTsq0zlKXU0Vt19XmWxT0RH2a3edPgu3ll5fwDxakHYDbrzahGhLDjgh1n9E78Ry2KCDbt+YHWdKD0z1GlHl5wIGYmPpGbiP+0YLVM53CriSgwdExNU8C9mUdMDdYPxWhuKB7+Ih/i/qaSYq8ScRTMqy363/lGBpMvBaVZp00GGvfCiWuWlGwDcXR8GqhqRUYaB5M4/njjzaIijfH0J5zoEjpda1q8HSLBW+BS6KUfR0NqD7rQ+fwxVY6G2tDDHd9f3ID9Dk+5//zkqiPabB7h+tRb7AxM+6noVt3HE9o9tpTCguHZ/9XvGunGJc8FPjg1jwpDEkLfXfPAYSd7dtraKX7gyjs0M8gSTLgvQRJo2DifoFk1Eh+o0seQxwVUzy37l3wchvS0YIPawBePadj+yFfGOkrEvVXJjS+3uBSotiTKUxubk7AHxur8zXpcAwTcd5lYEXH6uEEejTGtMv/A0Ozb08oFKFyGPBrRxqV2xRGzxNt9+uX46ox529/aRW1EknBwSzBm5Cs9mVHuiPsKqhNWGXiWSGz/9gw5IbJKfRwzpoOAFN/oO1wQ4aG4Eahx+b9pwo7xJQ248UyzxLknEC4vwx6T2HWL4xXYv2WwE/6Gc7LzDEFNY6BgJll2yemrlrPCNh9TNCgA8Ykh42RECNEbuJ2GkifbGJb29aTA==|920 \ No newline at end of file diff --git a/Pages/任务/工时/修改报工.json b/Pages/任务/工时/修改报工.json index c080e06b..b6c48db9 100644 --- a/Pages/任务/工时/修改报工.json +++ b/Pages/任务/工时/修改报工.json @@ -508,7 +508,7 @@ "ReloadData": true } ], - "ID": "0a86fbed-3751-41c2-af4b-31bbb0913fc9" + "ID": "ccff74b9-c145-4a92-8ba8-acc3d497819e" }, { "CommandList": [ @@ -523,7 +523,7 @@ "BtnText": "知道了" } ], - "ID": "6049aa95-7654-45a6-9398-8e8fc7ae7280" + "ID": "0d1c4acf-195d-4fe7-93eb-e1b24a8f2ced" } ] } @@ -761,4 +761,4 @@ "Formula": "修改报工!$B$19" } ] -}//QUBpXXVPIvAZBbP6PbEU/JtGraOMUxeRF7I8EvtTd/cmoED/rdZHbwwYhnehGsLXYIjszDYAY/xaoPvQHdJBZzHtmj6tgamju9r6789ZF3QeSCNJlhIHq///GhBbwt14eLuGtnVaqGgz+gN39O3nBdxvZmsAfH0cboPpSktmHFgS/gTe9KJlDMQnecA3YjXtbAhI5uZKQo9gtrdaYMhz0/4T5lCPuR1O178dwQBWNFG7eJBPgQyhFj5yoKrvTxuYawwGut7XgdzxqAThckM/0DuSJ30Pd8jfoZsOqEReXhqtUUqHjDHhjHYnXNOkSN7v9KRNKG8J+mPVBxPZmm8CMTDy1weBTBSyR//PsYFE/3M4s69OFeDLfmujLef9tOfFQFboUMYldurw6TSW4K4+TXz0PCd7qCbA4UfNb2vCNiprOZta0LDLq/PGRIL0GM1sr5PSNttQ8qptGh4YA9C1nTlNQQd7rs4ks4UcU5dCOblwi1O6+gmSjR1mEAIdorAG2hr0cBUsO4Ykjme6alLIbcs93awq1svo8mGxm/ND7x8o0YuIHtH2RT2fBwd6VSXOfRtM8/Cz/dHjVB9x1nTITi7enoaR3heqw2lAtBMIEBuDlSMFzSuAYEHWRKEwRbxxgddC2pT5sw+YEMXBb1Ib5O3JBrqF+m06hc95vM3AgBPCwVKmJzfaJWYGDULSgM/sHiskgTiuI2GlKhNZQMVgTzgBuCfeXmvb/0WNKL9+qNQ15g/aiY3flEsG85DYJh7uYvRmVxc+fl+BHwHXFBZFSXLCx1oHuMnbJx88vHfgT2MGmPFwp0dQFvADCAvQ2qknbLPjDFfX92f/+MDtL8Fi9AIDsehTFYkrrIobOUsFh268XXwCYuENs1vnqhOOLFiWMB9zDgXSTd8fDsRPkZA5qA==|920 \ No newline at end of file +}//JbGDtCPSJJLTZVFl7So5rdOeXWJd2c2eBmDlBhSMFpnQ2Q280uIIvHQhGS+/YyOPoWpO5y8pOcH5uP4EohsRVtOKwaAYYg1ufxF47FsgLGcVwg4MEcg/NyzuAIia28JSCikjY5iTgol+OytPYDhh64bs4jJGxJgH+ELzL55E6KykRWAR8477rQN7D9Sd0ReTY+r+sJ0n3M0voJIIOdsEEacEKEs3lS3iYKxRXWvArd8ucYPUqkYX1X0NKSWRwkNs/xgW2/2XJ4iwgPtdrAwFtNcgqVxhQU0KYnpJeHEwwtNIWxSC/t5fdFGQzO09nFiLqKlnH4DSa9eVHxi6cM2pq11yM9xrmXtAUzsc9XhNIXSuaqNR6iIcVS5gtxj7PAnSpPOZoKBJY9q+MMhu8b+eqUYtg8VDtQJeRwm05dmNiWX9fq4HbzSEuXFxB/dVs6JxuwCfQwMzWkf9dYfxVOxFJf4TrHnHPXn2UbWZKkh36VjjltIs58/Ljnt4V3RDrA3MGO9EP+SZ/RAw/wpdJGM1s9c2d5mMFnFp/PoCmABVHS6LSigAiqZ8BHqgodFRYIJbvdHk2cUjw7wmwVyJcNN6G752/camwLWY5RFZw9fw1aWSc3KrWG9Ief/JzUxQOvw9YhLIBbYBoorAoMqvFTj8wAYaaoREAwC05Xn+u0AmDsTuRUb5+8ouYCOYDkGZol47K2uyl4WlTEMJuVLa569M8vhxSRNJCn7h6r+NmjDVESlJ1GNkzBzCjsdgIkBwb+0Z3U4wOUPtHs45jdbGnA8M2giEnNQ9RCmZ+z8qY3VgfUfMYJ2gzCqrqP2ja9Vj6xDzInLQCHhIXDIq0VUaGg38yNMGtOWhDYZtH0/Byac7CIeg3bWz2M1T4HxKOXvYuazUp3MNHHK1tGI9GIih1FcsXA==|920 \ No newline at end of file diff --git a/Pages/共用/切换任务状态.json b/Pages/共用/切换任务状态.json index 0a7e05a4..4c653abc 100644 --- a/Pages/共用/切换任务状态.json +++ b/Pages/共用/切换任务状态.json @@ -16,18 +16,9 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 37.0, - "IsHidden": true - } } }, - "InLogicalVisibleIndexes": [ - 3 - ], - "Count": 4, + "Count": 3, "DefaultSize": 10.0 }, "Cols": { @@ -50,23 +41,16 @@ "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", "Commands": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupReturnValues": [ { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=切换任务状态!点击按钮" - }, + "Name": "状态码", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=切换任务状态!状态码" } } ] - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "PassValueBack": true } ], "ParamProperties": { @@ -166,11 +150,5 @@ "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 + } +}//Em7X3Rkou1GubtgHuYL4RKMdoxVWwYpYXjWjUBPZuoMv5dV+uLgEZDQKxpAvc/fbI+GduyCCoYJIpRgDHHXKd2hBqYs491u/Zl5ipGJkZwat3DdyoNJFkrEmg+y6FCzunDj2mY7zC4dzagzG4vGnLFlAIw1d4QHXzhbVks2i/r2Kz4ot8RNi6jE6dpaKpii2de3KvVEpaTN8Tr6WYLfmHh0u/ZRGYDHnXS1Plx8xQW/N3Br82JRhE+N9p70YCfT9QVZqTD5AIVceFkJe4zTZe1XT2RPr0x5OGfVzf3tuBShx/blCq9jYHuqV+bPy0vakBDFIeHz42Z7t5w5SinuR4JvAd2W5Pfh1+MTJdlSkSA+5YfDyWP15YJhGueuvrH4M9b0W6i2XW9QjHouvN+QxGyvWYeXlsnCjsbQA9KhAThJpg38KjYwbNV6HIKoF/AjuOyjg7Q5jaiZVSzYAcPwC+jXPErZHLfrU9b9suj9TwgBrQly6Ch5eC7rMABk/3aMbtd8N6LxzrXooGnIotCF81bicfbTFqybA5aKTqcEchoElnooDPGFFBxWnH/bINnWEfoVVd/5vHCd74OWULxuGX8ooe0o1RnW5XqXZ+EhtzGyj+ot9sQYiLzJzK2CEuvYNIVceaMkYU7oL1Gme+nRHawFISLY112tUG61R7WRmN7z7vnjwN5s8YIqn+KSnDYmmFEgJiOVkUu96j2k5J+8DtuvKmDZByPNFKEw2KbxBhF6U/QEb0lEj/ubyMrhrGRViZk471xnR9XnsCH0OHPtzCOk3lrL/EEbEO3z2NV7p5dZiWGbiMMOa//idpXxYQxjhWWvFgF40cA2EnDlSqyaTNpStH07AZtWFh89c1e/Tj9HqRcA99tsLoRoRCHcTc0VBPQfkTVWiYXE2zyEgLNKafQ==|920 \ No newline at end of file diff --git a/Pages/共用/切换任务状态.rd b/Pages/共用/切换任务状态.rd index 565d9337..84340463 100644 --- a/Pages/共用/切换任务状态.rd +++ b/Pages/共用/切换任务状态.rd @@ -1,11 +1,5 @@ { "PageType": 0, "ColumnCount": 1, - "RowCount": 4, - "CustomNames": [ - { - "Name": "点击按钮", - "Formula": "切换任务状态!$A$4" - } - ] + "RowCount": 3 } \ No newline at end of file diff --git a/Pages/共用/切换项目.json b/Pages/共用/切换项目.json index 3ced1551..1f03184b 100644 --- a/Pages/共用/切换项目.json +++ b/Pages/共用/切换项目.json @@ -16,18 +16,9 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 37.0, - "IsHidden": true - } } }, - "InLogicalVisibleIndexes": [ - 3 - ], - "Count": 4, + "Count": 3, "DefaultSize": 10.0 }, "Cols": { @@ -50,23 +41,16 @@ "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", "Commands": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupReturnValues": [ { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=切换项目!点击按钮" - }, + "Name": "选择项", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=切换项目!ID" } } ] - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "PassValueBack": true } ], "ParamProperties": { @@ -175,11 +159,5 @@ "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 + } +}//BC8AoM7ZUTUucvH7RZM+lA2zW43iIADx3wraZs986jdYy5aNu1RlL6Jas0pxt/zBKjV7Yf7yK8NBCy/1qZEr+XSPuXwcEUw+rFLBUtyTUc8Puis9PRMRK2k9du5H/aIkacb4K8AI7ThaHd+AqL8qVQcj1vX6H+gIY0RHbsXpWNCQfn3vA2t9aj0ZUtjag2xZiYJiT5BOIctwo4SJUnvvym9chppaeBBY1mkan8fcF8j8rau2nvmb4UxZOi4bYinBh3MZzrlSYwf24TTQoYqSwp0vlHh88zXuzVCwqKlLoxuzpxMrzqwcXZjxmcuB40JiR2Y1f3+N9w6/0QT3jv0gQ6swoLdeu4iD42ked6ZXRtHVyZeFc7AUz1l1yNppE3bg+FfWpPx7fr5bJp8AijgM/MJLXnJpP7cfFdLZ+khZ1ujxzAufDbKEtucThXfMlzGwPD2thrYj1xs00cg7hRAlxjlMwkz1qtng0Q6xntlXeJ/p2UsGwYsDY8E1QuVA8YhEHgCrZeoEVXHPGJ7SSQ4F82lFVIlDKKD8H8qoYt6Fqubwf06i1Frcau/Gdh0E05uu1dB7qhWvmGA9NHQhG4/wsLk7M+fnOEa0kCK5fSSn9hrjQSqjdHNVXJeHVnkEC/wccGhV3I46++brXTI01TueEQ19lUEQqtFNddiN3Zj4EOAXbnoSLfJjUBELc8cJvLahpD/r/nwla1dyqlyFVk1FOf/r6ZAGag/1PonQq97P2qtwkXD1AXXunZ2hz7FqxoUrBx5Ufynv9qQ7j/LopJPbN8znrn45GZX5f0pT14cztaiZZfZmYN6D6vPMXdOmMhCyG+OnB02WpFWZfOfLk4RRQGX+1x55R3BKy0jxBMj1IUE2XTv49eaaxgXXxon62Q6Nj/gkLsVOA9f6SEV+v3bEKA==|920 \ No newline at end of file diff --git a/Pages/共用/切换项目.rd b/Pages/共用/切换项目.rd index a5800485..84340463 100644 --- a/Pages/共用/切换项目.rd +++ b/Pages/共用/切换项目.rd @@ -1,11 +1,5 @@ { "PageType": 0, "ColumnCount": 1, - "RowCount": 4, - "CustomNames": [ - { - "Name": "点击按钮", - "Formula": "切换项目!$A$4" - } - ] + "RowCount": 3 } \ No newline at end of file diff --git a/Pages/共用/右键菜单1.json b/Pages/共用/右键菜单1.json deleted file mode 100644 index 2d22eb5b..00000000 --- a/Pages/共用/右键菜单1.json +++ /dev/null @@ -1,172 +0,0 @@ -{ - "Rows": { - "RowColumnAttachedInfos": { - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 38.0 - } - }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 38.0 - } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 37.0, - "IsHidden": true - } - } - }, - "InLogicalVisibleIndexes": [ - 2 - ], - "Count": 3, - "DefaultSize": 38.0 - }, - "Cols": { - "RowColumnAttachedInfos": { - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 11.0 - } - }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 152.0 - } - } - }, - "Count": 2, - "DefaultSize": 11.0 - }, - "Values": { - "0,1": "编辑", - "1,1": "删除" - }, - "AttachInfos": { - "0,1": { - "CellType": { - "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=右键菜单1!点击按钮" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=右键菜单1!B1" - } - } - ] - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "PassValueBack": true - } - ], - "Text": "编辑", - "ClickMode": 1, - "TemplateKey": "_RS_Information" - } - }, - "1,1": { - "CellType": { - "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", - "CommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=右键菜单1!点击按钮" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=右键菜单1!B2" - } - } - ] - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "PassValueBack": true - } - ], - "Text": "删除", - "ClickMode": 1, - "TemplateKey": "_RS_Error" - } - } - }, - "StyleDatas": { - "Styles": [ - { - "FontSize": 13.333333333333332, - "Foreground": 0, - "TextIndent": 8, - "HorizontalAlignment": 1, - "Underline": false - }, - { - "FontFamily": 2 - }, - { - "FontFamily": 2, - "FontSize": 13.333333333333332, - "TextIndent": 8, - "HorizontalAlignment": 1, - "Underline": false - } - ], - "Types": { - "Strs": [ - "black", - "Left", - "Body" - ] - }, - "CellStyles": { - "0,1": 0, - "1,0": 1, - "1,1": 2 - }, - "SheetStyle": { - "FontFamily": 2 - } - }, - "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": "右键菜单1!$B$3" - } - ] -}//LRYqrYQbNSW594zp2cQHBWikU8q8vBD0z4GvBeIS+7JZD8Lp8yWzGsbtZECdG/z1aMdpagG8Ha+dAl5dMu15uSk1MEaE8t8EmazYpf3m7uOWamr8GTjmV7RnT++x2+fflwsCBR0kQ/ZOV3VqEF/59t1HcSrteWcXJYXxGGtLdg9iwrg/5nfDgHWziv5e/Mb0mLV8qY7Z/PtuMJZTxtiOXSQxm/1CsgHCvzLqGTGLjqXCIIKRRblM2J0ZKZmh5XMJXl27YQ0eYnZ46cji1irhqm6QElQU7W4ImB5oE7RhpvpylKDfHCO8pfjVj1xzFauvP5+k8R5EV+P/NqAp8WpMRwpl+w+VAehOokFuT1dGFbdks4LAuER40M80RzH0pqYzrmW6ln7TCT9EoutjkYqRRuoSedl90yPbEOh6M5p1Ym3udkVcSAIYnogfqoM6rhbb8M7DG+wPpbU+afI37aL0CIWAyvNh5C8OtiwI1n08Zqg6sMRGegBOEGyDGPgseAMG0f54tNsp9LORtyJC+qZZnUsnwS0cCfMrAJkP3C1dNeVFEXcx7sd4STLOgf1+MAs3HPUvbnp6GLRKFOo1HQWH7CAnmKtCXJejmnyULUWVYy/3JvOVm0/lRKvQXO4yXknPg9ri5+7r+4PQOxqqdbUykF5ardPl5FsqHuTFntVvF3mdVtHZQi3+SU0k96O9cUczQ+90hVOMT4UuUeMu6fqBnw4ZnKsgJ3LqYjA0iVwnQSMcz+DQa+XVYu5C+1cZTjunNow1+xzpPs7+IxIF8El70uLuoIBcmOffiaGS2/MkPt48Wo/rC/xPM4zlaWlL+IDS4fRIXO7p1KGFOenWxrslIQyLwJJ/cwYFifE7FraAPOV6OTxW5rDfEK5y7B1nL22BDsjfzkXuGW6LLWPKm5J03Q==|920 \ No newline at end of file diff --git a/Pages/共用/右键菜单1.rd b/Pages/共用/右键菜单1.rd deleted file mode 100644 index eed284cb..00000000 --- a/Pages/共用/右键菜单1.rd +++ /dev/null @@ -1,11 +0,0 @@ -{ - "PageType": 0, - "ColumnCount": 2, - "RowCount": 3, - "CustomNames": [ - { - "Name": "点击按钮", - "Formula": "右键菜单1!$B$3" - } - ] -} \ No newline at end of file diff --git a/Pages/共用/编辑删除页面.json b/Pages/共用/编辑删除页面.json new file mode 100644 index 00000000..75c92326 --- /dev/null +++ b/Pages/共用/编辑删除页面.json @@ -0,0 +1,145 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + } + }, + "Count": 4, + "DefaultSize": 15.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 89.0 + } + } + }, + "Count": 3, + "DefaultSize": 15.0 + }, + "Values": { + "1,1": "编辑", + "2,1": "删除" + }, + "AttachInfos": { + "1,1": { + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupReturnValues": [ + { + "Name": "选择项", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=编辑删除页面!B2" + } + } + ] + } + ], + "Text": "编辑", + "ClickMode": 1, + "TemplateKey": "黑色" + } + }, + "2,1": { + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupReturnValues": [ + { + "Name": "选择项", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=编辑删除页面!B3" + } + } + ] + } + ], + "Text": "删除", + "ClickMode": 1, + "TemplateKey": "_RS_Error" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 1, + "Underline": false + } + ], + "Types": { + "Strs": [ + "Body", + "Left" + ] + }, + "CellStyles": { + "1,1": 0, + "2,1": 0 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "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": {} + } +}//IHgwTO9pym/H34PTu/w2x3kQumORAyFH49VKXmH+tCYZnQbLnk4VD7V7xY6N6lpegEimEsy8dHIPtAGKlPIPRorOe9/4Aqs5BWcu4UjYrQM5ChbhHJtEgGCa0OAYSlHwAtzbXpgnz59/jOf4ZBJY+Js46vr85aEsB4MBsjxE7ZXkBq0N3hVEsHQLt37DkW2CEvVCX5KCNjeiwTH/LrqBR8mH74BruFGSgYJmDEKcYg1GAt/VZK1JvQj1y1Y3qSVf9xCVlAgONh3BhHsI7B4dYcEYuCzgkyYF2LdhYW8JTeiKoDdP7lGV99P1ZXlgrX7WHI83H9Z7i5iev/RBtWuH7k/VRJOo+AT3xw6qxtaKvfndk3l8erNnxeJB55jr7Zozc6ZReNZ87K0Aj0q8i13W5DI3DQqsaR97k/xQgNQs8CoDdnNmCnI9sqRsWxn35InCCt9Be9KYuLPA3T44kR7XagK+Z5YRNaVGzjc5rglWFZ2RCH9KP6RmyrBCVFsycpy8XO7gk/MtVp+kQa6ETPoY/Vb0orPfQTzTlyXYTG8eJ/0eiv1KioCRwQw+GaiAJZUxr/d/EDptEdBMiYYFqE0LLcbzcu8IGATZaUfBE8MAc+Ghl2a3TwR2TQjh4jld/gVsbGDTrXLsuZuZqiV58O3doBATKAYivwWo2uVxmrc/BFdeWWYxC6mHrUiKKpsGggfHK/DNsB57E4xOyIz5B48NCvFc9viSqmkjlEBkzAhPl9sNERuh2gT4vAHf7NpzrsZ64iXj3YmNPZB4uqNtQA1/1ZmtNnhBl/F2qK91VL7xafV7S/AiZdQvk87HgJ8qPFVM3oc85hAASVojM14zFn6EycUJXR60Zegafuo1LHy3zHWaLzTAFpN818lnsfm7M7oSDvaCpTKfSfM7MI386vDibw==|920 \ No newline at end of file diff --git a/Pages/共用/编辑删除页面.rd b/Pages/共用/编辑删除页面.rd new file mode 100644 index 00000000..953fa8e8 --- /dev/null +++ b/Pages/共用/编辑删除页面.rd @@ -0,0 +1,5 @@ +{ + "PageType": 0, + "ColumnCount": 3, + "RowCount": 4 +} \ No newline at end of file diff --git a/Pages/共用/项目菜单.json b/Pages/共用/项目菜单.json index 1c6a920a..9ed8f2f6 100644 --- a/Pages/共用/项目菜单.json +++ b/Pages/共用/项目菜单.json @@ -90,23 +90,16 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupReturnValues": [ { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目菜单!点击按钮" - }, + "Name": "选择项", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目菜单!B2" } } ] - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "PassValueBack": true } ], "Text": "项目信息", @@ -124,23 +117,16 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupReturnValues": [ { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目菜单!点击按钮" - }, + "Name": "选择项", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目菜单!B3" } } ] - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "PassValueBack": true } ], "Text": "项目岗位", @@ -158,23 +144,16 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupReturnValues": [ { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目菜单!点击按钮" - }, + "Name": "选择项", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目菜单!B4" } } ] - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "PassValueBack": true } ], "Text": "预算申请", @@ -192,23 +171,16 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupReturnValues": [ { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目菜单!点击按钮" - }, + "Name": "选择项", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目菜单!B5" } } ] - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "PassValueBack": true } ], "Text": "归档项目", @@ -226,23 +198,16 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupReturnValues": [ { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目菜单!点击按钮" - }, + "Name": "选择项", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目菜单!B6" } } ] - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "PassValueBack": true } ], "Text": "退出项目", @@ -260,23 +225,16 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupReturnValues": [ { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目菜单!点击按钮" - }, + "Name": "选择项", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目菜单!B7" } } ] - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "PassValueBack": true } ], "Text": "移到回收站", @@ -294,23 +252,16 @@ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupReturnValues": [ { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目菜单!点击按钮" - }, + "Name": "选择项", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目菜单!B8" } } ] - }, - { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "PassValueBack": true } ], "Text": "更多设置", @@ -402,4 +353,4 @@ "Formula": "项目菜单!$B$10" } ] -}//l9OzDRMtcSn1bRH4wcR7Y+SIYSPd3aLKQss2V1r9hu7K56jo98QrTiL4n0EHr3B6Xe+Zzr7ExeH947RWrdPCA8WYfdvHMSIaWd4YTsyYy4cDDjCFzqKJTs+SifdTcr+jE+NUnU77OhrMmaQ+bTB8yC69GEcKyzB4XT/YUONT1CGChacFr8168aioD8RprLsYf/wsOln3bTAM7tBxKzmFMwggfFwmVJ+m1PMw0xiQxAPoF53AvVtvAu9fjnxRkvk5HgJVVYYh9+AV9ZqpkcFFFai2FgBRyqi1u6bzpNya7+UpUtsedeadvQgeeJIICjfUzwIXtGNW9Pjmo82YQzt1He0PPseLJCpiNjkTUqHHg0+YaVFKS4f74+c3sCG1y517GTnMsStI7VWVj9Hkp1/xJ7nyyEd90MH1YFwu1Pzi99bFOMzmuT9fxQ/2lvQRaXhOIGkR7yVg0Ibw+WzLea/UwkfHaKQfzV0HenUlpf7NFHfh8uLGbMY2oCnMueA++gtxcRH+S6P/FnOrCZ5UThz0MD+zujRdRaSf+tE9KcCoxtU5xI2QRw6nLvermu0VHCy3Br+83aUmQoIUWUZ5gaR1FpbH9lr5vTTfJMrdkiWaid2K9QUlVfJOzgaFJcA2yxygtHIh59RF+BSQBCkuN3JNNvjKgXbDN9AROveRr95B6FRiUiVK3FQqZCub0JvnbqTh/5ao6hT/S5DtbObW6RsESjhT3yx4QRIr9HfFX4SCa6rXC49U6HRMHjXMkH82py0IjDO6fpiNloJZBD+2vEB3ae8B65e2RMatJc6XUWTREscIWbkLseMVH4A4SFhZ45etdA+X/iCQCTDDucmcSjgJB2MiO3qoSofroS2hZEUqSY4ALG9DM1Nh1GFNgd3m2wZeRAVk3+bR9XU+cD2dN8cdQw==|920 \ No newline at end of file +}//fK10jh+h4Jzgathqb0YHGgm8nrSj/WCG2w7ukj8TTAmejRrYKclpcJcatBFqWRayQ+Op7DdZF3n+FktTwNFgH0v9CcNNCMHgxSFnFX4vykJYrhcTErZ7f5oHxyI+rjlXXI+NC9OJXfHifd+0P3S3M9H+DOYASzqe54wGNa7JUsuEp6jtblZLxioew0aBL61II8h2Irrq+1t8Xg+PbZXoze+bmOdNQ6ZJKfVaL7MC4HNXddgmaN/irq/ICxpZnEy4coSPoQFpdJowvmsGIWCyEbRoR/PSLfQG5kAM9AhNFREQz3rG53pKSgePt3m3r4I1bgVXJlvt5ZbshmVTAUjmUt2cYVLWC8O9ZvVqZGQ3EXP78DWpp39GeB5RUoY9z1WFHoYci6lokI2tg8mZrdrv/UGr1442hi+prAptAqnlN7c2kaIBG6u9glP+Eov2FV2l5mtq32SkhN2UFlFOvdgWvacR9mjqp1wHBP34EABvNJrufa4y7+9VMVzASJdWEAonFS5knxO47frKnwNptS4Q7CyQlTWuQZoDLM9/gEvlCum7A3cL0arm0lVOQRwQCGJeggtahMEmfVCyhwi7QJFs8pOhI7biV3qANbB3SCMk3xfTnWZF1toM/X1jmQOq9oRbSdwsIJks2S2a44M9xzfkDfBM7VX+TdnfRKkwiVoDdu7BI2nVqoIYH2mKUSivw7BjPnK3Dc5H8G1wsjlJscFtt0cd9wGntN3xEBIr02afS15WOr9YxmiqoVWRmF0XV7SB05Op0n0IWsTc9fHAkDs6J4Mleb8TsXpk+Qbk2vj1bZ+4X2iua1ahkD25Q7EFUiws21CQwdtPuLteAgecYOzbQXNPo1mr9pSVb7Xnz5gdzpPsEB2rAbCDkaP7rpZ5AxsbRGe1+Zy/XgbPIy7Gof237A==|920 \ No newline at end of file diff --git a/Pages/内建页面/FGC_修改用户信息.json b/Pages/内建页面/FGC_修改用户信息.json index 47451483..40aa27cb 100644 --- a/Pages/内建页面/FGC_修改用户信息.json +++ b/Pages/内建页面/FGC_修改用户信息.json @@ -447,6 +447,7 @@ } ], "TemplateKey": "_RS_NewLittleRoundCorner", + "WaterMark": "请输入", "ForguncyAttribute": "ChangeProfile_FullName" }, "DataValidationInfo": { @@ -462,6 +463,7 @@ } ], "TemplateKey": "_RS_NewLittleRoundCorner", + "WaterMark": "请输入", "ForguncyAttribute": "ChangeProfile_Email" }, "DataValidationInfo": { @@ -519,7 +521,7 @@ { "FontFamily": 0, "Formatter": 5, - "TextIndent": 0, + "HorizontalAlignment": 6, "Underline": false, "Strikethrough": false }, @@ -529,12 +531,6 @@ "Underline": false, "Strikethrough": false }, - { - "FontFamily": 0, - "Formatter": 5, - "Underline": false, - "Strikethrough": false - }, { "FontFamily": 0, "HorizontalAlignment": 6, @@ -560,8 +556,8 @@ "14,20": 3, "17,20": 4, "17,21": 2, - "18,20": 5, - "25,20": 6 + "18,20": 3, + "25,20": 5 }, "SheetStyle": { "FontFamily": 0, @@ -592,6 +588,7 @@ "BackgroundPictures": [ { "Name": "BackgroundPicture3", + "DisplayName": "背景图1", "StyleInfo": { "CornerRadius": 20.0, "Fill": "#FFF6F6F8", @@ -606,4 +603,4 @@ "BoxShadowString": "0 0 0 5 #18000000" } ] -}//xNiGAw+JEvuSgpZaA0xoOMD+uaoRj/sQcIE1XwLiEPi62BS+HavcJIpEIau/y2MsDjCk3oCli7Z1CTSHIf6+kUKWws1lJA62ApZOxsoG1oFPZIGCleuJBGMw+A9ymMMcttqxRnZmrNYeTQT6asQVR9E/KXu+UYweIwkOoJ+qhK5/ohlt2X81HXfnDE3SYDUbKPUwMmPwC0R42XG1tkoXfcs25mT6GiIGASikfg3DrV7iNwaWHuXqqkSn6JTWWafYUdvct7bfVWjK6vUz445c6pYeZg1mIp7aJj5WbM84r4yVhSx3zOJSRty8kv1gC86qEfet/UEsk1PrKBkK39XdD6hNPAq+eEnr7riiCEA+wf8SCoQoZ42SOhY70cQA6FzBGvJHnF840CvEQOWiXPWVua/kQEeCctCCTEXL1eNcCKjydvX5Veg+RLVW0DfPOvSKsY73nth26l4yAMZ9LyTZ+6Vgc1XXmuW5CUmOrgt+wSM/n/6lWNyeUcHG/o9jHBGeC5ANuG1AgaGPk2jO7C/LNZAuhhD4zsbh8wKkqoS7hC6QM1fHU163nP9fHqmtH1jMMvzLPKMXvpRo3xcAvv+fsWRhHYSxL0ftnfp3gpM9ROeoKQIWJBEHuwBpfbXPsBgpyqyNkqCwLxH0N68v0VVe3oeifz07TbCSjOLGAMPkG6RM19m9Aw4K9dhb4Ua6LzUOnyj2BxpY49c2WgOJTv6eTW4IOtCgfM8BUSktSvk2gZZZktTvyrcnEmHFgXMwOeluIoyqXP7oSJhKK0tBkLP+4+M+Bwyl+Xl6edI4ldZCO/QzrGI2xobyMqjybe9bvNG6x2vVprSXeHIDdRx705+QMbVk7AZQb6VhXYuHIRqifyxlhgW4QBm7+JQu8I3lDakpuBl49Ob8yFlyvtrpza23uw==|920 \ No newline at end of file +}//joap596P2warTEIZ0oavzC+Y8d5yH0fYJ1vIOJxqNKCXb2ee29TRSVfGhYNsHLTi1m5qBYuUlRIBZanJqp7OOBluS9G0Lsy40e057dA6ONH3I4ZWo9OkBokBUCCjLteh77MklILpxnHgV5UnU9Bd5s056110SFErZWf/wiQTMfOInEFDXuHtgDou5QzE5wddn4RbMh87gHvjyHeWUnarY95O5GZIy5JQsF1vrpuImJbKF6ABvpHYeYLbgaKTz55szJB00loSPYAHRKYv7q1P747Jhj0NFupGBE7B7Ee8awoPKjm//pJ2OAZHsxDqoVU85GYE3kSNQAtJioAtJOVXvdcrSwRpf5PCVyBEnpyDmwWRN08A0SwRXLoJ9+IXV24lj5nNEAL9avHTtkQ2w3PYFIX7Jy/9IYZXGX+ZLlm8qD/quFcoLNdov3EGLw7dqb2KENCmrwymQm+9pJes01+Dgc7eKHO7cAfpF4qcCQ6p0p8iPly8eGzXlxwdQbTmdRsle2e0BnD9a23/ZOBEQYubtq0Sip2rPDwWFhEN88CdvdpjhEjUIgGq/vL3lp7bFDZ2SBnVrvzXisbCKkRj5TxeMJ0NuGAI/7pG/TDau5h8xzzbN9Mixul0FYPFdHr/3ROyavehPxMltaEBBsDBpeNk1dhrpO0kWlalLoeyKzxlg8RZLGZw4RwqouBJgyJ1GU/nvxYCA3fCL1EIB2yIwNA6z4DmIh0Mhh2vgpLCAAf/Wbq5qWS7oBfwZIFJm09gCXeXoQ58YFtKg7WUTljSo1SFygISdxdQAz1bC2HmudvOpnd3BGBLqOz1mtncZHzFxrDHNukHaU2+5TIievE/OeSiJJUNQNHlPG6W0MmeLLe9h3MnR1aOmq9TMWieZLKv1/yasXDv1YdtZeAS238PGZQnXQ==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目列表.json b/Pages/项目首页/项目列表.json index 0dc92a18..92cf3474 100644 --- a/Pages/项目首页/项目列表.json +++ b/Pages/项目首页/项目列表.json @@ -524,7 +524,7 @@ } } ], - "ID": "5447882c-f225-4c43-bab5-58d64f8a58af" + "ID": "8ca03558-2ba6-47e9-9770-db290212db59" }, { "CommandList": [ @@ -537,7 +537,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "59b5f930-0000-40c5-be03-f1a5b9342bea" + "ID": "54414511-ed05-493e-bbd1-d55f8a97ba5d" } ] } @@ -880,4 +880,4 @@ "PaperSize": {}, "Margin": {} } -}//rLC3+L/iGY+PezsWZXv2GT7qFsmFzw2Th3cn1QfrIeqY9MKFfqlrdCeWXO33HLfnmx9dIkoIMMaNZPwkEcAk+/oNO4J6s3NjO4mlRYsJDl76wAFJjYGCZ3DlIUMYC/S1b42jbydn1x3EIn/1KD9b3q5mW32AjKOnBjm5YzSavADvKCbfZarY98SRcoWU6WLPE0YC6b5vjSDImnvvbw3VcKMi7xjIf47Yp047yLUTNB71LKBEMxKaPpsttsYz5jaZPoL2npH7H/ZUHM4ZQjWjyKD89boJVTYdFg29CYu0Rpk4ZGSSj4AAqRALvBIFA+/OR4/iouC9kq/mC+Vc7xGFY/eydbTRTC6MyHRjjEt8149hnlqvAYjZwFoJilNSVdS6WwptlijEbFhAXW1/97j3qmOOtXkT7BdUBkHlqEPqckhJNBf/f9vkIMa1zmyCxQMp8V9Y0ajuBMnm+jDIbJhaKz45Og1YMsJZ+gd8W9K1sBN3iHSx0AQnb+GI3/ftGhE/woOKgCZGUiAn7snxOweUJVuH5G+TZizRb4u93ErZ6nlvLKY1i4lvtQiw8Z8CzVVKiDjA1YZkoxUwvpRn6sAEx2cKtXzE6AA9Zz9FNYI6Vp4ykqNXdVT8+7tctPsQoRttBeUfeioizU6qnsJubuiEq17QLkSNmKxobpz3Sq/lkIp3e8y2oUAsUgom9cwA/ua1EWjyq/Ejdn7hCnDG+0UBW0QcDYdYPtvR1P/+lbUbG0IFi51/cCXSqiFCEOmG6yFW9ILVyXMTNWC6ZGyrK1IbPvGVzvvqfXGH/8IxNm7g00PkzTjGv251IJvu90HiHElqxOg0JVQ6CapESLYVrauz7xtkgddxHABeJiihf/NVCkcfAJ1NTtAmRQk/dHsfY2nAt5jNO/Mibz1b1orMcgvmVg==|920 \ No newline at end of file +}//Juprtj1QbYLFtPo+vVB6pBQfauZhKYhD9N1CnCe2ov29QObdrpbB83xj0ewX9JSarwIH8LaC1VhgfctHud7sCO3qBzy+K8djjk9nyhmNfWiU+2HeG22dfLbf00tEZHymYAwWAIK5N2PH8iFIbqlO0sOLsv5XxqmKtK/sX4Xt1z4Yeq8Yfy2ZbuJRc659fxWMNH2+qJu+MneAymXRjbs21sIVQKTVEJx2FE5CslC4Uer6CDahe8J7XsDCR5iUHwnDmpw05y2Ywhw8kIS8uZGVL6a1ZXr9ThAElr1pqUnYBP6iKArVNF1jX1yZtsQjix+FjbtwtPXY6zpBI9YLksEkRHsPXtw+odcb4WvpbBFFrHZnig+fLQQfSyRxejG76jtGyCl8ljNxb27DJx1+x4MqbU9vnUfOa9wwkqkNpyvLrI7DGMlQujKraILXjwnR2cwW3U5guwGTofKAG6euS3qT+Qfm9vaISv0Qlb6pRqEZ6yxNasRf5fEHx4J5QxXyQn9dZZRu1yU53/j2Zn4XEGgoKw5zKWgpfqAcM6EY6/HuNMf2he4agQAXPTQGVt+NVumOui/IuSdewROmm1E2pg1uRIQv23j4DGLZF/O7BGhEJSuZ2PZDH71bBTF36HTjfrlXi0N9oXZxb2iXv4iOPfgHV94FZN8T7hAALk7leb3nhjIUo1f8DUz85pLQ+wX0o9tQABmNQW2ohMbXxFDeeAMSGqlJ2OZZmwBIBiQgxWcdseShB50/Y/dBykxDcKsvJBztWp83bKFFjzzBgO3w+8lxjiyZ+RI7mjMbNpVUSR3fWSgZ8zTvJRrZxImUcdHBuzFMfo1LdEkyLXLP3GkqG3D1PIjg7YrgSB/g3Po2hFYJznuRenxQfY1OOZcl11IRq/1SiWkMM9VsAu6CLtQCV/hcVg==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目标题.json b/Pages/项目首页/项目标题.json index 29be89b3..5bb003e3 100644 --- a/Pages/项目首页/项目标题.json +++ b/Pages/项目首页/项目标题.json @@ -205,18 +205,64 @@ "Placement": { "SerializeProperty": "=项目标题!F2" }, - "PageName": "切换项目", - "PassValues": [ - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目标题!项目ID" - }, - "TargetCell": { - "SerializeProperty": "=切换项目!点击按钮" + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=是否为确定" + } + ] + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "LoadingCommand.StartLoadingCommand, LoadingCommand", + "LoadingTextColor": "Background 1 0" + }, + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "24a388d6-e3a7-492d-8b87-27ac72cb0457" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目标题!选择项" + } + } + }, + { + "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", + "JavaScript": "Forguncy.Page.reloadBindingData();", + "ID": "bccb5122e98246ef9cc0358dbbb17b37" + }, + { + "$type": "LoadingCommand.EndLoadingCommand, LoadingCommand" + } + ], + "ID": "e41ad2e9-e738-44ae-9d9c-c879262f7346" + } + ] } + ], + "ParamProperties": { + "IsOK": "是否为确定", + "选择项": "选择项" } - ] + }, + "PageName": "切换项目" } ], "Size": 20, @@ -279,18 +325,166 @@ "Placement": { "SerializeProperty": "=项目标题!O2" }, - "PageName": "项目菜单", - "PassValues": [ - { - "Source": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目标题!菜单回调" - }, - "TargetCell": { - "SerializeProperty": "=项目菜单!点击按钮" + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目标题!是否为确定" + } + ] + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.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": 3, + "DrawerDirection": 3, + "ShowDrawerHeader": true, + "PageName": "项目信息", + "LoadBindingDataOption": 1 + } + ], + "ID": "bf09c564-9887-49a5-ba0c-7ed60259cd71" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目标题!选择项" + } + ] + }, + "value": "项目岗位" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目配置首页" + } + ], + "ID": "d315568a-84c1-474b-b36d-0902ce41841f" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目标题!选择项" + } + ] + }, + "value": "预算申请" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon", + "ShareCommandContainerRefer": { + "ShareCommandContainerID": "be350e6b-c945-4a73-9a48-75e7d31ae2f9" + }, + "Params": [ + { + "ParamReferObject": { + "ParamID": "30be91f8-0920-4879-bfdb-73a2443b9f1b", + "ShareCommandContainerReferObject": { + "ShareCommandContainerID": "be350e6b-c945-4a73-9a48-75e7d31ae2f9" + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目标题!项目ID" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + } + } + ], + "ID": "aa5575cc-9221-4088-8d57-21b70838acdc" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目标题!选择项" + } + ] + }, + "value": "移到回收站" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目表", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "删除", + "GUID": "a925e7fa-672b-4320-9222-0b8198e0e094" + }, + "Value": "1" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "操作完成" + } + ], + "ID": "d4fd1c0a-43f0-4f6b-b753-a66d2a2d2b8e" + } + ] + } + ], + "ID": "73c7ce0a-6c29-4a9c-8bc4-f34f2602c10d" + } + ] } + ], + "ParamProperties": { + "IsOK": "是否为确定" } - ] + }, + "PageName": "项目菜单" } ], "Text": "菜单", @@ -354,7 +548,7 @@ ] } ], - "ID": "da56ecd8-7d30-4a29-abd1-d49d6cebf3fd" + "ID": "e72e5d6b-ef17-437e-bf77-3f73b5123686" } ] } @@ -407,213 +601,6 @@ "type": "default", "position": "top" } - }, - "5,14": { - "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": "=项目标题!O6" - } - ] - }, - "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": "86586cd01c1049e38b937a09ba094830" - }, - { - "$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": 3, - "DrawerDirection": 3, - "ShowDrawerHeader": true, - "PageName": "项目信息", - "LoadBindingDataOption": 1 - } - ], - "ID": "432d1de8-79b3-46a2-be71-b6f643050112" - }, - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=项目标题!事件值" - } - ] - }, - "value": "项目岗位" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "项目配置首页" - } - ], - "ID": "887efbed-c269-4d47-b097-40de6e92cefd" - }, - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=项目标题!事件值" - } - ] - }, - "value": "预算申请" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon", - "ShareCommandContainerRefer": { - "ShareCommandContainerID": "be350e6b-c945-4a73-9a48-75e7d31ae2f9" - }, - "Params": [ - { - "ParamReferObject": { - "ParamID": "30be91f8-0920-4879-bfdb-73a2443b9f1b", - "ShareCommandContainerReferObject": { - "ShareCommandContainerID": "be350e6b-c945-4a73-9a48-75e7d31ae2f9" - } - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目标题!项目ID" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - } - } - ], - "ID": "d4647af2-787f-476d-8ff9-74d6a08fbb6c" - }, - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=项目标题!事件值" - } - ] - }, - "value": "移到回收站" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目表", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "删除", - "GUID": "ce76ded5-121c-47f3-9f26-867f46bab44c" - }, - "Value": "1" - } - ] - }, - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": "操作完成" - } - ], - "ID": "f131f14e-9df9-4911-9aff-cea7f21c3331" - } - ] - } - ], - "ID": "21a5528e-9600-4185-8a9f-ec4cf4f29b99" - } - ] - } - ], - "ID": "4d66009a-a150-4dbe-b94c-cd85de9109ca" - } - ] - } - ] - } } }, "StyleDatas": { @@ -641,10 +628,6 @@ { "FontFamily": 0, "FontSize": 13.333333333333332 - }, - { - "Background": 4, - "Formatter": 5 } ], "Types": { @@ -652,9 +635,7 @@ "Body", "Text 1 50", "Left", - "[AUTO]General", - "#FFFFFF00", - "@" + "[AUTO]General" ] }, "CellStyles": { @@ -687,8 +668,7 @@ "4,12": 0, "4,13": 0, "5,10": 0, - "5,13": 0, - "5,14": 6 + "5,13": 0 }, "SheetStyle": { "FontFamily": 0 @@ -795,4 +775,4 @@ "Formula": "项目标题!$O$6" } ] -}//gHQqfV2fyX6FwkTSVpFR/eVqcU10fVaciAcY+nqHeu9SAsb1rOkXKHRz/qpqbKyaMEwo6azz0tlE11fekVK3niAD9TAWGsd3+PY+H+mssn5hux824CmV0L/GRQlEj2fT/MPefpQYaxA8kbd2h7kUpo1PXeTjy7kazVyfxs0qHEcphHBximw329/Tg1ksLj2jbfOe4hzt/Bee+W2T5S8pCw1g1XFt0H4a2MOYEfIWvphjIIjK+L863K7QVhuyIgNja3VgHE4I2yrI6497FJbGiKC/4Dp1nudZzFpUqRQBs6G98ei/1jrr/qp9HlP9HNSUcgqprjeuO9y9gseR1+RogV1uGWyLkW42OSidD9oh0q9+U/xU7BlNcWdHXZ4sd6ww6+KGYxYvGlal0YlAv0eyz6iLxj398q9VW2tlZgIUIoz6HYXNMZgiXwzTF7mO+wI0+KipFOgVdnocxKH8JkNiiotFqOsjpzIUrljqA64bGDw3dPIORcYRmn4ri9W1JpgXOS6CMDfcV7LcIHitij6Te1XXLCBpCg8R86kgYv5Udn+URRjh+URSxG85Uq+BDnFhOXMRJpCmYCNtILJaM848hqnOpX5vgvgCMbaLyBGYA02GZq7cPLvf2jNTIaiNsPvnVt1motlcJ7zaXzgslCaFyDJluKWoJ9kbHeEz2OCOSodeJ6uLElK0jhItBJhNxBZyU5OqKMBVWs+qPE8pJ9hnt7dtWJGpzX4ZiaCN6rKDw6VgyQQoD14dB9d4F8ydWR7SMY6TjIEH2zcqaHJWr4FjQWAhq9bxNq9qqvGyZMVJhEWz6oLhTSfxjIhM/7P7JWmRWyKMvus+M/aWsf+jUKw5rGnMXV2q9p4FnJCvyDYaKBy+nOku6CZB0X0FwKXvPXk/fXtZa/w/uOfL6mfJ1FoNYw==|920 \ No newline at end of file +}//T5FNFO9EbBAeQPnB2P7MRjYY8S+dlbodK5Mbhpj0HW2Ox6fpK83SJOWySFOOaUIGjyE3x8n5FpCbxpfcxOikgYDLSbEjHTZlEkjz4jd0ihWbNOpHuXDQ/ZGj2grNSKHjgTDEm/LSk5Q4Mv1VDuDjCw9gsH6gyJqohHDMOaIMZJ1GUyj91d3iiVbMehUAg19xIcFinGvg+o/XZUAVuCGqnfyOzsFAHzhQkJiZRAx8bZGk79zEdRBV5xAY3UJu3T8nWvT9HAk16LEdCuCjwu4HLOEJRSNbIZyc4lPseJFtdTljfRJnebV6AmrwoZaPTLkijqkNvGCxiyrgjVzo6M6XvphW3bF4hiFDcASwKiwQdp4+0vsW9eIBi2UqJRDpRwtNwPA3klF8pcby0glJsL1jWkqmFRVqIQICoTXvAFecDHGTqhdjAlTkSe6gEc56RBh998UP72TV9b/LXX3APzHIdFgcnvf17I6h8Tdf4Em32YzRugr6ifUleHjkleXfSA4hKoChuvgnAA5D1VemQZpB1jJh/05kaxjb1FD1tITmePzv1+ZXedLXSvQT/sTuvmulQa866eVsP1gdglPTYyFQL5495hs0aJHoOWSAo5cY4ZKGJ+QV8FrUpO126piCusn2/PuevGGejHmTuHhpPRz9STAr2VYMNpWgKcLC27KW6Xatdz8rtaJsQzbMzU4Mo4RFiS8P5ft28qMns6/e2C8hLgU/GeXWww/QeeI4anhWPlRgLcbi2puIAX5n4/5PEXI860wgbFOW02qTloYP3jONi/DyX6jmtMdVJFLsOk28daD74+hM4OKAgNpGHkrWpJbWjeStZBv2ZAd+ZThNOmVX3OZHe9a6O+cwqoogqxoOwDwUvt7+XakZ7yxDar2Ziarh81p8lZriMX99VyWJTGM2yA==|920 \ No newline at end of file diff --git a/Process/预算申请.bpmn b/Process/预算申请.bpmn index 7de40a2d..1fb1bd1e 100644 --- a/Process/预算申请.bpmn +++ b/Process/预算申请.bpmn @@ -4,7 +4,7 @@ - + @@ -35,7 +35,7 @@ - + Flow_1y1g7g4 Flow_1mecf6x diff --git a/ShareCommandContainers/发起预算申请.json b/ShareCommandContainers/发起预算申请.json index 990bd3a2..96496f9c 100644 --- a/ShareCommandContainers/发起预算申请.json +++ b/ShareCommandContainers/发起预算申请.json @@ -160,6 +160,11 @@ "value": "1" }, "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", "PageName": "FGC_任务详情", @@ -177,10 +182,15 @@ "LoadBindingDataOption": 1 } ], - "ID": "be24e8c1-f025-4116-9484-ddad03b75bf7" + "ID": "023f73ad-0ece-44dc-b217-4085a0807ce0" }, { "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, { "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", "Title": "温馨提示", @@ -191,15 +201,20 @@ "BtnText": "知道了" } ], - "ID": "6fd497c4-33ca-482d-9577-60fdd1555668" + "ID": "2a679d5a-edbc-4040-81c3-7274c398b7e6" } ] } ], - "ID": "35634334-d04c-48af-b26d-7cc4d54836c4" + "ID": "e05e8993-c102-44ef-9723-8ba257bc5a06" }, { "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, { "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", "FunctionName": "warning", @@ -208,15 +223,20 @@ "BtnText": "知道了" } ], - "ID": "40878c16-ed4a-4b8b-9eb0-b303a1efed51" + "ID": "848d74d7-7547-4c10-ade6-df9775b6e8ca" } ] } ], - "ID": "e6565bd7-1075-4912-8738-5520843e0ecb" + "ID": "c6dc1fd2-cded-4def-8a09-8d28c3ec323d" }, { "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, { "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", "FunctionName": "warning", @@ -225,14 +245,9 @@ "BtnText": "知道了" } ], - "ID": "94c58291-8ebc-4a2a-8d53-74c8f2b6eabc" + "ID": "21c88400-59c0-4462-b63e-e3902aa98503" } ] - }, - { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Title": "加载中" } ] } \ No newline at end of file diff --git a/Tables/任务/任务表.json b/Tables/任务/任务表.json index 4eeb9462..bb3b2e25 100644 --- a/Tables/任务/任务表.json +++ b/Tables/任务/任务表.json @@ -111,6 +111,7 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DefaultValue": 0, "DatabaseColumnType": "bigint", "MaxLength": -1, "Name": "任务状态", diff --git a/Tables/任务/子任务视图.json b/Tables/任务/子任务视图.json index 73cafa22..79986bca 100644 --- a/Tables/任务/子任务视图.json +++ b/Tables/任务/子任务视图.json @@ -36,7 +36,7 @@ "DatabaseColumnType": "nvarchar", "MaxLength": -1, "Name": "参与者", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", @@ -64,7 +64,7 @@ "DatabaseColumnType": "bigint", "MaxLength": -1, "Name": "版本", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", @@ -78,7 +78,7 @@ "DatabaseColumnType": "nvarchar", "MaxLength": -1, "Name": "备注", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", @@ -99,21 +99,21 @@ "DatabaseColumnType": "bigint", "MaxLength": -1, "Name": "分组ID", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "bigint", "MaxLength": -1, "Name": "工时核定方式", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", "MaxLength": -1, "Name": "关联资源", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", @@ -134,7 +134,7 @@ "DatabaseColumnType": "nvarchar", "MaxLength": -1, "Name": "FGC_LastModifier", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "ColumnType": "System.Byte[], System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", diff --git a/Tables/用户/用户信息视图.json b/Tables/用户/用户信息视图.json index 67c797a6..e8b24114 100644 --- a/Tables/用户/用户信息视图.json +++ b/Tables/用户/用户信息视图.json @@ -43,13 +43,6 @@ "Name": "组织上级", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "System.String", - "MaxLength": -1, - "Name": "头像", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "System.String", @@ -89,7 +82,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 [部门], [小组] 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 [小组] FROM [FGC_UserInfoTable]", "ViewType": 1 }, "PrimaryKey": [ diff --git a/Tables/项目任务/项目表.json b/Tables/项目任务/项目表.json index 72f98a1e..b0908f1e 100644 --- a/Tables/项目任务/项目表.json +++ b/Tables/项目任务/项目表.json @@ -429,6 +429,7 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DefaultValue": 0, "DatabaseColumnType": "bigint", "MaxLength": -1, "Name": "项目状态", diff --git a/Theme/CellTypeStyles b/Theme/CellTypeStyles index a0d9217f..fb1c9b97 100644 --- a/Theme/CellTypeStyles +++ b/Theme/CellTypeStyles @@ -1 +1 @@ -{"Forguncy.CustomMenu.ForguncyMenuCellTypeStyleTemplateSupportAttribute":[{"Key":"透明菜单","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Background 1 -15","Background":"Text 1 0","BorderRadiusString":"6px 6px 6px 6px"},"HoverStyle":{"Background":"Text 1 15"},"SelectedStyle":{"FontColor":"Background 1 0","Background":"Background 2 -75"},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"FontColor":"Background 1 -15","Background":"Text 1 0","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Text 1 15"},"SelectedStyle":{"FontColor":"Background 1 0","Background":"Text 1 15"},"Transition":"0.3s"},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"BalckWhite","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","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"}}}},{"Key":"流程样式","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 35","Background":"#FFECF9FF","BorderRadiusString":"0px 0px 0px 0px","Bold":true},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"Background":"Accent 1 80"},"Transition":"0.15s"},"LEVEL1":{"NormalStyle":{"FontColor":"Text 1 35","Background":"#FFF3F9FC","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"FontColor":"Accent 1 0","Background":"Background 1 0"},"Transition":"0.15s"},"LEVEL2":{"NormalStyle":{"FontColor":"Accent 1 14","Background":"Background 1","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"Background":"Accent 1 80"},"Transition":"0.15s"},"LEVEL3":{"NormalStyle":{"FontColor":"Accent 1 14","Background":"Background 1","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"Background":"Accent 1 80"},"Transition":"0.15s"}}}],"Forguncy.RepeaterCellTypeStyleTemplateSupportAttribute":[{"Key":"渐变卡片","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"linear-gradient(-180deg, #FFFDFBFB 0.00%, #FFEBEDEE 100.00%)","BorderString":"1px solid Background_2_0","BorderRadiusString":"10px 10px 10px 10px","BoxShadowString":"3px 3px 10px 0px #0B000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"HoverStyle":{"BorderString":"1px solid Accent_1_60","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"FocusStyle":{"BorderString":"1px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"ActiveStyle":{"MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"SelectedStyle":{"BorderString":"1px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"Transition":"0.3s"}}},{"Key":"普通_悬浮变白_","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 1 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"竖排无样式","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 2 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"BlackWhite","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderString":"2px solid Background_2_0","BorderRadiusString":"8px 8px 8px 8px","BoxShadowString":"3px 3px 5px 0px #20000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"HoverStyle":{"BoxShadowString":"5px 7px 15px 0px #17000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"FocusStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"ActiveStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"SelectedStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"Transition":"0.3s"}}},{"Key":"_RS_Static","Category":"_RS_Normal","Styles":{"TEMPLATE":{"NormalStyle":{"BorderTopString":"","BorderRightString":"","BorderBottomString":"","BorderLeftString":"3px solid Accent_1_0","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px","MarginTop":10,"MarginBottom":10},"Transition":"0.15s"}}},{"Key":"_RS_Selectable","Category":"_RS_Normal","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"4px 4px 4px 4px","BoxShadowString":"0px 0px 5px 0px Text_1_5_38","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"BoxShadowString":"0px 0px 7px 0px Accent_1_0_89"},"FocusStyle":{"BoxShadowString":"0px 0px 7px 0px Accent_1_0_165"},"ActiveStyle":{"BoxShadowString":"0px 0px 7px 0px Accent_1_0_165"},"Transition":"0.15s"}}},{"Key":"样式1","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"2px 2px 2px 2px","MarginLeft":10,"MarginRight":10,"MarginTop":10},"Transition":"0.15s"}}}],"Forguncy.ImageCellTypeStyleTemplateSupportAttribute":[{"Key":"按钮图标","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Background 1 -50","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"上圆角封面","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"8px 8px 0px 0px"}}}},{"Key":"pd_10","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":10,"PaddingBottom":10}}}},{"Key":"中圆角","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"10px 10px 10px 10px"}}}},{"Key":"_RS_Mini","Category":"_RS_RecommendStyle","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Text 1 35","BorderRadiusString":"0px 0px 0px 0px","MarginLeft":16,"MarginRight":16,"MarginTop":16,"MarginBottom":16},"HoverStyle":{"FontColor":"Accent 1 40","MarginLeft":16,"MarginRight":16,"MarginTop":16,"MarginBottom":16},"ActiveStyle":{"FontColor":"Accent 1 -25","MarginLeft":16,"MarginRight":16,"MarginTop":16,"MarginBottom":16}}},"Scope":1}],"Forguncy.ButtonCellTypeStyleTemplateSupportAttribute":[{"Key":"动态背景","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"6px 6px 6px 6px"},"DisableStyle":{"Opacity":0.445079736545843}}}},{"Key":"链接样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 0"},"Transition":"0.3s"}}},{"Key":"圆角浮动","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1 -50","Background":"Background 1 0","BorderString":"1px solid Background_2_0","BorderRadiusString":"20px 20px 20px 20px","BoxShadowString":"5px 5px 16px 0px #10000000"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"Gost","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"8px 8px 8px 8px"},"HoverStyle":{"Background":"Background 2 0"},"DisableStyle":{"Opacity":0.44507973654584293},"Transition":"0.3s"}}},{"Key":"流程样式2","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Accent 1 40","Background":"Background 1 0","BorderString":"1px solid Text_2_40","BorderRadiusString":"4px 4px 4px 4px","MarginLeft":4,"MarginRight":4,"MarginTop":4,"MarginBottom":4},"HoverStyle":{"FontColor":"Text 2 40","Background":"Accent 1 80","BorderString":"1px solid Text_2_40"},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_60"},"ActiveStyle":{"FontColor":"Background 1 0","Background":"Accent 1 40","BorderString":"1px solid Accent_1_40"},"DisableStyle":{"FontColor":"Background 1 -25","Background":"#FFFFFF","BorderString":"1px solid Background_1_-25"},"Transition":"0.15s"}}},{"Key":"流程样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1","Background":"Accent 1","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"4px 4px 4px 4px","MarginLeft":4,"MarginRight":4,"MarginTop":4,"MarginBottom":4},"HoverStyle":{"Background":"Accent 1 20"},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_40"},"ActiveStyle":{"Background":"Accent 1 -20"},"DisableStyle":{"FontColor":"#EEEEEE","Background":"Text 1 50","BorderString":"1px solid #AAAAAA"},"Transition":"0.15s"}}}],"Forguncy.HyperlinkCellTypeStyleTemplateSupportAttribute":[{"Key":"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"}}}}],"Forguncy.ProcessPanelCellTypeStyleTemplateSupportAttribute":[{"Key":"流程样式2","Category":"_RS_Custom","Styles":{"PROCESS_PANEL":{"NormalStyle":{"FontColor":"Accent 1","Background":"Background 1","BorderString":"1px solid Accent_1","BorderRadiusString":"4px 4px 4px 4px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"HoverStyle":{"Background":"Accent 1 80","BorderString":"1px solid Accent_1","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_60","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"ActiveStyle":{"Background":"Accent 1 80","BorderString":"1px solid Accent_1","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"DisableStyle":{"FontColor":"#EEEEEE","Background":"#FFFFFF","BorderString":"1px solid Background_1_-35","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"Transition":"0.15s"}}},{"Key":"流程样式","Category":"_RS_Custom","Styles":{"PROCESS_PANEL":{"NormalStyle":{"FontColor":"Background 1","Background":"Accent 1","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"4px 4px 4px 4px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"HoverStyle":{"Background":"Accent 1 20","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_60","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"ActiveStyle":{"Background":"Accent 1 -20","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"DisableStyle":{"FontColor":"#EEEEEE","Background":"Background 1 -35","BorderString":"1px solid Background 1 -35","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"Transition":"0.15s"}}}]} \ No newline at end of file +{"Forguncy.CustomMenu.ForguncyMenuCellTypeStyleTemplateSupportAttribute":[{"Key":"透明菜单","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Background 1 -15","Background":"Text 1 0","BorderRadiusString":"6px 6px 6px 6px"},"HoverStyle":{"Background":"Text 1 15"},"SelectedStyle":{"FontColor":"Background 1 0","Background":"Background 2 -75"},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"FontColor":"Background 1 -15","Background":"Text 1 0","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Text 1 15"},"SelectedStyle":{"FontColor":"Background 1 0","Background":"Text 1 15"},"Transition":"0.3s"},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"BalckWhite","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","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"}}}},{"Key":"流程样式","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 35","Background":"#FFECF9FF","BorderRadiusString":"0px 0px 0px 0px","Bold":true},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"Background":"Accent 1 80"},"Transition":"0.15s"},"LEVEL1":{"NormalStyle":{"FontColor":"Text 1 35","Background":"#FFF3F9FC","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"FontColor":"Accent 1 0","Background":"Background 1 0"},"Transition":"0.15s"},"LEVEL2":{"NormalStyle":{"FontColor":"Accent 1 14","Background":"Background 1","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"Background":"Accent 1 80"},"Transition":"0.15s"},"LEVEL3":{"NormalStyle":{"FontColor":"Accent 1 14","Background":"Background 1","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"Background":"Accent 1 80"},"Transition":"0.15s"}}}],"Forguncy.RepeaterCellTypeStyleTemplateSupportAttribute":[{"Key":"渐变卡片","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"linear-gradient(-180deg, #FFFDFBFB 0.00%, #FFEBEDEE 100.00%)","BorderString":"1px solid Background_2_0","BorderRadiusString":"10px 10px 10px 10px","BoxShadowString":"3px 3px 10px 0px #0B000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"HoverStyle":{"BorderString":"1px solid Accent_1_60","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"FocusStyle":{"BorderString":"1px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"ActiveStyle":{"MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"SelectedStyle":{"BorderString":"1px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"Transition":"0.3s"}}},{"Key":"普通_悬浮变白_","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 1 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"竖排无样式","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 2 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"BlackWhite","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderString":"2px solid Background_2_0","BorderRadiusString":"8px 8px 8px 8px","BoxShadowString":"3px 3px 5px 0px #20000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"HoverStyle":{"BoxShadowString":"5px 7px 15px 0px #17000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"FocusStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"ActiveStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"SelectedStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"Transition":"0.3s"}}},{"Key":"_RS_Static","Category":"_RS_Normal","Styles":{"TEMPLATE":{"NormalStyle":{"BorderTopString":"","BorderRightString":"","BorderBottomString":"","BorderLeftString":"3px solid Accent_1_0","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px","MarginTop":10,"MarginBottom":10},"Transition":"0.15s"}}},{"Key":"_RS_Selectable","Category":"_RS_Normal","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"4px 4px 4px 4px","BoxShadowString":"0px 0px 5px 0px Text_1_5_38","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"BoxShadowString":"0px 0px 7px 0px Accent_1_0_89"},"FocusStyle":{"BoxShadowString":"0px 0px 7px 0px Accent_1_0_165"},"ActiveStyle":{"BoxShadowString":"0px 0px 7px 0px Accent_1_0_165"},"Transition":"0.15s"}}},{"Key":"样式1","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"2px 2px 2px 2px","MarginLeft":10,"MarginRight":10,"MarginTop":10},"Transition":"0.15s"}}}],"Forguncy.ImageCellTypeStyleTemplateSupportAttribute":[{"Key":"按钮图标","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Background 1 -50","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"上圆角封面","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"8px 8px 0px 0px"}}}},{"Key":"pd_10","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":10,"PaddingBottom":10}}}},{"Key":"中圆角","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"10px 10px 10px 10px"}}}},{"Key":"_RS_Mini","Category":"_RS_RecommendStyle","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Text 1 35","BorderRadiusString":"0px 0px 0px 0px","MarginLeft":16,"MarginRight":16,"MarginTop":16,"MarginBottom":16},"HoverStyle":{"FontColor":"Accent 1 40","MarginLeft":16,"MarginRight":16,"MarginTop":16,"MarginBottom":16},"ActiveStyle":{"FontColor":"Accent 1 -25","MarginLeft":16,"MarginRight":16,"MarginTop":16,"MarginBottom":16}}},"Scope":1}],"Forguncy.ButtonCellTypeStyleTemplateSupportAttribute":[{"Key":"动态背景","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"6px 6px 6px 6px"},"DisableStyle":{"Opacity":0.445079736545843}}}},{"Key":"链接样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 0"},"Transition":"0.3s"}}},{"Key":"圆角浮动","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1 -50","Background":"Background 1 0","BorderString":"1px solid Background_2_0","BorderRadiusString":"20px 20px 20px 20px","BoxShadowString":"5px 5px 16px 0px #10000000"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"Gost","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"8px 8px 8px 8px"},"HoverStyle":{"Background":"Background 2 0"},"DisableStyle":{"Opacity":0.44507973654584293},"Transition":"0.3s"}}},{"Key":"流程样式2","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Accent 1 40","Background":"Background 1 0","BorderString":"1px solid Text_2_40","BorderRadiusString":"4px 4px 4px 4px","MarginLeft":4,"MarginRight":4,"MarginTop":4,"MarginBottom":4},"HoverStyle":{"FontColor":"Text 2 40","Background":"Accent 1 80","BorderString":"1px solid Text_2_40"},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_60"},"ActiveStyle":{"FontColor":"Background 1 0","Background":"Accent 1 40","BorderString":"1px solid Accent_1_40"},"DisableStyle":{"FontColor":"Background 1 -25","Background":"#FFFFFF","BorderString":"1px solid Background_1_-25"},"Transition":"0.15s"}}},{"Key":"流程样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1","Background":"Accent 1","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"4px 4px 4px 4px","MarginLeft":4,"MarginRight":4,"MarginTop":4,"MarginBottom":4},"HoverStyle":{"Background":"Accent 1 20"},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_40"},"ActiveStyle":{"Background":"Accent 1 -20"},"DisableStyle":{"FontColor":"#EEEEEE","Background":"Text 1 50","BorderString":"1px solid #AAAAAA"},"Transition":"0.15s"}}}],"Forguncy.HyperlinkCellTypeStyleTemplateSupportAttribute":[{"Key":"黑色","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"FontColor":"Text 1 0","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 25"},"DisableStyle":{"Opacity":0.41316738912675405}}},"StyleTemplateFashionScope":2},{"Key":"Gost","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"Background":"#00FFFFFF","BorderRadiusString":"5px 5px 5px 5px","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"HoverStyle":{"Background":"Background 2 0"},"Transition":"0.3s"}}}],"Forguncy.TextCellTypeStyleTemplateSupportAttribute":[{"Key":"Gost","Category":"_RS_Custom","Styles":{"MAIN":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Background 2 0"},"FocusStyle":{"FontColor":"Text 1 0","Background":"Background 2 0"},"Transition":"0.3s"},"FGC_BUILDIN_ERROR":{"NormalStyle":{"BorderString":"1px solid #FFFF0000","BorderRadiusString":"5px 5px 5px 5px"}}}}],"Forguncy.ProcessPanelCellTypeStyleTemplateSupportAttribute":[{"Key":"流程样式2","Category":"_RS_Custom","Styles":{"PROCESS_PANEL":{"NormalStyle":{"FontColor":"Accent 1","Background":"Background 1","BorderString":"1px solid Accent_1","BorderRadiusString":"4px 4px 4px 4px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"HoverStyle":{"Background":"Accent 1 80","BorderString":"1px solid Accent_1","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_60","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"ActiveStyle":{"Background":"Accent 1 80","BorderString":"1px solid Accent_1","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"DisableStyle":{"FontColor":"#EEEEEE","Background":"#FFFFFF","BorderString":"1px solid Background_1_-35","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"Transition":"0.15s"}}},{"Key":"流程样式","Category":"_RS_Custom","Styles":{"PROCESS_PANEL":{"NormalStyle":{"FontColor":"Background 1","Background":"Accent 1","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"4px 4px 4px 4px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"HoverStyle":{"Background":"Accent 1 20","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_60","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"ActiveStyle":{"Background":"Accent 1 -20","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"DisableStyle":{"FontColor":"#EEEEEE","Background":"Background 1 -35","BorderString":"1px solid Background 1 -35","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"Transition":"0.15s"}}}]} \ No newline at end of file diff --git a/Upload/485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.png b/Upload/485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.png new file mode 100644 index 00000000..200b076b Binary files /dev/null and b/Upload/485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.png differ diff --git a/Upload/485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.small.png b/Upload/485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.small.png new file mode 100644 index 00000000..614a2b37 Binary files /dev/null and b/Upload/485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.small.png differ diff --git a/Upload/a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.png b/Upload/a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.png new file mode 100644 index 00000000..200b076b Binary files /dev/null and b/Upload/a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.png differ diff --git a/Upload/a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.small.png b/Upload/a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.small.png new file mode 100644 index 00000000..614a2b37 Binary files /dev/null and b/Upload/a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.small.png differ diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3 index c0f9faa9..68194788 100644 Binary files a/UserServiceDB.sqlite3 and b/UserServiceDB.sqlite3 differ