From b0c7a660750a8b29e7f8b3a648296d56c50fd2ca Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 29 十一月 2022 18:43:10 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/markcomponent/index.jsx | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx
index 7945663..50c608f 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'
@@ -26,7 +24,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
marks: null,
columns: null,
visible: false,
@@ -64,7 +61,15 @@
width: '16%',
editable: true,
required: false,
- inputType: 'input'
+ inputType: 'input',
+ render: (text, record) => {
+ if (!text) return ''
+ if (record.field && record.field[1] === 'dynamic') {
+ return <span title="瀵规瘮鍔ㄦ�佸�兼椂锛屽姣斿�兼棤鏁堛��" style={{textDecoration: 'line-through'}}>{text}</span>
+ } else {
+ return text
+ }
+ }
},
{
title: '棰滆壊',
@@ -139,9 +144,13 @@
_columns.unshift({field: '$Index', label: '搴忓彿'})
let options = _columns.map(col => {
+ let label = col.label
+ if (col.label.toLowerCase() !== col.field.toLowerCase()) {
+ label += `锛�${col.field}锛塦
+ }
return {
value: col.field,
- label: col.label,
+ label: label,
isLeaf: false,
children: [
{
@@ -152,9 +161,13 @@
value: 'dynamic',
label: '鍔ㄦ�佸��',
children: _columns.map(cell => {
+ let _label = cell.label
+ if (cell.label.toLowerCase() !== cell.field.toLowerCase()) {
+ _label += `锛�${cell.field}锛塦
+ }
return {
value: cell.field,
- label: cell.label
+ label: _label
}
})
}
@@ -326,23 +339,23 @@
}
render() {
- const { marks, markColumns, visible, options, signs, dict } = this.state
+ const { marks, markColumns, visible, options, signs } = this.state
return (
<div style={{display: 'inline-block'}}>
<AntDesignOutlined className="profile" title="鏍囪" onClick={this.resetMark} />
<Modal
wrapClassName="model-table-column-mark-modal"
- title={'鏍囪璁剧疆'}
+ title="鏍囪璁剧疆"
visible={visible}
width={'75vw'}
maskClosable={false}
- okText={dict['model.submit']}
+ okText="鎻愪氦"
onOk={this.markSubmit}
onCancel={() => { this.setState({ visible: false }) }}
destroyOnClose
>
- <MarkForm field={this.props.field} 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