From 78176daf6910774e3ff96700314aaa254e616ae4 Mon Sep 17 00:00:00 2001
From: zhengjie <201507802@qq.com>
Date: Sat, 12 Dec 2020 22:49:57 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.6)?=
 =?UTF-8?q?=EF=BC=9Abug=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

link https://github.com/elunez/eladmin/issues/504
---
 src/views/mnt/app/index.vue           | 2 +-
 src/views/mnt/database/index.vue      | 2 +-
 src/views/mnt/deploy/index.vue        | 2 +-
 src/views/mnt/deployHistory/index.vue | 2 +-
 src/views/mnt/server/index.vue        | 2 +-
 src/views/system/dept/index.vue       | 2 +-
 src/views/system/dict/dictDetail.vue  | 2 +-
 src/views/system/dict/index.vue       | 7 ++-----
 src/views/system/menu/index.vue       | 2 +-
 src/views/system/role/index.vue       | 2 +-
 src/views/system/timing/index.vue     | 2 +-
 src/views/system/user/index.vue       | 2 +-
 12 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/views/mnt/app/index.vue b/src/views/mnt/app/index.vue
index 00adc45..ddb8fb8 100644
--- a/src/views/mnt/app/index.vue
+++ b/src/views/mnt/app/index.vue
@@ -60,7 +60,7 @@
       <el-table-column prop="deployPath" label="部署目录" />
       <el-table-column prop="backupPath" label="备份目录" />
       <el-table-column prop="createTime" label="创建日期" />
-      <el-table-column v-if="checkPer['admin','app:edit','app:del']" label="操作" width="150px" align="center">
+      <el-table-column v-if="checkPer(['admin','app:edit','app:del'])" label="操作" width="150px" align="center">
         <template slot-scope="scope">
           <udOperation
             :data="scope.row"
diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue
index 1aa0014..03d44a6 100644
--- a/src/views/mnt/database/index.vue
+++ b/src/views/mnt/database/index.vue
@@ -52,7 +52,7 @@
       <el-table-column prop="jdbcUrl" label="连接地址" />
       <el-table-column prop="userName" width="200px" label="用户名" />
       <el-table-column prop="createTime" width="200px" label="创建日期" />
-      <el-table-column v-if="checkPer['admin','database:edit','database:del']" label="操作" width="150px" align="center">
+      <el-table-column v-if="checkPer(['admin','database:edit','database:del'])" label="操作" width="150px" align="center">
         <template slot-scope="scope">
           <udOperation
             :data="scope.row"
diff --git a/src/views/mnt/deploy/index.vue b/src/views/mnt/deploy/index.vue
index 9ea2622..e2ab8a7 100644
--- a/src/views/mnt/deploy/index.vue
+++ b/src/views/mnt/deploy/index.vue
@@ -91,7 +91,7 @@
       <el-table-column prop="app.name" label="应用名称" />
       <el-table-column prop="servers" label="服务器列表" />
       <el-table-column prop="createTime" label="部署日期" />
-      <el-table-column v-if="checkPer['admin','deploy:edit','deploy:del']" label="操作" width="150px" align="center">
+      <el-table-column v-if="checkPer(['admin','deploy:edit','deploy:del'])" label="操作" width="150px" align="center">
         <template slot-scope="scope">
           <udOperation
             :data="scope.row"
diff --git a/src/views/mnt/deployHistory/index.vue b/src/views/mnt/deployHistory/index.vue
index 7d08715..c4f9728 100644
--- a/src/views/mnt/deployHistory/index.vue
+++ b/src/views/mnt/deployHistory/index.vue
@@ -17,7 +17,7 @@
       <el-table-column prop="ip" label="部署IP" />
       <el-table-column prop="deployUser" label="部署人员" />
       <el-table-column prop="deployDate" label="部署时间" />
-      <el-table-column v-if="checkPer['admin','deployHistory:del']" label="操作" width="100px" align="center">
+      <el-table-column v-if="checkPer(['admin','deployHistory:del'])" label="操作" width="100px" align="center">
         <template slot-scope="scope">
           <el-popover
             :ref="scope.row.id"
diff --git a/src/views/mnt/server/index.vue b/src/views/mnt/server/index.vue
index 8b95cb8..c26cc9c 100644
--- a/src/views/mnt/server/index.vue
+++ b/src/views/mnt/server/index.vue
@@ -43,7 +43,7 @@
       <el-table-column prop="port" label="端口" />
       <el-table-column prop="account" label="账号" />
       <el-table-column prop="createTime" label="创建日期" />
-      <el-table-column v-if="checkPer['admin','serverDeploy:edit','serverDeploy:del']" label="操作" width="150px" align="center">
+      <el-table-column v-if="checkPer(['admin','serverDeploy:edit','serverDeploy:del'])" label="操作" width="150px" align="center">
         <template slot-scope="scope">
           <udOperation
             :data="scope.row"
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index d5effe7..d02b846 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -80,7 +80,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="createTime" label="创建日期" />
-      <el-table-column v-if="checkPer['admin','dept:edit','dept:del']" label="操作" width="130px" align="center" fixed="right">
+      <el-table-column v-if="checkPer(['admin','dept:edit','dept:del'])" label="操作" width="130px" align="center" fixed="right">
         <template slot-scope="scope">
           <udOperation
             :data="scope.row"
diff --git a/src/views/system/dict/dictDetail.vue b/src/views/system/dict/dictDetail.vue
index 9e614d3..32756da 100644
--- a/src/views/system/dict/dictDetail.vue
+++ b/src/views/system/dict/dictDetail.vue
@@ -38,7 +38,7 @@
         <el-table-column prop="label" label="字典标签" />
         <el-table-column prop="value" label="字典值" />
         <el-table-column prop="dictSort" label="排序" />
-        <el-table-column v-if="checkPer['admin','dict:edit','dict:del']" label="操作" width="130px" align="center" fixed="right">
+        <el-table-column v-if="checkPer(['admin','dict:edit','dict:del'])" label="操作" width="130px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index cc5e2f4..20c818b 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -33,7 +33,7 @@
             <el-table-column type="selection" width="55" />
             <el-table-column :show-overflow-tooltip="true" prop="name" label="名称" />
             <el-table-column :show-overflow-tooltip="true" prop="description" label="描述" />
-            <el-table-column v-if="checkPer['admin','dict:edit','dict:del']" label="操作" width="130px" align="center" fixed="right">
+            <el-table-column v-if="checkPer(['admin','dict:edit','dict:del'])" label="操作" width="130px" align="center" fixed="right">
               <template slot-scope="scope">
                 <udOperation
                   :data="scope.row"
@@ -52,7 +52,7 @@
           <div slot="header" class="clearfix">
             <span>字典详情</span>
             <el-button
-              v-if="checkPermission(['admin','dict:add']) && this.$refs.dictDetail && this.$refs.dictDetail.query.dictName"
+              v-if="checkPer(['admin','dict:add']) && this.$refs.dictDetail && this.$refs.dictDetail.query.dictName"
               class="filter-item"
               size="mini"
               style="float: right;padding: 4px 10px"
@@ -69,10 +69,8 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
 import dictDetail from './dictDetail'
 import crudDict from '@/api/system/dict'
-
 import CRUD, { presenter, header, form } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
@@ -109,7 +107,6 @@ export default {
     }
   },
   methods: {
-    checkPermission,
     // 获取数据前设置好接口地址
     [CRUD.HOOK.beforeRefresh]() {
       if (this.$refs.dictDetail) {
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index ca4f4cc..110077e 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -134,7 +134,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="createTime" label="创建日期" width="135px" />
-      <el-table-column v-if="checkPer['admin','menu:edit','menu:del']" label="操作" width="130px" align="center" fixed="right">
+      <el-table-column v-if="checkPer(['admin','menu:edit','menu:del'])" label="操作" width="130px" align="center" fixed="right">
         <template slot-scope="scope">
           <udOperation
             :data="scope.row"
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 30c144c..c6af85b 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -62,7 +62,7 @@
             <el-table-column prop="level" label="角色级别" />
             <el-table-column :show-overflow-tooltip="true" prop="description" label="描述" />
             <el-table-column :show-overflow-tooltip="true" width="135px" prop="createTime" label="创建日期" />
-            <el-table-column v-if="checkPer['admin','roles:edit','roles:del']" label="操作" width="130px" align="center" fixed="right">
+            <el-table-column v-if="checkPer(['admin','roles:edit','roles:del'])" label="操作" width="130px" align="center" fixed="right">
               <template slot-scope="scope">
                 <udOperation
                   v-if="scope.row.level >= level"
diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue
index 97073b5..bb3bf77 100644
--- a/src/views/system/timing/index.vue
+++ b/src/views/system/timing/index.vue
@@ -85,7 +85,7 @@
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" prop="description" width="150px" label="描述" />
       <el-table-column :show-overflow-tooltip="true" prop="createTime" width="136px" label="创建日期" />
-      <el-table-column v-if="checkPer['admin','timing:edit','timing:del']" label="操作" width="170px" align="center" fixed="right">
+      <el-table-column v-if="checkPer(['admin','timing:edit','timing:del'])" label="操作" width="170px" align="center" fixed="right">
         <template slot-scope="scope">
           <el-button v-permission="['admin','timing:edit']" size="mini" style="margin-right: 3px;" type="text" @click="crud.toEdit(scope.row)">编辑</el-button>
           <el-button v-permission="['admin','timing:edit']" style="margin-left: -2px" type="text" size="mini" @click="execute(scope.row.id)">执行</el-button>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 91d11c5..92efc12 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -165,7 +165,7 @@
           </el-table-column>
           <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期" />
           <el-table-column
-            v-if="checkPer['admin','user:edit','user:del']"
+            v-if="checkPer(['admin','user:edit','user:del'])"
             label="操作"
             width="115"
             align="center"