From e9c48bd7356462ba9257540b130a47a65ad1861d Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 26 八月 2021 17:17:11 +0800 Subject: [PATCH] 2021-08-26 --- src/tabviews/zshare/actionList/changeuserbutton/index.jsx | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/tabviews/zshare/actionList/changeuserbutton/index.jsx b/src/tabviews/zshare/actionList/changeuserbutton/index.jsx index 12ee0f4..d750c2c 100644 --- a/src/tabviews/zshare/actionList/changeuserbutton/index.jsx +++ b/src/tabviews/zshare/actionList/changeuserbutton/index.jsx @@ -1,7 +1,7 @@ import React, {Component} from 'react' import PropTypes from 'prop-types' import { is, fromJS } from 'immutable' -import { Button, notification, Modal } from 'antd' +import { Button, notification, Modal, Icon } from 'antd' import Api from '@/api' import zhCN from '@/locales/zh-CN/main.js' @@ -162,6 +162,8 @@ localStorage.setItem('localDataM', res.dataM ? 'true' : '') localStorage.setItem('debug', res.debug || '') localStorage.setItem('role_id', res.role_id || '') + localStorage.setItem('departmentcode', res.departmentcode || '') + localStorage.setItem('organization', res.organization || '') localStorage.setItem('localRole_id', res.role_id || '') sessionStorage.removeItem('CloudAvatar') @@ -207,6 +209,22 @@ >{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 || '' + // } else if (show === 'text') { + } else { + label = btn.label + } + return ( <Button type="link" @@ -214,9 +232,9 @@ loading={loading} disabled={disabled} style={btn.style} - icon={show === 'text' ? '' : (btn.icon || '')} + icon={icon} onClick={(e) => {e.stopPropagation(); this.actionTrigger()}} - >{show === 'icon' && btn.icon ? '' : btn.label}</Button> + >{label}</Button> ) } } -- Gitblit v1.8.0