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 | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 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 b17ff7d..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,10 +1,12 @@ 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 MkIcon from '@/components/mk-icon' // import MKEmitter from '@/utils/events.js' import './index.scss' @@ -23,12 +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 ? <Icon type={text} /> : '' + return text ? <MkIcon type={text} /> : '' }}, { title: '鏄惁闅愯棌', dataIndex: 'hidden', key: 'hidden', render: (text, record) => { const trans = {'true': '鏄�', 'false': '鍚�'} @@ -38,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>) } ] @@ -129,7 +131,7 @@ if (editMenu.MenuID && editMenu.property === 'menu' && _menu.property !== 'menu') { const _this = this confirm({ - content: '鑿滃崟灞炴�х敱鈥滆彍鍗曗�濆垏鎹㈣嚦鍏朵粬绫诲瀷鏃讹紝鑿滃崟灏嗚閲嶇疆锛屽嵆瑙i櫎涔嬪墠鑿滃崟鐨勭粦瀹氬叧绯伙紝纭畾淇敼鍚楋紵', + content: '鑿滃崟灏嗚閲嶇疆锛岀‘瀹氫慨鏀瑰悧锛�', onOk() { _data = _data.map(item => { if (item.MenuID === _menu.MenuID) { @@ -177,7 +179,7 @@ <Modal title="缂栬緫" visible={visible} - width={750} + width={900} maskClosable={false} onOk={this.menuSubmit} onCancel={() => { this.setState({ visible: false }) }} -- Gitblit v1.8.0