From 2ae980243b7ad705dea575eadcfc4cf4e24073bd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:57:19 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index ac2b71c..3eff1c7 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1543,6 +1543,8 @@
MKEmitter.emit('popclose')
} else if (btn.execSuccess !== 'never') {
MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execSuccess, btn, id, this.state.selines)
+ } else {
+ btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
}
if (tabId) {
@@ -1553,6 +1555,11 @@
let id = btn.switchTab[btn.switchTab.length - 1]
let node = document.getElementById('tab' + id)
node && node.click()
+ }
+ if (btn.anchors && btn.anchors.length > 0) {
+ let id = btn.anchors[btn.anchors.length - 1]
+ let node = document.getElementById('anchor' + id)
+ node && node.scrollIntoView({behavior: 'smooth', block: 'center', inline: 'nearest'})
}
if (btn.openmenu && btn.openmenu.length > 0 && btn.MenuID) {
@@ -1823,10 +1830,10 @@
*/
improveAction = () => {
const { btn } = this.props
- const { btnconfig, autoMatic } = this.state
+ const { btnconfig } = this.state
if (btnconfig) {
- if (!autoMatic && (btnconfig.setting.display === 'prompt' || btnconfig.setting.display === 'exec')) { // 濡傛灉琛ㄥ崟浠ユ槸鍚︽灞曠ず
+ if (btnconfig.setting.display === 'prompt' || btnconfig.setting.display === 'exec') { // 濡傛灉琛ㄥ崟浠ユ槸鍚︽灞曠ず
this.modelconfirm()
} else {
this.setState({
@@ -1870,7 +1877,7 @@
this.setState({
btnconfig: _LongParam
}, () => {
- if (!autoMatic && (_LongParam.setting.display === 'prompt' || _LongParam.setting.display === 'exec')) { // 濡傛灉琛ㄥ崟浠ユ槸鍚︽灞曠ず
+ if (_LongParam.setting.display === 'prompt' || _LongParam.setting.display === 'exec') { // 濡傛灉琛ㄥ崟浠ユ槸鍚︽灞曠ず
this.modelconfirm()
} else {
this.setState({
@@ -1888,6 +1895,7 @@
*/
handleOk = () => {
if (!this.formRef) return
+
this.formRef.handleConfirm().then(res => {
this.setState({ confirmLoading: true })
--
Gitblit v1.8.0