From 45f26735e53b48de9a482b8665660deac1272a74 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 3 Aug 2021 11:12:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96token?= =?UTF-8?q?=E8=BF=87=E6=9C=9F=E6=8F=90=E7=A4=BA=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 3 ++- frontend/src/lang/tw.js | 25 +++++++++++++------------ frontend/src/lang/zh.js | 3 ++- frontend/src/utils/request.js | 6 ++++++ 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 221a97ff9b..e5c46b3c94 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -126,7 +126,8 @@ export default { expires: 'Login token expired, please login again', tokenError: 'Token error, please login again', username_error: 'Please enter the correct ID', - password_error: 'The password can not be less than 8 digits' + password_error: 'The password can not be less than 8 digits', + login_again: 'Login again' }, commons: { no_target_permission: 'No permission', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 1a6a5a5a74..054b685549 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -109,24 +109,25 @@ export default { navbar: { dashboard: '首頁', github: '項目地址', - logOut: '退出登陸', + logOut: '退出登錄', profile: '個人中心', theme: '換膚', size: '佈局大小' }, login: { - title: '系統登陸', + title: '系統登錄', welcome: '歡迎使用', - logIn: '登陸', + logIn: '登錄', username: '帳號', password: '密碼', any: '任意字符', - thirdparty: '第三方登陸', + thirdparty: '第三方登錄', thirdpartyTips: '本地不能模擬，請結合自己業務進行模擬！！！', - expires: '登陸信息過期，請重新登陸', - tokenError: '信息錯誤，請重新登陸', + expires: '登錄信息過期，請重新登錄', + tokenError: '信息錯誤，請重新登錄', username_error: '請輸入正確的 ID', - password_error: '密碼不小於 8 位' + password_error: '密碼不小於 8 位', + login_again: '重新登錄' }, commons: { no_target_permission: '沒有權限', @@ -183,7 +184,7 @@ export default { prompt: '提示', operating: '操作', input_limit: '長度在 {0} 到 {1} 個字符', - login: '登陸', + login: '登錄', welcome: '一站式開源數據分析平臺', username: '姓名', password: '密碼', @@ -255,7 +256,7 @@ export default { remove: '移除', remove_cancel: '移除取消', remove_success: '移除成功', - tips: '認證信息已過期，請重新登陸', + tips: '認證信息已過期，請重新登錄', not_performed_yet: '尚未執行', incorrect_input: '輸入內容不正確', delete_confirm: '請輸入以下內容，確認刪除：', @@ -1165,9 +1166,9 @@ export default { }, display: { logo: '頭部系統 Logo', - loginLogo: '登陸頁面頭部 Logo', - loginImage: '登陸頁面右側圖片', - loginTitle: '登陸頁面標題', + loginLogo: '登錄頁面頭部 Logo', + loginImage: '登錄頁面右側圖片', + loginTitle: '登錄頁面標題', title: '系統名稱', advice_size: '建議圖片大小' }, diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index aa5812d69d..703ff6edf5 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -126,7 +126,8 @@ export default { expires: '登录信息过期，请重新登录', tokenError: '登陆信息错误，请重新登录', username_error: '请输入正确的 ID', - password_error: '密码不小于 8 位' + password_error: '密码不小于 8 位', + login_again: '重新登录' }, commons: { no_target_permission: '没有权限', diff --git a/frontend/src/utils/request.js b/frontend/src/utils/request.js index 3d803b5eaa..23b2a1f7dd 100644 --- a/frontend/src/utils/request.js +++ b/frontend/src/utils/request.js @@ -62,6 +62,9 @@ const checkAuth = response => { store.dispatch('user/logout').then(() => { location.reload() }) + }, { + confirmButtonText: i18n.t('login.login_again'), + showClose: false }) } @@ -71,6 +74,9 @@ const checkAuth = response => { store.dispatch('user/logout').then(() => { location.reload() }) + }, { + confirmButtonText: i18n.t('login.login_again'), + showClose: false }) } // token到期后自动续命 刷新token From cdb383b529568746f880587701df13a8ae324ae6 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 3 Aug 2021 11:22:44 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/utils/request.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/frontend/src/utils/request.js b/frontend/src/utils/request.js index b6281eb4d5..e47ee2844a 100644 --- a/frontend/src/utils/request.js +++ b/frontend/src/utils/request.js @@ -52,9 +52,9 @@ service.interceptors.request.use( } ) -const defaultOptions = { - confirmButtonText: i18n.t('login.re_login') -} +// const defaultOptions = { +// confirmButtonText: i18n.t('login.re_login') +// } const checkAuth = response => { // 请根据实际需求修改 @@ -66,7 +66,6 @@ const checkAuth = response => { store.dispatch('user/logout').then(() => { location.reload() }) - }, { confirmButtonText: i18n.t('login.login_again'), showClose: false From 4dd89219e309dd0e63fd19402d67ebc6db857bcb Mon Sep 17 00:00:00 2001 From: junjie Date: Tue, 3 Aug 2021 11:33:26 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E6=A0=87=E7=AD=BE=E5=BC=95=E5=AF=BC?= =?UTF-8?q?=E7=BA=BF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/chart/components/shape-attr/LabelSelector.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/chart/components/shape-attr/LabelSelector.vue b/frontend/src/views/chart/components/shape-attr/LabelSelector.vue index cf1351262e..7695ef9779 100644 --- a/frontend/src/views/chart/components/shape-attr/LabelSelector.vue +++ b/frontend/src/views/chart/components/shape-attr/LabelSelector.vue @@ -12,7 +12,7 @@ - + {{ $t('chart.pie_label_line_show') }} From d188ac0eebc93662b9b48842e193b9bd2a9566a8 Mon Sep 17 00:00:00 2001 From: junjie Date: Tue, 3 Aug 2021 11:47:51 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E9=9B=B7=E8=BE=BE=E5=9B=BE=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/chart/radar/radar.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/chart/chart/radar/radar.js b/frontend/src/views/chart/chart/radar/radar.js index 07e3f81a83..cf1e9b37a1 100644 --- a/frontend/src/views/chart/chart/radar/radar.js +++ b/frontend/src/views/chart/chart/radar/radar.js @@ -43,7 +43,8 @@ export function baseRadarOption(chart_option, chart) { data: [ { value: y.data, - name: y.name + name: y.name, + label: y.label } ] } From afbad86b9315794b130c818748759a270245eafe Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 3 Aug 2021 13:18:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E8=BF=98=E6=98=AF=E7=81=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/DeDrag/DragShadow.vue | 172 ++++++++++++++++++ .../canvas/components/Editor/index.vue | 1 + 2 files changed, 173 insertions(+) create mode 100644 frontend/src/components/DeDrag/DragShadow.vue diff --git a/frontend/src/components/DeDrag/DragShadow.vue b/frontend/src/components/DeDrag/DragShadow.vue new file mode 100644 index 0000000000..60d9e6d358 --- /dev/null +++ b/frontend/src/components/DeDrag/DragShadow.vue @@ -0,0 +1,172 @@ + + + + + diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index b647626b30..e3ba326800 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -275,6 +275,7 @@ export default { // 第一次变化 不需要 重置边界 待改进 if (this.changeIndex++ > 0) { this.resizeParentBounds() + this.$store.state.styleChangeTimes++ } // this.changeScale() },