From 98bb1f00eeca2b459bd8b9fe5a745e65c6081f97 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 19 十月 2022 19:06:14 +0800
Subject: [PATCH] fix 修复 修改用户信息 校验用户名未排除当前用户问题
---
ruoyi-ui/src/layout/components/AppMain.vue | 123 ++++-------------------------------------
1 files changed, 12 insertions(+), 111 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/ruoyi-ui/src/layout/components/AppMain.vue
index f172fc2..f4e74db 100644
--- a/ruoyi-ui/src/layout/components/AppMain.vue
+++ b/ruoyi-ui/src/layout/components/AppMain.vue
@@ -1,128 +1,29 @@
-<!-- @author ruoyi 20201128 鏀寔涓夌骇浠ヤ笂鑿滃崟缂撳瓨 -->
<template>
<section class="app-main">
<transition name="fade-transform" mode="out-in">
- <keep-alive :max="20" :exclude="notCacheName">
- <router-view :key="key" />
+ <keep-alive :include="cachedViews">
+ <router-view v-if="!$route.meta.link" :key="key" />
</keep-alive>
</transition>
+ <iframe-toggle />
</section>
</template>
<script>
-import Global from "@/layout/components/global.js";
+import iframeToggle from "./IframeToggle/index"
export default {
name: 'AppMain',
+ components: { iframeToggle },
computed: {
- notCacheName() {
- var visitedViews = this.$store.state.tagsView.visitedViews;
- var noCacheViews = [];
- Object.keys(visitedViews).some((index) => {
- if (visitedViews[index].meta.noCache) {
- noCacheViews.push(visitedViews[index].name);
- }
- });
- return noCacheViews;
+ cachedViews() {
+ return this.$store.state.tagsView.cachedViews
},
key() {
- return this.$route.path;
- },
- },
- mounted() {
- // 鍏抽棴鏍囩瑙﹀彂
- Global.$on("removeCache", (name, view) => {
- this.removeCache(name, view);
- });
- },
- methods: {
- // 鑾峰彇鏈塳eep-alive瀛愯妭鐐圭殑Vnode
- getVnode() {
- // 鍒ゆ柇瀛愰泦闈炵┖
- if (this.$children.length == 0) return false;
- let vnode;
- for (let item of this.$children) {
- // 濡傛灉data涓湁key鍒欎唬琛ㄦ壘鍒颁簡keep-alive涓嬮潰鐨勫瓙闆嗭紝杩欎釜key灏辨槸router-view涓婄殑key
- if (item.$vnode.data.key) {
- vnode = item.$vnode;
- break;
- }
- }
- return vnode ? vnode : false;
- },
- // 绉婚櫎keep-alive缂撳瓨
- removeCache(name, view = {}) {
- let vnode = this.getVnode();
- if (!vnode) return false;
- let componentInstance = vnode.parent.componentInstance;
- // 杩欎釜key鏄敤鏉ヨ幏鍙栧墠缂�鐢ㄦ潵鍚庨潰姝ｅ垯鍖归厤鐢ㄧ殑
- let keyStart = vnode.key.split("/")[0];
- let thisKey = `${keyStart}${view.fullPath}`;
- let regKey = `${keyStart}${view.path}`;
-
- this[name]({ componentInstance, thisKey, regKey });
- },
- // 绉婚櫎鍏朵粬
- closeOthersTags({ componentInstance, thisKey }) {
- Object.keys(componentInstance.cache).forEach((key, index) => {
- if (key != thisKey) {
- // 閿�姣佸疄渚�(杩欓噷瀛樺湪澶氫釜key鎸囧悜涓�涓紦瀛樼殑鎯呭喌鍙兘鍓嶉潰涓�涓凡缁忔竻闄ゆ帀浜嗘墍鏈夎鍔犲垽鏂�)
- if (componentInstance.cache[key]) {
- componentInstance.cache[key].componentInstance.$destroy();
- }
- // 鍒犻櫎缂撳瓨
- delete componentInstance.cache[key];
- // 绉婚櫎key涓搴旂殑key
- componentInstance.keys.splice(index, 1);
- }
- });
- },
- // 绉婚櫎鎵�鏈夌紦瀛�
- closeAllTags({ componentInstance }) {
- // 閿�姣佸疄渚�
- Object.keys(componentInstance.cache).forEach((key) => {
- if (componentInstance.cache[key]) {
- componentInstance.cache[key].componentInstance.$destroy();
- }
- });
- // 鍒犻櫎缂撳瓨
- componentInstance.cache = {};
- // 绉婚櫎key涓搴旂殑key
- componentInstance.keys = [];
- },
- // 绉婚櫎鍗曚釜缂撳瓨
- closeSelectedTag({ componentInstance, regKey }) {
- let reg = new RegExp(`^${regKey}`);
- Object.keys(componentInstance.cache).forEach((key, i) => {
- if (reg.test(key)) {
- // 閿�姣佸疄渚�
- if (componentInstance.cache[key]) {
- componentInstance.cache[key].componentInstance.$destroy();
- }
- // 鍒犻櫎缂撳瓨
- delete componentInstance.cache[key];
- // 绉婚櫎key涓搴旂殑key
- componentInstance.keys.splice(i, 1);
- }
- });
- },
- // 鍒锋柊鍗曚釜缂撳瓨
- refreshSelectedTag({ componentInstance, thisKey }) {
- Object.keys(componentInstance.cache).forEach((key, index) => {
- if (null != thisKey && key.replace("/redirect", "") == thisKey) {
- // 1 閿�姣佸疄渚�(杩欓噷瀛樺湪澶氫釜key鎸囧悜涓�涓紦瀛樼殑鎯呭喌鍙兘鍓嶉潰涓�涓凡缁忔竻闄ゆ帀浜嗘墍鏈夎鍔犲垽鏂�)
- if (componentInstance.cache[key]) {
- componentInstance.cache[key].componentInstance.$destroy();
- }
- // 2 鍒犻櫎缂撳瓨
- delete componentInstance.cache[key];
- // 3 绉婚櫎key涓搴旂殑key
- componentInstance.keys.splice(index, 1);
- }
- });
- },
- },
-};
+ return this.$route.path
+ }
+ }
+}
</script>
<style lang="scss" scoped>
@@ -154,7 +55,7 @@
// fix css style bug in open el-dialog
.el-popup-parent--hidden {
.fixed-header {
- padding-right: 15px;
+ padding-right: 17px;
}
}
</style>
--
Gitblit v1.9.3