From 0227c25e4ed573d3095ada3f9c9a4ba5f18b0de5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 20 一月 2021 10:53:01 +0800
Subject: [PATCH] 2021-01-20
---
src/menu/components/table/normal-table/columns/index.jsx | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/index.jsx b/src/menu/components/table/normal-table/columns/index.jsx
index b2e611a..d779374 100644
--- a/src/menu/components/table/normal-table/columns/index.jsx
+++ b/src/menu/components/table/normal-table/columns/index.jsx
@@ -14,7 +14,7 @@
const { confirm } = Modal
const EditColumn = asyncIconComponent(() => import('./editColumn'))
-const MarkColumn = asyncIconComponent(() => import('./markcolumn'))
+const MarkColumn = asyncIconComponent(() => import('@/menu/components/share/markcomponent'))
const CardCellComponent = asyncComponent(() => import('@/menu/components/card/cardcellcomponent'))
class HeaderCol extends Component {
@@ -176,6 +176,7 @@
state = {
dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ tableId: '',
data: [{uuid: Utils.getuuid()}],
refresh: false, // 寮哄埗鍒锋柊
columns: [],
@@ -186,7 +187,24 @@
UNSAFE_componentWillMount () {
const { config } = this.props
+ let tableId = (() => {
+ let uuid = []
+ let _options = 'abcdefghigklmnopqrstuv'
+ for (let i = 0; i < 19; i++) {
+ uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
+ }
+ return uuid.join('')
+ }) ()
+
+ if (config.wrap && config.wrap.borderColor) { // 杈规棰滆壊
+ let style = `#${tableId} table, #${tableId} tr, #${tableId} th, #${tableId} td {border-color: ${config.wrap.borderColor}}`
+ let ele = document.createElement('style')
+ ele.innerHTML = style
+ document.getElementsByTagName('head')[0].appendChild(ele)
+ }
+
this.setState({
+ tableId,
columns: fromJS(config.cols).toJS(),
fields: fromJS(config.columns).toJS(),
lineMarks: config.lineMarks ? fromJS(config.lineMarks).toJS() : []
@@ -197,13 +215,17 @@
if (!is(fromJS(this.state.columns), fromJS(nextProps.config.cols))) {
let _columns = fromJS(nextProps.config.cols).toJS()
this.setState({columns: _columns})
-
let lastcol = _columns.slice(-1)[0]
if (lastcol && lastcol.focus) {
this.editColumn(lastcol)
}
} else if (!is(fromJS(this.state.fields), fromJS(nextProps.config.columns))) {
this.setState({fields: fromJS(nextProps.config.columns).toJS()})
+ } else if (this.props.config.wrap.borderColor !== nextProps.config.wrap.borderColor) {
+ let style = `#${this.state.tableId} table, #${this.state.tableId} tr, #${this.state.tableId} th, #${this.state.tableId} td {border-color: ${nextProps.config.wrap.borderColor}}`
+ let ele = document.createElement('style')
+ ele.innerHTML = style
+ document.getElementsByTagName('head')[0].appendChild(ele)
}
}
@@ -373,8 +395,8 @@
let oInput = document.createElement('input')
let val = {
- copyType: 'columns',
- columns: columns
+ copyType: 'cols',
+ cols: columns.filter(col => !col.origin)
}
oInput.value = window.btoa(window.encodeURIComponent(JSON.stringify(val)))
@@ -460,7 +482,7 @@
render() {
const { config } = this.props
- const { fields, card, lineMarks, dict } = this.state
+ const { fields, card, lineMarks, dict, tableId } = this.state
const components = {
header: {
cell: DragableHeaderCol
@@ -473,7 +495,7 @@
const columns = this.handlecolumns(this.state.columns, fields, config)
return (
- <div className={`normal-table-columns ${config.setting.laypage} ${config.wrap.tableType}`}>
+ <div className={`normal-table-columns ${config.setting.laypage} ${config.wrap.tableType}`} id={tableId}>
<div className="col-control">
<Icon title="澶嶅埗" type="copy" onClick={this.copycolumn} />
<MarkColumn columns={fields} type="line" marks={lineMarks} onSubmit={this.updateLineMarks} />
@@ -482,6 +504,7 @@
<DndProvider>
<Table
rowKey="uuid"
+ size={config.wrap.size || 'middle'}
rowClassName="editable-row"
bordered={config.wrap.bordered !== 'false'}
components={components}
--
Gitblit v1.8.0