From 76d07c0c336eafb918fba27450d63865baeb0642 Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期一, 29 九月 2025 09:19:56 +0800 Subject: [PATCH] Merge branch 'master' into dev-1.1.2 --- src/utils/common/area.ts | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/utils/common/area.ts b/src/utils/common/area.ts index cffe5d7..a49719c 100644 --- a/src/utils/common/area.ts +++ b/src/utils/common/area.ts @@ -1,13 +1,14 @@ import { AreaType } from '@/constants'; import _ from 'lodash'; -export interface AreaTreeNode extends API.AreaDto { - children?: AreaTreeNode[]; -} +// type formatAreaListToTreeOptions = { +// parentId?: string; +// maxLayer?: number; +// }; export function formatAreaListToTree( - areaDataList: API.AreaDto[], - parentId: number, + areaDataList: API.AreaTreeNode[], + parentId = null, maxLayer = AreaType.Area ) { const treeNodeList: API.AreaTreeNode[] = []; -- Gitblit v1.9.1