Kaynağa Gözat

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

zuohuaijun 1 yıl önce
ebeveyn
işleme
816523e817

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

@@ -18,9 +18,9 @@
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.15.6" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.5.8" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.5.8" />
-    <PackageReference Include="Furion.Pure" Version="4.9.5.8" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.5.10" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.5.10" />
+    <PackageReference Include="Furion.Pure" Version="4.9.5.10" />
     <PackageReference Include="Hashids.net" Version="1.7.0" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="IPTools.International" Version="1.6.0" />
@@ -39,7 +39,7 @@
     <PackageReference Include="SqlSugarCore" Version="5.1.4.169" />
     <PackageReference Include="SSH.NET" Version="2024.1.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.5" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1088" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1090" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>

+ 4 - 4
Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2024.09.17",
+	"lastBuildTime": "2024.09.19",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -76,7 +76,7 @@
 		"@types/sortablejs": "^1.15.8",
 		"@typescript-eslint/eslint-plugin": "^8.6.0",
 		"@typescript-eslint/parser": "^8.6.0",
-		"@vitejs/plugin-vue": "^5.1.3",
+		"@vitejs/plugin-vue": "^5.1.4",
 		"@vitejs/plugin-vue-jsx": "^4.0.1",
 		"@vue/compiler-sfc": "^3.5.6",
 		"code-inspector-plugin": "^0.16.1",
@@ -86,8 +86,8 @@
 		"less": "^4.2.0",
 		"prettier": "^3.3.3",
 		"rollup-plugin-visualizer": "^5.12.0",
-		"sass": "^1.78.0",
-		"terser": "^5.32.0",
+		"sass": "^1.79.1",
+		"terser": "^5.33.0",
 		"typescript": "^5.6.2",
 		"vite": "^5.4.6",
 		"vite-plugin-cdn-import": "^1.0.1",

+ 1 - 1
Web/src/views/system/codeGen/component/editCodeGenDialog.vue

@@ -173,7 +173,7 @@ const state = reactive({
 	printTypeList: [] as any,
 	printList: [] as Array<SysPrint>,
 });
-//级联选择器配置选项
+// 级联选择器配置选项
 const cascaderProps = { checkStrictly: true, emitPath: false, value: 'id', label: 'title' };
 
 onMounted(async () => {

+ 1 - 1
Web/src/views/system/menu/component/editMenu.vue

@@ -158,7 +158,7 @@ const state = reactive({
 	isShowDialog: false,
 	ruleForm: {} as UpdateMenuInput,
 });
-//级联选择器配置选项
+// 级联选择器配置选项
 const cascaderProps = { checkStrictly: true, emitPath: false, value: 'id', label: 'title' };
 
 // 获取全局组件大小

+ 1 - 1
Web/src/views/system/org/component/editOrg.vue

@@ -89,7 +89,7 @@ const state = reactive({
 	ruleForm: {} as UpdateOrgInput,
 	orgTypeList: [] as any,
 });
-//级联选择器配置选项
+// 级联选择器配置选项
 const cascaderProps = { checkStrictly: true, emitPath: false, value: 'id', label: 'name' };
 
 onMounted(async () => {

+ 1 - 1
Web/src/views/system/region/component/editRegion.vue

@@ -84,7 +84,7 @@ const state = reactive({
 	isShowDialog: false,
 	ruleForm: {} as UpdateRegionInput,
 });
-//级联选择器配置选项
+// 级联选择器配置选项
 //const cascaderProps = { checkStrictly: true, emitPath: false, value: 'id', label: 'name' };
 
 // 打开弹窗

+ 3 - 3
Web/src/views/system/user/component/editUser.vue

@@ -159,8 +159,8 @@
 									<el-radio-group v-model="state.ruleForm.sex">
 										<el-radio :value="1">男</el-radio>
 										<el-radio :value="2">女</el-radio>
-										<el-radio :value="0">未知的性别</el-radio>
-										<el-radio :value="9">未说明的性别</el-radio>
+										<el-radio :value="0">未知</el-radio>
+										<el-radio :value="9">未说明</el-radio>
 									</el-radio-group>
 								</el-form-item>
 							</el-col>
@@ -271,7 +271,7 @@ const state = reactive({
 	posData: [] as Array<SysPos>, // 职位数据
 	roleData: [] as Array<RoleOutput>, // 角色数据
 });
-//级联选择器配置选项
+// 级联选择器配置选项
 const cascaderProps = { checkStrictly: true, emitPath: false, value: 'id', label: 'name', expandTrigger: 'hover' };
 
 onMounted(async () => {

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

@@ -52,8 +52,8 @@
 							<template #default="scope">
 								<el-tag v-if="scope.row.sex === 1" type="success">男</el-tag>
 								<el-tag v-else-if="scope.row.sex === 2" type="danger">女</el-tag>
-								<el-tag v-else-if="scope.row.sex === 0" type="info">未知的性别</el-tag>
-								<el-tag v-else-if="scope.row.sex === 9" type="info">未说明的性别</el-tag>
+								<el-tag v-else-if="scope.row.sex === 0" type="info">未知</el-tag>
+								<el-tag v-else-if="scope.row.sex === 9" type="info">未说明</el-tag>
 							</template>
 						</el-table-column> -->
 						<el-table-column label="账号类型" width="110" align="center" show-overflow-tooltip>