From f078c137d61270d243cd8e03077fa9cf000e276b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 14 八月 2023 14:02:40 +0800
Subject: [PATCH] 2023-08-14
---
src/utils/utils.js | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 35d083e..369abde 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1,6 +1,5 @@
import moment from 'moment'
import md5 from 'md5'
-import options from '@/store/options.js'
const formatKeys = [
{ key: 'select', value: ' msltk ' },
@@ -798,8 +797,8 @@
let baseurl = ''
- if (options.cloudServiceApi) {
- baseurl = options.cloudServiceApi.replace(/webapi(.*)$/, '')
+ if (window.GLOB.cloudServiceApi) {
+ baseurl = window.GLOB.cloudServiceApi.replace(/webapi(.*)$/, '')
} else {
baseurl = window.GLOB.baseurl
}
@@ -1161,7 +1160,7 @@
_sqlBottom = _sqlBottom.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
- if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+ if (window.GLOB.debugger === true || (window.debugger === true && window.GLOB.sysType !== 'cloud')) {
let fsql = `
${_sql}
${_sqlInsert}
@@ -1396,7 +1395,7 @@
_sqlBottom = _sqlBottom.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
- if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+ if (window.GLOB.debugger === true || (window.debugger === true && window.GLOB.sysType !== 'cloud')) {
let fsql = `
${_sql}
${_sqlInsert}
@@ -2187,7 +2186,7 @@
_sql = _sql.replace(/@datam@/ig, '\'\'')
}
- if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+ if (window.GLOB.debugger === true || (window.debugger === true && window.GLOB.sysType !== 'cloud')) {
// _sql = _sql.replace(/\n\s{8}/ig, '\n')
console.info(_sql)
}
--
Gitblit v1.8.0