tallty_import_export 1.0.6 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20ec051b84c0c965ad0ca1277f1e3b485e9cf026fd261a5638a98f43089e89bb
-  data.tar.gz: d79f1efedffeff6d933411c761547597d3c6fa2dc3f685c58e6a6fb311db5ab9
+  metadata.gz: ac670fce1d35526ff3182599152b1731126e8252b34a23ccfebb21e2fd0bdb05
+  data.tar.gz: c9be74623d6e5530ffeb0908de53f44ed81765d54704ce8e051de099ce4fcfa4
 SHA512:
-  metadata.gz: 16bac50a5b23ca990021797d567086213b822d639940d9061cf31d1c14fa2023357642ec901b30813a3da83544f0f5c3f0e467ccc2845a3b8a20091b29f74bb7
-  data.tar.gz: 0c9640845a79b9bc44a3566ade9710b56bb633de42550528c0c36c0b4dc0c7b630e1d0624471c24fd64830f94519e8136ec3fc66aba0248da45883494a7956c2
+  metadata.gz: c4d825be60c8e01fb6f7390d62eafaa530d430ee9ec1f24e6a811e7664c7a565ff3ec28089cebd5ee56bfb889428b524bf71dc515704b5ee429180ed48f90ec4
+  data.tar.gz: e2bfd76beb5a504f35f041be64e5903aaedb31597c646c113e25024c0f8fd138c3d34d7a778a8707f432520394cd5584a68d891a7de63da4fea15a13f50d85c6

data/lib/tallty_import_export/export.rb

@@ -174,6 +174,8 @@ module TalltyImportExport
     # 根据数据类型 attr_type 进行数据的格式化
     def handle_format data, header
       case header[:attr_type].to_s
+      when 'string'
+        data.to_s
       when 'datetime'
         data ? data.strftime('%F %H:%M') : nil
       when 'date'

data/lib/tallty_import_export/import.rb

@@ -51,7 +51,7 @@ module TalltyImportExport
 
     def process_options options
       options = options.with_indifferent_access
-      self.headers = options.delete(:headers) || []
+      @headers = options.delete(:headers)
       @primary_keys = options.delete(:primary_keys) || @headers.map { |header| header[:primary_key] ? header[:key].to_sym : nil }.compact
 
       @excel_hash = @headers.reduce({}) do |h, header|
@@ -104,29 +104,29 @@ module TalltyImportExport
       @headers || klass.try(:headers) || klass.try(:model_headers) || (raise ArgumentError.new('missing import_headers'))
     end
 
-    # 只保留 key, name, json, 合并到 import_header
-    def headers= val
-      if val.empty?
-        @headers = import_headers_result.map { |header| header.with_indifferent_access }
-        return
-      end
-
-      key_to_coming_header = val.reduce({}) do |out, header|
-        out[header.with_indifferent_access[:key].to_sym] = header.with_indifferent_access
-        out
-      end
-
-      result = []
-      val.map do |header|
-        if (exist_header = import_headers_result.find { |model_header| model_header[:key] === header[:key] })
-          result.push(exist_header.merge(name: header[:name], json: header[:json]))
-        else
-          result.push({ key: header[:key], name: header[:name], json: header[:json]})
-        end
-      end
-
-      @headers = result
-    end
+    # # 只保留 key, name, json, 合并到 import_header
+    # def headers= val
+    #   if val.empty?
+    #     @headers = import_headers_result.map { |header| header.with_indifferent_access }
+    #     return
+    #   end
+    #
+    #   key_to_coming_header = val.reduce({}) do |out, header|
+    #     out[header.with_indifferent_access[:key].to_sym] = header.with_indifferent_access
+    #     out
+    #   end
+    #
+    #   result = []
+    #   val.map do |header|
+    #     if (exist_header = import_headers_result.find { |model_header| model_header[:key] === header[:key] })
+    #       result.push(exist_header.merge(header.compact))
+    #     else
+    #       result.push(header)
+    #     end
+    #   end
+    #
+    #   @headers = result
+    # end
 
     def skip val, processing_line_info, raw_line_info
       # do nothing there, use for header[:convert]

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.0.6"
+  VERSION = "1.0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tallty_import_export
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.11
 platform: ruby
 authors:
 - liyijie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip-zip