tallty_import_export 1.0.23 → 1.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f43fcc903c964ff3a19c273f812535777d8606ff24627f1e3e465431a8be327
-  data.tar.gz: a78bfa23bd82f2eb659218bff7b68c477a83bc6d6a9f9cab5e2a34a7f97009e9
+  metadata.gz: 7d689c40b8f11354501a465563d14f5ab1060137fb2221180db05c8a18fe2b0d
+  data.tar.gz: 9cbd15c9a1eae1a0e036dd4557fb5197e3f595067b035dd01119167becee6d3c
 SHA512:
-  metadata.gz: 868e1e722f37534dda11149447ec31215004d5150083edea5c577b2f73679983b1c202f10b4f87e81db22f835fb49a980ee56112db074421b8f1a1a289a31214
-  data.tar.gz: 18e14d3e9c139aef84df4b9b1d988f49a64114220ba6aee4b9e5028a0e042fd328247fd82bdc7c2125f338b55f05f1db817572f91035e9759354c14d490a64f6
+  metadata.gz: a11b8561c856588abf871fe6cac330e3a9412e468c6ff2d3480be75b8976b22a7037a655c51df7c884a367d9efa7c8b362c1c46ca3a1e5824f8777ccf0bb1204
+  data.tar.gz: d178c5d5ae84107a04862e7b5b929ba8546776b1400ed79bde6c518f656d6ac7c573bfaaad3d60b499ec18d1cf9df3a09962d0669c251acbc24f905939ab884e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tallty_import_export (1.0.22)
+    tallty_import_export (1.0.24)
       activesupport
       caxlsx
       redis
@@ -22,7 +22,7 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    caxlsx (3.1.0)
+    caxlsx (3.1.1)
       htmlentities (~> 4.3, >= 4.3.4)
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
@@ -32,7 +32,7 @@ GEM
     htmlentities (4.3.4)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    marcel (1.0.1)
+    marcel (1.0.2)
     mini_portile2 (2.6.1)
     minitest (5.14.4)
     nokogiri (1.12.4)
@@ -65,7 +65,7 @@ GEM
     rspec-support (3.10.0)
     ruby-ole (1.2.12.2)
     rubyzip (2.3.2)
-    spreadsheet (1.2.9)
+    spreadsheet (1.3.0)
       ruby-ole
     tallty_duck_record (1.1.3)
       activemodel (>= 5.0)

data/lib/tallty_import_export/export.rb

@@ -15,7 +15,7 @@ module TalltyImportExport
     #   { key: 'user_code', name: '考核人工号' },
     #   { key: 'user_department_name', name: '考核人部门' },
     #   { key: 'state', name: '考核状态', method: :state_zh },
-    #   { key: 'score', name: '考核分' },
+    #   { key: 'score', name: '考核分', source: true },
     # ]
     # export_headers_result / headers
     # key: 属性的英文名，可以支持user.name这样的方式
@@ -28,6 +28,7 @@ module TalltyImportExport
     # merge: true/false，默认false，某一列，如果上下行的内容相同，则直接合并单元格
     # json: model_payload，代表存储在某一个列中
     # select: [{ label: '已报备', value: 'submitted'}, ...]，需要转换的枚举类型
+    # source: true，如果source为true，代表从association_record 进行属性查询
 
     def export_xlsx records, **options
       records = with_scope records
@@ -65,7 +66,7 @@ module TalltyImportExport
       end
     end
 
-    def export_workbook workbook, records
+    def export_workbook workbook, association_records
       # excel导出样式
       alignment = { vertical: :center, horizontal: :center }
       border    = { color: '969696', style: :thin }
@@ -80,34 +81,44 @@ 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
-        records.send(each_method).with_index do |record, index|
+        index = 0
+        association_records.each do |association_record|
           row = []
-          headers.each_with_index do |header, col_index|
-            _data = handle_data(record, header, index)
-            if header[:merge].present? && last_row.present? && _data == last_row[col_index]
-              # 这里使用二维数组，每个数组里都是列内容相同的各行
-              merge_column_hash[col_index] ||= []
-              if merge_column_hash[col_index].last&.last == index + first_content_row_index - 1
-                # 说明内容和上面的是延续的，继续加入之前的数组
-                merge_column_hash[col_index].last << index + first_content_row_index
-              else
-                merge_column_hash[col_index] << [index + first_content_row_index - 1, index + first_content_row_index]
+          records = @each_method.present? ?
+            (try_method(association_record, @each_method) || [nil]) :
+            [association_record]
+
+          records.each do |record|
+            headers.each_with_index do |header, col_index|
+              index += 1
+              _data = header[:source] ?
+                handle_data(association_record, header, index) :
+                handle_data(record, header, index)
+
+              if header[:merge].present? && last_row.present? && _data == last_row[col_index]
+                # 这里使用二维数组，每个数组里都是列内容相同的各行
+                merge_column_hash[col_index] ||= []
+                if merge_column_hash[col_index].last&.last == index + first_content_row_index - 1
+                  # 说明内容和上面的是延续的，继续加入之前的数组
+                  merge_column_hash[col_index].last << index + first_content_row_index
+                else
+                  merge_column_hash[col_index] << [index + first_content_row_index - 1, index + first_content_row_index]
+                end
               end
+              row.push(_data)
             end
-            row.push(_data)
+            sheet.add_row row, style: title3, height: @row_height, types: headers.map{|header| header[:format]&.to_sym}
+            last_row = row
           end
-          sheet.add_row row, style: title3, height: @row_height, types: headers.map{|header| header[:format]&.to_sym}
-          last_row = row
         end
         # 需要根据column进行多行的内容合并
         if merge_column_hash.present?
@@ -123,15 +134,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

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
@@ -107,6 +107,10 @@ module TalltyImportExport
       @headers ||= import_headers&.with_indifferent_access
     end
 
+    def import_options
+      {}
+    end
+
     def import_headers **args
       @headers || klass.try(:headers) || klass.try(:model_headers) || (raise ArgumentError.new('missing import_headers'))
     end

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.0.23"
+  VERSION = "1.0.28"
 end

metadata

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