From 7e46c386be5c2cfc20af3936d26839ad3fce44b0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 16 八月 2023 17:40:32 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/views/design/sidemenu/editthdmenu/index.jsx | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/views/design/sidemenu/editthdmenu/index.jsx b/src/views/design/sidemenu/editthdmenu/index.jsx
index 28e78e7..2402f75 100644
--- a/src/views/design/sidemenu/editthdmenu/index.jsx
+++ b/src/views/design/sidemenu/editthdmenu/index.jsx
@@ -1,7 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { connect } from 'react-redux'
import { DndProvider } from 'react-dnd'
import HTML5Backend from 'react-dnd-html5-backend'
import { notification, Modal, Button } from 'antd'
@@ -21,6 +20,7 @@
class EditMenu extends Component {
static propTpyes = {
+ menuTree: PropTypes.array, // 鑿滃崟鏍�
menulist: PropTypes.any, // 涓夌骇鑿滃崟鍒楄〃
exitEdit: PropTypes.func, // 閫�鍑虹紪杈戠姸鎬�
supMenu: PropTypes.object, // 瀵瑰簲鐨勪笂绾ц彍鍗�
@@ -117,7 +117,7 @@
} else if (_menu.PageParam.Template === 'BaseTable') {
sessionStorage.setItem('menuTree', JSON.stringify(this.props.menuTree))
let _param = window.btoa(window.encodeURIComponent(JSON.stringify(_menu)))
-
+
window.open(`#/tabledesign/${_param}`)
} else if (_menu.PageParam.Template === 'CustomPage') {
let _param = {
@@ -304,14 +304,4 @@
}
}
-const mapStateToProps = (state) => {
- return {
- menuTree: state.menuTree
- }
-}
-
-const mapDispatchToProps = () => {
- return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(EditMenu)
\ No newline at end of file
+export default EditMenu
\ No newline at end of file
--
Gitblit v1.8.0