From 19e37e53c2714e19704bacdb5abaf60b045058ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Thu, 18 Jan 2018 13:49:02 +0800
Subject: [PATCH] no message

Former-commit-id: bc821963613e4d12d6ddda3c83aef8002e00ad94
Former-commit-id: 1d9feebd4110e87e32c345e69872fdae69dde4fe
Former-commit-id: 6bf5b2131177854f786fda21c18095859ca6cb3f
---
 src/components/core/MainLayout/_siderMenu.vue | 40 ++++++++++++-------
 src/pages/demo/business/dataFilter/index.vue  |  5 +++
 src/router/menu/_business.js                  | 22 ++++++++++
 src/router/menu/_charts.js                    |  2 +-
 src/router/menu/_plugin.js                    |  2 +-
 src/router/menu/index.js                      |  7 +++-
 6 files changed, 59 insertions(+), 19 deletions(-)
 create mode 100644 src/pages/demo/business/dataFilter/index.vue
 create mode 100644 src/router/menu/_business.js

diff --git a/src/components/core/MainLayout/_siderMenu.vue b/src/components/core/MainLayout/_siderMenu.vue
index 51a7e62e..571a8e4a 100644
--- a/src/components/core/MainLayout/_siderMenu.vue
+++ b/src/components/core/MainLayout/_siderMenu.vue
@@ -1,22 +1,32 @@
 <template>
   <el-menu class="el-menu-vertical-demo" v-bind="elMenu">
-    <el-submenu
-      v-for="(menu, index) in sideMenu"
-      :key="index"
-      :index="`${menu.title}${index}`">
-      <template slot="title">
-        <i v-if="menu.icon" :class="'fa fa-' + menu.icon"></i>
-        <span slot="title">{{menu.title}}</span>
-      </template>
+    <template v-for="(menu, index) in sideMenu">
       <el-menu-item
-        v-for="(menuItem, menuItemIndex) in menu.children"
-        :key="menuItemIndex"
-        :index="`${menuItem.name}${menuItemIndex}`"
-        @click.native="$router.push({name: menuItem.name})">
-        <i v-if="menu.icon" :class="'fa fa-' + menuItem.icon"></i>
-        {{menuItem.title}}
+        v-if="!menu.children"
+        :key="index"
+        :index="`${menu.title}${index}`"
+        @click.native="$router.push({name: menu.name})">
+        <i v-if="menu.icon" :class="'fa fa-' + menu.icon"></i>
+        {{menu.title}}
       </el-menu-item>
-    </el-submenu>
+      <el-submenu
+        v-if="menu.children"
+        :key="index"
+        :index="`${menu.title}${index}`">
+        <template slot="title">
+          <i v-if="menu.icon" :class="'fa fa-' + menu.icon"></i>
+          <span slot="title">{{menu.title}}</span>
+        </template>
+        <el-menu-item
+          v-for="(menuItem, menuItemIndex) in menu.children"
+          :key="menuItemIndex"
+          :index="`${menuItem.name}${menuItemIndex}`"
+          @click.native="$router.push({name: menuItem.name})">
+          <i v-if="menuItem.icon" :class="'fa fa-' + menuItem.icon"></i>
+          {{menuItem.title}}
+        </el-menu-item>
+      </el-submenu>
+    </template>
   </el-menu>
 </template>
 
diff --git a/src/pages/demo/business/dataFilter/index.vue b/src/pages/demo/business/dataFilter/index.vue
new file mode 100644
index 00000000..ff81382d
--- /dev/null
+++ b/src/pages/demo/business/dataFilter/index.vue
@@ -0,0 +1,5 @@
+<template>
+  <Container>
+    dataFilter
+  </Container>
+</template>
\ No newline at end of file
diff --git a/src/router/menu/_business.js b/src/router/menu/_business.js
new file mode 100644
index 00000000..5f6c9b17
--- /dev/null
+++ b/src/router/menu/_business.js
@@ -0,0 +1,22 @@
+// [业务演示] 菜单
+export const businessMenu = {
+  title: '业务演示',
+  path: '/demo/business',
+  name: 'demo-business',
+  component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) },
+  children: [
+    {
+      title: '数据过滤',
+      icon: 'document',
+      path: 'dataFilter',
+      name: 'demo-business-dataFilter',
+      component: resolve => { require(['@/pages/demo/business/dataFilter/index.vue'], resolve) }
+    }
+  ]
+}
+
+// [图表] 路由设置
+export const businessRouter = {
+  ...businessMenu,
+  children: [].concat(...businessMenu.children.map(e => e.children || e))
+}
diff --git a/src/router/menu/_charts.js b/src/router/menu/_charts.js
index fc77b6fa..896457db 100644
--- a/src/router/menu/_charts.js
+++ b/src/router/menu/_charts.js
@@ -32,5 +32,5 @@ export const chartsMenu = {
 // [图表] 路由设置
 export const chartsRouter = {
   ...chartsMenu,
-  children: [].concat(...chartsMenu.children.map(e => e.children))
+  children: [].concat(...chartsMenu.children.map(e => e.children || e))
 }
diff --git a/src/router/menu/_plugin.js b/src/router/menu/_plugin.js
index b307a33c..ba6f5901 100644
--- a/src/router/menu/_plugin.js
+++ b/src/router/menu/_plugin.js
@@ -224,5 +224,5 @@ export const pluginMenu = {
 // [插件] 路由设置
 export const pluginRouter = {
   ...pluginMenu,
-  children: [].concat(...pluginMenu.children.map(e => e.children))
+  children: [].concat(...pluginMenu.children.map(e => e.children || e))
 }
diff --git a/src/router/menu/index.js b/src/router/menu/index.js
index fdede460..e9587285 100644
--- a/src/router/menu/index.js
+++ b/src/router/menu/index.js
@@ -1,14 +1,17 @@
 import { pluginMenu, pluginRouter } from './_plugin'
 import { chartsMenu, chartsRouter } from './_charts'
+import { businessMenu, businessRouter } from './_business'
 
 // 菜单
 export const menu = [
   pluginMenu,
-  chartsMenu
+  chartsMenu,
+  businessMenu
 ]
 
 // 路由
 export const router = [
   pluginRouter,
-  chartsRouter
+  chartsRouter,
+  businessRouter
 ]