Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
antSword
Project
Project
Details
Activity
Releases
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
HuangJunbo
antSword
Commits
d7e31b04
Commit
d7e31b04
authored
May 14, 2019
by
Medicean
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(Fix:Database) 修复 `ASP`、`Custom` 数据库管理导出问题 #172
parent
8f9b3427
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
3 deletions
+4
-3
CHANGELOG.md
CHANGELOG.md
+1
-0
package.json
package.json
+1
-1
index.js
source/modules/database/asp/index.js
+1
-1
index.js
source/modules/database/custom/index.js
+1
-1
No files found.
CHANGELOG.md
View file @
d7e31b04
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
### 其它
### 其它
*
修复
`jsp_custom_script_for_mysql.jsp`
使用
`base64`
编码器连接数据库时
`characterEncoding`
二次解码导致的无法识别的问题 #171
*
修复
`jsp_custom_script_for_mysql.jsp`
使用
`base64`
编码器连接数据库时
`characterEncoding`
二次解码导致的无法识别的问题 #171
*
修复
`ASP`
、
`Custom`
数据库管理导出问题 #172
## 2019/05/13 `v(2.1.2)`
## 2019/05/13 `v(2.1.2)`
...
...
package.json
View file @
d7e31b04
{
{
"name"
:
"antsword"
,
"name"
:
"antsword"
,
"version"
:
"2.1.2.
1
"
,
"version"
:
"2.1.2.
2
"
,
"description"
:
"中国蚁剑是一款跨平台的开源网站管理工具"
,
"description"
:
"中国蚁剑是一款跨平台的开源网站管理工具"
,
"main"
:
"app.js"
,
"main"
:
"app.js"
,
"dependencies"
:
{
"dependencies"
:
{
...
...
source/modules/database/asp/index.js
View file @
d7e31b04
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
const
LANG
=
antSword
[
'language'
][
'database'
];
const
LANG
=
antSword
[
'language'
][
'database'
];
const
LANG_T
=
antSword
[
'language'
][
'toastr'
];
const
LANG_T
=
antSword
[
'language'
][
'toastr'
];
const
dialog
=
antSword
.
remote
.
dialog
;
class
ASP
{
class
ASP
{
...
@@ -666,7 +667,6 @@ class ASP {
...
@@ -666,7 +667,6 @@ class ASP {
dumpResult
()
{
dumpResult
()
{
const
grid
=
this
.
manager
.
result
.
layout
.
getAttachedObject
();
const
grid
=
this
.
manager
.
result
.
layout
.
getAttachedObject
();
let
filename
=
`
${
this
.
core
.
__opts__
.
ip
}
_
${
new
Date
().
format
(
"yyyyMMddhhmmss"
)}
.csv`
;
let
filename
=
`
${
this
.
core
.
__opts__
.
ip
}
_
${
new
Date
().
format
(
"yyyyMMddhhmmss"
)}
.csv`
;
antSword
[
'test'
]
=
this
;
dialog
.
showSaveDialog
({
dialog
.
showSaveDialog
({
title
:
LANG
[
'result'
][
'dump'
][
'title'
],
title
:
LANG
[
'result'
][
'dump'
][
'title'
],
defaultPath
:
filename
defaultPath
:
filename
...
...
source/modules/database/custom/index.js
View file @
d7e31b04
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
const
LANG
=
antSword
[
'language'
][
'database'
];
const
LANG
=
antSword
[
'language'
][
'database'
];
const
LANG_T
=
antSword
[
'language'
][
'toastr'
];
const
LANG_T
=
antSword
[
'language'
][
'toastr'
];
const
dialog
=
antSword
.
remote
.
dialog
;
class
CUSTOM
{
class
CUSTOM
{
...
@@ -616,7 +617,6 @@ class CUSTOM {
...
@@ -616,7 +617,6 @@ class CUSTOM {
dumpResult
()
{
dumpResult
()
{
const
grid
=
this
.
manager
.
result
.
layout
.
getAttachedObject
();
const
grid
=
this
.
manager
.
result
.
layout
.
getAttachedObject
();
let
filename
=
`
${
this
.
core
.
__opts__
.
ip
}
_
${
new
Date
().
format
(
"yyyyMMddhhmmss"
)}
.csv`
;
let
filename
=
`
${
this
.
core
.
__opts__
.
ip
}
_
${
new
Date
().
format
(
"yyyyMMddhhmmss"
)}
.csv`
;
antSword
[
'test'
]
=
this
;
dialog
.
showSaveDialog
({
dialog
.
showSaveDialog
({
title
:
LANG
[
'result'
][
'dump'
][
'title'
],
title
:
LANG
[
'result'
][
'dump'
][
'title'
],
defaultPath
:
filename
defaultPath
:
filename
...
...
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