From 03f93088637930acbda3cd0b405114e0b00c13e4 Mon Sep 17 00:00:00 2001 From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com> Date: 星期一, 30 九月 2024 17:29:00 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev --- _Main/UI/MacroPlannerWebApp/Component_DialogWholeShiftSystem/Component_ListEntity.def | 22 +++------------------- 1 files changed, 3 insertions(+), 19 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogWholeShiftSystem/Component_ListEntity.def b/_Main/UI/MacroPlannerWebApp/Component_DialogWholeShiftSystem/Component_ListEntity.def index 9993e10..2e353d2 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_DialogWholeShiftSystem/Component_ListEntity.def +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogWholeShiftSystem/Component_ListEntity.def @@ -12,10 +12,10 @@ Properties: [ DataType: 'MacroPlan' - FixedFilter: 'not object.GetIsSystem() and object.IsUnit();' + FixedFilter: 'not object.GetIsSystem() and object.IsUnit() and object.WholeShiftFiltering();' Source: 'MacroPlan' Taborder: 0 - Transformation: 'RootEntity' + Transformation: 'Unit' ] } Component DataSetLevelRootEntity @@ -25,27 +25,11 @@ Children: [ #child: listContextMenu902_1 - Component DataSetLevelChildEntity - { - #keys: '[414702.2.1845329623]' - BaseType: 'WebDataSetLevel' - Properties: - [ - Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeAllConstraint","columnid":"All constraints","title":"All constraints","subtotals":"","tooltip":"","width":-1,"display":"shown"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DisplayName","title":"Name","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"DisplayName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DisplayCapacityType","title":"Capacity type","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"DisplayCapacityType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImgIsToFill","title":"ImgIsToFill","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"ImgIsToFill"}}]' - ContextMenu: 'listContextMenu902' - FixedFilter: 'not object.GetIsSystem() and object.IsUnit();' - RelationFromParent: 'ChildEntity' - RelationRepeating: 'ChildEntity' - SortCriteria: 'DisplayIndex' - Taborder: 0 - ] - } ] Properties: [ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeAllConstraint","columnid":"All constraints","title":"All constraints","subtotals":"","tooltip":"","width":-1,"display":"shown"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DisplayName","title":"Name","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"DisplayName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DisplayCapacityType","title":"Capacity type","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"DisplayCapacityType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImgIsToFill","title":"ImgIsToFill","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"ImgIsToFill"}}]' ContextMenu: 'listContextMenu902' - RelationFromParent: 'ChildEntity' SortCriteria: 'DisplayIndex' Taborder: 1 ] @@ -55,7 +39,7 @@ Properties: [ DefaultExpandLevels: 100 - Taborder: 0 + Taborder: 1 ] ResponseDefinitions: [ -- Gitblit v1.9.3