From fb1634fb000c80a7b66d3af521c964dea9923d79 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期日, 04 八月 2024 17:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Component_MatrixEditorTable.def | 4 +---
1 files changed, 1 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..2efd8dd 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Component_MatrixEditorTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Component_MatrixEditorTable.def
@@ -45,8 +45,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 +54,7 @@
Properties:
[
Legend: 'Name'
- SortCriteria: 'Name'
+ SortCriteria: 'RowNr'
Taborder: 1
]
}
--
Gitblit v1.9.3