diff --git a/src/store/router/helper.ts b/src/store/router/helper.ts index bb281cd..010d564 100644 --- a/src/store/router/helper.ts +++ b/src/store/router/helper.ts @@ -1,7 +1,7 @@ /// import type { MenuOption } from 'naive-ui' import { $t, renderIcon } from '@/utils' -import { clone, isEmpty, min, pick } from 'radash' +import { clone, isEmpty, isNumber, min, pick } from 'radash' import { RouterLink } from 'vue-router' import arrayToTree from 'array-to-tree' @@ -98,13 +98,11 @@ function transformAuthRoutesToMenus(userRoutes: Entity.Menu[]) { .filter(route => route.menuVisible !== false) // Sort the menu according to the order size .sort((a, b) => { - if (a.sort && b.sort) - return a.sort - b.sort - else if (a.sort) - return -1 - else if (b.sort) - return 1 - else return 0 + const aHas = isNumber(a.sort) + const bHas = isNumber(b.sort) + if (aHas && bHas) + return (a.sort as number) - (b.sort as number) + return 0 }) // Convert to side menu data structure .map((item) => { diff --git a/src/views/monitor/login-log/columns.tsx b/src/views/monitor/login-log/columns.tsx index afea731..a947de7 100644 --- a/src/views/monitor/login-log/columns.tsx +++ b/src/views/monitor/login-log/columns.tsx @@ -6,7 +6,7 @@ import { renderProCopyableText } from 'pro-naive-ui' // 登录日志搜索表单数据类型 export interface LoginLogSearchFormData { ipaddr?: string - userName?: string + username?: string status?: number loginTime?: string } @@ -47,7 +47,7 @@ export const searchColumns: ProSearchFormColumns = [ field: 'date-time-range', fieldProps: { clearable: true, - format: 'yyyy-MM-dd HH:mm:ss', + format: 'yyyy-MM-dd', valueFormat: 'yyyy-MM-dd HH:mm:ss', defaultTime: ['00:00:00', '23:59:59'], }, diff --git a/src/views/system/menu/components/MenuModal.vue b/src/views/system/menu/components/MenuModal.vue index 8724e7a..4d52989 100644 --- a/src/views/system/menu/components/MenuModal.vue +++ b/src/views/system/menu/components/MenuModal.vue @@ -152,6 +152,7 @@ defineExpose({ title="父级目录" path="parentId" :field-props="{ + clearable: true, options: treeData, keyField: 'value', }"