From d1657e9835a6b3350dee76956deae3029cfe4b11 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 四月 2021 15:54:06 +0800
Subject: [PATCH] 2021-04-20

---
 src/mob/components/navbar/normal-navbar/menusetting/menutable/index.jsx |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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..5327876 100644
--- a/src/mob/components/navbar/normal-navbar/menusetting/menutable/index.jsx
+++ b/src/mob/components/navbar/normal-navbar/menusetting/menutable/index.jsx
@@ -12,7 +12,8 @@
 
 class MenuTable extends Component {
   static propTpyes = {
-    menus: PropTypes.object,    // 鍗$墖琛屼俊鎭�
+    menus: PropTypes.array,     // 鍗$墖琛屼俊鎭�
+    cols: PropTypes.array,      // 瀛楁闆�
   }
 
   state = {
@@ -25,6 +26,9 @@
         const trans = {menu: '鑿滃崟', link: '閾炬帴', linkmenu: '鍏宠仈鑿滃崟'}
 
         return trans[text]
+      }},
+      { title: '鍥炬爣', dataIndex: 'icon', key: 'icon',  render: (text, record) => {
+        return text ? <Icon type={text} /> : ''
       }},
       { title: '鏄惁闅愯棌', dataIndex: 'hidden', key: 'hidden',  render: (text, record) => {
         const trans = {'true': '鏄�', 'false': '鍚�'}
@@ -151,6 +155,7 @@
   }
 
   render() {
+    const { cols } = this.props
     const { columns, data, visible, editMenu } = this.state
 
     return (
@@ -165,7 +170,7 @@
         <Modal
           title="缂栬緫"
           visible={visible}
-          width={600}
+          width={750}
           maskClosable={false}
           onOk={this.menuSubmit}
           onCancel={() => { this.setState({ visible: false }) }}
@@ -173,6 +178,7 @@
         >
           <MenuForm
             menu={editMenu}
+            cols={cols}
             inputSubmit={this.menuSubmit}
             wrappedComponentRef={(inst) => this.menuRef = inst}
           />

--
Gitblit v1.8.0