From 6d9968b5e3de0f425bef89103b9d4eec06a897f6 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期五, 18 十月 2024 12:00:58 +0800
Subject: [PATCH] 修复产量对比报表日期筛选导出不生效的bug
---
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def
index dd916e8..7e1f2d0 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def
@@ -20,13 +20,13 @@
DataType: 'LocalTable'
Source: 'dhComparisonData'
Taborder: 0
- Transformation: 'LocalRow.LocalCell'
+ Transformation: 'LocalRow.LocalCell.astype(LocalCell_DemandComparison)'
]
}
]
Properties:
[
- Attributes: 'Value'
+ 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.ProductID())'
Source: 'dhComparisonData'
Taborder: 0
Transformation: 'LocalRow'
@@ -53,7 +55,7 @@
]
Properties:
[
- Legend: 'Index'
+ Legend: 'Name'
SortCriteria: 'Index'
Taborder: 1
]
@@ -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'
@@ -89,6 +93,7 @@
]
Properties:
[
+ AllowMultipleAttributes: true
Columns: 'MatrixEditorColumns'
ContextMenu: 'matrixeditorContextMenuDemandComparison'
Rows: 'MatrixEditorRows'
--
Gitblit v1.9.3