xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'abp' of https://gitee.com/tyjctl/Yi into abp

Browse Source
This commit is contained in:
tyjctl
2024-04-15 18:05:57 +08:00
parent cb2674ebb6 3f92a0ccb4
commit 8fc686bddf
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Yi.RuoYi.Vue3/src/components/DictTag/index.vue
View File

@@ -29,7 +29,7 @@ const props = defineProps({
default: null, default: null,
}, },
// 当前的值 // 当前的值
value: [Number, String, Array], value: [Number, String, Array,Boolean],
}) })
const values = computed(() => { const values = computed(() => {

4
Yi.RuoYi.Vue3/src/views/system/menu/index.vue
View File

@@ -57,7 +57,7 @@
<el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column> <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
<el-table-column prop="menuIcon" label="图标" align="center" width="100"> <el-table-column prop="menuIcon" label="图标" align="center" width="100">
<template #default="scope"> <template #default="scope">
<svg-icon :icon-class="scope.row.menuIcon" /> <svg-icon :icon-class="scope.row.menuIcon+''" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="orderNum" label="排序" width="60"></el-table-column> <el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
@@ -137,7 +137,7 @@
<template #prefix> <template #prefix>
<svg-icon <svg-icon
v-if="form.menuIcon" v-if="form.menuIcon"
:icon-class="form.menuIcon" :icon-class="form.menuIcon+''"
class="el-input__icon" class="el-input__icon"
style="height: 32px;width: 16px;" style="height: 32px;width: 16px;"
/> />