root/nl-sso-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修改iFrame字段为iframe，iFrame偶尔导致@setting注解读取失败问题

Browse Source
This commit is contained in:
zhangzhiqiang
2022-12-26 10:34:37 +08:00
parent 1801eba0f4
commit ce48bec077
7 changed files with 93 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
nladmin-ui/src/views/system/menu/index.vue
View File

@@ -14,7 +14,7 @@
@keyup.enter.native="queryBlurry"
/>
<el-select
v-model="query.system_type"
v-model="query.systemType"
style="width: 100px; height: 35px;top: -5px;"
placeholder="切换系统"
@change="changetype"
@@ -67,10 +67,10 @@
</el-input>
</el-popover>
</el-form-item>
<el-form-item v-show="form.type.toString() !== '2' && form.type.toString() !== '1'" label="外链菜单" prop="i_frame">
<el-radio-group v-model="form.i_frame" size="mini">
<el-radio-button label="1">是</el-radio-button>
<el-radio-button label="0">否</el-radio-button>
<el-form-item v-show="form.type.toString() !== '2' && form.type.toString() !== '1'" label="外链菜单" prop="iframe">
<el-radio-group v-model="form.iframe" size="mini">
<el-radio-button label="true">是</el-radio-button>
<el-radio-button label="false">否</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item v-show="form.type.toString() === '2'" label="菜单缓存" prop="cache">
@@ -96,7 +96,7 @@
<el-input v-model="form.title" placeholder="按钮名称" style="width: 190px;" />
</el-form-item>
<el-form-item v-show="form.type.toString() !== '1' " label="权限标识" prop="permission">
<el-input v-model="form.permission" :disabled="form.i_frame=='1'" placeholder="权限标识" style="width: 190px;" />
<el-input v-model="form.permission" :disabled="form.iframe" placeholder="权限标识" style="width: 190px;" />
</el-form-item>
<el-form-item v-if="form.type.toString() !== '1' && form.type.toString() !== '2'" label="路由地址" prop="path">
<el-input v-model="form.path" placeholder="路由地址" style="width: 190px;" />
@@ -110,10 +110,10 @@
style="width: 190px;"
/>
</el-form-item>
<el-form-item v-show="!form.i_frame && form.type.toString() === '3' " label="组件名称" prop="componentName">
<el-form-item v-show="!form.iframe && form.type.toString() === '3' " label="组件名称" prop="componentName">
<el-input v-model="form.componentName" style="width: 190px;" placeholder="匹配组件内Name字段" />
</el-form-item>
<el-form-item v-show="!form.i_frame && (form.type.toString() === '2' ||form.type.toString() === '3' ) " label="组件路径" prop="component">
<el-form-item v-show="!form.iframe && (form.type.toString() === '2' ||form.type.toString() === '3' ) " label="组件路径" prop="component">
<el-input v-model="form.component" style="width: 190px;" placeholder="组件路径" />
</el-form-item>
<el-form-item label="上级类目" prop="pid">
@@ -150,9 +150,9 @@
>
<el-table-column type="selection" width="55" />
<el-table-column label="菜单标题" prop="title" :min-width="100" />
<el-table-column label="子系统" prop="system_type" :min-width="flexWidth('system_type',crud.data,'子系统')">
<el-table-column label="子系统" prop="systemType" :min-width="flexWidth('systemType',crud.data,'子系统')">
<template slot-scope="scope">
{{ dict.label.system_type[scope.row.system_type] }}
{{ dict.label.system_type[scope.row.systemType] }}
</template>
</el-table-column>
<el-table-column prop="icon" label="图标" align="center" :min-width="flexWidth('icon',crud.data,'图标')">
@@ -167,9 +167,9 @@
</el-table-column>
<el-table-column prop="permission" label="权限标识" :min-width="flexWidth('permission',crud.data,'权限标识')" />
<el-table-column prop="component" label="组件路径" min-width="120" />
<el-table-column prop="i_frame" label="外链" :formatter="crud.formatIsOrNot" :min-width="flexWidth('i_frame',crud.data,'外链')">
<el-table-column prop="iframe" label="外链" :formatter="crud.formatIsOrNot" :min-width="flexWidth('iframe',crud.data,'外链')">
<template slot-scope="scope">
<span v-if="scope.row.i_frame">是</span>
<span v-if="scope.row.iframe">是</span>
<span v-else>否</span>
</template>
</el-table-column>
@@ -220,15 +220,15 @@ import Dict from '../../../components/Dict/Dict'
// crud交由presenter持有
const defaultForm = {
menu_id: null,
menuId: null,
title: null,
menuSort: 999,
path: null,
system_type: null,
systemType: null,
category: null,
component: null,
componentName: null,
i_frame: 0,
iframe: false,
roles: [],
pid: 0,
icon: null,
@@ -280,7 +280,7 @@ export default {
this.crud.toQuery()
},
changetype() {
const sysType = this.dict.dict.system_type[this.query.system_type]
const sysType = this.dict.dict.system_type[this.query.systemType]
this.query.pid = sysType.para1
this.crud.toQuery()
},
@@ -329,8 +329,8 @@ export default {
})
}, 100)
},
getSupMenus(menu_id) {
crudMenu.getMenuSuperior(menu_id).then(res => {
getSupMenus(menuId) {
crudMenu.getMenuSuperior(menuId).then(res => {
const children = res.map(function(obj) {
if (!obj.leaf && !obj.children) {
obj.children = null