@ruiapp/rapid-core 0.7.6 → 0.8.0

package/dist/bootstrapApplicationConfig.d.ts

@@ -18,10 +18,10 @@ declare const _default: {
             required: true;
             autoIncrement: true;
             description?: undefined;
+            defaultValue?: undefined;
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
-            defaultValue?: undefined;
         } | {
             name: string;
             code: string;
@@ -30,10 +30,10 @@ declare const _default: {
             required: true;
             autoIncrement?: undefined;
             description?: undefined;
+            defaultValue?: undefined;
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
-            defaultValue?: undefined;
         } | {
             name: string;
             code: string;
@@ -42,10 +42,10 @@ declare const _default: {
             required: false;
             autoIncrement?: undefined;
             description?: undefined;
+            defaultValue?: undefined;
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
-            defaultValue?: undefined;
         } | {
             name: string;
             description: string;
@@ -54,10 +54,22 @@ declare const _default: {
             type: "json";
             required: false;
             autoIncrement?: undefined;
+            defaultValue?: undefined;
+            relation?: undefined;
+            targetSingularCode?: undefined;
+            selfIdColumnName?: undefined;
+        } | {
+            name: string;
+            code: string;
+            columnName: string;
+            type: "boolean";
+            required: true;
+            defaultValue: string;
+            autoIncrement?: undefined;
+            description?: undefined;
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
-            defaultValue?: undefined;
         } | {
             name: string;
             code: string;
@@ -78,19 +90,7 @@ declare const _default: {
             required: false;
             autoIncrement?: undefined;
             description?: undefined;
-            relation?: undefined;
-            targetSingularCode?: undefined;
-            selfIdColumnName?: undefined;
             defaultValue?: undefined;
-        } | {
-            name: string;
-            code: string;
-            columnName: string;
-            type: "boolean";
-            required: true;
-            defaultValue: string;
-            autoIncrement?: undefined;
-            description?: undefined;
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
@@ -314,6 +314,18 @@ declare const _default: {
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
+        } | {
+            name: string;
+            code: string;
+            columnName: string;
+            type: "boolean";
+            required: true;
+            defaultValue: string;
+            autoIncrement?: undefined;
+            relation?: undefined;
+            targetSingularCode?: undefined;
+            selfIdColumnName?: undefined;
+            description?: undefined;
         })[];
         indexes?: undefined;
     } | {
@@ -409,6 +421,18 @@ declare const _default: {
             targetSingularCode?: undefined;
             targetIdColumnName?: undefined;
             defaultValue?: undefined;
+        } | {
+            name: string;
+            code: string;
+            columnName: string;
+            type: "boolean";
+            required: true;
+            defaultValue: string;
+            autoIncrement?: undefined;
+            relation?: undefined;
+            targetSingularCode?: undefined;
+            targetIdColumnName?: undefined;
+            description?: undefined;
         })[];
         indexes?: undefined;
     })[];

package/dist/index.js

@@ -1734,6 +1734,14 @@ var bootstrapApplicationConfig = {
                     type: "text",
                     required: false,
                 },
+                {
+                    name: "deprecated",
+                    code: "deprecated",
+                    columnName: "deprecated",
+                    type: "boolean",
+                    required: true,
+                    defaultValue: "false",
+                },
                 {
                     name: "properties",
                     code: "properties",
@@ -1866,6 +1874,14 @@ var bootstrapApplicationConfig = {
                     type: "text",
                     required: true,
                 },
+                {
+                    name: "deprecated",
+                    code: "deprecated",
+                    columnName: "deprecated",
+                    type: "boolean",
+                    required: true,
+                    defaultValue: "false",
+                },
                 {
                     name: "required",
                     code: "required",
@@ -2096,6 +2112,14 @@ var bootstrapApplicationConfig = {
                     type: "json",
                     required: false,
                 },
+                {
+                    name: "deprecated",
+                    code: "deprecated",
+                    columnName: "deprecated",
+                    type: "boolean",
+                    required: true,
+                    defaultValue: "false",
+                },
             ],
         },
         {
@@ -2190,6 +2214,14 @@ var bootstrapApplicationConfig = {
                     type: "json",
                     required: false,
                 },
+                {
+                    name: "deprecated",
+                    code: "deprecated",
+                    columnName: "deprecated",
+                    type: "boolean",
+                    required: true,
+                    defaultValue: "false",
+                },
             ],
         },
         {
@@ -3429,7 +3461,10 @@ async function createEntity(server, dataAccessor, options, plugin) {
         const targetDataAccessor = server.getDataAccessor({
             singularCode: property.targetSingularCode,
         });
-        const relatedEntitiesToBeSaved = entity[property.code];
+        let relatedEntitiesToBeSaved = entity[property.code];
+        if (relatedEntitiesToBeSaved === null) {
+            relatedEntitiesToBeSaved = [];
+        }
         if (!lodash.isArray(relatedEntitiesToBeSaved)) {
             throw new Error(`Value of field '${property.code}' should be an array.`);
         }
@@ -3743,7 +3778,10 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
         const targetDataAccessor = server.getDataAccessor({
             singularCode: property.targetSingularCode,
         });
-        const relatedEntitiesToBeSaved = changes[property.code];
+        let relatedEntitiesToBeSaved = changes[property.code];
+        if (relatedEntitiesToBeSaved === null) {
+            relatedEntitiesToBeSaved = [];
+        }
         if (!lodash.isArray(relatedEntitiesToBeSaved)) {
             throw new Error(`Value of field '${property.code}' should be an array.`);
         }
@@ -3790,7 +3828,7 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
                     relationRemoveMode = "delete";
                 }
                 else {
-                    relationRemoveMode = updateRelationPropertiesOptions.relationRemoveMode;
+                    relationRemoveMode = updateRelationPropertiesOptions?.relationRemoveMode || "delete";
                 }
                 const relationModel = server.getModel({
                     singularCode: property.targetSingularCode,
@@ -8554,7 +8592,7 @@ class CronJobPlugin {
             }
         }
         catch (ex) {
-            logger.error("Cron job execution error: " + ex.message);
+            logger.error('Cron job "%s" execution error: %s', job.code, ex.message, { cronJobCode: job.code });
         }
     }
 }

package/dist/types.d.ts

@@ -184,6 +184,10 @@ export interface RpdDataModel {
      * Configure the property code to save derived type for base entity.
      */
     derivedTypePropertyCode?: string;
+    /**
+     * Indicates whether the entity is deprecated.
+     */
+    deprecated?: boolean;
     /**
      * Configure the property code used to display the entity.
      */
@@ -252,6 +256,10 @@ export interface RpdDataModelProperty {
      * 字段类型。
      */
     type: RpdDataPropertyTypes;
+    /**
+     * Indicates whether the property is deprecated.
+     */
+    deprecated?: boolean;
     /**
      * 是否必须有值。默认为 false。
      */
@@ -368,6 +376,10 @@ export type RpdDataDictionary = {
      * 本地化资源
      */
     locales?: Record<string, RpdDataDictionaryLocale>;
+    /**
+     * Indicates whether the data dictionary is deprecated.
+     */
+    deprecated?: boolean;
 };
 export type RpdDataDictionaryLocale = {
     name: string;
@@ -413,6 +425,10 @@ export type RpdDataDictionaryEntry = {
      * 本地化资源
      */
     locales?: Record<string, RpdDataDictionaryEntryLocale>;
+    /**
+     * Indicates whether the data dictionary entry is deprecated.
+     */
+    deprecated?: boolean;
 };
 /**
  * 数据字典项本地化资源配置

package/package.json

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

package/src/bootstrapApplicationConfig.ts

@@ -122,6 +122,14 @@ export default {
           type: "text",
           required: false,
         },
+        {
+          name: "deprecated",
+          code: "deprecated",
+          columnName: "deprecated",
+          type: "boolean",
+          required: true,
+          defaultValue: "false",
+        },
         {
           name: "properties",
           code: "properties",
@@ -254,6 +262,14 @@ export default {
           type: "text",
           required: true,
         },
+        {
+          name: "deprecated",
+          code: "deprecated",
+          columnName: "deprecated",
+          type: "boolean",
+          required: true,
+          defaultValue: "false",
+        },
         {
           name: "required",
           code: "required",
@@ -484,6 +500,14 @@ export default {
           type: "json",
           required: false,
         },
+        {
+          name: "deprecated",
+          code: "deprecated",
+          columnName: "deprecated",
+          type: "boolean",
+          required: true,
+          defaultValue: "false",
+        },
       ],
     },
     {
@@ -578,6 +602,14 @@ export default {
           type: "json",
           required: false,
         },
+        {
+          name: "deprecated",
+          code: "deprecated",
+          columnName: "deprecated",
+          type: "boolean",
+          required: true,
+          defaultValue: "false",
+        },
       ],
     },
     {

package/src/dataAccess/entityManager.ts

@@ -951,7 +951,10 @@ async function createEntity(server: IRpdServer, dataAccessor: IRpdDataAccessor,
       singularCode: property.targetSingularCode!,
     });
 
-    const relatedEntitiesToBeSaved = entity[property.code];
+    let relatedEntitiesToBeSaved = entity[property.code];
+    if (relatedEntitiesToBeSaved === null) {
+      relatedEntitiesToBeSaved = [];
+    }
     if (!isArray(relatedEntitiesToBeSaved)) {
       throw new Error(`Value of field '${property.code}' should be an array.`);
     }
@@ -1292,7 +1295,10 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
       singularCode: property.targetSingularCode!,
     });
 
-    const relatedEntitiesToBeSaved = changes[property.code];
+    let relatedEntitiesToBeSaved = changes[property.code];
+    if (relatedEntitiesToBeSaved === null) {
+      relatedEntitiesToBeSaved = [];
+    }
     if (!isArray(relatedEntitiesToBeSaved)) {
       throw new Error(`Value of field '${property.code}' should be an array.`);
     }
@@ -1353,7 +1359,7 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
         if (updateRelationPropertiesOptions === true) {
           relationRemoveMode = "delete";
         } else {
-          relationRemoveMode = updateRelationPropertiesOptions.relationRemoveMode;
+          relationRemoveMode = updateRelationPropertiesOptions?.relationRemoveMode || "delete";
         }
         const relationModel = server.getModel({
           singularCode: property.targetSingularCode,

package/src/plugins/cronJob/CronJobPlugin.ts

@@ -109,7 +109,7 @@ class CronJobPlugin implements RapidPlugin {
         await job.handler(handlerContext, job.handleOptions);
       }
     } catch (ex) {
-      logger.error("Cron job execution error: " + ex.message);
+      logger.error('Cron job "%s" execution error: %s', job.code, ex.message, { cronJobCode: job.code });
     }
   }
 }

package/src/types.ts

@@ -211,6 +211,12 @@ export interface RpdDataModel {
    * Configure the property code to save derived type for base entity.
    */
   derivedTypePropertyCode?: string;
+
+  /**
+   * Indicates whether the entity is deprecated.
+   */
+  deprecated?: boolean;
+
   /**
    * Configure the property code used to display the entity.
    */
@@ -285,6 +291,12 @@ export interface RpdDataModelProperty {
    * 字段类型。
    */
   type: RpdDataPropertyTypes;
+
+  /**
+   * Indicates whether the property is deprecated.
+   */
+  deprecated?: boolean;
+
   /**
    * 是否必须有值。默认为 false。
    */
@@ -437,6 +449,11 @@ export type RpdDataDictionary = {
    * 本地化资源
    */
   locales?: Record<string, RpdDataDictionaryLocale>;
+
+  /**
+   * Indicates whether the data dictionary is deprecated.
+   */
+  deprecated?: boolean;
 };
 
 export type RpdDataDictionaryLocale = {
@@ -492,6 +509,11 @@ export type RpdDataDictionaryEntry = {
    * 本地化资源
    */
   locales?: Record<string, RpdDataDictionaryEntryLocale>;
+
+  /**
+   * Indicates whether the data dictionary entry is deprecated.
+   */
+  deprecated?: boolean;
 };
 
 /**