oak-domain 2.3.0 → 2.3.2

package/lib/store/CascadeStore.js

@@ -685,6 +685,7 @@ var CascadeStore = /** @class */ (function (_super) {
             Object.assign(data2, (_b = {},
                 _b[Entity_1.CreateAtAttribute] = now,
                 _b[Entity_1.UpdateAtAttribute] = now,
+                _b[Entity_1.DeleteAtAttribute] = null,
                 _b));
         };
         if (data instanceof Array) {
@@ -727,6 +728,8 @@ var CascadeStore = /** @class */ (function (_super) {
                     case 1:
                         this.preProcessDataCreated(entity, data);
                         if (!(option.modiParentEntity && !['modi', 'modiEntity', 'oper', 'operEntity'].includes(entity))) return [3 /*break*/, 3];
+                        // 变成对modi的插入
+                        (0, assert_1.default)(option.modiParentId);
                         modiCreate = {
                             id: 'dummy',
                             action: 'create',
@@ -983,6 +986,8 @@ var CascadeStore = /** @class */ (function (_super) {
                                     action: {
                                         $in: ['create', 'update'],
                                     },
+                                    entity: option.modiParentEntity,
+                                    entityId: option.modiParentId,
                                     iState: 'active',
                                     filter: ids_1.length > 0 ? {
                                         id: {

package/lib/store/checker.d.ts

@@ -1,7 +1,7 @@
-import { Checker, EntityDict, ExpressionRelationChecker, OperateOption, SelectOption, StorageSchema, Trigger } from "../types";
+import { Checker, EntityDict, OperateOption, SelectOption, StorageSchema, Trigger } from "../types";
 import { EntityDict as BaseEntityDict } from '../base-app-domain';
 import { AsyncContext } from "./AsyncRowStore";
 import { SyncContext } from './SyncRowStore';
 export declare function translateCheckerInAsyncContext<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>>(checker: Checker<ED, keyof ED, Cxt>): Trigger<ED, keyof ED, Cxt>['fn'];
 export declare function translateCheckerInSyncContext<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends SyncContext<ED>>(checker: Checker<ED, T, Cxt>): (operation: ED[T]['Operation'], context: Cxt, option: OperateOption | SelectOption) => void;
-export declare function createRelationHierarchyCheckers<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED> | SyncContext<ED>>(schema: StorageSchema<ED>): ExpressionRelationChecker<ED, keyof ED, Cxt>[];
+export declare function createRelationHierarchyCheckers<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED> | SyncContext<ED>>(schema: StorageSchema<ED>): Checker<ED, keyof ED, Cxt>[];

package/lib/store/checker.js

@@ -304,6 +304,9 @@ function createRelationHierarchyCheckers(schema) {
                     entity: userEntityName_1,
                     action: 'remove',
                     type: 'expressionRelation',
+                    conditionalFilter: {
+                        relation: r,
+                    },
                     expression: function (operation, context) {
                         var _a, _b;
                         var userId = context.getCurrentUserId();
@@ -343,6 +346,41 @@ function createRelationHierarchyCheckers(schema) {
             for (var r in reverseHierarchy_1) {
                 _loop_2(r);
             }
+            /* // 一个人不能授权给自己，也不能删除自己的授权
+            checkers.push({
+                entity: userEntityName as keyof ED,
+                action: 'create' as ED[keyof ED]['Action'],
+                type: 'data',
+                checker: (data, context) => {
+                    assert(!(data instanceof Array));
+                    const { userId } = data as ED[keyof ED]['CreateSingle']['data'];
+                    const userId2 = context.getCurrentUserId(true);
+                    if (userId === userId2) {
+                        throw new OakDataException('不允许授权给自己');
+                    }
+                }
+            });
+
+            checkers.push({
+                entity: userEntityName as keyof ED,
+                action: 'remove' as ED[keyof ED]['Action'],
+                type: 'row',
+                filter: (operation, context) => {
+                    const userId = context.getCurrentUserId(true);
+                    if (userId) {
+                        return {
+                            userId: {
+                                $ne: userId,
+                            },
+                        };
+                    }
+                    console.warn(`没有当前用户但在删除权限，请检查。对象是${entity}`);
+                    return {};
+                },
+                errMsg: '不允许回收自己的授权',
+            }); */
+            // 转让权限现在用update动作，只允许update userId给其它人
+            // todo 等实现的时候再写
         }
     };
     for (var entity in schema) {

package/lib/store/filter.js

@@ -871,8 +871,8 @@ function checkFilterRepel(entity, context, filter1, filter2) {
         blockTrigger: true,
     });
     if (count instanceof Promise) {
-        return count.then(function (count2) { return count2 !== 0; });
+        return count.then(function (count2) { return count2 === 0; });
     }
-    return count !== 0;
+    return count === 0;
 }
 exports.checkFilterRepel = checkFilterRepel;

package/lib/store/modi.js

@@ -5,6 +5,7 @@ var tslib_1 = require("tslib");
 var action_1 = require("../actions/action");
 var lodash_1 = require("../utils/lodash");
 var uuid_1 = require("../utils/uuid");
+var assert_1 = tslib_1.__importDefault(require("assert"));
 function createOperationsFromModies(modies) {
     return modies.map(function (modi) {
         return {
@@ -86,12 +87,45 @@ function createModiRelatedCheckers(schema) {
             action: restActions,
             type: 'row',
             filter: function (operation, context, option) {
-                if (option.modiParentId && option.modiParentEntity) {
-                    // 如果本身也是创建modi就允许通过
+                /**
+                 * 只有一种情况可以通过，即当前是在更新和active的modi所指向同一个父更新对象。
+                 * 比如：先申请了一个公司（company），再申请修改公司（companyApplyment），这时所有的active modi都指向此条companyApplyment
+                 *      这时：
+                 *          1）再申请一条新的修改公司（create companyApplyment），应被拒绝
+                 *          2）申请修改原来的companyApplyment(update companyApplyment)，可以通过
+                 *          3）在其它路径上对此company对象进行直接的更新，应被拒绝
+                 */
+                if (option.modiParentEntity) {
+                    var _a = option, modiParentEntity = _a.modiParentEntity, modiParentId = _a.modiParentId;
+                    (0, assert_1.default)(modiParentEntity);
+                    (0, assert_1.default)(modiParentId);
                     return {
                         id: {
-                            $exists: true,
-                        },
+                            $nin: {
+                                entity: 'modiEntity',
+                                data: {
+                                    entityId: 1,
+                                },
+                                filter: {
+                                    entity: entity,
+                                    modi: {
+                                        iState: 'active',
+                                        $or: [
+                                            {
+                                                entity: {
+                                                    $ne: modiParentEntity,
+                                                },
+                                            },
+                                            {
+                                                entityId: {
+                                                    $ne: modiParentId,
+                                                },
+                                            }
+                                        ],
+                                    },
+                                },
+                            },
+                        }
                     };
                 }
                 return {
@@ -111,7 +145,7 @@ function createModiRelatedCheckers(schema) {
                     }
                 };
             },
-            errMsg: "\u66F4\u65B0\u7684\u5BF9\u8C61".concat(entity, "\u4E0A\u6709\u5C1A\u672A\u7ED3\u675F\u7684modi"),
+            errMsg: '您请求的更新对象上还有正在申请的更新，请等该更新结束后再试',
         });
     };
     for (var entity in schema) {

package/package.json

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