From 06404e701a89955958cbf56213e2eec618d8644d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 16 十二月 2020 18:36:16 +0800
Subject: [PATCH] 2020-12-16
---
src/menu/components/table/normal-table/index.jsx | 29 ++++++-----------------------
1 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/src/menu/components/table/normal-table/index.jsx b/src/menu/components/table/normal-table/index.jsx
index d460388..9d2229c 100644
--- a/src/menu/components/table/normal-table/index.jsx
+++ b/src/menu/components/table/normal-table/index.jsx
@@ -16,7 +16,8 @@
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
const SearchComponent = asyncComponent(() => import('@/templates/sharecomponent/searchcomponent'))
-const ActionComponent = asyncComponent(() => import('@/menu/actioncomponent'))
+const ActionComponent = asyncComponent(() => import('@/menu/components/share/actioncomponent'))
+const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
const ColumnComponent = asyncComponent(() => import('./columns'))
const WrapComponent = asyncIconComponent(() => import('./wrapsetting'))
@@ -65,6 +66,7 @@
setting: { interType: 'system' },
wrap: { name: card.name, width: 24, bordered: 'true', tableType: 'checkbox' },
style: { marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px' },
+ headerStyle: { fontSize: '16px', borderBottomWidth: '1px', borderBottomColor: '#e8e8e8' },
columns: [],
cols: [
{ origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label1', field: '', Hide: 'false', type: 'text', Width: 120 },
@@ -160,22 +162,6 @@
this.props.updateConfig(_card)
}
- addCard = () => {
- let card = fromJS(this.state.card).toJS()
-
- // let newcard = {
- // uuid: Utils.getuuid(),
- // setting: { width: 6, type: 'simple'},
- // style: {
- // paddingTop: '5px', paddingBottom: '5px', paddingLeft: '15px', paddingRight: '15px',
- // },
- // elements: []
- // }
-
- this.setState({card})
- this.props.updateConfig(card)
- }
-
addColumns = () => {
let card = fromJS(this.state.card).toJS()
@@ -215,6 +201,7 @@
newcard.errorTime = 10
newcard.verify = null
newcard.show = 'button'
+ newcard.btnstyle = {marginRight: '15px'}
// 娉ㄥ唽浜嬩欢-娣诲姞鎸夐挳
MKEmitter.emit('addButton', card.uuid, newcard)
@@ -240,6 +227,7 @@
return (
<div className="menu-normal-table-edit-box" style={{...card.style, height: card.wrap.height}}>
+ <NormalHeader defaultshow="hidden" hideSearch="true" config={card} updateComponent={this.updateComponent}/>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<Icon className="plus" title="娣诲姞鍒�" onClick={this.addColumns} type="plus" />
@@ -254,12 +242,7 @@
<Icon type="tool" />
</Popover>
<SearchComponent config={card} updatesearch={this.updateconfig}/>
- <ActionComponent
- type="normaltable"
- config={card}
- setSubConfig={this.setSubConfig}
- updateaction={this.updateComponent}
- />
+ <ActionComponent config={card} setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
<ColumnComponent config={card} updatecolumn={this.updateconfig}/>
</div>
)
--
Gitblit v1.8.0