优化本地化参数类型

apps/vue/src/hooks/abp/useLocalization.ts

@@ -4,7 +4,7 @@ import { useAbpStoreWithOut } from '/@/store/modules/abp';
 import { format } from '/@/utils/strings';
 
 interface IStringLocalizer {
-  L(key: string, ...args: any[]): string;
+  L(key: string, args?: Recordable | any[] | undefined): string;
 }
 
 export function useLocalization(resourceName: string, ...mergeResources: string[]) {
@@ -18,7 +18,7 @@ export function useLocalization(resourceName: string, ...mergeResources: string[
     return resource;
   });
 
-  function L(key: string, ...args: any[]) {
+  function L(key: string, args?: Recordable | any[] | undefined) {
     if (!key) return '';
     if (!getResource.value) return key;
     if (!Reflect.has(getResource.value, key)) return key;

apps/vue/src/layouts/default/header/components/notify/useNotifications.ts

@@ -1,5 +1,5 @@
 import { onMounted, onUnmounted, ref } from 'vue';
-import { useI18n } from '/@/hooks/web/useI18n';
+import { notification } from 'ant-design-vue';
 import { getList } from '/@/api/messages/notifications';
 import {
   NotificationInfo,
@@ -11,6 +11,7 @@ import { TabItem, ListItem } from './data';
 import { formatPagedRequest } from '/@/utils/http/abp/helper';
 import { NotifyEventEnum } from '/@/enums/imEnum';
 import { useSignalR } from '/@/hooks/web/useSignalR';
+import { useLocalization } from '/@/hooks/abp/useLocalization';
 import errorAvatar from '/@/assets/icons/64x64/color-error.png';
 import warningAvatar from '/@/assets/icons/64x64/color-warning.png';
 import infoAvatar from '/@/assets/icons/64x64/color-info.png';
@@ -19,7 +20,6 @@ import successAvatar from '/@/assets/icons/64x64/color-success.png';
 import emitter from '/@/utils/eventBus';
 
 export function useNotifications() {
-  const { t } = useI18n();
   const notifierRef = ref<TabItem>({
     key: '1',
     name: '通知',
@@ -31,7 +31,7 @@ export function useNotifications() {
 
   onMounted(() => {
     emitter.on(NotifyEventEnum.NOTIFICATIONS_READ, readNotifer);
-    signalR.on('get-notification', onNotifyReceived);
+    signalR.on('get-notification', (data) => onNotifyReceived(data, true));
     signalR.onStart(refreshNotifer);
     signalR.start();
   });
@@ -41,26 +41,28 @@ export function useNotifications() {
     signalR.stop();
   });
 
-  function onNotifyReceived(notificationInfo: NotificationInfo) {
+  function onNotifyReceived(notificationInfo: NotificationInfo, notifer?: boolean) {
     const { data } = notificationInfo;
     if (!data.extraProperties) {
       return;
     }
     if (data.extraProperties.L === true) {
-      data.extraProperties.title = t(
+      const { L } = useLocalization(
-        data.extraProperties.title.ResourceName + '.' + data.extraProperties.title.Name,
+        data.extraProperties.title.ResourceName,
-        data.extraProperties.message.Values as Recordable,
+        data.extraProperties.message.ResourceName,
+        data.extraProperties.description?.ResourceName ?? "AbpUi");
+      data.extraProperties.title = L(
+        data.extraProperties.title.Name,
+        data.extraProperties.title.Values,
       );
-      data.extraProperties.message = t(
+      data.extraProperties.message = L(
-        data.extraProperties.message.ResourceName + '.' + data.extraProperties.message.Name,
+        data.extraProperties.message.Name,
-        data.extraProperties.message.Values as Recordable,
+        data.extraProperties.message.Values,
       );
       if (data.extraProperties.description) {
-        data.extraProperties.description = t(
+        data.extraProperties.description = L(
-          data.extraProperties.description.ResourceName +
+          data.extraProperties.description.Name,
-            '.' +
+          data.extraProperties.description.Values,
-            data.extraProperties.description.Name,
-          data.extraProperties.message.Values as Recordable,
         );
       }
     }
@@ -78,18 +80,42 @@ export function useNotifications() {
       case NotificationSeverity.Fatal:
         notifier.color = 'red';
         notifier.avatar = errorAvatar;
+        if (notifer) {
+          notification['error']({
+            message: notifier.title,
+            description: notifier.description,
+          });
+        }
         break;
       case NotificationSeverity.Warn:
         notifier.color = 'gold';
         notifier.avatar = warningAvatar;
+        if (notifer) {
+          notification['warning']({
+            message: notifier.title,
+            description: notifier.description,
+          });
+        }
         break;
       case NotificationSeverity.Info:
         notifier.color = 'gold';
         notifier.avatar = infoAvatar;
+        if (notifer) {
+          notification['info']({
+            message: notifier.title,
+            description: notifier.description,
+          });
+        }
         break;
       case NotificationSeverity.Success:
         notifier.color = 'green';
         notifier.avatar = successAvatar;
+        if (notifer) {
+          notification['success']({
+            message: notifier.title,
+            description: notifier.description,
+          });
+        }
         break;
     }
     emitter.emit(NotifyEventEnum.NOTIFICATIONS_RECEVIED, notificationInfo);

aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN/Abp/Notifications/AbpNotificationModule.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.BackgroundWorkers;
 using Volo.Abp.Json;
+using Volo.Abp.Json.SystemTextJson;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.VirtualFileSystem;
@@ -41,6 +42,11 @@ namespace LINGYUN.Abp.Notifications
                     .Add<NotificationsResource>("en")
                     .AddVirtualJson("/LINGYUN/Abp/Notifications/Localization/Resources");
             });
+
+            Configure<AbpSystemTextJsonSerializerOptions>(options =>
+            {
+                options.UnsupportedTypes.Add<NotificationInfo>();
+            });
         }
 
         private void AutoAddDefinitionProviders(IServiceCollection services)