@nest-omni/core 4.1.3-28 → 4.1.3-29

package/audit/interceptors/audit-action.interceptor.d.ts

@@ -14,6 +14,7 @@ export declare class AuditActionInterceptor implements NestInterceptor {
     private readonly contextService;
     private readonly summaryRepository;
     private readonly descriptionService?;
+    private readonly logger;
     constructor(reflector: Reflector, contextService: AuditContextService, summaryRepository: Repository<AuditActionSummaryEntity>, descriptionService?: OperationDescriptionService);
     intercept(context: ExecutionContext, next: CallHandler): Observable<any>;
     /**

package/audit/interceptors/audit-action.interceptor.js

@@ -20,6 +20,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var AuditActionInterceptor_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuditActionInterceptor = void 0;
 const common_1 = require("@nestjs/common");
@@ -36,12 +37,13 @@ const audit_action_decorator_1 = require("../decorators/audit-action.decorator")
  * 审计动作拦截器
  * 在请求开始时创建审计动作上下文，在请求结束时生成汇总记录
  */
-let AuditActionInterceptor = class AuditActionInterceptor {
+let AuditActionInterceptor = AuditActionInterceptor_1 = class AuditActionInterceptor {
     constructor(reflector, contextService, summaryRepository, descriptionService) {
         this.reflector = reflector;
         this.contextService = contextService;
         this.summaryRepository = summaryRepository;
         this.descriptionService = descriptionService;
+        this.logger = new common_1.Logger(AuditActionInterceptor_1.name);
     }
     intercept(context, next) {
         // 获取装饰器元数据
@@ -125,7 +127,7 @@ let AuditActionInterceptor = class AuditActionInterceptor {
                 yield this.summaryRepository.save(summary);
             }
             catch (err) {
-                console.error('Failed to generate audit action summary:', err);
+                this.logger.error('Failed to generate audit action summary:', err);
             }
             finally {
                 // 清除审计动作上下文
@@ -204,7 +206,7 @@ let AuditActionInterceptor = class AuditActionInterceptor {
     }
 };
 exports.AuditActionInterceptor = AuditActionInterceptor;
-exports.AuditActionInterceptor = AuditActionInterceptor = __decorate([
+exports.AuditActionInterceptor = AuditActionInterceptor = AuditActionInterceptor_1 = __decorate([
     (0, common_1.Injectable)(),
     __param(2, (0, common_1.Inject)((0, typeorm_1.getRepositoryToken)(entities_1.AuditActionSummaryEntity))),
     __param(3, (0, common_1.Optional)()),

package/audit/services/audit-action.service.d.ts

@@ -47,6 +47,7 @@ export interface AuditActionResult {
 export declare class AuditActionService {
     private readonly contextService;
     private readonly auditService;
+    private readonly logger;
     constructor(contextService: AuditContextService, auditService: EntityAuditService);
     /**
      * 在审计动作上下文中执行操作

package/audit/services/audit-action.service.js

@@ -17,6 +17,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var AuditActionService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuditActionService = void 0;
 const common_1 = require("@nestjs/common");
@@ -27,10 +28,11 @@ const enums_1 = require("../enums");
  * 审计动作服务
  * 提供声明式的审计动作管理，自动关联同一业务操作的所有实体变化
  */
-let AuditActionService = class AuditActionService {
+let AuditActionService = AuditActionService_1 = class AuditActionService {
     constructor(contextService, auditService) {
         this.contextService = contextService;
         this.auditService = auditService;
+        this.logger = new common_1.Logger(AuditActionService_1.name);
     }
     /**
      * 在审计动作上下文中执行操作
@@ -148,7 +150,7 @@ let AuditActionService = class AuditActionService {
                 });
             }
             catch (err) {
-                console.error('Failed to record audit action summary:', err);
+                this.logger.error('Failed to record audit action summary:', err);
             }
         });
     }
@@ -237,7 +239,7 @@ let AuditActionService = class AuditActionService {
     }
 };
 exports.AuditActionService = AuditActionService;
-exports.AuditActionService = AuditActionService = __decorate([
+exports.AuditActionService = AuditActionService = AuditActionService_1 = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [audit_context_service_1.AuditContextService,
         entity_audit_service_1.EntityAuditService])

package/audit/services/operation-description.service.d.ts

@@ -12,6 +12,7 @@ export declare class OperationDescriptionService {
     private readonly auditLogRepository;
     private readonly manualOperationRepository;
     private readonly cacheService;
+    private readonly logger;
     private readonly CACHE_NAMESPACE;
     private readonly CACHE_TTL;
     constructor(templateRepository: Repository<OperationTemplateEntity>, transactionRepository: Repository<EntityTransactionEntity>, auditLogRepository: Repository<EntityAuditLogEntity>, manualOperationRepository: Repository<ManualOperationLogEntity>, cacheService: CacheService);

package/audit/services/operation-description.service.js

@@ -20,6 +20,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var OperationDescriptionService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationDescriptionService = void 0;
 const common_1 = require("@nestjs/common");
@@ -31,13 +32,14 @@ const cache_1 = require("../../cache");
  * 操作描述服务
  * 负责根据模板和参数动态生成多语言描述
  */
-let OperationDescriptionService = class OperationDescriptionService {
+let OperationDescriptionService = OperationDescriptionService_1 = class OperationDescriptionService {
     constructor(templateRepository, transactionRepository, auditLogRepository, manualOperationRepository, cacheService) {
         this.templateRepository = templateRepository;
         this.transactionRepository = transactionRepository;
         this.auditLogRepository = auditLogRepository;
         this.manualOperationRepository = manualOperationRepository;
         this.cacheService = cacheService;
+        this.logger = new common_1.Logger(OperationDescriptionService_1.name);
         // 缓存命名空间
         this.CACHE_NAMESPACE = 'audit:template';
         // 缓存TTL（30分钟）
@@ -302,7 +304,7 @@ let OperationDescriptionService = class OperationDescriptionService {
                     };
                 }
                 catch (error) {
-                    console.error(`Failed to get description for transaction ${transaction.id}:`, error);
+                    this.logger.error(`Failed to get description for transaction ${transaction.id}:`, error);
                 }
             }
             return results;
@@ -410,7 +412,7 @@ let OperationDescriptionService = class OperationDescriptionService {
     }
 };
 exports.OperationDescriptionService = OperationDescriptionService;
-exports.OperationDescriptionService = OperationDescriptionService = __decorate([
+exports.OperationDescriptionService = OperationDescriptionService = OperationDescriptionService_1 = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, typeorm_1.InjectRepository)(entities_1.OperationTemplateEntity)),
     __param(1, (0, typeorm_1.InjectRepository)(entities_1.EntityTransactionEntity)),

package/audit/services/transaction-audit.service.d.ts

@@ -12,6 +12,7 @@ export declare class TransactionAuditService {
     private readonly contextService;
     private readonly auditService;
     private readonly multiDbService;
+    private readonly logger;
     constructor(transactionRepository: Repository<EntityTransactionEntity>, contextService: AuditContextService, auditService: EntityAuditService, multiDbService: MultiDatabaseService);
     /**
      * 开始事务

package/audit/services/transaction-audit.service.js

@@ -20,6 +20,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var TransactionAuditService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionAuditService = void 0;
 const common_1 = require("@nestjs/common");
@@ -34,12 +35,13 @@ const transaction_1 = require("@nest-omni/transaction");
 /**
  * 事务审计服务
  */
-let TransactionAuditService = class TransactionAuditService {
+let TransactionAuditService = TransactionAuditService_1 = class TransactionAuditService {
     constructor(transactionRepository, contextService, auditService, multiDbService) {
         this.transactionRepository = transactionRepository;
         this.contextService = contextService;
         this.auditService = auditService;
         this.multiDbService = multiDbService;
+        this.logger = new common_1.Logger(TransactionAuditService_1.name);
     }
     /**
      * 开始事务
@@ -182,7 +184,7 @@ let TransactionAuditService = class TransactionAuditService {
                         yield this.rollbackSingleEntity(manager, entity, connectionName);
                     }
                     catch (error) {
-                        console.error(`Failed to rollback entity ${entity.entityType}:${entity.entityId} in connection ${connectionName}:`, error);
+                        this.logger.error(`Failed to rollback entity ${entity.entityType}:${entity.entityId} in connection ${connectionName}:`, error);
                         throw error;
                     }
                 }
@@ -223,7 +225,7 @@ let TransactionAuditService = class TransactionAuditService {
                     }
                     break;
                 default:
-                    console.warn(`Unknown operation type: ${entity.operation}`);
+                    this.logger.warn(`Unknown operation type: ${entity.operation}`);
             }
         });
     }
@@ -239,7 +241,7 @@ let TransactionAuditService = class TransactionAuditService {
     }
 };
 exports.TransactionAuditService = TransactionAuditService;
-exports.TransactionAuditService = TransactionAuditService = __decorate([
+exports.TransactionAuditService = TransactionAuditService = TransactionAuditService_1 = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, typeorm_1.InjectRepository)(entities_1.EntityTransactionEntity)),
     __metadata("design:paramtypes", [typeorm_2.Repository,

package/common/helpers/validation-metadata-helper.d.ts

@@ -6,6 +6,8 @@ import type { Constructor } from '../types';
 export interface ValidationMetadata {
     /** 字段名称 */
     fieldName?: string;
+    /** i18n 翻译键 */
+    i18nKey?: string;
     /** 字段标签（多语言）- 使用 fieldLabel 避免命名冲突 */
     label?: string | {
         zh?: string;
@@ -21,6 +23,59 @@ export interface ValidationMetadata {
     /** 是否为数组 */
     each?: boolean;
 }
+/**
+ * i18n 翻译函数类型
+ */
+type I18nTranslateFunction = (key: string, options?: any) => string | Promise<string>;
+/**
+ * 设置全局 i18n 翻译函数
+ *
+ * @example
+ * // 在 app.module.ts 或 main.ts 中设置
+ * import { setI18nTranslate } from './common/helpers/validation-metadata-helper';
+ * import { I18nService } from 'nestjs-i18n';
+ *
+ * setI18nTranslate((key, options) => i18nService.translate(key, options));
+ */
+export declare function setI18nTranslate(fn: I18nTranslateFunction): void;
+/**
+ * 获取全局 i18n 翻译函数
+ */
+export declare function getI18nTranslate(): I18nTranslateFunction | null;
+/**
+ * 解析字段标签
+ * 支持以下格式：
+ * 1. i18n key 字符串: "user.username"
+ * 2. 多语言对象: { zh: '用户名', en: 'Username' }
+ * 3. 普通字符串: "Username"
+ *
+ * @param label - 字段标签
+ * @param i18nKey - i18n 翻译键（优先使用）
+ * @param lang - 语言代码 (zh, en, 等)
+ * @returns 解析后的标签文本
+ */
+export declare function resolveFieldLabel(label: string | {
+    zh?: string;
+    en?: string;
+    [lang: string]: string | undefined;
+} | undefined, i18nKey?: string, lang?: string): string | {
+    zh?: string;
+    en?: string;
+    [lang: string]: string | undefined;
+};
+/**
+ * 翻译字段标签
+ * 将 i18n key 或多语言对象解析为最终文本
+ *
+ * @param labelOrKey - 标签、i18n key 或多语言对象
+ * @param lang - 语言代码
+ * @returns 翻译后的文本
+ */
+export declare function translateFieldLabel(labelOrKey: string | {
+    zh?: string;
+    en?: string;
+    [lang: string]: string | undefined;
+}, lang?: string): Promise<string>;
 /**
  * 存储验证元数据到装饰器
  *
@@ -47,9 +102,11 @@ export declare function getAllValidationMetadata(target: Constructor<any>): Reco
 /**
  * 获取字段的友好标签
  * 根据语言环境返回对应的标签
+ * 支持优先级：fieldLabel > i18nKey > fieldName
  *
  * @param metadata - 验证元数据
  * @param lang - 语言 (zh, en, 等)
  * @returns 字段标签
  */
 export declare function getFieldLabelForValidation(metadata: ValidationMetadata, lang?: string): string;
+export {};

package/common/helpers/validation-metadata-helper.js

@@ -1,9 +1,106 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.setI18nTranslate = setI18nTranslate;
+exports.getI18nTranslate = getI18nTranslate;
+exports.resolveFieldLabel = resolveFieldLabel;
+exports.translateFieldLabel = translateFieldLabel;
 exports.setValidationMetadata = setValidationMetadata;
 exports.getValidationMetadata = getValidationMetadata;
 exports.getAllValidationMetadata = getAllValidationMetadata;
 exports.getFieldLabelForValidation = getFieldLabelForValidation;
+/**
+ * 全局 i18n 翻译函数（由应用设置）
+ */
+let globalI18nTranslate = null;
+/**
+ * 设置全局 i18n 翻译函数
+ *
+ * @example
+ * // 在 app.module.ts 或 main.ts 中设置
+ * import { setI18nTranslate } from './common/helpers/validation-metadata-helper';
+ * import { I18nService } from 'nestjs-i18n';
+ *
+ * setI18nTranslate((key, options) => i18nService.translate(key, options));
+ */
+function setI18nTranslate(fn) {
+    globalI18nTranslate = fn;
+}
+/**
+ * 获取全局 i18n 翻译函数
+ */
+function getI18nTranslate() {
+    return globalI18nTranslate;
+}
+/**
+ * 解析字段标签
+ * 支持以下格式：
+ * 1. i18n key 字符串: "user.username"
+ * 2. 多语言对象: { zh: '用户名', en: 'Username' }
+ * 3. 普通字符串: "Username"
+ *
+ * @param label - 字段标签
+ * @param i18nKey - i18n 翻译键（优先使用）
+ * @param lang - 语言代码 (zh, en, 等)
+ * @returns 解析后的标签文本
+ */
+function resolveFieldLabel(label, i18nKey, lang = 'zh') {
+    // 如果有 i18n key，返回 i18n key 对象（延迟解析）
+    if (i18nKey) {
+        return i18nKey;
+    }
+    // 如果有直接提供的 label
+    if (label) {
+        return label;
+    }
+    // 默认返回空字符串
+    return '';
+}
+/**
+ * 翻译字段标签
+ * 将 i18n key 或多语言对象解析为最终文本
+ *
+ * @param labelOrKey - 标签、i18n key 或多语言对象
+ * @param lang - 语言代码
+ * @returns 翻译后的文本
+ */
+function translateFieldLabel(labelOrKey_1) {
+    return __awaiter(this, arguments, void 0, function* (labelOrKey, lang = 'zh') {
+        // 如果是普通字符串，直接返回
+        if (typeof labelOrKey === 'string') {
+            // 尝试作为 i18n key 翻译
+            if (globalI18nTranslate && labelOrKey.includes('.')) {
+                try {
+                    const translated = yield globalI18nTranslate(labelOrKey, { lang });
+                    if (translated && translated !== labelOrKey) {
+                        return translated;
+                    }
+                }
+                catch (_a) {
+                    // 翻译失败，返回原始 key
+                }
+            }
+            return labelOrKey;
+        }
+        // 如果是多语言对象，返回对应语言的文本
+        if (typeof labelOrKey === 'object' && labelOrKey !== null) {
+            return (labelOrKey[lang] ||
+                labelOrKey.zh ||
+                labelOrKey.en ||
+                Object.values(labelOrKey).find((v) => v) ||
+                '');
+        }
+        return '';
+    });
+}
 /**
  * 验证元数据存储键
  */
@@ -44,17 +141,24 @@ function getAllValidationMetadata(target) {
 /**
  * 获取字段的友好标签
  * 根据语言环境返回对应的标签
+ * 支持优先级：fieldLabel > i18nKey > fieldName
  *
  * @param metadata - 验证元数据
  * @param lang - 语言 (zh, en, 等)
  * @returns 字段标签
  */
 function getFieldLabelForValidation(metadata, lang = 'zh') {
-    if (!metadata.label) {
-        return metadata.fieldName || '';
+    // 如果有 fieldLabel，直接使用
+    if (metadata.label) {
+        if (typeof metadata.label === 'string') {
+            return metadata.label;
+        }
+        return metadata.label[lang] || metadata.label.zh || metadata.label.en || '';
     }
-    if (typeof metadata.label === 'string') {
-        return metadata.label;
+    // 如果有 i18nKey，返回 i18nKey（会在运行时翻译）
+    if (metadata.i18nKey) {
+        return metadata.i18nKey;
     }
-    return metadata.label[lang] || metadata.label.zh || metadata.label.en || metadata.fieldName || '';
+    // 默认返回字段名
+    return metadata.fieldName || '';
 }