Skip to content

Commit 127cf90

Browse files
oblomov-devoblomov-dev
committed
update webc renderer
1 parent db14306 commit 127cf90

8 files changed

+58
-246
lines changed

‎src/z2ui5_cl_demo_app_013.clas.abap‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -26,89 +26,88 @@ CLASS z2ui5_cl_demo_app_013 IMPLEMENTATION.
2626

2727
METHOD render_tab_donut.
2828

29-
DATA(container) = z2ui5_cl_ui5=>_factory( )->_ns_m(
29+
DATA(container) = z2ui5_cl_xml_view=>factory(
3030
)->shell(
3131
)->page(
3232
title = 'abap2UI5 - Visualization'
3333
navbuttonpress = client->_event( 'BACK' )
3434
shownavbutton = abap_true
35-
)->headercontent(
35+
)->header_content(
3636
)->link( text = 'Demo' target = '_blank' href = `https://twitter.com/abap2UI5/status/1639191954285113344`
3737
)->link( text = 'Source_Code' target = '_blank' href = z2ui5_cl_demo_utility=>factory( client )->app_get_url_source_code( )
38-
)->_go_up( )->_ns_ui(
39-
)->tabcontainer( ).
38+
)->get_parent(
39+
)->tab_container( ).
4040

4141
DATA(grid) = container->tab(
4242
text = 'Donut Chart'
4343
selected = client->_bind( mv_tab_donut_active )
4444
)->grid( 'XL6 L6 M6 S12' ).
4545

46-
grid->_ns_m( )->link(
46+
grid->link(
4747
text = 'Go to the SAP Demos for Interactive Donut Charts here...' target = '_blank'
4848
href = 'https://sapui5.hana.ondemand.com/#/entity/sap.suite.ui.microchart.InteractiveDonutChart/sample/sap.suite.ui.microchart.sample.InteractiveDonutChart'
4949
)->text(
5050
text = 'Three segments'
5151
class = 'sapUiSmallMargin'
52-
)->_go_new( )->_ns_m( )->layoutdata( )->_ns_ui(
53-
)->griddata( 'XL12 L12 M12 S12' ).
52+
)->get( )->layout_data(
53+
)->grid_data( 'XL12 L12 M12 S12' ).
5454

5555

56-
DATA(seg) = grid->_ns_m( )->flexbox(
56+
DATA(seg) = grid->flex_box(
5757
width = '22rem'
5858
height = '13rem'
5959
alignitems = 'Start'
6060
justifycontent = 'SpaceBetween'
61-
)->items(
62-
)->_ns_suite( )->interactdonutchart(
61+
)->items( )->interact_donut_chart(
6362
selectionchanged = client->_event( 'DONUT_CHANGED' )
6463
)->segments( ).
65-
seg->interactdonutchartsegment( selected = client->_bind( mv_sel4 ) label = 'Impl. Phase' value = '40.0' displayedvalue = '40.0%' ).
66-
seg->interactdonutchartsegment( selected = client->_bind( mv_sel5 ) label = 'Design Phase' value = '21.5' displayedvalue = '21.5%' ).
67-
seg->interactdonutchartsegment( selected = client->_bind( mv_sel6 ) label = 'Test Phase' value = '38.5' displayedvalue = '38.5%' ).
64+
seg->interact_donut_chart_segment( selected = client->_bind( mv_sel4 ) label = 'Impl. Phase' value = '40.0' displayedvalue = '40.0%' ).
65+
seg->interact_donut_chart_segment( selected = client->_bind( mv_sel5 ) label = 'Design Phase' value = '21.5' displayedvalue = '21.5%' ).
66+
seg->interact_donut_chart_segment( selected = client->_bind( mv_sel6 ) label = 'Test Phase' value = '38.5' displayedvalue = '38.5%' ).
6867

69-
grid->_ns_m( )->text(
68+
grid->text(
7069
text = 'Four segments'
7170
class = 'sapUiSmallMargin'
72-
)->_go_new( )->_ns_m( )->layoutdata( )->_ns_ui(
73-
)->griddata( 'XL12 L12 M12 S12' ).
71+
)->get( )->layout_data(
72+
)->grid_data( 'XL12 L12 M12 S12' ).
7473

75-
seg = grid->_ns_m( )->flexbox(
74+
seg = grid->flex_box(
7675
width = '22rem'
7776
height = '13rem'
7877
alignitems = 'Start'
7978
justifycontent = 'SpaceBetween'
80-
)->items( )->_ns_suite( )->interactdonutchart(
79+
)->items( )->interact_donut_chart(
8180
selectionchanged = client->_event( 'DONUT_CHANGED' )
8281
press = client->_event( 'DONUT_PRESS' )
8382
displayedsegments = '4'
8483
)->segments( ).
85-
seg->interactdonutchartsegment( label = 'Design Phase' value = '32.0' displayedvalue = '32.0%' ).
86-
seg->interactdonutchartsegment( label = 'Implementation Phase' value = '28' displayedvalue = '28%' ).
87-
seg->interactdonutchartsegment( label = 'Test Phase' value = '25' displayedvalue = '25%' ).
88-
seg->interactdonutchartsegment( label = 'Launch Phase' value = '15' displayedvalue = '15%' ).
84+
seg->interact_donut_chart_segment( label = 'Design Phase' value = '32.0' displayedvalue = '32.0%' ).
85+
seg->interact_donut_chart_segment( label = 'Implementation Phase' value = '28' displayedvalue = '28%' ).
86+
seg->interact_donut_chart_segment( label = 'Test Phase' value = '25' displayedvalue = '25%' ).
87+
seg->interact_donut_chart_segment( label = 'Launch Phase' value = '15' displayedvalue = '15%' ).
8988

90-
grid->_ns_m( )->text(
89+
grid->text(
9190
text = 'Error Messages'
9291
class = 'sapUiSmallMargin'
93-
)->_go_new( )->_ns_m( )->layoutdata( )->_ns_ui(
94-
)->griddata( 'XL12 L12 M12 S12' ).
92+
)->get( )->layout_data(
93+
)->grid_data( 'XL12 L12 M12 S12' ).
9594

96-
seg = grid->_ns_m( )->flexbox(
95+
seg = grid->flex_box(
9796
width = '22rem'
9897
height = '13rem'
9998
alignitems = 'Start'
10099
justifycontent = 'SpaceBetween'
101-
)->items( )->_ns_suite( )->interactdonutchart(
100+
)->items( )->interact_donut_chart(
102101
selectionchanged = client->_event( 'DONUT_CHANGED' )
103102
showerror = abap_true
104103
errormessagetitle = 'No data'
105104
errormessage = 'Currently no data is available'
106105
)->segments( ).
107-
seg->interactdonutchartsegment( label = 'Implementation Phase' value = '40.0' displayedvalue = '40.0%' ).
108-
seg->interactdonutchartsegment( label = 'Design Phase' value = '21.5' displayedvalue = '21.5%' ).
109-
seg->interactdonutchartsegment( label = 'Test Phase' value = '38.5' displayedvalue = '38.5%' ).
106+
seg->interact_donut_chart_segment( label = 'Implementation Phase' value = '40.0' displayedvalue = '40.0%' ).
107+
seg->interact_donut_chart_segment( label = 'Design Phase' value = '21.5' displayedvalue = '21.5%' ).
108+
seg->interact_donut_chart_segment( label = 'Test Phase' value = '38.5' displayedvalue = '38.5%' ).
110109

111-
client->view_display( container->_stringify( ) ).
110+
client->view_display( container->stringify( ) ).
112111

113112
ENDMETHOD.
114113

‎src/z2ui5_cl_demo_app_023.clas.abap‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,19 +117,19 @@ CLASS z2ui5_cl_demo_app_023 IMPLEMENTATION.
117117

118118
WHEN 'NORMAL'.
119119

120-
DATA(lv_view_normal_xml) = z2ui5_cl_ui5=>_factory( )->_ns_m(
120+
DATA(lv_view_normal_xml) = z2ui5_cl_xml_view=>factory(
121121
)->page(
122122
title = 'abap2UI5 - NORMAL NORMAL NORMAL'
123123
navbuttonpress = client->_event( 'BACK' )
124124
shownavbutton = xsdbool( client->get( )-s_draft-id_prev_app_stack IS NOT INITIAL )
125-
)->headercontent(
125+
)->header_content(
126126
)->link(
127127
text = 'Source_Code'
128128
href = z2ui5_cl_demo_utility=>factory( client )->app_get_url_source_code( )
129129
target = '_blank'
130-
)->_go_up( )->_ns_ui(
131-
)->simpleform( 'Form Title'
132-
)->content( )->_ns_m(
130+
)->get_parent(
131+
)->simple_form( 'Form Title'
132+
)->content( `form`
133133
)->title( 'Input'
134134
)->label( 'quantity'
135135
)->input( client->_bind( quantity )
@@ -142,7 +142,7 @@ CLASS z2ui5_cl_demo_app_023 IMPLEMENTATION.
142142
)->button(
143143
text = 'XML'
144144
press = client->_event( 'XML' )
145-
)->_stringify( ).
145+
)->stringify( ).
146146

147147
client->view_display( lv_view_normal_xml ).
148148

‎src/z2ui5_cl_demo_app_035.clas.abap‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,14 @@ ENDCLASS.
2222
CLASS z2ui5_cl_demo_app_035 IMPLEMENTATION.
2323
METHOD view_display.
2424

25-
DATA(view) = z2ui5_cl_ui5=>_factory( )->_ns_m( ).
25+
DATA(view) = z2ui5_cl_xml_view=>factory( ).
2626

2727
DATA(page) = view->shell( )->page( title = 'abap2UI5 - File Editor'
2828
navbuttonpress = client->_event( 'BACK' )
2929
shownavbutton = xsdbool( client->get( )-s_draft-id_prev_app_stack IS NOT INITIAL )
30-
)->headercontent(
31-
)->link( text = 'Demo' target = '_blank' href = 'https://twitter.com/abap2UI5/status/1631562906570575875'
32-
)->link( text = 'Source_Code' target = '_blank' href = z2ui5_cl_demo_utility=>factory( client )->app_get_url_source_code( )
33-
)->_go_up( ).
30+
).
3431

35-
DATA(grid) = page->_ns_ui( )->grid( 'L7 M12 S12' )->content( `sap.ui.layout` ).
36-
37-
data(temp) = grid->simpleform( title = 'File' editable = abap_true )->content( )->_ns_m(
32+
data(temp) = page->simple_form( title = 'File' editable = abap_true )->content( `form`
3833
)->label( 'path'
3934
)->input( client->_bind_edit( mv_path )
4035
)->label( 'Option' ).
@@ -45,28 +40,25 @@ CLASS z2ui5_cl_demo_app_035 IMPLEMENTATION.
4540
v = shift_right( shift_left( row ) ) ) ).
4641

4742
data(temp3) = temp->input( value = client->_bind_edit( mv_type )
48-
suggestionitems = client->_bind_local( lt_types ) ).
49-
data(temp2) = temp3->_go_new( ).
50-
51-
temp2->_ns_m(
52-
)->suggestionitems( )->_ns_ui(
53-
)->listitem( text = '{NAME}' additionaltext = '{VALUE}'
54-
)->_go_up( )->_go_up( )->_ns_m(
55-
)->button( text = 'Download'
43+
suggestionitems = client->_bind_local( lt_types )
44+
)->get( ).
45+
46+
temp3->suggestion_items(
47+
)->list_item( text = '{N}' additionaltext = '{V}' ).
48+
49+
temp->label( '' )->button( text = 'Download'
5650
press = client->_event( 'DB_LOAD' )
5751
icon = 'sap-icon://download-from-cloud' ).
5852

59-
grid = page->_ns_ui( )->grid( 'L12 M12 S12' )->content( `sap.ui.layout` ).
60-
61-
page->_ns_ui( )->codeeditor( type = mv_type
53+
page->code_editor( type = mv_type
6254
editable = mv_check_editable
6355
value = client->_bind( mv_editor ) ).
6456

65-
page->_ns_m( )->footer( )->overflowtoolbar(
57+
page->footer( )->overflow_toolbar(
6658
)->button( text = 'Clear'
6759
press = client->_event( 'CLEAR' )
6860
icon = 'sap-icon://delete'
69-
)->toolbarspacer(
61+
)->toolbar_spacer(
7062
)->button( text = 'Edit'
7163
press = client->_event( 'EDIT' )
7264
icon = 'sap-icon://edit'
@@ -76,7 +68,7 @@ CLASS z2ui5_cl_demo_app_035 IMPLEMENTATION.
7668
icon = 'sap-icon://upload-to-cloud'
7769
enabled = xsdbool( mv_editor IS NOT INITIAL ) ).
7870

79-
client->view_display( page->_stringify( ) ).
71+
client->view_display( page->stringify( ) ).
8072
ENDMETHOD.
8173

8274
METHOD Z2UI5_if_app~main.

‎src/z2ui5_cl_demo_app_124.clas.abap‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,29 +36,29 @@ CLASS z2ui5_cl_demo_app_124 IMPLEMENTATION.
3636

3737
ENDCASE.
3838

39-
client->view_display( z2ui5_cl_ui5=>_factory( )->_ns_m( )->shell(
39+
client->view_display( z2ui5_cl_xml_view=>factory( )->shell(
4040
)->page(
4141
showheader = xsdbool( abap_false = client->get( )-check_launchpad_active )
4242
title = 'abap2UI5'
4343
navbuttonpress = client->_event( val = 'BACK' )
4444
shownavbutton = xsdbool( client->get( )-s_draft-id_prev_app_stack IS NOT INITIAL )
45-
)->headercontent(
45+
)->header_content(
4646
)->link(
4747
text = 'Source_Code'
4848
href = z2ui5_cl_demo_utility=>factory( client )->app_get_url_source_code( )
4949
target = '_blank'
50-
)->_go_up( )->_ns_ui(
51-
)->simpleform( title = 'Information' editable = abap_true
52-
)->content( )->_ns_m(
50+
)->get_parent(
51+
)->simple_form( title = 'Information' editable = abap_true
52+
)->content( 'form'
5353
)->label( 'mv_scan_input'
5454
)->input( client->_bind_edit( mv_scan_input )
5555
)->label( `mv_scan_type`
5656
)->input( client->_bind_edit( mv_scan_type )
57-
)->label( `scanner` )->_ns_ndc(
58-
)->barcodescannerbutton(
57+
)->label( `scanner`
58+
)->barcode_scanner_button(
5959
scansuccess = client->_event( val = 'ON_SCAN_SUCCESS' t_arg = VALUE #( ( `${$parameters>/text}` ) ( `${$parameters>/format}` ) ) )
6060
dialogtitle = `Barcode Scanner`
61-
)->_stringify( ) ).
61+
)->stringify( ) ).
6262

6363
ENDMETHOD.
6464
ENDCLASS.

‎src/z2ui5_cl_demo_app_131.clas.abap‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎src/z2ui5_cl_demo_app_131.clas.xml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)