From fb531cbb7ceca6e4c28288b5a988a2700a065c59 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 11 八月 2025 15:55:34 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
packages/utils/area.ts | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/packages/utils/area.ts b/packages/utils/area.ts
index a0b323e..aa4c806 100644
--- a/packages/utils/area.ts
+++ b/packages/utils/area.ts
@@ -1,19 +1,15 @@
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 = '',
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;
treeNodeList.push(areaTreeNode);
@@ -23,11 +19,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