Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

lihongji

2024-08-14 d0d4a34072977d5194fb981a23fce67ba1b7eae2

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def

@@ -27,7 +27,7 @@
      Properties:
      [
        Image: 'FLASH'
        Label: 'Requirement upload'
        Label: 'Demand upload'
        Taborder: 1
      ]
    }
@@ -44,10 +44,8 @@
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'Archive'
            FilterArguments: 'userName:QLibMacroPlannerWebUI::ApplicationMacroPlanner.ActionBarMacroPlanner.dhUserName'
            FixedFilter: 'object.ExecutionUserName() = userName'
            Source: 'Archive'
            DataType: 'ArchiveExecutionStatus'
            Source: 'ArchiveExecutionStatus'
            Taborder: 0
            Transformation: 'RequirementImportExecutionStatus'
          ]
@@ -55,17 +53,18 @@
      ]
      Properties:
      [
        Taborder: 2
        Taborder: 3
      ]
    }
    Component dhUserName
    Component bBESIWarning
    {
      #keys: '[414996.0.387620508]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      #keys: '[414996.0.413910939]'
      BaseType: 'WebButton'
      Properties:
      [
        Taborder: 3
        Image: 'WARNING'
        Label: 'BESI warning'
        Taborder: 2
      ]
    }
  ]