From b6c8bb568f103601bb6f01e25697b1831c5ebd70 Mon Sep 17 00:00:00 2001 From: XieYongHong <18010623010@163.com> Date: Wed, 2 Aug 2023 17:03:28 +0800 Subject: [PATCH] fix: bug#16990 --- src/utils/menu.ts | 2 -- src/views/device/components/Metadata/Base/columns.tsx | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/utils/menu.ts b/src/utils/menu.ts index f08a65d6..fc9753ac 100644 --- a/src/utils/menu.ts +++ b/src/utils/menu.ts @@ -446,12 +446,10 @@ export const handleMenus = (menuData: any[], components: any, level: number = 1) } route.component = findComponents(item.code, level, isApp, components) - console.log(`isApp:${isApp}`, route) const extraRoute = hasExtraChildren(item, extraRouteObj) const detail_components = findDetailRouteItem(item, components) if (extraRoute && !isApp) { // 包含额外的子路由 - console.log(extraRoute) route.children = route.children ? [...route.children, ...extraRoute] : extraRoute } diff --git a/src/views/device/components/Metadata/Base/columns.tsx b/src/views/device/components/Metadata/Base/columns.tsx index 6b2077e2..1004df1c 100644 --- a/src/views/device/components/Metadata/Base/columns.tsx +++ b/src/views/device/components/Metadata/Base/columns.tsx @@ -38,6 +38,9 @@ const type = { }; export const validatorConfig = (value: any, isObject: boolean = false) => { + + console.log(value) + if (!value) { return Promise.resolve() } @@ -53,7 +56,7 @@ export const validatorConfig = (value: any, isObject: boolean = false) => { return Promise.reject('请添加参数') } - if (value.type === 'file' && !value.fileType) { + if (value.type === 'file' && (!value.fileType || !Object.keys(value.fileType).length)) { return Promise.reject('请选择文件类型') }