tallty_import_export 1.0.16 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a10f7b098cd3e2d58f203bda043ac3ab1fb49f0a846c85c84aeed261ecfab16
-  data.tar.gz: 23bfd18fc032beae0ca7274c467cae73d28bed1c45f02037c9293a5e12945eab
+  metadata.gz: 9253a9c6be1b5829d258f8a3c7cf59729e84d1e8c8daeba7890fb050fe61708c
+  data.tar.gz: 7c3e2b5ba2c20149f47f0d19b26710d5e722ed946b483e4e78dcd1a9c1b00247
 SHA512:
-  metadata.gz: 8a02d6d4643a5b473afab17d86c21791bea8c3c040b06bcb04bfdd7d9f8afe8d40bbed12ca3d514201e44b480c5be6a5e5aa663f4619e196863c16de74f424d0
-  data.tar.gz: fca02d7bf9dd5811938cc7130e7170c004aad4544157dda71793a60e00e994ec02b56cf250819bd2582c4d5d25b1b482550282097facd3514ddbae1fde2521ed
+  metadata.gz: dbb47e4a94cd7b7c3fe059aa5f0fc3d0384b023360452e62ab37dc4c524a8f5258e3827e6bded58a8931f36ce569d079f02424578e48a1f9c9281a6dbc7ad001
+  data.tar.gz: 7101fb1b0ef57e7ea7983e949e7a4b88dc986fd382061da954609755b94efa3a4b26d4a23049ef146444c823ed81f52d8ded585460dc91b7ecfde858d0fcce36

data/lib/tallty_import_export/export.rb

@@ -179,9 +179,9 @@ module TalltyImportExport
       when 'string'
         data.to_s
       when 'datetime'
-        data ? data.strftime('%F %H:%M') : nil
+        data ? data.in_time_zone.strftime('%F %H:%M') : nil
       when 'date'
-        data ? data.strftime('%F') : nil
+        data ? data.in_time_zone.strftime('%F') : nil
       else
         data
       end

data/lib/tallty_import_export/import.rb

@@ -65,6 +65,8 @@ module TalltyImportExport
     end
 
     def process_line_info line_info, associations
+      # 去除空行内容
+      return unless line_info.values.any?(&:present?)
       # 转换处理导入的数据格式
       line_info = convert_data(line_info)
 
@@ -77,7 +79,7 @@ module TalltyImportExport
 
     def convert_data line_info
       line_info.with_indifferent_access.reduce({}) do |h, (k, v)|
-        header = @headers.find do |_header|
+        header = import_headers_result.find do |_header|
           _header[:key].to_sym == k.to_sym
         end
         # header[:convert] = handle_xxx
@@ -88,8 +90,7 @@ module TalltyImportExport
           h[header[:json]][k] = val
         elsif header[:finder]
           $SAFE = 2
-          eval_string = header[:finder] + '(val)'
-          eval eval_string
+          h[k.to_sym] = eval header[:finder]
         else
           h[k.to_sym] = val
         end
@@ -103,7 +104,7 @@ module TalltyImportExport
     end
 
     def import_headers_result
-      @headers || import_headers
+      @headers ||= import_headers
     end
 
     def import_headers **args

data/lib/tallty_import_export/version.rb

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

metadata

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