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/pastebasetable/index.jsx | 41 +++++++++++++----------------------------
1 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/src/menu/components/share/pastebasetable/index.jsx b/src/menu/components/share/pastebasetable/index.jsx
index adb2c56..5c8eb9a 100644
--- a/src/menu/components/share/pastebasetable/index.jsx
+++ b/src/menu/components/share/pastebasetable/index.jsx
@@ -39,42 +39,27 @@
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()
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 => {
--
Gitblit v1.8.0