From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 22 一月 2025 12:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_MatrixEditorTable#384.def | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_MatrixEditorTable\043384.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_MatrixEditorTable\043384.def"
index 2b4a7d6..37837b4 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_MatrixEditorTable\043384.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_MatrixEditorTable\043384.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'
--
Gitblit v1.9.3