修改commit的两个trigger

es/context/BackendRuntimeContext.d.ts

@@ -25,7 +25,7 @@ export declare abstract class BackendRuntimeContext<ED extends EntityDict & Base
      * 异步等待初始化完成
      */
     protected initialized(): Promise<void>;
-    private initialize;
+    protected initialize(data?: SerializedData): Promise<void>;
     getApplicationId(): ED["application"]["Schema"]["id"] | undefined;
     getSystemId(): ED["application"]["Schema"]["systemId"] | undefined;
     getApplication(): Partial<ED["application"]["Schema"]> | undefined;
@@ -34,7 +34,7 @@ export declare abstract class BackendRuntimeContext<ED extends EntityDict & Base
     getToken(allowUnloggedIn?: boolean): Partial<ED["token"]["Schema"]> | undefined;
     getCurrentUserId(allowUnloggedIn?: boolean): string;
     setTemporaryUserId(userId: string | undefined): void;
-    toString(): string;
+    protected getSerializedData(): SerializedData;
     isRoot(): boolean;
     isReallyRoot(): boolean;
     sendMessage(data: ED['message']['CreateSingle']['data']): Promise<import("oak-domain").OperationResult<ED>>;

es/context/BackendRuntimeContext.js

@@ -189,11 +189,14 @@ export class BackendRuntimeContext extends BRC {
     setTemporaryUserId(userId) {
         this.temporaryUserId = userId;
     }
-    toString() {
+    getSerializedData() {
-        if (this.rootMode) {
+        const data = super.getSerializedData();
-            return JSON.stringify({ rootMode: true });
+        return {
-        }
+            ...data,
-        return JSON.stringify({ a: this.application?.id, t: this.token?.id });
+            a: this.application?.id,
+            t: this.token?.id,
+            rm: this.rootMode,
+        };
     }
     isRoot() {
         if (this.rootMode) {

es/context/FrontendRuntimeContext.d.ts

@@ -11,6 +11,7 @@ export type AspectDict<ED extends EntityDict & BaseEntityDict, Cxt extends Backe
 export interface SerializedData extends Fsd {
     a?: string;
     t?: string;
+    rm?: boolean;
 }
 export declare abstract class FrontendRuntimeContext<ED extends EntityDict & BaseEntityDict, Cxt extends BackendRuntimeContext<ED>, AD extends AspectDict<ED, Cxt>> extends Frc<ED, Cxt, AD> implements RuntimeContext {
     private application;

es/triggers/extraFile.js

@@ -33,36 +33,8 @@ const triggers = [
         strict: 'makeSure',
         entity: 'extraFile',
         action: 'remove',
-        fn: async ({ operation }, context) => {
+        fn: async ({ rows }, context) => {
-            const { filter } = operation;
+            for (const extraFile of rows) {
-            const extraFileList = await context.select('extraFile', {
-                data: {
-                    id: 1,
-                    origin: 1,
-                    type: 1,
-                    bucket: 1,
-                    objectId: 1,
-                    tag1: 1,
-                    tag2: 1,
-                    filename: 1,
-                    md5: 1,
-                    entity: 1,
-                    entityId: 1,
-                    extra1: 1,
-                    extension: 1,
-                    size: 1,
-                    sort: 1,
-                    fileType: 1,
-                    isBridge: 1,
-                    uploadState: 1,
-                    uploadMeta: 1,
-                },
-                filter,
-            }, {
-                includedDeleted: true,
-                dontCollect: true,
-            });
-            for (const extraFile of extraFileList) {
                 const { origin } = extraFile;
                 const uploader = getCos(origin);
                 await uploader.removeFile(extraFile, context);

es/triggers/notification.js

@@ -240,17 +240,11 @@ const triggers = [
         action: 'create',
         when: 'commit',
         strict: 'takeEasy',
-        fn: async ({ operation }, context) => {
+        fn: async ({ rows }, context) => {
-            const { data } = operation;
             const closeRootMode = context.openRootMode();
             try {
-                if (data instanceof Array) {
+                for (const row of rows) {
-                    for (const d of data) {
+                    await sendNotification(row, context);
-                        await sendNotification(d, context);
-                    }
-                }
-                else {
-                    await sendNotification(data, context);
                 }
             }
             catch (err) {

lib/context/BackendRuntimeContext.d.ts

@@ -25,7 +25,7 @@ export declare abstract class BackendRuntimeContext<ED extends EntityDict & Base
      * 异步等待初始化完成
      */
     protected initialized(): Promise<void>;
-    private initialize;
+    protected initialize(data?: SerializedData): Promise<void>;
     getApplicationId(): ED["application"]["Schema"]["id"] | undefined;
     getSystemId(): ED["application"]["Schema"]["systemId"] | undefined;
     getApplication(): Partial<ED["application"]["Schema"]> | undefined;
@@ -34,7 +34,7 @@ export declare abstract class BackendRuntimeContext<ED extends EntityDict & Base
     getToken(allowUnloggedIn?: boolean): Partial<ED["token"]["Schema"]> | undefined;
     getCurrentUserId(allowUnloggedIn?: boolean): string;
     setTemporaryUserId(userId: string | undefined): void;
-    toString(): string;
+    protected getSerializedData(): SerializedData;
     isRoot(): boolean;
     isReallyRoot(): boolean;
     sendMessage(data: ED['message']['CreateSingle']['data']): Promise<import("oak-domain").OperationResult<ED>>;

lib/context/BackendRuntimeContext.js

@@ -192,11 +192,14 @@ class BackendRuntimeContext extends oak_frontend_base_1.BackendRuntimeContext {
     setTemporaryUserId(userId) {
         this.temporaryUserId = userId;
     }
-    toString() {
+    getSerializedData() {
-        if (this.rootMode) {
+        const data = super.getSerializedData();
-            return JSON.stringify({ rootMode: true });
+        return {
-        }
+            ...data,
-        return JSON.stringify({ a: this.application?.id, t: this.token?.id });
+            a: this.application?.id,
+            t: this.token?.id,
+            rm: this.rootMode,
+        };
     }
     isRoot() {
         if (this.rootMode) {

lib/context/FrontendRuntimeContext.d.ts

@@ -11,6 +11,7 @@ export type AspectDict<ED extends EntityDict & BaseEntityDict, Cxt extends Backe
 export interface SerializedData extends Fsd {
     a?: string;
     t?: string;
+    rm?: boolean;
 }
 export declare abstract class FrontendRuntimeContext<ED extends EntityDict & BaseEntityDict, Cxt extends BackendRuntimeContext<ED>, AD extends AspectDict<ED, Cxt>> extends Frc<ED, Cxt, AD> implements RuntimeContext {
     private application;

lib/triggers/extraFile.js

@@ -35,36 +35,8 @@ const triggers = [
         strict: 'makeSure',
         entity: 'extraFile',
         action: 'remove',
-        fn: async ({ operation }, context) => {
+        fn: async ({ rows }, context) => {
-            const { filter } = operation;
+            for (const extraFile of rows) {
-            const extraFileList = await context.select('extraFile', {
-                data: {
-                    id: 1,
-                    origin: 1,
-                    type: 1,
-                    bucket: 1,
-                    objectId: 1,
-                    tag1: 1,
-                    tag2: 1,
-                    filename: 1,
-                    md5: 1,
-                    entity: 1,
-                    entityId: 1,
-                    extra1: 1,
-                    extension: 1,
-                    size: 1,
-                    sort: 1,
-                    fileType: 1,
-                    isBridge: 1,
-                    uploadState: 1,
-                    uploadMeta: 1,
-                },
-                filter,
-            }, {
-                includedDeleted: true,
-                dontCollect: true,
-            });
-            for (const extraFile of extraFileList) {
                 const { origin } = extraFile;
                 const uploader = (0, cos_1.getCos)(origin);
                 await uploader.removeFile(extraFile, context);

lib/triggers/notification.js

@@ -242,17 +242,11 @@ const triggers = [
         action: 'create',
         when: 'commit',
         strict: 'takeEasy',
-        fn: async ({ operation }, context) => {
+        fn: async ({ rows }, context) => {
-            const { data } = operation;
             const closeRootMode = context.openRootMode();
             try {
-                if (data instanceof Array) {
+                for (const row of rows) {
-                    for (const d of data) {
+                    await sendNotification(row, context);
-                        await sendNotification(d, context);
-                    }
-                }
-                else {
-                    await sendNotification(data, context);
                 }
             }
             catch (err) {

src/triggers/extraFile.ts

@@ -41,40 +41,8 @@ const triggers: Trigger<EntityDict, 'extraFile', BackendRuntimeContext<EntityDic
         strict: 'makeSure',
         entity: 'extraFile',
         action: 'remove',
-        fn: async ({ operation }, context) => {
+        fn: async ({ rows }, context) => {
-            const { filter } = operation;
+            for (const extraFile of rows) {
-            const extraFileList = await context.select(
-                'extraFile',
-                {
-                    data: {
-                        id: 1,
-                        origin: 1,
-                        type: 1,
-                        bucket: 1,
-                        objectId: 1,
-                        tag1: 1,
-                        tag2: 1,
-                        filename: 1,
-                        md5: 1,
-                        entity: 1,
-                        entityId: 1,
-                        extra1: 1,
-                        extension: 1,
-                        size: 1,
-                        sort: 1,
-                        fileType: 1,
-                        isBridge: 1,
-                        uploadState: 1,
-                        uploadMeta: 1,
-                    },
-                    filter,
-                },
-                {
-                    includedDeleted: true,
-                    dontCollect: true,
-                }
-            );
-            for (const extraFile of extraFileList) {
                 const { origin } = extraFile;
                 const uploader = getCos(origin!);
                 await uploader.removeFile(extraFile as EntityDict['extraFile']['OpSchema'], context);

src/triggers/notification.ts

@@ -12,7 +12,7 @@ import { sendSms } from '../utils/sms';
 import { tryMakeSmsNotification } from './message';
 import { composeDomainUrl } from '../utils/domain';
 
-async function sendNotification(notification: CreateNotificationData, context: BackendRuntimeContext<EntityDict>) {
+async function sendNotification(notification: EntityDict['notification']['OpSchema'], context: BackendRuntimeContext<EntityDict>) {
     const { data, templateId, channel, messageSystemId, data1, id } = notification;
     const [messageSystem] = await context.select('messageSystem', {
         data: {
@@ -281,16 +281,11 @@ const triggers: Trigger<EntityDict, 'notification', BackendRuntimeContext<Entity
         action: 'create',
         when: 'commit',
         strict: 'takeEasy',
-        fn: async ({ operation }, context) => {
+        fn: async ({ rows }, context) => {
-            const { data } = operation;
             const closeRootMode = context.openRootMode();
             try {
-                if (data instanceof Array) {
+                for (const row of rows) {
-                    for (const d of data) {
+                    await sendNotification(row, context);
-                        await sendNotification(d, context);
-                    }
-                } else {
-                    await sendNotification(data, context);
                 }
             } catch (err) {
                 closeRootMode();