From ee635de6fc758c044db0761faa003d0db1e82563 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 07 八月 2023 20:32:35 +0800 Subject: [PATCH] Merge branch 'develop' --- src/views/design/index.jsx | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/views/design/index.jsx b/src/views/design/index.jsx index 5cd309f..4417706 100644 --- a/src/views/design/index.jsx +++ b/src/views/design/index.jsx @@ -1,4 +1,5 @@ import React, {Component} from 'react' +import { withRouter } from 'react-router-dom' import { ConfigProvider } from 'antd' import enUS from 'antd/es/locale/en_US' import zhCN from 'antd/es/locale/zh_CN' @@ -14,11 +15,18 @@ class Design extends Component { componentDidMount() { - window.debugger = false - window.GLOB.breakpoint = false - window.GLOB.designView = true - sessionStorage.removeItem('breakpoint') - setGLOBFuncs() + if (sessionStorage.getItem('isEditState') === 'true') { + sessionStorage.removeItem('isEditState') + this.props.history.replace('/main') + window.location.reload() + } else { + sessionStorage.setItem('isEditState', 'true') + window.debugger = false + window.GLOB.breakpoint = false + window.GLOB.designView = true + sessionStorage.removeItem('breakpoint') + setGLOBFuncs() + } } render () { @@ -33,4 +41,4 @@ } } -export default Design \ No newline at end of file +export default withRouter(Design) \ No newline at end of file -- Gitblit v1.8.0