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

xiaoding721

2024-11-06 2c714b2284a68fbe764bbd11dd23e74d42d83f34

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def

@@ -27,10 +27,58 @@
      Properties:
      [
        Image: 'FLASH'
        Label: 'Requirement upload'
        Label: 'Demand upload'
        Taborder: 1
      ]
    }
    Component dhRequirementImportExecutionStatus
    {
      #keys: '[414996.0.387620344]'
      BaseType: 'WebDataHolder'
      Databinding: 'RequirementImportExecutionStatus'
      Children:
      [
        Component deRequirementImportExecutionStatus
        {
          #keys: '[414996.0.387620380]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'ArchiveExecutionStatus'
            FilterArguments: 'userName:QLibMacroPlannerWebUI::ApplicationMacroPlanner.ActionBarMacroPlanner.dhUserName'
            FixedFilter: 'object.Filter( userName )'
            Source: 'ArchiveExecutionStatus'
            Taborder: 0
            Transformation: 'RequirementImportExecutionStatus'
          ]
        }
      ]
      Properties:
      [
        Taborder: 3
      ]
    }
    Component bBESIWarning
    {
      #keys: '[414996.0.413910939]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'WARNING'
        Label: 'BESI warning'
        Taborder: 2
      ]
    }
    Component dhUserName
    {
      #keys: '[413988.0.1522010283]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Taborder: 4
      ]
    }
  ]
  Properties:
  [