tallty_import_export 1.0.29 → 1.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0043f0699fb0631c48a0c1dcd018ccad9cdda7dfa376c0a702bf7857338e04a5
-  data.tar.gz: 7a8dd851866ea1bc55f87ac8ec443587e6776cfd3c52b8b76fcd9f982aeba513
+  metadata.gz: 3d508c090e1c1bf676c46ae3bb2d3d2d0c9d3e4d123853894a668262d9ac27ee
+  data.tar.gz: 2f6fee166e44b4e82015a1419da3b7aaad57e71880e26ddcfdfa9fe97cf61572
 SHA512:
-  metadata.gz: 406e6ac1fcf1623b2c0de6bd6fb415e15012e2e8f56fd9bf8ec1a552b5b15e528048ea8d9f6f5bce0b16f491941b20dd91a9d246459f4c397f891cf175a95806
-  data.tar.gz: 6af4e08406d4092107d372f0e8eaa6e5305dff67b9e5db7620151f55fb3b2f7ab3661817187ef4b92fbc85b32d030cd96c33f3c153037683d97fbc2839e7e317
+  metadata.gz: 96486980954a1b12f804bbebf6c6bcd1e75ebf191b39cf4e22dfc11b36a4bed21502555b1bc8cce413e2ac1285cfdb360435d505f899e5db1b3c19d5ce09eeb0
+  data.tar.gz: 6951da2e23d352e485c28a56b13c03d2789ea4bed2a4ae79207dfebcfa1a8543e70143e8eb68bfd04814cf245ea2c47493468672d4418570049b36af79ee3427

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
@@ -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
 
@@ -152,7 +154,7 @@ 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)
       end

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.0.29"
+  VERSION = "1.0.30"
 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.30
 platform: ruby
 authors:
 - liyijie