tallty_import_export 1.0.30 → 1.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d508c090e1c1bf676c46ae3bb2d3d2d0c9d3e4d123853894a668262d9ac27ee
-  data.tar.gz: 2f6fee166e44b4e82015a1419da3b7aaad57e71880e26ddcfdfa9fe97cf61572
+  metadata.gz: 25de46efb361ea554c4cef13898a6f14ac03e8b56cb5ca7fcbadb72ae40dcfcd
+  data.tar.gz: 0346d65fe26f1c9ee4357aa8b5850a86f9007c5b6da719b8b604a46ef6fe1fea
 SHA512:
-  metadata.gz: 96486980954a1b12f804bbebf6c6bcd1e75ebf191b39cf4e22dfc11b36a4bed21502555b1bc8cce413e2ac1285cfdb360435d505f899e5db1b3c19d5ce09eeb0
-  data.tar.gz: 6951da2e23d352e485c28a56b13c03d2789ea4bed2a4ae79207dfebcfa1a8543e70143e8eb68bfd04814cf245ea2c47493468672d4418570049b36af79ee3427
+  metadata.gz: 82b4c135ba29f61e1c1dbd4640b9a8c29639d9ad699474d2a02a11c6db8462269cfe46d9679fc6721258ab2a1b6cbfdc3fb59353de149d21f4cb541b62f206f3
+  data.tar.gz: 54d41b0b50c542827f8350d531aff8dfb80e202b2605cc9dc3cf1d6b49f8764ef7f8b367bf52782a9401c482eb2bd9cf3c684768e73bda935c7c8a8adea5c0cb

data/lib/tallty_import_export/export.rb

@@ -141,7 +141,7 @@ module TalltyImportExport
     end
 
     def process_options options = {}
-      options = export_options.merge(options).with_indifferent_access
+      options = export_options.merge(options.compact_blank!).with_indifferent_access
 
       @row_height ||= options.delete(:row_height) || 25
       @width ||= (options.delete(:width) || 20).to_f
@@ -157,7 +157,7 @@ module TalltyImportExport
     end
 
     def export_headers_result
-      @headers ||= export_headers&.with_indifferent_access
+      @headers ||= export_headers
     end
 
     def export_headers **args

data/lib/tallty_import_export/import.rb

@@ -27,7 +27,7 @@ module TalltyImportExport
 
       if TalltyImportExport::Excel === xlsx_file
         xlsx_file.rows.each_with_excel_hash(@excel_hash) do |line_info|
-          process_line_info(line_info, associations)
+          process_line_info(line_info.with_indifferent_access, associations)
         end
       else
         file_path = xlsx_file.is_a?(String) ? xlsx_file : xlsx_file.path
@@ -35,7 +35,7 @@ module TalltyImportExport
         xlsx.each_with_pagename do |_sheetname, sheet|
           sheet.each(**@excel_hash).with_index do |line_info, index|
             next if index == 0
-            process_line_info(line_info, associations)
+            process_line_info(line_info.with_indifferent_access, associations)
           end
         end
       end
@@ -44,7 +44,7 @@ module TalltyImportExport
     def import_data data, associations, **options
       process_options(options)
       TalltyImportExport::Excel::Rows.new(data).each_with_excel_hash(@excel_hash) do |line_info|
-        process_line_info(line_info, associations)
+        process_line_info(line_info.with_indifferent_access, associations)
       end
     end
 
@@ -53,7 +53,7 @@ module TalltyImportExport
     end
 
     def process_options options
-      options = import_options.merge(options).with_indifferent_access
+      options = import_options.merge(options.compact_blank!).with_indifferent_access
       @headers = options.delete(:headers) || import_headers
       @primary_keys = options.delete(:primary_keys) || @headers.map { |header| header[:primary_key] ? header[:key].to_sym : nil }.compact
       @skip_keys = options.delete(:skip_keys) || @headers.map { |header| header[:skip] ? header[:key].to_sym : nil }.compact
@@ -110,8 +110,23 @@ module TalltyImportExport
       true
     end
 
+    # TODO: 这里，对于import_headers，后面还是不要传参数了
+    # 需要合并proc，前端没有办法把proc传过来
     def import_headers_result
-      @headers ||= import_headers&.with_indifferent_access
+      if @headers.present?
+        import_header_hash = import_headers.to_h { |header| [header.with_indifferent_access[:key], header] }.with_indifferent_access
+        @headers.map do |header|
+          key = header[:key]
+          if import_header_hash.dig(key, :proc).present?
+            header[:proc] = import_header_hash.dig(key, :proc)
+          end
+          header
+        end
+      else
+        @headers = import_headers
+      end
+    rescue
+      @headers
     end
 
     def import_options
@@ -156,7 +171,7 @@ module TalltyImportExport
         _record = associations.find_or_initialize_by(line_info.clone.extract!(*primary_keys))
         _record.update!(line_info.clone.except!(*primary_keys, *@skip_keys))
       else
-        associations.create!(line_info)
+        associations.create!(line_info.clone.except!(*@skip_keys))
       end
     end
   end

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.0.30"
+  VERSION = "1.0.35"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tallty_import_export
 version: !ruby/object:Gem::Version
-  version: 1.0.30
+  version: 1.0.35
 platform: ruby
 authors:
 - liyijie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-11 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip-zip