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_FormOfflinePlanArchive/Component_PanelTable.def | 27 +++++++++++++++++++++++++++
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def | 20 +++++++++-----------
2 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
index 6c6f4ef..459c315 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
@@ -17,10 +17,10 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'InterfaceDataset'
- Source: 'InterfaceDataset'
+ DataType: 'structured[OfflinePlanArchiveRow]'
+ Source: 'dhRows'
Taborder: 0
- Transformation: 'OfflinePlanArchiveVersion.Row.Cell'
+ Transformation: 'Elements.Cell'
]
}
]
@@ -44,12 +44,10 @@
BaseType: 'WebDataExtractor'
Properties:
[
- 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'
+ DataType: 'structured[OfflinePlanArchiveRow]'
+ Source: 'dhRows'
Taborder: 0
- Transformation: 'OfflinePlanArchiveVersion.Row'
+ Transformation: 'Elements'
]
}
]
@@ -72,13 +70,13 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'InterfaceDataset'
+ DataType: 'structured[OfflinePlanArchiveRow]'
Description: '( search.StartDate().IsMinInfinity() or object.StartDate() >= search.StartDate() ) and ( search.EndDate().IsMaxInfinity() or object.StartDate() <= search.EndDate() )'
FilterArguments: 'search:QMacroPlanner::FormOfflinePlanArchive.dhSearch'
FixedFilter: 'object.Filter( search )'
- Source: 'InterfaceDataset'
+ Source: 'dhRows'
Taborder: 0
- Transformation: 'OfflinePlanArchiveVersion.Column'
+ Transformation: 'Elements.Cell.Column'
]
}
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTable.def
index 4c488b9..8388d74 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTable.def
@@ -6,6 +6,33 @@
Children:
[
#child: MatrixEditorTable
+ Component dhRows
+ {
+ #keys: '[730572.0.133250359]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'structured[OfflinePlanArchiveRow]*'
+ Children:
+ [
+ Component deRows
+ {
+ #keys: '[730572.0.134330656]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ 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: 'OfflinePlanArchiveVersion.Row'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 1
+ ]
+ }
]
Properties:
[
--
Gitblit v1.9.3