From 5c61ae9fca75111c512157b30b55eb6e050ba11a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Thu, 13 Jul 2023 15:18:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/Fe/src/components/umyTable/index.vue |  8 ++++----
 Code/Fe/src/permission.js                 | 24 +++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Code/Fe/src/components/umyTable/index.vue b/Code/Fe/src/components/umyTable/index.vue
index bd19b88..d708364 100644
--- a/Code/Fe/src/components/umyTable/index.vue
+++ b/Code/Fe/src/components/umyTable/index.vue
@@ -347,6 +347,7 @@
 
     <!-- json弹窗（复制的json内容） -->
     <el-dialog
+      id="copyJsonTextarea_dialog_ref"
       :visible.sync="showJsonCopy"
       :modal-append-to-body="false"
       :append-to-body="true"
@@ -845,7 +846,6 @@ export default {
     // 复制Json按钮
     copyJsonHandle(){
       this.showJsonCopy = true
-      // this.$refs.copyJsonTextarea_ref.focus()
       navigator.clipboard.writeText(this.showJsonData_str)
 			.then(() => {
 				this.$message.success('复制成功');
@@ -856,9 +856,9 @@ export default {
       this.$nextTick(()=>{
         if(this.$refs.copyJsonTextarea_ref){
           this.$refs.copyJsonTextarea_ref.focus()
-          // this.$nextTick(()=>{
-          //   this.$refs.copyJsonTextarea_ref.scrollTop = 0
-          // })
+          this.$nextTick(()=>{
+            document.getElementById('copyJsonTextarea_dialog_ref').scrollTop = 0
+          })
         }
       })
     },
diff --git a/Code/Fe/src/permission.js b/Code/Fe/src/permission.js
index f41ba68..10cb5ce 100644
--- a/Code/Fe/src/permission.js
+++ b/Code/Fe/src/permission.js
@@ -81,18 +81,18 @@ router.beforeEach(async (to, from, next) => {
     }
   }else{
     // 重新获取api接口表头
-    const _interfaceBoardColumnsNames = localStorage.getItem("interfaceBoardColumnsNames")
-    if( !_interfaceBoardColumnsNames || _interfaceBoardColumnsNames == 'undefined' || _interfaceBoardColumnsNames == 'null'){
-      getInterfaceBoard().then(result => {
-        let _zh = localStorage.getItem('columnsApiNamesZh')
-        localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.localization.values[_zh]));
-        setTimeout(()=>{
-          next()
-        },0)
-      })
-    }else{
-      next()
-    }
+    // const _interfaceBoardColumnsNames = localStorage.getItem("interfaceBoardColumnsNames")
+    // if( !_interfaceBoardColumnsNames || _interfaceBoardColumnsNames == 'undefined' || _interfaceBoardColumnsNames == 'null'){
+    getInterfaceBoard().then(result => {
+      let _zh = localStorage.getItem('columnsApiNamesZh')
+      localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.localization.values[_zh]));
+      setTimeout(()=>{
+        next()
+      },0)
+    })
+    // }else{
+    //   next()
+    // }
   }