From 5e871a4164869bac7927ea6884dbadd650b1cadf Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 25 五月 2023 11:25:28 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/pastecomponent/index.jsx | 40 +++++++++++++---------------------------
1 files changed, 13 insertions(+), 27 deletions(-)
diff --git a/src/menu/components/share/pastecomponent/index.jsx b/src/menu/components/share/pastecomponent/index.jsx
index 51ae57d..5c2b417 100644
--- a/src/menu/components/share/pastecomponent/index.jsx
+++ b/src/menu/components/share/pastecomponent/index.jsx
@@ -74,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
--
Gitblit v1.8.0