From f85b044ff8a3bc97d9c3ec61bd99480826ef1501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= Date: Mon, 10 Sep 2018 11:13:08 +0800 Subject: [PATCH 01/28] fix: table style bug in mini size option (#1081) #1080 --- src/views/table/complexTable.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/table/complexTable.vue b/src/views/table/complexTable.vue index 205fb001..834ed3d0 100644 --- a/src/views/table/complexTable.vue +++ b/src/views/table/complexTable.vue @@ -24,7 +24,7 @@ border fit highlight-current-row - style="width: 100%;min-height:1000px;"> + style="width: 100%;"> @@ -39,10 +39,11 @@ import path from 'path' import { generateTitle } from '@/utils/i18n' import { validateURL } from '@/utils/validate' import Item from './Item' +import AppLink from './Link' export default { name: 'SidebarItem', - components: { Item }, + components: { Item, AppLink }, props: { // route object item: { @@ -89,18 +90,14 @@ export default { return false }, resolvePath(routePath) { + if (this.isExternalLink(routePath)) { + return routePath + } return path.resolve(this.basePath, routePath) }, isExternalLink(routePath) { return validateURL(routePath) }, - clickLink(routePath, e) { - if (!this.isExternalLink(routePath)) { - e.preventDefault() - const path = this.resolvePath(routePath) - this.$router.push(path) - } - }, generateTitle } } From 98a8277a37c3eabf48d3e4ba0ada764b99100bf2 Mon Sep 17 00:00:00 2001 From: Pan Date: Thu, 27 Sep 2018 10:24:38 +0800 Subject: [PATCH 14/28] tweak code --- src/views/table/complexTable.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/table/complexTable.vue b/src/views/table/complexTable.vue index 834ed3d0..b7fc076c 100644 --- a/src/views/table/complexTable.vue +++ b/src/views/table/complexTable.vue @@ -111,8 +111,7 @@
{{ $t('table.cancel') }} - {{ $t('table.confirm') }} - {{ $t('table.confirm') }} + {{ $t('table.confirm') }}
From b82e8e860d7979474a4bc59f7ebfa5174097f828 Mon Sep 17 00:00:00 2001 From: zhaoguoweiLLHC <2644572487@qq.com> Date: Thu, 27 Sep 2018 13:24:37 +0800 Subject: [PATCH 15/28] fix[UploadExcel]: fixed bug when there were multiple components(#1136) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 复用此组件时因为id不可重复的问题会导致onSuccess指向错误。 --- src/components/UploadExcel/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/UploadExcel/index.vue b/src/components/UploadExcel/index.vue index 261bea38..20e16398 100644 --- a/src/components/UploadExcel/index.vue +++ b/src/components/UploadExcel/index.vue @@ -1,7 +1,7 @@