oak-backend-base 2.0.2 → 2.0.3

package/lib/DbStore.d.ts

@@ -7,7 +7,6 @@ export declare class DbStore<ED extends EntityDict & BaseEntityDict, Cxt extends
     private executor;
     constructor(storageSchema: StorageSchema<ED>, contextBuilder: (scene?: string) => (store: DbStore<ED, Cxt>) => Promise<AsyncContext<ED>>, mysqlConfiguration: MySQLConfiguration);
     protected cascadeUpdateAsync<T extends keyof ED>(entity: T, operation: ED[T]['Operation'], context: AsyncContext<ED>, option: MysqlOperateOption): Promise<import("oak-domain/lib/types").OperationResult<ED>>;
-    protected cascadeSelectAsync<T extends keyof ED>(entity: T, selection: ED[T]["Selection"], context: AsyncContext<ED>, option: MySqlSelectOption): Promise<Partial<ED[T]['Schema']>[]>;
     operate<T extends keyof ED>(entity: T, operation: ED[T]['Operation'], context: Cxt, option: MysqlOperateOption): Promise<import("oak-domain/lib/types").OperationResult<ED>>;
     select<T extends keyof ED>(entity: T, selection: ED[T]['Selection'], context: Cxt, option: MySqlSelectOption): Promise<Partial<ED[T]["Schema"]>[]>;
     count<T extends keyof ED>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, context: Cxt, option: SelectOption): Promise<number>;

package/lib/DbStore.js

@@ -19,19 +19,6 @@ class DbStore extends oak_db_1.MysqlStore {
         }
         return result;
     }
-    async cascadeSelectAsync(entity, selection, context, option) {
-        const selection2 = Object.assign({
-            action: 'select',
-        }, selection);
-        if (!option.blockTrigger) {
-            await this.executor.preOperation(entity, selection2, context, option);
-        }
-        const result = await super.cascadeSelectAsync(entity, selection2, context, option);
-        if (!option.blockTrigger) {
-            await this.executor.postOperation(entity, selection2, context, option, result);
-        }
-        return result;
-    }
     async operate(entity, operation, context, option) {
         const autoCommit = !context.getCurrentTxnId();
         let result;
@@ -56,8 +43,18 @@ class DbStore extends oak_db_1.MysqlStore {
             await context.begin();
         }
         let result;
+        // select的trigger应加在根select之前，cascade的select不加处理
+        const selection2 = Object.assign({
+            action: 'select',
+        }, selection);
+        if (!option.blockTrigger) {
+            await this.executor.preOperation(entity, selection2, context, option);
+        }
         try {
             result = await super.select(entity, selection, context, option);
+            if (!option.blockTrigger) {
+                await this.executor.postOperation(entity, selection2, context, option, result);
+            }
         }
         catch (err) {
             await context.rollback();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oak-backend-base",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "oak-backend-base",
   "main": "lib/index",
   "author": {
@@ -18,9 +18,9 @@
     "lodash": "^4.17.21",
     "mysql": "^2.18.1",
     "mysql2": "^2.3.3",
-    "oak-common-aspect": "2.0.1",
-    "oak-db": "^2.0.2",
-    "oak-domain": "^2.0.1",
+    "oak-common-aspect": "^2.0.2",
+    "oak-db": "^2.0.3",
+    "oak-domain": "^2.0.2",
     "uuid": "^8.3.2"
   },
   "license": "ISC",