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

lazhen

2024-10-21 88fdebd7f6e2936ae00b8999a86a7f301c914ab3

 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def

@@ -51,7 +51,7 @@
      [
        DataBinding: 'ddlOfflinePlanTable.Data.TableName'
        NumberOfColumns: 50
        Taborder: 4
        Taborder: 6
      ]
    }
    Component bExport id:bExport_298
@@ -61,7 +61,7 @@
      Properties:
      [
        Image: 'EXPORT1'
        Taborder: 2
        Taborder: 4
      ]
    }
    Component dhXMLDataListener id:dhXMLDataListener_273
@@ -87,6 +87,28 @@
      ]
      Properties:
      [
        Taborder: 5
      ]
    }
    Component rbgTimeUnit
    {
      #keys: '[414996.1.147730565]'
      BaseType: 'WebRadioButtonGroup'
      Properties:
      [
        BoundValue: 'Day'
        ButtonLabels: 'Day;Week;Month'
        ButtonValues: 'Day;Week;Month'
        Taborder: 2
      ]
    }
    Component dhTimeUnit
    {
      #keys: '[414996.1.147730603]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Taborder: 3
      ]
    }