Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tallty_import_export
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open-source
tallty_import_export
Commits
d0767b39
Commit
d0767b39
authored
Nov 17, 2021
by
liyijie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: fix import_headers_result
parent
93d3cdb8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
import.rb
lib/tallty_import_export/import.rb
+10
-6
No files found.
lib/tallty_import_export/import.rb
View file @
d0767b39
...
...
@@ -113,13 +113,17 @@ module TalltyImportExport
# TODO: 这里,对于import_headers,后面还是不要传参数了
# 需要合并proc,前端没有办法把proc传过来
def
import_headers_result
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
)
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
end
header
else
@headers
=
import_headers
end
rescue
@headers
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment