From e5a92d6bee2b8d47d5c145ed92485fd19b663b0f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 27 十二月 2024 12:26:21 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/markcomponent/index.jsx | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx
index 7185bea..4173b5b 100644
--- a/src/menu/components/share/markcomponent/index.jsx
+++ b/src/menu/components/share/markcomponent/index.jsx
@@ -112,7 +112,7 @@
options: [],
render: text => {
let sign = {
- 'font': '鏂囧瓧',
+ 'font': '瀛椾綋棰滆壊',
'background': '鑳屾櫙',
'underline': '涓嬪垝绾�',
'line-through': '涓垝绾�',
@@ -267,7 +267,7 @@
let signs = [
{
value: 'font',
- label: '鏂囧瓧'
+ label: '瀛椾綋棰滆壊'
},
{
value: 'background',
@@ -324,6 +324,11 @@
signs.pop()
signs.pop()
signs.pop()
+ } else if (type === 'icon') {
+ signs = [{
+ value: 'font',
+ label: '瀛椾綋棰滆壊'
+ }]
} else if (type === 'slider') {
markColumns = markColumns.filter(col => {
col.width = '20%'
@@ -399,12 +404,12 @@
})
this.props.onSubmit(marks)
} else {
- const _this = this
+ const that = this
confirm({
title: '瀛樺湪鏈繚瀛樻爣璁帮紝纭畾蹇界暐鍚楋紵',
onOk() {
- _this.setState({ visible: false })
- _this.props.onSubmit(marks)
+ that.setState({ visible: false })
+ that.props.onSubmit(marks)
},
onCancel() {}
})
--
Gitblit v1.8.0