manager/zyplayer-doc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：值为null时导出的SQL语句使用null，而非空字符串

Browse Source
This commit is contained in:
暮光：城中城
2021-12-26 22:24:24 +08:00
parent 208826df62
commit 990c2379ff
10 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zyplayer-doc-ui/db-ui/.env.development
View File

@@ -2,8 +2,8 @@
ENV = 'development'
# base api
# VUE_APP_BASE_API = 'http://local.zyplayer.com:8083/zyplayer-doc-manage'
VUE_APP_BASE_API = 'http://doc.zyplayer.com/zyplayer-doc-manage'
VUE_APP_BASE_API = 'http://local.zyplayer.com:8083/zyplayer-doc-manage'
# VUE_APP_BASE_API = 'http://doc.zyplayer.com/zyplayer-doc-manage'
VUE_CLI_BABEL_TRANSPILE_MODULES = true

19
zyplayer-doc-ui/db-ui/src/views/data/copy/base.js
View File

@@ -18,8 +18,10 @@ export default {
let values = '';
dataCols.forEach(col => {
if (values.length > 0) values += ', ';
let val = item[col.prop] || '';
if (typeof val === 'number' && !isNaN(val)) {
let val = item[col.prop];
if (val === undefined || val === null || isNaN(val)) {
values += "null";
} else if (typeof val === 'number' && !isNaN(val)) {
values += val;
} else {
val = String(val).replaceAll('\'', '\'\'');
@@ -38,19 +40,22 @@ export default {
choiceData.forEach(item => {
let values = '', where = '';
dataCols.forEach(col => {
let val = item[col.prop] || '';
let val = item[col.prop];
if (condition.indexOf(col.prop) >= 0) {
if (typeof val === 'number' && !isNaN(val)) {
if (where.length > 0) where += ' and ';
if (where.length > 0) where += ' and ';
if (val === undefined || val === null || isNaN(val)) {
where += col.prop + ' = null';
} else if (typeof val === 'number' && !isNaN(val)) {
where += col.prop + ' = ' + val;
} else {
if (where.length > 0) where += ' and ';
where += col.prop + ' = ' + "'" + val + "'";
}
} else {
if (values.length > 0) values += ', ';
values += col.prop + '=';
if (typeof val === 'number' && !isNaN(val)) {
if (val === undefined || val === null || isNaN(val)) {
values += "null";
} else if (typeof val === 'number' && !isNaN(val)) {
values += val;
} else {
val = String(val).replaceAll('\'', '\'\'');

19
zyplayer-doc-ui/db-ui/src/views/data/copy/sqlserver.js
View File

@@ -18,8 +18,10 @@ export default {
let values = '';
dataCols.forEach(col => {
if (values.length > 0) values += ', ';
let val = item[col.prop] || '';
if (typeof val === 'number' && !isNaN(val)) {
let val = item[col.prop];
if (val === undefined || val === null || isNaN(val)) {
values += "null";
} else if (typeof val === 'number' && !isNaN(val)) {
values += val;
} else {
val = String(val).replaceAll('\'', '\'\'');
@@ -38,19 +40,22 @@ export default {
choiceData.forEach(item => {
let values = '', where = '';
dataCols.forEach(col => {
let val = item[col.prop] || '';
let val = item[col.prop];
if (condition.indexOf(col.prop) >= 0) {
if (typeof val === 'number' && !isNaN(val)) {
if (where.length > 0) where += ' and ';
if (where.length > 0) where += ' and ';
if (val === undefined || val === null || isNaN(val)) {
where += col.prop + ' = null';
} else if (typeof val === 'number' && !isNaN(val)) {
where += col.prop + ' = ' + val;
} else {
if (where.length > 0) where += ' and ';
where += col.prop + ' = ' + "'" + val + "'";
}
} else {
if (values.length > 0) values += ', ';
values += col.prop + '=';
if (typeof val === 'number' && !isNaN(val)) {
if (val === undefined || val === null || isNaN(val)) {
values += "null";
} else if (typeof val === 'number' && !isNaN(val)) {
values += val;
} else {
val = String(val).replaceAll('\'', '\'\'');