From 866f26844a9e5d6fbcde9c7c474656b093afad3e Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期四, 02 一月 2025 20:32:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
index 92f4b4f..6c6f4ef 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: 'OfflinePlanArchiveVersion'
- Source: 'DataHolderTable'
+ DataType: 'InterfaceDataset'
+ Source: 'InterfaceDataset'
Taborder: 0
- Transformation: 'Row.Cell'
+ Transformation: 'OfflinePlanArchiveVersion.Row.Cell'
]
}
]
@@ -44,17 +44,18 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'OfflinePlanArchiveVersion'
- Description: "( search.Generation() = '<All>' or object.Product_MP().Generation() = search.Generation() ) and ( search.MqbMlb() = '<All>' or object.Product_MP().MQBMLB() = search.MqbMlb() ) and ( search.Power() = '<All>' or object.Product_MP().Power() = search.Power() )"
- 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: 'OfflinePlanArchiveVersion.Row'
]
}
]
Properties:
[
- Legend: 'Name'
+ Legend: 'ShowName'
SortCriteria: 'Name'
Taborder: 1
]
@@ -71,10 +72,13 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'OfflinePlanArchiveVersion'
- 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::FormOfflinePlanArchive.dhSearch'
+ FixedFilter: 'object.Filter( search )'
+ Source: 'InterfaceDataset'
Taborder: 0
- Transformation: 'Column'
+ Transformation: 'OfflinePlanArchiveVersion.Column'
]
}
]
--
Gitblit v1.9.3