From 49f09cc6f8ff8c30a75ed1a9d6f510b69b73962a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 12 十二月 2023 21:05:37 +0800
Subject: [PATCH] 2023-12-12
---
src/menu/components/share/pastebasetable/index.jsx | 45 +++++++++++++++------------------------------
1 files changed, 15 insertions(+), 30 deletions(-)
diff --git a/src/menu/components/share/pastebasetable/index.jsx b/src/menu/components/share/pastebasetable/index.jsx
index adb2c56..84811f8 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 => {
@@ -110,7 +95,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="绮樿创"
@@ -123,7 +108,7 @@
>
<PasteForm wrappedComponentRef={(inst) => this.pasteFormRef = inst} inputSubmit={this.pasteSubmit}/>
</Modal>
- </div>
+ </>
)
}
}
--
Gitblit v1.8.0