@steedos/objectql 2.1.63 → 2.1.67

package/lib/types/object.js

@@ -746,6 +746,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             uneditable_fields: null,
                             unrelated_objects: null,
                             field_permissions: null,
+                            viewAssignCompanysRecords: [],
+                            modifyAssignCompanysRecords: [],
                         };
                         if (_.isEmpty(roles)) {
                             throw new Error('not find user permission');
@@ -758,6 +760,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             if (rolePermission) {
                                 var roleFieldsPermission_1 = rolesFieldsPermission[role];
                                 _.each(userObjectPermission, function (v, k) {
+                                    var _a, _b;
                                     var _v = rolePermission[k];
                                     if (k === 'field_permissions') {
                                         _v = roleFieldsPermission_1;
@@ -782,6 +785,16 @@ var SteedosObjectType = /** @class */ (function (_super) {
                                             userObjectPermission[k].push(_v);
                                         }
                                     }
+                                    else if (['viewAssignCompanysRecords', 'modifyAssignCompanysRecords'].indexOf(k) > -1) {
+                                        if ('modifyAssignCompanysRecords' === k) {
+                                            if (!_.isEmpty(_v) && _.isArray(_v)) {
+                                                (_a = userObjectPermission['viewAssignCompanysRecords']).push.apply(_a, tslib_1.__spread(_v));
+                                            }
+                                        }
+                                        if (!_.isEmpty(_v) && _.isArray(_v)) {
+                                            (_b = userObjectPermission[k]).push.apply(_b, tslib_1.__spread(_v));
+                                        }
+                                    }
                                     else if ((_.isArray(v) || _.isNull(v))) {
                                         if (!_.isArray(_v)) {
                                             _v = [];
@@ -1806,29 +1819,42 @@ var SteedosObjectType = /** @class */ (function (_super) {
             });
         });
     };
-    // private async appendRecordPermission(records, userSession) {
-    //     const _ids = _.pluck(records, '_id');
-    //     const objPm = await this.getUserObjectPermission(userSession);
-    //     const permissionFilters = this.getObjectPermissionFilters(objPm, userSession, true);
-    //     if (_.isEmpty(permissionFilters)) {
-    //         return;
-    //     }
-    //     const filters = formatFiltersToODataQuery(['_id', 'in', _ids])
-    //     const results = await this.directFind({
-    //         fields: ['_id'],
-    //         filters: `(${filters}) and (${permissionFilters.join(' or ')})`
-    //     });
-    //     const allowEditIds = _.pluck(results, '_id');
-    //     _.each(records, (record) => {
-    //         if (_.include(allowEditIds, record._id)) {
-    //             record.record_permissions = {
-    //                 allowRead: true,
-    //                 allowEdit: true,
-    //                 allowDelete: true,
-    //             }
-    //         }
-    //     })
-    // }
+    SteedosObjectType.prototype.appendRecordPermission = function (records, userSession) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _ids, objPm, permissionFilters, filters, results, allowEditIds;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _ids = _.pluck(records, '_id');
+                        return [4 /*yield*/, this.getUserObjectPermission(userSession)];
+                    case 1:
+                        objPm = _a.sent();
+                        permissionFilters = this.getObjectEditPermissionFilters(objPm, userSession);
+                        if (_.isEmpty(permissionFilters)) {
+                            return [2 /*return*/];
+                        }
+                        filters = filters_1.formatFiltersToODataQuery(['_id', 'in', _ids]);
+                        return [4 /*yield*/, this.directFind({
+                                fields: ['_id'],
+                                filters: "(" + filters + ") and (" + permissionFilters.join(' or ') + ")"
+                            })];
+                    case 2:
+                        results = _a.sent();
+                        allowEditIds = _.pluck(results, '_id');
+                        _.each(records, function (record) {
+                            if (_.include(allowEditIds, record._id)) {
+                                record.record_permissions = {
+                                    allowRead: true,
+                                    allowEdit: true,
+                                    allowDelete: true,
+                                };
+                            }
+                        });
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
     SteedosObjectType.prototype.getTriggerContext = function (when, method, args, recordId) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var userSession, context, _a;
@@ -1918,7 +1944,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
             args[_i - 1] = arguments[_i];
         }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var adapterMethod, allow, objectName, recordId, doc, paramRecordId, returnValue, userSession, beforeTriggerContext, afterTriggerContext, previousDoc, values;
+            var adapterMethod, allow, objectName, recordId, doc, paramRecordId, returnValue, userSession, beforeTriggerContext, afterTriggerContext, previousDoc, values, _records;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -1961,7 +1987,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         return [4 /*yield*/, adapterMethod.apply(this._datasource, args)];
                     case 4:
                         returnValue = _a.sent();
-                        return [3 /*break*/, 21];
+                        return [3 /*break*/, 25];
                     case 5:
                         userSession = args[args.length - 1];
                         return [4 /*yield*/, this.getTriggerContext('before', method, args)];
@@ -1987,40 +2013,43 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         return [4 /*yield*/, adapterMethod.apply(this._datasource, args)];
                     case 10:
                         returnValue = _a.sent();
-                        if (method === 'find' || method == 'findOne' || method == 'count' || method == 'aggregate' || method == 'aggregatePrefixalPipeline') {
-                            values = returnValue || {};
-                            if (method === 'count') {
-                                values = returnValue || 0;
-                            }
-                            // else{
-                            //     if (userSession) {
-                            //         let _records = returnValue
-                            //         if (method == 'findOne' && returnValue) {
-                            //             _records = [_records]
-                            //         }
-                            //         await this.appendRecordPermission(_records, userSession);
-                            //     }
-                            // }
-                            Object.assign(afterTriggerContext, { data: { values: values } });
+                        if (!(method === 'find' || method == 'findOne' || method == 'count' || method == 'aggregate' || method == 'aggregatePrefixalPipeline')) return [3 /*break*/, 14];
+                        values = returnValue || {};
+                        if (!(method === 'count')) return [3 /*break*/, 11];
+                        values = returnValue || 0;
+                        return [3 /*break*/, 13];
+                    case 11:
+                        if (!userSession) return [3 /*break*/, 13];
+                        _records = returnValue;
+                        if (method == 'findOne' && returnValue) {
+                            _records = [_records];
                         }
+                        return [4 /*yield*/, this.appendRecordPermission(_records, userSession)];
+                    case 12:
+                        _a.sent();
+                        _a.label = 13;
+                    case 13:
+                        Object.assign(afterTriggerContext, { data: { values: values } });
+                        _a.label = 14;
+                    case 14:
                         // console.log("==returnValue==", returnValue);
                         if (method == 'insert' && _.has(returnValue, '_id')) {
                             afterTriggerContext.doc = returnValue;
                             afterTriggerContext = Object.assign({}, afterTriggerContext, { id: returnValue._id });
                         }
-                        if (!(method == "update")) return [3 /*break*/, 13];
-                        if (!returnValue) return [3 /*break*/, 12];
+                        if (!(method == "update")) return [3 /*break*/, 17];
+                        if (!returnValue) return [3 /*break*/, 16];
                         afterTriggerContext.doc = returnValue;
                         return [4 /*yield*/, this.runAfterTriggers(method, afterTriggerContext)];
-                    case 11:
+                    case 15:
                         _a.sent();
-                        _a.label = 12;
-                    case 12: return [3 /*break*/, 15];
-                    case 13: return [4 /*yield*/, this.runAfterTriggers(method, afterTriggerContext)];
-                    case 14:
+                        _a.label = 16;
+                    case 16: return [3 /*break*/, 19];
+                    case 17: return [4 /*yield*/, this.runAfterTriggers(method, afterTriggerContext)];
+                    case 18:
                         _a.sent();
-                        _a.label = 15;
-                    case 15:
+                        _a.label = 19;
+                    case 19:
                         if (method === 'find' || method == 'findOne' || method == 'count' || method == 'aggregate' || method == 'aggregatePrefixalPipeline') {
                             if (_.isEmpty(afterTriggerContext.data) || (_.isEmpty(afterTriggerContext.data.values) && !_.isNumber(afterTriggerContext.data.values))) {
                                 return [2 /*return*/, returnValue];
@@ -2036,9 +2065,9 @@ var SteedosObjectType = /** @class */ (function (_super) {
                                 user_session: userSession,
                                 previous_record: afterTriggerContext.previousDoc
                             }).run()];
-                    case 16:
+                    case 20:
                         _a.sent();
-                        if (!returnValue) return [3 /*break*/, 19];
+                        if (!returnValue) return [3 /*break*/, 23];
                         if (method === "insert") {
                             // 当为insert时，上面代码执行后的doc不带_id，只能从returnValue中取
                             doc = returnValue;
@@ -2046,18 +2075,18 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         }
                         // 一定要先运行公式再运行汇总，以下两个函数顺序不能反
                         return [4 /*yield*/, this.runRecordFormula(method, objectName, recordId, doc, userSession)];
-                    case 17:
+                    case 21:
                         // 一定要先运行公式再运行汇总，以下两个函数顺序不能反
                         _a.sent();
                         return [4 /*yield*/, this.runRecordSummaries(method, objectName, recordId, doc, previousDoc, userSession)];
-                    case 18:
+                    case 22:
                         _a.sent();
-                        _a.label = 19;
-                    case 19: return [4 /*yield*/, object_events_1.brokeEmitEvents(objectName, method, afterTriggerContext)];
-                    case 20:
+                        _a.label = 23;
+                    case 23: return [4 /*yield*/, object_events_1.brokeEmitEvents(objectName, method, afterTriggerContext)];
+                    case 24:
                         _a.sent();
-                        _a.label = 21;
-                    case 21: return [2 /*return*/, returnValue];
+                        _a.label = 25;
+                    case 25: return [2 /*return*/, returnValue];
                 }
             });
         });
@@ -2112,28 +2141,13 @@ var SteedosObjectType = /** @class */ (function (_super) {
             });
         });
     };
-    // private getObjectPermissionFilters(objectPermission, userSession, isEdit) {
-    //     const objectPermissionFilters = [];
-    //     let permissionFiltersKey = 'read_filters';
-    //     if (isEdit) {
-    //         permissionFiltersKey = 'edit_filters';
-    //     }
-    //     const globalData = Object.assign({}, userSession, { now: new Date() });
-    //     let permissionFilters = objectPermission[permissionFiltersKey];
-    //     _.each(permissionFilters, (permissionFilter) => {
-    //         if (_.isString(permissionFilter) && isExpression(permissionFilter.trim())) {
-    //             try {
-    //                 const filters = parseSingleExpression(permissionFilter, {}, "#", globalData);
-    //                 if (filters && !_.isString(filters)) {
-    //                     objectPermissionFilters.push(`(${formatFiltersToODataQuery(filters, userSession)})`)
-    //                 }
-    //             } catch (error) {
-    //                 console.error(`getObjectPermissionFilters error`, permissionFilter, error.message);
-    //             }
-    //         }
-    //     })
-    //     return objectPermissionFilters;
-    // }
+    SteedosObjectType.prototype.getObjectEditPermissionFilters = function (objectPermission, userSession) {
+        var objectPermissionFilters = [];
+        if (!_.isEmpty(objectPermission.modifyAssignCompanysRecords)) {
+            objectPermissionFilters.push("(" + filters_1.formatFiltersToODataQuery([['company_id', 'in', objectPermission.modifyAssignCompanysRecords], 'or', ['company_ids', 'in', objectPermission.modifyAssignCompanysRecords]], userSession) + ")");
+        }
+        return objectPermissionFilters;
+    };
     /**
      * 把query.filters用formatFiltersToODataQuery转为odata query
      * 主要是为了把userSession中的utcOffset逻辑传入formatFiltersToODataQuery函数处理
@@ -2154,7 +2168,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
     };
     SteedosObjectType.prototype.dealWithMethodPermission = function (method, args) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var userSession, spaceId, userId, objPm, query, spaceFilter, companyFilter, ownerFilter, sharesFilter, shareRuleFilters, restrictionRuleFilters, clientFilter, filters, permissionFilters, userFilters, permissionFilters, objectPermissionEditFilters, id, companyFilters, queryFilters, companyFilters, permissionFilters, objectPermissionEditFilters, id, companyFilters;
+            var userSession, spaceId, userId, objPm, query, spaceFilter, companyFilter, ownerFilter, sharesFilter, shareRuleFilters, restrictionRuleFilters, clientFilter, filters, permissionFilters, userFilters, viewAssignCompanysRecordsFilter_1, permissionFilters, objectPermissionEditFilters, id, companyFilters, queryFilters, companyFilters, permissionFilters, objectPermissionEditFilters, id, companyFilters;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -2180,10 +2194,12 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             return [2 /*return*/];
                         }
                         spaceFilter = void 0, companyFilter = void 0, ownerFilter = void 0, sharesFilter = void 0, shareRuleFilters = void 0, restrictionRuleFilters = void 0, clientFilter = query.filters, filters = void 0, permissionFilters = [], userFilters = [];
+                        //space 权限
                         if (spaceId) {
                             spaceFilter = "(space eq '" + spaceId + "')";
                         }
-                        if (spaceId && !objPm.viewAllRecords && objPm.viewCompanyRecords) { // 公司级
+                        // 本公司权限
+                        if (spaceId && !objPm.viewAllRecords && objPm.viewCompanyRecords) {
                             if (_.isEmpty(userSession.companies)) {
                                 console.log('objPm', objPm);
                                 throw new Error("user not belong any company!");
@@ -2195,14 +2211,25 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         if (!objPm.viewAllRecords && !objPm.viewCompanyRecords && objPm.allowRead) { // owner
                             ownerFilter = "(owner eq '" + userId + "')";
                         }
+                        viewAssignCompanysRecordsFilter_1 = [];
+                        if (objPm.viewAssignCompanysRecords) {
+                            _.each(objPm.viewAssignCompanysRecords, function (assignCompanyId) {
+                                viewAssignCompanysRecordsFilter_1.push("((company_id eq '" + assignCompanyId + "') or (company_ids eq '" + assignCompanyId + "'))");
+                            });
+                        }
+                        if (!_.isEmpty(viewAssignCompanysRecordsFilter_1)) {
+                            permissionFilters.push("(" + viewAssignCompanysRecordsFilter_1.join(' or ') + ")");
+                        }
                         return [4 /*yield*/, shareRule_1.ShareRules.getUserObjectFilters(this.name, userSession)];
                     case 2:
+                        //共享规则
                         shareRuleFilters = _a.sent();
                         if (!_.isEmpty(shareRuleFilters)) {
                             permissionFilters.push("(" + shareRuleFilters.join(' or ') + ")");
                         }
                         return [4 /*yield*/, restrictionRule_1.RestrictionRule.getUserObjectFilters(this.name, userSession)];
                     case 3:
+                        // 限制规则
                         restrictionRuleFilters = _a.sent();
                         if (!_.isEmpty(restrictionRuleFilters)) {
                             userFilters.push("(" + restrictionRuleFilters.join(' or ') + ")");
@@ -2211,6 +2238,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         // if (!_.isEmpty(objectPermissionFilters)) {
                         //     permissionFilters.push(`(${objectPermissionFilters.join(' or ')})`);
                         // }
+                        //共享规则(旧)
                         sharesFilter = util_1.getUserObjectSharesFilters(this.name, userSession);
                         if (!_.isEmpty(companyFilter)) {
                             permissionFilters.push("(" + companyFilter.join(' and ') + ")");
@@ -2242,7 +2270,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             }
                         }
                         else if (method === 'update' || method === 'updateOne') {
-                            permissionFilters = null;
+                            permissionFilters = this.getObjectEditPermissionFilters(objPm, userSession);
                             if (!objPm.allowEdit && _.isEmpty(permissionFilters)) {
                                 throw new Error("no " + method + " permission!");
                             }
@@ -2310,7 +2338,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             }
                         }
                         else if (method === 'delete') {
-                            permissionFilters = null;
+                            permissionFilters = this.getObjectEditPermissionFilters(objPm, userSession);
                             if (!objPm.allowDelete && _.isEmpty(permissionFilters)) {
                                 throw new Error("no " + method + " permission!");
                             }