0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#16990

This commit is contained in:
XieYongHong 2023-08-02 17:03:28 +08:00
parent 1f7cc1eaff
commit b6c8bb568f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/menu.ts
View File

@ -446,12 +446,10 @@ export const handleMenus = (menuData: any[], components: any, level: number = 1)
} }
route.component = findComponents(item.code, level, isApp, components) route.component = findComponents(item.code, level, isApp, components)
console.log(`isApp:${isApp}`, route)
const extraRoute = hasExtraChildren(item, extraRouteObj) const extraRoute = hasExtraChildren(item, extraRouteObj)
const detail_components = findDetailRouteItem(item, components) const detail_components = findDetailRouteItem(item, components)
if (extraRoute && !isApp) { // 包含额外的子路由 if (extraRoute && !isApp) { // 包含额外的子路由
console.log(extraRoute)
route.children = route.children ? [...route.children, ...extraRoute] : extraRoute route.children = route.children ? [...route.children, ...extraRoute] : extraRoute
} }

5
src/views/device/components/Metadata/Base/columns.tsx
View File

@ -38,6 +38,9 @@ const type = {
}; };
export const validatorConfig = (value: any, isObject: boolean = false) => { export const validatorConfig = (value: any, isObject: boolean = false) => {
console.log(value)
if (!value) { if (!value) {
return Promise.resolve() return Promise.resolve()
} }
@ -53,7 +56,7 @@ export const validatorConfig = (value: any, isObject: boolean = false) => {
return Promise.reject('请添加参数') return Promise.reject('请添加参数')
} }
if (value.type === 'file' && !value.fileType) { if (value.type === 'file' && (!value.fileType || !Object.keys(value.fileType).length)) {
return Promise.reject('请选择文件类型') return Promise.reject('请选择文件类型')
} }