From bea94c666455f1df84b144317a64a88a5fe82d98 Mon Sep 17 00:00:00 2001 From: lihongji <3117313295@qq.com> Date: 星期一, 28 十月 2024 18:31:43 +0800 Subject: [PATCH] 客户端BUG修复 --- _Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlActions.def | 6 +- _Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlContent.def | 15 +++++ /dev/null | 14 ---- _Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pCC#847.def | 29 +++++---- _Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pDL#545.def | 29 +++++---- _Main/UI/MacroPlannerWebApp/Component_DialogULOTC/_ROOT_Component_DialogULOTC.def | 4 _Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Response_pnlActions_btnCancel_OnClick.def | 2 _Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Response_pnlActions_btnOk_OnClick.def | 2 _Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlContent481.def | 17 +++++ _Main/UI/MacroPlannerWebApp/Component_FormTransferPlan/Response_pHeader_bMaximumDailyTransferCapacity_OnClick.def | 6 + 10 files changed, 78 insertions(+), 46 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlCCFactory.def "b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pCC\043847.def" similarity index 70% rename from _Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlCCFactory.def rename to "_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pCC\043847.def" index 026faf2..678f281 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlCCFactory.def +++ "b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pCC\043847.def" @@ -1,66 +1,71 @@ Quintiq file version 2.0 -Component pnlCCFactory +Component pCC id:pCC_847 { - #keys: '[413988.1.30911852]' + #keys: '[413988.1.37281166]' BaseType: 'WebPanel' Children: [ - Component npUpperLimitOfTransferCapacityZKGCC + Component CC_ZKG { - #keys: '[413988.1.30912074]' + #keys: '[413988.1.37281167]' BaseType: 'WebNumberPicker' Properties: [ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityZKGCC' Label: 'ZKG(pcs)' + Mask: 'NUMBER' Min: '0' Taborder: 0 ] } - Component npUpperLimitOfTransferCapacityZKMCC + Component CC_ZKM { - #keys: '[413988.1.30912108]' + #keys: '[413988.1.37281168]' BaseType: 'WebNumberPicker' Properties: [ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityZKMCC' Label: 'ZKM(pcs)' + Mask: 'NUMBER' Min: '0' Taborder: 1 ] } - Component npUpperLimitOfTransferCapacityPLCC + Component CC_PL { - #keys: '[413988.1.30912136]' + #keys: '[413988.1.37281169]' BaseType: 'WebNumberPicker' Properties: [ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityPLCC' Label: 'PL(pcs)' + Mask: 'NUMBER' Min: '0' Taborder: 2 ] } - Component npUpperLimitOfTransferCapacityKWCC + Component CC_KW { - #keys: '[413988.1.30912164]' + #keys: '[413988.1.37281170]' BaseType: 'WebNumberPicker' Properties: [ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityKWCC' Label: 'KW(pcs)' + Mask: 'NUMBER' Min: '0' Taborder: 3 ] } - Component npUpperLimitOfTransferCapacityAGWCC + Component CC_AGW { - #keys: '[413988.1.30912192]' + #keys: '[413988.1.37281171]' BaseType: 'WebNumberPicker' Properties: [ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityAGWCC' Label: 'AGW(pcs)' + Mask: 'NUMBER' Min: '0' Taborder: 4 ] diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlDLFactory.def "b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pDL\043545.def" similarity index 63% rename from _Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlDLFactory.def rename to "_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pDL\043545.def" index 4cae144..28c05c9 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlDLFactory.def +++ "b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pDL\043545.def" @@ -1,66 +1,71 @@ Quintiq file version 2.0 -Component pnlDLFactory +Component pDL id:pDL_545 { - #keys: '[413988.1.30911840]' + #keys: '[413988.1.37281160]' BaseType: 'WebPanel' Children: [ - Component npUpperLimitOfTransferCapacityZKG id:npUpperLimitOfTransferCapacityZKG_715 + Component DL_ZKG { - #keys: '[413988.1.30911967]' + #keys: '[413988.1.37281161]' BaseType: 'WebNumberPicker' Properties: [ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityZKG' Label: 'ZKG(pcs)' + Mask: 'NUMBER' Min: '0' Taborder: 0 ] } - Component npUpperLimitOfTransferCapacityZKM id:npUpperLimitOfTransferCapacityZKM_844 + Component DL_ZKM { - #keys: '[413988.1.30911990]' + #keys: '[413988.1.37281162]' BaseType: 'WebNumberPicker' Properties: [ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityZKM' Label: 'ZKM(pcs)' + Mask: 'NUMBER' Min: '0' Taborder: 1 ] } - Component npUpperLimitOfTransferCapacityPL id:npUpperLimitOfTransferCapacityPL_603 + Component DL_PL { - #keys: '[413988.1.30912013]' + #keys: '[413988.1.37281163]' BaseType: 'WebNumberPicker' Properties: [ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityPL' Label: 'PL(pcs)' + Mask: 'NUMBER' Min: '0' Taborder: 2 ] } - Component npUpperLimitOfTransferCapacityKW id:npUpperLimitOfTransferCapacityKW_858 + Component DL_KW { - #keys: '[413988.1.30912036]' + #keys: '[413988.1.37281164]' BaseType: 'WebNumberPicker' Properties: [ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityKW' Label: 'KW(pcs)' + Mask: 'NUMBER' Min: '0' Taborder: 3 ] } - Component npUpperLimitOfTransferCapacityAGW id:npUpperLimitOfTransferCapacityAGW_545 + Component DL_AGW { - #keys: '[413988.1.30912059]' + #keys: '[413988.1.37281165]' BaseType: 'WebNumberPicker' Properties: [ DataBinding: 'MacroPlan.UpperLimitOfTransferCapacityAGW' Label: 'AGW(pcs)' + Mask: 'NUMBER' Min: '0' Taborder: 4 ] diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlActions.def b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlActions.def similarity index 84% rename from _Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlActions.def rename to _Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlActions.def index 7ac917e..8c9c873 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlActions.def +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlActions.def @@ -1,13 +1,13 @@ Quintiq file version 2.0 Component pnlActions { - #keys: '[413988.0.1292313213]' + #keys: '[413988.1.35911888]' BaseType: 'WebPanel' Children: [ Component btnOk { - #keys: '[413988.0.1292313217]' + #keys: '[413988.1.35911892]' BaseType: 'WebButton' Properties: [ @@ -17,7 +17,7 @@ } Component btnCancel { - #keys: '[413988.0.1292313219]' + #keys: '[413988.1.35911894]' BaseType: 'WebButton' Properties: [ diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlContent.def new file mode 100644 index 0000000..bb29f81 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlContent.def @@ -0,0 +1,15 @@ +Quintiq file version 2.0 +Component pnlContent +{ + #keys: '[413988.1.35911886]' + BaseType: 'WebPanel' + Children: + [ + #child: pnlContent481 + ] + Properties: + [ + Padding: 'true' + Taborder: 0 + ] +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlContent481.def b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlContent481.def new file mode 100644 index 0000000..869911b --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Component_pnlContent481.def @@ -0,0 +1,17 @@ +Quintiq file version 2.0 +Component pnlContent481 +{ + #keys: '[413988.1.37281159]' + BaseType: 'WebPanel' + Children: + [ + #child: pDL_545 + #child: pCC_847 + ] + Properties: + [ + Orientation: 'tab' + Padding: 'true' + Taborder: 0 + ] +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Response_pnlActions_btnCancel_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Response_pnlActions_btnCancel_OnClick.def similarity index 88% rename from _Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Response_pnlActions_btnCancel_OnClick.def rename to _Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Response_pnlActions_btnCancel_OnClick.def index 2917a99..04619b4 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Response_pnlActions_btnCancel_OnClick.def +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Response_pnlActions_btnCancel_OnClick.def @@ -2,7 +2,7 @@ #parent: pnlActions/btnCancel Response OnClick () id:Response_pnlActions_btnCancel_OnClick { - #keys: '[413988.0.1292313223]' + #keys: '[413988.1.35911898]' DefinitionID: 'Responsedef_WebButton_OnClick' GroupServerCalls: true QuillAction diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Response_pnlActions_btnOk_OnClick.def similarity index 89% rename from _Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Response_pnlActions_btnOk_OnClick.def rename to _Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Response_pnlActions_btnOk_OnClick.def index 14ca6da..a228358 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Response_pnlActions_btnOk_OnClick.def +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/Response_pnlActions_btnOk_OnClick.def @@ -2,7 +2,7 @@ #parent: pnlActions/btnOk Response OnClick () id:Response_pnlActions_btnOk_OnClick { - #keys: '[413988.0.1292313222]' + #keys: '[413988.1.35911897]' DefinitionID: 'Responsedef_WebButton_OnClick' GroupServerCalls: true QuillAction diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/_ROOT_Component_DialogUpperLimitOfTransferCapacity.def b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/_ROOT_Component_DialogULOTC.def similarity index 78% rename from _Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/_ROOT_Component_DialogUpperLimitOfTransferCapacity.def rename to _Main/UI/MacroPlannerWebApp/Component_DialogULOTC/_ROOT_Component_DialogULOTC.def index 338e32f..4a48f54 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/_ROOT_Component_DialogUpperLimitOfTransferCapacity.def +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogULOTC/_ROOT_Component_DialogULOTC.def @@ -1,9 +1,9 @@ Quintiq file version 2.0 #root #parent: MacroPlannerWebApp -OrphanComponent DialogUpperLimitOfTransferCapacity +OrphanComponent DialogULOTC { - #keys: '[413988.0.1292313209]' + #keys: '[413988.1.35911884]' BaseType: 'WebForm' Children: [ diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlContent.def deleted file mode 100644 index 153f57a..0000000 --- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlContent.def +++ /dev/null @@ -1,14 +0,0 @@ -Quintiq file version 2.0 -Component pnlContent -{ - #error 102458: "Class Component with id 'pnlContent' cannot find its child with id 'pnlCCFactory'. The file / folder structure might be corrupted due to integration." - #error 102458: "Class Component with id 'pnlContent' cannot find its child with id 'pnlDLFactory'. The file / folder structure might be corrupted due to integration." - #keys: '[413988.0.1292313211]' - BaseType: 'WebPanel' - Properties: - [ - Orientation: 'tab' - Padding: 'true' - Taborder: 0 - ] -} diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormTransferPlan/Response_pHeader_bMaximumDailyTransferCapacity_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormTransferPlan/Response_pHeader_bMaximumDailyTransferCapacity_OnClick.def index 4c092f7..de3d677 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_FormTransferPlan/Response_pHeader_bMaximumDailyTransferCapacity_OnClick.def +++ b/_Main/UI/MacroPlannerWebApp/Component_FormTransferPlan/Response_pHeader_bMaximumDailyTransferCapacity_OnClick.def @@ -5,11 +5,15 @@ #keys: '[413988.0.1292330611]' CanBindMultiple: false DefinitionID: 'Responsedef_WebButton_OnClick' + Precondition: + [* + return not isnull( MacroPlan ); + *] QuillAction { Body: [* - dlg := construct( DialogUpperLimitOfTransferCapacity ); + dlg := construct( DialogULOTC ); ApplicationMacroPlanner.ShowFormModal( dlg ); *] -- Gitblit v1.9.3