Commit eee48c45 by liyijie

remove headers = method

parent 7b70eb91
...@@ -51,7 +51,7 @@ module TalltyImportExport ...@@ -51,7 +51,7 @@ module TalltyImportExport
def process_options options def process_options options
options = options.with_indifferent_access options = options.with_indifferent_access
self.headers = options.delete(:headers) || [] @headers = options.delete(:headers) || []
@primary_keys = options.delete(:primary_keys) || @headers.map { |header| header[:primary_key] ? header[:key].to_sym : nil }.compact @primary_keys = options.delete(:primary_keys) || @headers.map { |header| header[:primary_key] ? header[:key].to_sym : nil }.compact
@excel_hash = @headers.reduce({}) do |h, header| @excel_hash = @headers.reduce({}) do |h, header|
...@@ -104,29 +104,29 @@ module TalltyImportExport ...@@ -104,29 +104,29 @@ module TalltyImportExport
@headers || klass.try(:headers) || klass.try(:model_headers) || (raise ArgumentError.new('missing import_headers')) @headers || klass.try(:headers) || klass.try(:model_headers) || (raise ArgumentError.new('missing import_headers'))
end end
# 只保留 key, name, json, 合并到 import_header # # 只保留 key, name, json, 合并到 import_header
def headers= val # def headers= val
if val.empty? # if val.empty?
@headers = import_headers_result.map { |header| header.with_indifferent_access } # @headers = import_headers_result.map { |header| header.with_indifferent_access }
return # return
end # end
#
key_to_coming_header = val.reduce({}) do |out, header| # key_to_coming_header = val.reduce({}) do |out, header|
out[header.with_indifferent_access[:key].to_sym] = header.with_indifferent_access # out[header.with_indifferent_access[:key].to_sym] = header.with_indifferent_access
out # out
end # end
#
result = [] # result = []
val.map do |header| # val.map do |header|
if (exist_header = import_headers_result.find { |model_header| model_header[:key] === header[:key] }) # if (exist_header = import_headers_result.find { |model_header| model_header[:key] === header[:key] })
result.push(exist_header.merge(header.compact)) # result.push(exist_header.merge(header.compact))
else # else
result.push(header) # result.push(header)
end # end
end # end
#
@headers = result # @headers = result
end # end
def skip val, processing_line_info, raw_line_info def skip val, processing_line_info, raw_line_info
# do nothing there, use for header[:convert] # do nothing there, use for header[:convert]
......
module TalltyImportExport module TalltyImportExport
VERSION = "1.0.7" VERSION = "1.0.8"
end end
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