From 1d1ef9c117f162f5ee48237b67d69fbd015b10d1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 23 七月 2023 10:32:40 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/base-table/index.jsx | 50 ++++++++++++++------------------------------------
1 files changed, 14 insertions(+), 36 deletions(-)
diff --git a/src/menu/components/table/base-table/index.jsx b/src/menu/components/table/base-table/index.jsx
index 70765a7..c05c3d4 100644
--- a/src/menu/components/table/base-table/index.jsx
+++ b/src/menu/components/table/base-table/index.jsx
@@ -99,39 +99,6 @@
MKEmitter.removeListener('completeSave', this.completeSave)
}
- // updateFix = (card) => {
- // let fixs = {}
-
- // card.cols.forEach(col => {
- // if (!col.field) return
- // if (col.postfix || col.prefix) {
- // fixs[col.field] = col
- // }
- // })
-
- // card.cols.forEach(col => {
- // if (col.type === 'custom') {
- // col.elements.forEach(cell => {
- // if (cell.datatype === 'dynamic') {
- // cell.height = ''
- // cell.innerHeight = 'auto'
-
- // if (fixs[cell.field]) {
- // if (!cell.prefix && fixs[cell.field].prefix) {
- // cell.prefix = fixs[cell.field].prefix
- // }
- // if (!cell.postfix && fixs[cell.field].postfix) {
- // cell.postfix = fixs[cell.field].postfix
- // }
- // }
- // }
- // })
- // }
- // })
-
- // return card
- // }
-
completeSave = () => {
const { card } = this.state
@@ -142,7 +109,9 @@
item.cols = item.cols.filter(a => !a.origin)
delete item.isNew
- this.setState({card: item}, () => { MKEmitter.emit('revert') })
+ this.setState({card: null}, () => {
+ this.setState({card: item})
+ })
}
}
@@ -253,8 +222,13 @@
let _actions = [...action]
cols.forEach(col => {
- if (col.type !== 'action') return
- _actions.push(...col.elements)
+ if (col.type === 'custom') {
+ col.elements.forEach(cell => {
+ if (cell.eleType !== 'button') return
+
+ _actions.push(cell)
+ })
+ }
})
return getWrapForm(wrap, _actions, columns)
@@ -273,6 +247,8 @@
res.drawerPlacement = card.wrap.drawerPlacement || 'right'
res.searchRatio = card.wrap.searchRatio || 6
res.searchLwidth = card.wrap.searchLwidth !== undefined ? card.wrap.searchLwidth : 33.3
+ res.borderRadius = card.wrap.borderRadius || 0
+ res.resetContrl = card.wrap.resetContrl || 'init'
this.updateComponent({...card, wrap: res})
}
@@ -346,6 +322,8 @@
const { card } = this.state
let options = ['action', 'search', 'form', 'cols']
+ if (!card) return null
+
return (
<div className="menu-base-table-edit-box" style={card.style} id={card.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
--
Gitblit v1.8.0