tallty_import_export 1.0.28 → 1.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d689c40b8f11354501a465563d14f5ab1060137fb2221180db05c8a18fe2b0d
-  data.tar.gz: 9cbd15c9a1eae1a0e036dd4557fb5197e3f595067b035dd01119167becee6d3c
+  metadata.gz: fc07ae6791e3abfee248a3dd1413dad877cdc1e262bf0b93f3d79d73ba37e22e
+  data.tar.gz: b90999b8e70f6d3ecdf96ecfa2eb086ac2ff0a99abeaec0e11f45f887fc5ce14
 SHA512:
-  metadata.gz: a11b8561c856588abf871fe6cac330e3a9412e468c6ff2d3480be75b8976b22a7037a655c51df7c884a367d9efa7c8b362c1c46ca3a1e5824f8777ccf0bb1204
-  data.tar.gz: d178c5d5ae84107a04862e7b5b929ba8546776b1400ed79bde6c518f656d6ac7c573bfaaad3d60b499ec18d1cf9df3a09962d0669c251acbc24f905939ab884e
+  metadata.gz: fa462f47d3f0b4b09d3a759a9c64b3b3e358d4398e2e7f6667cd929dd8d0f7b5b825ea7428a8c8d6c0d26c068399e9745fc8d3137619ebc30810f8a2dc338958
+  data.tar.gz: 7fd7387e232a4b5be306f4e1c9d5b5836ab257e78b9ed45cc3092ce4e85201a91323c9cffda041f356951f59aa02bcda3c7ff36ce8834e970b9f02d00098f0ac

data/lib/tallty_import_export/export.rb

@@ -29,6 +29,7 @@ module TalltyImportExport
     # json: model_payload，代表存储在某一个列中
     # select: [{ label: '已报备', value: 'submitted'}, ...]，需要转换的枚举类型
     # source: true，如果source为true，代表从association_record 进行属性查询
+    # proc: proc或者lamda，支持call，传入 record 和 context
 
     def export_xlsx records, **options
       records = with_scope records
@@ -174,6 +175,8 @@ module TalltyImportExport
           try_chain(record, header[:chain])
         elsif header[:json]
           record.send(header[:json])[header[:key]]
+        elsif header[:proc] && header[:proc].respond_to?(:call)
+          header[:proc].call(record)
         else
           try_method(record, header[:key])
         end

data/lib/tallty_import_export/import.rb

@@ -16,6 +16,8 @@ module TalltyImportExport
     # primary_key: 是否是主键
     # 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
@@ -54,7 +56,9 @@ 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
 
       @excel_hash = @headers.reduce({}) do |h, header|
         h[header[:key].to_sym] = header[:name]
@@ -67,6 +71,7 @@ module TalltyImportExport
     def process_line_info line_info, associations
       # 去除空行内容
       return unless line_info.values.any?(&:present?)
+      context.line_info = line_info
       # 转换处理导入的数据格式
       line_info = convert_data(line_info)
 
@@ -88,6 +93,8 @@ module TalltyImportExport
         if header[:json]
           h[header[:json]] ||= {}
           h[header[:json]][k] = val
+        elsif header[:proc] && header[:proc].respond_to?(:call)
+          h[k.to_sym] = header[:proc].call(val, context)
         elsif header[:finder]
           # $SAFE = 2
           h[k.to_sym] = eval header[:finder]
@@ -103,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.fetch(key)&.fetch(:proc).present?
+          header[:proc] = import_header_hash.fetch(key)&.fetch(:proc)
+        end
+        header
+      end
+    rescue
+      @headers
     end
 
     def import_options
@@ -147,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.28"
+  VERSION = "1.0.32"
 end

metadata

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