From 72419e2f826031a158173f46d723a672064e37cd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 八月 2021 22:42:51 +0800
Subject: [PATCH] 2021-08-31
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index d298a5d..c151133 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -3,7 +3,7 @@
import moment from 'moment'
import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
-import { Button, Modal, notification, message } from 'antd'
+import { Button, Modal, notification, message, Icon } from 'antd'
import * as XLSX from 'xlsx'
import Utils from '@/utils/utils.js'
@@ -130,9 +130,7 @@
if (btn.search === 'true' && viewParam.search && viewParam.search.length > 0) {
let valid = false
viewParam.search.forEach(item => {
- if (Array.isArray(item.value) && item.value.length > 0) {
- valid = true
- } else if (item.value || item.value === 0) {
+ if (item.value || item.value === 0) {
valid = true
}
})
@@ -452,7 +450,7 @@
data && data.forEach((item, index) => {
let _row = {}
- item.$Index = index + 1
+ item.$Index = index + 1 + ''
btn.verify.columns.forEach((col, i) => {
if (item[col.Column] && col.abs === 'true') {
@@ -499,7 +497,7 @@
data && data.forEach((item, index) => {
let _row = {}
- item.$Index = index + 1
+ item.$Index = index + 1 + ''
_header.forEach(field => {
if (item[field] && abses.includes(field)) {
@@ -687,6 +685,9 @@
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
+ let RoleID = sessionStorage.getItem('role_id') || ''
+ let departmentcode = sessionStorage.getItem('departmentcode') || ''
+ let organization = sessionStorage.getItem('organization') || ''
let city = sessionStorage.getItem('city') || ''
if (sessionStorage.getItem('isEditState') === 'true') {
@@ -744,7 +745,7 @@
}
if (param.custom_script) {
- param.custom_script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@login_city nvarchar(50) select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @login_city='${city}'
+ param.custom_script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@departmentcode nvarchar(50),@organization nvarchar(50),@login_city nvarchar(50) select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @departmentcode='${departmentcode}', @organization='${organization}', @login_city='${city}'
${param.custom_script}
`
regoptions.forEach(item => {
@@ -872,15 +873,31 @@
>{btn.label}</Button>
)
} else { // icon銆乼ext銆� all 鍗＄墖
+ let label = ''
+ let icon = ''
+
+ if (show === 'button') {
+ label = btn.label
+ icon = btn.icon || ''
+ } else if (show === 'link') {
+ label = <span>{btn.label}{btn.icon ? <Icon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
+ icon = ''
+ } else if (show === 'icon') {
+ icon = btn.icon || 'download'
+ // } else if (show === 'text') {
+ } else {
+ label = btn.label
+ }
+
return (
<Button
type="link"
title={show === 'icon' ? btn.label : ''}
loading={loading}
style={btn.style}
- icon={show === 'text' ? '' : (show === 'icon' ? (btn.icon || 'download') : (btn.icon || ''))}
+ icon={icon}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
- >{show === 'icon' ? '' : btn.label}</Button>
+ >{label}</Button>
)
}
}
--
Gitblit v1.8.0