From 2652a3c1485dbbf3b003e13e5c5d1c0205e7c324 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 09 九月 2020 09:19:46 +0800
Subject: [PATCH] 2020-09-09
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 4429f0e..a54ec86 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -78,10 +78,14 @@
return
}
- if (
- btn.intertype === 'inner' && !btn.innerFunc &&
- ((setting.interType === 'inner' && setting.innerFunc) || setting.interType === 'outer')
- ) {
+ if (btn.intertype === 'system' && setting.interType !== 'system') {
+ notification.warning({
+ top: 92,
+ message: '瀵煎嚭鎸夐挳閰嶇疆閿欒锛�',
+ duration: 5
+ })
+ return
+ } else if (btn.intertype === 'inner' && !btn.innerFunc) {
notification.warning({
top: 92,
message: '瀵煎嚭鎸夐挳閰嶇疆閿欒锛�',
@@ -129,21 +133,21 @@
}
}
- if (btn.intertype === 'inner' && !btn.innerFunc && !viewParam.arr_field) { // 浣跨敤绯荤粺鍑芥暟
+ if (btn.intertype === 'system' && !viewParam.arr_field) { // 浣跨敤绯荤粺鍑芥暟
notification.warning({
top: 92,
message: '鏈缃樉绀哄垪锛�',
duration: 5
})
return
- } else if (btn.intertype === 'inner' && !btn.innerFunc && btn.verify && btn.verify.enable === 'true') {
+ } else if (btn.intertype === 'system' && btn.verify && btn.verify.enable === 'true') {
this.setState({search: fromJS(viewParam.search).toJS()})
}
this.updateStatus('start', name)
if (btn.pagination !== 'true') {
- if (btn.intertype === 'inner' && !btn.innerFunc) { // 浣跨敤绯荤粺鍑芥暟
+ if (btn.intertype === 'system') { // 浣跨敤绯荤粺鍑芥暟
let param = this.getExcelDefaultParam(viewParam.arr_field, viewParam.orderBy, viewParam.search)
Api.genericInterface(param).then(result => {
@@ -155,7 +159,7 @@
}, () => {
this.execError({})
})
- } else if (btn.intertype === 'inner' && btn.innerFunc) { // 浣跨敤鍐呴儴鍑芥暟
+ } else if (btn.intertype === 'inner') { // 浣跨敤鍐呴儴鍑芥暟
let param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search)
param.func = btn.innerFunc
@@ -320,14 +324,14 @@
getExcelOutData = (viewParam, pageIndex, pageSize, data) => {
const { btn } = this.props
let param = null
- if (btn.intertype === 'inner' && !btn.innerFunc) { // 浣跨敤绯荤粺鍑芥暟
+ if (btn.intertype === 'system') { // 浣跨敤绯荤粺鍑芥暟
if (!viewParam.arr_field) {
this.execError({ErrCode: 'N', message: '鏈缃樉绀哄垪锛�'})
return
}
param = this.getExcelDefaultParam(viewParam.arr_field, viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
- } else if (btn.intertype === 'inner' && btn.innerFunc) { // 浣跨敤鍐呴儴鍑芥暟
+ } else if (btn.intertype === 'inner') { // 浣跨敤鍐呴儴鍑芥暟
param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
param.func = btn.innerFunc
--
Gitblit v1.8.0