From df6e56c65e758b5a5e7b28bb9192575710a76c47 Mon Sep 17 00:00:00 2001
From: renhao <renhui.hao@capgemini.com>
Date: 星期四, 12 十月 2023 15:54:20 +0800
Subject: [PATCH] Merge branch 'dev'
---
_Main/UI/MacroPlanner/Component_FormTestButtonCollection/_ROOT_Component_FormTestButtonCollection.def | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/_Main/UI/MacroPlanner/Component_FormTestButtonCollection/_ROOT_Component_FormTestButtonCollection.def b/_Main/UI/MacroPlanner/Component_FormTestButtonCollection/_ROOT_Component_FormTestButtonCollection.def
index 53a8703..e4d9281 100644
--- a/_Main/UI/MacroPlanner/Component_FormTestButtonCollection/_ROOT_Component_FormTestButtonCollection.def
+++ b/_Main/UI/MacroPlanner/Component_FormTestButtonCollection/_ROOT_Component_FormTestButtonCollection.def
@@ -11,6 +11,7 @@
Columns:
[
GBFlow.Column { grow: 0 id: 454 parent: 0 }
+ GBFlow.Column { grow: 0 id: 968 parent: 0 }
]
Elements:
[
@@ -18,6 +19,11 @@
{
Component => Button398
Position { startcolumn: 454 startrow: 649 endcolumn: 454 endrow: 649 }
+ }
+ GBElement
+ {
+ Component => Button884
+ Position { startcolumn: 968 startrow: 649 endcolumn: 968 endrow: 649 }
}
]
Gaps: [ left: 5 right: 5 top: 5 bottom: 5 inner: 5 ]
@@ -35,7 +41,19 @@
Properties:
[
Image: 'HARDHAT'
+ LayoutGroup: 'Button'
Text: '鐢熸垚浜ц兘鍒嗛厤缁撴灉鏁版嵁'
+ ]
+ }
+ Component Button884
+ {
+ #keys: '[414702.1.33954049]'
+ BaseType: 'Button'
+ Properties:
+ [
+ Image: 'CAKE_SLICE'
+ LayoutGroup: 'Button'
+ Text: '鏍规嵁鎴愬搧鐢熸垚鐗╂枡'
]
}
]
@@ -46,5 +64,10 @@
IncludeInView: true
Title: '鍔熻兘娴嬭瘯鎸夐挳'
Width: 535
+ ModeledStringList ChildOrdering
+ {
+ c: Button398
+ c: Button884
+ }
]
}
--
Gitblit v1.9.3