SAP/abap2UI5
1
0
Fork 0
mirror of https://github.com/abap2UI5/abap2UI5.git synced 2025-04-29 22:04:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes (#922)

Browse Source 
* fixes

* update
This commit is contained in:
oblomov 2024-02-20 17:12:24 +01:00 committed by GitHub
parent 922ef3efda
commit 71032e59e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 65 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/01/02/01/z2ui5_cl_core_attri_srv.clas.abap
View File

@ -75,6 +75,7 @@ CLASS z2ui5_cl_core_attri_srv IMPLEMENTATION.
ASSIGN lr_attri->r_ref->* TO FIELD-SYMBOL(<val_ref>).
ASSIGN <val_ref>->* TO FIELD-SYMBOL(<val>).
lr_attri->srtti_data = z2ui5_cl_util=>xml_srtti_stringify( <val> ).
CLEAR <val>.

3
src/01/02/z2ui5_cl_core_action.clas.abap
View File

@ -119,6 +119,9 @@ CLASS z2ui5_cl_core_action IMPLEMENTATION.
METHOD factory_stack_leave.
result = prepare_app_stack( ms_next-o_app_leave ).
IF result->mo_app->ms_draft-id_prev_app_stack IS INITIAL.
result->mo_app->ms_draft-id_prev_app_stack = mo_app->ms_draft-id_prev_app_stack.
ENDIF.
ENDMETHOD.

4
src/01/02/z2ui5_cl_core_client.clas.abap
View File

@ -90,6 +90,10 @@ CLASS z2ui5_cl_core_client IMPLEMENTATION.
METHOD z2ui5_if_client~nav_app_leave.
if app is not bound.
app = z2ui5_if_client~get_app( z2ui5_if_client~get( )-s_draft-id_prev_app_stack ).
endif.
mo_action->ms_next-o_app_leave = app.
result = COND #( WHEN app->id_draft IS INITIAL

2
src/01/02/z2ui5_cl_core_http_get.clas.abap
View File

@ -307,7 +307,9 @@ CLASS z2ui5_cl_core_http_get IMPLEMENTATION.
` sap.z2ui5.oBody.VIEWNAME = 'MAIN';` && |\n| &&
` }else if ` && |\n| &&
` ( sap.z2ui5.oControllerPopup == this ) {` && |\n| &&
` if (sap.z2ui5.oViewPopup){` && |\n| &&
` sap.z2ui5.oBody.XX = sap.z2ui5.oViewPopup.getModel().getData().XX;` && |\n| &&
` }` && |\n| &&
` sap.z2ui5.oBody.VIEWNAME = 'MAIN';` && |\n| &&
` }else if ( ` && |\n| &&
` sap.z2ui5.oControllerPopover == this ) {` && |\n| &&

11
src/01/02/z2ui5_cl_core_http_post.clas.abap
View File

@ -9,6 +9,7 @@ CLASS z2ui5_cl_core_http_post DEFINITION
DATA mv_request_json TYPE string.
DATA ms_request TYPE z2ui5_if_core_types=>ty_s_http_request_post.
DATA ms_response TYPE z2ui5_if_core_types=>ty_s_http_response_post.
DATA mv_response TYPE string.
METHODS constructor
IMPORTING
@ -26,9 +27,7 @@ CLASS z2ui5_cl_core_http_post DEFINITION
RETURNING
VALUE(check_go_client) TYPE abap_bool.
METHODS main_end
RETURNING
VALUE(result) TYPE string.
METHODS main_end.
PRIVATE SECTION.
ENDCLASS.
@ -54,7 +53,8 @@ CLASS z2ui5_cl_core_http_post IMPLEMENTATION.
EXIT.
ENDIF.
ENDDO.
result = main_end( ).
* result = main_end( ).
result = mv_response.
ENDMETHOD.
@ -91,7 +91,7 @@ CLASS z2ui5_cl_core_http_post IMPLEMENTATION.
model = mo_action->mo_app->model_json_stringify( ) ).
DATA(lo_json_mapper) = NEW z2ui5_cl_core_json_srv( ).
result = lo_json_mapper->response_abap_to_json( ms_response ).
mv_response = lo_json_mapper->response_abap_to_json( ms_response ).
CLEAR mo_action->ms_next.
mo_action->mo_app->db_save( ).
@ -116,6 +116,7 @@ CLASS z2ui5_cl_core_http_post IMPLEMENTATION.
mo_action = mo_action->factory_stack_call( ).
ELSE.
main_end( ).
check_go_client = abap_true.
ENDIF.

1
src/01/03/z2ui5_cl_core_app_error.clas.abap
View File

@ -60,6 +60,7 @@ CLASS Z2UI5_CL_CORE_APP_ERROR IMPLEMENTATION.
press = client->_event_client( val = client->cs_event-location_reload t_arg = VALUE #( ( lv_url_app ) ) ) ).
client->view_display( view->_stringify( ) ).
client->popup_destroy( ).
ENDMETHOD.
ENDCLASS.

9
src/01/03/z2ui5_cl_core_app_startup.clas.abap
View File

@ -260,9 +260,12 @@ CLASS z2ui5_cl_core_app_startup IMPLEMENTATION.
client->view_model_update( ).
WHEN 'VALUE_HELP'.
mt_classes = z2ui5_cl_util=>rtti_get_classes_impl_intf( `Z2UI5_IF_APP` ).
client->nav_app_call( z2ui5_cl_popup_to_select=>factory( mt_classes ) ).
TRY.
mt_classes = z2ui5_cl_util=>rtti_get_classes_impl_intf( `Z2UI5_IF_APP` ).
client->nav_app_call( z2ui5_cl_popup_to_select=>factory( mt_classes ) ).
CATCH cx_root.
client->message_box_display( `The value help is not available on your system, upgrade to a higher release first` ).
ENDTRY.
ENDCASE.
ENDMETHOD.

4
src/01/04/z2ui5_cl_fw_cc_info_frontend.clas.abap
View File

@ -62,7 +62,7 @@ CLASS z2ui5_cl_fw_cc_info_frontend IMPLEMENTATION.
` onAfterRendering() {` && |\n| &&
|\n| &&
` },` && |\n| &&
` ` && |\n| &&
` onEvent(oControl) { oControl.fireFinished( ); }, ` && |\n| &&
` renderer(oRm, oControl) {` && |\n| &&
|\n| &&
` oControl.setProperty( "ui5_version" , sap.ui.version );` && |\n| &&
@ -70,7 +70,7 @@ CLASS z2ui5_cl_fw_cc_info_frontend IMPLEMENTATION.
` oControl.setProperty( "device_os" , sap.ui.Device.os.name );` && |\n| &&
` // this.setProperty( "device_systemtype" , sap.ui.getVersionInfo().gav );` && |\n| &&
` oControl.setProperty( "device_browser" , sap.ui.Device.browser.name );` && |\n| &&
` oControl.fireFinished();` && |\n| &&
` setTimeout( oControl.onEvent , 1000 , oControl );` && |\n| &&
` ` && |\n| &&
` }` && |\n| &&
` });` && |\n| &&

3
src/02/02/z2ui5_cl_app_search_apps.clas.abap
View File

@ -223,9 +223,8 @@ CLASS z2ui5_cl_app_search_apps IMPLEMENTATION.
LOOP AT mt_apps REFERENCE INTO DATA(lr_app).
DATA(lv_tabix) = sy-tabix.
page_all->generic_tile(
id = lr_app->name
class = 'sapUiTinyMarginBegin sapUiTinyMarginTop tileLayout'
press = client->_event( val = `ON_PRESS` t_arg = VALUE #( ( `${$source>/header}` ) ( `${$source>/id}` ) ) )
press = client->_event( val = `ON_PRESS` t_arg = VALUE #( ( `${$source>/header}` ) ( `${$source>/header}` ) ) )
header = client->_bind( val = lr_app->name tab = mt_apps tab_index = lv_tabix )
visible = client->_bind( val = lr_app->visible tab = mt_apps tab_index = lv_tabix ) ).
ENDLOOP.

43
src/02/03/z2ui5_cl_popup_js_loader.clas.abap
View File

@ -14,15 +14,25 @@ CLASS z2ui5_cl_popup_js_loader DEFINITION
RETURNING
VALUE(r_result) TYPE REF TO z2ui5_cl_popup_js_loader.
CLASS-METHODS factory_check_open_ui5
RETURNING
VALUE(r_result) TYPE REF TO z2ui5_cl_popup_js_loader.
METHODS result
RETURNING
VALUE(result3) TYPE string.
DATA mv_is_open_ui5 TYPE abap_bool.
DATA ui5_gav TYPE string.
PROTECTED SECTION.
DATA check_initialized TYPE abap_bool.
DATA client TYPE REF TO z2ui5_if_client.
DATA js TYPE string.
DATA user_command TYPE string.
DATA check_open_ui5 TYPE abap_bool.
METHODS view_display.
PRIVATE SECTION.
@ -30,7 +40,7 @@ ENDCLASS.
CLASS z2ui5_cl_popup_js_loader IMPLEMENTATION.
CLASS Z2UI5_CL_POPUP_JS_LOADER IMPLEMENTATION.
METHOD factory.
@ -42,6 +52,12 @@ CLASS z2ui5_cl_popup_js_loader IMPLEMENTATION.
ENDMETHOD.
METHOD factory_check_open_ui5.
r_result = NEW #( ).
r_result->check_open_ui5 = abap_true.
ENDMETHOD.
METHOD result.
result3 = user_command.
@ -51,10 +67,20 @@ CLASS z2ui5_cl_popup_js_loader IMPLEMENTATION.
METHOD view_display.
DATA(popup) = z2ui5_cl_xml_view=>factory_popup( )->dialog( `load library`
)->content(
)->_z2ui5( )->timer( client->_event( 'TIMER_FINISHED' )
)->_generic( ns = `html` name = `script` )->_cc_plain_xml( js ).
DATA(popup) = z2ui5_cl_xml_view=>factory_popup( )->dialog( `Setup UI...`
)->content( ).
IF js IS NOT INITIAL.
popup->_z2ui5( )->timer( client->_event( 'TIMER_FINISHED' )
)->_generic( ns = `html` name = `script` )->_cc_plain_xml( js ).
ENDIF.
IF check_open_ui5 = abap_true.
popup->_z2ui5( )->info_frontend(
finished = client->_event( `INFO_FINISHED` )
ui5_gav = client->_bind_edit( ui5_gav ) ).
ENDIF.
client->popup_display( popup->stringify( ) ).
@ -72,6 +98,13 @@ CLASS z2ui5_cl_popup_js_loader IMPLEMENTATION.
ENDIF.
CASE client->get( )-event.
WHEN `INFO_FINISHED`.
IF to_upper( ui5_gav ) CS `OPEN`.
mv_is_open_ui5 = abap_true.
ENDIF.
client->popup_destroy( ).
client->nav_app_leave( client->get_app( client->get( )-s_draft-id_prev_app_stack ) ).
WHEN `TIMER_FINISHED`.
client->popup_destroy( ).
client->nav_app_leave( client->get_app( client->get( )-s_draft-id_prev_app_stack ) ).

2
src/02/z2ui5_if_client.intf.abap
View File

@ -84,7 +84,7 @@ INTERFACE z2ui5_if_client
METHODS nav_app_leave
IMPORTING
app TYPE REF TO z2ui5_if_app
value(app) TYPE REF TO z2ui5_if_app OPTIONAL
RETURNING
VALUE(result) TYPE string.