From 3e22c533dd00a70f1bb7bb8575b5cb0335551626 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 14 十月 2024 18:05:34 +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 |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP.def
index 6143d29..5fcce35 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP.def
@@ -29,6 +29,7 @@
       [
         DisplayField: 'Name'
         Label: '鍩哄噯闇�姹傜増鏈細'
+        NumberOfColumns: 50
         Taborder: 0
       ]
     }
@@ -56,8 +57,8 @@
           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'
@@ -68,9 +69,21 @@
       [
         DisplayField: 'Name'
         Label: '瀵规瘮闇�姹傜増鏈細'
+        NumberOfColumns: 50
         Taborder: 2
       ]
     }
+    Component bSelectionChecks687
+    {
+      #keys: '[414996.1.13998608]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        Image: 'CHECK'
+        Label: '纭閫夋嫨'
+        Taborder: 3
+      ]
+    }
   ]
   Properties:
   [

--
Gitblit v1.9.3