diff --git a/src/views/system/user/dept/index.vue b/src/views/system/user/dept/index.vue
index 0fab609..7a4941a 100644
--- a/src/views/system/user/dept/index.vue
+++ b/src/views/system/user/dept/index.vue
@@ -91,11 +91,7 @@ const getTreeData = async (query: DeptQuery = { ...queryForm }) => {
popupVisible: false,
switcherIcon: (node: any) => {
if (!node.isLeaf) {
- if (node.expanded) {
- return
- } else {
- return
- }
+ return
}
return
}
diff --git a/src/views/tool/generator/GenPreviewModal.vue b/src/views/tool/generator/GenPreviewModal.vue
index 66d6880..a047d8c 100644
--- a/src/views/tool/generator/GenPreviewModal.vue
+++ b/src/views/tool/generator/GenPreviewModal.vue
@@ -1,25 +1,25 @@
-
+
{{ `生成 ${previewTableName} 表预览` }}
- 下载源码
+ 下载源码
-
+
+
+
+
@@ -75,9 +75,10 @@ const currentPreview = ref()
const genPreviewList = ref([])
const visible = ref(false)
-const treeData = ref([])
const previewTableName = ref('')
const treeRef = ref()
+const treeData = ref([])
+// 合并目录
const mergeDir = (parent: TreeNodeData) => {
// 合并目录
if (parent.children?.length === 1 && typeof parent.children[0].key === 'number') {
@@ -94,13 +95,9 @@ const mergeDir = (parent: TreeNodeData) => {
mergeDir(child)
}
}
-
- nextTick(() => {
- treeRef.value?.expandAll(true)
- })
return ''
}
-const expandKeys = ref([])
+
const pushDir = (children: TreeNodeData[] | undefined, treeNode: TreeNodeData) => {
if (children) {
for (const child of children) {
@@ -110,7 +107,6 @@ const pushDir = (children: TreeNodeData[] | undefined, treeNode: TreeNodeData) =
}
}
children?.push(treeNode)
- expandKeys.value.push(treeNode.key)
return treeNode.children
}
@@ -118,7 +114,8 @@ const pushDir = (children: TreeNodeData[] | undefined, treeNode: TreeNodeData) =
let autoIncrementKey = 0
// 将生成的目录组装成树结构
const assembleTree = (genPreview: GeneratePreviewResp) => {
- const paths: string[] = genPreview.path.split('\\')
+ const separator = genPreview.path.includes('/') ? '/' : '\\'
+ const paths: string[] = genPreview.path.split(separator)
let tempChildren: TreeNodeData[] | undefined = treeData.value
for (const path of paths) {
// 向treeData中推送目录,如果该级目录有那么不推送进行下级的合并
@@ -127,6 +124,7 @@ const assembleTree = (genPreview: GeneratePreviewResp) => {
tempChildren?.push({ title: genPreview.fileName, key: genPreview.fileName, children: new Array() })
}
+const selectedKeys = ref()
// 打开
const onPreview = async (tableName: string) => {
treeData.value = []
@@ -139,14 +137,22 @@ const onPreview = async (tableName: string) => {
for (const valueElement of treeData.value) {
mergeDir(valueElement)
}
+ selectedKeys.value = genPreviewList.value[0].fileName
currentPreview.value = genPreviewList.value[0]
+ await nextTick(() => {
+ treeRef.value.expandAll(true)
+ })
visible.value = true
}
// 选择文件预览
-const onSelectPreview = (selectedKeys) => {
- if (typeof selectedKeys[0] === 'string') {
- currentPreview.value = genPreviewList.value.filter((p) => p.fileName === selectedKeys[0])[0]
+const onSelectPreview = (keys: (string | number)[]) => {
+ if (typeof keys[0] === 'string') {
+ currentPreview.value = genPreviewList.value.filter((p) => p.fileName === keys[0])[0]
+ selectedKeys.value = keys[0]
+ } else {
+ const expandedKeys = treeRef.value.getExpandedNodes().map((node) => node.key)
+ treeRef.value.expandNode(keys[0], !expandedKeys.includes(keys[0]))
}
}
@@ -156,13 +162,14 @@ const onCopy = () => {
copy(currentPreview.value?.content)
}
}
-
watch(copied, () => {
if (copied.value) {
Message.success('复制成功')
}
})
-const gen = () => {
+
+// 下载
+const onDownload = () => {
emit('generate', [previewTableName.value])
}
// 校验文件类型
@@ -174,6 +181,9 @@ defineExpose({ onPreview })