Merge branch 'develop'

Former-commit-id: acb6531780480942055827238a880458f184146f [formerly acb6531780480942055827238a880458f184146f [formerly acb6531780480942055827238a880458f184146f [formerly acb6531780480942055827238a880458f184146f [formerly 683fdb9f545e9858574c65a565572bcd3591cdbf [formerly 86e5bf3b6a2e4ed0bb293c8cac6dd4bb6044598d]]]]]
Former-commit-id: 984ae0d808e0f968c8dd12172e3bbf310988662a
Former-commit-id: e78d96d19aba6de61041e3dbcd0e0933b94b2409
Former-commit-id: f4a42f6f7722c736993c1fed1f7ac72f10aae6c6 [formerly 85e431d8f80651ebed3c93f787fd715d4d8777d2]
Former-commit-id: 1e36a362c661c2d30a1e9270e97c482161993178
Former-commit-id: cd12f1dc733f051ba9f3b2402a253dcf1cae7c13
Former-commit-id: dabe846961afff06e599ba799ab4e2c05bd40663
Former-commit-id: 21c48d190f3f86d1e511b640f60179efe8a13925
Former-commit-id: 71e5dc2ad87ffe2fbf2e961ff452db1a8f5a079f

package.json

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

src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue

@@ -21,24 +21,31 @@
 </template>
 
 <script>
-  export default {
-    name: 'd2-contextmenu-list',
-    props: {
-      menulist: {
-        type: Array,
-        default: () => []
-      }
-    },
-    methods: {
-      rowClick (event) {
-        let target = event.target
-        while(!target.dataset.value) {
+export default {
+  name: 'd2-contextmenu-list',
+  props: {
+    menulist: {
+      type: Array,
+      default: () => []
+    }
+  },
+  methods: {
+    rowClick (event) {
+      let target = event.target
+      try {
+        let count = 0
+        while (!target.dataset.value && count < 6) {
           target = target.parentNode
+          count++
         }
         this.$emit('rowClick', target.dataset.value)
+      } catch (error) {
+        // 不做任何处理
+        console.log(error)
       }
     }
   }
+}
 </script>
 
 <style lang="scss">

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

@@ -19,7 +19,6 @@
           @edit="handleTabsEdit"
           @contextmenu.native="handleContextmenu">
           <el-tab-pane
-            class="hello"
             v-for="(page, index) in pageOpenedList"
             :key="index"
             :label="page.meta.title || '未命名'"