Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-10-15 224bc6082b06f53755ee7e834d78e17f51cb0fa2

 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomation.def

@@ -5,49 +5,31 @@
  BaseType: 'WebPanel'
  Children:
  [
    Component dhBaseVersionPath id:dhBaseVersionPath_640
    #child: pVersionInfomationBase
    #child: pVersionInfomationCompare
    Component dhCompareVersion
    {
      #keys: '[412672.0.1119852775]'
      #keys: '[414996.1.137780879]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Taborder: 2
      ]
    }
    Component dhCompareVersionPath id:dhCompareVersionPath_582
    {
      #keys: '[412672.0.1119852802]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Databinding: 'ArchiveFile'
      Properties:
      [
        Taborder: 3
      ]
    }
    Component lBaseVersionName
    Component dhBaseVersion
    {
      #keys: '[412672.0.1119853064]'
      BaseType: 'WebLabel'
      #keys: '[414996.1.137780892]'
      BaseType: 'WebDataHolder'
      Databinding: 'ArchiveFile'
      Properties:
      [
        Label: '基准需求版本：'
        Taborder: 0
      ]
    }
    Component lCompareVersionName
    {
      #keys: '[412672.0.1119853066]'
      BaseType: 'WebLabel'
      Properties:
      [
        Label: '对比需求版本：'
        Taborder: 1
        Taborder: 2
      ]
    }
  ]
  Properties:
  [
    Taborder: 4
    Taborder: 3
  ]
}