From 502818bb9c825cf243ba289e5f09d5d2da3e8b04 Mon Sep 17 00:00:00 2001
From: luojing <1126184155@qq.com>
Date: Thu, 9 May 2024 18:07:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E4=BB=A3=E7=A0=81=E6=98=AF?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E7=82=B9=E5=87=BB=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=85=88=E8=BF=9B=E8=A1=8C=E9=A2=84=E8=A7=88=E5=86=8D=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=EF=BC=8C=E9=A2=84=E8=A7=88=E6=8C=89=E7=85=A7=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=9A=84=E6=96=87=E4=BB=B6=E7=9B=AE=E5=BD=95=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/tool/type.ts                        |   1 +
 src/views/tool/generator/GenPreviewModal.vue | 151 ++++++++++++++++---
 src/views/tool/generator/index.vue           |  35 +----
 3 files changed, 129 insertions(+), 58 deletions(-)

diff --git a/src/apis/tool/type.ts b/src/apis/tool/type.ts
index 1ba075f..5937be2 100644
--- a/src/apis/tool/type.ts
+++ b/src/apis/tool/type.ts
@@ -44,6 +44,7 @@ export interface GeneratorConfigResp {
   fieldConfigs: FieldConfigResp[]
 }
 export interface GeneratePreviewResp {
+  path: string
   fileName: string
   content: string
 }
diff --git a/src/views/tool/generator/GenPreviewModal.vue b/src/views/tool/generator/GenPreviewModal.vue
index 4f36264..07f7bda 100644
--- a/src/views/tool/generator/GenPreviewModal.vue
+++ b/src/views/tool/generator/GenPreviewModal.vue
@@ -7,53 +7,122 @@
     width="90%"
     :footer="false"
   >
-    <div>
-      <a-scrollbar style="height: 700px; overflow: auto">
-        <a-link style="position: absolute; right: 20px; top: 50px; z-index: 999" @click="onCopy">
-          <template #icon>
-            <icon-copy size="large" />
-          </template>
-          复制
-        </a-link>
-        <a-tabs size="large" @tab-click="onTabClick">
-          <a-tab-pane v-for="item in genPreviewList" :key="item.fileName" :title="item.fileName">
-            <GiCodeView
-              :type="'vue' === item.fileName.split('.')[1] ? 'vue' : 'javascript'"
-              :code-json="item.content"
-            />
-          </a-tab-pane>
-        </a-tabs>
-      </a-scrollbar>
+    <template #title>
+      <a-button type="primary" status="success" size="medium" title="生成预览" @click="onGenerate()">
+        <template #icon><icon-download /></template>生成 {{ previewTableName }} 表
+      </a-button>
+    </template>
+    <div class="preview-content">
+      <a-layout>
+        <a-layout-sider theme="dark" :resize-directions="['right']" style="height: 700px">
+          <a-tree class="selectPreview" :data="treeData" :show-line="true" @select="onSelectPreview" />
+        </a-layout-sider>
+        <a-layout-content>
+          <a-scrollbar style="height: 700px; overflow: auto">
+            <a-link style="position: absolute; right: 20px; top: 50px; z-index: 999" @click="onCopy">
+              <template #icon>
+                <icon-copy size="large" />
+              </template>
+              复制
+            </a-link>
+            <a-card :title="currentPreview?.fileName">
+              <GiCodeView
+                :type="'vue' === currentPreview?.fileName.split('.')[1] ? 'vue' : 'javascript'"
+                :code-json="currentPreview?.content"
+              />
+            </a-card>
+          </a-scrollbar>
+        </a-layout-content>
+      </a-layout>
     </div>
   </a-modal>
 </template>
 
 <script setup lang="ts">
-import { genPreview, type GeneratePreviewResp } from '@/apis'
-import { Message } from '@arco-design/web-vue'
+import { genPreview, type GeneratePreviewResp, generate } from '@/apis'
+import { Message, type TreeNodeData } from '@arco-design/web-vue'
 import { useClipboard } from '@vueuse/core'
 
 const { copy, copied } = useClipboard()
-const copyCodeContent = ref()
+const currentPreview = ref<GeneratePreviewResp>()
 const genPreviewList = ref<GeneratePreviewResp[]>([])
 
 const visible = ref(false)
+const treeData = ref<TreeNodeData[]>([])
+const previewTableName = ref<string>('')
+
 // 打开
 const onPreview = async (tableName: string) => {
+  treeData.value = []
+  previewTableName.value = tableName
   const res = await genPreview(tableName)
   genPreviewList.value = res.data
-  copyCodeContent.value = genPreviewList.value[0].content
+  for (const genPreview of genPreviewList.value) {
+    assembleTree(genPreview)
+  }
+  for (const valueElement of treeData.value) {
+    mergeDir(valueElement)
+  }
+  currentPreview.value = genPreviewList.value[0]
   visible.value = true
 }
 
-// 点击 Tab
-const onTabClick = (key: any) => {
-  copyCodeContent.value = genPreviewList.value.filter((p) => p.fileName === key)[0].content
+// 自增的一个key 因为key相同的节点会出现一些问题
+let autoIncrementKey = 0
+// 将生成的目录组装成树结构
+const assembleTree = (genPreview: GeneratePreviewResp) => {
+  const paths: string[] = genPreview.path.split('\\')
+  let tempChildren: TreeNodeData[] | undefined = treeData.value
+  for (const path of paths) {
+    // 向treeData中推送目录,如果该级目录有那么不推送进行下级的合并
+    tempChildren = pushDir(tempChildren, { title: path, key: autoIncrementKey++, children: new Array<TreeNodeData>() })
+  }
+  tempChildren?.push({ title: genPreview.fileName, key: genPreview.fileName, children: new Array<TreeNodeData>() })
+}
+
+const pushDir = (children: TreeNodeData[] | undefined, treeNode: TreeNodeData) => {
+  if (children) {
+    for (const child of children) {
+      if (child.title === treeNode.title) {
+        return child.children
+      }
+    }
+  }
+  children?.push(treeNode)
+  return treeNode.children
+}
+
+const mergeDir = (parent: TreeNodeData) => {
+  // 合并目录
+  if (parent.children?.length == 1 && typeof parent.children[0].key === 'number') {
+    const mergeTitle = mergeDir(parent.children[0])
+    if (mergeTitle != '') {
+      parent.title = parent.title + '/' + mergeTitle
+    }
+    parent.children = parent.children[0].children
+    return parent.title
+  }
+  // 合并子目录
+  if (parent?.children) {
+    for (const child of parent.children) {
+      mergeDir(child)
+    }
+  }
+  return ''
+}
+
+// 选择文件预览
+const onSelectPreview = (selectedKeys) => {
+  if (typeof selectedKeys[0] === 'string') {
+    currentPreview.value = genPreviewList.value.filter((p) => p.fileName === selectedKeys[0])[0]
+  }
 }
 
 // 复制
 const onCopy = () => {
-  copy(copyCodeContent.value)
+  if (currentPreview.value) {
+    copy(currentPreview.value?.content)
+  }
 }
 watch(copied, () => {
   if (copied.value) {
@@ -61,5 +130,37 @@ watch(copied, () => {
   }
 })
 
+// 生成
+const onGenerate = async () => {
+  const res = await generate([previewTableName.value])
+  const contentDisposition = res.headers['content-disposition']
+  const pattern = new RegExp('filename=([^;]+\\.[^\.;]+);*')
+  const result = pattern.exec(contentDisposition) || ''
+  // 对名字进行解码
+  const fileName = window.decodeURI(result[1])
+  // 创建下载的链接
+  const blob = new Blob([res.data])
+  const downloadElement = document.createElement('a')
+  const href = window.URL.createObjectURL(blob)
+  downloadElement.style.display = 'none'
+  downloadElement.href = href
+  // 下载后文件名
+  downloadElement.download = fileName
+  document.body.appendChild(downloadElement)
+  // 点击下载
+  downloadElement.click()
+  // 下载完成，移除元素
+  document.body.removeChild(downloadElement)
+  // 释放掉 blob 对象
+  window.URL.revokeObjectURL(href)
+}
+
 defineExpose({ onPreview })
 </script>
+
+<style scoped>
+.preview-content :deep(.arco-layout-sider) {
+  min-width: 200px;
+  white-space: nowrap;
+}
+</style>
diff --git a/src/views/tool/generator/index.vue b/src/views/tool/generator/index.vue
index 7357c3e..2855737 100644
--- a/src/views/tool/generator/index.vue
+++ b/src/views/tool/generator/index.vue
@@ -21,16 +21,10 @@
         <template #action="{ record }">
           <a-space>
             <a-link @click="onConfig(record.tableName, record.comment)">配置</a-link>
-            <a-link
-              :title="record.isConfiged ? '生成预览' : '请先进行生成配置'"
-              :disabled="!record.isConfiged"
-              @click="onPreview(record.tableName)"
-              >预览</a-link
-            >
             <a-link
               :title="record.isConfiged ? '生成' : '请先进行生成配置'"
               :disabled="!record.isConfiged"
-              @click="onGenerate([record.tableName])"
+              @click="onPreview(record.tableName)"
               >生成</a-link
             >
           </a-space>
@@ -44,7 +38,7 @@
 </template>
 
 <script setup lang="ts">
-import { listGenerator, generate } from '@/apis'
+import { listGenerator } from '@/apis'
 import GenConfigDrawer from './GenConfigDrawer.vue'
 import GenPreviewModal from './GenPreviewModal.vue'
 import type { TableInstanceColumns } from '@/components/GiTable/type'
@@ -97,31 +91,6 @@ const GenPreviewModalRef = ref<InstanceType<typeof GenPreviewModal>>()
 const onPreview = (tableName: string) => {
   GenPreviewModalRef.value?.onPreview(tableName)
 }
-
-// 生成
-const onGenerate = async (tableNames: Array<string>) => {
-  const res = await generate(tableNames)
-  const contentDisposition = res.headers['content-disposition']
-  const pattern = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
-  const result = pattern.exec(contentDisposition) || ''
-  // 对名字进行解码
-  const fileName = window.decodeURI(result[1])
-  // 创建下载的链接
-  const blob = new Blob([res.data])
-  const downloadElement = document.createElement('a')
-  const href = window.URL.createObjectURL(blob)
-  downloadElement.style.display = 'none'
-  downloadElement.href = href
-  // 下载后文件名
-  downloadElement.download = fileName
-  document.body.appendChild(downloadElement)
-  // 点击下载
-  downloadElement.click()
-  // 下载完成，移除元素
-  document.body.removeChild(downloadElement)
-  // 释放掉 blob 对象
-  window.URL.revokeObjectURL(href)
-}
 </script>
 
 <style></style>
-- 
Gitee


From bf10b6e5c51badf43e8353621ab7c08af450a5f0 Mon Sep 17 00:00:00 2001
From: LuoJing <1126184155@qq.com>
Date: Fri, 10 May 2024 21:36:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=A4=9A=E9=80=89=E7=94=9F=E6=88=90=E6=97=B6?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=86=B2=E7=AA=81=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/views/tool/generator/GenPreviewModal.vue | 30 ++++----------------
 src/views/tool/generator/index.vue           | 29 +++++++++++++++++--
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/src/views/tool/generator/GenPreviewModal.vue b/src/views/tool/generator/GenPreviewModal.vue
index 07f7bda..4073767 100644
--- a/src/views/tool/generator/GenPreviewModal.vue
+++ b/src/views/tool/generator/GenPreviewModal.vue
@@ -8,7 +8,7 @@
     :footer="false"
   >
     <template #title>
-      <a-button type="primary" status="success" size="medium" title="生成预览" @click="onGenerate()">
+      <a-button type="primary" status="success" size="medium" title="生成预览" @click="gen">
         <template #icon><icon-download /></template>生成 {{ previewTableName }} 表
       </a-button>
     </template>
@@ -39,7 +39,7 @@
 </template>
 
 <script setup lang="ts">
-import { genPreview, type GeneratePreviewResp, generate } from '@/apis'
+import { genPreview, type GeneratePreviewResp } from '@/apis'
 import { Message, type TreeNodeData } from '@arco-design/web-vue'
 import { useClipboard } from '@vueuse/core'
 
@@ -131,30 +131,10 @@ watch(copied, () => {
 })
 
 // 生成
-const onGenerate = async () => {
-  const res = await generate([previewTableName.value])
-  const contentDisposition = res.headers['content-disposition']
-  const pattern = new RegExp('filename=([^;]+\\.[^\.;]+);*')
-  const result = pattern.exec(contentDisposition) || ''
-  // 对名字进行解码
-  const fileName = window.decodeURI(result[1])
-  // 创建下载的链接
-  const blob = new Blob([res.data])
-  const downloadElement = document.createElement('a')
-  const href = window.URL.createObjectURL(blob)
-  downloadElement.style.display = 'none'
-  downloadElement.href = href
-  // 下载后文件名
-  downloadElement.download = fileName
-  document.body.appendChild(downloadElement)
-  // 点击下载
-  downloadElement.click()
-  // 下载完成，移除元素
-  document.body.removeChild(downloadElement)
-  // 释放掉 blob 对象
-  window.URL.revokeObjectURL(href)
+const emit = defineEmits<{ (e: 'generate', tableNames: string[]): void }>()
+const gen = () => {
+  emit('generate', [previewTableName.value])
 }
-
 defineExpose({ onPreview })
 </script>
 
diff --git a/src/views/tool/generator/index.vue b/src/views/tool/generator/index.vue
index 2855737..d7d0088 100644
--- a/src/views/tool/generator/index.vue
+++ b/src/views/tool/generator/index.vue
@@ -33,12 +33,12 @@
     </a-card>
 
     <GenConfigDrawer ref="GenConfigDrawerRef" @save-success="search" />
-    <GenPreviewModal ref="GenPreviewModalRef" />
+    <GenPreviewModal ref="GenPreviewModalRef" @generate="onGenerate" />
   </div>
 </template>
 
 <script setup lang="ts">
-import { listGenerator } from '@/apis'
+import { generate, listGenerator } from '@/apis'
 import GenConfigDrawer from './GenConfigDrawer.vue'
 import GenPreviewModal from './GenPreviewModal.vue'
 import type { TableInstanceColumns } from '@/components/GiTable/type'
@@ -91,6 +91,31 @@ const GenPreviewModalRef = ref<InstanceType<typeof GenPreviewModal>>()
 const onPreview = (tableName: string) => {
   GenPreviewModalRef.value?.onPreview(tableName)
 }
+
+// 生成
+const onGenerate = async (tableNames: Array<string>) => {
+  const res = await generate(tableNames)
+  const contentDisposition = res.headers['content-disposition']
+  const pattern = new RegExp('filename=([^;]+\\.[^\.;]+);*')
+  const result = pattern.exec(contentDisposition) || ''
+  // 对名字进行解码
+  const fileName = window.decodeURI(result[1])
+  // 创建下载的链接
+  const blob = new Blob([res.data])
+  const downloadElement = document.createElement('a')
+  const href = window.URL.createObjectURL(blob)
+  downloadElement.style.display = 'none'
+  downloadElement.href = href
+  // 下载后文件名
+  downloadElement.download = fileName
+  document.body.appendChild(downloadElement)
+  // 点击下载
+  downloadElement.click()
+  // 下载完成，移除元素
+  document.body.removeChild(downloadElement)
+  // 释放掉 blob 对象
+  window.URL.revokeObjectURL(href)
+}
 </script>
 
 <style></style>
-- 
Gitee


From ec9b3b9431c4eee5f71463acde5f47fc5caa23b4 Mon Sep 17 00:00:00 2001
From: LuoJing <1126184155@qq.com>
Date: Fri, 10 May 2024 22:41:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E9=A2=84=E8=A7=88=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/generator/GenPreviewModal.vue | 38 +++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/views/tool/generator/GenPreviewModal.vue b/src/views/tool/generator/GenPreviewModal.vue
index 4073767..f9782d8 100644
--- a/src/views/tool/generator/GenPreviewModal.vue
+++ b/src/views/tool/generator/GenPreviewModal.vue
@@ -1,37 +1,41 @@
 <template>
   <a-modal
     v-model:visible="visible"
-    title="生成预览"
+    :title="'生成 ' + previewTableName + ' 表预览'"
     :mask-closable="false"
     :esc-to-close="false"
-    width="90%"
+    width="100%"
     :footer="false"
   >
-    <template #title>
-      <a-button type="primary" status="success" size="medium" title="生成预览" @click="gen">
-        <template #icon><icon-download /></template>生成 {{ previewTableName }} 表
-      </a-button>
-    </template>
     <div class="preview-content">
       <a-layout>
         <a-layout-sider theme="dark" :resize-directions="['right']" style="height: 700px">
           <a-tree class="selectPreview" :data="treeData" :show-line="true" @select="onSelectPreview" />
         </a-layout-sider>
         <a-layout-content>
-          <a-scrollbar style="height: 700px; overflow: auto">
-            <a-link style="position: absolute; right: 20px; top: 50px; z-index: 999" @click="onCopy">
-              <template #icon>
-                <icon-copy size="large" />
-              </template>
-              复制
-            </a-link>
-            <a-card :title="currentPreview?.fileName">
+          <a-card :header-style="{ height: '50px' }">
+            <template #title> {{ currentPreview?.path }}\{{ currentPreview?.fileName }} </template>
+            <template #extra>
+              <a-button-group type="outline" size="small">
+                <a-button @click="onCopy">
+                  <template #icon>
+                    <icon-copy />
+                  </template>
+                </a-button>
+                <a-button @click="gen">
+                  <template #icon>
+                    <icon-download />
+                  </template>
+                </a-button>
+              </a-button-group>
+            </template>
+            <a-scrollbar style="height: 650px; overflow: auto">
               <GiCodeView
                 :type="'vue' === currentPreview?.fileName.split('.')[1] ? 'vue' : 'javascript'"
                 :code-json="currentPreview?.content"
               />
-            </a-card>
-          </a-scrollbar>
+            </a-scrollbar>
+          </a-card>
         </a-layout-content>
       </a-layout>
     </div>
-- 
Gitee