tallty_import_export 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c79d5ce9feb1942a7a972b5b781d77a8227bd6cde6d572c9b9c35cc49fa7fca
-  data.tar.gz: 18b10723fc3ff9d1b3e2085cfcff144dae8a91b5658a8b7e8ab7d4d38d900b69
+  metadata.gz: 284928193ebed0e079f44ba98ee7a2f0d51c05f0c1ea5100dd68973940f56369
+  data.tar.gz: 75dbf1351c7a08ce445b508ea60aba31da811fcfc87e9355c5f8c710f66be47a
 SHA512:
-  metadata.gz: 2072530b6532f423f7076a630b32770bebbacc2555004fe9073312b5c9665801bc2d120d15f96ff4542f0522fc2fd871b3e237b316f0c4a6d383607c496ea516
-  data.tar.gz: 2f8ac80073fa1fa429b62316e05f6586245a1e410a5d6ddb181cd2fb9c49c98decb67f74d7e3e2dcd22b8dffeb30274a075c004c6d4a38775b543683ac4c2925
+  metadata.gz: 8d335d50b6059608dcdb41cc3f44e16f75746d900d698ff1ea3960de8d2541b0fdfadf9b7fceeadef33f70906a3c4673f8247c6aa9406195826f0b45a9977d5e
+  data.tar.gz: e72f4ddf2a9bb43f00d031aa74c56723870b63ce0b548110d6c3112a0945dbd21f789759a88834fb1101f24c61e30ce179bd14dea19001c2e4bb81f5e7721c9e

data/lib/tallty_import_export/import.rb

@@ -29,13 +29,14 @@ module TalltyImportExport
 
     # 导出excel的空模版
     def export_template_xlsx(**options)
+      origin_options = options.dup
       process_options(options)
 
       Axlsx::Package.new do |pack|
         pack.use_shared_strings = true
         workbook = pack.workbook
 
-        export_workbook workbook, **options
+        export_workbook workbook, **origin_options
 
         file_path = File.join(Rails.root, 'public', 'import')
         FileUtils.mkdir_p(file_path) unless Dir.exist?(file_path)
@@ -47,42 +48,11 @@ module TalltyImportExport
     end
 
     def export_workbook(workbook, **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) ? sheet_name : nil) || options[:sheet_name]
-
-      header_obj = @headers
-
-      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|
-          next unless 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
+      export_instance = TalltyImportExport::Export.new(@klass)
+      opts = options.symbolize_keys.merge({ headers: @headers })
+      Rails.logger.info opts
+      export_instance.process_options(opts)
+      export_instance.export_workbook(workbook, [], **opts)
     end
 
     def exchange_to_ids(xlsx_file, associations, **options)
@@ -136,7 +106,7 @@ module TalltyImportExport
 
     def process_options(options)
       options = import_options.merge(options).with_indifferent_access
-      @headers = options.delete(:headers) || import_headers
+      @headers = options.delete(:headers) || import_headers(**options)
       @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
       @params = options

data/lib/tallty_import_export/importable.rb

@@ -28,6 +28,10 @@ module TalltyImportExport
       def exchange_to_ids xlsx_file, associations, **options
         import_instance.exchange_to_ids(xlsx_file, associations, **options)
       end
+
+      def export_template_xlsx **options
+        import_instance.export_template_xlsx(**options)
+      end
     end
   end
 end

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tallty_import_export
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - liyijie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-07 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip-zip