From 5ae534ab606e6f2ba5ea60914224d665b0447d5a Mon Sep 17 00:00:00 2001
From: Kevin Kok Khah Whey <khahwhey.kok@3ds.com>
Date: 星期二, 07 十一月 2023 22:48:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_Kevin
---
_Main/UI/MacroPlannerWebApp/Component_DialogDataDistribution/Component_pnlContent.def | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogDataDistribution/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogDataDistribution/Component_pnlContent.def
index 5c05df7..a5e8867 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogDataDistribution/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogDataDistribution/Component_pnlContent.def
@@ -5,18 +5,6 @@
BaseType: 'WebPanel'
Children:
[
- Component dropDownStringListGeneral id:dropDownStringListGeneral_549
- {
- #keys: '[414702.1.87540205]'
- BaseType: 'WebDropDownStringList'
- Properties:
- [
- AllowEmpty: true
- DataBinding: 'DataHolderScenario.Data.ScenarioName'
- Label: 'Scenario Name'
- Taborder: 0
- ]
- }
Component checkboxIsKeyProduct id:checkboxIsKeyProduct_593
{
#keys: '[414702.1.87540263]'
@@ -49,6 +37,33 @@
Taborder: 3
]
}
+ Component ddlBusinessType
+ {
+ #keys: '[414702.1.169614090]'
+ BaseType: 'WebDropDownList'
+ Databinding: 'BusinessType'
+ Children:
+ [
+ Component deContent
+ {
+ #keys: '[414702.1.169614092]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'GlobalOTDTable'
+ Source: 'GlobalOTDTable'
+ Taborder: 0
+ Transformation: 'BusinessType'
+ ]
+ }
+ ]
+ Properties:
+ [
+ DisplayField: 'ScenarioName'
+ Label: 'Scenario Name'
+ Taborder: 0
+ ]
+ }
]
Properties:
[
--
Gitblit v1.9.3