tallty_import_export 1.0.21 → 1.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9253a9c6be1b5829d258f8a3c7cf59729e84d1e8c8daeba7890fb050fe61708c
-  data.tar.gz: 7c3e2b5ba2c20149f47f0d19b26710d5e722ed946b483e4e78dcd1a9c1b00247
+  metadata.gz: bc0e8d3d68e999a6b3f67fa31dbec4ac510d948ddb391a38ef12e06cd8d2674c
+  data.tar.gz: 0c6751bba32cf9eeed209efa7aef3514cdd64d0c3db4518e717b46336b96e174
 SHA512:
-  metadata.gz: dbb47e4a94cd7b7c3fe059aa5f0fc3d0384b023360452e62ab37dc4c524a8f5258e3827e6bded58a8931f36ce569d079f02424578e48a1f9c9281a6dbc7ad001
-  data.tar.gz: 7101fb1b0ef57e7ea7983e949e7a4b88dc986fd382061da954609755b94efa3a4b26d4a23049ef146444c823ed81f52d8ded585460dc91b7ecfde858d0fcce36
+  metadata.gz: 79b629e699808fd77b57631abd8fa2cabdc43140d524f9287c0a9ea1c5d5dfdf8fe5013f9d4422d23b7487c88c2154e39f818f2f1d32171be83ab20fb5c3ba92
+  data.tar.gz: 3fcc361eebf3f0ec4cc1d9b10e0d6a5060c3fbb7c22a75841397cb172e24abd77d0d9e0cb2c6a02eec7be1702c6455aa3068a2d08eb184ae1d9f50e593c00574

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tallty_import_export (0.1.0)
+    tallty_import_export (1.0.24)
       activesupport
       caxlsx
       redis
@@ -14,33 +14,35 @@ PATH
 GEM
   remote: https://gems.ruby-china.com/
   specs:
-    activemodel (6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activesupport (6.0.3.4)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    caxlsx (3.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    caxlsx (3.1.1)
       htmlentities (~> 4.3, >= 4.3.4)
-      mimemagic (~> 0.3)
+      marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.3.0, < 3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
     htmlentities (4.3.4)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    mimemagic (0.3.5)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    marcel (1.0.2)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
+    nokogiri (1.12.4)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    racc (1.5.2)
     rake (12.3.3)
-    redis (4.2.5)
-    redis-objects (1.5.0)
-      redis (~> 4.0)
+    redis (4.4.0)
+    redis-objects (1.5.1)
+      redis (~> 4.2)
     roo (2.8.3)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
@@ -62,18 +64,17 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
     ruby-ole (1.2.12.2)
-    rubyzip (2.3.0)
-    spreadsheet (1.2.6)
-      ruby-ole (>= 1.0)
-    tallty_duck_record (1.0.2)
-      activemodel (~> 6.0.3)
-      activesupport (~> 6.0.3)
+    rubyzip (2.3.2)
+    spreadsheet (1.3.0)
+      ruby-ole
+    tallty_duck_record (1.1.3)
+      activemodel (>= 5.0)
+      activesupport (>= 5.0)
     tallty_form (1.0.0)
       tallty_duck_record
-    thread_safe (0.3.6)
-    tzinfo (1.2.8)
-      thread_safe (~> 0.1)
-    zeitwerk (2.4.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
     zip-zip (0.3)
       rubyzip (>= 1.0.0)
 
@@ -86,4 +87,4 @@ DEPENDENCIES
   tallty_import_export!
 
 BUNDLED WITH
-   2.1.4
+   2.2.15

data/lib/tallty_import_export/export.rb

@@ -27,6 +27,7 @@ module TalltyImportExport
     # index: 数组方式，需要嵌套拿到里面的
     # merge: true/false，默认false，某一列，如果上下行的内容相同，则直接合并单元格
     # json: model_payload，代表存储在某一个列中
+    # select: [{ label: '已报备', value: 'submitted'}, ...]，需要转换的枚举类型
 
     def export_xlsx records, **options
       records = with_scope records
@@ -79,16 +80,16 @@ module TalltyImportExport
         if respond_to?(:first_header)
           row_index = Axlsx.col_ref(headers.size - 1)
           sheet.merge_cells("A1:#{row_index}1")
-          sheet.add_row [first_header], style: title1, height: 40
+          sheet.add_row [first_header], style: title1, height: 30
         end
 
-        sheet.add_row headers.map{|header| header[:name]}, style: title2, height: 39
+        sheet.add_row headers.map{|header| header[:name]}, style: title2, height: 25
 
         last_row = nil
         merge_column_hash = {}
         first_content_row_index = respond_to?(:first_header) ? 2 : 1
 
-        each_method = records.is_a?(Array) ? :each : :each
+        each_method = @each_method || :each
         records.send(each_method).with_index do |record, index|
           row = []
           headers.each_with_index do |header, col_index|
@@ -122,15 +123,21 @@ module TalltyImportExport
       end
     end
 
+    # 地处整体配置信息
+    def export_options
+      {}
+    end
+
     def process_options options = {}
-      options = options.with_indifferent_access
+      options = export_options.merge(options).with_indifferent_access
 
-      @row_height ||= options.delete(:row_height) || 35
+      @row_height ||= options.delete(:row_height) || 25
       @width ||= (options.delete(:width) || 20).to_f
       @filename ||= options.delete(:filename)
       @group_by ||= options.delete(:group_by)
       @group_where = "#{@group_by}_eq" if @group_by.present?
       @headers ||= options.delete(:headers)
+      @each_method ||= options.delete(:each_method)
     end
 
     def with_scope records
@@ -138,7 +145,7 @@ module TalltyImportExport
     end
 
     def export_headers_result
-      @headers || export_headers
+      @headers ||= export_headers&.with_indifferent_access
     end
 
     def export_headers **args
@@ -159,13 +166,14 @@ module TalltyImportExport
         else
           try_method(record, header[:key])
         end
-        handle_format(data, header)
+      data = handle_format(data, header)
+      data = handle_select(data, header)
     rescue
       ''
     end
 
     def try_chain record, arr
-      arr.inject(record, :try)
+      arr.reduce(record) { |r, m| r.try(m) || r.try(:[], m) }
     end
 
     def try_method record, method
@@ -186,5 +194,14 @@ module TalltyImportExport
         data
       end
     end
+
+    def handle_select data, header
+      if header[:select].present?
+        select_option = header[:select].find { |option| option[:value].to_s == data.to_s }
+        select_option.present? ? select_option[:label] : data
+      else
+        data
+      end
+    end
   end
 end

data/lib/tallty_import_export/import.rb

@@ -51,7 +51,7 @@ module TalltyImportExport
     end
 
     def process_options options
-      options = options.with_indifferent_access
+      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
       @params = options
@@ -89,7 +89,7 @@ module TalltyImportExport
           h[header[:json]] ||= {}
           h[header[:json]][k] = val
         elsif header[:finder]
-          $SAFE = 2
+          # $SAFE = 2
           h[k.to_sym] = eval header[:finder]
         else
           h[k.to_sym] = val
@@ -104,7 +104,11 @@ module TalltyImportExport
     end
 
     def import_headers_result
-      @headers ||= import_headers
+      @headers ||= import_headers&.with_indifferent_access
+    end
+
+    def import_options
+      {}
     end
 
     def import_headers **args

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.0.21"
+  VERSION = "1.0.25"
 end

metadata

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