oak-domain 2.6.6 → 2.6.7

package/lib/store/CascadeStore.js

@@ -11,13 +11,251 @@ var types_1 = require("../types");
 var lodash_1 = require("../utils/lodash");
 var filter_2 = require("./filter");
 var uuid_1 = require("../utils/uuid");
-var selection_1 = require("./selection");
 /**这个用来处理级联的select和update，对不同能力的 */
 var CascadeStore = /** @class */ (function (_super) {
     tslib_1.__extends(CascadeStore, _super);
     function CascadeStore(storageSchema) {
-        return _super.call(this, storageSchema) || this;
+        var _this = _super.call(this, storageSchema) || this;
+        _this.selectionRewriters = [];
+        _this.operationRewriters = [];
+        return _this;
     }
+    CascadeStore.prototype.reinforceSelection = function (entity, selection) {
+        var _this = this;
+        var filter = selection.filter, data = selection.data, sorter = selection.sorter;
+        var checkNode = function (projectionNode, attrs) {
+            attrs.forEach(function (attr) {
+                var _a;
+                if (!projectionNode.hasOwnProperty(attr)) {
+                    Object.assign(projectionNode, (_a = {},
+                        _a[attr] = 1,
+                        _a));
+                }
+            });
+        };
+        var relevantIds = [];
+        if (filter) {
+            var toBeAssignNode_1 = {}; // 用来记录在表达式中涉及到的结点
+            // filter当中所关联到的属性必须在projection中
+            var filterNodeDict_1 = {};
+            var checkFilterNode_1 = function (entity2, filterNode, projectionNode) {
+                var _a, e_1, _b, _c, _d, _e, _f;
+                var necessaryAttrs = ['id'];
+                for (var attr in filterNode) {
+                    if (attr === '#id') {
+                        (0, assert_1.default)(!filterNodeDict_1[filterNode[attr]], "projection\u4E2D\u7ED3\u70B9\u7684id\u6709\u91CD\u590D, ".concat(filterNode[attr]));
+                        Object.assign(filterNodeDict_1, (_a = {},
+                            _a[filterNode[attr]] = projectionNode,
+                            _a));
+                        if (toBeAssignNode_1[filterNode[attr]]) {
+                            checkNode(projectionNode, toBeAssignNode_1[filterNode[attr]]);
+                        }
+                    }
+                    else if (['$and', '$or'].includes(attr)) {
+                        try {
+                            for (var _g = (e_1 = void 0, tslib_1.__values(filterNode[attr])), _h = _g.next(); !_h.done; _h = _g.next()) {
+                                var node = _h.value;
+                                checkFilterNode_1(entity2, node, projectionNode);
+                            }
+                        }
+                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                        finally {
+                            try {
+                                if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
+                            }
+                            finally { if (e_1) throw e_1.error; }
+                        }
+                    }
+                    else if (attr === '$not') {
+                        checkFilterNode_1(entity2, filterNode[attr], projectionNode);
+                    }
+                    else if (attr === '$text') {
+                        // 全文检索首先要有fulltext索引，其次要把fulltext的相关属性加到projection里
+                        var indexes = _this.getSchema()[entity2].indexes;
+                        var fulltextIndex = indexes.find(function (ele) { return ele.config && ele.config.type === 'fulltext'; });
+                        var attributes = fulltextIndex.attributes;
+                        necessaryAttrs.push.apply(necessaryAttrs, tslib_1.__spreadArray([], tslib_1.__read((attributes.map(function (ele) { return ele.name; }))), false));
+                    }
+                    else {
+                        if (attr.toLowerCase().startsWith(types_1.EXPRESSION_PREFIX)) {
+                            var exprResult = (0, types_1.getAttrRefInExpression)(filterNode[attr]);
+                            for (var nodeName in exprResult) {
+                                if (nodeName === '#current') {
+                                    checkNode(projectionNode, exprResult[nodeName]);
+                                }
+                                else if (filterNodeDict_1[nodeName]) {
+                                    checkNode(filterNodeDict_1[nodeName], exprResult[nodeName]);
+                                }
+                                else {
+                                    if (toBeAssignNode_1[nodeName]) {
+                                        (_c = toBeAssignNode_1[nodeName]).push.apply(_c, tslib_1.__spreadArray([], tslib_1.__read(exprResult[nodeName]), false));
+                                    }
+                                    else {
+                                        Object.assign(toBeAssignNode_1, (_d = {},
+                                            _d[nodeName] = exprResult[nodeName],
+                                            _d));
+                                    }
+                                }
+                            }
+                        }
+                        else {
+                            var rel = _this.judgeRelation(entity2, attr);
+                            if (rel === 1) {
+                                necessaryAttrs.push(attr);
+                            }
+                            else if (rel === 2) {
+                                // entity/entityId反指
+                                necessaryAttrs.push('entity', 'entityId');
+                                if (!projectionNode[attr]) {
+                                    Object.assign(projectionNode, (_e = {},
+                                        _e[attr] = {
+                                            id: 1,
+                                        },
+                                        _e));
+                                }
+                                checkFilterNode_1(attr, filterNode[attr], projectionNode[attr]);
+                            }
+                            else if (typeof rel === 'string') {
+                                necessaryAttrs.push("".concat(attr, "Id"));
+                                if (!projectionNode[attr]) {
+                                    Object.assign(projectionNode, (_f = {},
+                                        _f[attr] = {
+                                            id: 1,
+                                        },
+                                        _f));
+                                }
+                                checkFilterNode_1(rel, filterNode[attr], projectionNode[attr]);
+                            }
+                            else if (rel instanceof Array) {
+                                // 现在filter中还不支持一对多的语义，先放着吧
+                            }
+                        }
+                    }
+                    checkNode(projectionNode, necessaryAttrs);
+                }
+            };
+            checkFilterNode_1(entity, filter, data);
+            relevantIds = (0, filter_2.getRelevantIds)(filter);
+        }
+        // sorter感觉现在取不取影响不大，前端的list直接获取返回的ids了，先不管之
+        if (sorter) {
+        }
+        var toBeAssignNode2 = {}; // 用来记录在表达式中涉及到的结点
+        var projectionNodeDict = {};
+        var checkProjectionNode = function (entity2, projectionNode) {
+            var _a, _b, _c;
+            var necessaryAttrs = ['id', '$$createAt$$']; // 有的页面依赖于其它页面取数据，有时两个页面的filter的差异会导致有一个加createAt，有一个不加，此时可能产生前台取数据不完整的异常。先统一加上
+            for (var attr in projectionNode) {
+                if (attr === '#id') {
+                    (0, assert_1.default)(!projectionNodeDict[projectionNode[attr]], "projection\u4E2D\u7ED3\u70B9\u7684id\u6709\u91CD\u590D, ".concat(projectionNode[attr]));
+                    Object.assign(projectionNodeDict, (_a = {},
+                        _a[projectionNode[attr]] = projectionNode,
+                        _a));
+                    if (toBeAssignNode2[projectionNode[attr]]) {
+                        checkNode(projectionNode, toBeAssignNode2[projectionNode[attr]]);
+                    }
+                }
+                else {
+                    if (attr.toLowerCase().startsWith(types_1.EXPRESSION_PREFIX)) {
+                        var exprResult = (0, types_1.getAttrRefInExpression)(projectionNode[attr]);
+                        for (var nodeName in exprResult) {
+                            if (nodeName === '#current') {
+                                checkNode(projectionNode, exprResult[nodeName]);
+                            }
+                            else if (projectionNodeDict[nodeName]) {
+                                checkNode(projectionNodeDict[nodeName], exprResult[nodeName]);
+                            }
+                            else {
+                                if (toBeAssignNode2[nodeName]) {
+                                    (_b = toBeAssignNode2[nodeName]).push.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(exprResult[nodeName]), false));
+                                }
+                                else {
+                                    Object.assign(toBeAssignNode2, (_c = {},
+                                        _c[nodeName] = exprResult[nodeName],
+                                        _c));
+                                }
+                            }
+                        }
+                    }
+                    else {
+                        var rel = (0, relation_1.judgeRelation)(_this.getSchema(), entity2, attr);
+                        if (rel === 1) {
+                            necessaryAttrs.push(attr);
+                        }
+                        else if (rel === 2) {
+                            // entity/entityId反指
+                            necessaryAttrs.push('entity', 'entityId');
+                            checkProjectionNode(attr, projectionNode[attr]);
+                        }
+                        else if (typeof rel === 'string') {
+                            necessaryAttrs.push("".concat(attr, "Id"));
+                            checkProjectionNode(rel, projectionNode[attr]);
+                        }
+                        else if (rel instanceof Array && !attr.endsWith('$$aggr')) {
+                            var data_1 = projectionNode[attr].data;
+                            if (rel[1]) {
+                                checkNode(data_1, [rel[1]]);
+                            }
+                            else {
+                                checkNode(data_1, ['entity', 'entityId']);
+                            }
+                            _this.reinforceSelection(rel[0], projectionNode[attr]);
+                        }
+                    }
+                }
+                checkNode(projectionNode, necessaryAttrs);
+            }
+            // 如果对象中指向一对多的Modi，此时加上指向Modi的projection
+            if (_this.getSchema()[entity2].toModi) {
+                Object.assign(projectionNode, {
+                    modi$entity: {
+                        $entity: 'modi',
+                        data: {
+                            id: 1,
+                            targetEntity: 1,
+                            entity: 1,
+                            entityId: 1,
+                            action: 1,
+                            iState: 1,
+                            data: 1,
+                            filter: 1,
+                        },
+                        filter: {
+                            iState: 'active',
+                        },
+                    }
+                });
+            }
+        };
+        checkProjectionNode(entity, data);
+        if (!sorter && relevantIds.length === 0) {
+            // 如果没有sorter，就给予一个按createAt逆序的sorter
+            Object.assign(selection, {
+                sorter: [
+                    {
+                        $attr: {
+                            $$createAt$$: 1,
+                        },
+                        $direction: 'desc',
+                    }
+                ]
+            });
+            Object.assign(data, {
+                $$createAt$$: 1,
+            });
+        }
+        this.selectionRewriters.forEach(function (ele) { return ele(_this.getSchema(), entity, selection); });
+    };
+    CascadeStore.prototype.reinforceOperation = function (entity, operation) {
+        var _this = this;
+        this.operationRewriters.forEach(function (ele) { return ele(_this.getSchema(), entity, operation); });
+    };
+    CascadeStore.prototype.registerOperationRewriter = function (rewriter) {
+        this.operationRewriters.push(rewriter);
+    };
+    CascadeStore.prototype.registerSelectionRewriter = function (rewriter) {
+        this.selectionRewriters.push(rewriter);
+    };
     CascadeStore.prototype.destructCascadeSelect = function (entity, projection2, context, cascadeSelectFn, aggregateFn, option) {
         var _this = this;
         var projection = {};
@@ -69,6 +307,10 @@ var CascadeStore = /** @class */ (function (_super) {
                 }
                 else {
                     cascadeSelectionFns.push(function (result) {
+                        var entityIds = (0, lodash_1.uniq)(result.filter(function (ele) { return ele.entity === attr; }).map(function (ele) {
+                            (0, assert_1.default)(ele.entityId !== null);
+                            return ele.entityId;
+                        }));
                         var dealWithSubRows = function (subRows) {
                             (0, assert_1.default)(subRows.length <= entityIds.length);
                             if (subRows.length < entityIds.length && !toModi) {
@@ -101,10 +343,6 @@ var CascadeStore = /** @class */ (function (_super) {
                                 }
                             });
                         };
-                        var entityIds = (0, lodash_1.uniq)(result.filter(function (ele) { return ele.entity === attr; }).map(function (ele) {
-                            (0, assert_1.default)(ele.entityId !== null);
-                            return ele.entityId;
-                        }));
                         if (entityIds.length > 0) {
                             var subRows = cascadeSelectFn.call(_this, attr, {
                                 data: projection2[attr],
@@ -121,8 +359,6 @@ var CascadeStore = /** @class */ (function (_super) {
                                 dealWithSubRows(subRows);
                             }
                         }
-                        else {
-                        }
                     });
                 }
             }
@@ -161,6 +397,7 @@ var CascadeStore = /** @class */ (function (_super) {
                 }
                 else {
                     cascadeSelectionFns.push(function (result) {
+                        var ids = (0, lodash_1.uniq)(result.filter(function (ele) { return !!(ele["".concat(attr, "Id")]); }).map(function (ele) { return ele["".concat(attr, "Id")]; }));
                         var dealWithSubRows = function (subRows) {
                             (0, assert_1.default)(subRows.length <= ids.length);
                             if (subRows.length < ids.length && !toModi) {
@@ -198,7 +435,6 @@ var CascadeStore = /** @class */ (function (_super) {
                                 }
                             });
                         };
-                        var ids = (0, lodash_1.uniq)(result.filter(function (ele) { return !!(ele["".concat(attr, "Id")]); }).map(function (ele) { return ele["".concat(attr, "Id")]; }));
                         if (ids.length > 0) {
                             var subRows = cascadeSelectFn.call(_this, relation, {
                                 data: projection2[attr],
@@ -262,14 +498,24 @@ var CascadeStore = /** @class */ (function (_super) {
                             var _a;
                             var ids = result.map(function (ele) { return ele.id; });
                             var dealWithSubRows = function (subRows) {
-                                result.forEach(function (ele) {
-                                    var _a;
-                                    var subRowss = subRows.filter(function (ele2) { return ele2[foreignKey_1] === ele.id; });
-                                    (0, assert_1.default)(subRowss);
-                                    Object.assign(ele, (_a = {},
-                                        _a[attr] = subRowss,
+                                var _a;
+                                // 这里如果result只有一行，则把返回结果直接置上，不对比外键值
+                                // 这样做的原因是有的对象的filter会被改写掉（userId)，只能临时这样处理
+                                if (result.length == 1) {
+                                    Object.assign(result[0], (_a = {},
+                                        _a[attr] = subRows,
                                         _a));
-                                });
+                                }
+                                else {
+                                    result.forEach(function (ele) {
+                                        var _a;
+                                        var subRowss = subRows.filter(function (ele2) { return ele2[foreignKey_1] === ele.id; });
+                                        (0, assert_1.default)(subRowss);
+                                        Object.assign(ele, (_a = {},
+                                            _a[attr] = subRowss,
+                                            _a));
+                                    });
+                                }
                             };
                             if (ids.length > 0) {
                                 var subRows = cascadeSelectFn.call(_this, entity2_1, {
@@ -332,14 +578,24 @@ var CascadeStore = /** @class */ (function (_super) {
                         cascadeSelectionFns.push(function (result) {
                             var ids = result.map(function (ele) { return ele.id; });
                             var dealWithSubRows = function (subRows) {
-                                result.forEach(function (ele) {
-                                    var _a;
-                                    var subRowss = subRows.filter(function (ele2) { return ele2.entityId === ele.id; });
-                                    (0, assert_1.default)(subRowss);
-                                    Object.assign(ele, (_a = {},
-                                        _a[attr] = subRowss,
+                                var _a;
+                                // 这里如果result只有一行，则把返回结果直接置上，不对比外键值
+                                // 这样做的原因是有的对象的filter会被改写掉（userId)，只能临时这样处理
+                                if (result.length === 1) {
+                                    Object.assign(result[0], (_a = {},
+                                        _a[attr] = subRows,
                                         _a));
-                                });
+                                }
+                                else {
+                                    result.forEach(function (ele) {
+                                        var _a;
+                                        var subRowss = subRows.filter(function (ele2) { return ele2.entityId === ele.id; });
+                                        (0, assert_1.default)(subRowss);
+                                        Object.assign(ele, (_a = {},
+                                            _a[attr] = subRowss,
+                                            _a));
+                                    });
+                                }
                             };
                             if (ids.length > 0) {
                                 var subRows = cascadeSelectFn.call(_this, entity2_1, {
@@ -426,7 +682,7 @@ var CascadeStore = /** @class */ (function (_super) {
             option2.modiParentEntity = entity;
         }
         var _loop_2 = function (attr) {
-            var _a, _b, _c, e_1, _d;
+            var _a, _b, _c, e_2, _d;
             var relation = (0, relation_1.judgeRelation)(this_2.storageSchema, entity, attr);
             if (relation === 1) {
                 Object.assign(opData, (_a = {},
@@ -683,17 +939,17 @@ var CascadeStore = /** @class */ (function (_super) {
                 };
                 if (otmOperations instanceof Array) {
                     try {
-                        for (var otmOperations_1 = (e_1 = void 0, tslib_1.__values(otmOperations)), otmOperations_1_1 = otmOperations_1.next(); !otmOperations_1_1.done; otmOperations_1_1 = otmOperations_1.next()) {
+                        for (var otmOperations_1 = (e_2 = void 0, tslib_1.__values(otmOperations)), otmOperations_1_1 = otmOperations_1.next(); !otmOperations_1_1.done; otmOperations_1_1 = otmOperations_1.next()) {
                             var oper = otmOperations_1_1.value;
                             dealWithOneToMany(oper);
                         }
                     }
-                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
                     finally {
                         try {
                             if (otmOperations_1_1 && !otmOperations_1_1.done && (_d = otmOperations_1.return)) _d.call(otmOperations_1);
                         }
-                        finally { if (e_1) throw e_1.error; }
+                        finally { if (e_2) throw e_2.error; }
                     }
                 }
                 else {
@@ -754,8 +1010,8 @@ var CascadeStore = /** @class */ (function (_super) {
      */
     CascadeStore.prototype.doUpdateSingleRowAsync = function (entity, operation, context, option) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var data, action, operId, filter, now, _a, modiCreate, result_1, createInner, multipleCreate, data_1, data_1_1, d, createSingleOper, e_2_1, operatorId, createOper, _b, ids_1, selection, rows, modiUpsert, upsertModis, _c, originData, originId, _d, createOper, updateAttrCount, result;
-            var e_2, _e, _f, _g, _h, _j, _k, _l;
+            var data, action, operId, filter, now, _a, modiCreate, result_1, createInner, multipleCreate, data_2, data_2_1, d, createSingleOper, e_3_1, operatorId, createOper, _b, ids_1, selection, rows, modiUpsert, upsertModis, _c, originData, originId, _d, createOper, updateAttrCount, result;
+            var e_3, _e, _f, _g, _h, _j, _k, _l;
             var _this = this;
             return tslib_1.__generator(this, function (_m) {
                 switch (_m.label) {
@@ -766,7 +1022,7 @@ var CascadeStore = /** @class */ (function (_super) {
                         switch (_a) {
                             case 'create': return [3 /*break*/, 1];
                         }
-                        return [3 /*break*/, 23];
+                        return [3 /*break*/, 22];
                     case 1:
                         this.preProcessDataCreated(entity, data);
                         if (!(option.modiParentEntity && !['modi', 'modiEntity', 'oper', 'operEntity'].includes(entity))) return [3 /*break*/, 3];
@@ -797,7 +1053,7 @@ var CascadeStore = /** @class */ (function (_super) {
                     case 3:
                         result_1 = 0;
                         createInner = function (operation2) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                            var _a, e_3;
+                            var _a, e_4;
                             return tslib_1.__generator(this, function (_b) {
                                 switch (_b.label) {
                                     case 0:
@@ -808,7 +1064,7 @@ var CascadeStore = /** @class */ (function (_super) {
                                         result_1 = _a + _b.sent();
                                         return [3 /*break*/, 3];
                                     case 2:
-                                        e_3 = _b.sent();
+                                        e_4 = _b.sent();
                                         /* 这段代码是处理插入时有重复的行，现在看有问题，等实际需求出现再写
                                         if (e instanceof OakCongruentRowExists) {
                                             if (option.allowExists) {
@@ -872,7 +1128,7 @@ var CascadeStore = /** @class */ (function (_super) {
                                                 }
                                             }
                                         } */
-                                        throw e_3;
+                                        throw e_4;
                                     case 3: return [2 /*return*/];
                                 }
                             });
@@ -886,11 +1142,11 @@ var CascadeStore = /** @class */ (function (_super) {
                         return [3 /*break*/, 12];
                     case 5:
                         _m.trys.push([5, 10, 11, 12]);
-                        data_1 = tslib_1.__values(data), data_1_1 = data_1.next();
+                        data_2 = tslib_1.__values(data), data_2_1 = data_2.next();
                         _m.label = 6;
                     case 6:
-                        if (!!data_1_1.done) return [3 /*break*/, 9];
-                        d = data_1_1.value;
+                        if (!!data_2_1.done) return [3 /*break*/, 9];
+                        d = data_2_1.value;
                         createSingleOper = {
                             id: 'any',
                             action: 'create',
@@ -901,18 +1157,18 @@ var CascadeStore = /** @class */ (function (_super) {
                         _m.sent();
                         _m.label = 8;
                     case 8:
-                        data_1_1 = data_1.next();
+                        data_2_1 = data_2.next();
                         return [3 /*break*/, 6];
                     case 9: return [3 /*break*/, 12];
                     case 10:
-                        e_2_1 = _m.sent();
-                        e_2 = { error: e_2_1 };
+                        e_3_1 = _m.sent();
+                        e_3 = { error: e_3_1 };
                         return [3 /*break*/, 12];
                     case 11:
                         try {
-                            if (data_1_1 && !data_1_1.done && (_e = data_1.return)) _e.call(data_1);
+                            if (data_2_1 && !data_2_1.done && (_e = data_2.return)) _e.call(data_2);
                         }
-                        finally { if (e_2) throw e_2.error; }
+                        finally { if (e_3) throw e_3.error; }
                         return [7 /*endfinally*/];
                     case 12: return [3 /*break*/, 15];
                     case 13: return [4 /*yield*/, createInner(operation)];
@@ -927,13 +1183,11 @@ var CascadeStore = /** @class */ (function (_super) {
                                 d: data,
                             });
                         }
-                        if (!(!option.dontCreateOper && !['oper', 'operEntity', 'modiEntity', 'modi'].includes(entity))) return [3 /*break*/, 22];
+                        if (!(!option.dontCreateOper && !['oper', 'operEntity', 'modiEntity', 'modi'].includes(entity))) return [3 /*break*/, 21];
                         // 按照框架要求生成Oper和OperEntity这两个内置的对象
                         (0, assert_1.default)(operId);
-                        return [4 /*yield*/, context.getCurrentUserId(true)];
-                    case 16:
-                        operatorId = _m.sent();
-                        if (!operatorId) return [3 /*break*/, 22];
+                        operatorId = context.getCurrentUserId(true);
+                        if (!operatorId) return [3 /*break*/, 21];
                         _f = {
                             id: 'dummy',
                             action: 'create'
@@ -942,9 +1196,10 @@ var CascadeStore = /** @class */ (function (_super) {
                             id: operId,
                             action: action,
                             data: data,
-                            operatorId: operatorId
+                            operatorId: operatorId,
+                            targetEntity: entity
                         };
-                        if (!(data instanceof Array)) return [3 /*break*/, 18];
+                        if (!(data instanceof Array)) return [3 /*break*/, 17];
                         _h = {
                             id: 'dummy',
                             action: 'create'
@@ -957,31 +1212,31 @@ var CascadeStore = /** @class */ (function (_super) {
                                             _a = {};
                                             return [4 /*yield*/, (0, uuid_1.generateNewIdAsync)()];
                                         case 1: return [2 /*return*/, (_a.id = _b.sent(),
-                                                _a.entity = entity,
                                                 _a.entityId = ele.id,
+                                                _a.entity = entity,
                                                 _a)];
                                     }
                                 });
                             }); }))];
-                    case 17:
+                    case 16:
                         _b = (_h.data = _m.sent(),
                             _h);
-                        return [3 /*break*/, 20];
-                    case 18:
+                        return [3 /*break*/, 19];
+                    case 17:
                         _j = {
                             id: 'dummy',
                             action: 'create'
                         };
                         _k = {};
                         return [4 /*yield*/, (0, uuid_1.generateNewIdAsync)()];
-                    case 19:
+                    case 18:
                         _b = [(_j.data = (_k.id = _m.sent(),
-                                _k.entity = entity,
                                 _k.entityId = data.id,
+                                _k.entity = entity,
                                 _k),
                                 _j)];
-                        _m.label = 20;
-                    case 20:
+                        _m.label = 19;
+                    case 19:
                         createOper = (_f.data = (_g.operEntity$oper = _b,
                             _g),
                             _f);
@@ -989,13 +1244,13 @@ var CascadeStore = /** @class */ (function (_super) {
                                 dontCollect: true,
                                 dontCreateOper: true,
                             })];
-                    case 21:
+                    case 20:
                         _m.sent();
-                        _m.label = 22;
-                    case 22: return [2 /*return*/, result_1];
-                    case 23:
+                        _m.label = 21;
+                    case 21: return [2 /*return*/, result_1];
+                    case 22:
                         ids_1 = (0, filter_2.getRelevantIds)(filter);
-                        if (!(ids_1.length === 0)) return [3 /*break*/, 25];
+                        if (!(ids_1.length === 0)) return [3 /*break*/, 24];
                         selection = {
                             data: {
                                 id: 1,
@@ -1007,17 +1262,17 @@ var CascadeStore = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.selectAbjointRowAsync(entity, selection, context, {
                                 dontCollect: true,
                             })];
-                    case 24:
+                    case 23:
                         rows = _m.sent();
                         ids_1.push.apply(ids_1, tslib_1.__spreadArray([], tslib_1.__read((rows.map(function (ele) { return ele.id; }))), false));
-                        _m.label = 25;
-                    case 25:
+                        _m.label = 24;
+                    case 24:
                         if (data) {
                             this.preProcessDataUpdated(data);
                         }
-                        if (!(option.modiParentEntity && !['modi', 'modiEntity'].includes(entity))) return [3 /*break*/, 31];
+                        if (!(option.modiParentEntity && !['modi', 'modiEntity'].includes(entity))) return [3 /*break*/, 30];
                         modiUpsert = void 0;
-                        if (!(action !== 'remove')) return [3 /*break*/, 27];
+                        if (!(action !== 'remove')) return [3 /*break*/, 26];
                         return [4 /*yield*/, this.selectAbjointRowAsync('modi', {
                                 data: {
                                     id: 1,
@@ -1048,7 +1303,7 @@ var CascadeStore = /** @class */ (function (_super) {
                                 indexFrom: 0,
                                 count: 1,
                             }, context, option)];
-                    case 26:
+                    case 25:
                         upsertModis = _m.sent();
                         if (upsertModis.length > 0) {
                             _c = upsertModis[0], originData = _c.data, originId = _c.id;
@@ -1063,9 +1318,9 @@ var CascadeStore = /** @class */ (function (_super) {
                                 }
                             };
                         }
-                        _m.label = 27;
-                    case 27:
-                        if (!!modiUpsert) return [3 /*break*/, 29];
+                        _m.label = 26;
+                    case 26:
+                        if (!!modiUpsert) return [3 /*break*/, 28];
                         modiUpsert = {
                             id: 'dummy',
                             action: 'create',
@@ -1080,7 +1335,7 @@ var CascadeStore = /** @class */ (function (_super) {
                                 filter: filter,
                             },
                         };
-                        if (!(ids_1.length > 0)) return [3 /*break*/, 29];
+                        if (!(ids_1.length > 0)) return [3 /*break*/, 28];
                         _d = modiUpsert.data;
                         _l = {
                             id: 'dummy',
@@ -1100,15 +1355,15 @@ var CascadeStore = /** @class */ (function (_super) {
                                     }
                                 });
                             }); }))];
-                    case 28:
+                    case 27:
                         _d.modiEntity$modi = (_l.data = _m.sent(),
                             _l);
-                        _m.label = 29;
-                    case 29: return [4 /*yield*/, this.cascadeUpdateAsync('modi', modiUpsert, context, option)];
-                    case 30:
+                        _m.label = 28;
+                    case 28: return [4 /*yield*/, this.cascadeUpdateAsync('modi', modiUpsert, context, option)];
+                    case 29:
                         _m.sent();
                         return [2 /*return*/, 1];
-                    case 31:
+                    case 30:
                         createOper = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                             var createOper_1;
                             var _a, _b, _c;
@@ -1126,7 +1381,8 @@ var CascadeStore = /** @class */ (function (_super) {
                                         _b = {
                                             id: operId,
                                             action: action,
-                                            data: data
+                                            data: data,
+                                            targetEntity: entity
                                         };
                                         _c = {
                                             id: 'dummy',
@@ -1140,8 +1396,8 @@ var CascadeStore = /** @class */ (function (_super) {
                                                             _a = {};
                                                             return [4 /*yield*/, (0, uuid_1.generateNewIdAsync)()];
                                                         case 1: return [2 /*return*/, (_a.id = _b.sent(),
-                                                                _a.entity = entity,
                                                                 _a.entityId = ele,
+                                                                _a.entity = entity,
                                                                 _a)];
                                                     }
                                                 });
@@ -1162,7 +1418,7 @@ var CascadeStore = /** @class */ (function (_super) {
                                 }
                             });
                         }); };
-                        if (!(action === 'remove')) return [3 /*break*/, 32];
+                        if (!(action === 'remove')) return [3 /*break*/, 31];
                         if (!option.dontCollect) {
                             context.opRecords.push({
                                 a: 'r',
@@ -1174,10 +1430,10 @@ var CascadeStore = /** @class */ (function (_super) {
                                 },
                             });
                         }
-                        return [3 /*break*/, 36];
-                    case 32:
+                        return [3 /*break*/, 35];
+                    case 31:
                         updateAttrCount = Object.keys(data).length;
-                        if (!(updateAttrCount > 0)) return [3 /*break*/, 33];
+                        if (!(updateAttrCount > 0)) return [3 /*break*/, 32];
                         // 优化一下，如果不更新任何属性，则不实际执行
                         Object.assign(data, {
                             $$updateAt$$: now,
@@ -1194,21 +1450,21 @@ var CascadeStore = /** @class */ (function (_super) {
                                 },
                             });
                         }
-                        return [3 /*break*/, 36];
-                    case 33:
-                        if (!(action !== 'update')) return [3 /*break*/, 35];
+                        return [3 /*break*/, 35];
+                    case 32:
+                        if (!(action !== 'update')) return [3 /*break*/, 34];
                         // 如果不是update动作而是用户自定义的动作，这里还是要记录oper
                         return [4 /*yield*/, createOper()];
-                    case 34:
+                    case 33:
                         // 如果不是update动作而是用户自定义的动作，这里还是要记录oper
                         _m.sent();
                         return [2 /*return*/, 0];
-                    case 35: return [2 /*return*/, 0];
-                    case 36: return [4 /*yield*/, this.updateAbjointRowAsync(entity, operation, context, option)];
-                    case 37:
+                    case 34: return [2 /*return*/, 0];
+                    case 35: return [4 /*yield*/, this.updateAbjointRowAsync(entity, operation, context, option)];
+                    case 36:
                         result = _m.sent();
                         return [4 /*yield*/, createOper()];
-                    case 38:
+                    case 37:
                         _m.sent();
                         return [2 /*return*/, result];
                 }
@@ -1216,7 +1472,7 @@ var CascadeStore = /** @class */ (function (_super) {
         });
     };
     CascadeStore.prototype.doUpdateSingleRow = function (entity, operation, context, option) {
-        var e_4, _a;
+        var e_5, _a;
         var _this = this;
         var data = operation.data, action = operation.action, operId = operation.id, filter = operation.filter;
         var now = Date.now();
@@ -1239,8 +1495,8 @@ var CascadeStore = /** @class */ (function (_super) {
                     }
                     else {
                         try {
-                            for (var data_2 = tslib_1.__values(data), data_2_1 = data_2.next(); !data_2_1.done; data_2_1 = data_2.next()) {
-                                var d = data_2_1.value;
+                            for (var data_3 = tslib_1.__values(data), data_3_1 = data_3.next(); !data_3_1.done; data_3_1 = data_3.next()) {
+                                var d = data_3_1.value;
                                 var createSingleOper = {
                                     id: 'any',
                                     action: 'create',
@@ -1249,12 +1505,12 @@ var CascadeStore = /** @class */ (function (_super) {
                                 createInner(createSingleOper);
                             }
                         }
-                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
                         finally {
                             try {
-                                if (data_2_1 && !data_2_1.done && (_a = data_2.return)) _a.call(data_2);
+                                if (data_3_1 && !data_3_1.done && (_a = data_3.return)) _a.call(data_3);
                             }
-                            finally { if (e_4) throw e_4.error; }
+                            finally { if (e_5) throw e_5.error; }
                         }
                     }
                 }
@@ -1284,8 +1540,8 @@ var CascadeStore = /** @class */ (function (_super) {
         }
     };
     CascadeStore.prototype.cascadeUpdate = function (entity, operation, context, option) {
-        var e_5, _a, e_6, _b, e_7, _c;
-        (0, selection_1.reinforceOperation)(this.getSchema(), entity, operation);
+        var e_6, _a, e_7, _b, e_8, _c;
+        this.reinforceOperation(entity, operation);
         var action = operation.action, data = operation.data, filter = operation.filter, id = operation.id;
         var opData;
         var wholeBeforeFns = [];
@@ -1294,20 +1550,20 @@ var CascadeStore = /** @class */ (function (_super) {
         if (['create', 'create-l'].includes(action) && data instanceof Array) {
             opData = [];
             try {
-                for (var data_3 = tslib_1.__values(data), data_3_1 = data_3.next(); !data_3_1.done; data_3_1 = data_3.next()) {
-                    var d = data_3_1.value;
+                for (var data_4 = tslib_1.__values(data), data_4_1 = data_4.next(); !data_4_1.done; data_4_1 = data_4.next()) {
+                    var d = data_4_1.value;
                     var _d = this.destructCascadeUpdate(entity, action, d, context, option, this.cascadeUpdate), od = _d.data, beforeFns = _d.beforeFns, afterFns = _d.afterFns;
                     opData.push(od);
                     wholeBeforeFns.push.apply(wholeBeforeFns, tslib_1.__spreadArray([], tslib_1.__read(beforeFns), false));
                     wholeAfterFns.push.apply(wholeAfterFns, tslib_1.__spreadArray([], tslib_1.__read(afterFns), false));
                 }
             }
-            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+            catch (e_6_1) { e_6 = { error: e_6_1 }; }
             finally {
                 try {
-                    if (data_3_1 && !data_3_1.done && (_a = data_3.return)) _a.call(data_3);
+                    if (data_4_1 && !data_4_1.done && (_a = data_4.return)) _a.call(data_4);
                 }
-                finally { if (e_5) throw e_5.error; }
+                finally { if (e_6) throw e_6.error; }
             }
         }
         else {
@@ -1325,12 +1581,12 @@ var CascadeStore = /** @class */ (function (_super) {
                 before_1();
             }
         }
-        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
                 if (wholeBeforeFns_1_1 && !wholeBeforeFns_1_1.done && (_b = wholeBeforeFns_1.return)) _b.call(wholeBeforeFns_1);
             }
-            finally { if (e_6) throw e_6.error; }
+            finally { if (e_7) throw e_7.error; }
         }
         var count = this.doUpdateSingleRow(entity, operation2, context, option);
         try {
@@ -1339,12 +1595,12 @@ var CascadeStore = /** @class */ (function (_super) {
                 after_1();
             }
         }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        catch (e_8_1) { e_8 = { error: e_8_1 }; }
         finally {
             try {
                 if (wholeAfterFns_1_1 && !wholeAfterFns_1_1.done && (_c = wholeAfterFns_1.return)) _c.call(wholeAfterFns_1);
             }
-            finally { if (e_7) throw e_7.error; }
+            finally { if (e_8) throw e_8.error; }
         }
         return result;
     };
@@ -1357,12 +1613,12 @@ var CascadeStore = /** @class */ (function (_super) {
      */
     CascadeStore.prototype.cascadeUpdateAsync = function (entity, operation, context, option) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var action, data, filter, id, opData, wholeBeforeFns, wholeAfterFns, result, data_4, data_4_1, d, _a, od, beforeFns, afterFns, _b, od, beforeFns, afterFns, operation2, wholeBeforeFns_2, wholeBeforeFns_2_1, before_2, e_8_1, count, wholeAfterFns_2, wholeAfterFns_2_1, after_2, e_9_1;
-            var e_10, _c, e_8, _d, _e, _f, e_9, _g;
+            var action, data, filter, id, opData, wholeBeforeFns, wholeAfterFns, result, data_5, data_5_1, d, _a, od, beforeFns, afterFns, _b, od, beforeFns, afterFns, operation2, wholeBeforeFns_2, wholeBeforeFns_2_1, before_2, e_9_1, count, wholeAfterFns_2, wholeAfterFns_2_1, after_2, e_10_1;
+            var e_11, _c, e_9, _d, _e, _f, e_10, _g;
             return tslib_1.__generator(this, function (_h) {
                 switch (_h.label) {
                     case 0:
-                        (0, selection_1.reinforceOperation)(this.getSchema(), entity, operation);
+                        this.reinforceOperation(entity, operation);
                         action = operation.action, data = operation.data, filter = operation.filter, id = operation.id;
                         wholeBeforeFns = [];
                         wholeAfterFns = [];
@@ -1370,20 +1626,20 @@ var CascadeStore = /** @class */ (function (_super) {
                         if (['create', 'create-l'].includes(action) && data instanceof Array) {
                             opData = [];
                             try {
-                                for (data_4 = tslib_1.__values(data), data_4_1 = data_4.next(); !data_4_1.done; data_4_1 = data_4.next()) {
-                                    d = data_4_1.value;
+                                for (data_5 = tslib_1.__values(data), data_5_1 = data_5.next(); !data_5_1.done; data_5_1 = data_5.next()) {
+                                    d = data_5_1.value;
                                     _a = this.destructCascadeUpdate(entity, action, d, context, option, this.cascadeUpdateAsync), od = _a.data, beforeFns = _a.beforeFns, afterFns = _a.afterFns;
                                     opData.push(od);
                                     wholeBeforeFns.push.apply(wholeBeforeFns, tslib_1.__spreadArray([], tslib_1.__read(beforeFns), false));
                                     wholeAfterFns.push.apply(wholeAfterFns, tslib_1.__spreadArray([], tslib_1.__read(afterFns), false));
                                 }
                             }
-                            catch (e_10_1) { e_10 = { error: e_10_1 }; }
+                            catch (e_11_1) { e_11 = { error: e_11_1 }; }
                             finally {
                                 try {
-                                    if (data_4_1 && !data_4_1.done && (_c = data_4.return)) _c.call(data_4);
+                                    if (data_5_1 && !data_5_1.done && (_c = data_5.return)) _c.call(data_5);
                                 }
-                                finally { if (e_10) throw e_10.error; }
+                                finally { if (e_11) throw e_11.error; }
                             }
                         }
                         else {
@@ -1412,14 +1668,14 @@ var CascadeStore = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_8_1 = _h.sent();
-                        e_8 = { error: e_8_1 };
+                        e_9_1 = _h.sent();
+                        e_9 = { error: e_9_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (wholeBeforeFns_2_1 && !wholeBeforeFns_2_1.done && (_d = wholeBeforeFns_2.return)) _d.call(wholeBeforeFns_2);
                         }
-                        finally { if (e_8) throw e_8.error; }
+                        finally { if (e_9) throw e_9.error; }
                         return [7 /*endfinally*/];
                     case 8: return [4 /*yield*/, this.doUpdateSingleRowAsync(entity, operation2, context, option)];
                     case 9:
@@ -1446,14 +1702,14 @@ var CascadeStore = /** @class */ (function (_super) {
                         return [3 /*break*/, 11];
                     case 14: return [3 /*break*/, 17];
                     case 15:
-                        e_9_1 = _h.sent();
-                        e_9 = { error: e_9_1 };
+                        e_10_1 = _h.sent();
+                        e_10 = { error: e_10_1 };
                         return [3 /*break*/, 17];
                     case 16:
                         try {
                             if (wholeAfterFns_2_1 && !wholeAfterFns_2_1.done && (_g = wholeAfterFns_2.return)) _g.call(wholeAfterFns_2);
                         }
-                        finally { if (e_9) throw e_9.error; }
+                        finally { if (e_10) throw e_10.error; }
                         return [7 /*endfinally*/];
                     case 17: return [2 /*return*/, result];
                 }
@@ -1461,7 +1717,7 @@ var CascadeStore = /** @class */ (function (_super) {
         });
     };
     CascadeStore.prototype.cascadeSelect = function (entity, selection, context, option) {
-        (0, selection_1.reinforceSelection)(this.getSchema(), entity, selection);
+        this.reinforceSelection(entity, selection);
         var data = selection.data, filter = selection.filter, indexFrom = selection.indexFrom, count = selection.count, sorter = selection.sorter;
         var _a = this.destructCascadeSelect(entity, data, context, this.cascadeSelect, this.aggregateSync, option), projection = _a.projection, cascadeSelectionFns = _a.cascadeSelectionFns;
         var rows = this.selectAbjointRow(entity, {
@@ -1544,11 +1800,11 @@ var CascadeStore = /** @class */ (function (_super) {
                         var id = row.id;
                         if (!entityBranch_1[id]) {
                             Object.assign(entityBranch_1, (_a = {},
-                                _a[id] = row,
+                                _a[id] = (0, lodash_1.cloneDeep)(row),
                                 _a));
                         }
                         else {
-                            Object.assign(entityBranch_1[id], row);
+                            Object.assign(entityBranch_1[id], (0, lodash_1.cloneDeep)(row));
                         }
                     }
                 });
@@ -1568,7 +1824,7 @@ var CascadeStore = /** @class */ (function (_super) {
             if (row) {
                 var id = row.id;
                 Object.assign(entityBranch, (_a = {},
-                    _a[id] = row,
+                    _a[id] = (0, lodash_1.cloneDeep)(row),
                     _a));
             }
         });
@@ -1583,7 +1839,7 @@ var CascadeStore = /** @class */ (function (_super) {
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        (0, selection_1.reinforceSelection)(this.getSchema(), entity, selection);
+                        this.reinforceSelection(entity, selection);
                         data = selection.data, filter = selection.filter, indexFrom = selection.indexFrom, count = selection.count, sorter = selection.sorter;
                         _a = this.destructCascadeSelect(entity, data, context, this.cascadeSelectAsync, this.aggregateAsync, option), projection = _a.projection, cascadeSelectionFns = _a.cascadeSelectionFns;
                         return [4 /*yield*/, this.selectAbjointRowAsync(entity, {
@@ -1601,7 +1857,7 @@ var CascadeStore = /** @class */ (function (_super) {
                         if (!(cascadeSelectionFns.length > 0)) return [3 /*break*/, 3];
                         ruException_2 = [];
                         return [4 /*yield*/, Promise.all(cascadeSelectionFns.map(function (ele) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                var e_11, rows_2;
+                                var e_12, rows_2;
                                 return tslib_1.__generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0:
@@ -1611,13 +1867,13 @@ var CascadeStore = /** @class */ (function (_super) {
                                             _a.sent();
                                             return [3 /*break*/, 3];
                                         case 2:
-                                            e_11 = _a.sent();
-                                            if (e_11 instanceof types_1.OakRowUnexistedException) {
-                                                rows_2 = e_11.getRows();
+                                            e_12 = _a.sent();
+                                            if (e_12 instanceof types_1.OakRowUnexistedException) {
+                                                rows_2 = e_12.getRows();
                                                 ruException_2.push.apply(ruException_2, tslib_1.__spreadArray([], tslib_1.__read(rows_2), false));
                                             }
                                             else {
-                                                throw e_11;
+                                                throw e_12;
                                             }
                                             return [3 /*break*/, 3];
                                         case 3: return [2 /*return*/];