@ruiapp/rapid-core 0.11.8 → 0.12.0

package/dist/index.js

@@ -1798,6 +1798,21 @@ var bootstrapApplicationConfig = {
                     required: true,
                     defaultValue: "false",
                 },
+                {
+                    name: "enableEventLog",
+                    code: "enableEventLog",
+                    columnName: "enable_event_log",
+                    type: "boolean",
+                    required: true,
+                    defaultValue: "false",
+                },
+                {
+                    name: "eventTypePolicy",
+                    code: "eventTypePolicy",
+                    columnName: "event_type_policy",
+                    type: "json",
+                    required: false,
+                },
                 {
                     name: "defaultOrderBy",
                     code: "defaultOrderBy",
@@ -4497,8 +4512,12 @@ class EntityManager {
                 singularCode: model.base,
             });
         }
+        let entityFilters = options.filters;
+        if (!options.includingSoftDeleted) {
+            entityFilters = tryAddUndeletedEntityFilter(model, baseModel, entityFilters);
+        }
         const countRowOptions = {
-            filters: await convertEntityFiltersToRowFilters(routeContext, this.#server, model, baseModel, options.filters),
+            filters: await convertEntityFiltersToRowFilters(routeContext, this.#server, model, baseModel, entityFilters),
         };
         return await this.#dataAccessor.count(countRowOptions, routeContext?.getDbTransactionClient());
     }

package/dist/types.d.ts

@@ -228,6 +228,14 @@ export interface RpdDataModel {
      * 是否使用软删除
      */
     softDelete?: boolean;
+    /**
+     * 是否启用事件日志
+     */
+    enableEventLog?: boolean;
+    /**
+     * 事件类型策略
+     */
+    eventTypePolicy?: RapidEntityEventTypePolicy;
     /**
      * 多语言配置
      */
@@ -255,6 +263,29 @@ export interface PermissionPolicy {
     any?: string[];
     all?: string[];
 }
+export interface RapidEntityEventTypePolicy {
+    /**
+     * 区分事件类型属性code
+     */
+    propertyCode?: string;
+    /**
+     * 属性值事件类型
+     */
+    eventTypes?: {
+        /**
+         * 属性值
+         */
+        propertyValue: string;
+        /**
+         * 事件code前缀 默认取 propertyValue 的值
+         */
+        eventTypeCodePrefix?: string;
+        /**
+         * 属性值名称 区分定义事件类型名称
+         */
+        name: string;
+    }[];
+}
 export interface RpdDataModelProperty {
     /**
      * 表示此属性由谁来维护
@@ -604,6 +635,7 @@ export interface FindEntityOrderByOptions {
 export interface CountEntityOptions {
     routeContext?: RouteContext;
     filters?: EntityFilterOptions[];
+    includingSoftDeleted?: boolean;
 }
 export interface CountEntityResult {
     count: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.11.8",
+  "version": "0.12.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/bootstrapApplicationConfig.ts

@@ -153,6 +153,21 @@ export default {
           required: true,
           defaultValue: "false",
         },
+        {
+          name: "enableEventLog",
+          code: "enableEventLog",
+          columnName: "enable_event_log",
+          type: "boolean",
+          required: true,
+          defaultValue: "false",
+        },
+        {
+          name: "eventTypePolicy",
+          code: "eventTypePolicy",
+          columnName: "event_type_policy",
+          type: "json",
+          required: false,
+        },
         {
           name: "defaultOrderBy",
           code: "defaultOrderBy",

package/src/dataAccess/entityManager.ts

@@ -1892,8 +1892,12 @@ export default class EntityManager<TEntity = any> {
         singularCode: model.base,
       });
     }
+    let entityFilters = options.filters;
+    if (!options.includingSoftDeleted) {
+      entityFilters = tryAddUndeletedEntityFilter(model, baseModel, entityFilters);
+    }
     const countRowOptions: CountRowOptions = {
-      filters: await convertEntityFiltersToRowFilters(routeContext, this.#server, model, baseModel, options.filters),
+      filters: await convertEntityFiltersToRowFilters(routeContext, this.#server, model, baseModel, entityFilters),
     };
     return await this.#dataAccessor.count(countRowOptions, routeContext?.getDbTransactionClient());
   }

package/src/types.ts

@@ -265,6 +265,16 @@ export interface RpdDataModel {
    */
   softDelete?: boolean;
 
+  /**
+   * 是否启用事件日志
+   */
+  enableEventLog?: boolean;
+
+  /**
+   * 事件类型策略
+   */
+  eventTypePolicy?: RapidEntityEventTypePolicy;
+
   /**
    * 多语言配置
    */
@@ -297,6 +307,30 @@ export interface PermissionPolicy {
   all?: string[];
 }
 
+export interface RapidEntityEventTypePolicy {
+  /**
+   * 区分事件类型属性code
+   */
+  propertyCode?: string;
+  /**
+   * 属性值事件类型
+   */
+  eventTypes?: {
+    /**
+     * 属性值
+     */
+    propertyValue: string;
+    /**
+     * 事件code前缀 默认取 propertyValue 的值
+     */
+    eventTypeCodePrefix?: string;
+    /**
+     * 属性值名称 区分定义事件类型名称
+     */
+    name: string;
+  }[];
+}
+
 export interface RpdDataModelProperty {
   /**
    * 表示此属性由谁来维护
@@ -772,6 +806,7 @@ export interface FindEntityOrderByOptions {
 export interface CountEntityOptions {
   routeContext?: RouteContext;
   filters?: EntityFilterOptions[];
+  includingSoftDeleted?: boolean;
 }
 
 export interface CountEntityResult {