From 7b0dbecd1d6155d26ec67be0a47a16264c738c85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 09 五月 2023 14:48:10 +0800
Subject: [PATCH] 2023-05-09

---
 src/menu/components/share/markcomponent/index.jsx |   40 +++++++++++++++++++++++++++++-----------
 1 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx
index 7945663..c188601 100644
--- a/src/menu/components/share/markcomponent/index.jsx
+++ b/src/menu/components/share/markcomponent/index.jsx
@@ -9,9 +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'
 
 const EditTable = asyncComponent(() => import('@/templates/zshare/editTable'))
@@ -26,7 +23,6 @@
   }
 
   state = {
-    dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
     marks: null,
     columns: null,
     visible: false,
@@ -38,6 +34,15 @@
         editable: true,
         inputType: 'cascader',
         options: [],
+        rules: [{
+          validator: (rule, value, callback) => {
+            if (value[1] === 'dynamic' && value[0] === value[2]) {
+              callback('瀵规瘮瀛楁涓嶅彲鐩稿悓锛�')
+            } else {
+              callback()
+            }
+          }
+        }],
         render: text => {
           return (
             <div>{text[0]}  VS  {text[2] ? text[2] : '闈欐�佸��'}</div>
@@ -64,7 +69,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 +152,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: [
           {
@@ -152,9 +166,10 @@
             value: 'dynamic',
             label: '鍔ㄦ�佸��',
             children: _columns.map(cell => {
+              let _label = `${cell.field}锛�${cell.label}锛塦
               return {
                 value: cell.field,
-                label: cell.label
+                label: _label
               }
             })
           }
@@ -259,6 +274,9 @@
       if (item.signType && item.signType[0] === 'icon') {
         item.signType = [item.signType[0] + item.signType[1], item.signType[2], item.signType[3]]
       }
+      if (!item.uuid) {
+        item.uuid = Utils.getuuid()
+      }
       return item
     })
 
@@ -326,23 +344,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