From fbad7d82de145608672e6df2895bf97730afc8b2 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 24 四月 2023 18:00:01 +0800 Subject: [PATCH] 2023-04-24 --- src/menu/components/share/pastecomponent/index.jsx | 113 ++++++++++++++++++++++++++++++++------------------------ 1 files changed, 65 insertions(+), 48 deletions(-) diff --git a/src/menu/components/share/pastecomponent/index.jsx b/src/menu/components/share/pastecomponent/index.jsx index 2d12bb3..51ae57d 100644 --- a/src/menu/components/share/pastecomponent/index.jsx +++ b/src/menu/components/share/pastecomponent/index.jsx @@ -1,12 +1,13 @@ 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' import asyncComponent from '@/utils/asyncComponent' -import './index.scss' +// import './index.scss' const PasteForm = asyncComponent(() => import('@/templates/zshare/pasteform')) @@ -20,27 +21,45 @@ visible: false } - handleMenuClick = () => { - this.setState({visible: true}) - } - - resetconfig = (item, copyBtns) => { + 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 } - if (item.copyType === 'cardcell') { + if (item.copyType === 'cardcell' && config.subtype === 'datacard') { + item.setting = item.setting || {} + item.$cardType = 'extendCard' + item.setting.width = item.setting.width || 6 + + if (item.elements) { + item.elements = item.elements.map(cell => { + if (cell.datatype === 'dynamic') { + cell.datatype = 'static' + } + cell.uuid = Utils.getuuid() + return cell + }) + } + if (item.backElements) { + item.backElements = item.backElements.map(cell => { + if (cell.datatype === 'dynamic') { + cell.datatype = 'static' + } + cell.uuid = Utils.getuuid() + return cell + }) + } + } else if (item.copyType === 'cardcell') { item.setting = item.setting || {} item.setting.width = item.setting.width || 6 + delete item.$cardType + + if (config.type === 'carousel') { + delete item.setting.linkbtn + delete item.backElements + } if (item.elements) { item.elements = item.elements.map(cell => { @@ -84,14 +103,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 }) } @@ -106,40 +118,41 @@ const { options } = this.props this.pasteFormRef.handleConfirm().then(res => { if (!options.includes(res.copyType)) { - notification.warning({ - top: 92, - message: '閰嶇疆淇℃伅鏍煎紡閿欒锛�', - duration: 5 - }) + notification.warning({ top: 92, message: '閰嶇疆淇℃伅鏍煎紡閿欒锛�', duration: 5 }) + return + } + + if (!this.props.config) { + this.props.updateConfig(res) + this.setState({visible: false}) return } let type = res.copyType let config = fromJS(this.props.config).toJS() - let copyBtns = new Map() - res = this.resetconfig(res, copyBtns) + res = this.resetconfig(res, config) delete res.copyType - copyBtns = [...copyBtns.values()] - - if (copyBtns.length > 0) { - MKEmitter.emit('copyButtons', copyBtns) - } - - if (type === 'action') { - config.action = config.action || [] - config.action = config.action.filter(item => !item.origin) - + if (config.type === 'form') { + this.props.updateConfig(res) + this.setState({visible: false}) + return + } else if (type === 'action') { + if (res.style) { + delete res.style.width + delete res.style.float + } + if (['line', 'bar', 'scatter'].includes(config.type) && !['excelOut', 'excelIn'].includes(res.OpenType)) { + notification.warning({ top: 92, message: '鍥捐〃涓笉鏀寔姝ょ被鎸夐挳锛�', duration: 5 }) + return + } MKEmitter.emit('addButton', config.uuid, res) } else if (type === 'search' || type === 'form') { - config.search = config.search || [] - config.search = config.search.filter(item => !item.origin) - - let keys = config.search.map(item => item.field.toLowerCase()) + let keys = config.search.map(item => item.field ? item.field.toLowerCase() : '') if (type === 'form') { - if (['number', 'switch', 'textarea', 'checkcard', 'fileupload', 'hint', 'color', 'funcvar'].includes(res.type)) { + if (['number', 'switch', 'textarea', 'fileupload', 'hint', 'color', 'funcvar'].includes(res.type)) { res.type = 'text' } else if (res.type === 'radio') { res.type = 'select' @@ -159,9 +172,13 @@ return } - config.search.push(res) + MKEmitter.emit('plusSearch', config.uuid, res, 'simple') + this.setState({visible: false}) + return } else if (type === 'cardcell') { config.subcards.push(res) + } else if (type === 'menucell') { + config.subMenus.push(res) } else if (type === 'cols') { config.cols = config.cols.filter(col => !col.origin) @@ -174,7 +191,7 @@ }) } - this.props.updateConfig(config) + this.props.updateConfig(config, type) this.setState({visible: false}) notification.success({ @@ -190,7 +207,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