From cbf2cc895f1d1e7dcf522a462e77709d92667747 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 11 十月 2024 18:10:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Component_MatrixEditorTable.def | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Component_MatrixEditorTable.def
index 8844548..d861543 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Component_MatrixEditorTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Component_MatrixEditorTable.def
@@ -18,6 +18,7 @@
Properties:
[
DataType: 'FinancialProductionReport'
+ FixedFilter: 'not object.FinancialProductionColumn().IsDay()'
Source: 'DataHolderTable'
Taborder: 0
Transformation: 'FinancialProductionColumn.FinancialProductionCell'
@@ -45,8 +46,6 @@
Properties:
[
DataType: 'FinancialProductionReport'
- FilterArguments: 'products:QLibMacroPlannerWebUI::ApplicationMacroPlanner.DataHolderProduct;search:QMacroPlanner::FormFinancialProductionReport.dhSearch'
- FixedFilter: 'object.Filter( search, products )'
Source: 'DataHolderTable'
Taborder: 0
Transformation: 'FinancialProductionRow'
@@ -56,7 +55,7 @@
Properties:
[
Legend: 'Name'
- SortCriteria: 'Name'
+ SortCriteria: 'RowNr'
Taborder: 1
]
}
@@ -73,6 +72,7 @@
Properties:
[
DataType: 'FinancialProductionReport'
+ FixedFilter: 'not object.IsDay()'
Source: 'DataHolderTable'
Taborder: 0
Transformation: 'FinancialProductionColumn'
--
Gitblit v1.9.3