From 890bde3948fb93abb133993a8e9c70fb452ed23e Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期五, 28 六月 2024 15:58:49 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

---
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPR.def |   94 ++++++++++++++++++++++++-----------------------
 1 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation11.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPR.def
similarity index 73%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation11.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPR.def
index 828d235..1bf0f92 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation11.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPR.def
@@ -1,59 +1,20 @@
 Quintiq file version 2.0
-Component PanelOperation11
+Component pSelectionPR
 {
-  #keys: '[412672.0.1085801711]'
+  #keys: '[412672.0.1109203593]'
   BaseType: 'WebPanel'
   Children:
   [
-    Component DropDownListCompareVersion id:DropDownListCompareVersion_85
+    Component DropDownListBaseVersionPR
     {
-      #keys: '[412672.0.1085801792]'
+      #keys: '[412672.0.1109203679]'
       BaseType: 'WebDropDownList'
       Databinding: 'ArchivePR'
       Children:
       [
-        Component DataExtractorOperation876 id:DataExtractorOperation876_293
+        Component DataExtractorOperation id:DataExtractorOperation_866
         {
-          #keys: '[412672.0.1085801793]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'Archive'
-            FilterArguments: 'baseSelection:QMacroPlanner::FormDemandComparison.dhBaseVersion'
-            FixedFilter: 'object <> baseSelection'
-            Source: 'Archive'
-            Taborder: 0
-            Transformation: 'ArchivePR'
-          ]
-        }
-      ]
-      Properties:
-      [
-        DisplayField: 'Name'
-        Label: '瀵规瘮闇�姹傜増鏈細'
-        Taborder: 2
-      ]
-    }
-    Component dhBaseVersion id:dhBaseVersion_357
-    {
-      #keys: '[412672.0.1085801820]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'ArchivePR'
-      Properties:
-      [
-        Taborder: 1
-      ]
-    }
-    Component DropDownListBaseVersion id:DropDownListBaseVersion_668
-    {
-      #keys: '[412672.0.1085801851]'
-      BaseType: 'WebDropDownList'
-      Databinding: 'ArchivePR'
-      Children:
-      [
-        Component DataExtractorOperation id:DataExtractorOperation_669
-        {
-          #keys: '[412672.0.1085801852]'
+          #keys: '[412672.0.1109203680]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -71,11 +32,52 @@
         Taborder: 0
       ]
     }
+    Component dhBaseVersionPR
+    {
+      #keys: '[412672.0.1109203707]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'ArchivePR'
+      Properties:
+      [
+        Taborder: 1
+      ]
+    }
+    Component DropDownListCompareVersionPR
+    {
+      #keys: '[412672.0.1109203739]'
+      BaseType: 'WebDropDownList'
+      Databinding: 'ArchivePR'
+      Children:
+      [
+        Component DataExtractorOperation876 id:DataExtractorOperation876_784
+        {
+          #keys: '[412672.0.1109203740]'
+          BaseType: 'WebDataExtractor'
+          Properties:
+          [
+            DataType: 'Archive'
+            FilterArguments: 'baseSelection:QMacroPlanner::FormDemandComparison.dhBaseVersionPR'
+            FixedFilter: 'object <> baseSelection'
+            Source: 'Archive'
+            Taborder: 0
+            Transformation: 'ArchivePR'
+          ]
+        }
+      ]
+      Properties:
+      [
+        DisplayField: 'Name'
+        Label: '瀵规瘮闇�姹傜増鏈細'
+        Taborder: 2
+      ]
+    }
   ]
   Properties:
   [
     FixedSize: true
     Orientation: 'horizontal'
-    Taborder: 0
+    Taborder: 1
+    Title: 'PR'
+    Visible: false
   ]
 }

--
Gitblit v1.9.3