From 1d5133b6957d95c0c2b1e9641f21a03d9a1c85bb Mon Sep 17 00:00:00 2001 From: ahaos <8406649+lhailgl@user.noreply.gitee.com> Date: 星期四, 14 十二月 2023 16:17:12 +0800 Subject: [PATCH] !69 修复升级依赖带来的类型问题 * fix 修复变量问题 * Merge remote-tracking branch 'origin/dev' into dev * update 依赖升级 * update 依赖升级 * Merge remote-tracking branch 'origin/dev' into dev * 升级依赖 * Merge remote-tracking branch 'origin/ts' into ts * 升级依赖 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance --- src/views/tool/gen/genInfoForm.vue | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue index ad8fd5e..a8d7e13 100644 --- a/src/views/tool/gen/genInfoForm.vue +++ b/src/views/tool/gen/genInfoForm.vue @@ -228,16 +228,16 @@ interface MenuOptionsType { menuId: number | string; menuName: string; - children: MenuOptionsType[] | undefined; + children?: MenuOptionsType[]; } +const { proxy } = getCurrentInstance(); const subColumns = ref<any>([]); const menuOptions = ref<Array<MenuOptionsType>>([]); -const { proxy } = getCurrentInstance(); const props = defineProps({ - info: propTypes.any.def(null), - tables: propTypes.any.def(null) + info: propTypes.any.isRequired, + tables: propTypes.any.isRequired }); const infoForm = computed(() => props.info); @@ -276,6 +276,7 @@ const res = await listMenu(); res.data.forEach((m) => (m.menuId = m.menuId.toString())); const data = proxy?.handleTree<MenuOptionsType>(res.data, 'menuId'); + if (data) { menuOptions.value = data; } -- Gitblit v1.9.3