From 502b9a2e6da207f6344b8b51115a637d8d812d57 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期三, 13 十一月 2024 18:05:00 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

---
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration#523.def |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration\043812.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration\043523.def"
similarity index 74%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration\043812.def"
rename to "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration\043523.def"
index 7417951..db84ced 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration\043812.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration\043523.def"
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component pGeneration id:pGeneration_812
+Component pGeneration id:pGeneration_523
 {
-  #keys: '[414996.1.209190760]'
+  #keys: '[414996.1.230731086]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhGenerations
     {
-      #keys: '[414996.1.209190761]'
+      #keys: '[414996.1.230731087]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -15,17 +15,16 @@
         Taborder: 1
       ]
     }
-    #child: ListGenerations_529
     Component dhCheckGenerations
     {
-      #keys: '[414996.1.209190767]'
+      #keys: '[414996.1.230731088]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckGenerations
         {
-          #keys: '[414996.1.209190768]'
+          #keys: '[414996.1.230731089]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -42,10 +41,13 @@
         Taborder: 2
       ]
     }
+    #child: ListGenerations_916
   ]
   Properties:
   [
-    MinimumRows: 20
+    FixedSize: true
+    MinimumColumns: 8
+    MinimumRows: 15
     Taborder: 0
     Title: 'Generation'
   ]

--
Gitblit v1.9.3