From b8cde0c39d7b6d58ceff3adf6dea3cb3118ea602 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 13 九月 2022 14:46:15 +0800
Subject: [PATCH] 2022-09-13
---
src/menu/components/share/pastecomponent/index.jsx | 142 ++++++++++++++++++++++++++++++++++------------
1 files changed, 104 insertions(+), 38 deletions(-)
diff --git a/src/menu/components/share/pastecomponent/index.jsx b/src/menu/components/share/pastecomponent/index.jsx
index 95ffb34..b0c79bb 100644
--- a/src/menu/components/share/pastecomponent/index.jsx
+++ b/src/menu/components/share/pastecomponent/index.jsx
@@ -1,9 +1,11 @@
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'
@@ -23,12 +25,47 @@
this.setState({visible: true})
}
- resetconfig = (item) => {
- item.uuid = Utils.getuuid()
+ resetconfig = (item, copyBtns, config) => {
+ let _uuid = Utils.getuuid()
- if (item.copyType === 'cardcell') {
+ 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' && 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 (item.elements) {
item.elements = item.elements.map(cell => {
@@ -42,7 +79,7 @@
return cell
})
}
- } else if (item.copyType === 'table') {
+ } else if (item.copyType === 'cols') {
let loopCol = (col) => {
col.subcols = col.subcols.map(c => {
c.uuid = Utils.getuuid()
@@ -54,11 +91,6 @@
cell.uuid = Utils.getuuid()
return cell
})
- } else if (c.type === 'action' && c.elements) {
- c.elements = c.elements.map(cell => {
- cell.uuid = Utils.getuuid()
- return cell
- })
}
return c
})
@@ -66,19 +98,30 @@
return col
}
- if (item.type === 'colspan' && item.subcols) {
- item = loopCol(item)
- } else if (item.type === 'custom' && item.elements) {
- item.elements = item.elements.map(cell => {
- cell.uuid = Utils.getuuid()
- return cell
- })
- } else if (item.type === 'action' && item.elements) {
- item.elements = item.elements.map(cell => {
- cell.uuid = Utils.getuuid()
- return cell
- })
- }
+ item.cols = item.cols.map(_item => {
+ _item.uuid = Utils.getuuid()
+ if (_item.type === 'colspan' && _item.subcols) {
+ _item = loopCol(_item)
+ } else if (_item.type === 'custom' && _item.elements) {
+ _item.elements = _item.elements.map(cell => {
+ cell.uuid = Utils.getuuid()
+ return cell
+ })
+ } 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
+ return cell
+ })
+ }
+ return _item
+ })
}
return item
@@ -87,34 +130,43 @@
pasteSubmit = () => {
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
}
let type = res.copyType
let config = fromJS(this.props.config).toJS()
+ let copyBtns = new Map()
- res = this.resetconfig(res)
+ res = this.resetconfig(res, copyBtns, config)
delete res.copyType
- if (type === 'action') {
+ 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)
- config.action.push(res)
+ 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'
@@ -134,9 +186,23 @@
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)
+
+ let keys = config.cols.map(col => (col.field || '$empty'))
+
+ res.cols.forEach(col => {
+ if (!keys.includes(col.field)) {
+ config.cols.push(col)
+ }
+ })
}
this.props.updateConfig(config)
@@ -155,7 +221,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