Merge branch 'dev' into dev_hrh_global

haorenhui

2023-10-27 1499d8149575493519f2c5b04462c2302a455aa9

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Component_PanelGeneral#549.def

@@ -39,18 +39,6 @@
        Taborder: 3
      ]
    }
    Component dropDownStringListGeneral
    {
      #keys: '[414384.0.692930324]'
      BaseType: 'WebDropDownStringList'
      Properties:
      [
        AllowEmpty: true
        DataBinding: 'DataHolderDialogData.Data.BusinessType'
        Label: 'BusinessType'
        Taborder: 4
      ]
    }
    Component CheckboxIsCreateNewVersion
    {
      #keys: '[412960.0.157150313]'
@@ -62,5 +50,44 @@
        Taborder: 7
      ]
    }
    Component DropDownListGeneral
    {
      #keys: '[412960.0.324971441]'
      BaseType: 'WebDropDownList'
      Databinding: 'BusinessType'
      Children:
      [
        Component DataExtractorGeneral
        {
          #keys: '[412960.0.324971443]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'GlobalOTDTable'
            Description: '传入Business Type类进Dosync'
            Source: 'GlobalOTDTable'
            Taborder: 0
            Transformation: 'BusinessType'
          ]
        }
      ]
      Properties:
      [
        AllowEmpty: true
        DisplayField: 'ScenarioName'
        Label: 'Scenario Name'
        Taborder: 4
      ]
    }
    Component dsPlanningStart
    {
      #keys: '[414702.1.259278858]'
      BaseType: 'WebDateSelector'
      Properties:
      [
        Label: '计划开始时间'
        Taborder: 8
      ]
    }
  ]
}