From 2aabdb83ad578b0c9213a18d1fb1257349e2bc3f Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 17 二月 2023 10:47:32 +0800 Subject: [PATCH] fix 修复 管理员登出动态租户未清理导致二次无法登录 --- ruoyi-ui/src/views/system/menu/index.vue | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue index d65773a..52eb8b9 100644 --- a/ruoyi-ui/src/views/system/menu/index.vue +++ b/ruoyi-ui/src/views/system/menu/index.vue @@ -1,17 +1,16 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"> + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> <el-form-item label="鑿滃崟鍚嶇О" prop="menuName"> <el-input v-model="queryParams.menuName" placeholder="璇疯緭鍏ヨ彍鍗曞悕绉�" clearable - size="small" @keyup.enter.native="handleQuery" /> </el-form-item> <el-form-item label="鐘舵��" prop="status"> - <el-select v-model="queryParams.status" placeholder="鑿滃崟鐘舵��" clearable size="small"> + <el-select v-model="queryParams.status" placeholder="鑿滃崟鐘舵��" clearable> <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" @@ -78,7 +77,7 @@ </el-table-column> <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope"> - <el-button + <el-button size="mini" type="text" icon="el-icon-edit" @@ -108,7 +107,7 @@ <el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-row> <el-col :span="24"> - <el-form-item label="涓婄骇鑿滃崟"> + <el-form-item label="涓婄骇鑿滃崟" prop="parentId"> <treeselect v-model="form.parentId" :options="menuOptions" @@ -128,7 +127,7 @@ </el-form-item> </el-col> <el-col :span="24" v-if="form.menuType != 'F'"> - <el-form-item label="鑿滃崟鍥炬爣"> + <el-form-item label="鑿滃崟鍥炬爣" prop="icon"> <el-popover placement="bottom-start" width="460" @@ -160,7 +159,7 @@ </el-form-item> </el-col> <el-col :span="12" v-if="form.menuType != 'F'"> - <el-form-item> + <el-form-item prop="isFrame"> <span slot="label"> <el-tooltip content="閫夋嫨鏄閾惧垯璺敱鍦板潃闇�瑕佷互`http(s)://`寮�澶�" placement="top"> <i class="el-icon-question"></i> @@ -196,10 +195,10 @@ </el-form-item> </el-col> <el-col :span="12" v-if="form.menuType != 'M'"> - <el-form-item> + <el-form-item prop="perms"> <el-input v-model="form.perms" placeholder="璇疯緭鍏ユ潈闄愭爣璇�" maxlength="100" /> <span slot="label"> - <el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top"> + <el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細@SaCheckPermission('system:user:list')" placement="top"> <i class="el-icon-question"></i> </el-tooltip> 鏉冮檺瀛楃 @@ -207,8 +206,8 @@ </el-form-item> </el-col> <el-col :span="12" v-if="form.menuType == 'C'"> - <el-form-item> - <el-input v-model="form.query" placeholder="璇疯緭鍏ヨ矾鐢卞弬鏁�" maxlength="255" /> + <el-form-item prop="queryParam"> + <el-input v-model="form.queryParam" placeholder="璇疯緭鍏ヨ矾鐢卞弬鏁�" maxlength="255" /> <span slot="label"> <el-tooltip content='璁块棶璺敱鐨勯粯璁や紶閫掑弬鏁帮紝濡傦細`{"id": 1, "name": "ry"}`' placement="top"> <i class="el-icon-question"></i> @@ -218,7 +217,7 @@ </el-form-item> </el-col> <el-col :span="12" v-if="form.menuType == 'C'"> - <el-form-item> + <el-form-item prop="isCache"> <span slot="label"> <el-tooltip content="閫夋嫨鏄垯浼氳`keep-alive`缂撳瓨锛岄渶瑕佸尮閰嶇粍浠剁殑`name`鍜屽湴鍧�淇濇寔涓�鑷�" placement="top"> <i class="el-icon-question"></i> @@ -232,7 +231,7 @@ </el-form-item> </el-col> <el-col :span="12" v-if="form.menuType != 'F'"> - <el-form-item> + <el-form-item prop="visible"> <span slot="label"> <el-tooltip content="閫夋嫨闅愯棌鍒欒矾鐢卞皢涓嶄細鍑虹幇鍦ㄤ晶杈规爮锛屼絾浠嶇劧鍙互璁块棶" placement="top"> <i class="el-icon-question"></i> @@ -249,7 +248,7 @@ </el-form-item> </el-col> <el-col :span="12" v-if="form.menuType != 'F'"> - <el-form-item> + <el-form-item prop="status"> <span slot="label"> <el-tooltip content="閫夋嫨鍋滅敤鍒欒矾鐢卞皢涓嶄細鍑虹幇鍦ㄤ晶杈规爮锛屼篃涓嶈兘琚闂�" placement="top"> <i class="el-icon-question"></i> -- Gitblit v1.9.3