From a61a3f982339216788d81366dcff59ba6ec32f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=99=8C?= <xiaomo.drip@gmail.com>
Date: Sun, 18 Jun 2023 23:42:02 +0800
Subject: [PATCH] no message

---
 src/components/scTable/index.vue | 4 ++--
 src/layout/index.vue             | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue
index 7d59410..3e75bb6 100644
--- a/src/components/scTable/index.vue
+++ b/src/components/scTable/index.vue
@@ -142,7 +142,7 @@
 		},
 		mounted() {
 			//判断是否开启自定义列
-			if(this.column){
+			if(this.tableName){
 				this.getCustomColumn()
 			}else{
 				this.userColumn = this.column
@@ -160,7 +160,7 @@
 				this.$refs.scTable.doLayout()
 			}
 		},
-		deactivated(){
+		deactivated(){ 
 			this.isActivat = false;
 		},
 		methods: {
diff --git a/src/layout/index.vue b/src/layout/index.vue
index d947c6e..ee24efe 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -39,7 +39,7 @@
 				<!-- <Topbar v-if="!ismobile"></Topbar> -->
 				<Tags v-if="!ismobile && layoutTags"></Tags>
 				<div class="adminui-main" id="adminui-main">
-					<router-view v-slot="{ Component }">
+					<router-view v-show="$route.meta.type!='iframe'" v-slot="{ Component }">
 					    <keep-alive :include="this.$store.state.keepAlive.keepLiveRoute">
 					        <component :is="Component" :key="$route.fullPath" v-if="$store.state.keepAlive.routeShow"/>
 					    </keep-alive>
@@ -81,7 +81,7 @@
 				<Topbar v-if="!ismobile"></Topbar>
 				<Tags v-if="!ismobile && layoutTags"></Tags>
 				<div class="adminui-main" id="adminui-main">
-					<router-view v-slot="{ Component }">
+					<router-view v-show="$route.meta.type!='iframe'" v-slot="{ Component }">
 					    <keep-alive :include="this.$store.state.keepAlive.keepLiveRoute">
 					        <component :is="Component" :key="$route.fullPath" v-if="$store.state.keepAlive.routeShow"/>
 					    </keep-alive>
@@ -115,7 +115,7 @@
 			<div class="aminui-body el-container">
 				<Tags v-if="!ismobile && layoutTags"></Tags>
 				<div class="adminui-main" id="adminui-main">
-					<router-view v-slot="{ Component }">
+					<router-view v-show="$route.meta.type!='iframe'" v-slot="{ Component }">
 					    <keep-alive :include="this.$store.state.keepAlive.keepLiveRoute">
 					        <component :is="Component" :key="$route.fullPath" v-if="$store.state.keepAlive.routeShow"/>
 					    </keep-alive>