Эх сурвалжийг харах

优化 routerView/iframes 样式,与标准页面保持一致

夜鹰 8 сар өмнө
parent
commit
53221917da

+ 9 - 5
Web/src/layout/routerView/iframes.vue

@@ -1,7 +1,12 @@
 <template>
-	<div class="layout-padding layout-padding-unset layout-iframe">
-		<div class="layout-padding-auto layout-padding-view">
-			<div class="w100" v-for="v in setIframeList" :key="v.path" v-loading="v.meta.loading" element-loading-background="white">
+	<div class="layout-iframe w100 h100">
+		<div class="layout-padding-view w100 h100">
+			<div class="w100 h100"
+                v-for="v in setIframeList" :key="v.path" 
+                v-show="getRoutePath === v.path"
+                v-loading="v.meta.loading" 
+                element-loading-background="white"
+            >
 				<transition-group :name="name">
 					<iframe
 						:src="`${v.meta.isLink}${v.meta.isLink.indexOf('?') > 0 ? '&' : '?'}token=${getToken()}`"
@@ -9,9 +14,7 @@
 						frameborder="0"
 						height="100%"
 						width="100%"
-						style="position: absolute"
 						:data-url="v.path"
-						v-show="getRoutePath === v.path"
 						ref="iframeRef"
 					/>
 				</transition-group>
@@ -50,6 +53,7 @@ const route = useRoute();
 
 // 处理 list 列表,当打开时,才进行加载
 const setIframeList = computed(() => {
+    console.log(props.list);
 	return (<RouteItems>props.list).filter((v: RouteItem) => v.meta?.isIframeOpen);
 });
 // 获取 iframe 当前路由 path

+ 2 - 3
Web/src/layout/routerView/parent.vue

@@ -3,12 +3,12 @@
 		<router-view v-slot="{ Component }">
 			<transition :name="setTransitionName" mode="out-in">
 				<keep-alive :include="getKeepAliveNames">
-					<component :is="Component" :key="state.refreshRouterViewKey" class="w100" v-show="!isIframePage" />
+					<component :is="Component" :key="state.refreshRouterViewKey" v-show="!isIframePage" />
 				</keep-alive>
 			</transition>
 		</router-view>
 		<transition :name="setTransitionName" mode="out-in">
-			<Iframes class="w100" v-show="isIframePage" :refreshKey="state.iframeRefreshKey" :name="setTransitionName" :list="state.iframeList" />
+			<Iframes v-show="isIframePage" :refreshKey="state.iframeRefreshKey" :name="setTransitionName" :list="state.iframeList" />
 		</transition>
 	</div>
 </template>
@@ -21,7 +21,6 @@ import { useKeepALiveNames } from '/@/stores/keepAliveNames';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import { Session } from '/@/utils/storage';
 import mittBus from '/@/utils/mitt';
-import {random} from "lodash-es";
 
 // 引入组件
 const Iframes = defineAsyncComponent(() => import('/@/layout/routerView/iframes.vue'));