Merge pull request #4595 from dataease/dev

merge dev

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) {

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"
       />
     </de-main-container>
   </de-container>
@@ -342,8 +342,9 @@ export default {
   height: 100%;
 }
 
-.table-class {
+.table-class-dialog {
   height: 100%;
+  overflow-y: auto !important;
 }
 
 .canvas-class {

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()
   }

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
       >