Merge branch 'master' into deploy

src/components/Permission/permission.js

@@ -1,18 +1,19 @@
 import store from '@/store'
 
 export default {
-  inserted(el, binding, vnode) {
+  inserted(el, binding) {
+    console.log(el, binding)
     const { value } = binding
     const roles = store.getters && store.getters.roles
-    if (value && value instanceof Array && value.length > 0) {
+    if (value && value instanceof Array) {
-      const permissionRoles = value
+      if (value.length > 0) {
-
+        const permissionRoles = value
-      const hasPermission = roles.some(role => {
+        const hasPermission = roles.some(role => {
-        return permissionRoles.includes(role)
+          return permissionRoles.includes(role)
-      })
+        })
-
+        if (!hasPermission) {
-      if (!hasPermission) {
+          el.parentNode && el.parentNode.removeChild(el)
-        el.parentNode && el.parentNode.removeChild(el)
+        }
       }
     } else {
       throw new Error(`使用方式： v-permission="['admin','editor']"`)

src/main.js

@@ -13,6 +13,7 @@ import 'mavon-editor/dist/css/index.css'
 import dict from './components/Dict'
 
 // 权限指令
+import checkPer from '@/utils/permission'
 import permission from './components/Permission'
 import './assets/styles/element-variables.scss'
 // global css
@@ -30,6 +31,7 @@ import './assets/icons' // icon
 import './router/index' // permission control
 import 'echarts-gl'
 
+Vue.use(checkPer)
 Vue.use(VueHighlightJS)
 Vue.use(mavonEditor)
 Vue.use(permission)

src/mixins/crud.js

@@ -6,7 +6,6 @@ import {
   parseTime,
   downloadFile
 } from '@/utils/index'
-import checkPermission from '@/utils/permission'
 
 export default {
   data() {
@@ -51,7 +50,6 @@ export default {
   methods: {
     parseTime,
     downloadFile,
-    checkPermission,
     async init() {
       if (!await this.beforeInit()) {
         return

src/utils/permission.js

@@ -5,21 +5,25 @@ import store from '@/store'
  * @returns {Boolean}
  * @example see @/views/permission/directive.vue
  */
-export default function checkPermission(value) {
+export default {
-  if (value && value instanceof Array && value.length > 0) {
+  install(Vue) {
-    const roles = store.getters && store.getters.roles
+    Vue.prototype.checkPer = (value) => {
-    const permissionRoles = value
+      if (value && value instanceof Array && value.length > 0) {
+        const roles = store.getters && store.getters.roles
+        const permissionRoles = value
 
-    const hasPermission = roles.some(role => {
+        const hasPermission = roles.some(role => {
-      return permissionRoles.includes(role)
+          return permissionRoles.includes(role)
-    })
+        })
 
-    if (!hasPermission) {
+        if (!hasPermission) {
-      return false
+          return false
+        }
+        return true
+      } else {
+        console.error(`need roles! Like v-permission="['admin','editor']"`)
+        return false
+      }
     }
-    return true
-  } else {
-    console.error(`need roles! Like v-permission="['admin','editor']"`)
-    return false
   }
 }

src/views/generator/index.vue

@@ -27,11 +27,7 @@
       <el-table-column :show-overflow-tooltip="true" prop="engine" label="数据库引擎" />
       <el-table-column :show-overflow-tooltip="true" prop="coding" label="字符编码集" />
       <el-table-column :show-overflow-tooltip="true" prop="remark" label="备注" />
-      <el-table-column prop="createTime" label="创建日期">
+      <el-table-column prop="createTime" label="创建日期" />
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" width="160px" align="center" fixed="right">
         <template slot-scope="scope">
           <el-button size="mini" style="margin-right: 2px" type="text">

src/views/mnt/app/index.vue

@@ -59,12 +59,8 @@
       <el-table-column prop="uploadPath" label="上传目录" />
       <el-table-column prop="deployPath" label="部署目录" />
       <el-table-column prop="backupPath" label="备份目录" />
-      <el-table-column prop="createTime" label="创建日期">
+      <el-table-column prop="createTime" label="创建日期" />
-        <template slot-scope="scope">
+      <el-table-column v-if="checkPer(['admin','app:edit','app:del'])" label="操作" width="150px" align="center">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-permission="['admin','app:edit','app:del']" label="操作" width="150px" align="center">
         <template slot-scope="scope">
           <udOperation
             :data="scope.row"

src/views/mnt/database/index.vue

@@ -51,12 +51,8 @@
       <el-table-column prop="name" width="130px" label="数据库名称" />
       <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 prop="createTime" width="200px" label="创建日期" />
-        <template slot-scope="scope">
+      <el-table-column v-if="checkPer(['admin','database:edit','database:del'])" label="操作" width="150px" align="center">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-permission="['admin','database:edit','database:del']" label="操作" width="150px" align="center">
         <template slot-scope="scope">
           <udOperation
             :data="scope.row"

src/views/mnt/deploy/index.vue

@@ -90,12 +90,8 @@
       <el-table-column type="selection" width="55" />
       <el-table-column prop="app.name" label="应用名称" />
       <el-table-column prop="servers" label="服务器列表" />
-      <el-table-column prop="createTime" label="部署日期">
+      <el-table-column prop="createTime" label="部署日期" />
-        <template slot-scope="scope">
+      <el-table-column v-if="checkPer(['admin','deploy:edit','deploy:del'])" label="操作" width="150px" align="center">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-permission="['admin','deploy:edit','deploy:del']" label="操作" width="150px" align="center">
         <template slot-scope="scope">
           <udOperation
             :data="scope.row"

src/views/mnt/deploy/sysRestore.vue

@@ -15,11 +15,7 @@
         </el-table-column>
         <el-table-column prop="appName" label="应用名称" />
         <el-table-column prop="ip" label="部署IP" />
-        <el-table-column prop="deployDate" label="部署时间">
+        <el-table-column prop="deployDate" label="部署时间" />
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.deployDate) }}</span>
-          </template>
-        </el-table-column>
         <el-table-column prop="deployUser" label="部署人员" />
       </el-table>
     </el-form>

src/views/mnt/deployHistory/index.vue

@@ -16,12 +16,8 @@
       <el-table-column prop="appName" label="应用名称" />
       <el-table-column prop="ip" label="部署IP" />
       <el-table-column prop="deployUser" label="部署人员" />
-      <el-table-column prop="deployDate" label="部署时间">
+      <el-table-column prop="deployDate" label="部署时间" />
-        <template slot-scope="scope">
+      <el-table-column v-if="checkPer(['admin','deployHistory:del'])" label="操作" width="100px" align="center">
-          <span>{{ parseTime(scope.row.deployDate) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-permission="['admin','deployHistory:del']" label="操作" width="100px" align="center">
         <template slot-scope="scope">
           <el-popover
             :ref="scope.row.id"

src/views/mnt/server/index.vue

@@ -42,12 +42,8 @@
       <el-table-column prop="ip" label="IP" />
       <el-table-column prop="port" label="端口" />
       <el-table-column prop="account" label="账号" />
-      <el-table-column prop="createTime" label="创建日期">
+      <el-table-column prop="createTime" label="创建日期" />
-        <template slot-scope="scope">
+      <el-table-column v-if="checkPer(['admin','serverDeploy:edit','serverDeploy:del'])" label="操作" width="150px" align="center">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-permission="['admin','serverDeploy:edit','serverDeploy:del']" label="操作" width="150px" align="center">
         <template slot-scope="scope">
           <udOperation
             :data="scope.row"

src/views/monitor/log/errorLog.vue

@@ -35,11 +35,7 @@
       <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源" />
       <el-table-column prop="description" label="描述" />
       <el-table-column prop="browser" label="浏览器" />
-      <el-table-column prop="createTime" label="创建日期">
+      <el-table-column prop="createTime" label="创建日期" />
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="异常详情" width="100px">
         <template slot-scope="scope">
           <el-button size="mini" type="text" @click="info(scope.row.id)">查看详情</el-button>

src/views/monitor/log/index.vue

@@ -42,11 +42,7 @@
           <el-tag v-else type="danger">{{ scope.row.time }}ms</el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="创建日期" width="180px">
+      <el-table-column prop="createTime" label="创建日期" width="180px" />
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
     </el-table>
     <!--分页组件-->
     <pagination />

src/views/monitor/online/index.vue

@@ -29,11 +29,7 @@
       <el-table-column prop="ip" label="登录IP" />
       <el-table-column :show-overflow-tooltip="true" prop="address" label="登录地点" />
       <el-table-column prop="browser" label="浏览器" />
-      <el-table-column prop="loginTime" label="登录时间">
+      <el-table-column prop="loginTime" label="登录时间" />
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.loginTime) }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" width="70px" fixed="right">
         <template slot-scope="scope">
           <el-popover

src/views/system/dept/index.vue

@@ -79,12 +79,8 @@
           />
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="创建日期">
+      <el-table-column prop="createTime" label="创建日期" />
-        <template slot-scope="scope">
+      <el-table-column v-if="checkPer(['admin','dept:edit','dept:del'])" label="操作" width="130px" align="center" fixed="right">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-permission="['admin','dept:edit','dept:del']" label="操作" width="130px" align="center" fixed="right">
         <template slot-scope="scope">
           <udOperation
             :data="scope.row"

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-permission="['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"

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-permission="['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) {

src/views/system/job/index.vue

@@ -24,14 +24,10 @@
           />
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="创建日期">
+      <el-table-column prop="createTime" label="创建日期" />
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
       <!--   编辑与删除   -->
       <el-table-column
-        v-permission="['admin','job:edit','job:del']"
+        v-if="checkPer(['admin','job:edit','job:del'])"
         label="操作"
         width="130px"
         align="center"
@@ -60,7 +56,6 @@ import CRUD, { presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import udOperation from '@crud/UD.operation'
-
 export default {
   name: 'Job',
   components: { eHeader, eForm, crudOperation, pagination, udOperation },

src/views/system/menu/index.vue

@@ -133,12 +133,8 @@
           <span v-else>是</span>
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="创建日期" width="135px">
+      <el-table-column prop="createTime" label="创建日期" width="135px" />
-        <template slot-scope="scope">
+      <el-table-column v-if="checkPer(['admin','menu:edit','menu:del'])" label="操作" width="130px" align="center" fixed="right">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-permission="['admin','menu:edit','menu:del']" label="操作" width="130px" align="center" fixed="right">
         <template slot-scope="scope">
           <udOperation
             :data="scope.row"

src/views/system/role/index.vue

@@ -61,12 +61,8 @@
             <el-table-column prop="dataScope" label="数据权限" />
             <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 :show-overflow-tooltip="true" width="135px" prop="createTime" label="创建日期" />
-              <template slot-scope="scope">
+            <el-table-column v-if="checkPer(['admin','roles:edit','roles:del'])" label="操作" width="130px" align="center" fixed="right">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column v-permission="['admin','roles:edit','roles:del']" label="操作" width="130px" align="center" fixed="right">
               <template slot-scope="scope">
                 <udOperation
                   v-if="scope.row.level >= level"

src/views/system/timing/index.vue

@@ -84,12 +84,8 @@
         </template>
       </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 :show-overflow-tooltip="true" prop="createTime" width="136px" label="创建日期" />
-        <template slot-scope="scope">
+      <el-table-column v-if="checkPer(['admin','timing:edit','timing:del'])" label="操作" width="170px" align="center" fixed="right">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-permission="['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>

src/views/system/timing/log.vue

@@ -38,11 +38,7 @@
           <el-tag :type="scope.row.isSuccess ? 'success' : 'danger'">{{ scope.row.isSuccess ? '成功' : '失败' }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="createTime" label="创建日期">
+      <el-table-column :show-overflow-tooltip="true" prop="createTime" label="创建日期" />
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
     </el-table>
     <el-dialog :visible.sync="errorDialog" append-to-body title="异常详情" width="85%">
       <pre v-highlightjs="errorInfo"><code class="java" /></pre>

src/views/system/user/center.vue

@@ -81,7 +81,7 @@
                     <div style="display:inline-block;float: right;cursor: pointer" @click="init">创建日期<i class="el-icon-refresh" style="margin-left: 40px" /></div>
                   </template>
                   <template slot-scope="scope">
-                    <span>{{ parseTime(scope.row.createTime) }}</span>
+                    <span>{{ scope.row.createTime }}</span>
                   </template>
                 </el-table-column>
               </el-table>
@@ -112,7 +112,6 @@ import updateEmail from './center/updateEmail'
 import { getToken } from '@/utils/auth'
 import store from '@/store'
 import { isvalidPhone } from '@/utils/validate'
-import { parseTime } from '@/utils/index'
 import crud from '@/mixins/crud'
 import { editUser } from '@/api/system/user'
 import Avatar from '@/assets/images/avatar.png'
@@ -163,7 +162,6 @@ export default {
     store.dispatch('GetInfo').then(() => {})
   },
   methods: {
-    parseTime,
     toggleShow() {
       this.show = !this.show
     },

src/views/system/user/index.vue

@@ -163,13 +163,9 @@
               />
             </template>
           </el-table-column>
-          <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
+          <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期" />
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
           <el-table-column
-            v-permission="['admin','user:edit','user:del']"
+            v-if="checkPer(['admin','user:edit','user:del'])"
             label="操作"
             width="115"
             align="center"

src/views/tools/storage/local/index.vue

@@ -94,11 +94,7 @@
       <el-table-column prop="type" label="类别" />
       <el-table-column prop="size" label="大小" />
       <el-table-column prop="operate" label="操作人" />
-      <el-table-column prop="createTime" label="创建日期">
+      <el-table-column prop="createTime" label="创建日期" />
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
     </el-table>
     <!--分页组件-->
     <pagination />

src/views/tools/storage/qiniu/index.vue

@@ -57,11 +57,7 @@
         <el-table-column prop="bucket" label="空间名称" />
         <el-table-column prop="size" label="文件大小" />
         <el-table-column prop="type" label="空间类型" />
-        <el-table-column prop="updateTime" label="创建日期">
+        <el-table-column prop="updateTime" label="创建日期" />
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.updateTime) }}</span>
-          </template>
-        </el-table-column>
       </el-table>
       <!--分页组件-->
       <pagination />