tallty_import_export 1.0.28 → 1.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d689c40b8f11354501a465563d14f5ab1060137fb2221180db05c8a18fe2b0d
-  data.tar.gz: 9cbd15c9a1eae1a0e036dd4557fb5197e3f595067b035dd01119167becee6d3c
+  metadata.gz: 0043f0699fb0631c48a0c1dcd018ccad9cdda7dfa376c0a702bf7857338e04a5
+  data.tar.gz: 7a8dd851866ea1bc55f87ac8ec443587e6776cfd3c52b8b76fcd9f982aeba513
 SHA512:
-  metadata.gz: a11b8561c856588abf871fe6cac330e3a9412e468c6ff2d3480be75b8976b22a7037a655c51df7c884a367d9efa7c8b362c1c46ca3a1e5824f8777ccf0bb1204
-  data.tar.gz: d178c5d5ae84107a04862e7b5b929ba8546776b1400ed79bde6c518f656d6ac7c573bfaaad3d60b499ec18d1cf9df3a09962d0669c251acbc24f905939ab884e
+  metadata.gz: 406e6ac1fcf1623b2c0de6bd6fb415e15012e2e8f56fd9bf8ec1a552b5b15e528048ea8d9f6f5bce0b16f491941b20dd91a9d246459f4c397f891cf175a95806
+  data.tar.gz: 6af4e08406d4092107d372f0e8eaa6e5305dff67b9e5db7620151f55fb3b2f7ab3661817187ef4b92fbc85b32d030cd96c33f3c153037683d97fbc2839e7e317

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,7 @@ module TalltyImportExport
     # primary_key: 是否是主键
     # json: model_payload，代表存储在某一个列中
     # finder: 执行代码，可以查找到相关的对象
+    # proc: proc或者lamda，支持call，传入 val 和 context
 
     # xlsx_file 为 file path or file object or TalltyImportExport::Excel.new
     def import_xlsx xlsx_file, associations, **options
@@ -55,6 +56,7 @@ module TalltyImportExport
       @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
+      context.params = @params
 
       @excel_hash = @headers.reduce({}) do |h, header|
         h[header[:key].to_sym] = header[:name]
@@ -67,6 +69,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 +91,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]

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.0.28"
+  VERSION = "1.0.29"
 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.29
 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