From 3e13e3e61854671fce6aac45679e1b7252126105 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 24 十二月 2023 23:41:01 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/normal-table/index.jsx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/table/normal-table/index.jsx b/src/menu/components/table/normal-table/index.jsx
index 5a6fd01..6bdefb2 100644
--- a/src/menu/components/table/normal-table/index.jsx
+++ b/src/menu/components/table/normal-table/index.jsx
@@ -280,7 +280,7 @@
getWrapForms = () => {
const { wrap, action, columns, cols } = this.state.card
- let _actions = [...action]
+ let _actions = []
cols.forEach(col => {
if (col.type === 'custom') {
@@ -292,7 +292,7 @@
}
})
- return getWrapForm(wrap, _actions, columns)
+ return getWrapForm(wrap, _actions, columns, action)
}
updateWrap = (res) => {
@@ -374,7 +374,7 @@
<PlusOutlined className="plus" title="娣诲姞鍒�" onClick={() => this.addColumns()}/>
{appType !== 'mob' ? <PlusCircleOutlined className="plus" title="娣诲姞鎼滅储" onClick={this.addSearch}/> : null}
<PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton}/>
- <NormalForm title="琛ㄦ牸璁剧疆" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
+ <NormalForm title="琛ㄦ牸璁剧疆" width={850} update={this.updateWrap} getForms={this.getWrapForms}>
<EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
<CopyComponent type="normaltable" card={card}/>
--
Gitblit v1.8.0