From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/logcomponent/index.jsx | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/share/logcomponent/index.jsx b/src/menu/components/share/logcomponent/index.jsx
index dd2112b..8130e93 100644
--- a/src/menu/components/share/logcomponent/index.jsx
+++ b/src/menu/components/share/logcomponent/index.jsx
@@ -1,10 +1,12 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Modal, Button, Popconfirm, Table } from 'antd'
+import { Modal, Button, Popconfirm, Table } from 'antd'
+import { RedoOutlined, CloseOutlined, RollbackOutlined } from '@ant-design/icons'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
+import MKEmitter from '@/utils/events.js'
import './index.scss'
const { confirm } = Modal
@@ -16,7 +18,8 @@
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ appType: sessionStorage.getItem('appType'),
visible: false,
data: [],
columns: [
@@ -42,14 +45,14 @@
title="纭畾鎭㈠璁板綍鍚楋紵"
onConfirm={() => this.revert(record)}
>
- <span title="鎭㈠" style={{color: '#26C281', fontSize: '16px', marginRight: '5px', cursor: 'pointer', padding: '5px'}}><Icon type="redo" /></span>
+ <span title="鎭㈠" style={{color: '#26C281', fontSize: '16px', marginRight: '5px', cursor: 'pointer', padding: '5px'}}><RedoOutlined /></span>
</Popconfirm>
<Popconfirm
overlayClassName="popover-confirm"
title="纭畾娓呴櫎璁板綍鍚楋紵"
onConfirm={() => this.handleDelete(record)}
>
- <span title="娓呴櫎" style={{color: '#ff4d4f', fontSize: '16px', cursor: 'pointer', padding: '5px'}}><Icon type="close" /></span>
+ <span title="娓呴櫎" style={{color: '#ff4d4f', fontSize: '16px', cursor: 'pointer', padding: '5px'}}><CloseOutlined /></span>
</Popconfirm>
</div>)
}
@@ -68,10 +71,15 @@
}
revert = (item) => {
+ const { appType } = this.state
const data = this.state.data.filter(d => d.uuid !== item.uuid)
this.setState({data})
this.props.handlelog('revert', data, item)
+
+ if (appType === 'mob' || (appType === 'pc' && item.OpenType !== 'popview')) return
+
+ MKEmitter.emit('thawButtons', item.uuid)
}
handleDelete = (item) => {
@@ -95,11 +103,12 @@
}
render () {
+ const { btnlog } = this.props
const { visible, dict, data, columns } = this.state
return (
- <div className="btn-log-wrap">
- <Icon type="rollback" onClick={this.trigger} />
+ <div className={'btn-log-wrap' + (btnlog && btnlog.length > 0 ? ' tip-sign' : '')}>
+ <RollbackOutlined title="瑙ｉ櫎鍐荤粨" onClick={this.trigger} />
<Modal
wrapClassName="popview-modal"
title="鍘嗗彶璁板綍"
--
Gitblit v1.8.0