From 133f1a1dc59bbf13a35dc3d64e2ddaf6b37a335f Mon Sep 17 00:00:00 2001 From: lazhen <17772815105@139.com> Date: 星期一, 14 十月 2024 18:19:02 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg --- _Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504#801.def | 44 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 34 insertions(+), 10 deletions(-) diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504\043801.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504\043801.def" index 0b818cc..56e00de 100644 --- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504\043801.def" +++ "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504\043801.def" @@ -9,7 +9,7 @@ { #keys: '[412672.1.78210474]' BaseType: 'WebDropDownList' - Databinding: 'OfflinePlanTable' + Databinding: 'OfflinePlanTableInfo' Children: [ Component DataExtractorRibbon @@ -18,7 +18,7 @@ BaseType: 'WebDataExtractor' Properties: [ - DataType: 'structured[OfflinePlanTable]' + DataType: 'structured[OfflinePlanTableInfo]' Source: 'dhOfflinePlanTables' Taborder: 0 Transformation: 'Elements' @@ -27,7 +27,7 @@ ] Properties: [ - DisplayField: 'SaveDateTime' + DisplayField: 'TableName' Label: '鍩哄噯涓嬬嚎璁″垝:' Taborder: 0 ] @@ -46,7 +46,7 @@ { #keys: '[412672.1.78210579]' BaseType: 'WebDropDownList' - Databinding: 'OfflinePlanTable' + Databinding: 'OfflinePlanTableInfo' Children: [ Component DataExtractorRibbon300 @@ -55,7 +55,7 @@ BaseType: 'WebDataExtractor' Properties: [ - DataType: 'structured[OfflinePlanTable]' + DataType: 'structured[OfflinePlanTableInfo]' Source: 'dhOfflinePlanTables' Taborder: 0 Transformation: 'Elements' @@ -64,7 +64,7 @@ ] Properties: [ - DisplayField: 'SaveDateTime' + DisplayField: 'TableName' Label: '瀵规瘮涓嬬嚎璁″垝:' Taborder: 1 ] @@ -73,10 +73,25 @@ { #keys: '[414996.1.103241339]' BaseType: 'WebDataHolder' - Databinding: 'structured[OfflinePlanTable]*' + Databinding: 'structured[OfflinePlanTableInfo]*' + Children: + [ + Component deOfflinePlanTables + { + #keys: '[414996.1.124700546]' + BaseType: 'WebDataExtractor' + Properties: + [ + DataType: 'RecycleBin' + Source: 'RecycleBin' + Taborder: 0 + Transformation: 'OfflinePlanTableInfo' + ] + } + ] Properties: [ - Taborder: 3 + Taborder: 4 ] } Component bExport @@ -86,7 +101,7 @@ Properties: [ Image: 'EXPORT1' - Taborder: 4 + Taborder: 5 ] } Component dhXMLDataListener @@ -112,7 +127,16 @@ ] Properties: [ - Taborder: 5 + Taborder: 6 + ] + } + Component ButtonRibbon + { + #keys: '[414996.1.125429607]' + BaseType: 'WebButton' + Properties: + [ + Taborder: 3 ] } ] -- Gitblit v1.9.3