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

lihongji

2024-10-12 f1de76007e7834e17d87712e3342efd84876c200

 _Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Component_MatrixEditorTable.def

@@ -18,6 +18,7 @@
          Properties:
          [
            DataType: 'FinancialProductionReport'
            FixedFilter: 'not object.FinancialProductionColumn().IsDay()'
            Source: 'DataHolderTable'
            Taborder: 0
            Transformation: 'FinancialProductionColumn.FinancialProductionCell'
@@ -45,8 +46,6 @@
          Properties:
          [
            DataType: 'FinancialProductionReport'
            FilterArguments: 'products:QLibMacroPlannerWebUI::ApplicationMacroPlanner.DataHolderProduct;search:QMacroPlanner::FormFinancialProductionReport.dhSearch'
            FixedFilter: 'object.Filter( search, products )'
            Source: 'DataHolderTable'
            Taborder: 0
            Transformation: 'FinancialProductionRow'
@@ -56,7 +55,7 @@
      Properties:
      [
        Legend: 'Name'
        SortCriteria: 'Name'
        SortCriteria: 'RowNr'
        Taborder: 1
      ]
    }
@@ -73,6 +72,7 @@
          Properties:
          [
            DataType: 'FinancialProductionReport'
            FixedFilter: 'not object.IsDay()'
            Source: 'DataHolderTable'
            Taborder: 0
            Transformation: 'FinancialProductionColumn'