From 2687b2eb3c96e4fc34f3d62437e97cdfc15bb526 Mon Sep 17 00:00:00 2001 From: Pan <panfree23@gmail.com> Date: Tue, 26 Jun 2018 17:10:21 +0800 Subject: [PATCH] perf[v-loading]: remove .body modifier #779 --- src/views/excel/exportExcel.vue | 2 +- src/views/excel/selectExcel.vue | 2 +- src/views/table/complexTable.vue | 10 +++++++--- src/views/table/dragTable.vue | 2 +- src/views/table/inlineEditTable.vue | 4 +--- src/views/zip/index.vue | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/views/excel/exportExcel.vue b/src/views/excel/exportExcel.vue index 543ee2ee..6f633a2b 100644 --- a/src/views/excel/exportExcel.vue +++ b/src/views/excel/exportExcel.vue @@ -11,7 +11,7 @@ </el-radio-group> <el-button style='margin:0 0 20px 20px;' type="primary" icon="document" @click="handleDownload" :loading="downloadLoading">{{$t('excel.export')}} excel</el-button> - <el-table :data="list" v-loading.body="listLoading" element-loading-text="æ‹¼å‘½åŠ è½½ä¸" border fit highlight-current-row> + <el-table :data="list" v-loading="listLoading" element-loading-text="æ‹¼å‘½åŠ è½½ä¸" border fit highlight-current-row> <el-table-column align="center" label='Id' width="95"> <template slot-scope="scope"> {{scope.$index}} diff --git a/src/views/excel/selectExcel.vue b/src/views/excel/selectExcel.vue index 4e74fa14..c0841373 100644 --- a/src/views/excel/selectExcel.vue +++ b/src/views/excel/selectExcel.vue @@ -3,7 +3,7 @@ <!-- $t is vue-i18n global function to translate lang --> <el-input style='width:340px;' :placeholder="$t('excel.placeholder')" prefix-icon="el-icon-document" v-model="filename"></el-input> <el-button style='margin-bottom:20px' type="primary" icon="document" @click="handleDownload" :loading="downloadLoading">{{$t('excel.selectedExport')}}</el-button> - <el-table :data="list" v-loading.body="listLoading" element-loading-text="æ‹¼å‘½åŠ è½½ä¸" border fit highlight-current-row @selection-change="handleSelectionChange" + <el-table :data="list" v-loading="listLoading" element-loading-text="æ‹¼å‘½åŠ è½½ä¸" border fit highlight-current-row @selection-change="handleSelectionChange" ref="multipleTable"> <el-table-column type="selection" align="center"></el-table-column> <el-table-column align="center" label='Id' width="95"> diff --git a/src/views/table/complexTable.vue b/src/views/table/complexTable.vue index f6171c5f..48720057 100644 --- a/src/views/table/complexTable.vue +++ b/src/views/table/complexTable.vue @@ -21,8 +21,8 @@ <el-checkbox class="filter-item" style='margin-left:15px;' @change='tableKey=tableKey+1' v-model="showReviewer">{{$t('table.reviewer')}}</el-checkbox> </div> - <el-table :key='tableKey' :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit highlight-current-row - style="width: 100%"> + <el-table :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row + style="width: 100%;min-height:1000px;"> <el-table-column align="center" :label="$t('table.id')" width="65"> <template slot-scope="scope"> <span>{{scope.row.id}}</span> @@ -221,7 +221,11 @@ export default { fetchList(this.listQuery).then(response => { this.list = response.data.items this.total = response.data.total - this.listLoading = false + + // Just to simulate the time of the request + setTimeout(() => { + this.listLoading = false + }, 1.5 * 1000) }) }, handleFilter() { diff --git a/src/views/table/dragTable.vue b/src/views/table/dragTable.vue index f13dcb32..b52c7b11 100644 --- a/src/views/table/dragTable.vue +++ b/src/views/table/dragTable.vue @@ -1,7 +1,7 @@ <template> <div class="app-container"> <!-- Note that row-key is necessary to get a correct row order. --> - <el-table :data="list" row-key="id" v-loading.body="listLoading" border fit highlight-current-row style="width: 100%"> + <el-table :data="list" row-key="id" v-loading="listLoading" border fit highlight-current-row style="width: 100%"> <el-table-column align="center" label="ID" width="65"> <template slot-scope="scope"> diff --git a/src/views/table/inlineEditTable.vue b/src/views/table/inlineEditTable.vue index c44efccc..9e744f55 100644 --- a/src/views/table/inlineEditTable.vue +++ b/src/views/table/inlineEditTable.vue @@ -1,7 +1,7 @@ <template> <div class="app-container"> - <el-table :data="list" v-loading.body="listLoading" border fit highlight-current-row style="width: 100%"> + <el-table :data="list" v-loading="listLoading" border fit highlight-current-row style="width: 100%"> <el-table-column align="center" label="ID" width="80"> <template slot-scope="scope"> @@ -89,9 +89,7 @@ export default { const items = response.data.items this.list = items.map(v => { this.$set(v, 'edit', false) // https://vuejs.org/v2/guide/reactivity.html - v.originalTitle = v.title // will be used when user click the cancel botton - return v }) this.listLoading = false diff --git a/src/views/zip/index.vue b/src/views/zip/index.vue index 54320a8e..c20c31d0 100644 --- a/src/views/zip/index.vue +++ b/src/views/zip/index.vue @@ -3,7 +3,7 @@ <!-- $t is vue-i18n global function to translate lang --> <el-input style='width:300px;' :placeholder="$t('zip.placeholder')" prefix-icon="el-icon-document" v-model="filename"></el-input> <el-button style='margin-bottom:20px;' type="primary" icon="document" @click="handleDownload" :loading="downloadLoading">{{$t('zip.export')}} zip</el-button> - <el-table :data="list" v-loading.body="listLoading" element-loading-text="æ‹¼å‘½åŠ è½½ä¸" border fit highlight-current-row> + <el-table :data="list" v-loading="listLoading" element-loading-text="æ‹¼å‘½åŠ è½½ä¸" border fit highlight-current-row> <el-table-column align="center" label='ID' width="95"> <template slot-scope="scope"> {{scope.$index}} -- GitLab