From 5601092f6699392200cdc8f0e3dc71b65274a864 Mon Sep 17 00:00:00 2001 From: KAI <1373639299@qq.com> Date: Wed, 12 Jun 2024 14:14:33 +0000 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/file-java.svg | 1 + src/assets/icons/file-javascript.svg | 1 + src/assets/icons/file-maven.svg | 1 + src/assets/icons/file-sql.svg | 1 + src/assets/icons/file-typescript.svg | 1 + src/assets/icons/file-vue.svg | 1 + src/assets/icons/file-xml.svg | 1 + src/views/tool/generator/GenPreviewModal.vue | 37 +++++++++++++++----- 8 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 src/assets/icons/file-java.svg create mode 100644 src/assets/icons/file-javascript.svg create mode 100644 src/assets/icons/file-maven.svg create mode 100644 src/assets/icons/file-sql.svg create mode 100644 src/assets/icons/file-typescript.svg create mode 100644 src/assets/icons/file-vue.svg create mode 100644 src/assets/icons/file-xml.svg diff --git a/src/assets/icons/file-java.svg b/src/assets/icons/file-java.svg new file mode 100644 index 0000000..e6fbbc0 --- /dev/null +++ b/src/assets/icons/file-java.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/file-javascript.svg b/src/assets/icons/file-javascript.svg new file mode 100644 index 0000000..85df74e --- /dev/null +++ b/src/assets/icons/file-javascript.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/file-maven.svg b/src/assets/icons/file-maven.svg new file mode 100644 index 0000000..3fcefcf --- /dev/null +++ b/src/assets/icons/file-maven.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/file-sql.svg b/src/assets/icons/file-sql.svg new file mode 100644 index 0000000..ad43fd6 --- /dev/null +++ b/src/assets/icons/file-sql.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/file-typescript.svg b/src/assets/icons/file-typescript.svg new file mode 100644 index 0000000..d58f584 --- /dev/null +++ b/src/assets/icons/file-typescript.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/file-vue.svg b/src/assets/icons/file-vue.svg new file mode 100644 index 0000000..927f2e5 --- /dev/null +++ b/src/assets/icons/file-vue.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/file-xml.svg b/src/assets/icons/file-xml.svg new file mode 100644 index 0000000..d5b69b1 --- /dev/null +++ b/src/assets/icons/file-xml.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/tool/generator/GenPreviewModal.vue b/src/views/tool/generator/GenPreviewModal.vue index a04dbee..fcb4234 100644 --- a/src/views/tool/generator/GenPreviewModal.vue +++ b/src/views/tool/generator/GenPreviewModal.vue @@ -4,19 +4,30 @@ :title="`生成 ${previewTableName} 表预览`" :mask-closable="false" :esc-to-close="false" - width="100%" + width="90%" draggable :footer="false" >
- - + + + + + + + + + + + @@ -63,8 +74,8 @@ const genPreviewList = ref([]) const visible = ref(false) const treeData = ref([]) const previewTableName = ref('') - -const mergeDir = (parent: TreeNodeData) => { +const treeRef = ref() +const mergeDir = async (parent: TreeNodeData) => { // 合并目录 if (parent.children?.length === 1 && typeof parent.children[0].key === 'number') { const mergeTitle = mergeDir(parent.children[0]) @@ -80,9 +91,13 @@ const mergeDir = (parent: TreeNodeData) => { mergeDir(child) } } + + await nextTick(() => { + treeRef.value?.expandAll(true) + }) return '' } - +const expandKeys = ref([]) const pushDir = (children: TreeNodeData[] | undefined, treeNode: TreeNodeData) => { if (children) { for (const child of children) { @@ -92,6 +107,7 @@ const pushDir = (children: TreeNodeData[] | undefined, treeNode: TreeNodeData) = } } children?.push(treeNode) + expandKeys.value.push(treeNode.key) return treeNode.children } @@ -143,10 +159,13 @@ watch(copied, () => { Message.success('复制成功') } }) - const gen = () => { emit('generate', [previewTableName.value]) } +// 校验文件类型 +const checkFileType = (title: string, type: string) => { + return title.endsWith(type) +} defineExpose({ onPreview })