From d1c2eb1528f90d225d9c07c135a10999487d5e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=98=89=E8=B1=AA?= <42510293+ziyujiahao@users.noreply.github.com> Date: Wed, 1 Dec 2021 11:19:53 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E5=88=B7=E6=96=B0=E8=B6=85=E6=97=B6=E5=90=8E?= =?UTF-8?q?=E7=BB=99=E5=87=BA=E6=8F=90=E7=A4=BA=EF=BC=8C=E4=B8=8B=E6=AC=A1?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=8F=AF=E8=87=AA=E5=8A=A8=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 仪表板视图刷新超时后给出提示,下次刷新可自动恢复 * refactor: 仪表板视图刷新超时后给出提示,下次刷新可自动恢复 --- .../canvas/custom-component/UserView.vue | 14 +++++++++----- frontend/src/lang/en.js | 3 ++- frontend/src/lang/tw.js | 3 ++- frontend/src/lang/zh.js | 3 ++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index 1f941819f7..07297d5119 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -319,13 +319,17 @@ export default { } return true }).catch(err => { - this.httpRequest.status = err.response.data.success - this.httpRequest.msg = err.response.data.message this.requestStatus = 'error' - if (err && err.response && err.response.data) { - this.message = err.response.data.message + if (err.message && err.message.indexOf('timeout') > -1) { + this.message = this.$t('panel.timeout_refresh') } else { - this.message = err + this.httpRequest.status = err.response.data.success + this.httpRequest.msg = err.response.data.message + if (err && err.response && err.response.data) { + this.message = err.response.data.message + } else { + this.message = err + } } return true }) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 6fd1c23b63..8ca1dcfea5 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1425,7 +1425,8 @@ export default { video_links: 'Video Links', video_add_tips: 'Please Add Video Info...', panel_view_result_show: 'View Result Show', - panel_view_result_tips: 'Chose "Panel" Will Overwrite View`s Result,Range 1~10000' + panel_view_result_tips: 'Chose "Panel" Will Overwrite View`s Result,Range 1~10000', + timeout_refresh: 'Timeout,Will Refresh...' }, plugin: { local_install: 'Local installation', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index b0d44416c0..a555c6ca9f 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1428,7 +1428,8 @@ export default { video_links: '視頻鏈接', video_add_tips: '請點擊添加配置視頻信息...', panel_view_result_show: '視圖結果展示', - panel_view_result_tips: '選擇儀表板會覆蓋視圖的結果展示數量,取值範圍1~10000' + panel_view_result_tips: '選擇儀表板會覆蓋視圖的結果展示數量,取值範圍1~10000', + timeout_refresh: '请求超时,稍后刷新...' }, plugin: { local_install: '本地安裝', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 13f643642d..9e2fea741c 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1436,7 +1436,8 @@ export default { video_links: '视频链接', video_add_tips: '请点击添加配置视频信息...', panel_view_result_show: '视图结果展示', - panel_view_result_tips: '选择仪表板会覆盖视图的结果展示数量,取值范围1~10000' + panel_view_result_tips: '选择仪表板会覆盖视图的结果展示数量,取值范围1~10000', + timeout_refresh: '请求超时,稍后刷新...' }, plugin: { local_install: '本地安装',