From d949d87cdd172a2052c893acdad8d2be0227457d Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 20 Apr 2020 19:55:07 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0lodash=E5=88=B0?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js                                     |  4 ++++
 src/components/ActionsGroup/index.vue            |  2 +-
 .../ListTable/formatters/ActionsFormatter.vue    | 16 ++++++++++++++--
 .../components/GenericDetailPage/index.vue       |  9 ++++++---
 src/main.js                                      |  5 +++++
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 64de64cac..636e06962 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -10,6 +10,10 @@ module.exports = {
     es6: true
   },
   extends: ['plugin:vue/recommended', 'eslint:recommended'],
+  globals: {
+    window: true,
+    _: true
+  },
 
   // add your custom rules here
   // it is base on https://github.com/vuejs/eslint-config-vue
diff --git a/src/components/ActionsGroup/index.vue b/src/components/ActionsGroup/index.vue
index ca24110ec..3db0df59d 100644
--- a/src/components/ActionsGroup/index.vue
+++ b/src/components/ActionsGroup/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div :class="grouped ? 'el-button-group' : ''">
     <el-button v-for="item in actions" :key="item.name" :size="size" v-bind="item" @click="handleClick(item.name)">
-      <i v-if="item.has" :class="'fa ' + item.fa" />{{ item.title }}
+      <i v-if="item.fa" :class="'fa ' + item.fa" />{{ item.title }}
     </el-button>
     <el-dropdown v-if="moreActions.length > 0" trigger="click" @command="handleClick">
       <el-button :size="size" class="btn-more-actions">
diff --git a/src/components/ListTable/formatters/ActionsFormatter.vue b/src/components/ListTable/formatters/ActionsFormatter.vue
index ebf3085fd..b8f7040cd 100644
--- a/src/components/ListTable/formatters/ActionsFormatter.vue
+++ b/src/components/ListTable/formatters/ActionsFormatter.vue
@@ -107,11 +107,22 @@ export default {
       }
       return validActions
     },
+    cleanedActions() {
+      const actions = []
+      for (const v of [...this.validActions]) {
+        const action = _.cloneDeep(v)
+        delete action['has']
+        delete action['can']
+        delete action['callback']
+        actions.push(action)
+      }
+      return actions
+    },
     actions() {
-      return this.validActions.slice(0, 2)
+      return this.cleanedActions.slice(0, 2)
     },
     moreActions() {
-      return this.validActions.slice(2, this.validActions.length)
+      return this.cleanedActions.slice(2, this.cleanedActions.length)
     },
     namedValidActions() {
       const actions = {}
@@ -127,6 +138,7 @@ export default {
   methods: {
     handleActionClick(item) {
       const action = this.namedValidActions[item]
+      console.log(this.validActions)
       if (action && action.callback) {
         const attrs = {
           reload: this.reload,
diff --git a/src/layout/components/GenericDetailPage/index.vue b/src/layout/components/GenericDetailPage/index.vue
index c5cab9eb5..ef50f1ae2 100644
--- a/src/layout/components/GenericDetailPage/index.vue
+++ b/src/layout/components/GenericDetailPage/index.vue
@@ -3,9 +3,12 @@
     <span slot="title">
       {{ title }}
     </span>
-    <span v-if="hasRightSide" slot="headingRightSide">
-      <ActionsGroup slot="headingRightSide" :actions="pageActions" />
-    </span>
+
+    <template #headingRightSide>
+      <span v-if="hasRightSide">
+        <ActionsGroup slot="headingRightSide" :actions="pageActions" />
+      </span>
+    </template>
 
     <div>
       <el-tabs v-if="submenu.length > 0" slot="submenu" v-model="activeName" class="page-submenu">
diff --git a/src/main.js b/src/main.js
index 0e272ed7e..e4b2c39d5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -42,6 +42,11 @@ Vue.use(VueCookie)
 
 import service from '@/utils/request'
 
+// lodash
+// import _ from 'lodash'
+window._ = require('lodash')
+// Vue.set(Vue.prototype, '_', _)
+
 // if the table component cannot access `this.$axios`, it cannot send request
 Vue.prototype.$axios = service
 // 注册全局事件总线