From 597f8e8f284b7494fceabaeb2c96e4496cfd2435 Mon Sep 17 00:00:00 2001 From: lihongji <3117313295@qq.com> Date: 星期二, 18 六月 2024 17:31:51 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev --- _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Component_pnlRouting.def | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Component_pnlRouting.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Component_pnlRouting.def index 0ebdb18..733da60 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Component_pnlRouting.def +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Component_pnlRouting.def @@ -5,21 +5,21 @@ BaseType: 'WebPanel' Children: [ - Component ddlRouting + Component ddlUnit { #keys: '[415136.0.756140276]' BaseType: 'WebDropDownList' - Databinding: 'Routing' + Databinding: 'Unit' Children: [ - Component DataExtractorRouting + Component DataExtractorUnit { #keys: '[415136.0.756140277]' BaseType: 'WebDataExtractor' Properties: [ - DataType: 'structured[Routing]' - Source: 'dhRoutingSelection' + DataType: 'structured[Unit]' + Source: 'dhUnitSelection' Taborder: 0 Transformation: 'Elements' ] @@ -28,18 +28,17 @@ Properties: [ AllowEmpty: true - DataBinding: 'dhDialogData.Data' DisplayField: 'Name' FixedSize: false - Label: 'Routing' + Label: 'Unit' Taborder: 1 ] } - Component dhRoutingSelection + Component dhUnitSelection { #keys: '[415136.0.756140424]' BaseType: 'WebDataHolder' - Databinding: 'structured[Routing]*' + Databinding: 'structured[Unit]*' Properties: [ MergeStyle: 'Union' -- Gitblit v1.9.3