From 34e7681fd12b1c4e4994d3bea1a553870e10bc50 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 11 三月 2023 17:58:54 +0800
Subject: [PATCH] 2023-03-11

---
 src/menu/components/share/markcomponent/index.jsx |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx
index 84c2b73..53a2a73 100644
--- a/src/menu/components/share/markcomponent/index.jsx
+++ b/src/menu/components/share/markcomponent/index.jsx
@@ -9,7 +9,6 @@
 import MarkForm from './markform'
 import MkIcon from '@/components/mk-icon'
 import { minkeIconSystem } from '@/utils/option.js'
-import '@/assets/css/table.scss'
 import './index.scss'
 
 const EditTable = asyncComponent(() => import('@/templates/zshare/editTable'))
@@ -61,7 +60,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: '棰滆壊',
@@ -136,9 +143,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 +157,10 @@
             value: 'dynamic',
             label: '鍔ㄦ�佸��',
             children: _columns.map(cell => {
+              let _label = `${cell.field}锛�${cell.label}锛塦
               return {
                 value: cell.field,
-                label: cell.label
+                label: _label
               }
             })
           }
@@ -256,6 +265,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
     })
 
@@ -330,7 +342,7 @@
         <AntDesignOutlined className="profile" title="鏍囪" onClick={this.resetMark} />
         <Modal
           wrapClassName="model-table-column-mark-modal"
-          title={'鏍囪璁剧疆'}
+          title="鏍囪璁剧疆"
           visible={visible}
           width={'75vw'}
           maskClosable={false}

--
Gitblit v1.8.0