From 5046d0d13dc6a8563b8e54e31913bc44cfa1072f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 四月 2022 19:23:18 +0800
Subject: [PATCH] 2022-04-26
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 891cd34..cbc490b 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -478,11 +478,13 @@
exportExcel = (data) => {
const { btn } = this.props
+ let columns = btn.verify.columns.filter(col => col.output !== 'false')
+
try {
- let imgCol = btn.verify.columns.filter(col => col.type === 'image')[0]
+ let imgCol = columns.filter(col => col.type === 'image')[0]
if (imgCol) {
- const column = btn.verify.columns.map(item => {
+ const column = columns.map(item => {
let col = {
title: item.Text,
key: item.Column,
@@ -503,7 +505,7 @@
item.$Index = index + 1 + ''
- btn.verify.columns.forEach((col, i) => {
+ columns.forEach((col, i) => {
if (item[col.Column] && col.abs === 'true') {
_row[col.Column] = Math.abs(item[col.Column])
} else {
@@ -528,7 +530,7 @@
let colwidth = []
let abses = []
- btn.verify.columns.forEach(col => {
+ columns.forEach(col => {
if (_topRow[col.Column]) return
_header.push(col.Column)
@@ -823,7 +825,7 @@
}
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
param.custom_script && console.info(`${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${param.custom_script}`)
LText && console.info(LText)
}
@@ -856,7 +858,7 @@
execSuccess = (res) => {
const { btn } = this.props
- if (res && res.ErrCode === 'S') { // 鎵ц鎴愬姛
+ if (res && (res.ErrCode === 'S' || !res.ErrCode)) { // 鎵ц鎴愬姛
notification.success({
top: 92,
message: res.ErrMesg || this.state.dict['main.action.confirm.success'],
@@ -939,6 +941,7 @@
className={'mk-btn mk-' + btn.class}
icon={btn.icon}
disabled={disabled}
+ title={disabled ? (btn.reason || '') : ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
loading={loading}
>{btn.label}</Button>
@@ -963,7 +966,7 @@
return (
<Button
type="link"
- title={show === 'icon' ? btn.label : ''}
+ title={disabled ? (btn.reason || '') : (show === 'icon' ? btn.label : '')}
loading={loading}
disabled={disabled}
style={btn.style}
--
Gitblit v1.8.0