From c5869e3233869eb5f1aa0e6eb7d36a8573901849 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Fri, 8 Dec 2023 08:29:13 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/gen/index.vue | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 10ac5a2..e1d3605 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -75,15 +75,15 @@
     <pagination v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" v-model:total="total" @pagination="getList" />
 
     <!-- 预览界面 -->
-    <el-dialog v-model="preview.open" width="80%" top="5vh" append-to-body>
+    <zr-dialog fullScreen v-model="preview.open" width="80%" top="5vh" append-to-body>
       <el-tabs v-model="preview.activeName">
         <el-tab-pane v-for="(item, key) in preview.data" :label="item.title" :id="key" :name="key.toString()" :key="key">
           {{ item.path }}
           <el-link :underline="false" icon="DocumentCopy" @click="onCopy(item.content)" class="btn-copy">复制 </el-link>
-          <pre><code class="hljs" v-html="highlightedCode(item.content, item.title)"></code></pre>
+          <pre><code class="hljs" v-html="highlightedCode(item.content)"></code></pre>
         </el-tab-pane>
       </el-tabs>
-    </el-dialog>
+    </zr-dialog>
     <import-table ref="importRef" @ok="getList" />
   </div>
 </template>
@@ -211,14 +211,17 @@ function handlePreview(row) {
       return
     }
     proxy.$modal.loading('请稍后...')
-    previewTable(row.tableId, { VueVersion: 3 }).then((res) => {
-      if (res.code === 200) {
-        showGenerate.value = false
-        preview.value.open = true
-        preview.value.data = res.data
+    previewTable(row.tableId, { VueVersion: 3 })
+      .then((res) => {
+        if (res.code === 200) {
+          showGenerate.value = false
+          preview.value.open = true
+          preview.value.data = res.data
+        }
+      })
+      .finally(() => {
         proxy.$modal.closeLoading()
-      }
-    })
+      })
   })
 }
 // 多选框选中数据
@@ -262,8 +265,7 @@ function handleDelete(row) {
     })
 }
 /** 高亮显示 */
-function highlightedCode(code, key) {
-  // var language = key.substring(key.lastIndexOf(".") , key.length)
+function highlightedCode(code) {
   const result = hljs.highlightAuto(code || '')
   return result.value || '&nbsp;'
 }