From a18ec483b8ca0383445de0446829525fb5e450af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B9=8B=E6=B1=9F=E5=A4=A9=E6=9E=A2?= Date: Wed, 14 Jul 2021 13:50:10 +0800 Subject: [PATCH] update web app --- webapp/CHANGELOG.md | 8 ++++++++ webapp/package.json | 2 +- webapp/src/boot/errorHandle.js | 1 + webapp/src/utils/download.js | 2 ++ webapp/src/views/dataset/version/actions.vue | 10 +++++++--- .../views/development/components/NotebookDetail.vue | 2 +- webapp/src/views/login.vue | 2 +- 7 files changed, 21 insertions(+), 6 deletions(-) diff --git a/webapp/CHANGELOG.md b/webapp/CHANGELOG.md index 8684d99..44ecb8b 100644 --- a/webapp/CHANGELOG.md +++ b/webapp/CHANGELOG.md @@ -1,3 +1,11 @@ +## 0.4.1 (2021-07-14) + +### Bug Fixs + +- 下载服务迁移到天枢官网 +- 修复了异常全局处理报错的问题 +- [模型开发] 修复 Notebook 详情抽屉样式污染问题 + ## 0.4.0 (2021-07-06) ### Features diff --git a/webapp/package.json b/webapp/package.json index 4e4f829..30418f1 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,6 +1,6 @@ { "name": "dubhe-web", - "version": "0.4.0", + "version": "0.4.1", "description": "之江天枢人工智能开源平台", "author": "zhejianglab", "keywords": [ diff --git a/webapp/src/boot/errorHandle.js b/webapp/src/boot/errorHandle.js index 4629b12..cda80a7 100644 --- a/webapp/src/boot/errorHandle.js +++ b/webapp/src/boot/errorHandle.js @@ -25,6 +25,7 @@ let isMsgOn = false; // 全局未捕获异常处理(包括普通异常和 await 未被捕获的异常) Vue.config.errorHandler = (err) => { + if (!err) return; console.error(err); // 未授权只提示一次 if (err.code === UNAUTHORIZED) { diff --git a/webapp/src/utils/download.js b/webapp/src/utils/download.js index b34ec28..4f02868 100644 --- a/webapp/src/utils/download.js +++ b/webapp/src/utils/download.js @@ -20,6 +20,8 @@ import ZIP from './zip'; const pMap = require('p-map'); +streamSaver.mitm = 'https://static.tianshu.org.cn/mitm.html'; + // 默认名字解析 const defaultName = (file) => file.name; diff --git a/webapp/src/views/dataset/version/actions.vue b/webapp/src/views/dataset/version/actions.vue index ff8a108..60f3792 100644 --- a/webapp/src/views/dataset/version/actions.vue +++ b/webapp/src/views/dataset/version/actions.vue @@ -71,6 +71,7 @@ import { annotationBy, dataTypeCodeMap, showOfRecord, + isCustomDataset, } from '@/views/dataset/util'; import { toggleVersion, deleteVersion, shiftOfRecord } from '@/api/preparation/dataset'; import { TableTooltip } from '@/hooks/tooltip'; @@ -160,12 +161,15 @@ export default { const prefixUrl = `dataset/${row.datasetId}/versionFile/${row.versionName}`; return downloadZipFromObjectPath(prefixUrl, `${row.datasetId}_${row.versionName}.zip`, { fileName: (file) => file.name.replace(`${prefixUrl}/`, ''), - filter: (result) => - result.filter((item) => { + filter: (result) => { + // 自定义数据集没有固定目录结构,直接下载即可 + if (isCustomDataset(row)) return result; + return result.filter((item) => { return ['annotation', 'origin'].some((str) => item.name.startsWith(`${prefixUrl}/${str}`) ); - }), + }); + }, }); }; diff --git a/webapp/src/views/development/components/NotebookDetail.vue b/webapp/src/views/development/components/NotebookDetail.vue index 1bdd29b..da91f1a 100644 --- a/webapp/src/views/development/components/NotebookDetail.vue +++ b/webapp/src/views/development/components/NotebookDetail.vue @@ -17,7 +17,7 @@