From 5223edbcccfed84a33a706e5637ee65a61f377aa Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 22 十二月 2021 18:00:39 +0800
Subject: [PATCH] 2021-12-22
---
src/mob/components/navbar/normal-navbar/menusetting/menutable/index.jsx | 73 ++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 29 deletions(-)
diff --git a/src/mob/components/navbar/normal-navbar/menusetting/menutable/index.jsx b/src/mob/components/navbar/normal-navbar/menusetting/menutable/index.jsx
index 8fc36cf..9bdc73e 100644
--- a/src/mob/components/navbar/normal-navbar/menusetting/menutable/index.jsx
+++ b/src/mob/components/navbar/normal-navbar/menusetting/menutable/index.jsx
@@ -1,18 +1,21 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Table, Button, Modal, Icon } from 'antd'
+import { Table, Button, Modal } from 'antd'
+import { ArrowUpOutlined, ArrowDownOutlined } from '@ant-design/icons'
import MenuForm from '../menuform'
import Utils from '@/utils/utils.js'
-import MKEmitter from '@/utils/events.js'
+import MkIcon from '@/components/mk-icon'
+// import MKEmitter from '@/utils/events.js'
import './index.scss'
const { confirm } = Modal
class MenuTable extends Component {
static propTpyes = {
- menus: PropTypes.object, // 鍗＄墖琛屼俊鎭�
+ menus: PropTypes.array, // 鍗＄墖琛屼俊鎭�
+ cols: PropTypes.array, // 瀛楁闆�
}
state = {
@@ -22,9 +25,12 @@
{ title: '鑿滃崟鍚嶇О', dataIndex: 'name', key: 'name' },
{ title: '鑿滃崟鍙傛暟', dataIndex: 'MenuNo', key: 'MenuNo' },
{ title: '鑿滃崟灞炴��', dataIndex: 'property', key: 'property', render: text => {
- const trans = {menu: '鑿滃崟', link: '閾炬帴', linkmenu: '鍏宠仈鑿滃崟'}
+ const trans = {menu: '鑿滃崟', link: '閾炬帴', linkmenu: '鍏宠仈鑿滃崟', sysmenu: '绯荤粺椤�'}
return trans[text]
+ }},
+ { title: '鍥炬爣', dataIndex: 'icon', key: 'icon', render: (text, record) => {
+ return text ? <MkIcon type={text} /> : ''
}},
{ title: '鏄惁闅愯棌', dataIndex: 'hidden', key: 'hidden', render: (text, record) => {
const trans = {'true': '鏄�', 'false': '鍚�'}
@@ -34,8 +40,8 @@
(<div>
<Button type="link" style={{padding: '0 5px', marginRight: '5px'}} onClick={() => this.editMenu(record)}>缂栬緫</Button>
<Button type="link" style={{color: '#ff4d4f', padding: '0 5px', marginRight: '5px'}} onClick={() => this.delMenu(record)}>鍒犻櫎</Button>
- <Icon type="arrow-up" style={{color: '#26C281', cursor: 'pointer', padding: '0 5px', marginRight: '5px'}} onClick={() => this.moveUp(record)}/>
- <Icon type="arrow-down" style={{color: '#ff4d4f', cursor: 'pointer', padding: '0 5px'}} onClick={() => this.moveDown(record)}/>
+ <ArrowUpOutlined style={{color: '#26C281', cursor: 'pointer', padding: '0 5px', marginRight: '5px'}} onClick={() => this.moveUp(record)}/>
+ <ArrowDownOutlined style={{color: '#ff4d4f', cursor: 'pointer', padding: '0 5px'}} onClick={() => this.moveDown(record)}/>
</div>)
}
]
@@ -80,20 +86,10 @@
const _this = this
confirm({
- title: (record.property === 'classify' && record.sublist.length > 0 ? '鑿滃崟涓嬪惈鏈夊瓙鑿滃崟锛�' : '') + '纭畾鍒犻櫎鍚楋紵',
+ title: '纭畾鍒犻櫎鍚楋紵',
content: '',
onOk() {
_this.setState({data: data.filter(item => item.MenuID !== record.MenuID)})
-
- let uuids = [record.MenuID]
- record.sublist && record.sublist.forEach(item => {
- uuids.push(item.MenuID)
-
- item.sublist && item.sublist.forEach(cell => {
- uuids.push(cell.MenuID)
- })
- })
- MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
@@ -117,21 +113,38 @@
this.menuRef.handleConfirm().then(res => {
let _menu = {...editMenu, ...res}
+ let _data = fromJS(data).toJS()
+
if (!_menu.MenuID) {
_menu.MenuID = Utils.getuuid()
- this.setState({data: [...data, _menu], editMenu: null, visible: false})
+ _data.push(_menu)
} else {
- this.setState({
- editMenu: null,
- visible: false,
- data: data.map(item => {
- if (item.MenuID === _menu.MenuID) {
- return _menu
- } else {
- return item
- }
- })
+ _data = _data.map(item => {
+ if (item.MenuID === _menu.MenuID) {
+ return _menu
+ } else {
+ return item
+ }
})
+ }
+
+ if (editMenu.MenuID && editMenu.property === 'menu' && _menu.property !== 'menu') {
+ const _this = this
+ confirm({
+ content: '鑿滃崟灏嗚閲嶇疆锛岀‘瀹氫慨鏀瑰悧锛�',
+ onOk() {
+ _data = _data.map(item => {
+ if (item.MenuID === _menu.MenuID) {
+ item.MenuID = Utils.getuuid()
+ }
+ return item
+ })
+ _this.setState({data: _data, editMenu: null, visible: false})
+ },
+ onCancel() {}
+ })
+ } else {
+ this.setState({data: _data, editMenu: null, visible: false})
}
})
}
@@ -151,6 +164,7 @@
}
render() {
+ const { cols } = this.props
const { columns, data, visible, editMenu } = this.state
return (
@@ -165,7 +179,7 @@
<Modal
title="缂栬緫"
visible={visible}
- width={600}
+ width={900}
maskClosable={false}
onOk={this.menuSubmit}
onCancel={() => { this.setState({ visible: false }) }}
@@ -173,6 +187,7 @@
>
<MenuForm
menu={editMenu}
+ cols={cols}
inputSubmit={this.menuSubmit}
wrappedComponentRef={(inst) => this.menuRef = inst}
/>
--
Gitblit v1.8.0