Merge branch 'hotfix/优化多标签页关闭逻辑以及版本号更新'

Former-commit-id: c8bb09de5d8109b86af9dec75796724d59641768 [formerly 0de757bbd5b967fc6b664437c9df099dc079e2c2] [formerly c8bb09de5d8109b86af9dec75796724d59641768 [formerly 0de757bbd5b967fc6b664437c9df099dc079e2c2] [formerly c8bb09de5d8109b86af9dec75796724d59641768 [formerly 0de757bbd5b967fc6b664437c9df099dc079e2c2] [formerly 0de757bbd5b967fc6b664437c9df099dc079e2c2 [formerly bcece99 [formerly 31065ca05a7370775be7898b3af4394daaf65155]]]]]
Former-commit-id: 47dad87
Former-commit-id: 88f65ae
Former-commit-id: d858d2a8add8c86094921fa227a6936dd7450bc6 [formerly 636425fc3138aef376d4ab6e6c698fc39b1f042c]
Former-commit-id: 6a3e80e43170797b9d912993a2117c7f735df42f
Former-commit-id: 4d98440dfe2972f1c74dce5942a8cd863c63427a
Former-commit-id: 4fa993eaabc0ff6f701f84875dfcbd1ab798d0b9
Former-commit-id: dadead845824e61942fc7a5ef15ab6f1bbae3d62
Former-commit-id: 6a39a1ff16feb86f458e59df4dadf52aeec23812

package.json

@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.1.9",
+  "version": "1.1.11",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --open",

src/layout/header-aside/components/tabs/index.vue

@@ -32,7 +32,7 @@
       <el-dropdown
         split-button
         @click="handleControlBtnClick"
-        @command="handleControlItemClick">
+        @command="command => handleControlItemClick(command)">
         <d2-icon name="times-circle"/>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item command="left">
@@ -127,21 +127,13 @@ export default {
      * @description 接收点击关闭控制上选项的事件
      */
     handleControlItemClick (command, tagName = null) {
-      // 关闭右键菜单
-      this.contextmenuFlag = false
-      // 判断触发方式
-      let pageSelect = tagName
-      if (pageSelect) {
-        if (pageSelect._isVue) {
-          pageSelect = null
-        }
+      if (tagName) {
+        this.contextmenuFlag = false
       }
-      // 设置传递参数
       const params = {
-        pageSelect,
+        pageSelect: tagName,
         vm: this
       }
-      // 根据不同的类型触发不同的关闭事件
       switch (command) {
         case 'left':
           this.d2adminTagCloseLeft(params)