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_pGeneration.def | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration208.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration.def
similarity index 64%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration208.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration.def
index 6bcde59..9f6b548 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration208.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component pGeneration208
+Component pGeneration
{
- #keys: '[414996.1.211222179]'
+ #keys: '[414996.1.218091286]'
BaseType: 'WebPanel'
Children:
[
- Component dhGenerations423
+ Component dhGenerations
{
- #keys: '[414996.1.211222180]'
+ #keys: '[414996.1.218091287]'
BaseType: 'WebDataHolder'
Databinding: 'structured[LocalValue]*'
Properties:
@@ -15,23 +15,22 @@
Taborder: 1
]
}
- #child: ListGenerations366
- Component dhCheckGenerations744
+ Component dhCheckGenerations
{
- #keys: '[414996.1.211222186]'
+ #keys: '[414996.1.218091288]'
BaseType: 'WebDataHolder'
Databinding: 'structured[LocalValue]*'
Children:
[
- Component deCheckGenerations857
+ Component deCheckGenerations
{
- #keys: '[414996.1.211222187]'
+ #keys: '[414996.1.218091289]'
BaseType: 'WebDataExtractor'
Properties:
[
DataType: 'structured[LocalValue]'
FixedFilter: 'object.IsCheck()'
- Source: 'dhGenerations423'
+ Source: 'dhGenerations'
Taborder: 0
Transformation: 'Elements'
]
@@ -42,10 +41,13 @@
Taborder: 2
]
}
+ #child: ListGenerations
]
Properties:
[
- MinimumRows: 20
+ FixedSize: true
+ MinimumColumns: 8
+ MinimumRows: 15
Taborder: 0
Title: 'Generation'
]
--
Gitblit v1.9.3