Merge branch 'i18n' into v2

Web/src/App.vue

@@ -60,9 +60,9 @@ const setLockScreen = computed(() => {
 // 	needUpdate.value = true;
 // }, 60000);
 
-// 获取全局组件大小
+// 获取全局组件大小，直接响应 themeConfig
 const getGlobalComponentSize = computed(() => {
-	return other.globalComponentSize();
+	return themeConfig.value.globalComponentSize;
 });
 // 获取全局 i18n
 // const getGlobalI18n = computed(() => {

Web/src/layout/navBars/topBar/user.vue

@@ -224,7 +224,7 @@ const onComponentSizeChange = (size: string) => {
 	themeConfig.value.globalComponentSize = size;
 	Local.set('themeConfig', themeConfig.value);
 	initI18nOrSize('globalComponentSize', 'disabledSize');
-	window.location.reload();
+	//window.location.reload();
 };
 // 语言切换
 const onLanguageChange = async (lang: string) => {

Web/src/main.ts

@@ -5,8 +5,7 @@ import App from '/@/App.vue';
 import router from '/@/router';
 import { directive } from '/@/directive/index';
 import other from '/@/utils/other';
-import ElementPlus from 'element-plus';
-import { ElTooltip } from 'element-plus'
+import ElementPlus, { ElTooltip } from 'element-plus';
 import '/@/theme/index.scss';
 // 动画库
 import 'animate.css';

Web/src/theme/element.scss

@@ -339,11 +339,13 @@
 // .el-dialog__title{
 // 	font-size: 14px;
 // 	color: #FFF;
-// 	font-weight: 700;
+// 	//font-weight: 700;
+//     line-height: normal;
 // }
 .el-dialog__header {
 	margin-right: 0;
 	padding: 8px;
+    border-radius: var(--el-dialog-border-radius) var(--el-dialog-border-radius) 0 0;
 	background: var(--el-color-primary);
 }
 .el-dialog__footer {
@@ -503,6 +505,10 @@
 	right: 0px;
 }
 
+.el-tree {
+    --el-tree-node-content-height: 30px;
+}
+
 $--el-table-text-color: #fb6d49;
 
 // hack列表页

Web/src/utils/other.ts

@@ -95,7 +95,7 @@ export const lazyImg = (el: string, arr: EmptyArrayType) => {
 export const globalComponentSize = (): string => {
 	const stores = useThemeConfig(pinia);
 	const { themeConfig } = storeToRefs(stores);
-	return Local.get('themeConfig')?.globalComponentSize || themeConfig.value?.globalComponentSize;
+	return themeConfig.value.globalComponentSize;
 };
 
 /**

Web/src/views/system/job/component/jobCluster.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="sys-jobCluster-container">
 		<el-drawer v-model="state.isVisible" title="作业集群" size="40%">
-			<el-table :data="state.jobClusterList" style="width: 100%; margin: 8px" v-loading="state.loading" border>
+			<el-table :data="state.jobClusterList" style="width: 100%;" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
 				<el-table-column prop="clusterId" label="集群编号" header-align="center" show-overflow-tooltip />
 				<el-table-column prop="status" label="状态" align="center" show-overflow-tooltip>
@@ -51,3 +51,9 @@ const openDrawer = () => {
 // 导出对象
 defineExpose({ openDrawer });
 </script>
+
+<style lang="scss" scoped>
+:deep(.el-drawer__body) {
+    padding: 8px;
+}
+</style>

Web/src/views/system/role/component/editRole.vue

@@ -48,7 +48,7 @@
 								icon="ele-Menu"
 								highlight-current
 								default-expand-all
-								style="height: 600px;overflow-y: auto;"
+								style="height: 450px;overflow-y: auto;"
 							/>
 						</el-form-item>
 					</el-col>

Web/src/views/system/tenant/component/editTenant.vue

@@ -10,7 +10,7 @@
 			</template>
 			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="auto">
 				<el-tabs v-loading="state.loading" v-model="state.selectedTabName">
-					<el-tab-pane label="基本信息" style="height: 400px; overflow-y: auto; overflow-x: hidden">
+					<el-tab-pane label="基本信息" style="height: 450px; overflow-y: auto; overflow-x: hidden">
 						<el-row :gutter="35">
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 								<el-form-item label="租户类型"
@@ -107,7 +107,7 @@
 							</el-col>
 						</el-row>
 					</el-tab-pane>
-					<el-tab-pane label="站点信息" style="height: 400px; overflow: auto; overflow-x: hidden"
+					<el-tab-pane label="站点信息" style="height: 450px; overflow: auto; overflow-x: hidden"
 						v-if="state.ruleForm.host?.trim()">
 						<el-row :gutter="35">
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">

Web/src/views/system/user/component/editUser.vue

@@ -8,7 +8,7 @@
 				</div>
 			</template>
 			<el-tabs v-loading="state.loading" v-model="state.selectedTabName">
-				<el-tab-pane label="基础信息" style="height: 550px; overflow-y: auto; overflow-x: hidden">
+				<el-tab-pane label="基础信息" class="tab-pane">
 					<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="auto">
 						<el-row :gutter="35">
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@@ -131,10 +131,10 @@
 						</el-row>
 					</el-form>
 				</el-tab-pane>
-				<el-tab-pane label="角色授权" style="height: 550px; margin-left: 36px">
+				<el-tab-pane label="角色授权" class="tab-pane">
 					<el-transfer :data="state.roleData" :props="{ key: 'id', label: 'name' }" v-model="state.ruleForm.roleIdList" :titles="['未授权', '已授权']"></el-transfer>
 				</el-tab-pane>
-				<el-tab-pane label="档案信息" style="height: 550px; overflow-y: auto; overflow-x: hidden">
+				<el-tab-pane label="档案信息" class="tab-pane">
 					<el-form :model="state.ruleForm" label-width="auto">
 						<el-row :gutter="35">
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@@ -325,3 +325,23 @@ const deleteExtOrgRow = (k: number) => {
 // 导出对象
 defineExpose({ openDialog });
 </script>
+
+<style lang="scss" scoped>
+.tab-pane {
+    padding: 0 10px;
+    height: 570px;
+    overflow: hidden auto;
+
+    .el-transfer {
+        margin: 0 auto;
+        width: fit-content;
+        height: 100%;
+
+        :deep(.el-transfer-panel) {
+            height: 100%;
+        }
+
+        --el-transfer-panel-body-height: calc(100% - 40px);
+    }
+}
+</style>