@ruiapp/rapid-core 0.10.0 → 0.10.2

package/dist/helpers/entityHelper.d.ts

@@ -1,3 +1,3 @@
 import { IRpdServer } from "../core/server";
-import { RpdDataModel } from "../types";
-export declare function detectChangedFieldsOfEntity(server: IRpdServer, model: RpdDataModel, before: any, after: any): Record<string, any> | null;
+import { RpdDataModel, UpdateEntityByIdOptions } from "../types";
+export declare function detectChangedFieldsOfEntity(server: IRpdServer, model: RpdDataModel, before: any, after: any, relationPropertiesToUpdate: UpdateEntityByIdOptions["relationPropertiesToUpdate"]): Record<string, any> | null;

package/dist/index.d.ts

@@ -7,6 +7,7 @@ export * from "./core/routeContext";
 export * from "./core/server";
 export * from "./core/http-types";
 export * from "./core/actionHandler";
+export { default as EventManager } from "./core/eventManager";
 export { default as DataAccessor } from "./dataAccess/dataAccessor";
 export * from "./dataAccess/dataAccessor";
 export { default as EntityManager } from "./dataAccess/entityManager";

package/dist/index.js

@@ -1385,6 +1385,13 @@ var bootstrapApplicationConfig = {
                     required: true,
                     defaultValue: "false",
                 },
+                {
+                    name: "defaultOrderBy",
+                    code: "defaultOrderBy",
+                    columnName: "default_order_by",
+                    type: "json",
+                    required: false,
+                },
             ],
             indexes: [
                 {
@@ -2354,7 +2361,7 @@ function mapPropertyNameToColumnName(server, model, propertyName) {
     return property.columnName || property.code;
 }
 
-function detectChangedFieldsOfEntity(server, model, before, after) {
+function detectChangedFieldsOfEntity(server, model, before, after, relationPropertiesToUpdate) {
     if (!before) {
         throw new Error("Argument 'before' can not be null.");
     }
@@ -2369,6 +2376,11 @@ function detectChangedFieldsOfEntity(server, model, before, after) {
             const afterValue = after[key];
             const beforeValue = before[key] || before[property.targetIdColumnName];
             if (afterValue) {
+                if (relationPropertiesToUpdate && relationPropertiesToUpdate[property.code]) {
+                    changed = true;
+                    changes[key] = afterValue;
+                    continue;
+                }
                 if (lodash.isNumber(afterValue)) {
                     if (beforeValue) {
                         if (lodash.isNumber(beforeValue)) {
@@ -3359,7 +3371,7 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
     if (!entity) {
         throw new Error(`${model.namespace}.${model.singularCode}  with id "${id}" was not found.`);
     }
-    let changes = detectChangedFieldsOfEntity(server, model, entity, entityToSave);
+    let changes = detectChangedFieldsOfEntity(server, model, entity, entityToSave, options.relationPropertiesToUpdate);
     if (!changes && !options.operation) {
         return entity;
     }
@@ -3389,7 +3401,7 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
         sender: plugin,
         routeContext: options.routeContext,
     });
-    changes = detectChangedFieldsOfEntity(server, model, entity, entityToSave);
+    changes = detectChangedFieldsOfEntity(server, model, entity, entityToSave, options.relationPropertiesToUpdate);
     // check readonly properties
     Object.keys(changes).forEach((propertyName) => {
         let isReadonlyProperty = false;
@@ -9909,6 +9921,7 @@ exports.DataAccessor = DataAccessor;
 exports.DataManagePlugin = DataManager;
 exports.EntityAccessControlPlugin = EntityAccessControlPlugin;
 exports.EntityManager = EntityManager;
+exports.EventManager = EventManager;
 exports.FileManagePlugin = FileManager;
 exports.GlobalRequest = GlobalRequest;
 exports.LicensePlugin = LicensePlugin;

package/dist/types.d.ts

@@ -211,6 +211,10 @@ export interface RpdDataModel {
      * Configure the property code used to display the entity.
      */
     displayPropertyCode?: string;
+    /**
+     * 默认排序方式
+     */
+    defaultOrderBy?: FindEntityOrderByOptions[];
     properties: RpdDataModelProperty[];
     indexes?: RpdDataModelIndex[];
     extensions?: RpdDataModelExtension[];

package/package.json

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

package/src/bootstrapApplicationConfig.ts

@@ -153,6 +153,13 @@ export default {
           required: true,
           defaultValue: "false",
         },
+        {
+          name: "defaultOrderBy",
+          code: "defaultOrderBy",
+          columnName: "default_order_by",
+          type: "json",
+          required: false,
+        },
       ],
       indexes: [
         {

package/src/dataAccess/entityManager.ts

@@ -1066,7 +1066,7 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
     throw new Error(`${model.namespace}.${model.singularCode}  with id "${id}" was not found.`);
   }
 
-  let changes = detectChangedFieldsOfEntity(server, model, entity, entityToSave);
+  let changes = detectChangedFieldsOfEntity(server, model, entity, entityToSave, options.relationPropertiesToUpdate);
   if (!changes && !options.operation) {
     return entity;
   }
@@ -1101,7 +1101,7 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
     routeContext: options.routeContext,
   });
 
-  changes = detectChangedFieldsOfEntity(server, model, entity, entityToSave);
+  changes = detectChangedFieldsOfEntity(server, model, entity, entityToSave, options.relationPropertiesToUpdate);
 
   // check readonly properties
   Object.keys(changes).forEach((propertyName) => {

package/src/helpers/entityHelper.ts

@@ -1,9 +1,15 @@
 import { isNumber, isObject } from "lodash";
 import { IRpdServer } from "~/core/server";
 import { getEntityPropertyByCode, isOneRelationProperty } from "~/helpers/metaHelper";
-import { RpdDataModel } from "~/types";
+import { RpdDataModel, UpdateEntityByIdOptions } from "~/types";
 
-export function detectChangedFieldsOfEntity(server: IRpdServer, model: RpdDataModel, before: any, after: any): Record<string, any> | null {
+export function detectChangedFieldsOfEntity(
+  server: IRpdServer,
+  model: RpdDataModel,
+  before: any,
+  after: any,
+  relationPropertiesToUpdate: UpdateEntityByIdOptions["relationPropertiesToUpdate"],
+): Record<string, any> | null {
   if (!before) {
     throw new Error("Argument 'before' can not be null.");
   }
@@ -19,7 +25,14 @@ export function detectChangedFieldsOfEntity(server: IRpdServer, model: RpdDataMo
     if (property && isOneRelationProperty(property)) {
       const afterValue: number | { id: number } | null = after[key];
       const beforeValue: number | { id: number } | null = before[key] || before[property.targetIdColumnName];
+
       if (afterValue) {
+        if (relationPropertiesToUpdate && relationPropertiesToUpdate[property.code]) {
+          changed = true;
+          changes[key] = afterValue;
+          continue;
+        }
+
         if (isNumber(afterValue)) {
           if (beforeValue) {
             if (isNumber(beforeValue)) {

package/src/index.ts

@@ -11,6 +11,7 @@ export * from "./core/routeContext";
 export * from "./core/server";
 export * from "./core/http-types";
 export * from "./core/actionHandler";
+export { default as EventManager } from "./core/eventManager";
 
 export { default as DataAccessor } from "./dataAccess/dataAccessor";
 export * from "./dataAccess/dataAccessor";

package/src/types.ts

@@ -244,6 +244,12 @@ export interface RpdDataModel {
    * Configure the property code used to display the entity.
    */
   displayPropertyCode?: string;
+
+  /**
+   * 默认排序方式
+   */
+  defaultOrderBy?: FindEntityOrderByOptions[];
+
   properties: RpdDataModelProperty[];
   indexes?: RpdDataModelIndex[];
   extensions?: RpdDataModelExtension[];