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

lihongji

2024-06-18 597f8e8f284b7494fceabaeb2c96e4496cfd2435

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Component_pnlRouting.def

@@ -5,21 +5,21 @@
  BaseType: 'WebPanel'
  Children:
  [
    Component ddlRouting
    Component ddlUnit
    {
      #keys: '[415136.0.756140276]'
      BaseType: 'WebDropDownList'
      Databinding: 'Routing'
      Databinding: 'Unit'
      Children:
      [
        Component DataExtractorRouting
        Component DataExtractorUnit
        {
          #keys: '[415136.0.756140277]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'structured[Routing]'
            Source: 'dhRoutingSelection'
            DataType: 'structured[Unit]'
            Source: 'dhUnitSelection'
            Taborder: 0
            Transformation: 'Elements'
          ]
@@ -28,18 +28,17 @@
      Properties:
      [
        AllowEmpty: true
        DataBinding: 'dhDialogData.Data'
        DisplayField: 'Name'
        FixedSize: false
        Label: 'Routing'
        Label: 'Unit'
        Taborder: 1
      ]
    }
    Component dhRoutingSelection
    Component dhUnitSelection
    {
      #keys: '[415136.0.756140424]'
      BaseType: 'WebDataHolder'
      Databinding: 'structured[Routing]*'
      Databinding: 'structured[Unit]*'
      Properties:
      [
        MergeStyle: 'Union'