tallty_import_export 1.0.15 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06f862bf1ae912a77b1e7a02d76fade118619343de44cbcff2b5f165756ea323
-  data.tar.gz: db83a7345b10d91e5018604ed08c24287e085930c96b7af66499d6333464f063
+  metadata.gz: b1cb38513ee9efd2e26a8cabc623e52306cf5f2a3ecf53711993aeb8067b2915
+  data.tar.gz: bcc91bcc85017141640c259777996e2036347fc68a978403d22a7085c704c1b1
 SHA512:
-  metadata.gz: ba25061c42d32c4396cbb88b9aae8ef7296b58a306c47037dd5c53cea9bde0d8df29f7ed373463d7f74596f78e73fecf3005aa02a2b449ab9d60f0313631bc63
-  data.tar.gz: 240105d66e1c3a009fb8f03b70a19cbb0307c3bbe2e611958e7cd019d332404bae5c75b681488595988996f2bc616aa4e445cc73f6bda6389b4ed55eb81e95ee
+  metadata.gz: 6465b690fba9935d30109b3423119cc9a93dd6b5872eacc647404400ed50da95156fbb9d1b35d94c7f733fef2236601de11ce244ab76618789ed2756027fe23b
+  data.tar.gz: 326fe9117444b0cb0461731181ac2131584b36b64582c8b2a21fab3eb7de761bf27c23d3d710ef703eded66f76fb106373628552437bf042d4371178448c3eb8

data/lib/tallty_import_export/import.rb

@@ -15,6 +15,7 @@ module TalltyImportExport
     # convert: 导入时候，把excel的内容转换成导入时候代码逻辑需要的内容
     # primary_key: 是否是主键
     # json: model_payload，代表存储在某一个列中
+    # finder: 执行代码，可以查找到相关的对象
 
     # xlsx_file 为 file path or file object or TalltyImportExport::Excel.new
     def import_xlsx xlsx_file, associations, **options
@@ -53,6 +54,7 @@ module TalltyImportExport
       options = 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
+      @params = options
 
       @excel_hash = @headers.reduce({}) do |h, header|
         h[header[:key].to_sym] = header[:name]
@@ -63,6 +65,8 @@ module TalltyImportExport
     end
 
     def process_line_info line_info, associations
+      # 去除空行内容
+      return unless line_info.values.any?(&:present?)
       # 转换处理导入的数据格式
       line_info = convert_data(line_info)
 
@@ -75,7 +79,7 @@ module TalltyImportExport
 
     def convert_data line_info
       line_info.with_indifferent_access.reduce({}) do |h, (k, v)|
-        header = @headers.find do |_header|
+        header = import_headers_result.find do |_header|
           _header[:key].to_sym == k.to_sym
         end
         # header[:convert] = handle_xxx
@@ -84,6 +88,9 @@ module TalltyImportExport
         if header[:json]
           h[header[:json]] ||= {}
           h[header[:json]][k] = val
+        elsif header[:finder]
+          $SAFE = 2
+          h[k.to_sym] = eval header[:finder]
         else
           h[k.to_sym] = val
         end
@@ -97,7 +104,7 @@ module TalltyImportExport
     end
 
     def import_headers_result
-      @headers || import_headers
+      @headers ||= import_headers
     end
 
     def import_headers **args

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.0.15"
+  VERSION = "1.0.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tallty_import_export
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.20
 platform: ruby
 authors:
 - liyijie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2021-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip-zip