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

lihongji

2024-08-07 4e81774a232b45a6a9df3dfd06893c481c83695d

 _Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Component_MatrixEditorTable.def

@@ -45,8 +45,6 @@
          Properties:
          [
            DataType: 'FinancialProductionReport'
            Description: 'productids.FindString( object.Name(), 0 ) >= 0 and object.Unit() = unit'
            FilterArguments: 'unit:QMacroPlanner::FormFinancialProductionReport.dhUnit;productids:QMacroPlanner::FormFinancialProductionReport.dhProductIDs'
            Source: 'DataHolderTable'
            Taborder: 0
            Transformation: 'FinancialProductionRow'
@@ -56,7 +54,7 @@
      Properties:
      [
        Legend: 'Name'
        SortCriteria: 'Name'
        SortCriteria: 'RowNr'
        Taborder: 1
      ]
    }