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 | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx
index 84c2b73..a17b5dd 100644
--- a/src/menu/components/share/markcomponent/index.jsx
+++ b/src/menu/components/share/markcomponent/index.jsx
@@ -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: '棰滆壊',
@@ -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
}
})
}
@@ -330,7 +340,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