@ruiapp/rapid-core 0.2.11 → 0.2.13

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: [
                 {
@@ -3656,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",
@@ -6311,6 +6333,11 @@ async function appendFile(path, data) {
     });
 }
 
+function getFileBaseName(pathname) {
+    const extName = path__default["default"].extname(pathname);
+    return path__default["default"].basename(pathname, extName);
+}
+
 const code$8 = "downloadDocument";
 async function handler$8(plugin, ctx, options) {
     const { server, applicationConfig, routerContext, input } = ctx;
@@ -6318,24 +6345,52 @@ async function handler$8(plugin, ctx, options) {
     const documentDataAccessor = ctx.server.getDataAccessor({
         singularCode: "ecm_document",
     });
+    const revisionDataAccessor = ctx.server.getDataAccessor({
+        singularCode: "ecm_revision",
+    });
     const storageDataAccessor = ctx.server.getDataAccessor({
         singularCode: "ecm_storage_object",
     });
-    const document = await documentDataAccessor.findById(input.documentId);
-    if (!document) {
-        ctx.output = { error: new Error("Document not found.") };
+    let storageObjectId = 0;
+    let fileName;
+    let { revisionId, documentId } = input;
+    if (revisionId) {
+        const revision = await revisionDataAccessor.findById(revisionId);
+        if (!revision) {
+            ctx.output = { error: new Error(`Revision with id "${revisionId}" was not found.`) };
+            return;
+        }
+        storageObjectId = revision.storage_object_id;
+        documentId = revision.document_id;
+        const document = await documentDataAccessor.findById(documentId);
+        if (!document) {
+            ctx.output = { error: new Error(`Document with id "${documentId}" was not found.`) };
+            return;
+        }
+        fileName = `${getFileBaseName(document.name)}${revision.ext_name}`;
+    }
+    else if (documentId) {
+        const document = await documentDataAccessor.findById(documentId);
+        if (!document) {
+            ctx.output = { error: new Error(`Document with id "${documentId}" was not found.`) };
+            return;
+        }
+        storageObjectId = document.storage_object_id;
+        fileName = document.name;
+    }
+    else {
+        ctx.output = { error: new Error(`Parameter "revisionId" or "documentId" must be provided.`) };
         return;
     }
-    const storageObject = await storageDataAccessor.findById(document.storage_object_id);
+    const storageObject = await storageDataAccessor.findById(storageObjectId);
     if (!storageObject) {
-        ctx.output = { error: new Error("Storage object not found.") };
+        ctx.output = { error: new Error(`Storage object with id "${storageObjectId}" was not found.`) };
         return;
     }
     const fileKey = storageObject.key;
     const filePathName = path__default["default"].join(server.config.localFileStoragePath, fileKey);
-    const attachmentFileName = document.name;
     response.body = await readFile(filePathName);
-    response.headers.set("Content-Disposition", `attachment; filename="${encodeURIComponent(attachmentFileName)}"`);
+    response.headers.set("Content-Disposition", `attachment; filename="${encodeURIComponent(fileName)}"`);
 }
 
 var downloadDocumentActionHandler = /*#__PURE__*/Object.freeze({

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;

package/dist/utilities/pathUtility.d.ts

@@ -0,0 +1,3 @@
+export declare function getFileExtensionName(pathname: string): string;
+export declare function getFileName(pathname: string): string;
+export declare function getFileBaseName(pathname: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "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

@@ -1580,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/plugins/fileManage/actionHandlers/downloadDocument.ts

@@ -2,6 +2,7 @@ import path from "path";
 import { ActionHandlerContext } from "~/core/actionHandler";
 import { RapidPlugin } from "~/core/server";
 import { readFile } from "~/utilities/fsUtility";
+import { getFileBaseName } from "~/utilities/pathUtility";
 
 export const code = "downloadDocument";
 
@@ -12,25 +13,53 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
   const documentDataAccessor = ctx.server.getDataAccessor({
     singularCode: "ecm_document",
   });
+  const revisionDataAccessor = ctx.server.getDataAccessor({
+    singularCode: "ecm_revision",
+  });
   const storageDataAccessor = ctx.server.getDataAccessor({
     singularCode: "ecm_storage_object",
   });
 
-  const document = await documentDataAccessor.findById(input.documentId);
-  if (!document) {
-    ctx.output = { error: new Error("Document not found.") };
+  let storageObjectId = 0;
+  let fileName: string;
+  let { revisionId, documentId } = input;
+  if (revisionId) {
+    const revision = await revisionDataAccessor.findById(revisionId);
+    if (!revision) {
+      ctx.output = { error: new Error(`Revision with id "${revisionId}" was not found.`) };
+      return;
+    }
+    storageObjectId = revision.storage_object_id;
+
+    documentId = revision.document_id;
+    const document = await documentDataAccessor.findById(documentId);
+    if (!document) {
+      ctx.output = { error: new Error(`Document with id "${documentId}" was not found.`) };
+      return;
+    }
+    fileName = `${getFileBaseName(document.name!)}${revision.ext_name}`;
+  } else if (documentId) {
+    const document = await documentDataAccessor.findById(documentId);
+    if (!document) {
+      ctx.output = { error: new Error(`Document with id "${documentId}" was not found.`) };
+      return;
+    }
+    storageObjectId = document.storage_object_id;
+    fileName = document.name;
+  } else {
+    ctx.output = { error: new Error(`Parameter "revisionId" or "documentId" must be provided.`) };
     return;
   }
-  const storageObject = await storageDataAccessor.findById(document.storage_object_id);
+
+  const storageObject = await storageDataAccessor.findById(storageObjectId);
   if (!storageObject) {
-    ctx.output = { error: new Error("Storage object not found.") };
+    ctx.output = { error: new Error(`Storage object with id "${storageObjectId}" was not found.`) };
     return;
   }
 
   const fileKey = storageObject.key;
   const filePathName = path.join(server.config.localFileStoragePath, fileKey);
-  const attachmentFileName = document.name;
 
   response.body = await readFile(filePathName);
-  response.headers.set("Content-Disposition", `attachment; filename="${encodeURIComponent(attachmentFileName)}"`);
+  response.headers.set("Content-Disposition", `attachment; filename="${encodeURIComponent(fileName)}"`);
 }

package/src/types.ts

@@ -212,6 +212,10 @@ export interface RpdDataModel {
   indexes?: RpdDataModelIndex[];
   extensions?: RpdDataModelExtension[];
   permissionPolicies?: RpdDataModelPermissionPolicies;
+  /**
+   * 是否使用软删除
+   */
+  softDelete?: boolean;
 }
 
 export interface RpdDataModelPermissionPolicies {

package/src/utilities/pathUtility.ts

@@ -0,0 +1,14 @@
+import path from "path";
+
+export function getFileExtensionName(pathname: string) {
+  return path.extname(pathname);
+}
+
+export function getFileName(pathname: string) {
+  return path.basename(pathname);
+}
+
+export function getFileBaseName(pathname: string) {
+  const extName = path.extname(pathname);
+  return path.basename(pathname, extName);
+}