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

lazhen

2024-08-27 6dd20e086c57bd0371d8633f6c3ae90c354a4067

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Component_pnlContent.def

@@ -54,20 +54,6 @@
        Taborder: 2
      ]
    }
    Component npPercentage
    {
      #keys: '[412672.0.1040102201]'
      BaseType: 'WebNumberPicker'
      Properties:
      [
        DataBinding: 'dhDialogData.Data.Percentage'
        Label: 'Percentage*'
        Max: '99'
        Min: '1'
        PlaceHolder: 'Percentage 为必填项'
        Taborder: 3
      ]
    }
    Component efPercentage
    {
      #keys: '[414996.1.29740363]'
@@ -75,10 +61,11 @@
      Properties:
      [
        DataBinding: 'dhDialogData.Data.Percentage'
        Enabled: false
        Label: 'Final Percentage'
        Taborder: 4
        Tooltip: '最终输入的Percentage会在这里展示'
        Mask: 'REAL'
        PlaceHolder: 'Percentage 为必填项'
        Taborder: 3
        Text: '0'
      ]
    }
  ]