From e8edfdadb561cd83bf6e1c3e00d55b8cc2aee6d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 十月 2022 17:57:34 +0800
Subject: [PATCH] 2022-10-17
---
src/menu/components/share/markcomponent/index.jsx | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx
index 1da2ecd..84c2b73 100644
--- a/src/menu/components/share/markcomponent/index.jsx
+++ b/src/menu/components/share/markcomponent/index.jsx
@@ -9,8 +9,6 @@
import MarkForm from './markform'
import MkIcon from '@/components/mk-icon'
import { minkeIconSystem } from '@/utils/option.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import '@/assets/css/table.scss'
import './index.scss'
@@ -19,13 +17,13 @@
class MarkColumn extends Component {
static propTpyes = {
+ field: PropTypes.any,
columns: PropTypes.array, // 鏄剧ず鍒�
marks: PropTypes.object,
onSubmit: PropTypes.func
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
marks: null,
columns: null,
visible: false,
@@ -325,7 +323,7 @@
}
render() {
- const { marks, markColumns, visible, options, signs, dict } = this.state
+ const { marks, markColumns, visible, options, signs } = this.state
return (
<div style={{display: 'inline-block'}}>
@@ -336,12 +334,12 @@
visible={visible}
width={'75vw'}
maskClosable={false}
- okText={dict['model.submit']}
+ okText="鎻愪氦"
onOk={this.markSubmit}
onCancel={() => { this.setState({ visible: false }) }}
destroyOnClose
>
- <MarkForm dict={dict} signs={signs} columns={options} markChange={this.markChange}/>
+ <MarkForm field={this.props.field} signs={signs} columns={options} markChange={this.markChange}/>
<Col style={{fontSize: '12px', color: '#757575', paddingLeft: '10px'}} span={24}>娉細浠庝笂鍒颁笅锛屽尮閰嶇涓�涓鍚堟潯浠剁殑鏍囪銆�</Col>
<EditTable actions={['edit', 'move', 'del']} data={marks} columns={markColumns} onChange={(marks) => this.setState({marks})}/>
</Modal>
--
Gitblit v1.8.0