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_DialogEditPriorityFactorDetails/Component_pnlContent.def | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactorDetails/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactorDetails/Component_pnlContent.def
index 8f09095..1f2cbd2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactorDetails/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactorDetails/Component_pnlContent.def
@@ -11,7 +11,7 @@
BaseType: 'WebEditField'
Properties:
[
- DataBinding: 'DataHolderEditPriorityFactorDetails.Data.GradeTarget'
+ DataBinding: 'DataHolderEditPriorityFactorDetail.Data.GradeTarget'
Label: '鍒嗙骇鐩爣鍊�'
Taborder: 2
]
@@ -22,7 +22,7 @@
BaseType: 'WebCheckbox'
Properties:
[
- DataBinding: 'DataHolderEditPriorityFactorDetails.Data.IsRange'
+ DataBinding: 'DataHolderEditPriorityFactorDetail.Data.IsRange'
Label: '鍒嗙骇鑼冨洿:'
Taborder: 3
]
@@ -33,7 +33,7 @@
BaseType: 'WebEditField'
Properties:
[
- DataBinding: 'DataHolderEditPriorityFactorDetails.Data.RangeMax'
+ DataBinding: 'DataHolderEditPriorityFactorDetail.Data.RangeMax'
Label: '鏈�澶у��'
Taborder: 4
Visible: false
@@ -45,7 +45,7 @@
BaseType: 'WebEditField'
Properties:
[
- DataBinding: 'DataHolderEditPriorityFactorDetails.Data.RangeMin'
+ DataBinding: 'DataHolderEditPriorityFactorDetail.Data.RangeMin'
Label: '鏈�灏忓��'
ReadOnly: true
Taborder: 6
@@ -57,7 +57,7 @@
BaseType: 'WebEditField'
Properties:
[
- DataBinding: 'DataHolderEditPriorityFactorDetails.Data.GradeDesc'
+ DataBinding: 'DataHolderEditPriorityFactorDetail.Data.GradeDesc'
FixedSize: false
Label: '鎻忚堪'
SizeRatio: 3
@@ -70,20 +70,9 @@
BaseType: 'WebLabel'
Properties:
[
- DataBinding: 'DataHolderEditPriorityFactorDetails.Data.PriorityFactorName'
+ DataBinding: 'DataHolderEditPriorityFactorDetail.Data.PriorityFactor.Name'
Label: '浼樺厛绾у洜瀛�'
Taborder: 0
- ]
- }
- Component PriorityFactorDetailsName
- {
- #keys: '[414382.0.486013052]'
- BaseType: 'WebLabel'
- Properties:
- [
- DataBinding: 'DataHolderEditPriorityFactorDetails.Data.GradingName'
- Label: '缁嗗垎鍚嶇О'
- Taborder: 1
]
}
Component RangeMaxTest
@@ -107,6 +96,17 @@
Taborder: 7
]
}
+ Component PriorityFactorDetailsName
+ {
+ #keys: '[414996.0.36000637]'
+ BaseType: 'WebEditField'
+ Properties:
+ [
+ DataBinding: 'DataHolderEditPriorityFactorDetail.Data.GradingName'
+ Label: '缁嗗垎鍚嶇О'
+ Taborder: 1
+ ]
+ }
]
Properties:
[
--
Gitblit v1.9.3