From 880f3c0257eeb8c37761d484258fdd102a369a19 Mon Sep 17 00:00:00 2001
From: 陈清红 <420599804@qq.com>
Date: 星期一, 14 四月 2025 16:46:36 +0800
Subject: [PATCH] BUG&优化项
---
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def
index ba95322..d132cfb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def
@@ -17,10 +17,10 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'MacroPlan'
+ DataType: 'InterfaceDataset'
+ Description: 'object.Column().TimeUnit() = search.TimeUnit() and object.Column().StartDate() >= search.StartDate() and object.Column().StartDate() <= search.EndDate()'
FilterArguments: 'search:QMacroPlanner::FormCustomerDemandPPAIDS.dhSearch'
- FixedFilter: 'object.Column().TimeUnit() = search.TimeUnit()'
- Source: 'MacroPlan'
+ Source: 'InterfaceDataset'
Taborder: 0
Transformation: 'CustomerDemandIDS.Row.Cell'
]
@@ -46,10 +46,10 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'MacroPlan'
- FilterArguments: 'search:QMacroPlanner::FormCustomerDemandPPAIDS.dhSearch'
- FixedFilter: "( 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: 'MacroPlan'
+ DataType: 'InterfaceDataset'
+ FilterArguments: 'units:QLibMacroPlannerWebUI::ApplicationMacroPlanner.DataHolderUnit;products:QLibMacroPlannerWebUI::ApplicationMacroPlanner.DataHolderProduct'
+ FixedFilter: '( units.Size() = 0 or exists( units, Elements, unit, unit.ID() = object.Factory() ) ) and ( products.Size() = 0 or exists( products, Elements, product, product.ID() = object.Name() ) )'
+ Source: 'InterfaceDataset'
Taborder: 0
Transformation: 'CustomerDemandIDS.Row'
]
@@ -74,10 +74,11 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'MacroPlan'
+ DataType: 'InterfaceDataset'
+ Description: '( search.StartDate().IsMinInfinity() or object.StartDate() >= search.StartDate() ) and ( search.EndDate().IsMaxInfinity() or object.StartDate() <= search.EndDate() )'
FilterArguments: 'search:QMacroPlanner::FormCustomerDemandPPAIDS.dhSearch'
- FixedFilter: 'object.TimeUnit() = search.TimeUnit()'
- Source: 'MacroPlan'
+ FixedFilter: 'object.Filter( search )'
+ Source: 'InterfaceDataset'
Taborder: 0
Transformation: 'CustomerDemandIDS.Column'
]
--
Gitblit v1.9.3