From b617603a5e9a4f86e47bb3df67e1cd0c9beb2ba1 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期一, 11 八月 2025 17:03:51 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp --- packages/utils/area.ts | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/packages/utils/area.ts b/packages/utils/area.ts index a0b323e..c41d617 100644 --- a/packages/utils/area.ts +++ b/packages/utils/area.ts @@ -1,21 +1,19 @@ import { AreaType } from '@12333/constants'; -export interface AreaTreeNode extends API.AreaInfo { - children?: AreaTreeNode[]; -} - export function formatAreaListToTree( - areaDataList: API.AreaInfo[], - parentId: number, + areaDataList: API.AreaTreeNode[], + parentId = null, maxLayer = AreaType.Area ) { const treeNodeList: API.AreaTreeNode[] = []; if (areaDataList.length > 0) { areaDataList.forEach((areaData) => { const areaTreeNode: API.AreaTreeNode = { ...areaData }; - if (areaData.parentId === parentId && areaData.layer <= maxLayer) { + if (areaData.parentCode === parentId && areaData.layer <= maxLayer) { const children = formatAreaListToTree(areaDataList, areaData.areaCode, maxLayer); - areaTreeNode.children = children; + if (children.length > 0) { + areaTreeNode.children = children; + } treeNodeList.push(areaTreeNode); } }); @@ -23,11 +21,11 @@ return treeNodeList; } -export function flattenAreaTree(tree: API.AreaInfo[]) { - let result = [] as API.AreaInfo[]; +export function flattenAreaTree(tree: API.AreaDto[]) { + let result = [] as API.AreaDto[]; // 閫掑綊鍑芥暟锛岀敤浜庨亶鍘嗗瓙鑺傜偣 - function flatten(node: API.AreaInfo) { + function flatten(node: API.AreaDto) { result.push(node); if (node.children && node.children.length > 0) { -- Gitblit v1.9.1