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

lihongji

2024-12-03 77dc40157d7ebff272f55055708cc8d2a1ae71ce

 _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_MatrixEditorTable#384.def

@@ -17,16 +17,16 @@
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'AssemblyOnlinePlanVersion'
            Source: 'DataHolderTable'
            DataType: 'InterfaceDataset'
            Source: 'InterfaceDataset'
            Taborder: 0
            Transformation: 'Row.Cell'
            Transformation: 'AssemblyOnlinePlanVersion.Row.Cell'
          ]
        }
      ]
      Properties:
      [
        Attributes: 'Quantity'
        Attributes: 'Order;Quantity'
        Column: 'Column'
        Row: 'Row'
        Taborder: 0
@@ -44,16 +44,18 @@
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'AssemblyOnlinePlanVersion'
            Source: 'DataHolderTable'
            DataType: 'InterfaceDataset'
            FilterArguments: 'units:QLibMacroPlannerWebUI::ApplicationMacroPlanner.DataHolderUnit;products:QLibMacroPlannerWebUI::ApplicationMacroPlanner.DataHolderProduct'
            FixedFilter: '( units.Size() = 0 or exists( units, Elements, unit, unit.ID() = object.ProductionLine() ) ) and ( products.Size() = 0 or exists( products, Elements, product, product.ID() = object.Name() ) )'
            Source: 'InterfaceDataset'
            Taborder: 0
            Transformation: 'Row'
            Transformation: 'AssemblyOnlinePlanVersion.Row'
          ]
        }
      ]
      Properties:
      [
        Legend: 'Name'
        Legend: 'ShowName'
        SortCriteria: 'Name'
        Taborder: 1
      ]
@@ -70,10 +72,13 @@
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'AssemblyOnlinePlanVersion'
            Source: 'DataHolderTable'
            DataType: 'InterfaceDataset'
            Description: '( search.StartDate().IsMinInfinity() or object.StartDate() >= search.StartDate() ) and ( search.EndDate().IsMaxInfinity() or object.StartDate() <= search.EndDate() )'
            FilterArguments: 'search:QMacroPlanner::FormAssemblyOnlinePlanVersion.dhSearch'
            FixedFilter: 'object.Filter( search )'
            Source: 'InterfaceDataset'
            Taborder: 0
            Transformation: 'Column'
            Transformation: 'AssemblyOnlinePlanVersion.Column'
          ]
        }
      ]
@@ -89,6 +94,7 @@
  ]
  Properties:
  [
    AllowMultipleAttributes: true
    Columns: 'MatrixEditorColumnsTable'
    ContextMenu: 'matrixeditorContextMenuTable'
    Rows: 'MatrixEditorRowsTable'