tallty_import_export 1.0.35 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25de46efb361ea554c4cef13898a6f14ac03e8b56cb5ca7fcbadb72ae40dcfcd
-  data.tar.gz: 0346d65fe26f1c9ee4357aa8b5850a86f9007c5b6da719b8b604a46ef6fe1fea
+  metadata.gz: 72c586f1a3e13625520d1ce6378e478ee8dc6cf0055a16528f63ead86c20794f
+  data.tar.gz: 857a44c2a36c69347a2baed91855d943a16581427bdd1b562dd02e54d4a7d97c
 SHA512:
-  metadata.gz: 82b4c135ba29f61e1c1dbd4640b9a8c29639d9ad699474d2a02a11c6db8462269cfe46d9679fc6721258ab2a1b6cbfdc3fb59353de149d21f4cb541b62f206f3
-  data.tar.gz: 54d41b0b50c542827f8350d531aff8dfb80e202b2605cc9dc3cf1d6b49f8764ef7f8b367bf52782a9401c482eb2bd9cf3c684768e73bda935c7c8a8adea5c0cb
+  metadata.gz: 9ae472d4119ebb57fe5066615d49001ba99a417a067d0586f25010338e7bba1d5fdda737cf8a7892483e68b079af065e21862e87225409f3a7f2e7e0683f8d5f
+  data.tar.gz: fd6af86be0af8b552d2d5170e86b807a301550e7b7f3e604fa0cef539fe6f4630083a4117a494071bc734f83fb29950425f6cdb147b82e130b978c0a2fc8af6f

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    tallty_import_export (1.0.24)
+    tallty_import_export (1.0.35)
       activesupport
+      attr_json
       caxlsx
       redis
       redis-objects
@@ -14,36 +15,40 @@ PATH
 GEM
   remote: https://gems.ruby-china.com/
   specs:
-    activemodel (6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activesupport (6.1.4.1)
+    activemodel (7.0.2.4)
+      activesupport (= 7.0.2.4)
+    activerecord (7.0.2.4)
+      activemodel (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
+    activesupport (7.0.2.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    caxlsx (3.1.1)
+    attr_json (1.4.0)
+      activerecord (>= 5.0.0, < 7.1)
+    caxlsx (3.2.0)
       htmlentities (~> 4.3, >= 4.3.4)
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.3.0, < 3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.4.4)
     htmlentities (4.3.4)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     marcel (1.0.2)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
-    nokogiri (1.12.4)
-      mini_portile2 (~> 2.6.1)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
+    nokogiri (1.13.4)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    racc (1.5.2)
+    racc (1.6.0)
     rake (12.3.3)
-    redis (4.4.0)
+    redis (4.6.0)
     redis-objects (1.5.1)
       redis (~> 4.2)
-    roo (2.8.3)
+    roo (2.9.0)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
     roo-xls (1.2.0)
@@ -74,7 +79,6 @@ GEM
       tallty_duck_record
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
     zip-zip (0.3)
       rubyzip (>= 1.0.0)
 

data/lib/tallty_import_export/attr/export_header.rb

@@ -0,0 +1,100 @@
+module TalltyImportExport
+  module Attr
+    class ExportHeaderItem
+      include AttrJson::Model
+      attr_json_config(bad_cast: :as_nil, unknown_key: :allow)
+
+      attr_json :key, :string
+      attr_json :name, :string
+      attr_json :attr_type, :string
+      attr_json :format, :string
+      attr_json :method, :string
+      attr_json :chain, :string, array: true
+      attr_json :merge, :boolean
+      attr_json :json, :string
+      attr_json :select, ActiveModel::Type::Value.new, array: true
+      attr_json :source, :boolean
+      attr_json :proc, ActiveModel::Type::Value.new, array: true
+      attr_json :children, self.to_type, array: true
+
+      attr_accessor :depth, :parent_path, :seq
+
+      def calcute_flatten_value _depth, _parent_path
+        @depth = _depth
+        @parent_path = _parent_path
+        if children && children.count > 0
+          children.map do |child|
+            child.calcute_flatten_value(_depth + 1, [*_parent_path, self])
+          end.compact.flatten
+        else
+          [self]
+        end
+      end
+
+      def cluster_seqs
+        calcute_flatten_value(0, []).map(&:seq)
+      end
+
+      def seq
+        @seq ||= SecureRandom.uuid
+      end
+
+      # def living_alone?
+      #   depth == 0 && children.present?
+      # end
+    end
+
+    class ExportHeader
+      include AttrJson::Model
+      attr_json_config(bad_cast: :as_nil, unknown_key: :allow)
+
+      attr_json :items, ExportHeaderItem.to_type, array: true
+
+      attr_reader :header_seq_to_axios
+
+      def flatten_value
+        items.map do |item|
+          item.calcute_flatten_value(0, [])
+        end.flatten
+      end
+
+      def height
+        flatten_value.map(&:depth).max + 1
+      end
+
+      def header_lines
+        result = []
+
+        height.times.each do |row_index|
+          col_index = 0
+
+          next_line = flatten_value.map do |header|
+            next_header = [*header.try(:parent_path), header]&.[](row_index)
+
+            @header_seq_to_axios ||= {}
+
+
+            if next_header
+              @header_seq_to_axios[next_header.seq] ||= []
+              @header_seq_to_axios[next_header.seq].push([col_index, row_index])
+            end
+
+            # 处理最后一列
+            if (row_index === height - 1)
+              @header_seq_to_axios[header.seq] ||= []
+              @header_seq_to_axios[header.seq].push([col_index, row_index])
+            end
+
+            col_index += 1
+
+            # 下一级继续递归 或 保持自己以合并
+            next_header || header
+          end
+
+          result.push(next_line)
+        end
+        result
+      end
+    end
+  end
+end

data/lib/tallty_import_export/attr.rb

@@ -0,0 +1 @@
+require 'tallty_import_export/attr/export_header'

data/lib/tallty_import_export/export.rb

@@ -1,9 +1,10 @@
 module TalltyImportExport
   class Export
-    attr_reader :klass
+    attr_reader :klass, :context
 
     def initialize klass
       @klass = klass
+      @context = Context.new({})
     end
 
     # [
@@ -16,6 +17,7 @@ module TalltyImportExport
     #   { key: 'user_department_name', name: '考核人部门' },
     #   { key: 'state', name: '考核状态', method: :state_zh },
     #   { key: 'score', name: '考核分', source: true },
+    #   { key: 'model_key', name: '关键字', list: [ { key: 'model_key', name: '新属性' } ]},
     # ]
     # export_headers_result / headers
     # key: 属性的英文名，可以支持user.name这样的方式
@@ -30,6 +32,7 @@ module TalltyImportExport
     # select: [{ label: '已报备', value: 'submitted'}, ...]，需要转换的枚举类型
     # source: true，如果source为true，代表从association_record 进行属性查询
     # proc: proc或者lamda，支持call，传入 record 和 context
+    # list: 对于list布局的，进行嵌套，生成子表格
 
     def export_xlsx records, **options
       records = with_scope records
@@ -38,6 +41,7 @@ module TalltyImportExport
       options = options.with_indifferent_access
 
       Axlsx::Package.new do |pack|
+        pack.use_shared_strings = true
         workbook = pack.workbook
 
         if @group_by.present?
@@ -45,20 +49,21 @@ module TalltyImportExport
             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
+              export_workbook workbook, group_records, **options
             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
+              export_workbook workbook, records.ransack("#{@group_where}" => key).result, **options
             end
           end
         else
-          export_workbook workbook, records
+          export_workbook workbook, records, **options
         end
 
         file_path = File.join(Rails.root, 'public', 'export')
+        # file_path = File.join('/Users/mushu/', 'export')
         FileUtils.mkdir_p(file_path) unless Dir.exist?(file_path)
         file_name = "#{Time.now.strftime('%Y%m%d%H%M%S')}#{@filename}.xlsx"
         file_path_with_name = File.join(file_path, file_name)
@@ -67,14 +72,14 @@ module TalltyImportExport
       end
     end
 
-    def export_workbook workbook, association_records
+    def export_workbook workbook, association_records, **options
       # excel导出样式
       alignment = { vertical: :center, horizontal: :center }
       border    = { color: '969696', style: :thin }
       title1 = workbook.styles.add_style(alignment: alignment, border: border, sz: 12, b: true)
       title2 = workbook.styles.add_style(alignment: alignment, border: border, bg_color: "2a5caa",  sz: 12, fg_color: "fffffb")
       title3 = workbook.styles.add_style(alignment: alignment.merge(wrap_text: true), border: border, sz: 10)
-      headers = export_headers_result
+      headers = export_headers_result **options
 
       _sheet_name = respond_to?(:sheet_name) ? self.sheet_name : nil
 
@@ -93,14 +98,15 @@ module TalltyImportExport
 
         index = 0
         association_records.each do |association_record|
-          row = []
           records = @each_method.present? ?
             (try_method(association_record, @each_method) || [nil]) :
             [association_record]
 
           records.each do |record|
+            row = []
+            formats = []
+            index += 1
             headers.each_with_index do |header, col_index|
-              index += 1
               _data = header[:source] ?
                 handle_data(association_record, header, index) :
                 handle_data(record, header, index)
@@ -116,8 +122,9 @@ module TalltyImportExport
                 end
               end
               row.push(_data)
+              formats.push(header[:format]&.to_sym || (_data.is_a?(String) ? :string : nil))
             end
-            sheet.add_row row, style: title3, height: @row_height, types: headers.map{|header| header[:format]&.to_sym}
+            sheet.add_row row, style: title3, height: @row_height, types: formats
             last_row = row
           end
         end
@@ -141,7 +148,7 @@ module TalltyImportExport
     end
 
     def process_options options = {}
-      options = export_options.merge(options.compact_blank!).with_indifferent_access
+      options = export_options.merge(options).with_indifferent_access
 
       @row_height ||= options.delete(:row_height) || 25
       @width ||= (options.delete(:width) || 20).to_f
@@ -150,14 +157,26 @@ module TalltyImportExport
       @group_where = "#{@group_by}_eq" if @group_by.present?
       @headers ||= options.delete(:headers)
       @each_method ||= options.delete(:each_method)
+      @params = options
+      context.params = @params
     end
 
     def with_scope records
       records
     end
 
-    def export_headers_result
-      @headers ||= export_headers
+    def export_headers_result **options
+      if @headers.present? && @group_key.blank?
+        headers_hash = @headers.to_h { |header| [header.with_indifferent_access[:key], header] }.with_indifferent_access
+        export_headers(**options.symbolize_keys).select do |_header|
+          _header.with_indifferent_access[:key].to_s.in?(headers_hash.keys)
+        end.map do |_header|
+          _header = _header.with_indifferent_access
+          _header.merge(headers_hash[_header[:key]].delete_if { |k, v| v.blank? })
+        end
+      else
+        @headers = export_headers(**options.symbolize_keys)
+      end
     end
 
     def export_headers **args
@@ -165,38 +184,44 @@ module TalltyImportExport
     end
 
     # 处理一个记录的数据
-    def handle_data record, header, index=0
+    def handle_data record, header, index=0, **opts
       data =
         if header[:key] == '_index'
-          index + 1
+          index
         elsif header[:method].present?
           send(header[:method], record, header)
         elsif header[:chain].present?
           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)
+          header[:proc].call(record, context)
         else
-          try_method(record, header[:key])
+          try_method(record, header[:key], prefix: [header[:prefix], header[:json]].compact.join('.'))
         end
-      data = handle_format(data, header)
-      data = handle_select(data, header)
+      data = handle_format(data, header, **opts)
+      data = handle_data_type(data, **opts)
+      data = handle_select(data, header, **opts)
     rescue
       ''
     end
 
     def try_chain record, arr
-      arr.reduce(record) { |r, m| r.try(m) || r.try(:[], m) }
+      arr.reduce(record) do |r, m|
+        if r.is_a?(Array)
+          r.try(m) || r.try(:[], m.to_i)
+        else
+          r.try(:[], m) || r.try(:[], m.to_sym) || r.try(m)
+        end
+      end
     end
 
-    def try_method record, method
+    def try_method record, method, prefix: nil
+      prefix_arr = prefix.to_s.split(/\./)
       arr = method.to_s.split(/\./)
-      try_chain record, arr
+      try_chain record, prefix_arr + arr
     end
 
     # 根据数据类型 attr_type 进行数据的格式化
-    def handle_format data, header
+    def handle_format data, header, **opts
       case header[:attr_type].to_s
       when 'string'
         data.to_s
@@ -209,7 +234,30 @@ module TalltyImportExport
       end
     end
 
-    def handle_select data, header
+    def handle_data_type data, **opts
+      if data.is_a?(Time)
+        data.in_time_zone.strftime('%F %H:%M')
+      elsif data.is_a?(Date)
+        data.in_time_zone.strftime('%F')
+      elsif data.is_a?(TrueClass)
+        '是'
+      elsif data.is_a?(FalseClass)
+        '否'
+      elsif data.is_a?(Array) && !opts[:keep_array]
+        if data.first.is_a?(Hash) && data.first&.dig('url').present?
+          # 文件array
+          data.map do |item|
+            item.dig('url')
+          end.compact.join("\n")
+        else
+          data.map(&:to_s).compact.join("\n")
+        end
+      else
+        data
+      end
+    end
+
+    def handle_select data, header, **opts
       if header[:select].present?
         select_option = header[:select].find { |option| option[:value].to_s == data.to_s }
         select_option.present? ? select_option[:label] : data

data/lib/tallty_import_export/export_form.rb

@@ -0,0 +1,134 @@
+module TalltyImportExport
+  class ExportForm < TalltyImportExport::Export
+    def initialize *attrs
+      super(*attrs)
+    end
+
+    class << self
+      def export_template_xlsx form
+        export_xlsx([], {
+          headers: form_transfer_to_headers(form),
+          header_only: true
+        })
+      end
+    end
+
+    def export_workbook workbook, association_records, **options
+      # excel导出样式
+      alignment = { vertical: :center, horizontal: :center }
+      border    = { color: '969696', style: :thin }
+      title1 = workbook.styles.add_style(alignment: alignment, border: border, sz: 12, b: true)
+      title2 = workbook.styles.add_style(alignment: alignment, border: border, bg_color: "2a5caa",  sz: 12, fg_color: "fffffb")
+      title3 = workbook.styles.add_style(alignment: alignment.merge(wrap_text: true), border: border, sz: 10)
+      _sheet_name = (respond_to?(:sheet_name) ? self.sheet_name : nil) || options[:sheet_name]
+
+      header_obj = export_headers_result **options
+
+      workbook.add_worksheet(name: _sheet_name) do |sheet|
+        index = 0
+
+        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: 30
+          index += 1
+        end
+
+        header_obj.header_lines.each do |header_line|
+          sheet.add_row(header_line.map(&:name), style: title2, height: 25)
+          index += 1
+        end
+
+        # 合并相同 header
+        header_obj.header_seq_to_axios.values.each do |axios_ary|
+          if axios_ary.count > 1
+            top_right = [axios_ary.map(&:first).min, axios_ary.map(&:last).min]
+            bottom_left = [axios_ary.map(&:first).max, axios_ary.map(&:last).max]
+            sheet.merge_cells(
+              Axlsx::cell_r(top_right.first, top_right.last) + ':' + Axlsx::cell_r(bottom_left.first, bottom_left.last)
+            )
+          end
+        end
+
+        return if options[:header_only]
+
+        value_seq_to_axios = {}
+
+        formats = []
+        association_records.each do |association_record|
+          records = @each_method.present? ?
+            (try_method(association_record, @each_method) || [nil]) :
+            [association_record]
+
+          records.each do |record|
+            value_living_alone_col_index_to_value_count = {}
+
+            payload = TalltyImportExport::ExportPayload.new(record, header: header_obj) do |payload, header, **opts|
+              _data = header[:source] ?
+                handle_data(association_record, header, index, **opts) :
+                handle_data(payload, header, index, **opts)
+            end
+
+
+            # p '----------------------------------------------------------------'
+            # payload.lines.each { |x| p x.map { |x| x.try(:value) || '________' } }
+
+            payload.lines.each_with_index do |line, row_index|
+              row = []
+              line.each_with_index do |value, col_index|
+                value_living_alone_col_index_to_value_count[col_index] ||= 0
+
+                if (TalltyImportExport::ExportPayload::Value === value)
+                  row << value.value
+                  value_living_alone_col_index_to_value_count[col_index] += 1
+                  unless value_seq_to_axios[value.seq]
+                    value_seq_to_axios[value.seq] = []
+                  end
+                  value_seq_to_axios[value.seq] << [col_index , row_index + index]
+                else
+                  row << nil
+                end
+                formats.push(
+                  header_obj.flatten_value[col_index].format&.to_sym || (row.last.is_a?(String) ? :string : nil)
+                )
+              end
+              sheet.add_row(row, style: title3, height: @row_height, types: formats)
+              formats = []
+
+            end
+
+            # 合并仅有一个值的一列中所有格子
+            value_living_alone_col_index_to_value_count.each_pair do |col_index, count|
+              if count == 1
+                sheet.merge_cells(
+                  Axlsx::cell_r(col_index, index) + ':' + Axlsx::cell_r(col_index, index + payload.max_matrix_height - 1)
+                )
+              end
+            end
+
+            index += payload.max_matrix_height
+          end
+        end
+
+        # 合并相同值
+        value_seq_to_axios.values.each do |axios_ary|
+          if axios_ary.count > 1
+            top_right = [axios_ary.map(&:first).min, axios_ary.map(&:last).min]
+            bottom_left = [axios_ary.map(&:first).max, axios_ary.map(&:last).max]
+            sheet.merge_cells(
+              Axlsx::cell_r(top_right.first, top_right.last) + ':' + Axlsx::cell_r(bottom_left.first, bottom_left.last)
+            )
+          end
+        end
+      end
+    end
+
+
+    def export_headers_result **options
+      @headers = options.symbolize_keys[:headers]
+      super(**options)
+      @headers = TalltyImportExport::Attr::ExportHeader.new({ items: @headers })
+    end
+
+  end
+end

data/lib/tallty_import_export/export_payload/cell.rb

@@ -0,0 +1,101 @@
+class TalltyImportExport::ExportPayload::Cell
+  attr_accessor :cell_cluster, :value, :header, :parent_path
+
+  # cell_cluster 是表格纵向 集合
+  def initialize header, value, context, parent_path=[], &value_handler
+    @value = value
+    @header = header
+    @value_handler = value_handler
+
+    # context
+    @context = context
+
+    value.seq_chain.each do |s|
+    # s = seq
+      @context[:header_seq_to_value_seq_to_value][header.seq] ||= {}
+      @context[:header_seq_to_value_seq_to_value][header.seq][s] = value # NOTE: value 对象
+    end
+
+    # parent
+    @parent_path = parent_path
+
+    @context[:parent_cell_seq_to_children_cell_value_array][parent_cell_seq] ||= []
+    @context[:parent_cell_seq_to_children_cell_value_array][parent_cell_seq].push(@value)
+
+    @cell_cluster = []
+  end
+
+  def seq
+    @seq ||= SecureRandom.uuid
+  end
+
+  def parent_cell_seq
+    @parent_path.last&.seq
+  end
+
+  def depth
+    @parent_path.count
+  end
+
+  def header_chain_seqs
+    [*@parent_path, self].map { |cell| cell.header.cluster_seqs }.reduce(:concat)
+  end
+
+  def divise
+    if @header.children.present? && @value.value
+      new_cells = @header.children.map do |child_header|
+        val = @value_handler.call(@value.value, child_header.as_json.symbolize_keys, keep_array: true)
+        if (child_header.children.present? && val.is_a?(Array))
+          val.map do |val|
+            cell = TalltyImportExport::ExportPayload::Cell.new(
+              child_header,
+              TalltyImportExport::ExportPayload::Value.new(val, @value.chain, inherited: true),
+              @context,
+              [*self.parent_path, self],
+              &@value_handler
+            )
+            cell
+          end
+        else
+          val = @value_handler.call(@value.value, child_header.as_json.symbolize_keys)
+          TalltyImportExport::ExportPayload::Cell.new(
+            child_header,
+            TalltyImportExport::ExportPayload::Value.new(val, @value.chain),
+            @context,
+            [*self.parent_path, self],
+            &@value_handler
+          )
+        end
+      end.flatten
+      new_cells.each(&:divise)
+      @cell_cluster.concat(new_cells.map(&:cell_cluster))
+    else
+      @cell_cluster = [self]
+    end
+
+    self
+  end
+
+  def grow_to_line
+    @context[:flatten_headers].
+      select do |header|
+        header_chain_seqs.include?(header.seq)
+      end.
+      map do |header|
+        target_value = nil
+
+        # 兄弟细胞上先查找，以解决同级兄弟细胞父一样，而导致的值覆盖
+        brother_cell_value_seqs = (@context[:parent_cell_seq_to_children_cell_value_array][parent_cell_seq] || []).map(&:seq)
+
+        [*brother_cell_value_seqs, *@value.seq_chain.uniq.reverse].each do |seq|
+          next if target_value
+          # seq = @value.seq
+          if @context[:header_seq_to_value_seq_to_value][header.seq]&.[](seq)
+            target_value = @context[:header_seq_to_value_seq_to_value][header.seq][seq]
+          end
+      end
+
+      target_value
+    end
+  end
+end

data/lib/tallty_import_export/export_payload/cell_column.rb

@@ -0,0 +1,54 @@
+# 一个 最大的竖列，分子列前的竖列
+class TalltyImportExport::ExportPayload::CellColumn
+  attr_reader :header, :payload, :context, :cell_clusters, :flatten_cells, :tallest_cell_cluster
+
+  def initialize header, value, context, &value_handler
+    @header = header
+    @value = value
+    @context = context
+    @cell_clusters = []
+    @value_handler = value_handler
+
+    val = @value_handler.call(@value.value, @header.as_json.symbolize_keys, keep_array: true)
+    if header.children && val.is_a?(Array)
+      @cell_clusters = val.map do |val|
+        TalltyImportExport::ExportPayload::Cell.new(
+          @header,
+          TalltyImportExport::ExportPayload::Value.new(val, @value.chain),
+          @context,
+          &@value_handler
+        )
+      end
+    else
+      @cell_clusters = [
+        TalltyImportExport::ExportPayload::Cell.new(
+          @header,
+          TalltyImportExport::ExportPayload::Value.new(
+            @value_handler.call(@value.value, @header.as_json.symbolize_keys),
+            @value.chain,
+          ),
+          @context,
+          &@value_handler
+        )
+      ]
+    end
+
+    @flatten_cells = []
+
+    cell_divise
+  end
+
+  def cell_divise
+    divised_cell_clusters = @cell_clusters.map do |cell_cluster|
+      cell_cluster.divise.cell_cluster
+    end
+
+    @flatten_cells = divised_cell_clusters.flatten
+
+    depth_to_cells_mapping = @flatten_cells.group_by { |cell| [cell.header.seq] }
+
+    @tallest_cell_cluster = depth_to_cells_mapping.values.max { |a, b| a.count <=> b.count } || []
+
+    self
+  end
+end

data/lib/tallty_import_export/export_payload/value.rb

@@ -0,0 +1,15 @@
+class TalltyImportExport::ExportPayload::Value
+  attr_reader :value, :chain, :seq_chain
+
+  def initialize(val, chain=[], inherited: false)
+    @value = val
+    @parent_chain = chain
+
+    @chain = inherited ? @parent_chain : [*@parent_chain, self]
+    @seq_chain = @chain.map(&:seq)
+  end
+
+  def seq
+    @seq ||= SecureRandom.uuid
+  end
+end

data/lib/tallty_import_export/export_payload.rb

@@ -0,0 +1,62 @@
+require 'matrix'
+
+class TalltyImportExport::ExportPayload
+  extend ActiveSupport::Autoload
+
+  autoload :Value
+  autoload :CellColumn
+  autoload :Cell
+
+  attr_reader :value, :context, :cell_columns, :max_matrix_height
+
+  def initialize(val, header:, &value_handler)
+    @value = TalltyImportExport::ExportPayload::Value.new(val)
+    @headers = header.items # TalltyImportExport::Attr::ExportHeaderItem array
+    @flatten_headers = header.flatten_value
+    @value_handler = value_handler
+    @context = {
+      header_seq_to_value_seq_to_value: {},
+      parent_cell_seq_to_children_cell_value_array: {},
+      flatten_headers: @flatten_headers,
+    }
+  end
+
+  def lines
+    @cell_columns = @headers.map do |header|
+      TalltyImportExport::ExportPayload::CellColumn.new(
+        header,
+        self.value,
+        @context,
+        &@value_handler
+      )
+    end
+
+    # 分离的，每个初始 header 为一个矩阵
+    matrixes = @cell_columns.map do |cell_column|
+      cell_column.tallest_cell_cluster.map(&:grow_to_line)
+    end
+
+    # 计算所有矩阵中最高高度，用于填充
+    @max_matrix_height = matrixes.map(&:count).max
+
+    # 填充各个矩阵至等高
+    detached_matrixes = matrixes.map do |ragged_col|
+      col = ragged_col.uniq
+      while col.count < @max_matrix_height
+        col.push((col[0].try(:count) || 1).times.to_a)
+      end
+      Matrix[*col]
+    end
+
+    # 合并矩阵
+    result = detached_matrixes.reduce do |out, matrix|
+      Matrix.hstack(out, matrix)
+    end.to_a
+    # .select do |line|
+    #   line.select { |value| TalltyImportExport::ExportPayload::Value === value }.count > 0
+    # end
+
+    # result.map { |x| p x.map { |xx| xx.try(:value)}}
+    result
+  end
+end

data/lib/tallty_import_export/exportable_form.rb

@@ -0,0 +1,21 @@
+module TalltyImportExport
+  module ExportableForm
+    extend ActiveSupport::Concern
+    include Common
+
+    included do |base|
+      # base.include(Common)
+      base.const_set('Export', Class.new(TalltyImportExport::ExportForm))
+    end
+
+    module ClassMethods
+      def export_instance
+        const_get('Export').new(self)
+      end
+
+      def export_xlsx records, **options
+        export_instance.export_xlsx(records, **options)
+      end
+    end
+  end
+end

data/lib/tallty_import_export/import.rb

@@ -21,13 +21,35 @@ module TalltyImportExport
 
     # xlsx_file 为 file path or file object or TalltyImportExport::Excel.new
     def import_xlsx xlsx_file, associations, **options
+      process_xlsx_line_info(xlsx_file, associations, **options) do |line_info, associations|
+        process_line_info(line_info, associations)
+      end
+    end
+
+    def exchange_to_ids xlsx_file, associations, **options
+      errors = []
+      ids = []
+      process_xlsx_line_info(xlsx_file, associations, **options) do |line_info, associations|
+        ids << exchange_line_info_to_id(line_info, associations, errors)
+      end
+
+      if errors.any?
+        error_msg = errors.map do |line_info|
+          "【#{@primary_keys.map { |key| line_info[key] }.join(' - ')}】"
+        end.join(' ')
+        raise RecordNotFountError.new("以下内容未找到: #{error_msg}")
+      end
+      return ids.compact.uniq
+    end
+
+    def process_xlsx_line_info xlsx_file, associations, **options
       @associations = associations
       # 先处理获取出来Excel每行的数据, line_info
       process_options(options)
 
       if TalltyImportExport::Excel === xlsx_file
         xlsx_file.rows.each_with_excel_hash(@excel_hash) do |line_info|
-          process_line_info(line_info.with_indifferent_access, associations)
+          yield line_info.with_indifferent_access, associations
         end
       else
         file_path = xlsx_file.is_a?(String) ? xlsx_file : xlsx_file.path
@@ -35,7 +57,7 @@ module TalltyImportExport
         xlsx.each_with_pagename do |_sheetname, sheet|
           sheet.each(**@excel_hash).with_index do |line_info, index|
             next if index == 0
-            process_line_info(line_info.with_indifferent_access, associations)
+            yield line_info.with_indifferent_access, associations
           end
         end
       end
@@ -53,7 +75,7 @@ module TalltyImportExport
     end
 
     def process_options options
-      options = import_options.merge(options.compact_blank!).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
       @skip_keys = options.delete(:skip_keys) || @headers.map { |header| header[:skip] ? header[:key].to_sym : nil }.compact
@@ -83,13 +105,13 @@ module TalltyImportExport
     end
 
     def convert_data line_info
-      line_info.with_indifferent_access.reduce({}) do |h, (k, v)|
-        header = import_headers_result.find do |_header|
-          _header[:key].to_sym == k.to_sym
-        end
+      info = line_info.with_indifferent_access
+      import_headers_result.reduce({}) do |h, header|
+        k = header[:key]
+        v = info[k]
         # header[:convert] = handle_xxx
         # handle_xxx(val, processing_line_info, raw_line_info)
-        val = header[:convert] ? send(header[:convert], v, h, line_info) : v
+        val = header[:convert] ? send(header[:convert], v, h, info) : v
         if header[:json]
           h[header[:json]] ||= {}
           h[header[:json]][k] = val
@@ -114,16 +136,15 @@ module TalltyImportExport
     # 需要合并proc，前端没有办法把proc传过来
     def import_headers_result
       if @headers.present?
-        import_header_hash = import_headers.to_h { |header| [header.with_indifferent_access[:key], header] }.with_indifferent_access
-        @headers.map do |header|
-          key = header[:key]
-          if import_header_hash.dig(key, :proc).present?
-            header[:proc] = import_header_hash.dig(key, :proc)
-          end
-          header
+        headers_hash = @headers.to_h { |header| [header.with_indifferent_access[:key], header] }.with_indifferent_access
+        import_headers(**context.params.symbolize_keys).select do |_header|
+          _header.with_indifferent_access[:key].to_s.in?(headers_hash.keys)
+        end.map do |_header|
+          _header = _header.with_indifferent_access
+          _header.merge(headers_hash[_header[:key]].delete_if { |k, v| v.blank? })
         end
       else
-        @headers = import_headers
+        @headers = import_headers(**options.symbolize_keys)
       end
     rescue
       @headers
@@ -174,5 +195,27 @@ module TalltyImportExport
         associations.create!(line_info.clone.except!(*@skip_keys))
       end
     end
+
+    def exchange_line_info_to_id line_info, associations, errors
+      # 去除空行内容
+      return unless line_info.values.any?(&:present?)
+      context.line_info = line_info
+
+      return unless primary_keys.present?
+      ids = associations.where(line_info.clone.extract!(*primary_keys)).pluck(:id)
+
+      context.last_line_info = line_info
+
+      errors << line_info unless ids[0]
+      return ids[0]
+    end
+
+    class RecordNotFountError < StandardError
+      attr_accessor :message
+      def initialize message
+        @message = message
+        super()
+      end
+    end
   end
 end

data/lib/tallty_import_export/importable.rb

@@ -24,6 +24,10 @@ module TalltyImportExport
       def import_excel_klass
         import_instance.tallty_excel
       end
+
+      def exchange_to_ids xlsx_file, associations, **options
+        import_instance.exchange_to_ids(xlsx_file, associations, **options)
+      end
     end
   end
 end

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.0.35"
+  VERSION = "1.1.0"
 end

data/lib/tallty_import_export.rb

@@ -1,20 +1,27 @@
+require 'active_support'
 require "active_support/core_ext/hash"
+require "active_support/core_ext/object"
 require "tallty_import_export/version"
 require 'axlsx'
 require 'redis'
-require 'tallty_form'
+# require 'tallty_form'
+require 'attr_json'
 
 module TalltyImportExport
   extend ActiveSupport::Autoload
 
   autoload :Common
   autoload :Exportable
+  autoload :ExportableForm
   autoload :Export
   autoload :Importable
   autoload :Import
   autoload :Context
   autoload :FormConvert
   autoload :Excel
+  autoload :Attr
+  autoload :ExportPayload
+  autoload :ExportForm
 
   class Error < StandardError; end
 

data/tallty_import_export.gemspec

@@ -14,8 +14,7 @@ Gem::Specification.new do |spec|
 
   spec.platform    = Gem::Platform::RUBY
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  # Specify which files should be added to the gem when it is released. The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
@@ -31,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency('activesupport')
   spec.add_dependency('redis')
   spec.add_dependency('redis-objects')
+  spec.add_dependency 'attr_json'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tallty_import_export
 version: !ruby/object:Gem::Version
-  version: 1.0.35
+  version: 1.1.0
 platform: ruby
 authors:
 - liyijie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip-zip
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: attr_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: " import & export for active_record with simple_controller "
 email:
 - liyijie825@gmail.com
@@ -140,11 +154,19 @@ files:
 - bin/console
 - bin/setup
 - lib/tallty_import_export.rb
+- lib/tallty_import_export/attr.rb
+- lib/tallty_import_export/attr/export_header.rb
 - lib/tallty_import_export/common.rb
 - lib/tallty_import_export/context.rb
 - lib/tallty_import_export/excel.rb
 - lib/tallty_import_export/export.rb
+- lib/tallty_import_export/export_form.rb
+- lib/tallty_import_export/export_payload.rb
+- lib/tallty_import_export/export_payload/cell.rb
+- lib/tallty_import_export/export_payload/cell_column.rb
+- lib/tallty_import_export/export_payload/value.rb
 - lib/tallty_import_export/exportable.rb
+- lib/tallty_import_export/exportable_form.rb
 - lib/tallty_import_export/form_convert.rb
 - lib/tallty_import_export/import.rb
 - lib/tallty_import_export/importable.rb