From 607205fa87d2b6084ad7cd545dffe68fd2009862 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 08 十一月 2023 09:46:57 +0800
Subject: [PATCH] Merge branch 'dev' into dev_lrs
---
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/_ROOT_Component_FormCapacityAndSaleBudgeCompare.def | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/_ROOT_Component_FormCapacityAndSaleBudgeCompare.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/_ROOT_Component_FormCapacityAndSaleBudgeCompare.def
index ec18fe9..fd88e20 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/_ROOT_Component_FormCapacityAndSaleBudgeCompare.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/_ROOT_Component_FormCapacityAndSaleBudgeCompare.def
@@ -7,20 +7,37 @@
BaseType: 'WebForm'
Children:
[
- Component ButtonCapacityAndSaleBudgeCompare
+ #child: MatrixEditorCapacityAndSaleBudgeCompare
+ #child: pButton
+ Component dhStatus
{
- #keys: '[414384.0.818241675]'
- BaseType: 'WebButton'
+ #keys: '[414702.1.386200525]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'CapacityAndSaleBudgeRunStatus'
+ Children:
+ [
+ Component deStatus
+ {
+ #keys: '[414702.1.386200546]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'GlobalOTDSOP'
+ Source: 'GlobalOTDSOP'
+ Taborder: 0
+ Transformation: 'CapacityAndSaleBudgeRunStatus'
+ ]
+ }
+ ]
Properties:
[
- Label: '鍒锋柊'
- Taborder: 0
+ Taborder: 2
]
}
- #child: MatrixEditorCapacityAndSaleBudgeCompare
]
Properties:
[
- Title: '浜ч攢棰勭畻瀵规瘮'
+ Description: '骞村害浜ч攢棰勭畻瀵规瘮'
+ Title: '骞村害浜ч攢棰勭畻瀵规瘮'
]
}
--
Gitblit v1.9.3