From b0830fba374aba39b9984891d50b08b37fa81bb4 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Tue, 27 Aug 2019 15:56:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=8A=A0=E5=BC=BA=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E9=A1=B9=EF=BC=9A=E6=98=AF=E5=90=A6=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=EF=BC=88=E6=9F=90=E4=BA=9B=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E6=98=BE=E7=A4=BA=E5=9C=A8=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E8=8F=9C=E5=8D=95=E6=A0=8F=E4=B8=AD=EF=BC=89=EF=BC=8C?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=BC=93=E5=AD=98=E8=8F=9C=E5=8D=95=EF=BC=88?=
 =?UTF-8?q?=E5=8F=AF=E8=A7=A3=E5=86=B3=E5=88=87=E6=8D=A2Tab=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E6=B8=B2=E6=9F=93=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=AF=A5=E5=8A=9F=E8=83=BD=E5=BF=85=E9=A1=BB?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=E7=BB=84=E4=BB=B6=E5=90=8D=E7=A7=B0=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=94=E5=BF=85=E9=A1=BB=E4=B8=8E=E7=BB=84=E4=BB=B6=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84name=E4=B8=80=E8=87=B4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/AppMain.vue     |  2 +-
 src/views/components/Editor.vue       |  1 +
 src/views/generator/generator.vue     |  1 -
 src/views/generator/index.vue         |  1 +
 src/views/monitor/log/errorLog.vue    |  1 +
 src/views/monitor/log/index.vue       |  1 +
 src/views/monitor/redis/index.vue     |  1 +
 src/views/monitor/sql/index.vue       |  1 +
 src/views/system/dept/index.vue       |  1 +
 src/views/system/dict/index.vue       |  1 +
 src/views/system/job/index.vue        |  1 +
 src/views/system/menu/form.vue        | 27 +++++++++++++++------------
 src/views/system/menu/index.vue       | 26 +++++++++++++++-----------
 src/views/system/permission/index.vue |  6 ++++--
 src/views/system/role/index.vue       |  1 +
 src/views/system/timing/index.vue     |  1 +
 src/views/system/user/index.vue       |  1 +
 src/views/tools/aliPay/index.vue      |  1 +
 src/views/tools/email/index.vue       |  1 +
 src/views/tools/picture/index.vue     |  1 +
 src/views/tools/qiniu/index.vue       |  1 +
 src/views/tools/swagger/index.vue     |  1 +
 22 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 82adf2e..5c3a0b5 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,7 +1,7 @@
 <template>
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
-      <keep-alive :exclude="cachedViews">
+      <keep-alive :include="cachedViews">
         <router-view :key="key"/>
       </keep-alive>
     </transition>
diff --git a/src/views/components/Editor.vue b/src/views/components/Editor.vue
index 543f715..bb9e08a 100644
--- a/src/views/components/Editor.vue
+++ b/src/views/components/Editor.vue
@@ -17,6 +17,7 @@ import { mapGetters } from 'vuex'
 import E from 'wangeditor'
 import { getToken } from '@/utils/auth'
 export default {
+  name: 'Editor',
   data() {
     return {
       headers: {
diff --git a/src/views/generator/generator.vue b/src/views/generator/generator.vue
index 3b185ec..689c13a 100644
--- a/src/views/generator/generator.vue
+++ b/src/views/generator/generator.vue
@@ -80,7 +80,6 @@ import initData from '@/mixins/initData'
 import { update, get } from '@/api/genConfig'
 import { generator } from '@/api/generator'
 export default {
-  name: 'Generator',
   mixins: [initData],
   props: {
     name: {
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index de31b9b..8be8c22 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -43,6 +43,7 @@ import initData from '@/mixins/initData'
 import { parseTime } from '@/utils/index'
 import Generator from './generator'
 export default {
+  name: 'Generator',
   components: { Generator },
   mixins: [initData],
   data() {
diff --git a/src/views/monitor/log/errorLog.vue b/src/views/monitor/log/errorLog.vue
index 3a4e7ef..e32bdab 100644
--- a/src/views/monitor/log/errorLog.vue
+++ b/src/views/monitor/log/errorLog.vue
@@ -42,6 +42,7 @@ import { parseTime } from '@/utils/index'
 import { getErrDetail } from '@/api/log'
 import Search from './search'
 export default {
+  name: 'ErrorLog',
   components: { Search },
   mixins: [initData],
   data() {
diff --git a/src/views/monitor/log/index.vue b/src/views/monitor/log/index.vue
index 366f631..f265300 100644
--- a/src/views/monitor/log/index.vue
+++ b/src/views/monitor/log/index.vue
@@ -38,6 +38,7 @@ import initData from '@/mixins/initData'
 import { parseTime } from '@/utils/index'
 import Search from './search'
 export default {
+  name: 'Log',
   components: { Search },
   mixins: [initData],
   created() {
diff --git a/src/views/monitor/redis/index.vue b/src/views/monitor/redis/index.vue
index 79f80c6..7f0766f 100644
--- a/src/views/monitor/redis/index.vue
+++ b/src/views/monitor/redis/index.vue
@@ -58,6 +58,7 @@ import checkPermission from '@/utils/permission' // 权限判断函数
 import initData from '@/mixins/initData'
 import { del, delAll } from '@/api/redis'
 export default {
+  name: 'Redis',
   mixins: [initData],
   data() {
     return {
diff --git a/src/views/monitor/sql/index.vue b/src/views/monitor/sql/index.vue
index 76fb6f0..da7e83a 100644
--- a/src/views/monitor/sql/index.vue
+++ b/src/views/monitor/sql/index.vue
@@ -5,6 +5,7 @@
 import { mapGetters } from 'vuex'
 import elFrame from '@/components/iframe/index'
 export default {
+  name: 'Sql',
   components: { elFrame },
   computed: {
     ...mapGetters([
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index d432a5e..46c4497 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -73,6 +73,7 @@ import { del } from '@/api/dept'
 import { parseTime } from '@/utils/index'
 import eForm from './form'
 export default {
+  name: 'Dept',
   components: { eForm, treeTable },
   mixins: [initData, initDict],
   data() {
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 4d5db1d..8effdf7 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -81,6 +81,7 @@ import { del } from '@/api/dict'
 import dictDetail from '../dictDetail/index'
 import eForm from './form'
 export default {
+  name: 'Dict',
   components: { dictDetail, eForm },
   mixins: [initData],
   data() {
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index 6b2f6a2..47ca8ed 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -82,6 +82,7 @@ import { del } from '@/api/job'
 import { parseTime } from '@/utils/index'
 import eForm from './form'
 export default {
+  name: 'Job',
   components: { eForm },
   mixins: [initData, initDict],
   data() {
diff --git a/src/views/system/menu/form.vue b/src/views/system/menu/form.vue
index c7e8ea5..64aa3b0 100644
--- a/src/views/system/menu/form.vue
+++ b/src/views/system/menu/form.vue
@@ -1,24 +1,21 @@
 <template>
-  <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增菜单' : '编辑菜单'" append-to-body width="600px">
+  <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增菜单' : '编辑菜单'" append-to-body width="585px">
     <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
       <el-form-item label="菜单图标">
         <el-popover
           placement="bottom-start"
-          width="460"
+          width="450"
           trigger="click"
           @show="$refs['iconSelect'].reset()">
           <IconSelect ref="iconSelect" @selected="selected" />
-          <el-input slot="reference" v-model="form.icon" style="width: 460px;" placeholder="点击选择图标" readonly>
+          <el-input slot="reference" v-model="form.icon" style="width: 450px;" placeholder="点击选择图标" readonly>
             <svg-icon v-if="form.icon" slot="prefix" :icon-class="form.icon" class="el-input__icon" style="height: 32px;width: 16px;" />
             <i v-else slot="prefix" class="el-icon-search el-input__icon"/>
           </el-input>
         </el-popover>
       </el-form-item>
       <el-form-item label="菜单名称" prop="name">
-        <el-input v-model="form.name" placeholder="名称" style="width: 460px;"/>
-      </el-form-item>
-      <el-form-item label="菜单排序" prop="sort">
-        <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 460px;"/>
+        <el-input v-model="form.name" placeholder="名称" style="width: 450px;"/>
       </el-form-item>
       <el-form-item label="内部菜单">
         <el-radio-group v-model="form.iframe" size="mini">
@@ -38,14 +35,20 @@
           <el-radio-button label="false">否</el-radio-button>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="菜单排序" prop="sort">
+        <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 177px;"/>
+      </el-form-item>
       <el-form-item label="链接地址" prop="path">
-        <el-input v-model="form.path" placeholder="菜单路径" style="width: 460px;"/>
+        <el-input v-model="form.path" placeholder="链接地址" style="width: 177px;"/>
       </el-form-item>
       <el-form-item v-if="form.iframe === 'false'" label="组件路径">
-        <el-input v-model="form.component" placeholder="菜单路径" style="width: 460px;"/>
+        <el-input v-model="form.component" placeholder="菜单路径"/>
+      </el-form-item>
+      <el-form-item v-if="form.iframe === 'false'" label="组件名称">
+        <el-input v-model="form.componentName" placeholder="匹配组件内Name字段"/>
       </el-form-item>
       <el-form-item label="上级类目">
-        <treeselect v-model="form.pid" :options="menus" style="width: 460px;" placeholder="选择上级类目" />
+        <treeselect v-model="form.pid" :options="menus" style="width: 450px;" placeholder="选择上级类目" />
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -71,7 +74,7 @@ export default {
   data() {
     return {
       loading: false, dialog: false, menus: [],
-      form: { name: '', sort: 999, path: '', component: '', iframe: 'false', roles: [], pid: 0, icon: '', cache: false, hidden: false },
+      form: { name: '', sort: 999, path: '', component: '', componentName: '', iframe: 'false', roles: [], pid: 0, icon: '', cache: false, hidden: false },
       rules: {
         name: [
           { required: true, message: '请输入名称', trigger: 'blur' }
@@ -134,7 +137,7 @@ export default {
     resetForm() {
       this.dialog = false
       this.$refs['form'].resetFields()
-      this.form = { name: '', sort: 999, path: '', component: '', iframe: 'false', roles: [], pid: 0, icon: '', cache: false, hidden: false }
+      this.form = { name: '', sort: 999, path: '', component: '', componentName: '', iframe: 'false', roles: [], pid: 0, icon: '', cache: false, hidden: false }
     },
     selected(name) {
       this.form.icon = name
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index a12d82d..88acf1e 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -27,38 +27,39 @@
     <!--表单组件-->
     <eForm ref="form" :is-add="isAdd"/>
     <!--表格渲染-->
-    <tree-table v-loading="loading" :data="data" :expand-all="expand" :columns="columns" size="small">
-      <el-table-column prop="icon" label="图标" align="center" width="80px">
+    <tree-table v-loading="loading" :data="data" :expand-all="expand" :columns="columns" :height="height" size="small">
+      <el-table-column prop="icon" label="图标" align="center" width="60px">
         <template slot-scope="scope">
           <svg-icon :icon-class="scope.row.icon" />
         </template>
       </el-table-column>
-      <el-table-column prop="sort" align="center" width="100px" label="排序">
+      <el-table-column prop="sort" align="center" label="排序">
         <template slot-scope="scope">
           <el-tag>{{ scope.row.sort }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" prop="path" label="链接地址"/>
-      <el-table-column :show-overflow-tooltip="true" prop="component" label="组件路径"/>
-      <el-table-column prop="iframe" width="100px" label="内部菜单">
+      <el-table-column :show-overflow-tooltip="true" prop="componentName" label="组件名称"/>
+      <el-table-column :show-overflow-tooltip="true" prop="component" label="组件路径" width="130px"/>
+      <el-table-column prop="iframe" label="内部菜单">
         <template slot-scope="scope">
           <span v-if="!scope.row.iframe">是</span>
           <span v-else>否</span>
         </template>
       </el-table-column>
-      <el-table-column prop="iframe" width="100px" label="是否缓存">
+      <el-table-column prop="iframe" label="是否缓存">
         <template slot-scope="scope">
           <span v-if="scope.row.cache">是</span>
           <span v-else>否</span>
         </template>
       </el-table-column>
-      <el-table-column prop="iframe" width="100px" label="是否隐藏">
+      <el-table-column prop="iframe" label="是否隐藏">
         <template slot-scope="scope">
           <span v-if="scope.row.hidden">是</span>
           <span v-else>否</span>
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="创建日期">
+      <el-table-column prop="createTime" label="创建日期" width="135px">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
@@ -92,6 +93,7 @@ import { del } from '@/api/menu'
 import { parseTime } from '@/utils/index'
 import eForm from './form'
 export default {
+  name: 'Menu',
   components: { treeTable, eForm },
   mixins: [initData],
   data() {
@@ -99,14 +101,16 @@ export default {
       columns: [
         {
           text: '名称',
-          value: 'name'
+          value: 'name',
+          width: 140
         }
       ],
-      delLoading: false, expand: true
+      delLoading: false, expand: true, height: 625
     }
   },
   created() {
     this.$nextTick(() => {
+      this.height = document.documentElement.clientHeight - 200
       this.init()
     })
   },
@@ -148,7 +152,7 @@ export default {
       this.isAdd = false
       const _this = this.$refs.form
       _this.getMenus()
-      _this.form = { id: data.id, component: data.component, name: data.name, sort: data.sort, pid: data.pid, path: data.path, iframe: data.iframe.toString(), roles: [], icon: data.icon, cache: data.cache, hidden: data.hidden }
+      _this.form = { id: data.id, component: data.component, componentName: data.componentName, name: data.name, sort: data.sort, pid: data.pid, path: data.path, iframe: data.iframe.toString(), roles: [], icon: data.icon, cache: data.cache, hidden: data.hidden }
       _this.dialog = true
     },
     changExpand() {
diff --git a/src/views/system/permission/index.vue b/src/views/system/permission/index.vue
index 5616328..951b6ee 100644
--- a/src/views/system/permission/index.vue
+++ b/src/views/system/permission/index.vue
@@ -27,7 +27,7 @@
     <!--表单组件-->
     <eForm ref="form" :is-add="isAdd"/>
     <!--表格渲染-->
-    <tree-table v-loading="loading" :data="data" :expand-all="expand" :columns="columns" size="small">
+    <tree-table v-loading="loading" :data="data" :expand-all="expand" :height="height" :columns="columns" size="small">
       <el-table-column prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -62,6 +62,7 @@ import { del } from '@/api/permission'
 import { parseTime } from '@/utils/index'
 import eForm from './form'
 export default {
+  name: 'Permission',
   components: { treeTable, eForm },
   mixins: [initData],
   data() {
@@ -76,11 +77,12 @@ export default {
           value: 'alias'
         }
       ],
-      delLoading: false, expand: true
+      delLoading: false, expand: true, height: 625
     }
   },
   created() {
     this.$nextTick(() => {
+      this.height = document.documentElement.clientHeight - 200
       this.init()
     })
   },
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index bb8d4ca..b59540a 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -133,6 +133,7 @@ import { parseTime } from '@/utils/index'
 import eForm from './form'
 import { editPermission, editMenu, get } from '@/api/role'
 export default {
+  name: 'Role',
   components: { eForm },
   mixins: [initData],
   data() {
diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue
index ff4948e..64258a7 100644
--- a/src/views/system/timing/index.vue
+++ b/src/views/system/timing/index.vue
@@ -114,6 +114,7 @@ import { del, updateIsPause, execution, add, edit } from '@/api/timing'
 import { parseTime } from '@/utils/index'
 import Log from './log'
 export default {
+  name: 'Timing',
   components: { Log },
   mixins: [initData],
   data() {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 8dba217..9735675 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -103,6 +103,7 @@ import { getDepts } from '@/api/dept'
 import { parseTime, downloadFile } from '@/utils/index'
 import eForm from './form'
 export default {
+  name: 'User',
   components: { eForm },
   mixins: [initData, initDict],
   data() {
diff --git a/src/views/tools/aliPay/index.vue b/src/views/tools/aliPay/index.vue
index dc25ce2..e346585 100644
--- a/src/views/tools/aliPay/index.vue
+++ b/src/views/tools/aliPay/index.vue
@@ -35,6 +35,7 @@ import Config from './config'
 import ToPay from './toPay'
 import '@/styles/description.scss'
 export default {
+  name: 'AliPay',
   components: { Config, ToPay },
   data() {
     return {
diff --git a/src/views/tools/email/index.vue b/src/views/tools/email/index.vue
index 013aa38..3809ce4 100644
--- a/src/views/tools/email/index.vue
+++ b/src/views/tools/email/index.vue
@@ -28,6 +28,7 @@ import Config from './config'
 import Send from './send'
 import '@/styles/description.scss'
 export default {
+  name: 'Email',
   components: { Config, Send },
   data() {
     return {
diff --git a/src/views/tools/picture/index.vue b/src/views/tools/picture/index.vue
index 21e2068..a872753 100644
--- a/src/views/tools/picture/index.vue
+++ b/src/views/tools/picture/index.vue
@@ -99,6 +99,7 @@ import { mapGetters } from 'vuex'
 import { del, delAll } from '@/api/picture'
 import { getToken } from '@/utils/auth'
 export default {
+  name: 'Pictures',
   mixins: [initData],
   data() {
     return {
diff --git a/src/views/tools/qiniu/index.vue b/src/views/tools/qiniu/index.vue
index 334fbc7..a43795b 100644
--- a/src/views/tools/qiniu/index.vue
+++ b/src/views/tools/qiniu/index.vue
@@ -27,6 +27,7 @@ import Config from './config'
 import List from './list'
 import '@/styles/description.scss'
 export default {
+  name: 'Qiniu',
   components: { Config, List },
   data() {
     return {
diff --git a/src/views/tools/swagger/index.vue b/src/views/tools/swagger/index.vue
index 40e1719..4851ac8 100644
--- a/src/views/tools/swagger/index.vue
+++ b/src/views/tools/swagger/index.vue
@@ -5,6 +5,7 @@
 import { mapGetters } from 'vuex'
 import elFrame from '@/components/iframe/index'
 export default {
+  name: 'Swagger',
   components: { elFrame },
   computed: {
     ...mapGetters([