Просмотр исходного кода

401,404页样式修正,规范一些代码以消除浏览器控制台警告消息

夜鹰 4 месяцев назад
Родитель
Сommit
1b4645b2b6

+ 16 - 16
Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2025.11.08",
+	"lastBuildTime": "2025.11.23",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -26,7 +26,7 @@
 		"@element-plus/icons-vue": "^2.3.2",
 		"@logicflow/core": "^2.1.3",
 		"@logicflow/extension": "^2.1.5",
-		"@microsoft/signalr": "^9.0.6",
+		"@microsoft/signalr": "^10.0.0",
 		"@vue-office/docx": "^1.6.3",
 		"@vue-office/excel": "^1.7.14",
 		"@vue-office/pdf": "^2.0.10",
@@ -41,16 +41,16 @@
 		"echarts": "^6.0.0",
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
-		"element-plus": "^2.11.7",
-		"ezuikit-js": "^8.1.16",
+		"element-plus": "^2.11.8",
+		"ezuikit-js": "^8.1.17",
 		"js-cookie": "^3.0.5",
 		"js-table2excel": "^1.1.2",
 		"json-editor-vue": "^0.18.1",
 		"jsplumb": "^2.15.6",
 		"lodash-es": "^4.17.21",
-		"md-editor-v3": "^6.0.1",
+		"md-editor-v3": "^6.2.0",
 		"mitt": "^3.0.1",
-		"monaco-editor": "^0.54.0",
+		"monaco-editor": "^0.55.1",
 		"mqtt": "^5.14.1",
 		"nprogress": "^0.2.0",
 		"pinia": "^3.0.4",
@@ -70,7 +70,7 @@
 		"vue-demi": "^0.14.10",
 		"vue-draggable-plus": "^0.6.0",
 		"vue-grid-layout": "3.0.0-beta1",
-		"vue-i18n": "^11.1.12",
+		"vue-i18n": "^11.2.1",
 		"vue-json-pretty": "^2.6.0",
 		"vue-plugin-hiprint": "^0.0.60",
 		"vue-router": "^4.6.3",
@@ -83,25 +83,25 @@
 		"@eslint/js": "^9.39.1",
 		"@plugin-web-update-notification/vite": "^2.0.2",
 		"@types/lodash-es": "^4.17.12",
-		"@types/node": "^22.19.0",
+		"@types/node": "^22.19.1",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.9",
-		"@typescript-eslint/eslint-plugin": "^8.46.3",
-		"@typescript-eslint/parser": "^8.46.3",
-		"@vitejs/plugin-vue": "^6.0.1",
-		"@vitejs/plugin-vue-jsx": "^5.1.1",
+		"@typescript-eslint/eslint-plugin": "^8.47.0",
+		"@typescript-eslint/parser": "^8.47.0",
+		"@vitejs/plugin-vue": "^6.0.2",
+		"@vitejs/plugin-vue-jsx": "^5.1.2",
 		"@vue/compiler-sfc": "^3.5.24",
-		"code-inspector-plugin": "^1.2.10",
+		"code-inspector-plugin": "^1.3.0",
 		"eslint": "^9.39.1",
-		"eslint-plugin-vue": "^10.5.1",
+		"eslint-plugin-vue": "^10.6.0",
 		"globals": "^16.5.0",
 		"less": "^4.4.2",
 		"prettier": "^3.6.2",
 		"rollup-plugin-visualizer": "^6.0.5",
-		"sass": "^1.93.3",
+		"sass": "^1.94.2",
 		"terser": "^5.44.1",
 		"typescript": "^5.9.3",
-		"vite": "^7.2.2",
+		"vite": "^7.2.4",
 		"vite-plugin-cdn-import": "^1.0.1",
 		"vite-plugin-compression2": "^2.3.1",
 		"vite-plugin-vue-setup-extend": "^0.4.0",

+ 3 - 0
Web/src/theme/element.scss

@@ -352,6 +352,9 @@
 				padding: 18px !important;
                 max-height: calc(100vh - 37px);
 			}
+            .el-dialog__body:has(+ .el-dialog__footer) {
+                max-height: calc(100vh - 37px - 47px);
+            }
 		}
 	}
 }

+ 3 - 1
Web/src/views/error/401.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="error layout-padding">
+	<div class="error">
 		<div class="layout-padding-auto layout-padding-view">
 			<div class="error-flex">
 				<div class="left">
@@ -36,6 +36,8 @@ const onSetAuth = () => {
 <style scoped lang="scss">
 .error {
 	height: 100%;
+    width: 100%;
+    
 	.error-flex {
 		margin: auto;
 		display: flex;

+ 3 - 1
Web/src/views/error/404.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="error layout-padding">
+	<div class="error">
 		<div class="layout-padding-auto layout-padding-view">
 			<div class="error-flex">
 				<div class="left">
@@ -36,6 +36,8 @@ const onGoHome = () => {
 <style scoped lang="scss">
 .error {
 	height: 100%;
+    width: 100%;
+
 	.error-flex {
 		margin: auto;
 		display: flex;

+ 1 - 2
Web/src/views/home/widgets/components/myapp.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-card shadow="hover" header="快捷入口">
+	<el-card shadow="hover" header="快捷入口" body-style="padding: 0">
 		<template #header>
 			<el-icon style="display: inline; vertical-align: middle"> <ele-Guide /> </el-icon>
 			<span> 快捷入口 </span>
@@ -139,7 +139,6 @@ const beforeClose = async () => {
 <style scoped lang="scss">
 .myMods {
 	list-style: none;
-	margin: -10px;
 }
 .myMods li {
 	display: inline-block;

+ 0 - 1
Web/src/views/system/org/index.vue

@@ -175,7 +175,6 @@ const nodeClick = async (node: any) => {
     state.queryParams.code = undefined;
     state.queryParams.type = undefined;
     state.tenantId = node.tenantId;
-    console.log(node)
     handleQuery();
 };
 </script>

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

@@ -57,7 +57,7 @@
 							<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' }]" 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-input v-model="state.ruleForm.content" v-else type="textarea" :rows="15" show-word-limit clearable />
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" style="user-select: none;">

+ 9 - 2
Web/src/views/system/user/index.vue

@@ -118,7 +118,15 @@
 							</template>
 						</el-table-column>
 					</el-table>
-					<el-pagination v-model:currentPage="state.tableParams.page" @current-change="handleCurrentChange" layout="total, sizes, prev, pager, next, jumper" />
+					<el-pagination size="small" background 
+                        v-model:currentPage="state.tableParams.page" 
+                        v-model:page-size="state.tableParams.pageSize"
+                        :total="state.tableParams.total"
+                        :page-sizes="[10, 20, 50, 100]"
+                        @size-change="handleSizeChange"
+                        @current-change="handleCurrentChange" 
+                        layout="total, sizes, prev, pager, next, jumper" 
+                    />
 				</el-card>
 			</el-splitter-panel>
 		</el-splitter>
@@ -174,7 +182,6 @@ const loadOrgData = async () => {
 	state.loading = true;
 	let res = await getAPI(SysOrgApi).apiSysOrgTreeGet(0);
 	state.orgTreeData = res.data.result ?? [];
-	console.log('🚀 → index.vue:173 → loadOrgData → state.orgTreeData:', state.orgTreeData);
 	state.loading = false;
 };