zuohuaijun 2 лет назад
Родитель
Сommit
244f20c331

+ 5 - 5
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.14.6" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.4.5" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.4.5" />
-    <PackageReference Include="Furion.Pure" Version="4.9.4.5" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.4.6" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.4.6" />
+    <PackageReference Include="Furion.Pure" Version="4.9.4.6" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="IPTools.International" Version="1.6.0" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.1" />
@@ -34,10 +34,10 @@
     <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.2" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.4.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.6.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.162" />
+    <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.3" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1047" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1048" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>

+ 2 - 2
Web/src/stores/userInfo.ts

@@ -181,7 +181,7 @@ export const useUserInfo = defineStore('userInfo', {
 			if (ds) {
 				return ds;
 			}
-		
+
 			const dictList = this.dictList[dictTypeCode];
 			if (dictList) {
 				ds = dictList.map((element: { code: any }) => {
@@ -189,7 +189,7 @@ export const useUserInfo = defineStore('userInfo', {
 				});
 				this.dictListInt[dictTypeCode] = ds;
 			}
-		
+
 			return ds;
 		},
 	},

+ 11 - 11
Web/src/views/home/widgets/components/index.ts

@@ -12,20 +12,20 @@ const requireComponent = import.meta.glob('./*.vue', { eager: true });
 // console.log(requireComponent);
 
 Object.keys(requireComponent).forEach((fileName: string) => {
-  // 处理文件名,去掉开头的 './' 和结尾的文件扩展名
-  const componentName = fileName.replace(/^\.\/(.*)\.\w+$/, '$1');
+	// 处理文件名,去掉开头的 './' 和结尾的文件扩展名
+	const componentName = fileName.replace(/^\.\/(.*)\.\w+$/, '$1');
 
-  // 如果组件名称在排除数组中,跳过导入
-  if (excludeComponents.includes(componentName)) {
-    return;
-  }
+	// 如果组件名称在排除数组中,跳过导入
+	if (excludeComponents.includes(componentName)) {
+		return;
+	}
 
-  // 确保模块导出存在并且是默认导出
-  const componentModule = requireComponent[fileName] as { default: Component };
+	// 确保模块导出存在并且是默认导出
+	const componentModule = requireComponent[fileName] as { default: Component };
 
-  // 将组件添加到 resultComps 中,使用处理后的文件名作为键
-  resultComps[componentName] = componentModule.default;
+	// 将组件添加到 resultComps 中,使用处理后的文件名作为键
+	resultComps[componentName] = componentModule.default;
 });
 
 // 标记 resultComps 为原始对象,避免其被设为响应式
-export default markRaw(resultComps);
+export default markRaw(resultComps);