From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/menu/components/share/markcomponent/index.jsx |   49 ++++++++++++++++++++++++++++++-------------------
 1 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx
index fa36e99..a17b5dd 100644
--- a/src/menu/components/share/markcomponent/index.jsx
+++ b/src/menu/components/share/markcomponent/index.jsx
@@ -1,29 +1,29 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import { fromJS } from 'immutable'
-import { Icon, Modal, Col } from 'antd'
+import { Modal, Col } from 'antd'
+import { AntDesignOutlined } from '@ant-design/icons'
 
 import Utils from '@/utils/utils.js'
 import asyncComponent from '@/utils/asyncComponent'
 import MarkForm from './markform'
-import './index.scss'
+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'
 
 const EditTable = asyncComponent(() => import('@/templates/zshare/editTable'))
 const { confirm } = Modal
 
 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,
@@ -61,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: '棰滆壊',
@@ -92,7 +100,7 @@
           }
 
           return (
-            <div>{sign[text[0]]} {text[2] ? <Icon type={text[text.length - 1]} /> : null}</div>
+            <div>{sign[text[0]]} {text[2] ? <MkIcon type={text[text.length - 1]} /> : null}</div>
           )
         }
       }
@@ -136,9 +144,10 @@
     _columns.unshift({field: '$Index', label: '搴忓彿'})
 
     let options = _columns.map(col => {
+      let label = `${col.field}锛�${col.label}锛塦
       return {
         value: col.field,
-        label: col.label,
+        label: label,
         isLeaf: false,
         children: [
           {
@@ -149,9 +158,10 @@
             value: 'dynamic',
             label: '鍔ㄦ�佸��',
             children: _columns.map(cell => {
+              let _label = `${cell.field}锛�${cell.label}锛塦
               return {
                 value: cell.field,
-                label: cell.label
+                label: _label
               }
             })
           }
@@ -166,7 +176,7 @@
         children: minkeIconSystem.direction.map(cell => {
           return {
             value: cell,
-            label: (<Icon type={cell} />)
+            label: (<MkIcon type={cell} />)
           }
         })
       },
@@ -176,7 +186,7 @@
         children: minkeIconSystem.hint.map(cell => {
           return {
             value: cell,
-            label: (<Icon type={cell} />)
+            label: (<MkIcon type={cell} />)
           }
         })
       },
@@ -186,7 +196,7 @@
         children: minkeIconSystem.edit.map(cell => {
           return {
             value: cell,
-            label: (<Icon type={cell} />)
+            label: (<MkIcon type={cell} />)
           }
         })
       },
@@ -196,7 +206,7 @@
         children: minkeIconSystem.data.map(cell => {
           return {
             value: cell,
-            label: (<Icon type={cell} />)
+            label: (<MkIcon type={cell} />)
           }
         })
       },
@@ -206,7 +216,7 @@
         children: minkeIconSystem.normal.map(cell => {
           return {
             value: cell,
-            label: (<Icon type={cell} />)
+            label: (<MkIcon type={cell} />)
           }
         })
       }
@@ -241,6 +251,7 @@
     ]
 
     if (type === 'line' || type === 'sequence') {
+      signs.pop()
       signs.pop()
     } else if (type === 'slider') {
       markColumns = markColumns.filter(col => {
@@ -322,23 +333,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'}}>
-        <Icon className="profile" title="鏍囪" type="ant-design" onClick={this.resetMark} />
+        <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 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