From 3d65ee18d645a30e600c9b63f0daefe2fc2b1151 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期三, 13 十一月 2024 15:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower.def |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower243.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower.def
similarity index 66%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower243.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower.def
index 4c8ef19..effb842 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower243.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component pPower243
+Component pPower
 {
-  #keys: '[414996.1.211222170]'
+  #keys: '[414996.1.218091277]'
   BaseType: 'WebPanel'
   Children:
   [
-    Component dhPowers404
+    Component dhPowers
     {
-      #keys: '[414996.1.211222171]'
+      #keys: '[414996.1.218091278]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -15,23 +15,23 @@
         Taborder: 1
       ]
     }
-    #child: ListPowers199
-    Component dhCheckPowers354
+    #child: ListPowers
+    Component dhCheckPowers
     {
-      #keys: '[414996.1.211222177]'
+      #keys: '[414996.1.218091284]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
-        Component deCheckPowers981
+        Component deCheckPowers
         {
-          #keys: '[414996.1.211222178]'
+          #keys: '[414996.1.218091285]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
             DataType: 'structured[LocalValue]'
             FixedFilter: 'object.IsCheck()'
-            Source: 'dhPowers404'
+            Source: 'dhPowers'
             Taborder: 0
             Transformation: 'Elements'
           ]
@@ -45,7 +45,9 @@
   ]
   Properties:
   [
-    MinimumRows: 20
+    FixedSize: true
+    MinimumColumns: 8
+    MinimumRows: 15
     Taborder: 1
     Title: 'Power'
   ]

--
Gitblit v1.9.3