tallty_import_export 1.0.29 → 1.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0043f0699fb0631c48a0c1dcd018ccad9cdda7dfa376c0a702bf7857338e04a5
-  data.tar.gz: 7a8dd851866ea1bc55f87ac8ec443587e6776cfd3c52b8b76fcd9f982aeba513
+  metadata.gz: 27824038474eaaac3d03896f311952b08a41bec424d8a5e360ee8814cf439e02
+  data.tar.gz: b357c47d9b2ac449b58d9bc8c15c524e3ab4cf65342ca7b1df54ef834d48636b
 SHA512:
-  metadata.gz: 406e6ac1fcf1623b2c0de6bd6fb415e15012e2e8f56fd9bf8ec1a552b5b15e528048ea8d9f6f5bce0b16f491941b20dd91a9d246459f4c397f891cf175a95806
-  data.tar.gz: 6af4e08406d4092107d372f0e8eaa6e5305dff67b9e5db7620151f55fb3b2f7ab3661817187ef4b92fbc85b32d030cd96c33f3c153037683d97fbc2839e7e317
+  metadata.gz: 46b8963859ceac6a7cfaaf734aa5a32421f0d8f20800db4eaef6b21aa3a54c4d892ffa5d2f42c31224d50cff958d7acb661777c877f8bb13e790cdb009b9edb2
+  data.tar.gz: 0c8f53e6a57eace206218376aa038f589bedc80fe4e1043ec2a85f238150216a888152942e0a68216d2d80d7b4c191fc845e16b0483b264f35e80c9248109c33

data/lib/tallty_import_export/import.rb

@@ -17,6 +17,7 @@ module TalltyImportExport
     # json: model_payload，代表存储在某一个列中
     # finder: 执行代码，可以查找到相关的对象
     # proc: proc或者lamda，支持call，传入 val 和 context
+    # skip: 用来综合使用的数据，但是不导入
 
     # xlsx_file 为 file path or file object or TalltyImportExport::Excel.new
     def import_xlsx xlsx_file, associations, **options
@@ -26,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
@@ -34,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
@@ -43,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
 
@@ -55,6 +56,7 @@ module TalltyImportExport
       options = import_options.merge(options).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
       @params = options
       context.params = @params
 
@@ -108,8 +110,19 @@ module TalltyImportExport
       true
     end
 
+    # TODO: 这里，对于import_headers，后面还是不要传参数了
+    # 需要合并proc，前端没有办法把proc传过来
     def import_headers_result
-      @headers ||= import_headers&.with_indifferent_access
+      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
+    rescue
+      @headers
     end
 
     def import_options
@@ -152,9 +165,9 @@ module TalltyImportExport
     def import_record line_info, associations
       if primary_keys.present?
         _record = associations.find_or_initialize_by(line_info.clone.extract!(*primary_keys))
-        _record.update!(line_info.clone.except!(*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.29"
+  VERSION = "1.0.33"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tallty_import_export
 version: !ruby/object:Gem::Version
-  version: 1.0.29
+  version: 1.0.33
 platform: ruby
 authors:
 - liyijie