diff --git a/app/webapp/controller/View1.controller.js b/app/webapp/controller/View1.controller.js index 6d878b89..d2f4730e 100644 --- a/app/webapp/controller/View1.controller.js +++ b/app/webapp/controller/View1.controller.js @@ -242,12 +242,8 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/ } break; case 'SET_ODATA_MODEL': - // sap.ui.require([ - // "sap/ui/model/odata/v2/ODataModel" - // ], async (ODataModel) => { var oModel = new ODataModel({ serviceUrl : args[1] }); z2ui5.oView.setModel( oModel , args[2] ); - // }); break; case 'DOWNLOAD_B64_FILE': var a = document.createElement("a"); @@ -364,7 +360,7 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/ BusyIndicator.show(); z2ui5.oBody = {}; if (args[0][3] || z2ui5.oController == this ) { - if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL){ + if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCH_DEFAULT_MODEL_PATH){ var oModel = z2ui5.oView.getModel( "http"); }else{ oModel = z2ui5.oView.getModel(); @@ -476,9 +472,8 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/ async displayView(xml, viewModel) { let oview_model = new JSONModel(viewModel); var oModel = oview_model; - if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL){ - oModel = new ODataModel({ serviceUrl : z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL }); - // oModel = z2ui5.oOwnerComponent.getModel(z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL); + if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCH_DEFAULT_MODEL_PATH){ + oModel = new ODataModel({ serviceUrl : z2ui5.oResponse.PARAMS.S_VIEW?.SWITCH_DEFAULT_MODEL_PATH }); } z2ui5.oView = await XMLView.create({ definition: xml, @@ -494,7 +489,7 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/ } }); z2ui5.oView.setModel(z2ui5.oDeviceModel, "device"); - if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL){ + if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCH_DEFAULT_MODEL_PATH){ z2ui5.oView.setModel(oview_model, "http"); } z2ui5.oApp.removeAllPages(); diff --git a/src/01/02/z2ui5_cl_core_client.clas.abap b/src/01/02/z2ui5_cl_core_client.clas.abap index f72d466c..797113fb 100644 --- a/src/01/02/z2ui5_cl_core_client.clas.abap +++ b/src/01/02/z2ui5_cl_core_client.clas.abap @@ -28,7 +28,7 @@ CLASS z2ui5_cl_core_client IMPLEMENTATION. METHOD z2ui5_if_client~follow_up_action. * mo_action->ms_next-s_set-s_follow_up_action-custom_js = val. - insert val into table mo_action->ms_next-s_set-s_follow_up_action-custom_js. + INSERT val INTO TABLE mo_action->ms_next-s_set-s_follow_up_action-custom_js. ENDMETHOD. @@ -292,7 +292,7 @@ CLASS z2ui5_cl_core_client IMPLEMENTATION. METHOD z2ui5_if_client~view_display. mo_action->ms_next-s_set-s_view-xml = val. - mo_action->ms_next-s_set-s_view-switchDefaultModelPath = switchDefaultModelPath. + mo_action->ms_next-s_set-s_view-switch_default_model_path = switch_default_model_path. ENDMETHOD. @@ -312,8 +312,7 @@ CLASS z2ui5_cl_core_client IMPLEMENTATION. custom_mapper = custom_mapper tab = z2ui5_cl_util=>conv_get_as_data_ref( tab ) tab_index = tab_index - switchDefaultModel = switchDefaultModel ) ). - + switch_default_model = switch_Default_Model ) ). ENDMETHOD. @@ -330,7 +329,7 @@ CLASS z2ui5_cl_core_client IMPLEMENTATION. custom_mapper_back = custom_mapper_back tab = z2ui5_cl_util=>conv_get_as_data_ref( tab ) tab_index = tab_index - switchDefaultModel = switchDefaultModel ) ). + switch_default_model = switch_Default_Model ) ). ENDMETHOD. @@ -341,7 +340,7 @@ CLASS z2ui5_cl_core_client IMPLEMENTATION. config = VALUE #( path_only = path custom_mapper = custom_mapper custom_filter = custom_filter - switchDefaultModel = switchDefaultModel ) ). + switch_default_model = switch_Default_Model ) ). ENDMETHOD. diff --git a/src/01/02/z2ui5_cl_core_srv_bind.clas.abap b/src/01/02/z2ui5_cl_core_srv_bind.clas.abap index 14b66138..de22416c 100644 --- a/src/01/02/z2ui5_cl_core_srv_bind.clas.abap +++ b/src/01/02/z2ui5_cl_core_srv_bind.clas.abap @@ -230,7 +230,7 @@ CLASS z2ui5_cl_core_srv_bind IMPLEMENTATION. ENDIF. - IF ms_config-switchdefaultmodel = abap_true. + IF ms_config-switch_default_model = abap_true. result = |http>{ result }|. ENDIF. @@ -287,7 +287,7 @@ CLASS z2ui5_cl_core_srv_bind IMPLEMENTATION. result = |/{ lv_id }|. - IF ms_config-switchdefaultmodel = abap_true. + IF ms_config-switch_default_model = abap_true. result = |http>{ result }|. ENDIF. diff --git a/src/01/02/z2ui5_if_core_types.intf.abap b/src/01/02/z2ui5_if_core_types.intf.abap index 3335bd11..f9e72080 100644 --- a/src/01/02/z2ui5_if_core_types.intf.abap +++ b/src/01/02/z2ui5_if_core_types.intf.abap @@ -35,15 +35,15 @@ INTERFACE z2ui5_if_core_types TYPES: BEGIN OF ty_s_bind_config, - path_only TYPE abap_bool, - view TYPE string, - custom_mapper TYPE REF TO z2ui5_if_ajson_mapping, - custom_mapper_back TYPE REF TO z2ui5_if_ajson_mapping, - custom_filter TYPE REF TO z2ui5_if_ajson_filter, - custom_filter_back TYPE REF TO z2ui5_if_ajson_filter, - tab TYPE REF TO data, - tab_index TYPE i, - switchDefaultModel TYPE abap_bool, + path_only TYPE abap_bool, + view TYPE string, + custom_mapper TYPE REF TO z2ui5_if_ajson_mapping, + custom_mapper_back TYPE REF TO z2ui5_if_ajson_mapping, + custom_filter TYPE REF TO z2ui5_if_ajson_filter, + custom_filter_back TYPE REF TO z2ui5_if_ajson_filter, + tab TYPE REF TO data, + tab_index TYPE i, + switch_default_model TYPE abap_bool, END OF ty_s_bind_config. TYPES: @@ -67,10 +67,10 @@ INTERFACE z2ui5_if_core_types TYPES: BEGIN OF ty_s_next_frontend, BEGIN OF s_view, - xml TYPE string, - switchdefaultmodelpath TYPE string, - check_destroy TYPE abap_bool, - check_update_model TYPE abap_bool, + xml TYPE string, + switch_default_model_path TYPE string, + check_destroy TYPE abap_bool, + check_update_model TYPE abap_bool, END OF s_view, BEGIN OF s_view_nest, xml TYPE string, diff --git a/src/02/z2ui5_if_client.intf.abap b/src/02/z2ui5_if_client.intf.abap index 45804e38..8ec8894c 100644 --- a/src/02/z2ui5_if_client.intf.abap +++ b/src/02/z2ui5_if_client.intf.abap @@ -32,8 +32,8 @@ INTERFACE z2ui5_if_client METHODS view_display IMPORTING - val TYPE clike - switchDefaultModelPath TYPE string OPTIONAL. + val TYPE clike + switch_default_model_path TYPE string OPTIONAL. METHODS view_model_update. @@ -157,40 +157,40 @@ INTERFACE z2ui5_if_client METHODS _bind IMPORTING - val TYPE data - !path TYPE abap_bool DEFAULT abap_false - custom_mapper TYPE REF TO z2ui5_if_ajson_mapping OPTIONAL - custom_filter TYPE REF TO z2ui5_if_ajson_filter OPTIONAL - !tab TYPE data OPTIONAL - tab_index TYPE i OPTIONAL - switchDefaultModel TYPE abap_bool DEFAULT abap_false + val TYPE data + !path TYPE abap_bool DEFAULT abap_false + custom_mapper TYPE REF TO z2ui5_if_ajson_mapping OPTIONAL + custom_filter TYPE REF TO z2ui5_if_ajson_filter OPTIONAL + !tab TYPE data OPTIONAL + tab_index TYPE i OPTIONAL + switch_Default_Model TYPE abap_bool DEFAULT abap_false RETURNING - VALUE(result) TYPE string. + VALUE(result) TYPE string. METHODS _bind_edit IMPORTING - val TYPE data - !path TYPE abap_bool DEFAULT abap_false - view TYPE string DEFAULT z2ui5_if_client=>cs_view-main - custom_mapper TYPE REF TO z2ui5_if_ajson_mapping OPTIONAL - custom_mapper_back TYPE REF TO z2ui5_if_ajson_mapping OPTIONAL - custom_filter TYPE REF TO z2ui5_if_ajson_filter OPTIONAL - custom_filter_back TYPE REF TO z2ui5_if_ajson_filter OPTIONAL - !tab TYPE data OPTIONAL - tab_index TYPE i OPTIONAL - switchDefaultModel TYPE abap_bool DEFAULT abap_false + val TYPE data + !path TYPE abap_bool DEFAULT abap_false + view TYPE string DEFAULT z2ui5_if_client=>cs_view-main + custom_mapper TYPE REF TO z2ui5_if_ajson_mapping OPTIONAL + custom_mapper_back TYPE REF TO z2ui5_if_ajson_mapping OPTIONAL + custom_filter TYPE REF TO z2ui5_if_ajson_filter OPTIONAL + custom_filter_back TYPE REF TO z2ui5_if_ajson_filter OPTIONAL + !tab TYPE data OPTIONAL + tab_index TYPE i OPTIONAL + switch_default_model TYPE abap_bool DEFAULT abap_false RETURNING - VALUE(result) TYPE string. + VALUE(result) TYPE string. METHODS _bind_local IMPORTING - val TYPE data - !path TYPE abap_bool DEFAULT abap_false - custom_mapper TYPE REF TO z2ui5_if_ajson_mapping OPTIONAL - custom_filter TYPE REF TO z2ui5_if_ajson_filter OPTIONAL - switchDefaultModel TYPE abap_bool DEFAULT abap_false + val TYPE data + !path TYPE abap_bool DEFAULT abap_false + custom_mapper TYPE REF TO z2ui5_if_ajson_mapping OPTIONAL + custom_filter TYPE REF TO z2ui5_if_ajson_filter OPTIONAL + switch_default_Model TYPE abap_bool DEFAULT abap_false RETURNING - VALUE(result) TYPE string. + VALUE(result) TYPE string. METHODS follow_up_action IMPORTING