Pārlūkot izejas kodu

修复“表单设计”样式问题,优化“routerView/iframes”样式与标准页面保持一致等

夜鹰 5 mēneši atpakaļ
vecāks
revīzija
66bdfc8282

+ 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'));

+ 2 - 2
Web/src/views/system/database/component/visualTable.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="sys-databaseVisual-container" style="height: calc(100vh - 60px)">
+	<div class="sys-databaseVisual-container" style="height: 100%">
 		<RelationGraph ref="graphRef" :options="graphOptions" :on-node-click="onNodeClick" :on-line-click="onLineClick">
 			<template #graph-plug>
 				<div
@@ -45,7 +45,7 @@
 							<th>长度</th>
 							<th>描述</th>
 						</tr>
-						<template v-for="column of node.data.columns" :key="column.columnName">
+						<template v-for="column of node.data.columns">
 							<tr>
 								<td>
 									<div :id="`${node.id}-${column.columnName}`">{{ column.columnName }}</div>

+ 1 - 1
Web/src/views/system/formDes/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-formDes-container">
-		<v-form-designer class="form-designer" ref="vFormDesignRef"></v-form-designer>
+		<v-form-designer ref="vFormDesignRef"></v-form-designer>
 	</div>
 </template>
 

+ 1 - 1
Web/src/views/system/infoSetting/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<div>
+	<div class="h100">
 		<CardPro shadow="hover" v-loading="state.isLoading" style="height: 100%;">
 			<el-descriptions title="系统信息配置" :column="2" :border="true">
 				<template #title>

+ 7 - 7
Web/src/views/system/template/component/editTemplate.vue

@@ -1,15 +1,15 @@
 <template>
 	<div class="sys-config-container">
-		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="900px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
 					<span> {{ props.title }} </span>
 				</div>
 			</template>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="60">
+			<el-form :model="state.ruleForm" ref="ruleFormRef">
 				<el-tabs v-model="state.selectedTabName">
-					<el-tab-pane label="基础信息" name="1" style="height: 550px; overflow-y: auto; overflow-x: hidden">
+					<el-tab-pane label="基础信息" name="1" >
 						<el-row :gutter="35">
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 								<el-form-item label="名称" prop="name" :rules="[{ required: true, message: '名称不能为空', trigger: 'blur' }]">
@@ -43,7 +43,7 @@
 							</el-col>
 						</el-row>
 					</el-tab-pane>
-					<el-tab-pane label="模板内容" name="2" style="height: 550px; overflow-y: auto; overflow-x: hidden">
+					<el-tab-pane label="模板内容" name="2">
 						<el-row :gutter="5">
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 								<el-form-item label="内容类型">
@@ -55,7 +55,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-								<el-form-item label="内容" prop="content" :rules="[{ required: true, message: '内容不能为空', trigger: 'blur' }]">
+								<el-form-item label="内容" prop="content" :rules="[{ required: true, message: '内容不能为空', trigger: 'blur' }]" label-position="top">
 									<Editor v-model:get-html="state.ruleForm.content" ref="editorRef" height="200px" v-if="state.contentType == 1" />
 									<el-input v-model="state.ruleForm.content" v-else type="textarea" rows="15" show-word-limit clearable />
 								</el-form-item>
@@ -63,7 +63,7 @@
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" style="user-select: none;">
 								<el-row :gutter="5">
 									<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" title="双击删除参数项">
-										<el-form-item label="预览参数">
+										<el-form-item label="预览参数" label-position="top">
 											<el-button icon="ele-Plus" text @click="() => state.renderData.push([])"></el-button>
 										</el-form-item>
 									</el-col>
@@ -80,7 +80,7 @@
 								</el-row>
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-								<el-form-item label="预览结果:" label-width="75" label-position="left" />
+								<el-form-item label="预览结果:" label-width="85" />
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 								<span v-html="state.result"></span>