From d47b2a6610c16b6db7fa991f6064d990085b65f3 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期五, 22 十一月 2024 17:14:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def
index 3c6db85..d132cfb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def
@@ -17,12 +17,12 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'CustomerDemandIDS'
+ 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'
- Source: 'DataHolderTable'
+ Source: 'InterfaceDataset'
Taborder: 0
- Transformation: 'Row.Cell'
+ Transformation: 'CustomerDemandIDS.Row.Cell'
]
}
]
@@ -46,12 +46,12 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'CustomerDemandIDS'
- Description: "search.Product() = '<All>' or object.Name() = search.Product() and ( search.Unit() = '<All>' or object.Factory() = search.Unit() )"
- FilterArguments: 'search:QMacroPlanner::FormCustomerDemandPPAIDS.dhSearch'
- 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.Factory() ) ) and ( products.Size() = 0 or exists( products, Elements, product, product.ID() = object.Name() ) )'
+ Source: 'InterfaceDataset'
Taborder: 0
- Transformation: 'Row'
+ Transformation: 'CustomerDemandIDS.Row'
]
}
]
@@ -74,12 +74,13 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'CustomerDemandIDS'
- Description: 'object.TimeUnit() = search.TimeUnit() and ( search.StartDate().IsMinInfinity() or object.StartDate() >= search.StartDate() ) and ( search.EndDate().IsMaxInfinity() or object.StartDate() <= search.EndDate() )'
+ 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'
- Source: 'DataHolderTable'
+ FixedFilter: 'object.Filter( search )'
+ Source: 'InterfaceDataset'
Taborder: 0
- Transformation: 'Column'
+ Transformation: 'CustomerDemandIDS.Column'
]
}
]
--
Gitblit v1.9.3