diff --git a/.collaboration b/.collaboration index 648b1cc9..9f546707 100644 --- a/.collaboration +++ b/.collaboration @@ -17,16 +17,7 @@ }, { "ModuleName": "Table/项目表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:29:36.0189125+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/任务表", @@ -138,17 +129,7 @@ }, { "ModuleName": "PCPage/项目列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:19:40.1210451+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目列表.json", - "Pages\\b90932e038f94707b54e571ff7cd84d.json" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目首页", @@ -156,29 +137,11 @@ }, { "ModuleName": "PCPage/项目首页", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T16:10:42.5553429+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T16:27:16.862004+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目标题.json" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目首页/子页面", @@ -194,16 +157,7 @@ }, { "ModuleName": "PCPage/任务首页", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:12:36.7643763+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务首页.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-基本信息", @@ -219,47 +173,15 @@ }, { "ModuleName": "MasterPCPage/FGC_母版页", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:52:39.7286671+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\FGC_母版页.json" - ] + "ModuleType": 3 }, { "ModuleName": "ApplicationSetting", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:46:27.2039005+08:00", - "ModuleType": 8, - "ToRemoveFiles": [ - "ApplicationSettings.json", - "favicon.ico" - ] + "ModuleType": 8 }, { "ModuleName": "Theme", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:52:39.7284652+08:00", - "ModuleType": 9, - "ToRemoveFiles": [ - "Theme\\CellTypeStyles", - "Theme\\ListViewStyles", - "Theme\\StyleDefaultNames", - "Theme\\ThemeConfig", - "Reports\\DefaultTheme.rdlx-theme" - ] + "ModuleType": 9 }, { "ModuleName": "image/内置图片", @@ -311,17 +233,7 @@ }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T16:00:33.846852+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json", - "UserFile\\BaseCss.css" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", @@ -341,22 +253,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T16:36:02.6926496+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\Notiflix_Forguncy.zip", - "Plugin\\PC组件包-ElementPlus-9_0_102_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\支持预览的附件上传-9_0_102_0.zip", - "Plugin\\设置当前行命令-9_0_102_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -392,17 +289,7 @@ }, { "ModuleName": "PCPage/任务-进展", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T16:30:27.9041552+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-进展.json", - "Pages\\77fae08dfbac4664a299aa7ec207218.json" - ] + "ModuleType": 1 }, { "ModuleName": "Table/任务进展", @@ -414,150 +301,51 @@ }, { "ModuleName": "PCPage/新增进展", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:10:55.9387324+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\新增进展.json" - ] + "ModuleType": 1 }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:42:47.7760866+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-02T15:42:47.7760887+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-02T15:42:47.7760901+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-02T15:42:47.7760918+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-02T15:42:47.7760932+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-02T15:42:47.7760945+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-02T15:42:47.7760959+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-02T15:42:47.7760973+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-02T15:42:47.7760993+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织级别视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -704,19 +492,6 @@ "ModuleName": "Image/项目文件.svg", "ModuleType": 38 }, - { - "ModuleName": "PCPage/项目信息", - "State": 2, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T16:35:54.4927436+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目信息.json" - ] - }, { "ModuleName": "image/图片", "ModuleType": 37 @@ -739,17 +514,7 @@ }, { "ModuleName": "Table/项目分组", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:42:47.7760822+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目分组.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -794,102 +559,42 @@ }, { "ModuleName": "Image/展开.svg", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:14:03.7518189+08:00", "ModuleType": 38 }, { "ModuleName": "PCPage/新增项目", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:25:23.2046731+08:00", "ModuleType": 1 }, { "ModuleName": "Image/暂无数据 (1).png", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:39:26.2047389+08:00", "ModuleType": 38 }, { "ModuleName": "Image/无数据插画 (1).png", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:39:26.2047408+08:00", "ModuleType": 38 }, { "ModuleName": "Image/缺省页.png", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:39:26.2047429+08:00", "ModuleType": 38 }, { "ModuleName": "Image/钉钉.png", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:39:26.204744+08:00", "ModuleType": 38 }, { "ModuleName": "Image/无数据插画.png", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:39:26.2047454+08:00", "ModuleType": 38 }, { "ModuleName": "Image/暂无内容 (1).png", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:39:26.2047465+08:00", "ModuleType": 38 }, { "ModuleName": "Image/项目.png", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:51:14.5872124+08:00", "ModuleType": 38 }, { "ModuleName": "Image/项目 (1).png", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-02T15:51:14.5872148+08:00", "ModuleType": 38 } ] \ No newline at end of file diff --git a/ApplicationSettings.json b/ApplicationSettings.json index 28ad7b32..b1bee397 100644 --- a/ApplicationSettings.json +++ b/ApplicationSettings.json @@ -7,5 +7,6 @@ "WebSitePort": 40013, "UserServicePort": 43797, "StartPage": "项目列表", - "StartDateFiscalYear": 1 + "StartDateFiscalYear": 1, + "PageLoadingMode": 2 } \ No newline at end of file diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index e1be373b..7049e85a 100644 Binary files a/ForguncyDB.sqlite3 and b/ForguncyDB.sqlite3 differ diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json index 66a8c956..d559653e 100644 --- a/MasterPages/FGC_母版页.json +++ b/MasterPages/FGC_母版页.json @@ -23,7 +23,7 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 794.0, + "DesignLengthInPixel": 665.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -57,17 +57,12 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 196.0 + "DesignLengthInPixel": 176.0 } }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 5.0 - } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 302.0, + "DesignLengthInPixel": 230.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -77,50 +72,82 @@ } } }, - "6": { + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 230.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 230.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 230.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 190.0 } }, - "7": { + "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, - "Count": 8, - "DefaultSize": 301.0 + "Count": 7, + "DefaultSize": 230.0 }, "Values": { "1,0": "TeamAction" }, "AttachInfos": { - "1,6": { + "1,0": { "CellType": { - "$type": "Forguncy.CurrentUserCellType, ServerDesignerCommon", - "CellCustomValue": "%CurrentUser%", - "ShowCircleUserPicture": true, - "NavigateSettingWhenLogout": { - "NavigateWhenLogoutMode": 1 - } + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "Text": "TeamAction", + "TemplateKey": "链接样式", + "Icon": { + "Name": "项目 (1).png" + }, + "IconSize": 22.0 } }, - "3,2": { - "IsPlaceHolderCell": true - }, - "4,0": { + "1,1": { + "CssName": "pms-menu-row", "CellType": { "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu", - "IsSingleExpand": true, - "TemplateKey": "BalckWhite", + "TemplateKey": "透明菜单", "Items": [ { - "Value": "项目/Project", - "Text": "项目/Project", + "Text": "项目", "SelectedIconColor": "Background 1", "SelectedIconColorUseItemColor": true, "IconColorUseItemColor": true, - "IsDefaultItem": true, "IsOldMenuPath": false, "CommandList": [ { @@ -133,8 +160,7 @@ ] }, { - "Value": "客户/Customs", - "Text": "客户/Customs", + "Text": "客户", "SelectedIconColor": "Background 1", "SelectedIconColorUseItemColor": true, "IconColorUseItemColor": true, @@ -144,8 +170,7 @@ ] }, { - "Value": "工时/WorkTime", - "Text": "工时/WorkTime", + "Text": "工时", "SelectedIconColor": "Background 1", "SelectedIconColorUseItemColor": true, "IconColorUseItemColor": true, @@ -155,8 +180,8 @@ ] }, { - "Value": "财务/Finance", - "Text": "财务/Finance", + "Value": "财务", + "Text": "财务", "SelectedIconColor": "Background 1", "SelectedIconColorUseItemColor": true, "IconColorUseItemColor": true, @@ -166,8 +191,8 @@ ] }, { - "Value": "统计/Statistics", - "Text": "统计/Statistics", + "Value": "统计", + "Text": "统计", "SelectedIconColor": "Background 1", "SelectedIconColorUseItemColor": true, "IconColorUseItemColor": true, @@ -177,16 +202,39 @@ ] } ], + "Orientation": 0, "MenuLevelsStyle": [ { "FontSize": 16.0, "Bold": false, - "Height": 55.0, - "IconHeight": 14.0, - "IconWidth": 14.0 + "Height": 30.0, + "Width": 150.0, + "IconHeight": 18.0, + "IconWidth": 18.0 + }, + { + "FontSize": 16.0, + "Bold": false, + "Height": 40.0, + "Width": 150.0, + "IconHeight": 18.0, + "IconWidth": 18.0 } ] } + }, + "1,5": { + "CellType": { + "$type": "Forguncy.CurrentUserCellType, ServerDesignerCommon", + "CellCustomValue": "%CurrentUser%", + "ShowCircleUserPicture": true, + "NavigateSettingWhenLogout": { + "NavigateWhenLogoutMode": 1 + } + } + }, + "3,0": { + "IsPlaceHolderCell": true } }, "StyleDatas": { @@ -197,38 +245,26 @@ "FontStyle": 1, "FontWeight": 2, "Foreground": 3, - "TextIndent": 30, - "HorizontalAlignment": 4, - "BorderBottom": null, - "BorderTop": null, - "BorderLeft": null, - "BorderRight": null + "HorizontalAlignment": 4 + }, + { + "FontSize": 13.333333333333332 }, { "FontFamily": 5, "FontSize": 13.333333333333332, - "Foreground": 3, - "HorizontalAlignment": 6, + "Foreground": 6, + "HorizontalAlignment": 7, "BorderBottom": null, "BorderTop": null, "BorderLeft": null, "BorderRight": null }, { - "Background": 7 + "Background": 6 }, { - "Background": 3 - }, - { - "FontFamily": 5, - "BorderBottom": null, - "BorderTop": null, - "BorderLeft": null, - "BorderRight": null - }, - { - "Background": null + "Background": 8 } ], "Types": { @@ -236,30 +272,23 @@ "CJNgaiHK", "Italic", "Normal", - "Background 1 0", - "Left", + "Background 2 0", + "Center", "Body", + "Background 1 0", "Right", - "Background 2 0" + "Background 1 -5" ] }, "CellStyles": { "1,0": 0, - "1,6": 1, - "3,1": 2, - "3,2": 3, - "4,0": 4, - "4,1": 2, - "4,7": 3, - "5,1": 2, - "5,6": 3, - "5,7": 3, - "6,1": 2, - "6,6": 3, - "6,7": 3 + "1,1": 1, + "1,5": 2, + "3,0": 3 }, - "ColStyles": { - "1": 5 + "RowStyles": { + "5": 4, + "6": 4 }, "SheetStyle": { "FontFamily": 5, @@ -270,7 +299,8 @@ } }, "Spans": [ - "3,2,2,5" + "1,1,1,4", + "3,0,2,7" ], "PageInfo": { "$type": "Forguncy.Model.Pages.MasterPage, ServerDesignerCommon", @@ -704,8 +734,8 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Size": "1628,46", + "Size": "1318,46", "BoxShadowString": "0 2 0 5 #175D7183" } ] -}//fHeV1UlZSW+c7p6d1l/GjIJfvP+ehCnmY8nWuGtt2GrUOTa8mC3SN6c1JhHy2eIVfflGUgZYf12d3NDml5Z1s0f6FqJYwIAM/4MAAX8lY9n1bmLWTHhdCuNWNT7rnYBKRDhuU27lhz64ZdE1pu9o1uk4oDeTAlMYvEpy4r/IazcHv70O5HpLBygiEdqw+JnkUTH6VXavOID9WMnqIQWvIbxuHDCSleedh9QM+VCGywlSlfaIAXl4xWR1ZruKE7IfSyuwk/qSoi3ALQe/WHwHkHmksw0IyIabK3niSh7IS4ojS/+QZDZqEO5wsHxn/LRWeKNRG8kN7Y8vN2dccv2fV2IU8Euu/kux+WU9gXYX4R+4UTOCv1WgUFe018tC4CHa/Q/Xj0N4sTJRD8wSCJs2c/YuCK4rkA27u/Mlwpi3M17yS1dHvwr36fSx4fu2mF27yQ36jDdcc1Zw8oKnj6E6Ob1U43mRLD4Z5yD0o3L0DG4cjdhnheCjlGJ5+CtzXp2MywNq8ekplom1ek9hRK2VLff1i/inX93EKtghZlK4UykQsQyUUUTN1LdARtHNi0KY4d8M2XzjP4Go8Di4DTCF+1jABzdTV/afzIyP+sTbZPLcWMuun30zoDk9ERQXWPWW/YanBd7dTnnaJiDqaYCuqo/fOgKKOtpUBPwK2v8xc4XXoG0r70fAtd+Ux307M2q6XJpBBVoRZP1quLEft50iQVAxloSl/Ipbx+l7ERIEEMjvTqtrU8WCofeNgVy24Ta8Bizosngz9Te5EDOg0oZyBi10sUCPzL5RZyHCug7EneHu42D/PEhO6Uv/kmDoce2Zc9NqJ3UqZE+H6GyiYmnjJZdQW1vGj5WMt15RTbGHGcPOuvkmjaH276CO5CuPStuTe0MaEBjrfsliriyXdTkUhQ==|920 \ No newline at end of file +}//LQPA+AbNDd4jnEMa0NQqvY6lHpEgofnabQKjrvoVf36PqJht1yto7KJJYZRzZhsZaMI8AMtMorZk4/7C8ySYZU1Z7NuVgrn7o/D4HLOI45Y0ynYLeOHz7UANsXP6m1Z3UZfVwxo1ni1xbYXW4jJHKXfpFtpMIibqdPF6NCcvtSKp8k9el9R+H/Z70cqkCdygCh79EUQwOZ4zalcS3yKFpmHJMy6AZNylR/zyqBw1CSps0f8VgudQdEYysGwy/KdKW+EzsMIm+4Kp9Rl+yEaq2DQQ80d9kHN6J02U8OXFIrFh/BrpxeH4BVq44Zy3lj9DziJd3533iLfgNrt6thkyZsZOs58GDNBS9KfmaYvY/ezWufWpGqHC94XsoNd5kiDBKZtHfrW8U3N7YoQ1v8ej94gE06lVGdbWLpb2fJZswluV2mt2l43MmWqQ57UabDwYnXtYOF4Sh8a9zSkEgrPqXl5VDSsT7nyhye6qjVbFf//nEc2pvWqN2wkue2u50R2X1xNpJkCzA9480X0xF7eM2OTSKdY5RcgxWmrENns/bAlk8/JAUfCCLwwnmdNIQXQYVlv6qdh4Gl9YNXgk/A1ILjVE3XCqz4GahTudLs8v2sibUftF43+GoKFbSQ5NZsyG2y+jqlppDEPy4iufIBTMf8GqfW0BJwIq21xoe9Aj+imxFGOh4q1iHXdWEY5SfV/p5RWL7TNsOGvc9oKlJQ+IQZkx3rjvyfKE5ajbfQStPEIeNTNueKMPGXukxSt2ByYXb061J8zK19ModsrddioQh6c6ldYEoozcKEgD3nHezbxQGCEO1Tao6J3b1Me15yIbumXUoeFdyN62qnecZZJgogJnb7JcFP8xexkRdnvwYMg5Ae4gx52jggFEsq9BqkRASQuJ3nQwWLsyPjL2HOtkyg==|920 \ No newline at end of file diff --git a/Pages/b90932e038f94707b54e571ff7cd84d.json b/Pages/b90932e038f94707b54e571ff7cd84d.json index 3845c4f6..80e33250 100644 --- a/Pages/b90932e038f94707b54e571ff7cd84d.json +++ b/Pages/b90932e038f94707b54e571ff7cd84d.json @@ -20,9 +20,17 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 22.0 + } } }, - "Count": 4, + "InLogicalVisibleIndexes": [ + 4 + ], + "Count": 5, "DefaultSize": 10.0 }, "Cols": { @@ -36,19 +44,27 @@ "Count": 3 }, "Values": { - "2,1": "项目名称" + "2,1": "加载中" }, "AttachInfos": { "0,0": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "ToolTip": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=b90932e038f94707b54e571ff7cd84d!B5" + }, "TemplateKey": "上圆角封面", "ImageSizeMode": 2, "ImagePath": "app-logo横幅.png" - } + }, + "TemplateCellSource": "项目封面" }, "2,1": { "TemplateCellSource": "项目名称" + }, + "4,1": { + "TemplateCellSource": "项目描述" } }, "StyleDatas": { @@ -65,7 +81,9 @@ ] }, "CellStyles": { - "2,1": 0 + "2,1": 0, + "3,1": 0, + "4,1": 0 }, "SheetStyle": { "FontFamily": 1 @@ -82,4 +100,4 @@ "PaperSize": {}, "Margin": {} } -}//1uQ/iGNyRg4SXJNaSZ1TS3SVCGfGAN1ybiBoW/DEH0vsv4tTMBXdQu71CKMU+67zqWlNm/jiUCiYg7DnRuZU6+dJfpdu2PaFvs33301iM5SUrRN3cBggEt+Spy6tuyv+gnJc6bLVDq3Lt6y0mNqUTVWGRcSXgGApUXFo7fBkcol2GEv/Mpy1CWLgsIrN8WuYDvwxzBlmxZwiX2fAdlI++xKKEZiINiihIObkLMQXSmfZo6SK3jyEwFb1dYaSz+UwO/0Djq2eL61VF1UjU+6icjbEvD0hMio4COxQN904+464cCDMHHIu+v5Na+F4Bv6YUmz/GPbQwELDlJIsoP/t7B4XbjcQqrf6+cnuZ9HrzliEhdzGRnEG+IuqCbwD0G0Hp3iqtmhR7Nf8FPMUIwhwvJR4BsrChAP/0tT4k2qFcBL85ansfjAAIPynSgHuB2WvZkvoSVCcrnsHMAkVXj3rsNs4XUbP3mRI5WhUQbztKVodNng27bMlrDT0cxFpXtaNF8TqH0kySzc3sulTack6/0gA7XugqU9zJzL41VtL6xt699rVPtGpbUL/DncvbyDcxMknlgoiMTKKKz++B82DDrUetDzob/bG8UJkVPEKhlH7LJeggBBLPZzQmbSMGW/adgzex9fQm15UUdKMeefC3smbLJ7rrMfqBIzrQA6GFelAxpY8773ea6vGFr/OmWuiBDqRH96x8DpbO8BnOM3LBBWc8M55u4R2xj8jFGaxkhsMENbNv+/PirW/1Ysohu73r85ZpYeFa17iT7o4aCLmVD2T8WqZyL9e1uw0r/g/7WT6/jo8uP8s/rzGh2XWiAmi9y6MEJ5ugCL824N1HQt4xBk5MoP3CC25Op7r2pUgfVISTnWKPzOeUmxmjwUa8IDE81xo+cFWOweOlVTilXlSVg==|920 \ No newline at end of file +}//Tk/EyHRxwsyQ+zfN1yIPcag7ugNaZNQOY22Z7V1lbmFaRU3j2EidPsu2tmHpfH5YKRVfqhI9HTnuQWBUk418UHfZo2Lc3n/8E62sAfr4AAG+llvCXI/cUy1qHBdSQPIlrcDnYrT3m54GngWXNCjcY2U1cTkIHM0cWbB+YMRoMl4Dk2gCxxKlWhZW+POSXXp+Z5Z4bKN0gva3iiFO4r76vKxjbZ35NbA4Jx9POdWLdH12VG7KCR/w5R9EXgmgmIUce4n8I6H3ckEqV7tG4YZfYc8DJPOPIIUr1T9CR8pYJv4gwW6j5KBYvYsQDeBWdRfs3iTQF4dm3zAU3ComQIyNoUZHYWtGOo5S9K0XK6azeI6yjYFsFDpQhEAR5tG9OdzfILPzHKLwdVoHuGEDLOhg/P33uVtE89Acp2TnJ2hJhgMwmpOAbQIvgibXFMA3Ow0TydLogRm5Zh5Ig7JTwBtIiqrdmYqdgvMaLX8y1pgx2k+HHlsvQ0JqCDJ1lRessOdfilA70vy7fbTPitb7iOJjvKk0fHny70ARxbfNHhc4Th48T/xlyuEjW582ssV0BxVYXV00SpNJuLOZjdFiFCZdTruxOCwYNyLbLN0lrjbMdoI1MCaKLCyRMCjaY6a7zZmrQOlUpaCf0pwVhJxxFEjMnCw4AMIZeb/N81kzMiVXZCjdjp0IAN4ivmO1efRoiksT13dJqya7ofqDC72mkmQ2awWt/EukK9xGl5S6jqIZ/RRU78RT+yYc8a6yByQ/s9DH65KdvouaJfpcVzyNRjt4Kck/EzISTOXVbQjnxQQFfry/13P7BDizZyJAuvi+L+RSxzRihFD+ZY8aFyD8Z4ukNGdB0wE0q1qtiumzojVXSSZC8RKu6pCyTwhCFLkev+sIBSxdzTvjiT0VRFs4kHBFyQ==|920 \ No newline at end of file diff --git a/Pages/任务/任务-进展.json b/Pages/任务/任务-进展.json index b55aef89..e700858a 100644 --- a/Pages/任务/任务-进展.json +++ b/Pages/任务/任务-进展.json @@ -130,7 +130,7 @@ "DefaultSize": 32.0 }, "Values": { - "0,2": "任务进展", + "0,1": "任务进展", "2,2": "新增进展" }, "AttachInfos": { @@ -268,63 +268,69 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 1, - "Formatter": 2 + "Foreground": 1 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 2, + "Formatter": 3 }, { "FontFamily": 0, "FontSize": 13.333333333333332 }, { - "HorizontalAlignment": 3 + "HorizontalAlignment": 4 }, { - "Foreground": 4 + "Foreground": 1 } ], "Types": { "Strs": [ "Body", + "Text 1 50", "Accent 1 0", "[AUTO]General", - "Center", - "Text 1 50" + "Center" ] }, "CellStyles": { - "2,2": 0, - "2,3": 1, - "2,4": 1, - "3,2": 2, - "4,2": 2, - "4,3": 2, - "4,4": 2, - "4,5": 2, - "4,6": 2, - "4,7": 2, - "4,8": 2, - "4,9": 2, - "4,10": 2, - "4,11": 2, - "4,12": 2, - "4,13": 2, - "4,14": 2, - "4,15": 2, - "4,16": 2, - "4,17": 2, - "4,18": 2, - "4,19": 2, - "4,20": 2, - "4,21": 2, - "4,22": 2, - "4,23": 2, - "4,24": 2, - "4,25": 2, - "4,26": 2, - "4,27": 2 + "0,1": 0, + "2,2": 1, + "2,3": 2, + "2,4": 2, + "3,2": 3, + "4,2": 3, + "4,3": 3, + "4,4": 3, + "4,5": 3, + "4,6": 3, + "4,7": 3, + "4,8": 3, + "4,9": 3, + "4,10": 3, + "4,11": 3, + "4,12": 3, + "4,13": 3, + "4,14": 3, + "4,15": 3, + "4,16": 3, + "4,17": 3, + "4,18": 3, + "4,19": 3, + "4,20": 3, + "4,21": 3, + "4,22": 3, + "4,23": 3, + "4,24": 3, + "4,25": 3, + "4,26": 3, + "4,27": 3 }, "ColStyles": { - "2": 3 + "2": 4 }, "SheetStyle": { "FontFamily": 0, @@ -374,4 +380,4 @@ "Size": "927,316" } ] -}//yymCAF+FnWUf835t8cJIiLGGR8CW1+tCtYUnj5Qww4n0ukKm86EZxAdCtcw+fcQB0cFiXCpGUvznI+9zpqcfGxH4ApJfoF15NP5Yp3KrWuna3IcpjNIdJAJS0+Gm9BYaYaP2cft111N3FMBx+zmeKmUKhL9c6r+S7EujlBcVZo81Ka/fMfVy7udQtV4O5Bzsg2QWFh0ZQVE6d6ds9vPIWcD1KTAsZ7HQ7KbSKTiLYtrAfMePc5AVSvjE0H/DQ62wuuhGP2rjAsTyuygN2BuxLQSkfoHfLI+ijgmT+T3UsvXm/EosuZs69F5CP7T+K28TCEGmpMZ5mM1VNyCpYlBjpw80lJ5wXkXbOG/EQI/Jze3+jGE+2j+ELQQCPmfaUPPApDnEIN4lwcxmS4lyFKR4CurB9r3gMzT9GgOISxo4NQAhHp2qZEi8JXpJf1aKvbbxABY9gQcO51jUgHlo5nUfOLc5zK1CKCqmmXYmdZm/2zCGbKInhvnuwektPBvfC6pUfoOA8xtuUFaRy2jQ4K/i+/cCx+ZLtjAgBmlVe6V87crya9eEAfuzrfeOo6yCDtc9XT8yySbPdCbSvdmRC8BPYyAZS/m0lOvOnbIa4HME4u1kl/FEjxuE7+vJF5ZIYgBods4r27cvHVtQiNfOQ+tIePxnNID4Vg6eBSb4HhyHAQBxQ0cqdXkaPqBVtd41JXW1tbCmmfAizXX6V/JQjk1QREO/TGCYI3Xvhhr/FNKfJaagFWLCCICdjnBmunXeoHimLtJ5dvUMgAmMjPqDnxH3Bli5xluyhCjhw/cLtywv9dhRXektMKfR72/7qbvdhklIIRNEIs2qucAulMQgrCma3gsewQamYz8VD1V+DpzHBF3Lh9CLvuLZCSkHbfEyR+La0udPHtTITamhke5ZqTEPMw==|920 \ No newline at end of file +}//k5PsEqVtdCntRFjvm2hb5gUvKsAw2uu1dzqkaBpPVQseHzbqD5TIdUjTP4iDRfONYzG2uEnQ58ay6JRSZszmcmiW2BorxLvdCGjbExkhbq6+SHkWWm60+pWUb4qB9o/NNTZoPB66KJoEBU1LrD4b2HMgrQ9/wt/TvOVFGvphFofOUP/WMZWE92l1VCxjXtxlaIjY2s1ODALiOmsRwo6tVYlNjUbiiPxA+WabqKSgy8QqfaANtBf9lzIJ+MCmEP6WmXFjwkF3AYIj4v0xj/AlclqsSdy1WyH185BNtbCCVeLkl7Mn7+cU4FPXTHINSjfvLzJJ6ap3v4bV57mea9jWA1Y6qEgPy4SDlk1s2R4N1KSeUUjJFFllExsoZ9cKtjw3SQYrQ5JDL/fvCWuHgieCwR/smx6M0YJ6NlrTRS1R/lRLgZ5Eue6TF1v6ydFLQcHsPhba2dop5cyjofz4rGL/aT1DNOKFx+CG6wt4vSNfV50+fbnKFXhCOfcqE9b69jlCMh9bldB3JTwfGNmD0Xn9I96iKoa02SG0e3cH0aXEe1t1a39LEIRiDv5unBzPCIStxpSea+ES4CldfudDgvhc0SlkB1q34d05Whec5RpFai7mzCuJHjUf7AkbYxb9z+4bFNnUXQDcIloSbAj2YV5SNgLdbgQMwg3me4MQI6yuqx9DqG2r2XOlC5pSyqtrLEwDCu+hCnyRDABSv50piKVw9tqvuu/rJTeg7Z5ms2sP7vqmPy0Jy7P5md8MqyqLfTHYVk75YYM10Q7zeUtI9whLJV4xsKuIYyNZMi0CpyORv/bWY/KtjKKoBzLlB29O4eSLuN177D9ohf98o7dIosWu42LH8oxb/wooOBKW2d/T42F02IA9NrINWTU4HZ8Qw4XoV0NJVTtrUzFQxL1eOwrHVA==|920 \ No newline at end of file diff --git a/Pages/任务/任务首页.json b/Pages/任务/任务首页.json index 08ca39f8..096ee4b5 100644 --- a/Pages/任务/任务首页.json +++ b/Pages/任务/任务首页.json @@ -1,27 +1,19 @@ { "Rows": { "RowColumnAttachedInfos": { - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0, - "IsHidden": true - } - }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "IsHidden": true + "DesignLengthInPixel": 32.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0, - "IsHidden": true + "DesignLengthInPixel": 15.0 } }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 210.0, + "DesignLengthInPixel": 349.0, "Mode": 1 } }, @@ -53,7 +45,7 @@ }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 289.0, + "DesignLengthInPixel": 103.0, "Mode": 1 } }, @@ -69,7 +61,7 @@ }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 265.0, + "DesignLengthInPixel": 139.0, "Mode": 1 } }, @@ -85,7 +77,7 @@ }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 400.0, + "DesignLengthInPixel": 236.0, "Mode": 1 } }, @@ -101,7 +93,7 @@ }, "18": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 400.0, + "DesignLengthInPixel": 203.0, "Mode": 1 } }, @@ -118,9 +110,6 @@ } }, "InLogicalVisibleIndexes": [ - 0, - 1, - 2, 20 ], "Count": 21, @@ -237,53 +226,58 @@ }, "31": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 39.0 + "DesignLengthInPixel": 10.0 } }, "32": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 38.0 + "DesignLengthInPixel": 39.0 } }, "33": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 39.0 + "DesignLengthInPixel": 38.0 } }, "34": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 38.0 + "DesignLengthInPixel": 39.0 } }, "35": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 39.0 + "DesignLengthInPixel": 38.0 } }, "36": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 38.0 + "DesignLengthInPixel": 39.0 } }, "37": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 39.0 + "DesignLengthInPixel": 38.0 } }, "38": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 39.0 + } + }, + "39": { "GridRowColumnDefinition": { "DesignLengthInPixel": 38.0, "Mode": 1 } }, - "39": { + "40": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "40": { + "41": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "18": { @@ -342,12 +336,12 @@ } } }, - "Count": 41, + "Count": 42, "DefaultSize": 32.0 }, "Values": { + "0,32": "任务-侧栏", "3,0": "任务-基本信息", - "3,31": "任务-侧栏", "6,0": "任务-任务信息", "9,0": "任务-子任务列表", "12,0": "任务-关联资源", @@ -355,87 +349,46 @@ "18,0": "任务-进展", "20,3": "任务ID:", "20,10": "项目ID:", - "20,17": "参与人数:" + "20,17": "参与人数:", + "20,23": false }, "AttachInfos": { - "1,1": { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务类型", - "GUID": "e2164ea1-e71f-4102-8b40-4f2ced89611c", - "RelationBinding": { - "RelatedTable": "任务类型", - "RelatedColumn": "ID", - "DisplayColumn": "任务类型" - } - }, + "0,32": { "CellType": { - "$type": "ElementUI.Tag, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "ColorList": [ - { - "color": "Accent 1" - }, - { - "color": "Accent 2" - }, - { - "color": "Accent 3" - }, - { - "color": "Accent 4" - }, - { - "color": "Accent 5" - }, - { - "color": "Accent 6" - } - ], - "separator": ",", - "size": "default", - "effect": "light", - "allowAdd": false, - "addButtonSettings": { - "width": 100, - "text": "添加标签" - }, - "distinct": false, - "ReadOnly": true + "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", + "PageName": "任务-侧栏" } }, - "1,39": { + "1,1": { + "CellType": { + "$type": "Forguncy.ProcessPanelCellType, ServerDesignerCommon", + "TemplateKey": "_RS_Main1", + "ActionButtonStyleTemplateInfos": [] + } + }, + "1,30": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", - "ReloadData": true + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!收起侧栏" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT(任务首页!收起侧栏)" + } + } + ] } ], - "TemplateKey": "pd_10", - "ImagePath": "Mobile/456_delete_8.svg", - "BuiltIn": true, + "ToolTip": "收缩/展开", + "Size": 18, + "ImagePath": "展开.svg", "UseCellForeColor": true } }, @@ -445,12 +398,6 @@ "PageName": "任务-基本信息" } }, - "3,31": { - "CellType": { - "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", - "PageName": "任务-侧栏" - } - }, "6,0": { "CellType": { "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", @@ -501,31 +448,81 @@ "ColumnName": "参与人数", "GUID": "dd68b5dc-2111-47fc-92e0-c24293bc5265" } + }, + "20,23": { + "CellType": { + "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", + "Caption": "收起侧栏", + "Style": 1, + "CommandList": [ + { + "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "Location": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务首页!AG:AP" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=NOT(任务首页!X21)" + } + } + ] + } + ] + } } }, "StyleDatas": { "Styles": [ + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 1 + }, { "Background": null, "FontFamily": 0, - "BorderBottom": 0 + "FontSize": 14.67, + "BorderLeft": 0 }, { - "BorderBottom": 0 - }, - { - "Background": null, - "FontFamily": 0 + "FontSize": 13.333333333333332 }, { "BorderLeft": 0 }, { - "FontSize": 13.333333333333332, - "HorizontalAlignment": 2 + "Background": null, + "FontFamily": 0, + "FontSize": 14.67 }, { - "Background": 3, + "Background": null, + "FontFamily": 0, + "FontSize": 14.67 + }, + { + "Background": null, + "FontFamily": 0, + "BorderBottom": 0 + }, + { + "BorderBottom": 0 + }, + { + "Background": null, + "FontFamily": 0, + "FontSize": 14.67, + "BorderBottom": 0 + }, + { + "FontSize": 13.333333333333332, + "HorizontalAlignment": 3 + }, + { + "Background": 4, "FontFamily": 0, "BorderBottom": 1, "BorderTop": 1, @@ -545,10 +542,10 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "HorizontalAlignment": 2 + "HorizontalAlignment": 3 }, { - "Background": 3, + "Background": 4, "FontFamily": 0, "BorderBottom": 1, "BorderTop": 1, @@ -566,8 +563,8 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "Formatter": 5, - "HorizontalAlignment": 2 + "Formatter": 6, + "HorizontalAlignment": 3 }, { "Background": null @@ -576,6 +573,7 @@ "Types": { "Strs": [ "Body", + "Text 1 50", "Background 2 -10", "Right", "#FFFFFF00", @@ -584,571 +582,550 @@ ], "Borders": [ { - "Color": 1 + "Color": 2 }, { - "Color": 4 + "Color": 5 } ] }, "CellStyles": { - "2,0": 0, - "2,1": 0, - "2,2": 0, - "2,3": 0, - "2,4": 0, - "2,5": 0, - "2,6": 0, - "2,7": 0, - "2,8": 0, - "2,9": 0, - "2,10": 0, - "2,11": 0, - "2,12": 0, - "2,13": 0, - "2,14": 0, - "2,15": 0, - "2,16": 0, - "2,17": 0, - "2,18": 1, - "2,19": 1, - "2,20": 1, - "2,21": 1, - "2,22": 1, - "2,23": 1, - "2,24": 1, - "2,25": 0, - "2,26": 1, - "2,27": 1, - "2,28": 1, - "2,29": 0, - "2,30": 0, - "2,31": 0, - "2,32": 1, - "2,33": 1, - "2,34": 1, - "2,35": 0, - "2,36": 1, - "2,37": 0, - "2,38": 0, - "2,39": 0, - "2,40": 0, - "3,0": 2, - "3,25": 2, - "3,29": 2, - "3,30": 2, - "3,31": 3, - "4,0": 2, - "4,1": 0, - "4,2": 0, - "4,3": 0, - "4,4": 0, - "4,5": 0, - "4,6": 0, - "4,7": 0, - "4,8": 0, - "4,9": 0, - "4,10": 0, - "4,11": 0, - "4,12": 0, - "4,13": 0, - "4,14": 0, - "4,15": 0, - "4,16": 0, - "4,17": 0, - "4,18": 1, - "4,19": 1, - "4,20": 1, - "4,21": 1, - "4,22": 1, - "4,23": 1, - "4,24": 1, - "4,25": 0, - "4,26": 1, - "4,27": 1, - "4,28": 1, - "4,29": 0, - "4,30": 2, - "4,31": 3, - "5,0": 2, - "5,1": 2, - "5,2": 2, - "5,3": 2, - "5,4": 2, - "5,5": 2, - "5,6": 2, - "5,7": 2, - "5,8": 2, - "5,9": 2, - "5,10": 2, - "5,11": 2, - "5,12": 2, - "5,13": 2, - "5,14": 2, - "5,15": 2, - "5,16": 2, - "5,17": 2, - "5,18": 2, - "5,19": 2, - "5,20": 2, - "5,21": 2, - "5,22": 2, - "5,23": 2, - "5,24": 2, - "5,25": 2, - "5,26": 2, - "5,27": 2, - "5,28": 2, - "5,29": 2, - "5,30": 2, - "5,31": 3, - "6,0": 2, - "6,1": 2, - "6,2": 2, - "6,3": 2, - "6,4": 2, - "6,5": 2, - "6,6": 2, - "6,7": 2, - "6,8": 2, - "6,9": 2, - "6,10": 2, - "6,11": 2, - "6,12": 2, - "6,13": 2, - "6,14": 2, - "6,15": 2, - "6,16": 2, - "6,17": 2, - "6,25": 2, - "6,29": 2, - "6,30": 2, - "6,31": 3, - "7,0": 2, - "7,1": 0, - "7,2": 0, - "7,3": 0, - "7,4": 0, - "7,5": 0, - "7,6": 0, - "7,7": 0, - "7,8": 0, - "7,9": 0, - "7,10": 0, - "7,11": 0, - "7,12": 0, - "7,13": 0, - "7,14": 0, - "7,15": 0, - "7,16": 0, - "7,17": 0, - "7,18": 1, - "7,19": 1, - "7,20": 1, - "7,21": 1, - "7,22": 1, - "7,23": 1, - "7,24": 1, - "7,25": 0, - "7,26": 1, - "7,27": 1, - "7,28": 1, - "7,29": 0, - "7,30": 2, - "7,31": 3, - "8,0": 2, - "8,1": 2, - "8,2": 2, - "8,3": 2, - "8,4": 2, - "8,5": 2, - "8,6": 2, - "8,7": 2, - "8,8": 2, - "8,9": 2, - "8,10": 2, - "8,11": 2, - "8,12": 2, - "8,13": 2, - "8,14": 2, - "8,15": 2, - "8,16": 2, - "8,17": 2, - "8,18": 2, - "8,19": 2, - "8,20": 2, - "8,21": 2, - "8,22": 2, - "8,23": 2, - "8,24": 2, - "8,25": 2, - "8,26": 2, - "8,27": 2, - "8,28": 2, - "8,29": 2, - "8,30": 2, - "8,31": 3, - "9,0": 2, - "9,1": 2, - "9,2": 2, - "9,3": 2, - "9,4": 2, - "9,5": 2, - "9,6": 2, - "9,7": 2, - "9,8": 2, - "9,9": 2, - "9,10": 2, - "9,11": 2, - "9,12": 2, - "9,13": 2, - "9,14": 2, - "9,15": 2, - "9,16": 2, - "9,17": 2, - "9,25": 2, - "9,29": 2, - "9,30": 2, - "9,31": 3, - "10,0": 2, - "10,1": 0, - "10,2": 0, - "10,3": 0, - "10,4": 0, - "10,5": 0, - "10,6": 0, - "10,7": 0, - "10,8": 0, - "10,9": 0, - "10,10": 0, - "10,11": 0, - "10,12": 0, - "10,13": 0, - "10,14": 0, - "10,15": 0, - "10,16": 0, - "10,17": 0, - "10,18": 1, - "10,19": 1, - "10,20": 1, - "10,21": 1, - "10,22": 1, - "10,23": 1, - "10,24": 1, - "10,25": 0, - "10,26": 1, - "10,27": 1, - "10,28": 1, - "10,29": 0, - "10,30": 2, - "10,31": 3, - "11,0": 2, - "11,1": 2, - "11,2": 2, - "11,3": 2, - "11,4": 2, - "11,5": 2, - "11,6": 2, - "11,7": 2, - "11,8": 2, - "11,9": 2, - "11,10": 2, - "11,11": 2, - "11,12": 2, - "11,13": 2, - "11,14": 2, - "11,15": 2, - "11,16": 2, - "11,17": 2, - "11,18": 2, - "11,19": 2, - "11,20": 2, - "11,21": 2, - "11,22": 2, - "11,23": 2, - "11,24": 2, - "11,25": 2, - "11,26": 2, - "11,27": 2, - "11,28": 2, - "11,29": 2, - "11,30": 2, - "11,31": 3, - "12,0": 2, - "12,1": 2, - "12,2": 2, - "12,3": 2, - "12,4": 2, - "12,5": 2, - "12,6": 2, - "12,7": 2, - "12,8": 2, - "12,9": 2, - "12,10": 2, - "12,11": 2, - "12,12": 2, - "12,13": 2, - "12,14": 2, - "12,15": 2, - "12,16": 2, - "12,17": 2, - "12,25": 2, - "12,29": 2, - "12,30": 2, - "12,31": 3, - "13,0": 2, - "13,1": 0, - "13,2": 0, - "13,3": 0, - "13,4": 0, - "13,5": 0, - "13,6": 0, - "13,7": 0, - "13,8": 0, - "13,9": 0, - "13,10": 0, - "13,11": 0, - "13,12": 0, - "13,13": 0, - "13,14": 0, - "13,15": 0, - "13,16": 0, - "13,17": 0, - "13,18": 1, - "13,19": 1, - "13,20": 1, - "13,21": 1, - "13,22": 1, - "13,23": 1, - "13,24": 1, - "13,25": 0, - "13,26": 1, - "13,27": 1, - "13,28": 1, - "13,29": 0, - "13,30": 2, - "13,31": 3, - "14,0": 2, - "14,1": 2, - "14,2": 2, - "14,3": 2, - "14,4": 2, - "14,5": 2, - "14,6": 2, - "14,7": 2, - "14,8": 2, - "14,9": 2, - "14,10": 2, - "14,11": 2, - "14,12": 2, - "14,13": 2, - "14,14": 2, - "14,15": 2, - "14,16": 2, - "14,17": 2, - "14,18": 2, - "14,19": 2, - "14,20": 2, - "14,21": 2, - "14,22": 2, - "14,23": 2, - "14,24": 2, - "14,25": 2, - "14,26": 2, - "14,27": 2, - "14,28": 2, - "14,29": 2, - "14,30": 2, - "14,31": 3, - "15,0": 2, - "15,1": 2, - "15,2": 2, - "15,3": 2, - "15,4": 2, - "15,5": 2, - "15,6": 2, - "15,7": 2, - "15,8": 2, - "15,9": 2, - "15,10": 2, - "15,11": 2, - "15,12": 2, - "15,13": 2, - "15,14": 2, - "15,15": 2, - "15,16": 2, - "15,17": 2, - "15,25": 2, - "15,29": 2, - "15,30": 2, - "15,31": 3, - "16,0": 2, - "16,1": 0, - "16,2": 0, - "16,3": 0, - "16,4": 0, - "16,5": 0, - "16,6": 0, - "16,7": 0, - "16,8": 0, - "16,9": 0, - "16,10": 0, - "16,11": 0, - "16,12": 0, - "16,13": 0, - "16,14": 0, - "16,15": 0, - "16,16": 0, - "16,17": 0, - "16,18": 1, - "16,19": 1, - "16,20": 1, - "16,21": 1, - "16,22": 1, - "16,23": 1, - "16,24": 1, - "16,25": 0, - "16,26": 1, - "16,27": 1, - "16,28": 1, - "16,29": 0, - "16,30": 2, - "16,31": 3, - "17,0": 2, - "17,1": 2, - "17,2": 2, - "17,3": 2, - "17,4": 2, - "17,5": 2, - "17,6": 2, - "17,7": 2, - "17,8": 2, - "17,9": 2, - "17,10": 2, - "17,11": 2, - "17,12": 2, - "17,13": 2, - "17,14": 2, - "17,15": 2, - "17,16": 2, - "17,17": 2, - "17,18": 2, - "17,19": 2, - "17,20": 2, - "17,21": 2, - "17,22": 2, - "17,23": 2, - "17,24": 2, - "17,25": 2, - "17,26": 2, - "17,27": 2, - "17,28": 2, - "17,29": 2, - "17,30": 2, - "17,31": 3, - "18,0": 2, - "18,1": 2, - "18,2": 2, - "18,3": 2, - "18,4": 2, - "18,5": 2, - "18,6": 2, - "18,7": 2, - "18,8": 2, - "18,9": 2, - "18,10": 2, - "18,11": 2, - "18,12": 2, - "18,13": 2, - "18,14": 2, - "18,15": 2, - "18,16": 2, - "18,17": 2, - "18,25": 2, - "18,29": 2, - "18,30": 2, - "18,31": 3, - "19,0": 2, - "19,1": 2, - "19,2": 2, - "19,3": 2, - "19,4": 2, - "19,5": 2, - "19,6": 2, - "19,7": 2, - "19,8": 2, - "19,9": 2, - "19,10": 2, - "19,11": 2, - "19,12": 2, - "19,13": 2, - "19,14": 2, - "19,15": 2, - "19,16": 2, - "19,17": 2, - "19,18": 2, - "19,19": 2, - "19,20": 2, - "19,21": 2, - "19,22": 2, - "19,23": 2, - "19,24": 2, - "19,25": 2, - "19,26": 2, - "19,27": 2, - "19,28": 2, - "19,29": 2, - "19,30": 2, - "20,3": 4, - "20,4": 5, - "20,5": 6, - "20,6": 6, - "20,7": 6, - "20,9": 7, - "20,10": 8, - "20,11": 9, - "20,12": 10, - "20,13": 10, - "20,14": 11, - "20,16": 7, - "20,17": 12, - "20,18": 9, - "20,19": 10, - "20,20": 10, - "20,21": 11, - "20,25": 12, - "20,29": 12 + "0,31": 0, + "0,32": 1, + "1,1": 2, + "1,30": 0, + "1,31": 0, + "1,32": 3, + "2,32": 3, + "3,0": 4, + "3,25": 4, + "3,29": 4, + "3,30": 4, + "3,31": 5, + "3,32": 3, + "4,0": 4, + "4,1": 6, + "4,2": 6, + "4,3": 6, + "4,4": 6, + "4,5": 6, + "4,6": 6, + "4,7": 6, + "4,8": 6, + "4,9": 6, + "4,10": 6, + "4,11": 6, + "4,12": 6, + "4,13": 6, + "4,14": 6, + "4,15": 6, + "4,16": 6, + "4,17": 6, + "4,18": 7, + "4,19": 7, + "4,20": 7, + "4,21": 7, + "4,22": 7, + "4,23": 7, + "4,24": 7, + "4,25": 6, + "4,26": 7, + "4,27": 7, + "4,28": 7, + "4,29": 6, + "4,30": 8, + "4,31": 5, + "4,32": 3, + "5,0": 4, + "5,1": 4, + "5,2": 4, + "5,3": 4, + "5,4": 4, + "5,5": 4, + "5,6": 4, + "5,7": 4, + "5,8": 4, + "5,9": 4, + "5,10": 4, + "5,11": 4, + "5,12": 4, + "5,13": 4, + "5,14": 4, + "5,15": 4, + "5,16": 4, + "5,17": 4, + "5,18": 4, + "5,19": 4, + "5,20": 4, + "5,21": 4, + "5,22": 4, + "5,23": 4, + "5,24": 4, + "5,25": 4, + "5,26": 4, + "5,27": 4, + "5,28": 4, + "5,29": 4, + "5,30": 5, + "5,31": 5, + "5,32": 3, + "6,0": 4, + "6,1": 4, + "6,2": 4, + "6,3": 4, + "6,4": 4, + "6,5": 4, + "6,6": 4, + "6,7": 4, + "6,8": 4, + "6,9": 4, + "6,10": 4, + "6,11": 4, + "6,12": 4, + "6,13": 4, + "6,14": 4, + "6,15": 4, + "6,16": 4, + "6,17": 4, + "6,25": 4, + "6,29": 4, + "6,30": 5, + "6,31": 5, + "6,32": 3, + "7,0": 4, + "7,1": 6, + "7,2": 6, + "7,3": 6, + "7,4": 6, + "7,5": 6, + "7,6": 6, + "7,7": 6, + "7,8": 6, + "7,9": 6, + "7,10": 6, + "7,11": 6, + "7,12": 6, + "7,13": 6, + "7,14": 6, + "7,15": 6, + "7,16": 6, + "7,17": 6, + "7,18": 7, + "7,19": 7, + "7,20": 7, + "7,21": 7, + "7,22": 7, + "7,23": 7, + "7,24": 7, + "7,25": 6, + "7,26": 7, + "7,27": 7, + "7,28": 7, + "7,29": 6, + "7,30": 8, + "7,31": 5, + "7,32": 3, + "8,0": 4, + "8,1": 4, + "8,2": 4, + "8,3": 4, + "8,4": 4, + "8,5": 4, + "8,6": 4, + "8,7": 4, + "8,8": 4, + "8,9": 4, + "8,10": 4, + "8,11": 4, + "8,12": 4, + "8,13": 4, + "8,14": 4, + "8,15": 4, + "8,16": 4, + "8,17": 4, + "8,18": 4, + "8,19": 4, + "8,20": 4, + "8,21": 4, + "8,22": 4, + "8,23": 4, + "8,24": 4, + "8,25": 4, + "8,26": 4, + "8,27": 4, + "8,28": 4, + "8,29": 4, + "8,30": 5, + "8,31": 5, + "8,32": 3, + "9,0": 4, + "9,1": 4, + "9,2": 4, + "9,3": 4, + "9,4": 4, + "9,5": 4, + "9,6": 4, + "9,7": 4, + "9,8": 4, + "9,9": 4, + "9,10": 4, + "9,11": 4, + "9,12": 4, + "9,13": 4, + "9,14": 4, + "9,15": 4, + "9,16": 4, + "9,17": 4, + "9,25": 4, + "9,29": 4, + "9,30": 5, + "9,31": 5, + "9,32": 3, + "10,0": 4, + "10,1": 6, + "10,2": 6, + "10,3": 6, + "10,4": 6, + "10,5": 6, + "10,6": 6, + "10,7": 6, + "10,8": 6, + "10,9": 6, + "10,10": 6, + "10,11": 6, + "10,12": 6, + "10,13": 6, + "10,14": 6, + "10,15": 6, + "10,16": 6, + "10,17": 6, + "10,18": 7, + "10,19": 7, + "10,20": 7, + "10,21": 7, + "10,22": 7, + "10,23": 7, + "10,24": 7, + "10,25": 6, + "10,26": 7, + "10,27": 7, + "10,28": 7, + "10,29": 6, + "10,30": 8, + "10,31": 5, + "10,32": 3, + "11,0": 4, + "11,1": 4, + "11,2": 4, + "11,3": 4, + "11,4": 4, + "11,5": 4, + "11,6": 4, + "11,7": 4, + "11,8": 4, + "11,9": 4, + "11,10": 4, + "11,11": 4, + "11,12": 4, + "11,13": 4, + "11,14": 4, + "11,15": 4, + "11,16": 4, + "11,17": 4, + "11,18": 4, + "11,19": 4, + "11,20": 4, + "11,21": 4, + "11,22": 4, + "11,23": 4, + "11,24": 4, + "11,25": 4, + "11,26": 4, + "11,27": 4, + "11,28": 4, + "11,29": 4, + "11,30": 5, + "11,31": 5, + "11,32": 3, + "12,0": 4, + "12,1": 4, + "12,2": 4, + "12,3": 4, + "12,4": 4, + "12,5": 4, + "12,6": 4, + "12,7": 4, + "12,8": 4, + "12,9": 4, + "12,10": 4, + "12,11": 4, + "12,12": 4, + "12,13": 4, + "12,14": 4, + "12,15": 4, + "12,16": 4, + "12,17": 4, + "12,25": 4, + "12,29": 4, + "12,30": 5, + "12,31": 5, + "12,32": 3, + "13,0": 4, + "13,1": 6, + "13,2": 6, + "13,3": 6, + "13,4": 6, + "13,5": 6, + "13,6": 6, + "13,7": 6, + "13,8": 6, + "13,9": 6, + "13,10": 6, + "13,11": 6, + "13,12": 6, + "13,13": 6, + "13,14": 6, + "13,15": 6, + "13,16": 6, + "13,17": 6, + "13,18": 7, + "13,19": 7, + "13,20": 7, + "13,21": 7, + "13,22": 7, + "13,23": 7, + "13,24": 7, + "13,25": 6, + "13,26": 7, + "13,27": 7, + "13,28": 7, + "13,29": 6, + "13,30": 5, + "13,31": 5, + "13,32": 3, + "14,0": 4, + "14,1": 4, + "14,2": 4, + "14,3": 4, + "14,4": 4, + "14,5": 4, + "14,6": 4, + "14,7": 4, + "14,8": 4, + "14,9": 4, + "14,10": 4, + "14,11": 4, + "14,12": 4, + "14,13": 4, + "14,14": 4, + "14,15": 4, + "14,16": 4, + "14,17": 4, + "14,18": 4, + "14,19": 4, + "14,20": 4, + "14,21": 4, + "14,22": 4, + "14,23": 4, + "14,24": 4, + "14,25": 4, + "14,26": 4, + "14,27": 4, + "14,28": 4, + "14,29": 4, + "14,30": 5, + "14,31": 5, + "14,32": 3, + "15,0": 4, + "15,1": 4, + "15,2": 4, + "15,3": 4, + "15,4": 4, + "15,5": 4, + "15,6": 4, + "15,7": 4, + "15,8": 4, + "15,9": 4, + "15,10": 4, + "15,11": 4, + "15,12": 4, + "15,13": 4, + "15,14": 4, + "15,15": 4, + "15,16": 4, + "15,17": 4, + "15,25": 4, + "15,29": 4, + "15,30": 5, + "15,31": 5, + "15,32": 3, + "16,0": 4, + "16,1": 6, + "16,2": 6, + "16,3": 6, + "16,4": 6, + "16,5": 6, + "16,6": 6, + "16,7": 6, + "16,8": 6, + "16,9": 6, + "16,10": 6, + "16,11": 6, + "16,12": 6, + "16,13": 6, + "16,14": 6, + "16,15": 6, + "16,16": 6, + "16,17": 6, + "16,18": 7, + "16,19": 7, + "16,20": 7, + "16,21": 7, + "16,22": 7, + "16,23": 7, + "16,24": 7, + "16,25": 6, + "16,26": 7, + "16,27": 7, + "16,28": 7, + "16,29": 6, + "16,30": 8, + "16,31": 5, + "16,32": 3, + "17,0": 4, + "17,1": 4, + "17,2": 4, + "17,3": 4, + "17,4": 4, + "17,5": 4, + "17,6": 4, + "17,7": 4, + "17,8": 4, + "17,9": 4, + "17,10": 4, + "17,11": 4, + "17,12": 4, + "17,13": 4, + "17,14": 4, + "17,15": 4, + "17,16": 4, + "17,17": 4, + "17,18": 4, + "17,19": 4, + "17,20": 4, + "17,21": 4, + "17,22": 4, + "17,23": 4, + "17,24": 4, + "17,25": 4, + "17,26": 4, + "17,27": 4, + "17,28": 4, + "17,29": 4, + "17,30": 5, + "17,31": 5, + "17,32": 3, + "18,0": 4, + "18,1": 4, + "18,2": 4, + "18,3": 4, + "18,4": 4, + "18,5": 4, + "18,6": 4, + "18,7": 4, + "18,8": 4, + "18,9": 4, + "18,10": 4, + "18,11": 4, + "18,12": 4, + "18,13": 4, + "18,14": 4, + "18,15": 4, + "18,16": 4, + "18,17": 4, + "18,25": 4, + "18,29": 4, + "18,30": 5, + "18,31": 5, + "18,32": 3, + "19,0": 4, + "19,1": 4, + "19,2": 4, + "19,3": 4, + "19,4": 4, + "19,5": 4, + "19,6": 4, + "19,7": 4, + "19,8": 4, + "19,9": 4, + "19,10": 4, + "19,11": 4, + "19,12": 4, + "19,13": 4, + "19,14": 4, + "19,15": 4, + "19,16": 4, + "19,17": 4, + "19,18": 4, + "19,19": 4, + "19,20": 4, + "19,21": 4, + "19,22": 4, + "19,23": 4, + "19,24": 4, + "19,25": 4, + "19,26": 4, + "19,27": 4, + "19,28": 4, + "19,29": 4, + "19,30": 4, + "19,31": 5, + "20,3": 9, + "20,4": 10, + "20,5": 11, + "20,6": 11, + "20,7": 11, + "20,9": 12, + "20,10": 13, + "20,11": 14, + "20,12": 15, + "20,13": 15, + "20,14": 16, + "20,16": 12, + "20,17": 17, + "20,18": 14, + "20,19": 15, + "20,20": 15, + "20,21": 16, + "20,29": 17 }, "RowStyles": { - "1": 13, - "2": 13, - "3": 13, - "4": 13, - "5": 13 + "3": 18, + "4": 18, + "5": 18 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "3,0,1,30", "6,0,1,30", "9,0,1,30", "20,4,1,4", "12,0,1,30", "15,0,1,30", - "2,31,1,8", - "1,1,1,2", "18,0,1,30", - "3,31,16,10", "20,11,1,4", - "2,17,1,13", - "4,17,1,13", "7,17,1,13", "10,17,1,13", "13,17,1,13", "16,17,1,13", - "20,18,1,4" + "20,18,1,4", + "1,1,1,13", + "3,0,1,30", + "4,17,1,13", + "0,32,19,10", + "20,23,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1198,6 +1175,10 @@ { "Name": "参与人数", "Formula": "任务首页!$S$21" + }, + { + "Name": "收起侧栏", + "Formula": "任务首页!$X$21" } ] -}//WfhKK2FtWLAqGh749iOnMUW3KDvEh9N48QaYrCV1UdnzcguU88rGVLToHZIPSyqUnYxPujXKBwsWDlkXrcFWA80Enh8PveoSEnwpJ2vizIClaGHahkiOP0JOMrCxiGH5z+eLnKCxMOl/RReGff6OSE8YRF4ahrxcYBUs+pn3V/t/Slg6AO/6pKE3AcH+Now/dR1yPiSroC4Sa/mQCzuHk7wCBQ1N2CCNX7I3meBTQ6Le+C1rnHRMSgZHkUcemlLptyVRs5G/UGwfjrcHFlI01AzbdvLayWA3cYwStwg/XrMtKwlsreEX5lbW7EeciiG9jvs2wolR2TXlIhOZs2fCdzLtGE3cm5auotBY5NYcGTUoNBZvQpuP/OhrrJxwb97u/EWtURoJnKD86t59+AG8lXXzR3UJSfJ/YRLQ3Shry29VTx/xsguRBectb0/SKNW70TO59k72e2ZzWs6O+8PcU0tVHvFXaT1Xa172eW+rVan9iF/npKxHMh4dDMgIuQMHVdGD9sBy5dy961B9N7X0xeOV3+jbrzCWayWst3/2M7XlmmthXAVW6/IUM8tjU0AnOs9i33P5hSqFa+iwDCnxtsPhh5wzKxecM59dNfQhz/t0WqywVruoLGk5Zxd9rMCqnY5uh9gi9VwCkGIB5keu1pnntbGaB2YfInf3hltv2pcvOtCde1XFvEvvcUAnE81QnX+LckS0CzCj6UOGVGvYUb22vIBk9cUNvCIEr+f+dXDJSxhrvLjJ4yZz45xQRSUveCQo2VlQxw2FDnDQP2NWUU4b+Wk9ZnZqcuGsTiRaoJZgpHxTjhiUWjJFMH4Q/D4CFkwrBSClHZn8AoaWG2JjbotyouVqA0iBS44hI8g2ijmmMrbiv9WYCrvsLnJao/haJO88+UJUre3yMmVJIVXoMg==|920 \ No newline at end of file +}//zvZGYHg76/AujT1ynz/G2gGKIWEQ8hwDPzOZDm9Rrim1NzSfSW2+BwF9qNuRZwqqGFTZjfGkUHO1bNX7iV2YvkySYyaQkW+o26YHoMM5RJGQuyA+6j3a3iPXzzPAnC1C2bp3YZuGmbTSxzUg1gsx2jcGwv4bM9ZAb+MFizEWxNy64q1+XqPRlJHEUt+hKngtKiNPAOBO3qIt09+g2FoR112dFfwNH6+tZ6AnmgD/S/h/537KomOlVnnDLeYuvFp/u84PqvzIRdQD/WmqIehq3CZXHwM2LywPAVDTr5/aNAlVkG/VOCzcp7hnQgj1jgp8y5rr/l5K4hH+0ApmLNFlSL1UF+47QdiU1UuSuzlBhP82I+aYQDMhn2q/V4oj54lEAiPHxI775q5fBBRAL699sA4rLw/W9DXRIHTh+TwjUHuCrSHnSnqOFu1mUdOmNd6r3vWKpdhYJFwPa1+Lw2iYeVwTBXaERrUi+Z28PFPClzNHjr/ap3fTXiWRyR1EpvPWvnQCmm1LeOUBiePzs2BWs0fPgjvZHO8VWoqTjWEeuCk+q2RefTrX5Q8/ITwPoAYeeiOLkhq0bFT3HWbiwpHdR8Nc7W0AwsndTUEKgSLwsgXcz9odu4nqA0LWfkVuBAbTnrIoLV6tRMiNg8ovN+kYOIIhSsaNMwMKouHwwTyglBa+hgGscPYYddIWLY/Dj1OZ2j+N+TKPJUgqXrsfIfZoJERnNx2pIFPQ6kQl4V3cnOjjKuO4rq/hHfJVJ5r49yXzympJbRqY41r6pLxOEiuwtssqUcNq3sG0dQ96eZy4oAoQG9sjMz3YlJ5AnWMeE8uilv1n/nDRzjuA9T1w8U40NGrbSvrwlsy/37HV25N0K4HqGXtwgeyutvGUgh6PEi1nRutdwc9JL798DmP8yOCrxQ==|920 \ No newline at end of file diff --git a/Pages/任务/新增进展.json b/Pages/任务/新增进展.json index e2c4cd12..1585dc3f 100644 --- a/Pages/任务/新增进展.json +++ b/Pages/任务/新增进展.json @@ -3,12 +3,12 @@ "RowColumnAttachedInfos": { "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 34.0 + "DesignLengthInPixel": 35.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 13.0 + "DesignLengthInPixel": 24.0 } }, "3": { @@ -18,7 +18,8 @@ }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 33.0 + "DesignLengthInPixel": 33.0, + "IsHidden": true } } }, @@ -164,6 +165,7 @@ "DefaultSize": 32.0 }, "Values": { + "1,1": 1, "1,33": "提交" }, "AttachInfos": { @@ -173,9 +175,11 @@ "ColumnName": "进展状态ID", "GUID": "a1d519a1-c132-4e42-9d7c-7fb8d48816d5" }, + "CssName": "singlebox", "CellType": { "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", "Style": 3, + "CellDefaultValue": 1, "IsBounding": true, "DataSource": "项目进展状态表", "ValueColumnBindingInfo": { @@ -334,4 +338,4 @@ "Formula": "新增进展!$F$6" } ] -}//0eKEsmRx4w+MIU4iczZ/+DWMwlx5nxPflgCNAvJKAOBIytGZRTp4+IsGpXN6/AknrQ5YgTsyDsG35xGlPU/ry73yKlYPLDQF6TVYcUdwSC82OqBEsQA63yc9w/Qb77LDrW1TAQPzcBdmdKYBReayoYC/KDfysaJbFaNs9bxlAkAu6dA5SGj+eWP8Ykhsq1ZiKraP/3xKAt3AfeEYcaOUY3sn61RcZkS3eHG4mQDVTll9UpmLgKK32K764G7suBAF+gD75YRoGrLT3vB9cRh7fsNVDFqU8n32UsoidWOCUNkp+B0J7Km5i5GoKMIjMiKb4WHmWiyxZTEK+5sKQQ3NivFy/8vgZ2daLhptkStHvtwYDutJCAZk+akHZ1bvFQV5MWvEYonj1sBMPkbBCCm2I00CN6q+N3NRRlQC2Oyh8IPysNWQ++PvvHkGcOnxmCP2RFg5Y3Y/hej/Bj+5Yv+6/ksn1HhD+2yKQHflxgq1wQqcabxeUxkUd9HI0LdHZrDsEAdZ29cr3cqnQ4eEPtFto0YZDYXs51d6rwk5UK13uUEuLKI/bA6nSVX8G92/07jl+8ysI0nPpu576ppq7yS+A2XE+1FL0KpWeIznBqSpAmCAaQAbePTx4LmC/uA5rJgWoG7Bg4C9JUmoYIHP+7FUFhTYhRFjHJWmOl/sIs5Zko09vDoxKbAZ5lwklQJxJnkeSrTIQAW4J0NIuQ9DDGqOF+79M7SufbQ/ZaxlYpGgk5QSyCL7m6fYtXma3AIDiwA4lyCgtshosCGZBdUsUcvsze7hXjCrOIWoIbQTOSflfzluEyy5aj7XGg0HplKuVw4qccSOAfJqXNgs9Uxa9UDxxGmGMLFgqYWTN6FPwYnogqmaTETOsxJY3ehflQf8r1ecfrZyJh2hbhszVIL7trW6fA==|920 \ No newline at end of file +}//nqk6UOoanvtKw3SAMETvmqhnKEBi04unCFpp/sX3knzUE1VH+riaU4mykkssI971j0xUk2TDJ7WetiAjwaQ1DkmMLhBMjnhFfzfQTAygM11C1GQEP1PYB21liI3osog9joGwnuW2LNHeXnHjIfOSpbpv25I4OlXGu0+uoQvRJwODyB+0cHdGlYUe2hJDua9xY1uOgqPE2H1mpGWPwR01BiGYn+9R1SH8APl9xNuQMBM36SkQNoN9M7M6RbinQLpXYOj1qAuu3zd81nbLmUt/6XbCs/7ynv32y8j/VfRCyah4Xj7dkUPQmglx5WOJpLMDwUedYOE/w5lNyqkGINXLb1HcKM3SdmxynEiQycE5ycDzOK3RPkKBz4cQXSy68yGWD1O+3n26dIQ1089bPS0cOM1E4qI84Nk48OOvKV24TvMRAU+16sja7d3AufdMa9AbTMIIDDhMoeOgk19Wt8tfiOU5q8Vs4lwdafGGmAJu19lB2ZUeoRz45YnGpmLG+AY+XD1rVCt8y/l9bOGvLgpc1VeZTqrSJtAYJdgBOzgOBHrX7VQljSGhJMWOwl9e0DieHmusw1sg3XBKNUkG9MY0RqCUA5TD1RJBxKAgfPhWHpDu4XN6pxsWki33LC08NCPcOKGM/kq3qzbSfBfjLKcqdnVnX5N/2z+ZIh85bXlT68WFgkdxdI9JEevXiYZL7Ir0bQ5FAIikkh/zMRRpEHpLVQnMetfhj2RK7b6JMi4iMimYDtjSH4njTeKr51N0deuAoLP+L92jFwxm6GLpwkEMAKxitdp5d+RiC0Rw5HQX83QIEN+ph0O3ZCM6TongsRMfqMWfUkbRDC5hWZqrkT97k+NZM+8sDqepVFx8VeRSnE11iEQt8Z5vxgkFPF2Fdchdi7dSvJTU6xe8QQAhTVMB8A==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目信息.json b/Pages/项目首页/新增项目.json similarity index 66% rename from Pages/项目首页/项目信息.json rename to Pages/项目首页/新增项目.json index 38d21de7..60a860c5 100644 --- a/Pages/项目首页/项目信息.json +++ b/Pages/项目首页/新增项目.json @@ -73,12 +73,12 @@ }, "14": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 118.0 } }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 32.0 } }, "16": { @@ -88,31 +88,16 @@ }, "17": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 118.0 + "DesignLengthInPixel": 32.0 } }, "18": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } - }, - "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "20": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "21": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } } }, - "Count": 22, + "Count": 19, "DefaultSize": 32.0 }, "Cols": { @@ -187,34 +172,38 @@ "DesignLengthInPixel": 32.0 } }, - "14": { + "27": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } } }, - "Count": 15, + "Count": 28, "DefaultSize": 32.0 }, "Values": { "1,1": "项目封面", "4,1": "项目名称", "7,1": "管理员", - "10,1": "分组", - "10,8": "权限", + "7,8": "权限", + "7,15": "分组", + "8,1": "%CurrentUser.UserName%", + "8,8": "0", + "10,1": "预算工时", + "10,8": "预算金额", + "10,15": "严格模式", + "11,1": "0", "11,8": "0", - "13,1": "严格模式", - "13,8": "预算工时", - "14,8": "0", - "16,1": "项目简介", - "20,11": "提交" + "11,15": false, + "13,1": "项目简介", + "17,18": "提交" }, "AttachInfos": { "2,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目封面", - "GUID": "ea261426-d9fd-4d15-a0b6-81a5dcb9b21e", + "GUID": "0bad7bf3-59cf-4bf0-b075-da3c64c300f4", "IsImagePath": true }, "CellType": { @@ -229,7 +218,7 @@ "BindingInfo": { "TableName": "项目表", "ColumnName": "项目名称", - "GUID": "23a0e2bc-dba9-465b-a867-c5a04c30b2c3" + "GUID": "3932708b-c539-4462-8df8-475d18e159b5" }, "CellType": { "$type": "ElementUI.InputCellType, ElementUI", @@ -256,13 +245,16 @@ ], "type": "text", "resize": "none" + }, + "DataValidationInfo": { + "IgnoreBlank": false } }, "8,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "管理员", - "GUID": "4491c9cb-7df2-4d89-9db2-a9dd2c07deb3" + "GUID": "9f298f18-4000-414d-bc43-e98003e3a8e3" }, "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", @@ -281,6 +273,7 @@ ] } ], + "DefaultValue": "%CurrentUser.UserName%", "useBinding": true, "options": [ { @@ -312,7 +305,7 @@ "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", - "GUID": "707fd52b-8bf9-4a13-956d-2fec99c72b9d" + "GUID": "6dfc2193-adee-4b1e-8568-8beb32e3adb7" }, "ColumnName": "value" }, @@ -320,7 +313,7 @@ "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "全名", - "GUID": "c265ea91-5496-4450-a508-38d6c420522c" + "GUID": "6fb7138d-becf-4c66-b350-4b99f2ed800a" }, "ColumnName": "label" } @@ -336,11 +329,49 @@ "noMatchText": "无匹配数据" } }, - "11,1": { + "8,8": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "0", + "options": [ + { + "value": "0", + "label": "私有" + }, + { + "value": "1", + "label": "公开" + } + ], + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + } + }, + "8,15": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目分组", - "GUID": "2ee0d45e-271b-4d13-a6bc-c4d8aec63370" + "GUID": "58df3610-34ee-4996-bed0-25120673d8fe" }, "CellType": { "$type": "ElementUI.SelectCellType, ElementUI", @@ -389,8 +420,8 @@ { "BindingInfo": { "TableName": "项目分组", - "ColumnName": "ID", - "GUID": "302299f6-3179-43f5-8ace-bbce40e3848f" + "ColumnName": "项目分组", + "GUID": "5f24491d-98ce-482d-8bf2-41cc4dfdf097" }, "ColumnName": "value" }, @@ -398,61 +429,26 @@ "BindingInfo": { "TableName": "项目分组", "ColumnName": "项目分组", - "GUID": "f3a8134b-cbb3-4286-aec8-1eefb6ce40c7" + "GUID": "6dccb167-9e68-4982-bbf2-94fae61e6e7a" }, "ColumnName": "label" } ], "CustomColumns": [] }, - "placeholder": "请选择", + "placeholder": "请选择或输入", "noDataText": "无数据", + "filterable": true, "filterInServerOptions": { "matchMethod": "contains", "loadingText": "加载中" }, - "noMatchText": "无匹配数据" + "allowCreate": true, + "noMatchText": "无匹配数据", + "clearable": true } }, - "11,8": { - "CellType": { - "$type": "ElementUI.SelectCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "DefaultValue": "0", - "options": [ - { - "value": "0", - "label": "私有" - }, - { - "value": "1", - "label": "公开" - } - ], - "placeholder": "请选择", - "noDataText": "无数据", - "filterInServerOptions": { - "matchMethod": "contains", - "loadingText": "加载中" - }, - "noMatchText": "无匹配数据" - } - }, - "13,3": { + "10,17": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "ToolTip": "开启后,将严格控制工时,不允许超额计划", @@ -461,24 +457,11 @@ "UseCellForeColor": true } }, - "14,1": { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "严格模式", - "GUID": "982f0cea-6989-4f6a-a888-78a07036387f" - }, - "CellType": { - "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", - "Caption": "开启严格模式", - "Style": 1, - "CommandList": [] - } - }, - "14,8": { + "11,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目预算工时", - "GUID": "08b4e776-8fe9-4631-bf48-fbfe48fed20f" + "GUID": "079538fe-f23c-41e4-be18-f50a6fd06d27" }, "CellType": { "$type": "ElementUI.InputNumberCellType, ElementUI", @@ -508,17 +491,70 @@ "NumberType": 7, "FirstParamValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(OR(项目信息!B15=FALSE(),项目信息!I15>0),1,0)" + "SerializeProperty": "=IF(OR(INT(新增项目!P12)=0,新增项目!B12>0),1,0)" }, "IgnoreBlank": false, "ErrorMessage": "开启严格模式下,预算工时必须大于0" } }, - "17,1": { + "11,8": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目预算费用", + "GUID": "10bafad5-a960-433e-a2b3-dfce911b8ca5" + }, + "CellType": { + "$type": "ElementUI.InputNumberCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": "0", + "min": 0, + "step": 1, + "precision": 1, + "placeholder": "请输入", + "controlsPosition": true + }, + "DataValidationInfo": { + "NumberType": 7, + "FirstParamValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(OR(INT(#REF!)=0,新增项目!I12>0),1,0)" + }, + "IgnoreBlank": false, + "ErrorMessage": "开启严格模式下,预算工时必须大于0" + } + }, + "11,15": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "严格模式", + "GUID": "9d1420ec-8ca7-462d-8f2e-0041cfff8053" + }, + "CellType": { + "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", + "Caption": " 开启严格模式", + "Style": 2, + "CommandList": [] + } + }, + "14,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目简介", - "GUID": "7f210e70-588a-495b-ac0a-0a1107bfbe59" + "GUID": "04181a21-8f77-4356-b29b-4b49085a531e" }, "CellType": { "$type": "ElementUI.InputCellType, ElementUI", @@ -547,14 +583,47 @@ "resize": "none" } }, - "20,11": { + "17,18": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目表", - "ShowConfirm": false + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "5b79a673-3839-41ee-80c3-78b5017b5037" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目表", + "UpdateType": "add", + "ShowConfirm": false + } + ], + "ID": "107633c4-0a24-4f17-a9a3-3e345aad78fc" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目表", + "ShowConfirm": false + } + ], + "ID": "f43b34f1-ac8a-433c-8255-92f41b4f2acd" + } + ] }, { "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", @@ -584,9 +653,19 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 2 + "HorizontalAlignment": 2 }, { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 3 + }, + { + "BorderBottom": 0 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, "BorderBottom": 0 } ], @@ -594,12 +673,13 @@ "Strs": [ "Body", "[AUTO]General", + "Right", "Text 1 50", "Background 2 0" ], "Borders": [ { - "Color": 3 + "Color": 4 } ] }, @@ -612,23 +692,80 @@ "7,5": 0, "7,6": 0, "7,7": 0, - "7,8": 0, + "7,8": 1, "7,9": 0, "7,10": 0, "7,11": 0, "7,12": 0, "7,13": 0, "7,14": 0, + "7,15": 0, + "7,16": 0, + "7,17": 0, + "7,18": 0, + "7,19": 0, + "7,20": 2, + "7,21": 0, + "7,22": 0, + "7,23": 0, + "7,24": 0, + "7,25": 0, + "7,26": 0, + "7,27": 0, "8,0": 0, "8,1": 0, + "8,8": 0, + "8,9": 0, + "8,10": 0, + "8,11": 0, + "8,12": 0, + "8,13": 0, "8,14": 0, + "8,15": 0, + "8,16": 0, + "8,17": 0, + "8,18": 0, + "8,19": 0, + "8,20": 0, + "8,21": 0, + "8,22": 0, + "8,23": 0, + "8,24": 0, + "8,25": 0, + "8,26": 0, + "8,27": 0, + "10,1": 1, + "10,2": 0, + "10,3": 0, + "10,4": 0, + "10,5": 0, + "10,6": 0, + "10,7": 0, "10,8": 1, "10,9": 0, "10,10": 0, "10,11": 0, "10,12": 0, "10,13": 0, + "10,14": 0, + "10,15": 1, + "10,16": 0, + "10,17": 3, + "10,18": 0, + "10,19": 0, + "10,20": 0, + "10,21": 0, + "10,22": 0, + "10,23": 0, + "10,24": 0, + "10,25": 0, + "10,26": 0, "11,1": 0, + "11,2": 0, + "11,3": 0, + "11,4": 0, + "11,5": 0, + "11,6": 0, "11,7": 0, "11,8": 0, "11,9": 0, @@ -636,6 +773,19 @@ "11,11": 0, "11,12": 0, "11,13": 0, + "11,14": 0, + "11,15": 0, + "11,16": 0, + "11,17": 0, + "11,18": 0, + "11,19": 0, + "11,20": 0, + "11,21": 0, + "11,22": 0, + "11,23": 0, + "11,24": 0, + "11,25": 0, + "11,26": 0, "12,0": 0, "12,1": 0, "12,2": 0, @@ -651,40 +801,50 @@ "12,12": 0, "12,13": 0, "12,14": 0, - "13,0": 0, + "12,15": 0, + "12,16": 0, + "12,17": 0, + "12,18": 0, + "12,19": 0, + "12,20": 0, + "12,21": 0, + "12,22": 0, + "12,23": 0, + "12,24": 0, + "12,25": 0, + "12,26": 0, + "12,27": 0, "13,1": 1, - "13,2": 0, - "13,3": 2, - "13,4": 0, - "13,5": 0, - "13,6": 0, - "13,7": 0, - "13,8": 1, - "13,9": 0, - "13,10": 0, - "13,11": 0, - "13,12": 0, - "13,13": 0, - "13,14": 0, - "14,0": 0, - "14,1": 0, - "14,7": 0, - "14,8": 0, - "14,14": 0, - "16,1": 1, - "18,1": 3, - "18,2": 3, - "18,3": 3, - "18,4": 3, - "18,5": 3, - "18,6": 3, - "18,7": 3, - "18,8": 3, - "18,9": 3, - "18,10": 3, - "18,11": 3, - "18,12": 3, - "18,13": 3 + "15,1": 4, + "15,2": 4, + "15,3": 4, + "15,4": 4, + "15,5": 4, + "15,6": 4, + "15,7": 4, + "15,8": 4, + "15,9": 4, + "15,10": 4, + "15,11": 4, + "15,12": 4, + "15,13": 4, + "15,14": 5, + "15,15": 5, + "15,16": 5, + "15,17": 5, + "15,18": 5, + "15,19": 5, + "15,20": 5, + "16,14": 0, + "16,15": 0, + "16,16": 0, + "16,17": 0, + "16,18": 0, + "16,19": 0, + "16,20": 0, + "17,18": 0, + "17,19": 0, + "17,20": 0 }, "SheetStyle": { "FontFamily": 0, @@ -692,15 +852,16 @@ } }, "Spans": [ - "5,1,1,13", "2,1,1,4", - "11,8,1,6", - "17,1,1,13", - "8,1,1,13", + "8,1,1,6", + "8,8,1,6", + "8,15,1,6", + "11,15,1,6", "11,1,1,6", - "20,11,1,3", - "14,8,1,6", - "14,1,1,6" + "11,8,1,6", + "14,1,1,20", + "17,18,1,3", + "5,1,1,20" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -725,4 +886,4 @@ "PaperSize": {}, "Margin": {} } -}//v0BZFixeNqqB8sdOxxRErIjeOSTbsmzZC1Ulei2NORx2JArP2vdoTX83QJig4560m/fhXbTT8KvXMtfyZLf2dt8ni74r9jE/ZDsutSCT/39nlm+lgVyg9QSmMOlQIVe7EK6gLB3I2VWqDpBRIj3NUOb14+WiAibGsuS9/k9VGxns2iuERZ45939K3Wc0oUyW+5bWiR8as0JkjM/iOQ9jg5Rl1EH2JEslD5wyApD55LWd4iTG+38uL7IPWN48VsaZ311hD6M6UyFZ4ztfpCidGOrWLh80jb7W2qMxt/Jm5oPwRk3rH8rsrTtdN5zb7hE36f7Yt0RImo9YMSuH2eCGUcjPyAPbWLAxJqMphdmiHZxTcLniK5ONpryQpBWtYrqdL2YSwyzLUf0LgPTchp/6tebqhGWXvxA2BTvlYf4L6IloLq6S2I4NJkldiqfq8ZUxlF+HAfvVCa8M8yuvYWVfBc+p6e74Efym432r8lTLGEohXa6lLnQ1zXXztZT6AqTFFhXIPSD1OX0f6gwdVx1Hkv+LU6eUbu7W/FF4f8djBkmyfcMyYc6RtJVUuEzhqt2X9hm03ZE00OwnJZpWz2NSLA8x0vKCRyNArEhEf1QCnxPIKCKL7/1O/YMLj3PH2NibQPe2PEbGFd3OzXEy5dPqfA0jF0zbTdcYbTE5CohZ69Kb2jQTYcFuP+YcHPkpmiRDZQ890aHqAX4FB0BhjufnQ1HZ9fn2Up1NuOCdrNtZPKR1NDkVDt73UCjD+tiM0+fIR1eZcZHdyaE/TWru+QXcZoph4LeU/+pWg+riXzz130s5KKXdOtEfGGyNN9WgGYLmHkrtytNPL7mby0sYGoM/5Hv+/dX5YFPDNBtSqaE9fUShSSsEkSWlNauFrEXmBAot3+syINVJEDBs4OH1ENVIYw==|920 \ No newline at end of file +}///f3paaVschrc3eUlkdR75aFToz1Lkdl6Ux4vCwVL94mLMjUeEf//pwPTAk6yAxS4h2XbyctHy0xhQYM4TpKfmGpZSj7zfV6vHJOAP3dSlwVpmT6kAf00igKhSvzVbqwGmmXwAV9XJFLggvclQpGVvoKA9YF9pHCcSNMnGDIAVGpS54c393bLUY8UDHqXojLU7nWRNjQ2GKHc6JAjxRq7h2C8tYM3N468WWPdV5dstIMwPr7F+SVscTr0fhFHgelIMiWOP6v8FSqpBuqX1T/HSwbqgc+4s7Yz/nPqd3AdJfje58POx1nA51n28TpS7aerZSlTI3lTLGDeKHPqpMRNTW38rWHHLJ1X6alKm2ZBaIhGl8vhW6xC17tPdmIMlyIhMw0Ek6pcG5sOJ5UegMMT4yr87ARTOtZKUSQJs1X4n7UeUpuSnTiP8Wkv05HNrwmMi5KZm/MCjz5df06UlQDc8SJVAFot3SBynyI3/9kSZoYwNoXkfTW4IdFKuQlqI/4TokghmtdMZrMxHUoA+8T49OcExxPWeMbs63XGszwKmuqczqnNHR/ZHMixRaNPf4iJlTDUv0rKB+d6nZvtbPdvfTPty5NNHAF9vINZiEUo4U/Ani8Bw6zejqvFVHlPPoxK4wWvIGphzDu/RfBUcCPp5+Wz6acD2NKKeaxZAj6M1Er4d2Wo6kelzhCgJSahl4d2DRwUJ3l8iKmpTmYPdfUIQsyyoc1IAjbt4SPMj6n3CpfBX7R+uRNuEZ6+RwXdHyNGCyvAQK+04BB325YsyZFQGIpI/tDWJmWxBQ0tPO5J1/cXJMZWf0Q8ef68boJN3C1D/aJNLTiDkoeP1FSRc2YOiwQTEJrPPQIB56lBIAybBgSOTeahipSlxpT8eOSjF4TaVuGOrkY47vflr2KUhEmLAA==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目列表.json b/Pages/项目首页/项目列表.json index ed3b6cdc..94e317f7 100644 --- a/Pages/项目首页/项目列表.json +++ b/Pages/项目首页/项目列表.json @@ -3,12 +3,12 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 24.0 } }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 47.0 + "DesignLengthInPixel": 35.0 } }, "2": { @@ -18,7 +18,7 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 712.0, + "DesignLengthInPixel": 642.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -30,7 +30,8 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "IsHidden": true } } }, @@ -38,7 +39,7 @@ 4 ], "Count": 5, - "DefaultSize": 32.0 + "DefaultSize": 24.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -214,11 +215,6 @@ "DesignLengthInPixel": 32.0 } }, - "33": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "34": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -245,58 +241,241 @@ } }, "39": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "40": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "41": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "42": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "43": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } } }, - "Count": 44, + "Count": 40, "DefaultSize": 32.0 }, "Values": { - "1,1": "1" + "1,11": "添加项目" }, "AttachInfos": { "1,1": { "CellType": { - "$type": "ElementUI.TabHeader, ElementUI", - "DefaultValue": "1", - "Tabs": [ + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ { - "Value": "1", - "Name": "我参与的" + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] }, { - "Value": "2", - "Name": "已归档的" + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] }, { - "Value": "3", - "Name": "回收站" + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] } ], - "type": "default", - "position": "top" + "type": "text", + "placeholder": "搜索项目", + "suffixIcon": { + "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", + "Name": "Application/047_search_8.svg", + "BuiltIn": true, + "Color": "#c0c4cc" + }, + "resize": "none" + } + }, + "1,11": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 3, + "DrawerDirection": 3, + "ShowDrawerHeader": true, + "PageName": "新增项目", + "LoadBindingDataOption": 2 + } + ], + "Text": "添加项目", + "TemplateKey": "_RS_Main3", + "Icon": { + "Name": "增加.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "1,25": { + "CssName": "singe-box", + "CellType": { + "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", + "Style": 1, + "Items": [ + { + "Value": "参与", + "DisplayValue": "我参与" + }, + { + "Value": "归档", + "DisplayValue": "已归档" + }, + { + "Value": "删除", + "DisplayValue": "回收站" + } + ], + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目列表!Z2" + } + ] + }, + "value": "参与" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.QueryCommand, ServerDesignerCommon", + "TargetTableName": "项目表", + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "删除", + "GUID": "b40f5a4d-f431-495a-be3f-30e2a9cca56e" + }, + "Value": "1" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "归档", + "GUID": "31ebc0ad-1596-45de-9d3c-ec05b9a639cf" + }, + "Value": "1" + } + ] + }, + "ID": "e3c29c30d51f4d2f91daef7ed8e848ec" + } + ], + "ID": "ae158399-3a67-4ed6-bc86-fff1720355b2" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目列表!Z2" + } + ] + }, + "value": "归档" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.QueryCommand, ServerDesignerCommon", + "TargetTableName": "项目表", + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "删除", + "GUID": "68262b37-c895-4e91-9d7f-748e1ab65331" + }, + "Value": "1" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "归档", + "GUID": "0e5a8641-24e6-4a91-bddb-c8077065917f" + }, + "Value": "1" + } + ] + }, + "ID": "c3aa118a8c674c1bb75ddf3ced1e5d5e" + } + ], + "ID": "5e3501cd-8857-49ef-a921-842b9027bace" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目列表!Z2" + } + ] + }, + "value": "删除" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.QueryCommand, ServerDesignerCommon", + "TargetTableName": "项目表", + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "删除", + "GUID": "65d70e57-e821-4697-89eb-daabea658752" + }, + "Value": "1" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "归档", + "GUID": "588898fe-e2cc-48b3-bcca-5d2590f7d121" + }, + "Value": "1" + } + ] + }, + "ID": "218ecfedc1fc4a32b479c98f8a8184e2" + } + ], + "ID": "e5a6fb7c-8fab-42f6-9383-021e3635e9e8" + } + ] + } + ] } }, "3,1": { @@ -307,9 +486,45 @@ "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", "Commands": [ { - "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", - "PageName": "项目首页", - "LoadBindingDataOption": 1 + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目列表!ID" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "项目首页", + "LoadBindingDataOption": 1 + } + ], + "ID": "fddc5353-08bd-48f0-9605-7e307981681b" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 3, + "DrawerDirection": 3, + "ShowDrawerHeader": true, + "PageName": "新增项目", + "LoadBindingDataOption": 2 + } + ], + "ID": "788fcb81-2419-4c80-b7f2-09179ce8d9ec" + } + ] } ], "ParamProperties": { @@ -404,6 +619,9 @@ "LoadOnDemandCount": 15, "DisplayMode": 2, "NoItemSetting": { + "ImageForNoItem": { + "Name": "暂无内容 (1).png" + }, "NoItemImageSize": 128.0, "TextForNoItem": "暂无项目", "Orientation": 1 @@ -418,27 +636,40 @@ "Foreground": 0 }, { - "HorizontalAlignment": 1 + "FontFamily": 1 + }, + { + "FontSize": 13.333333333333332 + }, + { + "HorizontalAlignment": 2 } ], "Types": { "Strs": [ "black", - "Center", - "Body" + "Body", + "Center" ] }, "CellStyles": { "1,1": 0, - "3,1": 1 + "1,11": 1, + "1,12": 1, + "1,13": 1, + "1,14": 1, + "1,25": 2, + "3,1": 3 }, "SheetStyle": { - "FontFamily": 2 + "FontFamily": 1 } }, "Spans": [ - "1,1,1,42", - "3,1,1,42" + "3,1,1,38", + "1,1,1,9", + "1,11,1,4", + "1,25,1,14" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -464,4 +695,4 @@ "PaperSize": {}, "Margin": {} } -}//Msyvmq9o/7ftiAS4jHpoylJ3rEUaYpzJWK1LEEOhAAe+7pQ6YQs5+0rwb0G2RKJoNUOWtKqzetmT0TIp4scb9TmU3hI3Jh0RfKmosi+L6TFQIOXgdUPsJzgsIGuKc1m397LX8zqxA/TUZrzxZfPFwLLgTgr0Xtr5BSl71EWqvCnHUBobwlAzT5PiDBSHxZaeV5Oghm6xxSOPYiN+IfQPVwqYUAjbDVkrgjCHDEdIVtBCyeVAQFTpm/dSbe8jWKCrrxpmsNAs4n2UBOdGilRpMmRKSGVzyLchu6cEkK3imHIyAxrNudOVoWYuQtah1V1FcYMu4CGDAriYRzhpg8pAp55e3WCZi1ZO47iiPsMG45Zs2llXAAJlZHE3702GdplB3HSuhquqf4vlfbQqDa+4suhWzVkjAYIKJoWd8wZ6Xnyn1NHlYDRGnCRodIyjYaMjZ9ZZdVoVn9RtV9Mf1vVz7DTOOC+HsgcDqL75JX2QaDJYg7n8LHZrfRGlpJY5kmh6CYDkpirW8FrjUm64K2QdIh1gyc6M/dE06HvBy2qIssvXGqY6nilwvdox3Ly5sH/qa0EFHbPTagchwoPCbr/i3MytfglbHy7mSmQWDG2sBBOP+1ohtKAY+DoKSM5RmfnfKOQSqJm1d1nTjKwiiF25lmGv2WLoSwrf1kzRrAQv40NP7AigceSuSqopikoPaTf1485rZhgoB0O1fgGDbvMmyZf7atgQkM9x0AG3erya+uYfJaTXe40z/VQQ9sggOcNwV6vIHX5f5ohqkDWlp0qJzOlkrNo9pM/SgwtyGJya1SpHgIakTzYGpNh/Kz2fGM8WUC9W/UWW6Kt8B95Rgr42rK3LL1m31UYkHPi2zHhwa5YwpIRJyuDf5KHzpwxLNLP5+T/kD10Dr+9wKoWrc18ZzQ==|920 \ No newline at end of file +}//TA05Qc8L3DaIH06E1G5QpfTIuXGYvqaRRDzuV1hSjumjRn0qRR0wNndH/PwhqZ47zQmq4BklJDXtEI3ZTr77Vpr5Q00qpFsz9iiBgvfm6AhvEAJdzNj8qQxEarrmR2ofMVP0I4UqLBkK2qwfjCNmXaFflW1+HI0luiosQ4vsnXJx/zdyk5/KH7gbpU8CABjjl09YmUiS41phVZaLhN3pMs076TXVx7a+QtsxsHjJMgJxScIkyT9Xthp+LbEhLaSybssZckOGQtLBv1Q2/sAIrqdYNhbIW/0VdXGxA9ZbTEjkEm9Y1CFkPQ6ZOCMFlQCRS+L7q8TXxyqsSopKHp8OyWNU7UbtfdYwsCT+9mpMbfTYhC8JDMhE+V63MrNifRU17SsM3dY2mYKyv+f9QIqHwcQ3tdOAb9hg0LRPEde3kLKDIkf/gZcqj1NTWpNHYV8mxOfYmRxZezDmvcb7Rb1couTo0zpTNfVYOnec+wXVhins5dcmUVnwFkYNfszZD++Dg+5a+CpEGKMTgCGFLlmUKJ4MkJc3ybeQMRBfd2Lh3OCF7qJ4WeztAq5Qv4hmtoZaQQ2LFwH+ughKprcF351kljxDOYYuOJOt3e6kmKpS4dFzZLfgyWVVBqLu14gc2vfp8fs1qyBMYZCOjFrHNgi8UFzPMkSjjvntYyewvcsxlkoK2tlv05KGAXA+L0jrEUxhwANalKu7SNLZCkKKrywzg5UWPAyBT/a0Kn4mOr9ilM5zfHkpo4M0dmZ3tSjmwiQvMLzCOf8iJKx9z9ORgeo3tRWoTAX3PERf1vrJ30zA34AMpvsD20dMAKdTIUjusg3mYrr2gcOjjL2fBn960ZAgK3E/EYx65sCgPsqMww3fG43B8SyLncuz8ga+wSx1thlIZ5hfvIwcBm/ThxSFIpPp2Q==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目标题.json b/Pages/项目首页/项目标题.json index 8820d255..7eeb7b53 100644 --- a/Pages/项目首页/项目标题.json +++ b/Pages/项目首页/项目标题.json @@ -137,7 +137,8 @@ "CommandList": [ { "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", - "NavigateType": "back" + "NavigateType": "back", + "LoadBindingDataOption": 2 } ], "ImagePath": "Arrow/291_left_arrow_2.svg", @@ -380,7 +381,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目标题!菜单回调" }, - "ID": "3108fddb6b7c44ca98935f5d4334377e" + "ID": "5c5e16dd558d4a66858e094fe4e803ca" }, { "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", @@ -414,11 +415,11 @@ { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", "PopupDisplayMode": 2, - "PageName": "项目信息", + "PageName": "新增项目", "LoadBindingDataOption": 1 } ], - "ID": "a743dfac-f29e-4e93-8f18-1cc26bb89216" + "ID": "9db9cd49-0be0-40e0-b7d3-23de8ddd897e" }, { "Condition": { @@ -439,17 +440,53 @@ "PageName": "项目配置首页" } ], - "ID": "75b5f7f5-0f1c-4bf5-bb97-91c30c34f346" + "ID": "a602b0b7-f7d6-40a1-a10b-9ca449d295ed" + }, + { + "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": "a47945e2-4980-45f1-9e47-e0066ad12b08" + }, + "Value": "1" + } + ] + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": "操作完成" + } + ], + "ID": "ed477ff5-30ac-4af0-84fc-19e0fc61ba9f" } ] } ], - "ID": "fca1ba63-27ac-4fbb-81ae-aac1b0573fca" + "ID": "9195dbcf-befd-471e-a0a6-0fac13d8b496" } ] } ], - "ID": "e02c384b-62d6-4692-9ce9-b97058bd6ebd" + "ID": "af797e47-dd16-404f-9785-941b5a5dce4e" } ] } @@ -565,4 +602,4 @@ "Formula": "项目标题!$M$6" } ] -}//S8+60tEF0XrfzxSXmX3bhCiEQ4Bey+MjnAqMx3NWeM+jqL3WISDiLrHQWG10CTdmZNkb7VteWVM7joEK3oJSzxSdgTPsFjWTl64ZfrwjYb3zhjYbY90AAVFoxwM5WLDMvzSLiMkW1IT814pyItumvMqOqs57xmQmgyc8nLXBMI3d34PEnJ6SKnuLBOYZzr6TTgHdI/pJv34eaEWWgZjjKhlTP5n0T9rx72cHquDgv7q84O380VvoOAYiu5BNlVjBVDMCk8RLJUNpULZH6CCjtf/AZ0sYkaurZgysTq1BE3xecwq7W1qNynP2IX4PrzwwSp4WoAfywsEOT8uAVl5URgNd64rsihy35uzbMfupZvYPph8eeacN0KqGpADl1VcwiQtgO7YFHVwpOeS5+XStgeHNv3x4N8jgT/419Rx7DCSuFHIpIVidCZi86c8QrkOQO0uVIDhSts6iEq48ZX12it56YYcjTEW/KI4eU8L3pyApPaCBkP4LIrpRzpcdeHzG49BUdXDZhfrCZRVdG/Gk2+iU82zix2Jsco9005CixJk4NgErxrXgmpe4GQF4tFopcKpntAh5alU6GLopAIIiYA+cwj6b5n0PQnaQRQ5KtVBf7vOvcTIDbkVzLNjLbJLnhKUp/lOtzbXRKw3Ao3/H+tnx0Vhkndgfta3UpsFI2QbKbtK9gF+uink6zhaI2ETsUH+3g+3ZKAvtnkqTP9L3xMaLUukwNwSh5HzMGECPuI9GvE2PV4629Mw4X1ZeCMjnrWh0/A4ULTCmntvaQT9gwDemqPykthSi0Wik6Wwex8NDjq3yDg95dAc8f1B0JiNuRSfrGDVj9aXiVtcjd9Q1TURDvX/PMUVBWffwO7QZU4MAOH6XyRqTqlT1K1hr/SZsYtgL2FAGBFSko/udQUyLsw==|920 \ No newline at end of file +}//w2nvLakdWwPl1bjAn/A/cexGfvpFrGhAONrzFF7p9mUo+JXb0/72QLRE7Aq1kfIcsK6kVRfiEn6LhfmGuAvaH5crhZjR19V7XDSzpbrs2j0+MkzTkPMBkmZhG4s6zCMzd5MYHkU4Qh3wBmcbDA17gxeGVk6cfPqg8NP7W9LYCunjdsfRTMFgRy/dxr76/JQ6p6WTmZdTnOR8m6Guy6/QS2Ykq1PyUib/q6SNgMcDOU5kdxNQPZMf5Zb8btMZNA3qDD3/xGGJl2fb3uodkLBad8jKH4k3Ba5g+AIPz6DoqjYazz8RpZRILfFuZCHyAx6dk/lpGnprZEMviFxwFKt95N7lJGWiUenLi2HWE7J/xLjvFiWfk6tFz40h5Zrq3+3EKTAGGDy++fLxfz0gfX5uGgCTVhbhuLyyHbjg9FuxWLFxXUgZPcfuQLeBhIKQXkoWDIAM5fB2deQURPIYWunVzm4ZvfrjK0xyPbjjUzrC9cmIsIW50VyKt/VBxehVPG3VVSe+zniT0NsJ7/aEg9YPT6xDaluqICzxdGjjXhcoolagOZfi6hwnbCTtl73D89My8/YI4vA46FliqY9MmHivL5+J5uSfOlyiWAdgJdEvM3W8xEi2SoMnIrFyH2nnKpxSvg+lp7167E7X3iJeLHCpd9BdElYU2lwEaL1m+H9UUR0pxUG1NeQ0YEoonjf+ZnUZAZuAxz/po6sHFMG0QqogVko/5gFFRlc1f1cw4YxpFOvygA5efIPtuQPRPKN2UC7/kyq+/yBrKbc6EOK3MWrL/J6NsMeh2bG7Iyq43trj6y4xFWyHsxd+2C4NZQQRIFlDhwm5vMANCTVErZJ5GHydkqpR68AKs+RC2WkGgpVDSRYNNCGn+vpz4uKoLXlP10gyDGRNjAulHtvghnfqOubUEw==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页.json b/Pages/项目首页/项目首页.json index 8e6ae6f8..d5573c53 100644 --- a/Pages/项目首页/项目首页.json +++ b/Pages/项目首页/项目首页.json @@ -317,8 +317,8 @@ }, "CommandList": [ { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "Title": "加载中" + "$type": "LoadingCommand.StartLoadingCommand, LoadingCommand", + "LoadingTextColor": "Background 1 0" }, { "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", @@ -327,7 +327,7 @@ "ColumnBindingInfo": { "TableName": "项目表", "ColumnName": "ID", - "GUID": "ecae9cb8-2975-4525-aa0f-baf06d5c4bf4" + "GUID": "24a388d6-e3a7-492d-8b87-27ac72cb0457" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -338,15 +338,13 @@ { "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", "JavaScript": "Forguncy.Page.reloadBindingData();\r\n", - "ID": "b58e3e0c63374cf2a19a70f15f0bfba1" + "ID": "e53878b1401e44e79a1be857a76870e0" }, { - "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Title": "加载中" + "$type": "LoadingCommand.EndLoadingCommand, LoadingCommand" } ], - "ID": "573081b4-9f68-4287-8b1e-610c4775b779" + "ID": "90c0e312-a97a-4dd4-8bf5-be5b0c5dfc84" } ] } @@ -484,4 +482,4 @@ "Formula": "项目首页!$A$2" } ] -}//m2ErzpB+OOYQdBH2aQUSaBzUreUAeHlNt6OrIkQjIw20zqBK0WBs0nyCoEs4yE0lno15A/d6GFEdOU/3KcX/Mr/1a2qfXz843eImzHsMOQ48UKhiLbkwhFvHpJKulUjxiCU8xyR5mKI/pdHa1vAjokeoSJKEetkWE+1qhbhA8WBHkRBwxpAk2px6qsugmZmsS6Pug+aTQqX8ehSOo6ZokymRNbK2TejVrf/lTY8SR1gJ3+0QNM+0xAMhb4xrfLjw087MM7f3WdVu+rRvXoepRUaXWA13Gk2jL4+5+XYXbCrcdSwXbMb56OiRILDbuMshyMl8onu614SdYeCI98y0B5MteygZA1Wz8GDMiWE4nIps19cMc/4SWIy9H+A787Z4RkONGdC6hSCMVnPIrnoN2XPC/rLASHS+aZ6zvwvUgC/HEZED4Vgl+KQyr6sASta6ZS53+rLgeE7EsG4T9Wz9dR0MvSsbK9cZgOq7D7BwbwjSNW/LpSbmWjObcfa/XJ9XFiS5FF6qde5FSN0WLrpUBOaRCL03FSqEjKak/OKuT9pm9u+ZvO1ZlE2uYTUzqVDVxTMTuEhUMJzkFljQRmc1JnzoYYwv5+rbM8022CMe6fl6Axmn1ixpyxwTVuUSEIrK4KPujMlQvXcLWLC/yR1naM5CuTqIfV+Id5htziWIh86iPPhUdOWEceOkntAjdL4iL7OuJwmzL4wX7QO4Xi443aupSx3o4e0oCC3zC6gEk/8wC1AEMc5RrW1jfNPn1rDta4bGHOWZnU3pEWOvjMSv8m0TxNXjQ6etHSg0FwR+vkc6b4vwCHZLVxPmnKWqN3JOFf9Hoe4Ke9bXs+xj4CvVCL2XjhULtb1J0YS7X/TCtHxfOAJdPZoDGXhC4pbZL5RD5dtP8ab7DMNHrTJN1UJAQg==|920 \ No newline at end of file +}//xblkVuqNZ8ivRpx0U0Qk1vsopWESERUPi/jM1Tzw4IRdi7a189y60DSmAQZwKYnCDhqXjyrSTun5oukprTLqtxEgEs/ldn/bS6i3QzmNOZ4uheG2avaF7QX+aJF1ucUPzrQ4HaVj9USuOZa6SHncO++/p/TbvMjKroybkGaajj6rB+VpMjzlymAhjPkWMy5IOgXLqMvsS7I+YkrwcPIphC2IR9YOIASjB2EKDXAotadezrBqVTv/icLbNDsPjKwQHEF56c0MC6CKJ4pV+IIHygfbl2wlvSwzLrRwZXbVFp6DSagbLYRRYw0Ceno5UmumOapgSX/tLcenb6pkA5G+bpOjKi1lzQ4RU3OJBLeXgWPwK5SCYQPVnBbZZV3H+xbaGAwrxzd33vQx5jMFLBXarYzqtesdoWona1EboRzamT4c9bOXgqko9tCb59zw6XRBEuDPRIT0yWxB1rptYvTX1EaSNQW06J4eDw+YkvIo6zf6V9fKraiaeGr93wR6A/d/K1+rGbQeICQZASQvj8W6GLaQ1TN23ca6C0pKHZfku98tM0SQiYIMOfAyWFSa4ExNK8aNpSXHWaRp7I4bjzr1FM9U9hVx7oTlCvwVZy+bwgi0kc6eCSgUg26pgMcjv43+HeqojkDatcpZOokIsGggS+SP1KQutm7NMTMND2sTQBNAlWoeSzz2SBrJBGmQWjZ6QHhOBv/G4u5ZSJDFrDZsXUUgnHYCJnE6j09l1kdpfghcyRA+t7exl/4eeoMGMCWx0uvfd8pKsM/AIRyjEu1jRW+DLO2ycnDZoYVIxxnGMra2XoLAZKuRcOQKKPqtESrIA/4ZUUXZ3lKyJZmTzwm8wOkKugZSUqWPhkahlFi8wCfl+E8fELDTli4emWEViInFpg6WL6XAhbL2PW+L/Re6CA==|920 \ No newline at end of file diff --git a/Plugin/加载动画-9_0_102_0.zip b/Plugin/加载动画-9_0_102_0.zip new file mode 100644 index 00000000..b6f6c193 Binary files /dev/null and b/Plugin/加载动画-9_0_102_0.zip differ diff --git a/Tables/项目任务/项目分组.json b/Tables/项目任务/项目分组.json index 174e8bd4..185c4a46 100644 --- a/Tables/项目任务/项目分组.json +++ b/Tables/项目任务/项目分组.json @@ -13,6 +13,8 @@ }, { "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "Required": true, + "Unique": true, "DatabaseColumnType": "System.String", "Name": "项目分组", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" diff --git a/Tables/项目任务/项目表.json b/Tables/项目任务/项目表.json index d34532f2..b0e539cd 100644 --- a/Tables/项目任务/项目表.json +++ b/Tables/项目任务/项目表.json @@ -41,10 +41,10 @@ }, { "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", - "DatabaseColumnType": "bigint", + "DatabaseColumnType": "nvarchar", "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.Model.Tables.BindingColumn, ServerDesignerCommon", @@ -68,6 +68,13 @@ "Name": "项目预算工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "项目预算费用", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", "DefaultValue": 0, @@ -84,6 +91,20 @@ "Name": "严格模式", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "归档", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "删除", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.Model.Tables.UserExtraBingingColumn, ServerDesignerCommon", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", @@ -126,17 +147,6 @@ "RelationTypeOnDelete": 0, "RelationTypeOnUpdate": 0, "IsDetailTableRelation": true - }, - { - "PrimarySchema": null, - "PrimaryTable": "项目分组", - "PrimaryColumn": "ID", - "ForeignSchema": null, - "ForeignTable": "项目表", - "ForeignColumn": "项目分组", - "RelationTypeOnDelete": 0, - "RelationTypeOnUpdate": 0, - "IsDetailTableRelation": true } ] } \ No newline at end of file diff --git a/Theme/CellTypeStyles b/Theme/CellTypeStyles index f9d35ed6..e1e47460 100644 --- a/Theme/CellTypeStyles +++ b/Theme/CellTypeStyles @@ -1 +1 @@ -{"Forguncy.CustomMenu.ForguncyMenuCellTypeStyleTemplateSupportAttribute":[{"Key":"BalckWhite","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 50"},"SelectedStyle":{"FontColor":"Accent 1 0","BorderLeftString":"3px solid Accent_1_0","Bold":true},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}}],"Forguncy.RepeaterCellTypeStyleTemplateSupportAttribute":[{"Key":"普通_悬浮变白_","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 1 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"竖排无样式","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 2 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"BlackWhite","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderString":"2px solid Background_2_0","BorderRadiusString":"8px 8px 8px 8px","BoxShadowString":"3px 3px 5px 0px #20000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"HoverStyle":{"BoxShadowString":"5px 7px 15px 0px #17000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"FocusStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"ActiveStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"SelectedStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"Transition":"0.3s"}}}],"Forguncy.ImageCellTypeStyleTemplateSupportAttribute":[{"Key":"按钮图标","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Background 1 -50","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"上圆角封面","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"8px 8px 0px 0px"}}}},{"Key":"pd_10","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":10,"PaddingBottom":10}}}},{"Key":"中圆角","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"10px 10px 10px 10px"}}}}],"Forguncy.ButtonCellTypeStyleTemplateSupportAttribute":[{"Key":"动态背景","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"6px 6px 6px 6px"},"DisableStyle":{"Opacity":0.445079736545843}}}},{"Key":"链接样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 0"},"Transition":"0.3s"}}},{"Key":"圆角浮动","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1 -50","Background":"Background 1 0","BorderString":"1px solid Background_2_0","BorderRadiusString":"20px 20px 20px 20px","BoxShadowString":"5px 5px 16px 0px #10000000"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"Gost","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"8px 8px 8px 8px"},"HoverStyle":{"Background":"Background 2 0"},"DisableStyle":{"Opacity":0.44507973654584293},"Transition":"0.3s"}}}],"Forguncy.HyperlinkCellTypeStyleTemplateSupportAttribute":[{"Key":"Gost","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"Background":"#00FFFFFF","BorderRadiusString":"5px 5px 5px 5px","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"HoverStyle":{"Background":"Background 2 0"},"Transition":"0.3s"}}}],"Forguncy.TextCellTypeStyleTemplateSupportAttribute":[{"Key":"Gost","Category":"_RS_Custom","Styles":{"MAIN":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Background 2 0"},"FocusStyle":{"FontColor":"Text 1 0","Background":"Background 2 0"},"Transition":"0.3s"},"FGC_BUILDIN_ERROR":{"NormalStyle":{"BorderString":"1px solid #FFFF0000","BorderRadiusString":"5px 5px 5px 5px"}}}}]} \ No newline at end of file +{"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"}}}}],"Forguncy.RepeaterCellTypeStyleTemplateSupportAttribute":[{"Key":"普通_悬浮变白_","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 1 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"竖排无样式","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 2 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"BlackWhite","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderString":"2px solid Background_2_0","BorderRadiusString":"8px 8px 8px 8px","BoxShadowString":"3px 3px 5px 0px #20000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"HoverStyle":{"BoxShadowString":"5px 7px 15px 0px #17000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"FocusStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"ActiveStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"SelectedStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"Transition":"0.3s"}}}],"Forguncy.ImageCellTypeStyleTemplateSupportAttribute":[{"Key":"按钮图标","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Background 1 -50","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"上圆角封面","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"8px 8px 0px 0px"}}}},{"Key":"pd_10","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":10,"PaddingBottom":10}}}},{"Key":"中圆角","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"10px 10px 10px 10px"}}}}],"Forguncy.ButtonCellTypeStyleTemplateSupportAttribute":[{"Key":"动态背景","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"6px 6px 6px 6px"},"DisableStyle":{"Opacity":0.445079736545843}}}},{"Key":"链接样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 0"},"Transition":"0.3s"}}},{"Key":"圆角浮动","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1 -50","Background":"Background 1 0","BorderString":"1px solid Background_2_0","BorderRadiusString":"20px 20px 20px 20px","BoxShadowString":"5px 5px 16px 0px #10000000"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"Gost","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"8px 8px 8px 8px"},"HoverStyle":{"Background":"Background 2 0"},"DisableStyle":{"Opacity":0.44507973654584293},"Transition":"0.3s"}}}],"Forguncy.HyperlinkCellTypeStyleTemplateSupportAttribute":[{"Key":"Gost","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"Background":"#00FFFFFF","BorderRadiusString":"5px 5px 5px 5px","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"HoverStyle":{"Background":"Background 2 0"},"Transition":"0.3s"}}}],"Forguncy.TextCellTypeStyleTemplateSupportAttribute":[{"Key":"Gost","Category":"_RS_Custom","Styles":{"MAIN":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Background 2 0"},"FocusStyle":{"FontColor":"Text 1 0","Background":"Background 2 0"},"Transition":"0.3s"},"FGC_BUILDIN_ERROR":{"NormalStyle":{"BorderString":"1px solid #FFFF0000","BorderRadiusString":"5px 5px 5px 5px"}}}}]} \ No newline at end of file diff --git a/UserFile/BaseCss.css b/UserFile/BaseCss.css index a5d6fe3a..04876836 100644 --- a/UserFile/BaseCss.css +++ b/UserFile/BaseCss.css @@ -3,11 +3,23 @@ border-radius: 8px !important; overflow: hidden; } -.FUI-dialog-cover.FUI-show{ +/* .FUI-dialog-cover.FUI-show{ backdrop-filter: blur(3px); -} +} */ /* 单选按钮圆形 */ .singlebox .fgc-toggle-button { border-radius: 20px; +} + +/* 活字格菜单组件 */ +.pms-menu-row ul { + text-align: center; +} +.pms-menu-row ul li { + width: auto !important; + margin: 0 10px; +} +.pms-menu-row ul li a { + padding: 0px 10px !important; } \ No newline at end of file diff --git a/image/图标/展开.svg b/image/图标/展开.svg new file mode 100644 index 00000000..ec3040c1 --- /dev/null +++ b/image/图标/展开.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/image/图标/项目 (1).png b/image/图标/项目 (1).png new file mode 100644 index 00000000..7ea10f12 Binary files /dev/null and b/image/图标/项目 (1).png differ diff --git a/image/图标/项目.png b/image/图标/项目.png new file mode 100644 index 00000000..87fac7c7 Binary files /dev/null and b/image/图标/项目.png differ diff --git a/image/插图/无数据插画 (1).png b/image/插图/无数据插画 (1).png new file mode 100644 index 00000000..338028d2 Binary files /dev/null and b/image/插图/无数据插画 (1).png differ diff --git a/image/插图/无数据插画.png b/image/插图/无数据插画.png new file mode 100644 index 00000000..4f5c5c09 Binary files /dev/null and b/image/插图/无数据插画.png differ diff --git a/image/插图/暂无内容 (1).png b/image/插图/暂无内容 (1).png new file mode 100644 index 00000000..b3d01e33 Binary files /dev/null and b/image/插图/暂无内容 (1).png differ diff --git a/image/插图/暂无数据 (1).png b/image/插图/暂无数据 (1).png new file mode 100644 index 00000000..e6752d34 Binary files /dev/null and b/image/插图/暂无数据 (1).png differ diff --git a/image/插图/缺省页.png b/image/插图/缺省页.png new file mode 100644 index 00000000..a0313149 Binary files /dev/null and b/image/插图/缺省页.png differ diff --git a/image/插图/钉钉.png b/image/插图/钉钉.png new file mode 100644 index 00000000..e2b32a8c Binary files /dev/null and b/image/插图/钉钉.png differ