tallty_import_export 1.0.14 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afdaeaa5f7a0eab21b85fdd7aafa0677afba151a2564fd0fdd1a9916132af0f2
-  data.tar.gz: ae51318bbda8fe1c37533ad29c34a64c9c5d52e2a3b9e7bcb491c8cee1039cd2
+  metadata.gz: 47d4e395eb95191fc74c60002ce97284ba86d11b0d7708be87e59f13296ac983
+  data.tar.gz: 78935b1942529ec78a9ed6b7430d4fa79fe8307f1ecb4f77cffb295c95a5a1cb
 SHA512:
-  metadata.gz: b6966aa85b471dd960fa05ae537c4f1b6938efe30635d0261ec5763e66bd83cf8de5252831ddb46fdb248eeac3c622df52594f88738e8312a958b2bf734891d3
-  data.tar.gz: 252f71c459a9b1034a32b75421474671df4568145c0f33f19cbdb6f83fb42ee7f210e9dcff83a7ee65fdea42db11b52d03a3df8f287e3ede74bb25f231ee56be
+  metadata.gz: 5a59cfce4a219cf9c8022d7b9d6dcc527e1d8fd72a47b8a6536afdc79e792ddfe6e2161bcfdd480d388adf54345447b3ab70e2e8f6db217c2f6e8ddaaedb010e
+  data.tar.gz: 55b49d0a89e8194d1c5029fc2398b9851b079e215acef761a7e37f8c158dc2282740c5025bb43f5abacacbfec7872b0980e53510cd23d479e5967baffd313279

data/lib/tallty_import_export/export.rb

@@ -40,11 +40,13 @@ module TalltyImportExport
         if @group_by.present?
           if records.is_a?(Array)
             records.group_by { |record| record.send(@group_by)}.each do |key, group_records|
+              next unless key.present?
               @group_key = key
               export_workbook workbook, group_records
             end
           else
             records.group(@group_by).count.keys.each do |key|
+              next unless key.present?
               @group_key = key
               export_workbook workbook, records.ransack("#{@group_where}" => key).result
             end

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)
 
@@ -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

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.0.14"
+  VERSION = "1.0.19"
 end

metadata

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