mirror of
https://github.com/abap2xlsx/abap2xlsx.git
synced 2025-05-06 06:42:08 +08:00
Merge branch 'main' into fix-issue-1013-part2
This commit is contained in:
commit
1cb1b98249
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
## Procedure
|
## Procedure
|
||||||
|
|
||||||
Execute abapGit using the report **ZABAPGIT_FULL**, click on *New Online*, fill the field *Git repository URL* with *https://github.com/abap2xlsx/abap2xlsx.git*, package with *$abap2xlsx* if you just want to test. If you want to transport abap2xlsx to production then use a non local package, for example ZABAP2XLSX. Click *Create package* if the package doesn't exist yet. Then click *Clone online repo*.
|
Execute abapGit using the report **ZABAPGIT_STANDALONE**, click on *New Online*, fill the field *Git repository URL* with *https://github.com/abap2xlsx/abap2xlsx.git*, package with *$abap2xlsx* if you just want to test. If you want to transport abap2xlsx to production then use a non local package, for example ZABAP2XLSX. Click *Create package* if the package doesn't exist yet. Then click *Clone online repo*.
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
|
|
@ -94,7 +94,6 @@ CLASS zcl_excel_worksheet DEFINITION
|
||||||
DATA sheet_setup TYPE REF TO zcl_excel_sheet_setup .
|
DATA sheet_setup TYPE REF TO zcl_excel_sheet_setup .
|
||||||
DATA show_gridlines TYPE zexcel_show_gridlines READ-ONLY VALUE abap_true ##NO_TEXT.
|
DATA show_gridlines TYPE zexcel_show_gridlines READ-ONLY VALUE abap_true ##NO_TEXT.
|
||||||
DATA show_rowcolheaders TYPE zexcel_show_gridlines READ-ONLY VALUE abap_true ##NO_TEXT.
|
DATA show_rowcolheaders TYPE zexcel_show_gridlines READ-ONLY VALUE abap_true ##NO_TEXT.
|
||||||
DATA styles TYPE zexcel_t_sheet_style .
|
|
||||||
DATA tabcolor TYPE zexcel_s_tabcolor READ-ONLY .
|
DATA tabcolor TYPE zexcel_s_tabcolor READ-ONLY .
|
||||||
DATA column_formulas TYPE mty_th_column_formula READ-ONLY .
|
DATA column_formulas TYPE mty_th_column_formula READ-ONLY .
|
||||||
CLASS-DATA:
|
CLASS-DATA:
|
||||||
|
@ -2966,14 +2965,18 @@ CLASS ZCL_EXCEL_WORKSHEET IMPLEMENTATION.
|
||||||
|
|
||||||
DATA: lt_field_catalog TYPE zexcel_t_fieldcatalog,
|
DATA: lt_field_catalog TYPE zexcel_t_fieldcatalog,
|
||||||
lv_value_lowercase TYPE string,
|
lv_value_lowercase TYPE string,
|
||||||
|
lv_scrtext_l_initial TYPE scrtext_l,
|
||||||
|
lv_long_text TYPE string,
|
||||||
|
lv_max_length TYPE i,
|
||||||
|
lv_temp_length TYPE i,
|
||||||
lv_syindex TYPE c LENGTH 3,
|
lv_syindex TYPE c LENGTH 3,
|
||||||
lt_column_name_buffer TYPE SORTED TABLE OF string WITH UNIQUE KEY table_line.
|
lt_column_name_buffer TYPE SORTED TABLE OF string WITH UNIQUE KEY table_line.
|
||||||
FIELD-SYMBOLS: <ls_field_catalog> TYPE zexcel_s_fieldcatalog,
|
FIELD-SYMBOLS: <ls_field_catalog> TYPE zexcel_s_fieldcatalog,
|
||||||
<scrtxt1> TYPE any,
|
<scrtxt1> TYPE any,
|
||||||
<scrtxt2> TYPE any,
|
<scrtxt2> TYPE any,
|
||||||
<scrtxt3> TYPE any.
|
<scrtxt3> TYPE any.
|
||||||
|
|
||||||
" Due restrinction of new table object we cannot have two column with the same name
|
" Due to restrictions in new table object we cannot have two columns with the same name
|
||||||
" Check if a column with the same name exists, if exists add a counter
|
" Check if a column with the same name exists, if exists add a counter
|
||||||
" If no medium description is provided we try to use small or long
|
" If no medium description is provided we try to use small or long
|
||||||
|
|
||||||
|
@ -3010,6 +3013,8 @@ CLASS ZCL_EXCEL_WORKSHEET IMPLEMENTATION.
|
||||||
<ls_field_catalog>-scrtext_l = 'Column'. " default value as Excel does
|
<ls_field_catalog>-scrtext_l = 'Column'. " default value as Excel does
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
||||||
|
lv_scrtext_l_initial = <ls_field_catalog>-scrtext_l.
|
||||||
|
DESCRIBE FIELD <ls_field_catalog>-scrtext_l LENGTH lv_max_length IN CHARACTER MODE.
|
||||||
DO.
|
DO.
|
||||||
lv_value_lowercase = <ls_field_catalog>-scrtext_l.
|
lv_value_lowercase = <ls_field_catalog>-scrtext_l.
|
||||||
TRANSLATE lv_value_lowercase TO LOWER CASE.
|
TRANSLATE lv_value_lowercase TO LOWER CASE.
|
||||||
|
@ -3019,7 +3024,14 @@ CLASS ZCL_EXCEL_WORKSHEET IMPLEMENTATION.
|
||||||
EXIT.
|
EXIT.
|
||||||
ELSE.
|
ELSE.
|
||||||
lv_syindex = sy-index.
|
lv_syindex = sy-index.
|
||||||
CONCATENATE <ls_field_catalog>-scrtext_l lv_syindex INTO <ls_field_catalog>-scrtext_l.
|
CONCATENATE lv_scrtext_l_initial lv_syindex INTO lv_long_text.
|
||||||
|
IF strlen( lv_long_text ) <= lv_max_length.
|
||||||
|
<ls_field_catalog>-scrtext_l = lv_long_text.
|
||||||
|
ELSE.
|
||||||
|
lv_temp_length = strlen( lv_scrtext_l_initial ) - 1.
|
||||||
|
lv_scrtext_l_initial = substring( val = lv_scrtext_l_initial len = lv_temp_length ).
|
||||||
|
CONCATENATE lv_scrtext_l_initial lv_syindex INTO <ls_field_catalog>-scrtext_l.
|
||||||
|
ENDIF.
|
||||||
ENDIF.
|
ENDIF.
|
||||||
ENDDO.
|
ENDDO.
|
||||||
|
|
||||||
|
@ -3133,7 +3145,7 @@ CLASS ZCL_EXCEL_WORKSHEET IMPLEMENTATION.
|
||||||
rv_guid = ip_style_or_guid.
|
rv_guid = ip_style_or_guid.
|
||||||
|
|
||||||
ELSE.
|
ELSE.
|
||||||
RAISE EXCEPTION TYPE zcx_excel EXPORTING error = 'IP_GUID type must be either REF TO zcl_excel_tyle or zexcel_cell_style'.
|
RAISE EXCEPTION TYPE zcx_excel EXPORTING error = 'IP_GUID type must be either REF TO zcl_excel_style or zexcel_cell_style'.
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
||||||
ENDMETHOD.
|
ENDMETHOD.
|
||||||
|
@ -3687,6 +3699,9 @@ CLASS ZCL_EXCEL_WORKSHEET IMPLEMENTATION.
|
||||||
* If not, use default
|
* If not, use default
|
||||||
DATA: lo_format_code_datetime TYPE zexcel_number_format.
|
DATA: lo_format_code_datetime TYPE zexcel_number_format.
|
||||||
DATA: stylemapping TYPE zexcel_s_stylemapping.
|
DATA: stylemapping TYPE zexcel_s_stylemapping.
|
||||||
|
IF <fs_sheet_content>-cell_style IS INITIAL.
|
||||||
|
<fs_sheet_content>-cell_style = me->excel->get_default_style( ).
|
||||||
|
ENDIF.
|
||||||
CASE lv_value_type.
|
CASE lv_value_type.
|
||||||
WHEN cl_abap_typedescr=>typekind_date.
|
WHEN cl_abap_typedescr=>typekind_date.
|
||||||
TRY.
|
TRY.
|
||||||
|
|
|
@ -1101,18 +1101,6 @@
|
||||||
<LANGU>I</LANGU>
|
<LANGU>I</LANGU>
|
||||||
<DESCRIPT>Show Gridlines</DESCRIPT>
|
<DESCRIPT>Show Gridlines</DESCRIPT>
|
||||||
</SEOCOMPOTX>
|
</SEOCOMPOTX>
|
||||||
<SEOCOMPOTX>
|
|
||||||
<CLSNAME>ZCL_EXCEL_WORKSHEET</CLSNAME>
|
|
||||||
<CMPNAME>STYLES</CMPNAME>
|
|
||||||
<LANGU>E</LANGU>
|
|
||||||
<DESCRIPT>Sheet style table type</DESCRIPT>
|
|
||||||
</SEOCOMPOTX>
|
|
||||||
<SEOCOMPOTX>
|
|
||||||
<CLSNAME>ZCL_EXCEL_WORKSHEET</CLSNAME>
|
|
||||||
<CMPNAME>STYLES</CMPNAME>
|
|
||||||
<LANGU>I</LANGU>
|
|
||||||
<DESCRIPT>Sheet style table type</DESCRIPT>
|
|
||||||
</SEOCOMPOTX>
|
|
||||||
<SEOCOMPOTX>
|
<SEOCOMPOTX>
|
||||||
<CLSNAME>ZCL_EXCEL_WORKSHEET</CLSNAME>
|
<CLSNAME>ZCL_EXCEL_WORKSHEET</CLSNAME>
|
||||||
<CMPNAME>STYLES_COND</CMPNAME>
|
<CMPNAME>STYLES_COND</CMPNAME>
|
||||||
|
|
|
@ -415,7 +415,7 @@ CLASS zcl_excel_writer_huge_file IMPLEMENTATION.
|
||||||
|
|
||||||
IF lv_freeze_cell_column > 1.
|
IF lv_freeze_cell_column > 1.
|
||||||
lv_value = lv_freeze_cell_column - 1.
|
lv_value = lv_freeze_cell_column - 1.
|
||||||
l_worksheet-xsplit = lv_freeze_cell_row - 1.
|
l_worksheet-xsplit = lv_freeze_cell_column - 1.
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
||||||
lv_freeze_cell_column_alpha = zcl_excel_common=>convert_column2alpha( ip_column = lv_freeze_cell_column ).
|
lv_freeze_cell_column_alpha = zcl_excel_common=>convert_column2alpha( ip_column = lv_freeze_cell_column ).
|
||||||
|
|
|
@ -1,22 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<abapGit version="v1.0.0" serializer="LCL_OBJECT_TABL" serializer_version="v1.0.0">
|
|
||||||
<asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
|
|
||||||
<asx:values>
|
|
||||||
<DD02V>
|
|
||||||
<TABNAME>ZEXCEL_S_SHEET_STYLE</TABNAME>
|
|
||||||
<DDLANGUAGE>E</DDLANGUAGE>
|
|
||||||
<TABCLASS>INTTAB</TABCLASS>
|
|
||||||
<DDTEXT>Sheet style structure</DDTEXT>
|
|
||||||
<EXCLASS>1</EXCLASS>
|
|
||||||
</DD02V>
|
|
||||||
<DD03P_TABLE>
|
|
||||||
<DD03P>
|
|
||||||
<FIELDNAME>GUID</FIELDNAME>
|
|
||||||
<ROLLNAME>ZEXCEL_CELL_STYLE</ROLLNAME>
|
|
||||||
<ADMINFIELD>0</ADMINFIELD>
|
|
||||||
<COMPTYPE>E</COMPTYPE>
|
|
||||||
</DD03P>
|
|
||||||
</DD03P_TABLE>
|
|
||||||
</asx:values>
|
|
||||||
</asx:abap>
|
|
||||||
</abapGit>
|
|
|
@ -1,18 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<abapGit version="v1.0.0" serializer="LCL_OBJECT_TTYP" serializer_version="v1.0.0">
|
|
||||||
<asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
|
|
||||||
<asx:values>
|
|
||||||
<DD40V>
|
|
||||||
<TYPENAME>ZEXCEL_T_SHEET_STYLE</TYPENAME>
|
|
||||||
<DDLANGUAGE>E</DDLANGUAGE>
|
|
||||||
<ROWTYPE>ZEXCEL_S_SHEET_STYLE</ROWTYPE>
|
|
||||||
<ROWKIND>S</ROWKIND>
|
|
||||||
<DATATYPE>STRU</DATATYPE>
|
|
||||||
<ACCESSMODE>T</ACCESSMODE>
|
|
||||||
<KEYDEF>D</KEYDEF>
|
|
||||||
<KEYKIND>N</KEYKIND>
|
|
||||||
<DDTEXT>Sheet style table type</DDTEXT>
|
|
||||||
</DD40V>
|
|
||||||
</asx:values>
|
|
||||||
</asx:abap>
|
|
||||||
</abapGit>
|
|
Loading…
Reference in New Issue
Block a user