oak-domain 1.1.0 → 1.1.1

package/lib/compiler/schemalBuilder.js

@@ -3027,6 +3027,7 @@ function analyzeInModi() {
         if (schema.toModi || schema.inModi || schema.actionType === 'readOnly' || schema.static) {
             return;
         }
+        console.log('setInModi', entity);
         schema.inModi = true;
         var related = getRelateEntities(entity);
         related.forEach(function (ele) { return setInModi(ele); });

package/lib/store/actionDef.js

@@ -182,10 +182,26 @@ function analyzeActionDefDict(schema, actionDefDict) {
                             var _b;
                             return tslib_1.__generator(this, function (_c) {
                                 data = operation.data;
-                                Object.assign(data, (_b = {},
-                                    _b[attr] = is,
-                                    _b));
-                                return [2 /*return*/, 1];
+                                if (data instanceof Array) {
+                                    data.forEach(function (ele) {
+                                        var _a;
+                                        if (!ele[attr]) {
+                                            Object.assign(ele, (_a = {},
+                                                _a[attr] = is,
+                                                _a));
+                                        }
+                                    });
+                                    return [2 /*return*/, data.length];
+                                }
+                                else {
+                                    if (!data[attr]) {
+                                        Object.assign(data, (_b = {},
+                                            _b[attr] = is,
+                                            _b));
+                                    }
+                                    return [2 /*return*/, 1];
+                                }
+                                return [2 /*return*/];
                             });
                         });
                     }

package/lib/store/modi.d.ts

@@ -1,11 +1,11 @@
 import { EntityDict as BaseEntityDict } from '../base-app-domain';
 import { UniversalContext } from '../store/UniversalContext';
 import { OpSchema as Modi } from '../base-app-domain/Modi/Schema';
-import { Checker, Operation, StorageSchema, EntityDict, Context } from '../types';
+import { Checker, Operation, StorageSchema, EntityDict, Context, OperateOption } from '../types';
 export declare function createOperationsFromModies(modies: Modi[]): Array<{
     operation: Operation<string, Object, Object>;
     entity: string;
 }>;
-export declare function applyModis<ED extends EntityDict & BaseEntityDict, Cxt extends UniversalContext<ED>>(filter: ED['modi']['Selection']['filter'], context: Cxt): Promise<import("../types").OperationResult<ED>>;
-export declare function abandonModis<ED extends EntityDict & BaseEntityDict, Cxt extends UniversalContext<ED>>(filter: ED['modi']['Selection']['filter'], context: Cxt): Promise<import("../types").OperationResult<ED>>;
+export declare function applyModis<ED extends EntityDict & BaseEntityDict, Cxt extends UniversalContext<ED>, Op extends OperateOption>(filter: ED['modi']['Selection']['filter'], context: Cxt, option: Op): Promise<import("../types").OperationResult<ED>>;
+export declare function abandonModis<ED extends EntityDict & BaseEntityDict, Cxt extends UniversalContext<ED>, Op extends OperateOption>(filter: ED['modi']['Selection']['filter'], context: Cxt, option: Op): Promise<import("../types").OperationResult<ED>>;
 export declare function createModiRelatedCheckers<ED extends EntityDict & BaseEntityDict, Cxt extends Context<ED>>(schema: StorageSchema<ED>): Checker<ED, keyof ED, Cxt>[];

package/lib/store/modi.js

@@ -19,7 +19,7 @@ function createOperationsFromModies(modies) {
     });
 }
 exports.createOperationsFromModies = createOperationsFromModies;
-function applyModis(filter, context) {
+function applyModis(filter, context, option) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var _a, _b, _c;
         var _d;
@@ -42,16 +42,15 @@ function applyModis(filter, context) {
                                     $direction: 'asc',
                                 }
                             ],
-                            _d), context, {
-                            dontCollect: true,
-                            blockTrigger: true,
-                        }]))];
+                            _d), context, Object.assign({}, option, {
+                            blockTrigger: false,
+                        })]))];
             }
         });
     });
 }
 exports.applyModis = applyModis;
-function abandonModis(filter, context) {
+function abandonModis(filter, context, option) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var _a, _b, _c;
         var _d;
@@ -74,10 +73,9 @@ function abandonModis(filter, context) {
                                     $direction: 'asc',
                                 }
                             ],
-                            _d), context, {
-                            dontCollect: true,
-                            blockTrigger: true,
-                        }]))];
+                            _d), context, Object.assign({}, option, {
+                            blockTrigger: false,
+                        })]))];
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "author": {
         "name": "XuChang"
     },