From b8cde0c39d7b6d58ceff3adf6dea3cb3118ea602 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 13 九月 2022 14:46:15 +0800
Subject: [PATCH] 2022-09-13
---
src/menu/components/table/edit-table/columns/index.jsx | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/menu/components/table/edit-table/columns/index.jsx b/src/menu/components/table/edit-table/columns/index.jsx
index 67057c7..50c3486 100644
--- a/src/menu/components/table/edit-table/columns/index.jsx
+++ b/src/menu/components/table/edit-table/columns/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { DndProvider, DragSource, DropTarget } from 'react-dnd'
-import { Table, Popover, Modal, message, Button } from 'antd'
+import { Table, Popover, Modal, message, Button, Typography } from 'antd'
import { PlusOutlined, FileSyncOutlined, EditOutlined, CopyOutlined, DeleteOutlined, FontColorsOutlined, CloseCircleOutlined, AntDesignOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
@@ -14,6 +14,7 @@
import './index.scss'
const { confirm } = Modal
+const { Paragraph } = Typography
const EditColumn = asyncComponent(() => import('./editColumn'))
const TableVerify = asyncComponent(() => import('./tableIn'))
const MarkColumn = asyncIconComponent(() => import('@/menu/components/share/markcomponent'))
@@ -69,9 +70,10 @@
}
<EditOutlined className="edit" title="缂栬緫" onClick={() => this.props.editColumn(column)} />
{column.type === 'custom' ? <PasteComponent options={['customCardElement']} updateConfig={(res, resolve) => this.props.pasteCell(column, res, resolve)} /> : null}
+ {column.type === 'action' ? <PasteComponent options={['action']} updateConfig={(res, resolve) => this.props.pasteCell(column, res, resolve)} /> : null}
{column.type === 'custom' ? <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => this.props.changeStyle(column)}/> : null}
<DeleteOutlined className="close" title="鍒犻櫎" onClick={this.deleteCol} />
- {['text', 'number', 'formula'].includes(column.type) ? <MarkColumn columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
+ {['text', 'number', 'formula'].includes(column.type) ? <MarkColumn field={column.field || ''} columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
</div>
} trigger="hover">
{children}
@@ -156,9 +158,9 @@
}
return (
<td style={{...style, minWidth: column.Width || 100}} className={className}>
- {val}
- {column.Hide === 'true' ? <CloseCircleOutlined style={{marginLeft: '5px', color: 'orange', fontSize: '12px'}}/> : null}
+ {column.field ? <Paragraph className="col-copy" copyable={{ text: column.field }}>{val}</Paragraph> : val}
{column.marks && column.marks.length ? <AntDesignOutlined className="profile"/> : null}
+ {column.Hide === 'true' ? <CloseCircleOutlined className="close-col"/> : null}
</td>
)
} else {
@@ -340,27 +342,25 @@
editStyleCard: fromJS(col).toJS()
})
- MKEmitter.emit('changeStyle', [col.uuid], ['font', 'padding'], col.style || {})
+ MKEmitter.emit('changeStyle', ['font', 'padding'], col.style || {}, this.getStyle)
}
changeSubmitStyle = () => {
const { config } = this.props
- MKEmitter.emit('changeStyle', [config.uuid, 'submit'], ['font', 'background', 'border', 'margin', 'padding'], config.submit.style || {})
+ MKEmitter.emit('changeStyle', ['font', 'background', 'border', 'margin', 'padding'], config.submit.style || {}, this.getSubmitStyle)
}
- getStyle = (comIds, style) => {
+ getSubmitStyle = (style) => {
const { config } = this.props
+
+ let submit = {...config.submit, style}
+
+ this.props.updatecolumn({...config, submit: submit})
+ }
+
+ getStyle = (style) => {
const { editStyleCard } = this.state
-
- if (comIds.length === 2 && comIds[0] === config.uuid && comIds[1] === 'submit') {
- let submit = {...config.submit, style}
-
- this.props.updatecolumn({...config, submit: submit})
-
- return
- }
- if (comIds.length !== 1 || !editStyleCard || comIds[0] !== editStyleCard.uuid) return
let _card = {...editStyleCard, style}
--
Gitblit v1.8.0