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

Former-commit-id: c8b0ec3f3b8a456283b9ecfe1b27a231d893c9a2 [formerly c8b0ec3f3b8a456283b9ecfe1b27a231d893c9a2 [formerly c8b0ec3f3b8a456283b9ecfe1b27a231d893c9a2 [formerly c8b0ec3f3b8a456283b9ecfe1b27a231d893c9a2 [formerly fc36affd158bd7b09698853b1e8952458f956b50 [formerly 0d2e234658c41fde9bb884420b8f441fcdecf09e]]]]]
Former-commit-id: 9839c180b17ff8366b1ae0428b237e6984e73761
Former-commit-id: 84d5db08a9d0f26af53a03c63d65366338ca5f70
Former-commit-id: 928a3ba4106b3b9cd27eb483d6bfb59cb84857c6 [formerly 6f8c369a585e8f86787f5b7249e9944c0ead0365]
Former-commit-id: a675b9408e13b7cb42035b6533d608a0b3b457df
Former-commit-id: 029d4d1d31d8a60ce798077005b3551f8c3e3e01
Former-commit-id: 094f285f3b00fc370495878142c138fef0af6737
Former-commit-id: ba6bd632c477a6fc9e5fd8989c71c6ef6dc095bc
Former-commit-id: 56dc1db7fadc5a49978e92297f0b7b700ace3638

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)