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
b068fd27
Commit
b068fd27
authored
Nov 12, 2021
by
liyijie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 修改import_header_hash
parent
86d7c2da
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
import.rb
lib/tallty_import_export/import.rb
+10
-2
version.rb
lib/tallty_import_export/version.rb
+1
-1
No files found.
lib/tallty_import_export/import.rb
View file @
b068fd27
...
@@ -110,8 +110,16 @@ module TalltyImportExport
...
@@ -110,8 +110,16 @@ module TalltyImportExport
true
true
end
end
# 需要合并proc,前端没有办法把proc传过来
def
import_headers_result
def
import_headers_result
@headers
||=
import_headers
&
.
with_indifferent_access
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
.
fetch
(
key
)
&
.
fetch
(
:proc
).
present?
header
[
:proc
]
=
import_header_hash
.
fetch
(
key
)
&
.
fetch
(
:proc
)
end
header
end
end
end
def
import_options
def
import_options
...
@@ -156,7 +164,7 @@ module TalltyImportExport
...
@@ -156,7 +164,7 @@ module TalltyImportExport
_record
=
associations
.
find_or_initialize_by
(
line_info
.
clone
.
extract!
(
*
primary_keys
))
_record
=
associations
.
find_or_initialize_by
(
line_info
.
clone
.
extract!
(
*
primary_keys
))
_record
.
update!
(
line_info
.
clone
.
except!
(
*
primary_keys
,
*
@skip_keys
))
_record
.
update!
(
line_info
.
clone
.
except!
(
*
primary_keys
,
*
@skip_keys
))
else
else
associations
.
create!
(
line_info
)
associations
.
create!
(
line_info
.
clone
.
except!
(
*
@skip_keys
)
)
end
end
end
end
end
end
...
...
lib/tallty_import_export/version.rb
View file @
b068fd27
module
TalltyImportExport
module
TalltyImportExport
VERSION
=
"1.0.3
0
"
VERSION
=
"1.0.3
1
"
end
end
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