From 66bdbc1df92e8ec4a5108a4e0323e25a7b9ff8f8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:37:16 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 30564b9..d4f7524 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -204,8 +204,8 @@
/**
* @description 瑙﹀彂鎸夐挳鎿嶄綔
*/
- actionTrigger = (triggerId, record, type, callback) => {
- const { btn, selectedData } = this.props
+ actionTrigger = (triggerId, record, type, lid, callback) => {
+ const { btn, selectedData, LID } = this.props
const { loading, disabled } = this.state
if (type === 'preButton') {
@@ -219,7 +219,7 @@
if (loading || disabled) return
if (triggerId && btn.uuid !== triggerId) return
- if (type === 'linkbtn' && !btn.$toolbtn && !is(fromJS(selectedData || []), fromJS(record))) return
+ if (type === 'linkbtn' && !btn.$toolbtn && LID !== lid) return
if (btn.OpenType === 'form' && btn.formType === 'count_line') return
this.setState({autoMatic: type === 'autoMatic'})
@@ -1093,7 +1093,7 @@
let node = document.getElementById('button' + btnId)
if (node) {
- MKEmitter.emit('triggerBtnId', btnId, null, 'preButton', (res) => {
+ MKEmitter.emit('triggerBtnId', btnId, null, 'preButton', null, (res) => {
if (!res) {
this.setState({loading: false})
resolve()
@@ -1638,11 +1638,12 @@
})
keys = keys.join(',')
+ vals = vals.join(',')
lines.push({
table: md5(tb + keys),
- insert: `Insert into ${tbName} (${keys},[mk_level],[mk_id],[mk_bid])`,
- select: `Select ${vals.join(',')},'${level}','${id}','${bid}'`
+ insert: `Insert into ${tbName} (${keys ? keys + ',' : ''}[mk_level],[mk_id],[mk_bid])`,
+ select: `Select ${keys ? vals + ',' : ''}'${level}','${id}','${bid}'`
})
subObjs.forEach(item => {
@@ -2434,6 +2435,24 @@
if (btn.execSuccess === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
MKEmitter.emit('refreshPopButton', btn.$tabId)
+ }
+
+ if (btn.verify && btn.verify.linkEnable === 'true') {
+ let url = ''
+ if (window.GLOB.systemType === 'production') {
+ url = btn.verify.linkProUrl
+ if (!url) {
+ notification.warning({
+ top: 92,
+ message: '灏氭湭娣诲姞姝ｅ紡绯荤粺閾炬帴鍦板潃锛�',
+ duration: 5
+ })
+ return
+ }
+ } else {
+ url = btn.verify.linkUrl
+ }
+ window.open(url)
}
}
@@ -3567,7 +3586,7 @@
loading={loading}
disabled={disabled}
style={btn.style}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
--
Gitblit v1.8.0