tallty_import_export 1.0.13 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44d0cfc1f2d9fda3dae9e82861cdb8e4cad7f7535deedc488b49e487a926b67b
-  data.tar.gz: 31514974c3010af2809271f3f0aca99cb5e53e4bd1f00d116601ed9c70cd5711
+  metadata.gz: 56c0a62d935867d8420680ac232d8c156c8c653b805534ede5880bc615514706
+  data.tar.gz: 4efe0c40688bed288036ae32f51fe6ac7d3e28a9faddb7aa0dc05f8f901cc0c0
 SHA512:
-  metadata.gz: 0633e13811f7c3e119f8e68e4e0defc0e77e407fc5a4049b97bc17558a4b27713d892ddb117c2105dce96cc5d21f1bf92840d6ee1191a0469385888346ae0143
-  data.tar.gz: f34f948a034d20a48d7c921ef3da36809fefc5fda0b6fab0b7997619f0cb0a2eadb597f776a13b1c50cdc28a00768b8da057fdf9f8003d7dc98269d9595a4245
+  metadata.gz: b4f9e59896340ed7d75128c165d40ca8ddc4d0d584953d3953433f90bfbfe3d8cfe355cd7b4ee3182c19217a238f98c8d10b2100483b949ebc5aad1a73d31868
+  data.tar.gz: 0f36b4f04a2bc8759b4e835cd4dcd0e051933735322a0fefb18b5a06f438a0954d269fb9c7d3e30f436b603e94c54cfedb26e4dfcf1039d92c734874c2da838e

data/lib/tallty_import_export/export.rb

@@ -38,14 +38,15 @@ module TalltyImportExport
         workbook = pack.workbook
 
         if @group_by.present?
-          @header = nil # 因为group_by的，基本上都是export_header动态变化的，因此去掉选择
           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,11 @@ module TalltyImportExport
         if header[:json]
           h[header[:json]] ||= {}
           h[header[:json]][k] = val
+        elsif header[:finder]
+          $SAFE = 2
+          eval_string = header[:finder] + '(val)'
+          eval_val = eval eval_string
+          h[k.to_sym] = eval_val
         else
           h[k.to_sym] = val
         end

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.0.13"
+  VERSION = "1.0.18"
 end

metadata

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