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

lihongji

2024-08-12 acf70acb5438a3358d07978afdc0eb28950f40d5

 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def

@@ -26,7 +26,7 @@
      ]
      Properties:
      [
        Attributes: 'BaseVersionValue;CompareVersionValue;BaseVersion;CompareVersion;Gap'
        Attributes: 'BaseVersion;CompareVersion;Gap'
        Column: 'LocalColumn'
        Row: 'LocalRow'
        Taborder: 0
@@ -45,6 +45,8 @@
          Properties:
          [
            DataType: 'LocalTable'
            FilterArguments: 'checkedProduct:QMacroPlanner::FormDemandComparison.dhFinelProduct'
            FixedFilter: 'exists( checkedProduct,Elements,product,product.ID() = object.Name() )'
            Source: 'dhComparisonData'
            Taborder: 0
            Transformation: 'LocalRow'
@@ -71,6 +73,8 @@
          Properties:
          [
            DataType: 'LocalTable'
            FilterArguments: 'startDate:QMacroPlanner::FormDemandComparison.dhStartDate;endDate:QMacroPlanner::FormDemandComparison.dhEndDate'
            FixedFilter: 'not object.IsAttrbuteColumn() and startDate <= object.Date() and endDate > object.Date()'
            Source: 'dhComparisonData'
            Taborder: 0
            Transformation: 'LocalColumn'