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
d08d72c1
Commit
d08d72c1
authored
Jun 30, 2023
by
Ivan Lan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复导出 merge
parent
06c3deb9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
export.rb
lib/tallty_import_export/export.rb
+3
-3
No files found.
lib/tallty_import_export/export.rb
View file @
d08d72c1
...
...
@@ -142,11 +142,11 @@ module TalltyImportExport
if
header
[
:merge
].
present?
&&
last_row
.
present?
&&
_data
==
last_row
[
col_index
]
# 这里使用二维数组,每个数组里都是列内容相同的各行
merge_column_hash
[
col_index
]
||=
[]
if
merge_column_hash
[
col_index
].
last
&
.
last
==
index
+
first_content_row_index
-
1
if
merge_column_hash
[
col_index
].
last
&
.
last
==
index
+
first_content_row_index
-
1
-
1
# 说明内容和上面的是延续的,继续加入之前的数组
merge_column_hash
[
col_index
].
last
<<
index
+
first_content_row_index
merge_column_hash
[
col_index
].
last
<<
index
+
first_content_row_index
-
1
else
merge_column_hash
[
col_index
]
<<
[
index
+
first_content_row_index
-
1
,
index
+
first_content_row_index
]
merge_column_hash
[
col_index
]
<<
[
index
+
first_content_row_index
-
1
-
1
,
index
+
first_content_row_index
-
1
]
end
end
row
.
push
(
_data
)
...
...
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