Commit aec701ab by liyijie

fix column merge use col_index

parent d732e8fe
...@@ -90,7 +90,7 @@ module TalltyImportExport ...@@ -90,7 +90,7 @@ module TalltyImportExport
row = [] row = []
headers.each_with_index do |header, col_index| headers.each_with_index do |header, col_index|
_data = handle_data(record, header, index) _data = handle_data(record, header, index)
if header[:merge].present? && last_row.present? && _data == last_row[index] if header[:merge].present? && last_row.present? && _data == last_row[col_index]
merge_index = merge_column_hash[col_index] || [] merge_index = merge_column_hash[col_index] || []
merge_index << index + first_content_row_index merge_index << index + first_content_row_index
merge_index << index + first_content_row_index + 1 merge_index << index + first_content_row_index + 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment