From bc5ec1017fd8a140ec5c30ea9e8ea839d5bf1bda Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 15 十二月 2020 16:22:20 +0800
Subject: [PATCH] 2020-12-15
---
src/menu/components/table/normal-table/columns/index.jsx | 12 ++++++------
1 files changed, 6 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 b2c1597..944cf5b 100644
--- a/src/menu/components/table/normal-table/columns/index.jsx
+++ b/src/menu/components/table/normal-table/columns/index.jsx
@@ -13,7 +13,6 @@
import './index.scss'
const { confirm } = Modal
-const coldict = localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
const EditColumn = asyncIconComponent(() => import('./editColumn'))
const MarkColumn = asyncIconComponent(() => import('./markcolumn'))
const CardCellComponent = asyncComponent(() => import('@/menu/components/card/cardcellcomponent'))
@@ -58,7 +57,7 @@
}
<Icon className="edit" title="缂栬緫" type="edit" onClick={() => this.props.editColumn(column)} />
<Icon className="close" title="鍒犻櫎" type="delete" onClick={this.deleteCol} />
- {column && ['text', 'number'].includes(column.type) ? <MarkColumn dict={coldict} columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
+ {column && ['text', 'number'].includes(column.type) ? <MarkColumn columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
</div>
} trigger="hover">
{children}
@@ -75,7 +74,7 @@
}
<Icon className="edit" title="缂栬緫" type="edit" onClick={() => this.props.editColumn(column)} />
<Icon className="close" title="鍒犻櫎" type="delete" onClick={this.deleteCol} />
- {column && ['text', 'number'].includes(column.type) ? <MarkColumn dict={coldict} columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
+ {column && ['text', 'number'].includes(column.type) ? <MarkColumn columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
</div>
} trigger="hover">
{children}
@@ -174,6 +173,7 @@
}
state = {
+ dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
data: [{uuid: Utils.getuuid()}],
columns: [],
fields: [],
@@ -389,7 +389,7 @@
render() {
const { config } = this.props
- const { fields, card, lineMarks } = this.state
+ const { fields, card, lineMarks, dict } = this.state
const components = {
header: {
cell: DragableHeaderCol
@@ -449,7 +449,7 @@
<div className={`normal-table-columns ${config.setting.laypage} ${config.wrap.tableType}`}>
<div className="col-control">
<Icon title="澶嶅埗" type="copy" onClick={this.copycolumn} />
- <MarkColumn dict={coldict} columns={fields} type="line" marks={lineMarks} onSubmit={this.updateLineMarks} />
+ <MarkColumn columns={fields} type="line" marks={lineMarks} onSubmit={this.updateLineMarks} />
</div>
<DndProvider>
<Table
@@ -470,7 +470,7 @@
}}
/>
</DndProvider>
- <EditColumn column={card} dict={coldict} fields={fields} submitCol={this.submitCol} cancelCol={this.cancelCol}/>
+ <EditColumn column={card} dict={dict} fields={fields} submitCol={this.submitCol} cancelCol={this.cancelCol}/>
</div>
)
}
--
Gitblit v1.8.0