diff --git a/apps/web-antd/src/components/tree/src/data.tsx b/apps/web-antd/src/components/tree/src/data.tsx index 2bbaf317..b58886f3 100644 --- a/apps/web-antd/src/components/tree/src/data.tsx +++ b/apps/web-antd/src/components/tree/src/data.tsx @@ -2,9 +2,11 @@ import type { VxeGridProps } from '#/adapter/vxe-table'; import type { ID } from '#/api/common'; import type { MenuOption } from '#/api/system/menu/model'; -import { h, markRaw } from 'vue'; +import { h } from 'vue'; -import { FolderIcon, MenuIcon, OkButtonIcon, VbenIcon } from '@vben/icons'; +import { VbenIcon } from '@vben/icons'; + +import { menuTypes } from '#/views/system/menu/data'; export interface Permission { checked: boolean; @@ -16,12 +18,6 @@ export interface MenuPermissionOption extends MenuOption { permissions: Permission[]; } -const menuTypes = { - C: { icon: markRaw(MenuIcon), value: '菜单' }, - F: { icon: markRaw(OkButtonIcon), value: '按钮' }, - M: { icon: markRaw(FolderIcon), value: '目录' }, -}; - export const nodeOptions = [ { label: '节点关联', value: true }, { label: '节点独立', value: false }, diff --git a/apps/web-antd/src/views/system/menu/data.tsx b/apps/web-antd/src/views/system/menu/data.tsx index e5177cab..079b34f3 100644 --- a/apps/web-antd/src/views/system/menu/data.tsx +++ b/apps/web-antd/src/views/system/menu/data.tsx @@ -4,7 +4,7 @@ import type { VxeGridProps } from '#/adapter/vxe-table'; import { h } from 'vue'; import { DictEnum } from '@vben/constants'; -import { FolderIcon, MenuIcon, OkButtonIcon, VbenIcon } from '@vben/icons'; +import { VbenIcon } from '@vben/icons'; import { $t } from '@vben/locales'; import { getPopupContainer } from '@vben/utils'; @@ -51,10 +51,19 @@ export const yesNoOptions = [ ]; // (M目录 C菜单 F按钮) -const menuTypes = { - C: { icon: MenuIcon, value: '菜单' }, - F: { icon: OkButtonIcon, value: '按钮' }, - M: { icon: FolderIcon, value: '目录' }, +export const menuTypes = { + C: { + icon: , + value: '菜单', + }, + F: { + icon: , + value: '按钮', + }, + M: { + icon: , + value: '目录', + }, }; export const columns: VxeGridProps['columns'] = [ { diff --git a/packages/icons/src/iconify-offline/index.ts b/packages/icons/src/iconify-offline/index.ts index 59d4431b..f36396d0 100644 --- a/packages/icons/src/iconify-offline/index.ts +++ b/packages/icons/src/iconify-offline/index.ts @@ -1,8 +1,5 @@ import { createIconifyOfflineIcon } from '@vben-core/icons'; -import folderIcon from '@iconify/icons-flat-color-icons/folder'; -import menuIcon from '@iconify/icons-material-symbols/menu'; -import okButtonIcon from '@iconify/icons-mdi/button-pointer'; import dingdingFill from '@iconify/icons-ri/dingding-fill'; import giteeIcon from '@iconify/icons-simple-icons/gitee'; @@ -17,17 +14,3 @@ export const GiteeIcon = createIconifyOfflineIcon( 'simple-icons:gitee', giteeIcon, ); - -// 菜单类型 目录/按钮/菜单 -export const FolderIcon = createIconifyOfflineIcon( - 'flat-color-icons:folder', - folderIcon, -); -export const OkButtonIcon = createIconifyOfflineIcon( - 'mdi:button-pointer', - okButtonIcon, -); -export const MenuIcon = createIconifyOfflineIcon( - 'material-symbols:menu', - menuIcon, -);