From 6f817bf3ae4e6f51f982c07b0713adb3caf9fac2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 02 二月 2023 17:14:16 +0800
Subject: [PATCH] 2023-02-02
---
src/menu/components/share/pastecomponent/index.jsx | 55 +++++++++++++++++++------------------------------------
1 files changed, 19 insertions(+), 36 deletions(-)
diff --git a/src/menu/components/share/pastecomponent/index.jsx b/src/menu/components/share/pastecomponent/index.jsx
index e9c8bf3..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
})
}
@@ -129,6 +116,7 @@
pasteSubmit = () => {
const { options } = this.props
this.pasteFormRef.handleConfirm().then(res => {
+
if (!options.includes(res.copyType)) {
notification.warning({ top: 92, message: '閰嶇疆淇℃伅鏍煎紡閿欒锛�', duration: 5 })
return
@@ -136,34 +124,25 @@
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 (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 (['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'
@@ -183,9 +162,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)
@@ -214,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