Prechádzať zdrojové kódy

😎1、代码整理 2、升级依赖

zuohuaijun 1 rok pred
rodič
commit
91301378ba

+ 2 - 2
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -17,7 +17,7 @@
     <PackageReference Include="AngleSharp" Version="1.1.2" />
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
-    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.14.7" />
+    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.14.8" />
     <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.4.11" />
     <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.4.11" />
     <PackageReference Include="Furion.Pure" Version="4.9.4.11" />
@@ -38,7 +38,7 @@
     <PackageReference Include="SqlSugarCore" Version="5.1.4.166" />
     <PackageReference Include="SSH.NET" Version="2024.1.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.4" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1059" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1060" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>

+ 5 - 5
Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2024.08.01",
+	"lastBuildTime": "2024.08.02",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -25,7 +25,7 @@
 		"@wangeditor/editor-for-vue": "^5.1.12",
 		"animate.css": "^4.1.1",
 		"async-validator": "^4.2.5",
-		"axios": "^1.7.2",
+		"axios": "^1.7.3",
 		"countup.js": "^2.8.0",
 		"cropperjs": "^1.6.2",
 		"echarts": "^5.5.1",
@@ -46,7 +46,7 @@
 		"print-js": "^1.6.0",
 		"push.js": "^1.0.12",
 		"qrcodejs2-fixes": "^0.0.2",
-		"qs": "^6.12.3",
+		"qs": "^6.13.0",
 		"relation-graph": "^2.2.3",
 		"screenfull": "^6.0.2",
 		"sm-crypto-v2": "^1.9.1",
@@ -61,7 +61,7 @@
 		"vue-i18n": "^9.13.1",
 		"vue-json-pretty": "^2.4.0",
 		"vue-plugin-hiprint": "0.0.57-beta20",
-		"vue-router": "^4.4.1",
+		"vue-router": "^4.4.2",
 		"vue-signature-pad": "^3.0.2",
 		"vue3-tree-org": "^4.2.2",
 		"vuedraggable": "4.1.0",
@@ -75,7 +75,7 @@
 		"@types/sortablejs": "^1.15.8",
 		"@typescript-eslint/eslint-plugin": "^7.18.0",
 		"@typescript-eslint/parser": "^7.18.0",
-		"@vitejs/plugin-vue": "^5.1.1",
+		"@vitejs/plugin-vue": "^5.1.2",
 		"@vitejs/plugin-vue-jsx": "^4.0.0",
 		"@vue/compiler-sfc": "^3.4.35",
 		"code-inspector-plugin": "^0.15.2",

+ 5 - 6
Web/src/theme/media/form.scss

@@ -29,15 +29,14 @@
 		overflow: auto;
 	}
 	// 在小屏幕中,取消表单左边距
-	.el-form-item__label-wrap{
+	.el-form-item__label-wrap {
 		margin-left: 0px !important;
 	}
 	// 列表页查询表单内的输入框宽度适配
-    .el-form--inline .el-form-item .el-select,
-    .el-form--inline .el-form-item .el-input
-    {
-        width: 100% !important;
-    }
+	.el-form--inline .el-form-item .el-select,
+	.el-form--inline .el-form-item .el-input {
+		width: 100% !important;
+	}
 	.el-form--inline .el-form-item:has(.el-form-item__label) {
 		margin-right: 0;
 	}

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

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-cache-container">
-		<splitpanes horizontal >
+		<splitpanes horizontal>
 			<pane size="5">
 				<NoticeBar text="系统缓存数据管理,请慎重操作!" leftIcon="iconfont icon-tongzhi2" background="var(--el-color-primary-light-9)" color="var(--el-color-primary)" />
 			</pane>

+ 7 - 7
Web/src/views/system/user/index.vue

@@ -1,11 +1,11 @@
 <template>
 	<div class="sys-user-container">
 		<splitpanes>
-  <pane size="16">
-    <OrgTree ref="orgTreeRef" @node-click="nodeClick" />
-  </pane>
-  <pane size="94">
-    <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
+			<pane size="16">
+				<OrgTree ref="orgTreeRef" @node-click="nodeClick" />
+			</pane>
+			<pane size="94">
+				<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 					<el-form :model="state.queryParams" ref="queryForm" :inline="true">
 						<el-form-item label="账号">
 							<el-input v-model="state.queryParams.account" placeholder="账号" clearable />
@@ -105,8 +105,8 @@
 						layout="total, sizes, prev, pager, next, jumper"
 					/>
 				</el-card>
-  </pane>
-</splitpanes>
+			</pane>
+		</splitpanes>
 
 		<EditUser ref="editUserRef" :title="state.editUserTitle" :orgData="state.orgTreeData" @handleQuery="handleQuery" />
 	</div>