From aefafd2142478d4fb07d6b8b45c3047e247389e0 Mon Sep 17 00:00:00 2001 From: hongji.li <hongji.a.li@capgemini.com> Date: 星期五, 03 十一月 2023 16:31:17 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj --- _Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/_ROOT_Component_FormInterfaceTest.def | 64 ++++--------------------------- 1 files changed, 9 insertions(+), 55 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/_ROOT_Component_FormInterfaceTest.def b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/_ROOT_Component_FormInterfaceTest.def index 16917a6..97b6783 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/_ROOT_Component_FormInterfaceTest.def +++ b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/_ROOT_Component_FormInterfaceTest.def @@ -13,70 +13,24 @@ #child: PanelInterfaceOption3 #child: PanelInterfaceOption2 #child: PanelInterfaceOption1 - Component ButtonGenerateProductCategory + Component CheckSelectAll { - #keys: '[414702.1.220980872]' - BaseType: 'WebButton' + #keys: '[414702.1.245944647]' + BaseType: 'WebCheckbox' Properties: [ - Image: 'TELEPHONE2' - Label: '鏍规嵁浜嬩笟閮ㄧ敓鎴愪骇鍝佸垎绫�' - Taborder: 6 + Label: '鍏ㄩ��' + Taborder: 0 ] } - Component Button1 + Component DataHolderInterfaceTest { - #keys: '[414702.1.225920560]' - BaseType: 'WebButton' + #keys: '[414502.0.443241895]' + BaseType: 'WebDataHolder' + Databinding: 'Scenario' Properties: [ - Image: 'BRUSH2' - Label: '鏍规嵁浜у搧ID鐢熸垚ProductInLine鍒嗙被' Taborder: 7 - ] - } - Component Button2 - { - #keys: '[414702.1.225920577]' - BaseType: 'WebButton' - Properties: - [ - Image: 'INDUSTRIAL_ROBOT' - Label: '鏍规嵁浜у搧ID鐢熸垚StockingPoingCost鍒嗙被' - Taborder: 8 - ] - } - Component Button3 - { - #keys: '[414702.1.226882098]' - BaseType: 'WebButton' - Properties: - [ - Image: 'BANANA' - Label: '鏍规嵁浜у搧ID鐢熸垚MAPISPIP鍒嗙被' - Taborder: 9 - ] - } - Component Button4 - { - #keys: '[414702.1.226891739]' - BaseType: 'WebButton' - Properties: - [ - Image: 'BEER_GLASS' - Label: '鏍规嵁浜у搧ID鐢熸垚InventorySupply鍒嗙被' - Taborder: 10 - ] - } - Component Button5 - { - #keys: '[414702.1.228751221]' - BaseType: 'WebButton' - Properties: - [ - Image: 'BROOM' - Label: '娓呯┖鍒嗙被' - Taborder: 11 ] } ] -- Gitblit v1.9.3