From e1cee96b38805bcccf48e7bcb9d296f2bc54c720 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 24 一月 2025 11:10:32 +0800
Subject: [PATCH] 2025-01-24

---
 src/menu/components/share/pastebasetable/index.jsx |   56 ++++++++++++++++++++++----------------------------------
 1 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/src/menu/components/share/pastebasetable/index.jsx b/src/menu/components/share/pastebasetable/index.jsx
index ac88559..9204d46 100644
--- a/src/menu/components/share/pastebasetable/index.jsx
+++ b/src/menu/components/share/pastebasetable/index.jsx
@@ -4,6 +4,7 @@
 import { SnippetsOutlined } from '@ant-design/icons'
 
 import Utils from '@/utils/utils.js'
+import MenuUtils from '@/utils/utils-custom.js'
 import asyncComponent from '@/utils/asyncComponent'
 // import './index.scss'
 
@@ -17,10 +18,6 @@
 
   state = {
     visible: false
-  }
-
-  handleMenuClick = () => {
-    this.setState({visible: true})
   }
 
   pasteSubmit = () => {
@@ -43,42 +40,31 @@
         return cell
       })
 
-      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 (col.type === 'action') {
+            col.type = 'custom'
+          }
 
-          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 === '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()
+
+              if (cell.eleType === 'button') {
+                MenuUtils.resetBtn(cell, cell.uuid)
+              }
               return cell
             })
           }
-          return c
+          return col
         })
-
-        return col
       }
 
-      res.cols = res.cols.map(col => {
-        col.uuid = Utils.getuuid()
-
-        if (col.type === 'colspan' && col.subcols) {
-          col = loopCol(col)
-        } else if (col.type === 'custom' && col.elements) {
-          col.elements = col.elements.map(cell => {
-            cell.uuid = Utils.getuuid()
-            return cell
-          })
-        } else if (col.type === 'action' && col.elements) {
-          col.elements = col.elements.map(cell => {
-            cell.uuid = Utils.getuuid()
-            return cell
-          })
-        }
-        return col
-      })
+      res.cols = loopCol(res.cols)
 
       let oriUids = {}
       res.action = res.action.map(cell => {
@@ -87,6 +73,8 @@
         oriUids[cell.uuid] = _uuid
 
         cell.uuid = _uuid
+
+        MenuUtils.resetBtn(cell, cell.uuid)
 
         return cell
       })
@@ -114,7 +102,7 @@
     const { visible } = this.state
 
     return (
-      <div style={{display: 'inline-block'}}>
+      <>
         {type === 'page' ? <Button icon="snippets" style={{color: '#1890ff', borderColor: '#1890ff'}} onClick={() => {this.setState({visible: true})}} >绮樿创</Button> : <SnippetsOutlined style={{color: 'purple'}} onClick={() => {this.setState({visible: true})}} />}
         <Modal
           title="绮樿创"
@@ -127,7 +115,7 @@
         >
           <PasteForm wrappedComponentRef={(inst) => this.pasteFormRef = inst} inputSubmit={this.pasteSubmit}/>
         </Modal>
-      </div>
+      </>
     )
   }
 }

--
Gitblit v1.8.0