From dddb2c96f42d9c852dba26ff9a27daa12bd85008 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 14 十月 2021 00:07:20 +0800
Subject: [PATCH] 2021-10-14
---
src/menu/components/share/markcomponent/index.jsx | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx
index 03dd41d..2a736fe 100644
--- a/src/menu/components/share/markcomponent/index.jsx
+++ b/src/menu/components/share/markcomponent/index.jsx
@@ -13,6 +13,7 @@
import '@/assets/css/table.scss'
const EditTable = asyncComponent(() => import('@/templates/zshare/editTable'))
+const { confirm } = Modal
class MarkColumn extends Component {
static propTpyes = {
@@ -22,7 +23,7 @@
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
marks: null,
columns: null,
visible: false,
@@ -128,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,
@@ -142,7 +146,7 @@
{
value: 'dynamic',
label: '鍔ㄦ�佸��',
- children: columns.map(cell => {
+ children: _columns.map(cell => {
return {
value: cell.field,
label: cell.label
@@ -250,7 +254,7 @@
}
]
- if (type === 'line') {
+ if (type === 'line' || type === 'sequence') {
signs.pop()
} else if (type === 'slider') {
markColumns = markColumns.filter(col => {
@@ -278,9 +282,13 @@
}
markSubmit = () => {
- this.setState({
- visible: false
- })
+ let save = false
+ let input = document.getElementById('contrastValue')
+ let val = input && input.value ? input.value : ''
+
+ if (!val) {
+ save = true
+ }
let marks = this.state.marks.map(item => {
if (item.signType && item.signType[0] === 'background') {
@@ -291,14 +299,32 @@
} else {
item.fontColor = ''
}
- } catch {
+ } catch (e) {
item.fontColor = ''
}
+ }
+ if (val && item.contrastValue === val) {
+ save = true
}
return item
})
- this.props.onSubmit(marks)
+ if (save) {
+ this.setState({
+ visible: false
+ })
+ this.props.onSubmit(marks)
+ } else {
+ const _this = this
+ confirm({
+ title: '瀛樺湪鏈繚瀛樻爣璁帮紝纭畾蹇界暐鍚楋紵',
+ onOk() {
+ _this.setState({ visible: false })
+ _this.props.onSubmit(marks)
+ },
+ onCancel() {}
+ })
+ }
}
render() {
@@ -313,7 +339,6 @@
visible={visible}
width={'75vw'}
maskClosable={false}
- style={{minWidth: '900px', maxWidth: '1200px'}}
okText={dict['model.submit']}
onOk={this.markSubmit}
onCancel={() => { this.setState({ visible: false }) }}
--
Gitblit v1.8.0