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

fix generate shlp + messagepopover (#523)

Browse Source 
* fix generate shlp + messagepopover

* Update src/z2ui5_cl_xml_view.clas.abap

Co-authored-by: abaplint[bot] <24845621+abaplint[bot]@users.noreply.github.com>

* added dynamic call of function module

* local decleration of shlp_descr type

* abaplint - update table key

* update max cyclic complexity

* add abaplint fix

---------

Co-authored-by: abaplint[bot] <24845621+abaplint[bot]@users.noreply.github.com>
Co-authored-by: oblomov <102328295+oblomov-dev@users.noreply.github.com>
This commit is contained in:
choper725 2023-09-03 16:55:44 +03:00 committed by GitHub
parent 54cd6bd34b
commit db2b9f22db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 327 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
abaplint.jsonc
View File

@ -67,7 +67,7 @@
"cyclomatic_complexity": { "cyclomatic_complexity": {
"exclude": [], "exclude": [],
"severity": "Error", "severity": "Error",
"max": 18 "max": 25
}, },
"dangerous_statement": true, "dangerous_statement": true,
"db_operation_in_loop": true, "db_operation_in_loop": true,

152
src/z2ui5_cl_xml_view.clas.abap
View File

@ -601,6 +601,12 @@
IMPORTING IMPORTING
!items TYPE clike OPTIONAL !items TYPE clike OPTIONAL
!groupitems TYPE clike OPTIONAL !groupitems TYPE clike OPTIONAL
!listselect TYPE clike OPTIONAL
!activetitlepress TYPE clike OPTIONAL
!placement TYPE clike OPTIONAL
!afterclose TYPE clike OPTIONAL
!beforeclose TYPE clike OPTIONAL
!initiallyexpanded TYPE clike OPTIONAL
RETURNING RETURNING
VALUE(result) TYPE REF TO z2ui5_cl_xml_view . VALUE(result) TYPE REF TO z2ui5_cl_xml_view .
METHODS message_item METHODS message_item
@ -610,7 +616,11 @@
!subtitle TYPE clike OPTIONAL !subtitle TYPE clike OPTIONAL
!description TYPE clike OPTIONAL !description TYPE clike OPTIONAL
!groupname TYPE clike OPTIONAL !groupname TYPE clike OPTIONAL
!markupdescription TYPE abap_bool OPTIONAL !markupdescription TYPE clike OPTIONAL
!textDirection TYPE clike OPTIONAL
!longtextUrl TYPE clike OPTIONAL
!counter TYPE clike OPTIONAL
!activeTitle TYPE clike OPTIONAL
RETURNING RETURNING
VALUE(result) TYPE REF TO z2ui5_cl_xml_view . VALUE(result) TYPE REF TO z2ui5_cl_xml_view .
METHODS page METHODS page
@ -1928,6 +1938,7 @@
!searchevent TYPE clike OPTIONAL !searchevent TYPE clike OPTIONAL
!isshlp TYPE any OPTIONAL !isshlp TYPE any OPTIONAL
ircontroller TYPE REF TO object OPTIONAL ircontroller TYPE REF TO object OPTIONAL
shlpid TYPE string OPTIONAL
RETURNING RETURNING
VALUE(result) TYPE REF TO z2ui5_cl_xml_view ##NEEDED. VALUE(result) TYPE REF TO z2ui5_cl_xml_view ##NEEDED.
@ -3112,7 +3123,11 @@ CLASS Z2UI5_CL_XML_VIEW IMPLEMENTATION.
( n = `title` v = title ) ( n = `title` v = title )
( n = `subtitle` v = subtitle ) ( n = `subtitle` v = subtitle )
( n = `description` v = description ) ( n = `description` v = description )
( n = `longtextUrl` v = longtextUrl )
( n = `textDirection` v = textDirection )
( n = `groupName` v = groupname ) ( n = `groupName` v = groupname )
( n = `activeTitle` v = z2ui5_cl_fw_utility=>boolean_abap_2_json( activeTitle ) )
( n = `counter` v = counter )
( n = `markupDescription` v = z2ui5_cl_fw_utility=>boolean_abap_2_json( markupdescription ) ) ) ). ( n = `markupDescription` v = z2ui5_cl_fw_utility=>boolean_abap_2_json( markupdescription ) ) ) ).
ENDMETHOD. ENDMETHOD.
@ -3132,6 +3147,12 @@ CLASS Z2UI5_CL_XML_VIEW IMPLEMENTATION.
METHOD message_popover. METHOD message_popover.
result = _generic( name = `MessagePopover` result = _generic( name = `MessagePopover`
t_prop = VALUE #( ( n = `items` v = items ) t_prop = VALUE #( ( n = `items` v = items )
( n = `activeTitlePress` v = activetitlepress )
( n = `placement` v = placement )
( n = `listSelect` v = listselect )
( n = `afterClose` v = afterclose )
( n = `beforeClose` v = beforeClose )
( n = `initiallyExpanded` v = z2ui5_cl_fw_utility=>boolean_abap_2_json( initiallyexpanded ) )
( n = `groupItems` v = z2ui5_cl_fw_utility=>boolean_abap_2_json( groupitems ) ) ) ). ( n = `groupItems` v = z2ui5_cl_fw_utility=>boolean_abap_2_json( groupitems ) ) ) ).
ENDMETHOD. ENDMETHOD.
@ -4603,8 +4624,29 @@ CLASS Z2UI5_CL_XML_VIEW IMPLEMENTATION.
METHOD zfc_ddic_search_help. METHOD zfc_ddic_search_help.
TYPES ty_fields TYPE SORTED TABLE OF char30 WITH UNIQUE KEY table_line.
TYPES: TYPES:
BEGIN OF ty_ddshfprop, BEGIN OF ty_ddshtextsearch,
request(60) TYPE c,
fields TYPE ty_fields,
END OF ty_ddshtextsearch.
TYPES:
BEGIN OF ty_ddshselops,
shlpname(30) TYPE c,
shlpfield(30) TYPE c,
sign(1) TYPE c,
option(2) TYPE c,
low(45) TYPE c,
high(45) TYPE c,
END OF ty_ddshselops.
TYPES t_ty_ddshselops TYPE TABLE OF ty_ddshselops WITH empty KEY.
TYPES:
BEGIN OF ty_ddshfprops,
fieldname(30) TYPE c, fieldname(30) TYPE c,
shlpinput(1) TYPE c, shlpinput(1) TYPE c,
shlpoutput(1) TYPE c, shlpoutput(1) TYPE c,
@ -4612,7 +4654,9 @@ CLASS Z2UI5_CL_XML_VIEW IMPLEMENTATION.
shlplispos(2) TYPE n, shlplispos(2) TYPE n,
shlpseldis(1) TYPE c, shlpseldis(1) TYPE c,
defaultval(21) TYPE c, defaultval(21) TYPE c,
END OF ty_ddshfprop. END OF ty_ddshfprops.
TYPES t_ty_ddshfprops TYPE TABLE OF ty_ddshfprops WITH empty KEY.
TYPES: TYPES:
BEGIN OF ty_ddfields, BEGIN OF ty_ddfields,
@ -4667,15 +4711,70 @@ CLASS Z2UI5_CL_XML_VIEW IMPLEMENTATION.
ampmformat(1) TYPE c, ampmformat(1) TYPE c,
END OF ty_ddfields. END OF ty_ddfields.
TYPES t_ty_ddfields TYPE TABLE OF ty_ddfields WITH empty KEY.
TYPES:
BEGIN OF ty_ddshifaces,
shlpfield(30) TYPE c,
valtabname(30) TYPE c,
valfield(132) TYPE c,
value(132) TYPE c,
internal(1) TYPE c,
dispfield(1) TYPE c,
f4field(1) TYPE c,
topshlpnam(30) TYPE c,
topshlpfld(30) TYPE c,
END OF ty_ddshifaces.
TYPES t_ty_ddshifaces TYPE TABLE OF ty_ddshifaces WITH empty KEY.
TYPES:
BEGIN OF ty_intdescr,
issimple(1) TYPE c,
hotkey(1) TYPE c,
selmtype(1) TYPE c,
selmethod(30) TYPE c,
texttab(30) TYPE c,
selmexit(30) TYPE c,
dialogtype(1) TYPE c,
ddlanguage(1) TYPE c,
ddtext(60) TYPE c,
dialoginfo(1) TYPE c,
f4state(1) TYPE c,
tabname(30) TYPE c,
fieldname(30) TYPE c,
title(60) TYPE c,
history(1) TYPE c,
handle TYPE int4,
autosuggest(1) TYPE c,
fuzzy_search(1) TYPE c,
fuzzy_similarity(2) TYPE p DECIMALS 1,
END OF ty_intdescr.
TYPES:
BEGIN OF ty_shlp_descr,
shlpname(30) TYPE c,
shlptype(2) TYPE c,
intdescr TYPE ty_intdescr,
interface TYPE t_ty_ddshifaces,
fielddescr TYPE t_ty_ddfields,
fieldprop TYPE t_ty_ddshfprops,
selopt TYPE t_ty_ddshselops,
textsearch TYPE ty_ddshtextsearch,
END OF ty_shlp_descr.
DATA ls_shlp TYPE ty_shlp_descr.
DATA: lv_grid_form_no TYPE i, DATA: lv_grid_form_no TYPE i,
lt_arg TYPE string_table, lt_arg TYPE string_table,
lv_arg_fieldname TYPE string, lv_arg_fieldname TYPE string,
lv_cell_fieldname TYPE string, lv_cell_fieldname TYPE string,
lv_path_result_itab TYPE string, lv_path_result_itab TYPE string,
lv_path_shlp_fields TYPE string, lv_path_shlp_fields TYPE string,
lt_fieldprop_sel TYPE STANDARD TABLE OF ty_ddshfprop WITH EMPTY KEY, lt_fieldprop_sel TYPE STANDARD TABLE OF ty_ddshfprops WITH EMPTY KEY,
lt_fieldprop_lis TYPE STANDARD TABLE OF ty_ddshfprop WITH EMPTY KEY, lt_fieldprop_lis TYPE STANDARD TABLE OF ty_ddshfprops WITH EMPTY KEY,
lt_ddffields TYPE STANDARD TABLE OF ty_ddfields WITH EMPTY KEY. lt_ddffields TYPE STANDARD TABLE OF ty_ddfields WITH EMPTY KEY,
shlp_id(30) TYPE c.
FIELD-SYMBOLS: FIELD-SYMBOLS:
<lt_result_itab> TYPE ANY TABLE, <lt_result_itab> TYPE ANY TABLE,
@ -4695,28 +4794,53 @@ CLASS Z2UI5_CL_XML_VIEW IMPLEMENTATION.
ENDIF. ENDIF.
IF isshlp IS INITIAL. IF isshlp IS INITIAL.
TRY.
shlp_id = shlpid.
data(lv_function) = `F4IF_GET_SHLP_DESCR`.
"get shlp data
CALL FUNCTION lv_function
EXPORTING
shlpname = shlp_id
IMPORTING
shlp = ls_shlp.
CATCH cx_root.
RETURN. RETURN.
ENDTRY.
lt_fieldprop_sel = ls_shlp-fieldprop.
lt_fieldprop_lis = ls_shlp-fieldprop.
ELSE. ELSE.
ASSIGN COMPONENT 'FIELDPROP' OF STRUCTURE isshlp TO FIELD-SYMBOL(<fs_fieldprop>). ASSIGN COMPONENT 'FIELDPROP' OF STRUCTURE isshlp TO FIELD-SYMBOL(<fs_fieldprop>).
IF <fs_fieldprop> IS NOT ASSIGNED. IF <fs_fieldprop> IS NOT ASSIGNED.
RETURN. RETURN.
ENDIF. ENDIF.
lt_fieldprop_sel = <fs_fieldprop>.
lt_fieldprop_lis = <fs_fieldprop>.
ENDIF. ENDIF.
* ---------- Set Selection and List properties ---------------------------------------------------- * ---------- Set Selection and List properties ----------------------------------------------------
lt_fieldprop_sel = <fs_fieldprop>.
lt_fieldprop_lis = <fs_fieldprop>.
DELETE lt_fieldprop_sel WHERE shlpselpos IS INITIAL. DELETE lt_fieldprop_sel WHERE shlpselpos IS INITIAL.
DELETE lt_fieldprop_lis WHERE shlplispos IS INITIAL. DELETE lt_fieldprop_lis WHERE shlplispos IS INITIAL.
SORT lt_fieldprop_sel BY shlpselpos. SORT lt_fieldprop_sel BY shlpselpos.
SORT lt_fieldprop_lis BY shlplispos. SORT lt_fieldprop_lis BY shlplispos.
ASSIGN COMPONENT 'FIELDDESCR' OF STRUCTURE isshlp TO FIELD-SYMBOL(<fs_isshlp_fielddescr>). IF ls_shlp IS NOT INITIAL.
field-symbols <fs_isshlp_fielddescr> type standard table.
ASSIGN COMPONENT 'FIELDDESCR' OF STRUCTURE ls_shlp TO <fs_isshlp_fielddescr>.
ELSE.
ASSIGN COMPONENT 'FIELDDESCR' OF STRUCTURE isshlp TO <fs_isshlp_fielddescr>.
ENDIF.
IF <fs_isshlp_fielddescr> IS NOT ASSIGNED. IF <fs_isshlp_fielddescr> IS NOT ASSIGNED.
RETURN. RETURN.
ENDIF. ENDIF.
lt_ddffields = <fs_isshlp_fielddescr>. lt_ddffields = <fs_isshlp_fielddescr>.
* ------------------------------------------------------------------------------------------------- * -------------------------------------------------------------------------------------------------
*Searchfield Grid *Searchfield Grid
* ------------------------------------------------------------------------------------------------- * -------------------------------------------------------------------------------------------------
@ -4776,7 +4900,7 @@ CLASS Z2UI5_CL_XML_VIEW IMPLEMENTATION.
WHEN 2. WHEN 2.
* ---------- Grid 2-------------------------------------------------------------------------------- * ---------- Grid 2--------------------------------------------------------------------------------
* ---------- Set field label ---------------------------------------------------------------------- * ---------- Set field label ----------------------------------------------------------------------
lr_form_shlp_2->label( <ls_fielddescr>-rollname ). lr_form_shlp_2->label( <ls_fielddescr>-scrtext_l ).
* ---------- Set input field ---------------------------------------------------------------------- * ---------- Set input field ----------------------------------------------------------------------
CASE <ls_fielddescr>-datatype. CASE <ls_fielddescr>-datatype.
@ -4791,7 +4915,7 @@ CLASS Z2UI5_CL_XML_VIEW IMPLEMENTATION.
WHEN 3. WHEN 3.
* ---------- Grid 3-------------------------------------------------------------------------------- * ---------- Grid 3--------------------------------------------------------------------------------
* ---------- Set field label ---------------------------------------------------------------------- * ---------- Set field label ----------------------------------------------------------------------
lr_form_shlp_3->label( <ls_fielddescr>-rollname ). lr_form_shlp_3->label( <ls_fielddescr>-scrtext_l ).
* ---------- Set input field ---------------------------------------------------------------------- * ---------- Set input field ----------------------------------------------------------------------
CASE <ls_fielddescr>-datatype. CASE <ls_fielddescr>-datatype.
@ -4806,7 +4930,7 @@ CLASS Z2UI5_CL_XML_VIEW IMPLEMENTATION.
WHEN 4. WHEN 4.
* ---------- Grid 4-------------------------------------------------------------------------------- * ---------- Grid 4--------------------------------------------------------------------------------
* ---------- Set field label ---------------------------------------------------------------------- * ---------- Set field label ----------------------------------------------------------------------
lr_form_shlp_4->label( <ls_fielddescr>-rollname ). lr_form_shlp_4->label( <ls_fielddescr>-scrtext_l ).
* ---------- Set input field ---------------------------------------------------------------------- * ---------- Set input field ----------------------------------------------------------------------
CASE <ls_fielddescr>-datatype. CASE <ls_fielddescr>-datatype.
@ -4840,7 +4964,7 @@ CLASS Z2UI5_CL_XML_VIEW IMPLEMENTATION.
CONTINUE. CONTINUE.
ENDIF. ENDIF.
lr_columns->column( )->text( <ls_fielddescr>-rollname ). lr_columns->column( )->text( <ls_fielddescr>-scrtext_l ).
ENDLOOP. ENDLOOP.
* ---------- Build export parameter list ---------------------------------------------------------- * ---------- Build export parameter list ----------------------------------------------------------