From a138fbc6b652954c4ab61d034b78fad475810bcb Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Tue, 27 Aug 2019 14:20:34 +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=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/dev.env.js                 |  1 +
 package.json                      |  2 +-
 src/layout/components/AppMain.vue |  2 +-
 src/views/system/menu/form.vue    | 32 ++++++++++++++++++++++---------
 src/views/system/menu/index.vue   | 14 +++++++++++++-
 src/views/system/role/index.vue   |  5 +++--
 6 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/config/dev.env.js b/config/dev.env.js
index 031402a..0115503 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -5,4 +5,5 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   BASE_API: '"http://localhost:8000"'
+  // BASE_API: '"https://api.auauz.net"'
 })
diff --git a/package.json b/package.json
index bfb4611..66d8d46 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "simple-drawing-board": "^2.0.1",
     "vue": "2.5.17",
     "vue-count-to": "1.0.13",
-    "vue-router": "3.0.2",
+    "vue-router": "^3.1.2",
     "vuex": "3.0.1",
     "wangeditor": ">=3.0.0",
     "xlsx": "^0.11.16"
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 5c3a0b5..82adf2e 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 :include="cachedViews">
+      <keep-alive :exclude="cachedViews">
         <router-view :key="key"/>
       </keep-alive>
     </transition>
diff --git a/src/views/system/menu/form.vue b/src/views/system/menu/form.vue
index 3e95321..c7e8ea5 100644
--- a/src/views/system/menu/form.vue
+++ b/src/views/system/menu/form.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增菜单' : '编辑菜单'" append-to-body width="600px">
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+    <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
       <el-form-item label="菜单图标">
         <el-popover
           placement="bottom-start"
@@ -20,11 +20,25 @@
       <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-form-item>
-      <el-form-item label="内部菜单" prop="iframe">
-        <el-radio v-model="form.iframe" label="false">是</el-radio>
-        <el-radio v-model="form.iframe" label="true" >否</el-radio>
+      <el-form-item label="内部菜单">
+        <el-radio-group v-model="form.iframe" size="mini">
+          <el-radio-button label="false">是</el-radio-button>
+          <el-radio-button label="true">否</el-radio-button>
+        </el-radio-group>
       </el-form-item>
-      <el-form-item label="链接地址">
+      <el-form-item label="是否缓存">
+        <el-radio-group v-model="form.cache" size="mini">
+          <el-radio-button label="true">是</el-radio-button>
+          <el-radio-button label="false">否</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="是否隐藏">
+        <el-radio-group v-model="form.hidden" size="mini">
+          <el-radio-button label="true">是</el-radio-button>
+          <el-radio-button label="false">否</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="链接地址" prop="path">
         <el-input v-model="form.path" placeholder="菜单路径" style="width: 460px;"/>
       </el-form-item>
       <el-form-item v-if="form.iframe === 'false'" label="组件路径">
@@ -57,7 +71,7 @@ export default {
   data() {
     return {
       loading: false, dialog: false, menus: [],
-      form: { name: '', sort: 999, path: '', component: '', iframe: 'false', roles: [], pid: 0, icon: '' },
+      form: { name: '', sort: 999, path: '', component: '', iframe: 'false', roles: [], pid: 0, icon: '', cache: false, hidden: false },
       rules: {
         name: [
           { required: true, message: '请输入名称', trigger: 'blur' }
@@ -65,8 +79,8 @@ export default {
         sort: [
           { required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
         ],
-        iframe: [
-          { required: true, message: '请选择菜单类型', trigger: 'blur' }
+        path: [
+          { required: true, message: '请输入地址', trigger: 'blur' }
         ]
       }
     }
@@ -120,7 +134,7 @@ export default {
     resetForm() {
       this.dialog = false
       this.$refs['form'].resetFields()
-      this.form = { name: '', sort: 999, path: '', component: '', iframe: 'false', roles: [], pid: 0, icon: '' }
+      this.form = { name: '', sort: 999, path: '', component: '', 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 7400a80..a12d82d 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -46,6 +46,18 @@
           <span v-else>否</span>
         </template>
       </el-table-column>
+      <el-table-column prop="iframe" width="100px" 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="是否隐藏">
+        <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="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -136,7 +148,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 }
+      _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.dialog = true
     },
     changExpand() {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 4e8ec2f..bb8d4ca 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -156,8 +156,6 @@ export default {
     parseTime,
     checkPermission,
     beforeInit() {
-      this.$refs.permission.setCheckedKeys([])
-      this.$refs.menu.setCheckedKeys([])
       this.showButton = false
       this.url = 'api/roles'
       const sort = 'level,asc'
@@ -165,6 +163,9 @@ export default {
       const value = query.value
       this.params = { page: this.page, size: this.size, sort: sort }
       if (value) { this.params['blurry'] = value }
+      // 清空权限与菜单的选中
+      this.$refs.permission.setCheckedKeys([])
+      this.$refs.menu.setCheckedKeys([])
       return true
     },
     subDelete(id) {