Merge branch 'dev'

renhao

2023-10-24 7a8fd5ab0aad4a41a8898b7084b1bceb9a2a8a51

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def

@@ -80,5 +80,31 @@
    Component DataHolderCurrentUser #extension
    {
    }
    Component DataHolderAllScenario
    {
      #keys: '[414702.1.169450613]'
      BaseType: 'WebDataHolder'
      Databinding: 'structured[ScenarioNode]*'
      Children:
      [
        Component DataExtractorAllScenario
        {
          #keys: '[414702.1.166961408]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'ScenarioManager'
            FixedFilter: 'not object.IsDeleted()'
            Source: 'ScenarioManager'
            Taborder: 0
            Transformation: 'ScenarioNode'
          ]
        }
      ]
      Properties:
      [
        Taborder: 46
      ]
    }
  ]
}