From b3babf694ac7026bebe0015b47fca321103bb4ec Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期三, 03 七月 2024 15:05:49 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def
index e22590b..df39242 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def
@@ -26,7 +26,7 @@
]
Properties:
[
- Attributes: 'BaseVersionValue;CompareVersionValue;BaseVersion;CompareVersion;Gap'
+ Attributes: 'BaseVersion;CompareVersion;Gap'
Column: 'LocalColumn'
Row: 'LocalRow'
Taborder: 0
@@ -45,6 +45,8 @@
Properties:
[
DataType: 'LocalTable'
+ FilterArguments: 'checkedProduct:QMacroPlanner::FormDemandComparison.dhFinelProduct'
+ FixedFilter: 'exists( checkedProduct,Elements,product,product.ID() = object.Name() )'
Source: 'dhComparisonData'
Taborder: 0
Transformation: 'LocalRow'
@@ -71,6 +73,8 @@
Properties:
[
DataType: 'LocalTable'
+ FilterArguments: 'startDate:QMacroPlanner::FormDemandComparison.dhStartDate;endDate:QMacroPlanner::FormDemandComparison.dhEndDate'
+ FixedFilter: 'not object.IsAttrbuteColumn() and startDate <= object.Date() and endDate > object.Date()'
Source: 'dhComparisonData'
Taborder: 0
Transformation: 'LocalColumn'
--
Gitblit v1.9.3