From 547e5fe219ee7bee309ecd67db74bc8df66b5433 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 八月 2023 11:47:45 +0800
Subject: [PATCH] 2023-08-23
---
src/tabviews/zshare/actionList/printbutton/index.jsx | 93 ++++++++++++++++++++--------------------------
1 files changed, 40 insertions(+), 53 deletions(-)
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index f89c377..fdc3ac2 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({
@@ -981,10 +976,15 @@
let _dataresource = btn.verify.setting.dataresource
let _customScript = ''
-
+ let _tailScript = ''
btn.verify.scripts && btn.verify.scripts.forEach(script => {
- if (script.status !== 'false') {
+ if (script.status === 'false') return
+ if (script.position !== 'back') {
_customScript += `
+ ${script.sql}
+ `
+ } else {
+ _tailScript += `
${script.sql}
`
}
@@ -994,16 +994,28 @@
_dataresource = ''
}
+ let isDataM = sessionStorage.getItem('dataM') === 'true'
+ let regoptions = [
+ { reg: /@ID@/ig, value: `'${ID}'`},
+ { reg: /@BID@/ig, value: `'${BID || ''}'`},
+ { reg: /@LoginUID@/ig, value: `'${sessionStorage.getItem('LoginUID') || ''}'`},
+ { reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`},
+ { reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID') || ''}'`},
+ { reg: /@Appkey@/ig, value: `'${window.GLOB.appkey || ''}'`},
+ { reg: /@typename@/ig, value: `'admin'`},
+ { reg: /\$@/ig, value: isDataM ? '/*' : ''},
+ { reg: /@\$/ig, value: isDataM ? '*/' : ''},
+ { reg: /@datam@/ig, value: isDataM ? `'Y'` : `''`},
+ ]
+
+ regoptions.forEach(item => {
+ _dataresource = _dataresource.replace(item.reg, item.value)
+ _customScript = _customScript.replace(item.reg, item.value)
+ _tailScript = _tailScript.replace(item.reg, item.value)
+ })
+
if (/\s/.test(_dataresource)) {
_dataresource = '(' + _dataresource + ') tb'
- }
-
- if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- _dataresource = _dataresource.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
- _customScript = _customScript.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
- } else {
- _dataresource = _dataresource.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
- _customScript = _customScript.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
let initsql = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100)
@@ -1091,36 +1103,12 @@
select ${_initvars.join(',')}
`
}
-
if (_customScript) {
_customScript = `${initsql}
${_customScript}
`
}
-
- _dataresource = _dataresource.replace(/@select\$|\$select@/ig, '')
- _customScript = _customScript.replace(/@select\$|\$select@/ig, '')
- _dataresource = _dataresource.replace(/\$sum@/ig, '/*')
- _dataresource = _dataresource.replace(/@sum\$/ig, '*/')
- _customScript = _customScript.replace(/\$sum@/ig, '/*')
- _customScript = _customScript.replace(/@sum\$/ig, '*/')
-
- _dataresource = _dataresource.replace(/@ID@/ig, `'${ID}'`)
- _customScript = _customScript.replace(/@ID@/ig, `'${ID}'`)
- _dataresource = _dataresource.replace(/@BID@/ig, `'${BID || ''}'`)
- _customScript = _customScript.replace(/@BID@/ig, `'${BID || ''}'`)
- _dataresource = _dataresource.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
- _customScript = _customScript.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
- _dataresource = _dataresource.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
- _customScript = _customScript.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
- _dataresource = _dataresource.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
- _customScript = _customScript.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
- _dataresource = _dataresource.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
- _customScript = _customScript.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
- _dataresource = _dataresource.replace(/@typename@/ig, `'admin'`)
- _customScript = _customScript.replace(/@typename@/ig, `'admin'`)
-
let LText = ''
@@ -1131,17 +1119,27 @@
if (_customScript) {
if (LText) {
LText = `${LText}
+ ${_tailScript}
aaa:
if @ErrorCode!=''
insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,'${sessionStorage.getItem('UserID') || ''}'
`
} else {
_customScript = `${_customScript}
+ ${_tailScript}
aaa:
if @ErrorCode!=''
insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,'${sessionStorage.getItem('UserID') || ''}'
`
}
+ } else if (_tailScript) {
+ LText = `${initsql}
+ ${LText}
+ ${_tailScript}
+ aaa:
+ if @ErrorCode!=''
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,'${sessionStorage.getItem('UserID') || ''}'
+ `
} else {
LText = `${initsql}
${LText}
@@ -1149,7 +1147,7 @@
}
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+ if (window.GLOB.debugger === true) {
_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 +1214,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 +1958,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