diff --git a/kicc-ui/src/utils/index.ts b/kicc-ui/src/utils/index.ts index ea3e15f0..6a50dfdd 100644 --- a/kicc-ui/src/utils/index.ts +++ b/kicc-ui/src/utils/index.ts @@ -10,6 +10,7 @@ import type { RouteLocationNormalized, RouteRecordNormalized } from 'vue-router' import type { App, Plugin } from 'vue'; import { unref } from 'vue'; import { isObject } from '/@/utils/is'; +import { isEmpty } from 'lodash-es'; export const noop = () => {}; @@ -102,11 +103,12 @@ export const withInstall = (component: T, alias?: string) => { export const findListNameById = (id: string, list: any[], options: Partial<{ idField: string, nameField: string, childrenField: string }> = {}) => { // 设置默认配置 options = Object.assign({ idField: 'id', nameField: 'name', childrenField: 'children' }, options); + console.log(id, list, options); for (let i = 0; i < list.length; i++) { if (list[i][options.idField!] === id) { return list[i][options.nameField!]; } - if (list[i][options.childrenField!]) { + if (!isEmpty(list[i][options.childrenField!])) { return findListNameById(id, list[i][options.childrenField!],options); } } diff --git a/kicc-ui/src/views/system/user/UserModal.vue b/kicc-ui/src/views/system/user/UserModal.vue index 9a0f7314..a341ef45 100644 --- a/kicc-ui/src/views/system/user/UserModal.vue +++ b/kicc-ui/src/views/system/user/UserModal.vue @@ -14,7 +14,7 @@ * Copyright © 2020-2022 entfrm All rights reserved. * author entfrm开发团队-王翔 */ - import {defineComponent, reactive, ref, toRaw, unref} from 'vue'; + import {defineComponent, reactive, toRaw } from 'vue'; import { BasicModal, useModalInner } from '/@/components/Modal'; import { BasicForm, useForm } from '/@/components/Form/index'; import { userFormSchema } from './user.data';