From d82fec9e2a4238ff1833e67c01bc9b34e525d904 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 25 二月 2022 16:37:12 +0800 Subject: [PATCH] 2022-02-25 --- src/tabviews/zshare/actionList/normalbutton/index.jsx | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 55 insertions(+), 5 deletions(-) diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx index 72a568c..55ca27b 100644 --- a/src/tabviews/zshare/actionList/normalbutton/index.jsx +++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx @@ -85,6 +85,10 @@ if (btn.OpenType === 'form') { let data = selectedData && selectedData[0] ? selectedData[0] : null this.setState({check: data && data[btn.field] === btn.openVal}) + } else if (btn.OpenType === 'formSubmit') { + this.setState({ + selines: selectedData || [] + }) } } @@ -142,6 +146,10 @@ if (btn.OpenType === 'form') { let data = nextProps.selectedData && nextProps.selectedData[0] ? nextProps.selectedData[0] : null this.setState({check: data && data[btn.field] === btn.openVal}) + } else if (btn.OpenType === 'formSubmit') { + this.setState({ + selines: nextProps.selectedData || [] + }) } } @@ -164,13 +172,39 @@ } actionSubmit = (res) => { - const { btn } = this.props + const { btn, setting, BID } = this.props + const { selines } = this.state if (btn.uuid !== res.menuId) return + let data = selines || [] + + if (setting.supModule && !BID) { + notification.warning({ + top: 92, + message: '闇�瑕佷笂绾т富閿�硷紒', + duration: 3 + }) + return + } else if (btn.Ot !== 'notRequired' && data.length === 0) { + notification.warning({ + top: 92, + message: '璇烽�夋嫨琛岋紒', + duration: 5 + }) + return + } else if (btn.Ot === 'requiredSgl' && data.length !== 1) { + notification.warning({ + top: 92, + message: '璇烽�夋嫨鍗曡鏁版嵁锛�', + duration: 5 + }) + return + } + this.setState({ loading: true }) - this.execSubmit(this.state.selines, () => {}, res.form) + this.execSubmit(data, () => {}, res.form) } resetModuleParam = (menuId, btnId, param) => { @@ -987,6 +1021,12 @@ _resolve() }) } + // xml璋冪敤鏂瑰紡 + // Api.directRequest('http://localhost:3001/test.xml', 'get', null, 'true').then(res => { + // let $x2js = new x2js() + // let jsonObj = $x2js.xml2js(res); + // console.info(jsonObj) + // }) /** * @description 鑷畾涔夎姹傚惊鐜墽琛� @@ -1451,7 +1491,7 @@ const { btn } = this.props const { btnconfig, autoMatic } = this.state - if ((res && res.ErrCode === 'S') || autoMatic) { // 鎵ц鎴愬姛 + if ((res && (res.ErrCode === 'S' || !res.ErrCode)) || autoMatic) { // 鎵ц鎴愬姛 notification.success({ top: 92, message: res.ErrMesg || this.state.dict['main.action.confirm.success'], @@ -1487,6 +1527,15 @@ if (btn.output) { id = res.mk_b_id || res[btn.output] || '' } + let tabId = '' + if (btn.refreshTab && btn.refreshTab.length > 0) { + tabId = btn.refreshTab[btn.refreshTab.length - 1] + } + + if (tabId && btn.$MenuID === tabId) { // 鍒锋柊褰撳墠鑿滃崟鏃讹紝鍋滄鍏朵粬鎿嶄綔 + MKEmitter.emit('reloadMenuView', tabId, 'table') + return + } if (btn.execSuccess === 'closetab') { MKEmitter.emit('closeTabView', btn.$MenuID) @@ -1496,9 +1545,10 @@ MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execSuccess, btn, id, this.state.selines) } - if (btn.refreshTab && btn.refreshTab.length > 0) { - MKEmitter.emit('reloadMenuView', btn.refreshTab[btn.refreshTab.length - 1], 'table') + if (tabId) { + MKEmitter.emit('reloadMenuView', tabId, 'table') } + if (btn.switchTab && btn.switchTab.length > 0) { let id = btn.switchTab[btn.switchTab.length - 1] let node = document.getElementById('tab' + id) -- Gitblit v1.8.0