From 4adb8b8868aeed1f5f3b89ae269a7724c6b451ad Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 11 八月 2023 16:58:31 +0800
Subject: [PATCH] 2023-08-11
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 0d0807c..a871951 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -8,7 +8,6 @@
import Api from '@/api'
import Utils, { getSysDefaultSql } from '@/utils/utils.js'
-import options from '@/store/options.js'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
import { updateForm } from '@/utils/utils-update.js'
import MKEmitter from '@/utils/events.js'
@@ -1601,7 +1600,7 @@
sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
sql = sql.replace(/@typename@/ig, `'admin'`)
- if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+ if (window.GLOB.debugger === true || (window.debugger === true && window.GLOB.sysType !== 'cloud')) {
console.info(sql.replace(/\n\s{8}/ig, '\n'))
}
@@ -1637,7 +1636,7 @@
Sort: index + 1
}))
- if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+ if (window.GLOB.debugger === true || (window.debugger === true && window.GLOB.sysType !== 'cloud')) {
let sql = [...lineMap.values()].map(item => (`
${item.insert}
${item.selects.join(` union all
@@ -1827,8 +1826,8 @@
if (window.GLOB.mainSystemApi) {
result.rduri = window.GLOB.mainSystemApi
}
- } else if (btn.sysInterface === 'true' && options.cloudServiceApi) {
- result.rduri = options.cloudServiceApi
+ } else if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
+ result.rduri = window.GLOB.cloudServiceApi
result.userid = sessionStorage.getItem('CloudUserID') || ''
result.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
} else if (btn.sysInterface !== 'true') {
@@ -2264,7 +2263,7 @@
let domain1 = ''
let domain2 = ''
- if (['8IFltwzyKcu15iA8fqSyb6m-pMa88a3ZTu0No3vDHgo', 'LOB-bbt9jVncGh7IOAUdESh1Sgzcbt62UwOqSqcK9ok'].includes(verify.wxTemplateId) && options.sysType !== 'cloud') {
+ if (['8IFltwzyKcu15iA8fqSyb6m-pMa88a3ZTu0No3vDHgo', 'LOB-bbt9jVncGh7IOAUdESh1Sgzcbt62UwOqSqcK9ok'].includes(verify.wxTemplateId) && window.GLOB.sysType !== 'cloud') {
domain1 = 'https://cloud.mk9h.cn/'
domain2 = 'https://cloud.mk9h.cn:8443/'
}
--
Gitblit v1.8.0