From 44c339e7e72e30a03e92f41cd89a45d276f84acb Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Tue, 21 Feb 2023 11:10:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E6=96=B0=E5=BB=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E6=A0=B7=E5=BC=8F=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/datasource/DsTree.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue index b546ca3449..e3c2be026d 100644 --- a/frontend/src/views/system/datasource/DsTree.vue +++ b/frontend/src/views/system/datasource/DsTree.vue @@ -262,7 +262,7 @@ v-dialogDrag :title="$t('datasource.create')" :visible.sync="dsTypeRelate" - width="1005px" + width="1010px" class="de-dialog-form none-scroll-bar" append-to-body > From 7feeed50155bb1efbcf00f466385e6b3dc8fda64 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 21 Feb 2023 11:39:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E6=98=8E=E7=BB=86=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E6=97=A0=E6=B3=95=E6=BB=9A=E5=8A=A8=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/customComponent/UserViewDialog.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/canvas/customComponent/UserViewDialog.vue b/frontend/src/components/canvas/customComponent/UserViewDialog.vue index a3a4d023ce..58a4e5fee1 100644 --- a/frontend/src/components/canvas/customComponent/UserViewDialog.vue +++ b/frontend/src/components/canvas/customComponent/UserViewDialog.vue @@ -64,7 +64,7 @@ :enable-scroll="false" :chart="chartTable" :show-summary="false" - class="table-class" + class="table-class-dialog" /> @@ -342,8 +342,9 @@ export default { height: 100%; } -.table-class { +.table-class-dialog { height: 100%; + overflow-y: auto !important; } .canvas-class { From 2658cc4cef5ede5b6bf0d9c369b244d5c455f531 Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 21 Feb 2023 11:58:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=98=8E=E7=BB=86=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=A4=B1=E6=95=88=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/canvas/customComponent/UserView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/canvas/customComponent/UserView.vue b/frontend/src/components/canvas/customComponent/UserView.vue index da4713b75f..e5de90d083 100644 --- a/frontend/src/components/canvas/customComponent/UserView.vue +++ b/frontend/src/components/canvas/customComponent/UserView.vue @@ -759,7 +759,7 @@ export default { const attrSize = JSON.parse(this.view.customAttr).size if (this.chart.type === 'table-info' && this.view.datasetMode === 0 && (!attrSize.tablePageMode || attrSize.tablePageMode === 'page')) { requestInfo.goPage = this.currentPage.page - requestInfo.pageSize = this.currentPage.pageSize + requestInfo.pageSize = this.currentPage.pageSize === parseInt(attrSize.tablePageSize) ? this.currentPage.pageSize : parseInt(attrSize.tablePageSize) } } if (this.isFirstLoad) { From 203ed10aa393e23bc56ba82fec6337f77e559f2f Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 21 Feb 2023 12:43:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix(=E7=A7=BB=E5=8A=A8=E7=AB=AF):=20?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=88=A0=E9=99=A4=E7=BC=93=E5=AD=98=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E6=9C=AA=E7=BB=91=E5=AE=9A=E4=B9=9F=E8=83=BD=E4=BB=8E?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E8=BF=9B=E5=85=A5DE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/permission.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/permission.js b/frontend/src/permission.js index c612f949c9..96aa5902fd 100644 --- a/frontend/src/permission.js +++ b/frontend/src/permission.js @@ -57,7 +57,7 @@ const routeBefore = (callBack) => { callBack() } } -router.beforeEach(async(to, from, next) => routeBefore(() => { +router.beforeEach(async (to, from, next) => routeBefore(() => { // start progress bar NProgress.start() const mobileIgnores = ['/delink', '/de-auto-login'] @@ -69,6 +69,9 @@ router.beforeEach(async(to, from, next) => routeBefore(() => { if (hasToken) { urlSuffix += ('?detoken=' + hasToken) } + localStorage.removeItem('user-info') + localStorage.removeItem('userId') + localStorage.removeItem('Authorization') window.location.href = window.origin + urlSuffix NProgress.done() }