From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/editor/braft-editor/editorcontent/index.jsx | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/menu/components/editor/braft-editor/editorcontent/index.jsx b/src/menu/components/editor/braft-editor/editorcontent/index.jsx
index d1d288b..b6a6afc 100644
--- a/src/menu/components/editor/braft-editor/editorcontent/index.jsx
+++ b/src/menu/components/editor/braft-editor/editorcontent/index.jsx
@@ -1,10 +1,9 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Modal } from 'antd'
+import { Modal } from 'antd'
+import { FormOutlined } from '@ant-design/icons'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import asyncComponent from '@/utils/asyncComponent'
import './index.scss'
@@ -17,7 +16,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
visible: false,
html: null
}
@@ -53,21 +51,21 @@
render () {
const { config } = this.props
- const { visible, dict, html } = this.state
+ const { visible, html } = this.state
if (!config) return null
return (
<div className="model-menu-edit-content-wrap">
- {config.wrap.datatype === 'static' ? <Icon title="鍐呭缂栬緫" type="form" onClick={() => this.trigger()} /> : null}
- {config.wrap.datatype !== 'static' ? <Icon title="鍐呭缂栬緫" style={{color: '#eeeeee', cursor: 'not-allowed'}} type="form"/> : null}
+ {config.wrap.datatype === 'static' ? <FormOutlined title="鍐呭缂栬緫" onClick={() => this.trigger()} /> :
+ <FormOutlined title="鍐呭缂栬緫" style={{color: '#eeeeee', cursor: 'not-allowed'}}/>}
<Modal
wrapClassName="popview-modal model-menu-edit-content-form"
title="鍐呭缂栬緫"
visible={visible}
width={950}
maskClosable={false}
- okText={dict['model.submit']}
+ okText="鎻愪氦"
onOk={this.verifySubmit}
onCancel={() => { this.setState({ visible: false }) }}
destroyOnClose
--
Gitblit v1.8.0