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/tabviews/zshare/actionList/printbutton/index.jsx | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index f89c377..2e24601 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -6,7 +6,6 @@
import Api from '@/api'
import Utils 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'
@@ -169,10 +168,6 @@
message: '璇烽�夋嫨鍗曡鏁版嵁锛�',
duration: 5
})
- return
- } else if (!['requiredSgl', 'notRequired', 'requiredOnce', 'required'].includes(btn.Ot)) {
- // 鏁版嵁閫夋嫨绫诲瀷鏍￠獙
- this.actionSettingError()
return
} else if (!btn.verify || !btn.verify.printMode) {
notification.warning({
@@ -1149,7 +1144,7 @@
}
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+ if (window.GLOB.debugger === true || (window.debugger === true && window.GLOB.sysType !== 'cloud')) {
_customScript && console.info(`${btn.logLabel ? `/*${btn.logLabel} 鑷畾涔夎剼鏈�*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
LText && console.info(`${btn.logLabel ? `/*${btn.logLabel} 鏁版嵁婧�*/\n` : ''}` + LText.replace(/\n\s{8}/ig, '\n'))
}
@@ -1216,8 +1211,8 @@
_outParam = JSON.parse(JSON.stringify(res))
if (window.GLOB.mkHS) {
- if (btn.sysInterface === 'true' && options.cloudServiceApi) {
- res.rduri = options.cloudServiceApi
+ if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
+ res.rduri = window.GLOB.cloudServiceApi
res.userid = sessionStorage.getItem('CloudUserID') || ''
res.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
} else if (btn.sysInterface !== 'true') {
@@ -1960,17 +1955,6 @@
if (btn.execError !== 'never') {
MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execError, btn, '', this.state.selines)
}
- }
-
- /**
- * @description 鎸夐挳閰嶇疆淇℃伅閿欒鎻愮ず
- */
- actionSettingError = () => {
- notification.warning({
- top: 92,
- message: '鎸夐挳璁剧疆閿欒锛�',
- duration: 5
- })
}
handleModelConfig = (config) => {
--
Gitblit v1.8.0