Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tallty_import_export
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open-source
tallty_import_export
Commits
da71d9f8
Commit
da71d9f8
authored
Apr 19, 2021
by
liyijie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge logic fix
parent
aec701ab
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
export.rb
lib/tallty_import_export/export.rb
+4
-4
No files found.
lib/tallty_import_export/export.rb
View file @
da71d9f8
...
...
@@ -91,9 +91,9 @@ module TalltyImportExport
headers
.
each_with_index
do
|
header
,
col_index
|
_data
=
handle_data
(
record
,
header
,
index
)
if
header
[
:merge
].
present?
&&
last_row
.
present?
&&
_data
==
last_row
[
col_index
]
merge_
index
=
merge_column_hash
[
col_index
]
||
[]
merge_
index
<<
index
+
first_content_row_index
merge_
index
<<
index
+
first_content_row_index
+
1
merge_
column_hash
[
col_index
]
||=
[]
merge_
column_hash
[
col_index
]
<<
index
+
first_content_row_index
merge_
column_hash
[
col_index
]
<<
index
+
first_content_row_index
+
1
end
row
.
push
(
_data
)
end
...
...
@@ -105,7 +105,7 @@ module TalltyImportExport
merge_column_hash
.
each
do
|
col_index
,
row_arr
|
split_arr
(
row_arr
).
each
do
|
arr
|
sheet
.
merge_cells
(
Axlsx
::
cell_r
(
arr
.
first
,
col_index
)
+
':'
+
Axlsx
::
cell_r
(
arr
.
last
,
col_index
)
Axlsx
::
cell_r
(
col_index
,
arr
.
first
)
+
':'
+
Axlsx
::
cell_r
(
col_index
,
arr
.
last
)
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment