From 4a2835ddadb796c69f180097b95f971dbab4687d Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 13 九月 2023 09:09:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS-WEB/src/components/file/main.vue | 60 +++++++++++++++++++++++++----------------------------------- 1 files changed, 25 insertions(+), 35 deletions(-) diff --git a/Source/UBCS-WEB/src/components/file/main.vue b/Source/UBCS-WEB/src/components/file/main.vue index cb4d046..8444c92 100644 --- a/Source/UBCS-WEB/src/components/file/main.vue +++ b/Source/UBCS-WEB/src/components/file/main.vue @@ -1,21 +1,22 @@ <template> <basic-container> <avue-crud :option="option" - :table-loading="loading" - :data="data" - :page.sync="page" - :before-open="beforeOpen" - :permission="permissionList" - v-model="form" - ref="crud" - @row-del="rowDel" - @search-change="searchChange" - @search-reset="searchReset" - @selection-change="selectionChange" - @current-change="currentChange" - @size-change="sizeChange" - @refresh-change="refreshChange" - @on-load="onLoad"> + :table-loading="loading" + :data="data" + :page.sync="page" + :before-open="beforeOpen" + :permission="permissionList" + v-model="form" + ref="crud" + @row-del="rowDel" + @search-change="searchChange" + @search-reset="searchReset" + @selection-change="selectionChange" + @row-click="selectedRowClick" + @current-change="currentChange" + @size-change="sizeChange" + @refresh-change="refreshChange" + @on-load="onLoad"> <template slot="menuLeft"> <el-button v-if="hasUpload" type="primary" size="small" @@ -63,7 +64,6 @@ <script> import {getList, getFile,upload,update, remove,download} from "@/api/resource/file"; import {mapGetters} from "vuex"; -import {dateFormat} from "@/util/date"; import {validatenull} from "@/util/validate"; import func from "@/util/func"; @@ -88,7 +88,7 @@ hasDel:validatenull(this.options.hasDel) ? true :this.options.hasDel, hasDownload:validatenull(this.options.hasDownload) ? true :this.options.hasDownload, option: { - height:(this.options.tableHeight?this.options.tableHeight:'200'), + height:(this.options.tableHeight?this.options.tableHeight:'400'), calcHeight: 30, tip: false, searchShow: false, @@ -395,24 +395,7 @@ download(data).then(res=>{ // console.log(res); if(res){ - const fileNames = res.headers['content-disposition'].split(";"); - let characterSet = fileNames[2].split("filename*=")[1]; - let fileName = decodeURI(fileNames[1].split("filename=")[1],characterSet); - // console.log(fileName) - let blob = new Blob([res.data], { - type: res.data.type + ";charset=utf-8", - }); - let src = window.URL.createObjectURL(blob); - if (src) { - let link = document.createElement("a"); - link.style.display = "none"; - link.href = src; - link.setAttribute("download", fileName); - document.body.appendChild(link); - link.click(); - document.body.removeChild(link); //涓嬭浇瀹屾垚绉婚櫎鍏冪礌 - window.URL.revokeObjectURL(src); //閲婃斁鎺塨lob瀵硅薄 - } + func.downloadFileByBlobHandler(res); } }); }, @@ -475,6 +458,13 @@ }, selectionChange(list) { this.selectionList = list; + this.$refs.crud.setCurrentRow(this.selectionList[list.length-1]); + }, + selectedRowClick(row){ + this.selectionList = row; + this.$refs.crud.toggleSelection(); + this.$refs.crud.setCurrentRow(row); + this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛� }, selectionClear() { this.selectionList = []; -- Gitblit v1.9.3