Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3

frontend/src/business/components/common/components/MsTableHeader.vue

@@ -7,15 +7,15 @@
       </slot>
     </el-row>
     <el-row type="flex" justify="space-between" align="middle">
+      <template v-slot:button>
       <span class="operate-button">
         <ms-table-button :is-tester-permission="isTesterPermission" v-if="showCreate" icon="el-icon-circle-plus-outline"
                          :content="createTip" @click="create"/>
         <ms-table-button :is-tester-permission="isTesterPermission" v-if="showRun" icon="el-icon-video-play"
                          type="primary"
                          :content="runTip" @click="runTest"/>
-
-        <slot name="button"></slot>
       </span>
+      </template>
       <span>
         <ms-table-search-bar :condition.sync="condition" @change="search" class="search-bar" :tip="tip"/>
         <ms-table-adv-search-bar :condition.sync="condition" @search="search" v-if="isCombine"/>

frontend/src/business/components/common/router/router.js

@@ -41,6 +41,13 @@ router.beforeEach((to, from, next) => {
   }
 });
 
+//重复点击导航路由报错
+const routerPush = VueRouter.prototype.push;
+VueRouter.prototype.push = function push(location) {
+  return routerPush.call(this, location).catch(error => error)
+}
+
+
 // 登入后跳转至原路径
 function redirectLoginPath(originPath) {
   let redirectUrl = sessionStorage.getItem('redirectUrl');