From ed1cc4adc145f8685d04763e19fbd6b0bd80c136 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 09 六月 2022 16:22:44 +0800
Subject: [PATCH] 2022-06-09

---
 src/menu/components/tabs/paste/index.jsx |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/menu/components/tabs/paste/index.jsx b/src/menu/components/tabs/paste/index.jsx
index a18fd27..3e73e8d 100644
--- a/src/menu/components/tabs/paste/index.jsx
+++ b/src/menu/components/tabs/paste/index.jsx
@@ -1,6 +1,7 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
-import { Icon, Modal, notification } from 'antd'
+import { Modal, notification } from 'antd'
+import { SnippetsOutlined } from '@ant-design/icons'
 
 import MenuUtils from '@/utils/utils-custom.js'
 import MKEmitter from '@/utils/events.js'
@@ -23,8 +24,7 @@
     this.setState({visible: true})
   }
 
-  resetconfig = (item, Tab, copyBtns, uuids = {}) => {
-    item.floor = Tab.floor + 1
+  resetconfig = (item, Tab, copyBtns, uuids = {}, floor) => {
     item.tabId = Tab.uuid
     item.parentId = Tab.parentId
     
@@ -39,12 +39,12 @@
         tab.uuid = uuids[tab.uuid]
         tab.parentId = item.uuid
 
-        if (item.floor >= 3) {
+        if (floor >= 3) {
           tab.components = tab.components.filter(cell => cell.type !== 'tabs')
         }
 
         tab.components = tab.components.map(cell => {
-          cell = this.resetconfig(cell, tab, copyBtns, uuids)
+          cell = this.resetconfig(cell, tab, copyBtns, uuids, floor + 1)
           return cell
         })
       })
@@ -55,7 +55,6 @@
       item.name = item.setting.name
 
       item.components = item.components.map(cell => {
-        cell.floor = Tab.floor + 1
         cell.tabId = Tab.uuid
         cell.parentId = Tab.parentId
 
@@ -101,8 +100,9 @@
       }
 
       let copyBtns = new Map()
+      let floor = MenuUtils.getFloor(Tab.parentId)
 
-      res = this.resetconfig(res, Tab, copyBtns)
+      res = this.resetconfig(res, Tab, copyBtns, {}, floor)
 
       delete res.copyType
       
@@ -129,7 +129,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