From fe74c2c3e538a4e7dc163741cc5ebbac94fadf17 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 11 十一月 2024 18:34:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP.def | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP.def
index 6143d29..4801027 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP.def
@@ -21,7 +21,7 @@
DataType: 'Archive'
Source: 'Archive'
Taborder: 0
- Transformation: 'ArchivePP'
+ Transformation: 'ArchiveFile.astype( ArchivePP )'
]
}
]
@@ -29,6 +29,8 @@
[
DisplayField: 'Name'
Label: '鍩哄噯闇�姹傜増鏈細'
+ NumberOfColumns: 50
+ SortCriteria: 'desc:DateTime'
Taborder: 0
]
}
@@ -56,11 +58,11 @@
Properties:
[
DataType: 'Archive'
- FilterArguments: 'baseSelection:QMacroPlanner::FormDemandComparison.dhBaseVersionPP'
- FixedFilter: 'object <> baseSelection'
+ FilterArguments: 'baseSelection:QMacroPlanner::FormDemandComparison.dhBaseVersionPP;dateUnit:QLibMacroPlannerWebUI::ApplicationMacroPlanner.ActionBarMacroPlanner.dhDateUnitPP'
+ FixedFilter: 'object.Filter( baseSelection,dateUnit )'
Source: 'Archive'
Taborder: 0
- Transformation: 'ArchivePP'
+ Transformation: 'ArchiveFile.astype( ArchivePP )'
]
}
]
@@ -68,9 +70,22 @@
[
DisplayField: 'Name'
Label: '瀵规瘮闇�姹傜増鏈細'
+ NumberOfColumns: 50
+ SortCriteria: 'desc:DateTime'
Taborder: 2
]
}
+ Component bSelectionChecks687
+ {
+ #keys: '[414996.1.13998608]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'CHECK'
+ Label: '纭閫夋嫨'
+ Taborder: 3
+ ]
+ }
]
Properties:
[
--
Gitblit v1.9.3