GTsoft/ruoyi-plus-soybean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复菜单本地图标显示问题

Browse Source
This commit is contained in:
xlsea 2025-05-15 22:44:41 +08:00
parent e6ac3797b9
commit 3356928138
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/custom/menu-tree-select.vue
View File

@ -38,9 +38,9 @@ async function getMenuList() {
getMenuList();
function renderPrefix({ option }: { option: TreeOption }) {
const renderLocalIcon = String(option.icon).startsWith('icon-');
const renderLocalIcon = String(option.icon).startsWith('local-icon-');
const icon = renderLocalIcon ? undefined : String(option.icon);
const localIcon = renderLocalIcon ? String(option.icon).replace('icon-', 'menu-') : undefined;
const localIcon = renderLocalIcon ? String(option.icon).replace('local-icon-', 'menu-') : undefined;
return <SvgIcon icon={icon} localIcon={localIcon} />;
}
</script>

4
src/components/custom/menu-tree.vue
View File

@ -61,9 +61,9 @@ watch([expandAll, options], ([newVal]) => {
});
function renderPrefix({ option }: { option: TreeOption }) {
const renderLocalIcon = String(option.icon).startsWith('icon-');
const renderLocalIcon = String(option.icon).startsWith('local-icon-');
let icon = renderLocalIcon ? undefined : String(option.icon ?? 'material-symbols:buttons-alt-outline-rounded');
const localIcon = renderLocalIcon ? String(option.icon).replace('icon-', 'menu-') : undefined;
const localIcon = renderLocalIcon ? String(option.icon).replace('local-icon-', 'menu-') : undefined;
if (icon === '#') {
icon = 'material-symbols:buttons-alt-outline-rounded';
}

4
src/views/system/menu/index.vue
View File

@ -93,9 +93,9 @@ async function handleDeleteMenu(id?: CommonType.IdType) {
}
function renderPrefix({ option }: { option: TreeOption }) {
const renderLocalIcon = String(option.icon).startsWith('icon-');
const renderLocalIcon = String(option.icon).startsWith('local-icon-');
const icon = renderLocalIcon ? undefined : String(option.icon);
const localIcon = renderLocalIcon ? String(option.icon).replace('icon-', 'menu-') : undefined;
const localIcon = renderLocalIcon ? String(option.icon).replace('local-icon-', 'menu-') : undefined;
return <SvgIcon icon={icon} localIcon={localIcon} />;
}

4
src/views/system/menu/modules/menu-operate-drawer.vue
View File

@ -122,12 +122,12 @@ async function handleSubmit() {
menuId,
parentId,
menuName,
icon,
orderNum,
queryParam,
isFrame,
isCache,
menuType,
icon,
visible: menuVisible,
status,
perms,
@ -264,7 +264,7 @@ function onCreate() {
</NInput>
</template>
<template v-if="iconType === '2'">
<NSelect v-model:value="model.icon" placeholder="请选择本地图标" :options="localIconOptions" />
<NSelect v-model:value="model.icon" placeholder="请选择本地图标" filterable :options="localIconOptions" />
</template>
</NFormItemGi>
<NFormItemGi v-if="!isBtn" :span="24" path="path">

2
src/views/system/user/index.vue
View File

@ -123,6 +123,8 @@ const {
align: 'center',
width: 150,
render: row => {
if (row.userId === 1) return null;
const editBtn = () => {
return (
<ButtonIcon