From 31871ca836e6fcbea9b1c54e2ec15f49667bf093 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 23 十二月 2022 14:14:04 +0800 Subject: [PATCH] 2022-12-23 --- src/menu/components/share/pastecomponent/index.jsx | 35 ++++++----------------------------- 1 files changed, 6 insertions(+), 29 deletions(-) diff --git a/src/menu/components/share/pastecomponent/index.jsx b/src/menu/components/share/pastecomponent/index.jsx index c6df7d3..cb1bb7b 100644 --- a/src/menu/components/share/pastecomponent/index.jsx +++ b/src/menu/components/share/pastecomponent/index.jsx @@ -1,7 +1,8 @@ import React, {Component} from 'react' import PropTypes from 'prop-types' import { fromJS } from 'immutable' -import { Icon, Modal, notification } from 'antd' +import { Modal, notification } from 'antd' +import { SnippetsOutlined } from '@ant-design/icons' import Utils from '@/utils/utils.js' import MKEmitter from '@/utils/events.js' @@ -24,15 +25,8 @@ this.setState({visible: true}) } - resetconfig = (item, copyBtns, config) => { + resetconfig = (item, config) => { let _uuid = Utils.getuuid() - - if (item.OpenType === 'popview') { - let _cell = fromJS(item).toJS() - _cell.$originUuid = _cell.uuid - _cell.uuid = _uuid - copyBtns.set(_uuid, _cell) - } if (item.uuid) { item.uuid = _uuid @@ -108,14 +102,7 @@ }) } else if (_item.type === 'action' && _item.elements) { _item.elements = _item.elements.map(cell => { - let _uuid = Utils.getuuid() - if (cell.OpenType === 'popview') { - let _cell = fromJS(cell).toJS() - _cell.$originUuid = _cell.uuid - _cell.uuid = _uuid - copyBtns.set(_uuid, _cell) - } - cell.uuid = _uuid + cell.uuid = Utils.getuuid() return cell }) } @@ -137,25 +124,15 @@ let type = res.copyType let config = fromJS(this.props.config).toJS() - let copyBtns = new Map() - res = this.resetconfig(res, copyBtns, config) + res = this.resetconfig(res, config) delete res.copyType - - copyBtns = [...copyBtns.values()] - - if (copyBtns.length > 0) { - MKEmitter.emit('copyButtons', copyBtns) - } if (config.type === 'form') { this.props.updateConfig(res) this.setState({visible: false}) return } else if (type === 'action') { - config.action = config.action || [] - config.action = config.action.filter(item => !item.origin) - if (['line', 'bar', 'scatter'].includes(config.type) && !['excelOut', 'excelIn'].includes(res.OpenType)) { notification.warning({ top: 92, message: '鍥捐〃涓笉鏀寔姝ょ被鎸夐挳锛�', duration: 5 }) return @@ -220,7 +197,7 @@ return ( <div style={{display: 'inline-block'}}> - <Icon type="snippets" style={{color: 'purple'}} onClick={() => {this.setState({visible: true})}} /> + <SnippetsOutlined style={{color: 'purple'}} onClick={() => {this.setState({visible: true})}} /> <Modal title="绮樿创" visible={visible} -- Gitblit v1.8.0