From f66e19dd13af07ee466306632ad43c72f1f16ae7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 26 五月 2021 14:49:55 +0800
Subject: [PATCH] 2021-05-26
---
src/menu/components/share/pastecomponent/index.jsx | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/menu/components/share/pastecomponent/index.jsx b/src/menu/components/share/pastecomponent/index.jsx
index 2d12bb3..e9c8bf3 100644
--- a/src/menu/components/share/pastecomponent/index.jsx
+++ b/src/menu/components/share/pastecomponent/index.jsx
@@ -24,7 +24,7 @@
this.setState({visible: true})
}
- resetconfig = (item, copyBtns) => {
+ resetconfig = (item, copyBtns, config) => {
let _uuid = Utils.getuuid()
if (item.OpenType === 'popview') {
@@ -38,9 +38,33 @@
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 (item.elements) {
item.elements = item.elements.map(cell => {
@@ -106,11 +130,7 @@
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
}
@@ -118,7 +138,7 @@
let config = fromJS(this.props.config).toJS()
let copyBtns = new Map()
- res = this.resetconfig(res, copyBtns)
+ res = this.resetconfig(res, copyBtns, config)
delete res.copyType
copyBtns = [...copyBtns.values()]
@@ -131,6 +151,10 @@
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
+ }
MKEmitter.emit('addButton', config.uuid, res)
} else if (type === 'search' || type === 'form') {
config.search = config.search || []
--
Gitblit v1.8.0