From a29d9d644a2a30e9ef4afcc6d728c20c218dc359 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 15 六月 2023 14:25:28 +0800
Subject: [PATCH] 2023-06-15
---
src/menu/components/share/pastecomponent/index.jsx | 64 +++++++++++++++-----------------
1 files changed, 30 insertions(+), 34 deletions(-)
diff --git a/src/menu/components/share/pastecomponent/index.jsx b/src/menu/components/share/pastecomponent/index.jsx
index cb1bb7b..5c2b417 100644
--- a/src/menu/components/share/pastecomponent/index.jsx
+++ b/src/menu/components/share/pastecomponent/index.jsx
@@ -7,7 +7,7 @@
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'))
@@ -19,10 +19,6 @@
state = {
visible: false
- }
-
- handleMenuClick = () => {
- this.setState({visible: true})
}
resetconfig = (item, config) => {
@@ -60,6 +56,11 @@
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 => {
cell.uuid = Utils.getuuid()
@@ -73,41 +74,27 @@
})
}
} else if (item.copyType === 'cols') {
- let loopCol = (col) => {
- col.subcols = col.subcols.map(c => {
- c.uuid = Utils.getuuid()
+ let loopCol = (cols) => {
+ return cols.map(col => {
+ col.uuid = Utils.getuuid()
- if (c.type === 'colspan' && c.subcols) {
- c = loopCol(c)
- } else if (c.type === 'custom' && c.elements) {
- c.elements = c.elements.map(cell => {
+ if (col.type === 'action') {
+ col.type = 'custom'
+ }
+
+ if (col.type === 'colspan' && col.subcols) {
+ col.subcols = loopCol(col.subcols)
+ } else if (col.type === 'custom' && col.elements) {
+ col.elements = col.elements.map(cell => {
cell.uuid = Utils.getuuid()
return cell
})
}
- return c
+ return col
})
-
- return col
}
- 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 => {
- cell.uuid = Utils.getuuid()
- return cell
- })
- }
- return _item
- })
+ item.cols = loopCol(item.cols)
}
return item
@@ -116,9 +103,14 @@
pasteSubmit = () => {
const { options } = this.props
this.pasteFormRef.handleConfirm().then(res => {
-
if (!options.includes(res.copyType)) {
notification.warning({ top: 92, message: '閰嶇疆淇℃伅鏍煎紡閿欒锛�', duration: 5 })
+ return
+ }
+
+ if (!this.props.config) {
+ this.props.updateConfig(res)
+ this.setState({visible: false})
return
}
@@ -133,6 +125,10 @@
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
@@ -181,7 +177,7 @@
})
}
- this.props.updateConfig(config)
+ this.props.updateConfig(config, type)
this.setState({visible: false})
notification.success({
--
Gitblit v1.8.0