From c98e45bfac25e9110ad0383faac54a54d98ea9d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 18 十一月 2021 20:47:04 +0800
Subject: [PATCH] 2021-11-18
---
src/menu/components/share/markcomponent/index.jsx | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx
index 3608c2e..2a736fe 100644
--- a/src/menu/components/share/markcomponent/index.jsx
+++ b/src/menu/components/share/markcomponent/index.jsx
@@ -129,8 +129,11 @@
resetMark = () => {
const { marks, columns, type } = this.props
let markColumns = fromJS(this.state.markColumns).toJS()
+ let _columns = fromJS(columns).toJS()
- let options = columns.map(col => {
+ _columns.unshift({field: '$Index', label: '搴忓彿'})
+
+ let options = _columns.map(col => {
return {
value: col.field,
label: col.label,
@@ -143,7 +146,7 @@
{
value: 'dynamic',
label: '鍔ㄦ�佸��',
- children: columns.map(cell => {
+ children: _columns.map(cell => {
return {
value: cell.field,
label: cell.label
@@ -251,7 +254,7 @@
}
]
- if (type === 'line') {
+ if (type === 'line' || type === 'sequence') {
signs.pop()
} else if (type === 'slider') {
markColumns = markColumns.filter(col => {
@@ -296,7 +299,7 @@
} else {
item.fontColor = ''
}
- } catch {
+ } catch (e) {
item.fontColor = ''
}
}
--
Gitblit v1.8.0