@ruiapp/rapid-core 0.2.10 → 0.2.12

package/dist/bootstrapApplicationConfig.d.ts

@@ -20,6 +20,7 @@ declare const _default: {
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
+            defaultValue?: undefined;
         } | {
             name: string;
             code: string;
@@ -30,6 +31,7 @@ declare const _default: {
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
+            defaultValue?: undefined;
         } | {
             name: string;
             code: string;
@@ -40,6 +42,7 @@ declare const _default: {
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
+            defaultValue?: undefined;
         } | {
             name: string;
             code: string;
@@ -50,6 +53,7 @@ declare const _default: {
             columnName?: undefined;
             required?: undefined;
             autoIncrement?: undefined;
+            defaultValue?: undefined;
         } | {
             name: string;
             code: string;
@@ -60,6 +64,18 @@ declare const _default: {
             relation?: undefined;
             targetSingularCode?: undefined;
             selfIdColumnName?: undefined;
+            defaultValue?: undefined;
+        } | {
+            name: string;
+            code: string;
+            columnName: string;
+            type: "boolean";
+            required: true;
+            defaultValue: string;
+            autoIncrement?: undefined;
+            relation?: undefined;
+            targetSingularCode?: undefined;
+            selfIdColumnName?: undefined;
         })[];
         indexes: ({
             name: string;

package/dist/index.js

@@ -1539,6 +1539,14 @@ var bootstrapApplicationConfig = {
                     type: "json",
                     required: false,
                 },
+                {
+                    name: "softDelete",
+                    code: "softDelete",
+                    columnName: "soft_delete",
+                    type: "boolean",
+                    required: true,
+                    defaultValue: "false",
+                },
             ],
             indexes: [
                 {
@@ -3559,13 +3567,16 @@ async function willEntityDuplicate(server, dataAccessor, options) {
         routeContext,
     });
     if (entityId) {
-        return entityInDb && entityInDb.Id !== entityId;
+        return entityInDb && entityInDb.id !== entityId;
     }
     else {
         return !!entityInDb;
     }
 }
 function getEntityDuplicatedErrorMessage(server, model, indexConfig) {
+    if (indexConfig.duplicateErrorMessage) {
+        return indexConfig.duplicateErrorMessage;
+    }
     const propertyNames = indexConfig.properties.map((propConfig) => {
         let propCode;
         if (lodash.isString(propConfig)) {
@@ -3653,12 +3664,26 @@ class EntityManager {
             sender: plugin,
             routeContext,
         });
-        await this.#dataAccessor.deleteById(id);
-        if (model.base) {
-            const baseDataAccessor = this.#server.getDataAccessor({
-                singularCode: model.base,
+        if (model.softDelete) {
+            let dataAccessor = model.base
+                ? this.#server.getDataAccessor({
+                    singularCode: model.base,
+                })
+                : this.#dataAccessor;
+            const currentUserId = routeContext?.state?.userId;
+            await dataAccessor.updateById(id, {
+                deleted_at: getNowStringWithTimezone(),
+                deleter_id: currentUserId,
             });
-            await baseDataAccessor.deleteById(id);
+        }
+        else {
+            await this.#dataAccessor.deleteById(id);
+            if (model.base) {
+                const baseDataAccessor = this.#server.getDataAccessor({
+                    singularCode: model.base,
+                });
+                await baseDataAccessor.deleteById(id);
+            }
         }
         await this.#server.emitEvent({
             eventName: "entity.delete",

package/dist/types.d.ts

@@ -186,6 +186,10 @@ export interface RpdDataModel {
     indexes?: RpdDataModelIndex[];
     extensions?: RpdDataModelExtension[];
     permissionPolicies?: RpdDataModelPermissionPolicies;
+    /**
+     * 是否使用软删除
+     */
+    softDelete?: boolean;
 }
 export interface RpdDataModelPermissionPolicies {
     find?: PermissionPolicy;
@@ -349,6 +353,10 @@ export interface RpdDataModelIndex {
     unique?: boolean;
     properties: RpdDataModelIndexPropertyConfig[];
     conditions?: RpdDataModelIndexOptions[];
+    /**
+     * 重复时的错误信息。
+     */
+    duplicateErrorMessage?: string;
 }
 export type RpdDataModelIndexPropertyConfig = string | {
     code: string;

package/package.json

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

package/src/bootstrapApplicationConfig.ts

@@ -121,6 +121,14 @@ export default {
           type: "json",
           required: false,
         },
+        {
+          name: "softDelete",
+          code: "softDelete",
+          columnName: "soft_delete",
+          type: "boolean",
+          required: true,
+          defaultValue: "false",
+        },
       ],
       indexes: [
         {

package/src/dataAccess/entityManager.ts

@@ -1466,13 +1466,17 @@ async function willEntityDuplicate(server: IRpdServer, dataAccessor: IRpdDataAcc
   });
 
   if (entityId) {
-    return entityInDb && entityInDb.Id !== entityId;
+    return entityInDb && entityInDb.id !== entityId;
   } else {
     return !!entityInDb;
   }
 }
 
 function getEntityDuplicatedErrorMessage(server: IRpdServer, model: RpdDataModel, indexConfig: RpdDataModelIndex) {
+  if (indexConfig.duplicateErrorMessage) {
+    return indexConfig.duplicateErrorMessage;
+  }
+
   const propertyNames = indexConfig.properties.map((propConfig) => {
     let propCode: string;
     if (isString(propConfig)) {
@@ -1576,12 +1580,25 @@ export default class EntityManager<TEntity = any> {
       routeContext,
     });
 
-    await this.#dataAccessor.deleteById(id);
-    if (model.base) {
-      const baseDataAccessor = this.#server.getDataAccessor({
-        singularCode: model.base,
+    if (model.softDelete) {
+      let dataAccessor = model.base
+        ? this.#server.getDataAccessor({
+            singularCode: model.base,
+          })
+        : this.#dataAccessor;
+      const currentUserId = routeContext?.state?.userId;
+      await dataAccessor.updateById(id, {
+        deleted_at: getNowStringWithTimezone(),
+        deleter_id: currentUserId,
       });
-      await baseDataAccessor.deleteById(id);
+    } else {
+      await this.#dataAccessor.deleteById(id);
+      if (model.base) {
+        const baseDataAccessor = this.#server.getDataAccessor({
+          singularCode: model.base,
+        });
+        await baseDataAccessor.deleteById(id);
+      }
     }
 
     await this.#server.emitEvent({

package/src/types.ts

@@ -212,6 +212,10 @@ export interface RpdDataModel {
   indexes?: RpdDataModelIndex[];
   extensions?: RpdDataModelExtension[];
   permissionPolicies?: RpdDataModelPermissionPolicies;
+  /**
+   * 是否使用软删除
+   */
+  softDelete?: boolean;
 }
 
 export interface RpdDataModelPermissionPolicies {
@@ -415,6 +419,11 @@ export interface RpdDataModelIndex {
   unique?: boolean;
   properties: RpdDataModelIndexPropertyConfig[];
   conditions?: RpdDataModelIndexOptions[];
+
+  /**
+   * 重复时的错误信息。
+   */
+  duplicateErrorMessage?: string;
 }
 
 export type RpdDataModelIndexPropertyConfig =