From 0c439ced2c97905cb2b02f5f689a37b19369fb8a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 22 七月 2022 15:00:58 +0800
Subject: [PATCH] 2022-07-22
---
src/views/design/sidemenu/index.jsx | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/views/design/sidemenu/index.jsx b/src/views/design/sidemenu/index.jsx
index db9232f..7dc2bfa 100644
--- a/src/views/design/sidemenu/index.jsx
+++ b/src/views/design/sidemenu/index.jsx
@@ -1,8 +1,8 @@
import React, {Component} from 'react'
import { connect } from 'react-redux'
import { is, fromJS } from 'immutable'
-import { Menu, notification, Popover } from 'antd'
-import { EditOutlined, CloseOutlined, SwapOutlined, PlusOutlined, UnlockOutlined, SettingOutlined } from '@ant-design/icons'
+import { Menu, notification, Popover, Modal, Spin } from 'antd'
+import { EditOutlined, SwapOutlined, PlusOutlined, UnlockOutlined, SettingOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import { resetEditLevel, modifyMenuTree, modifyMainMenu } from '@/store/action'
@@ -13,8 +13,9 @@
import MkIcon from '@/components/mk-icon'
import './index.scss'
-const EditSecMenu = asyncComponent(() => import('@/templates/menuconfig/editsecmenu'))
-const EditThdMenu = asyncComponent(() => import('@/templates/menuconfig/editthdmenu'))
+const EditSecMenu = asyncComponent(() => import('./editsecmenu'))
+const EditThdMenu = asyncComponent(() => import('./editthdmenu'))
+const TransferForm = asyncComponent(() => import('@/templates/zshare/basetransferform'))
const { SubMenu } = Menu
class Sidemenu extends Component {
@@ -259,8 +260,9 @@
render () {
const { mainMenu, editLevel } = this.props
+ const { visible } = this.state
- let isnew = false
+ let isnew = true
return (
<aside className="mk-sys-side-menu ant-menu-dark mk-edit">
@@ -293,15 +295,8 @@
{item.children.map(cell => {
return (
<Menu.Item key={cell.MenuID}>
- {editLevel !== 'HS' && isnew ?
- <Popover overlayClassName="mk-popover-control-wrap mk-menu-control" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
- <div className="mk-popover-control">
- <EditOutlined className="edit" onClick={() => this.editmenu(cell)} />
- <CloseOutlined className="close" onClick={() => {}} />
- </div>
- } trigger="hover" placement="top">
- <span className="editable-menu-item">{cell.MenuName}</span>
- </Popover> :
+ {editLevel !== 'HS' ?
+ <span className="editable-menu-item" onDoubleClick={() => this.editmenu(cell)}>{cell.MenuName}</span> :
<a href={cell.src} id={cell.MenuID} onClick={(e) => this.changemenu(e, cell)}>{cell.MenuName}</a>
}
</Menu.Item>
@@ -329,6 +324,18 @@
exitEdit={this.exitEdit}
/> : null
}
+ <Modal
+ title="瑙ｅ喕鑿滃崟"
+ width={600}
+ visible={visible}
+ onOk={this.thawMemuSubmit}
+ confirmLoading={this.state.confirmLoading}
+ onCancel={this.thawMemuCancel}
+ destroyOnClose
+ >
+ {!this.state.thawmenulist ? <Spin style={{marginLeft: 'calc(50% - 22px)', marginTop: '70px', marginBottom: '70px'}} size="large" /> :
+ <TransferForm onChange={(vals) => this.setState({targetKeys: vals})} menulist={this.state.thawmenulist}/>}
+ </Modal>
</aside>
)
}
@@ -338,7 +345,6 @@
return {
mainMenu: state.mainMenu,
menuTree: state.menuTree,
- memberLevel: state.memberLevel,
editLevel: state.editLevel
}
}
--
Gitblit v1.8.0