From dcd660c86dba586c1b78c0530ddee7c1dc093ee6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 25 四月 2024 17:51:15 +0800
Subject: [PATCH] 2024-04-25

---
 src/menu/components/share/pastecomponent/index.jsx |   96 ++++++++++++++++++++++++++++--------------------
 1 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/src/menu/components/share/pastecomponent/index.jsx b/src/menu/components/share/pastecomponent/index.jsx
index cb1bb7b..a96fa09 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,10 +103,19 @@
   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
+      }
+
+      if (res.copyType === 'editcols') {
+        res.copyType = 'cols'
       }
 
       let type = res.copyType
@@ -133,6 +129,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
@@ -172,16 +172,32 @@
       } 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)
+        if ((config.subtype === 'normaltable' || config.subtype === 'editable') && res.cols.length === 1) {
+          config.cols.push(...res.cols)
+        } else {
+          let keys = config.cols.map(col => (col.field || '$empty'))
+  
+          let cols = []
+          res.cols.forEach(col => {
+            if (!col.field || !keys.includes(col.field)) {
+              cols.push(col)
+            }
+          })
+  
+          if (cols.length === 0) {
+            notification.warning({
+              top: 92,
+              message: '鏄剧ず鍒楀凡瀛樺湪锛�',
+              duration: 5
+            })
+            return
+          } else {
+            config.cols.push(...cols)
           }
-        })
+        }
       }
 
-      this.props.updateConfig(config)
+      this.props.updateConfig(config, type)
       this.setState({visible: false})
 
       notification.success({

--
Gitblit v1.8.0