@steedos/objectql 2.2.55-beta.7 → 2.3.0-beta.10

package/lib/types/object.js

@@ -22,23 +22,7 @@ var field_permission_1 = require("./field_permission");
 var dynamic_load_1 = require("../dynamic-load");
 var cachers_1 = require("@steedos/cachers");
 var clone = require('clone');
-// 主子表有层级限制，超过3层就报错，该函数判断当前对象作为主表对象往下的层级最多不越过3层，
-// 其3层指的是A-B-C-D，它们都有父子关系，A作为最顶层，该对象上不可以再创建主表子表关系字段，但是B、C、D上可以；
-// 或者如果当前对象上创建的主表子表关系字段指向的对象是D，那么也会超过3层的层级限制；
-// 又或者中间加一层M先连接B再连接C，形成A-B-M-C-D，也会超过3层的层级限制；
 exports.MAX_MASTER_DETAIL_LEAVE = 3;
-/**
- * 判断传入的paths中每条path下是否有重复对象名称，返回第一个重复的对象名称
- * 有可能传入的paths有多个链条，只要其中任何一个链条上有同名对象名说明异常，返回第一个异常的同名对象名即可
- * 比如传入下面示例中的paths，表示当前对象b向下有4条主子关系链，将返回第三条链中的重复对象名b
- * @param paths 对象上getDetailPaths或getMasterPaths函数返回的当前对象向下或向上取主表子表关联对象名称列表链条
- * [
-    [ 'b', 't1', 't2' ],
-    [ 'b', 't1', 'm1', 'm2' ],
-    [ 'b', 't1', 'm2', 'b' ],
-    [ 'b', 'c', 'd' ]
- * ]
- */
 var getRepeatObjectNameFromPaths = function (paths) {
     var e_1, _a;
     var repeatItem;
@@ -67,14 +51,14 @@ var getRepeatObjectNameFromPaths = function (paths) {
     return repeatItem;
 };
 exports.getRepeatObjectNameFromPaths = getRepeatObjectNameFromPaths;
-var SteedosObjectProperties = /** @class */ (function () {
+var SteedosObjectProperties = (function () {
     function SteedosObjectProperties() {
     }
     return SteedosObjectProperties;
 }());
 exports._TRIGGERKEYS = ['beforeFind', 'beforeInsert', 'beforeUpdate', 'beforeDelete', 'afterFind', 'afterCount', 'afterFindOne', 'afterInsert', 'afterUpdate', 'afterDelete', 'beforeAggregate', 'afterAggregate'];
 var properties = ['label', 'icon', 'enable_search', 'sidebar', 'is_enable', 'enable_files', 'enable_tasks', 'enable_notes', 'enable_events', 'enable_api', 'enable_share', 'enable_instances', 'enable_chatter', 'enable_audit', 'enable_web_forms', 'enable_inline_edit', 'enable_approvals', 'enable_trash', 'enable_space_global', 'enable_tree', 'parent_field', 'children_field', 'enable_enhanced_lookup', 'enable_workflow', 'is_view', 'hidden', 'description', 'custom', 'owner', 'methods', '_id', 'relatedList', 'fields_serial_number', "is_enable", "in_development", "version", "paging"];
-var SteedosObjectType = /** @class */ (function (_super) {
+var SteedosObjectType = (function (_super) {
     tslib_1.__extends(SteedosObjectType, _super);
     function SteedosObjectType(object_name, datasource, config) {
         var _this = _super.call(this) || this;
@@ -123,7 +107,6 @@ var SteedosObjectType = /** @class */ (function (_super) {
             permission.name = name;
             _this.setPermission(permission);
         });
-        //TODO remove ; 目前为了兼容现有object的定义保留
         _.each(config.permission_set, function (permission, name) {
             permission.name = name;
             _this.setPermission(permission);
@@ -238,10 +221,10 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         actionFullName = "objects.".concat(action);
-                        return [4 /*yield*/, this.schema.metadataBroker.call(actionFullName, params)];
+                        return [4, this.schema.metadataBroker.call(actionFullName, params)];
                     case 1:
                         result = _a.sent();
-                        return [2 /*return*/, result];
+                        return [2, result];
                 }
             });
         });
@@ -296,7 +279,6 @@ var SteedosObjectType = /** @class */ (function (_super) {
         this.registerTrigger(trigger);
     };
     SteedosObjectType.prototype.registerTrigger = function (trigger) {
-        //如果是meteor mongo 则不做任何处理
         if (!_.isString(this._datasource.driver) || this._datasource.driver != datasource_1.SteedosDatabaseDriverType.MeteorMongo || trigger.when === 'beforeFind' || trigger.when === 'afterFind' || trigger.when === 'afterFindOne' || trigger.when === 'afterCount' || trigger.when === 'beforeAggregate' || trigger.when === 'afterAggregate') {
             if (!trigger.todo) {
                 return;
@@ -327,10 +309,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             return tslib_1.__awaiter(this, void 0, void 0, function () {
                                 return tslib_1.__generator(this, function (_a) {
                                     switch (_a.label) {
-                                        case 0: return [4 /*yield*/, event.apply(thisArg, args)];
-                                        case 1: 
-                                        // Object.setPrototypeOf(thisArg, Object.getPrototypeOf(trigger))
-                                        return [2 /*return*/, _a.sent()];
+                                        case 0: return [4, event.apply(thisArg, args)];
+                                        case 1: return [2, _a.sent()];
                                     }
                                 });
                             });
@@ -338,8 +318,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         thisArg = tslib_1.__assign(tslib_1.__assign({}, context), { object_name: object_name, datasource_name: this._datasource.name, getObject: function (object_name) {
                                 return _this._schema.getObject(object_name);
                             } });
-                        return [4 /*yield*/, todoWrapper.call(thisArg)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                        return [4, todoWrapper.call(thisArg)];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -351,34 +331,34 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_c.label) {
                     case 0:
                         triggers = this._triggersQueue[when];
-                        if (!triggers) return [3 /*break*/, 4];
+                        if (!triggers) return [3, 4];
                         triggerKeys = _.keys(triggers);
                         index = 0;
                         _c.label = 1;
                     case 1:
-                        if (!(index < triggerKeys.length)) return [3 /*break*/, 4];
+                        if (!(index < triggerKeys.length)) return [3, 4];
                         trigger = triggers[triggerKeys[index]];
-                        return [4 /*yield*/, this.runTirgger(trigger, context)];
+                        return [4, this.runTirgger(trigger, context)];
                     case 2:
                         _c.sent();
                         _c.label = 3;
                     case 3:
                         index++;
-                        return [3 /*break*/, 1];
+                        return [3, 1];
                     case 4:
                         wildcardListeners = (0, dynamic_load_1.getPatternListeners)(this.name);
-                        if (!wildcardListeners) return [3 /*break*/, 8];
+                        if (!wildcardListeners) return [3, 8];
                         _a = [];
                         for (_b in wildcardListeners)
                             _a.push(_b);
                         _i = 0;
                         _c.label = 5;
                     case 5:
-                        if (!(_i < _a.length)) return [3 /*break*/, 8];
+                        if (!(_i < _a.length)) return [3, 8];
                         key = _a[_i];
-                        if (!Object.prototype.hasOwnProperty.call(wildcardListeners, key)) return [3 /*break*/, 7];
+                        if (!Object.prototype.hasOwnProperty.call(wildcardListeners, key)) return [3, 7];
                         listener = wildcardListeners[key];
-                        if (!(listener && listener[when])) return [3 /*break*/, 7];
+                        if (!(listener && listener[when])) return [3, 7];
                         triggerConfig = {
                             name: "".concat(key, "_").concat(when),
                             on: 'server',
@@ -386,14 +366,14 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             todo: listener[when],
                         };
                         trigger = new _1.SteedosTriggerType(triggerConfig);
-                        return [4 /*yield*/, this.runTirgger(trigger, context)];
+                        return [4, this.runTirgger(trigger, context)];
                     case 6:
                         _c.sent();
                         _c.label = 7;
                     case 7:
                         _i++;
-                        return [3 /*break*/, 5];
-                    case 8: return [2 /*return*/];
+                        return [3, 5];
+                    case 8: return [2];
                 }
             });
         });
@@ -451,7 +431,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                     case 0:
                         triggers = this.getTriggerActions(when);
                         if (_.isEmpty(triggers)) {
-                            return [2 /*return*/];
+                            return [2];
                         }
                         _b.label = 1;
                     case 1:
@@ -459,11 +439,10 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         triggers_1 = tslib_1.__values(triggers), triggers_1_1 = triggers_1.next();
                         _b.label = 2;
                     case 2:
-                        if (!!triggers_1_1.done) return [3 /*break*/, 5];
+                        if (!!triggers_1_1.done) return [3, 5];
                         trigger = triggers_1_1.value;
                         params = (0, util_1.generateActionParams)(when, context);
-                        return [4 /*yield*/, this._schema.metadataBroker.call("".concat(trigger.service.name, ".").concat(trigger.metadata.action), params).catch(function (error) {
-                                //如果action trigger 下线，则只打印error
+                        return [4, this._schema.metadataBroker.call("".concat(trigger.service.name, ".").concat(trigger.metadata.action), params).catch(function (error) {
                                 if (error && _.isObject(error) && error.type === 'SERVICE_NOT_AVAILABLE') {
                                     console.error("runTriggerActions error", error);
                                 }
@@ -476,19 +455,19 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         _b.label = 4;
                     case 4:
                         triggers_1_1 = triggers_1.next();
-                        return [3 /*break*/, 2];
-                    case 5: return [3 /*break*/, 8];
+                        return [3, 2];
+                    case 5: return [3, 8];
                     case 6:
                         e_2_1 = _b.sent();
                         e_2 = { error: e_2_1 };
-                        return [3 /*break*/, 8];
+                        return [3, 8];
                     case 7:
                         try {
                             if (triggers_1_1 && !triggers_1_1.done && (_a = triggers_1.return)) _a.call(triggers_1);
                         }
                         finally { if (e_2) throw e_2.error; }
-                        return [7 /*endfinally*/];
-                    case 8: return [2 /*return*/];
+                        return [7];
+                    case 8: return [2];
                 }
             });
         });
@@ -568,8 +547,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.callMetadataObjectServiceAction("getDetailPaths", { objectApiName: this.name })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4, this.callMetadataObjectServiceAction("getDetailPaths", { objectApiName: this.name })];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -578,8 +557,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.callMetadataObjectServiceAction("getMasterPaths", { objectApiName: this.name })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4, this.callMetadataObjectServiceAction("getMasterPaths", { objectApiName: this.name })];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -588,8 +567,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.callMetadataObjectServiceAction("getMaxDetailsLeave", { objectApiName: this.name, paths: paths })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4, this.callMetadataObjectServiceAction("getMaxDetailsLeave", { objectApiName: this.name, paths: paths })];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -598,8 +577,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.callMetadataObjectServiceAction("getMaxMastersLeave", { objectApiName: this.name, paths: paths })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4, this.callMetadataObjectServiceAction("getMaxMastersLeave", { objectApiName: this.name, paths: paths })];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -648,15 +627,15 @@ var SteedosObjectType = /** @class */ (function (_super) {
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        if (!(this.datasource.driver === datasource_1.SteedosDatabaseDriverType.Mongo || this.datasource.driver === datasource_1.SteedosDatabaseDriverType.MeteorMongo)) return [3 /*break*/, 21];
+                        if (!(this.datasource.driver === datasource_1.SteedosDatabaseDriverType.Mongo || this.datasource.driver === datasource_1.SteedosDatabaseDriverType.MeteorMongo)) return [3, 21];
                         adapter = this.datasource.adapter;
-                        return [4 /*yield*/, adapter.connect()];
+                        return [4, adapter.connect()];
                     case 1:
                         _b.sent();
                         collection = adapter.collection(this.name);
-                        if (!(this.datasource.driver === datasource_1.SteedosDatabaseDriverType.MeteorMongo)) return [3 /*break*/, 3];
+                        if (!(this.datasource.driver === datasource_1.SteedosDatabaseDriverType.MeteorMongo)) return [3, 3];
                         defaultAdapter = (0, datasource_1.getDataSource)('default').adapter;
-                        return [4 /*yield*/, defaultAdapter.connect()];
+                        return [4, defaultAdapter.connect()];
                     case 2:
                         _b.sent();
                         collection = defaultAdapter.collection(this.name);
@@ -674,7 +653,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                                 dropIndexNames.push(field.getIndexName());
                             }
                         }
-                        if (!(indexesInfo && indexesInfo.length > 0)) return [3 /*break*/, 21];
+                        if (!(indexesInfo && indexesInfo.length > 0)) return [3, 21];
                         _b.label = 4;
                     case 4:
                         _b.trys.push([4, 20, , 21]);
@@ -683,71 +662,57 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         _b.trys.push([5, 13, 14, 19]);
                         indexesInfo_1 = tslib_1.__asyncValues(indexesInfo);
                         _b.label = 6;
-                    case 6: return [4 /*yield*/, indexesInfo_1.next()];
+                    case 6: return [4, indexesInfo_1.next()];
                     case 7:
-                        if (!(indexesInfo_1_1 = _b.sent(), !indexesInfo_1_1.done)) return [3 /*break*/, 12];
+                        if (!(indexesInfo_1_1 = _b.sent(), !indexesInfo_1_1.done)) return [3, 12];
                         indexInfo = indexesInfo_1_1.value;
                         key = indexInfo.key;
                         delete indexInfo.key;
                         _b.label = 8;
                     case 8:
                         _b.trys.push([8, 10, , 11]);
-                        return [4 /*yield*/, collection.createIndex(key, indexInfo)];
+                        return [4, collection.createIndex(key, indexInfo)];
                     case 9:
                         _b.sent();
-                        return [3 /*break*/, 11];
+                        return [3, 11];
                     case 10:
                         error_1 = _b.sent();
-                        return [3 /*break*/, 11];
-                    case 11: return [3 /*break*/, 6];
-                    case 12: return [3 /*break*/, 19];
+                        return [3, 11];
+                    case 11: return [3, 6];
+                    case 12: return [3, 19];
                     case 13:
                         e_3_1 = _b.sent();
                         e_3 = { error: e_3_1 };
-                        return [3 /*break*/, 19];
+                        return [3, 19];
                     case 14:
                         _b.trys.push([14, , 17, 18]);
-                        if (!(indexesInfo_1_1 && !indexesInfo_1_1.done && (_a = indexesInfo_1.return))) return [3 /*break*/, 16];
-                        return [4 /*yield*/, _a.call(indexesInfo_1)];
+                        if (!(indexesInfo_1_1 && !indexesInfo_1_1.done && (_a = indexesInfo_1.return))) return [3, 16];
+                        return [4, _a.call(indexesInfo_1)];
                     case 15:
                         _b.sent();
                         _b.label = 16;
-                    case 16: return [3 /*break*/, 18];
+                    case 16: return [3, 18];
                     case 17:
                         if (e_3) throw e_3.error;
-                        return [7 /*endfinally*/];
-                    case 18: return [7 /*endfinally*/];
-                    case 19: return [3 /*break*/, 21];
+                        return [7];
+                    case 18: return [7];
+                    case 19: return [3, 21];
                     case 20:
                         error_2 = _b.sent();
                         console.error(error_2);
-                        return [3 /*break*/, 21];
-                    case 21: return [2 /*return*/];
+                        return [3, 21];
+                    case 21: return [2];
                 }
             });
         });
     };
-    //TODO 处理对象继承
     SteedosObjectType.prototype.extend_TODO = function (config) {
         var _this = this;
         if (this.name != config.name)
             throw new Error("You can not extend on different object");
-        // override each fields
         _.each(config.fields, function (field, field_name) {
             _this.setField(field_name, field);
         });
-        // override each actions
-        // if (config.actions) {
-        //     _.each(config.actions, (action) => {
-        //         this.actions[action.name] = action
-        //     })
-        // }
-        // override each triggers
-        // if (config.triggers) {
-        //     _.each(config.triggers, (trigger) => {
-        //         this.triggers[trigger.name] = trigger
-        //     })
-        // }
     };
     SteedosObjectType.prototype.getObjectRolesPermission = function (spaceId) {
         var globalPermission = this._datasource.getObjectRolesPermission(this._name);
@@ -759,12 +724,6 @@ var SteedosObjectType = /** @class */ (function (_super) {
         }
         return globalPermission;
     };
-    /**
-     * @description:
-     * @param {SteedosUserSession} userSession
-     * @param {any} rolesFieldsPermission: 如果为false, 则不计算字段集权限,提交计算效率.
-     * @return {*}
-     */
     SteedosObjectType.prototype.getUserObjectPermission = function (userSession, rolesFieldsPermission) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var roles, objectRolesPermission, userObjectPermission, field_permissions, spaceId;
@@ -799,18 +758,16 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             field_permissions: null,
                             viewAssignCompanysRecords: [],
                             modifyAssignCompanysRecords: [],
-                            // read_filters: [],
-                            // edit_filters: []
                         };
                         if (_.isEmpty(roles)) {
                             throw new Error('not find user permission');
                         }
-                        if (!(rolesFieldsPermission === false)) return [3 /*break*/, 1];
+                        if (!(rolesFieldsPermission === false)) return [3, 1];
                         rolesFieldsPermission = {};
-                        return [3 /*break*/, 3];
+                        return [3, 3];
                     case 1:
-                        if (!!rolesFieldsPermission) return [3 /*break*/, 3];
-                        return [4 /*yield*/, field_permission_1.FieldPermission.getObjectFieldsPermissionGroupRole(this.name)];
+                        if (!!rolesFieldsPermission) return [3, 3];
+                        return [4, field_permission_1.FieldPermission.getObjectFieldsPermissionGroupRole(this.name)];
                     case 2:
                         rolesFieldsPermission = _a.sent();
                         _a.label = 3;
@@ -904,9 +861,9 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         userObjectPermission.unrelated_objects = userObjectPermission.unrelated_objects || [];
                         spaceId = userSession.spaceId;
                         if ((0, util_1.isTemplateSpace)(spaceId)) {
-                            return [2 /*return*/, Object.assign({}, userObjectPermission, { allowRead: true, viewAllRecords: true, viewCompanyRecords: true })];
+                            return [2, Object.assign({}, userObjectPermission, { allowRead: true, viewAllRecords: true, viewCompanyRecords: true })];
                         }
-                        return [2 /*return*/, userObjectPermission];
+                        return [2, userObjectPermission];
                 }
             });
         });
@@ -918,17 +875,17 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         if (!userSession)
-                            return [2 /*return*/, true];
-                        return [4 /*yield*/, this.getUserObjectPermission(userSession, false)];
+                            return [2, true];
+                        return [4, this.getUserObjectPermission(userSession, false)];
                     case 1:
                         userObjectPermission = _a.sent();
                         if (userObjectPermission.allowRead) {
-                            return [2 /*return*/, true];
+                            return [2, true];
                         }
                         else {
-                            return [2 /*return*/, false];
+                            return [2, false];
                         }
-                        return [2 /*return*/];
+                        return [2];
                 }
             });
         });
@@ -940,17 +897,17 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         if (!userSession)
-                            return [2 /*return*/, true];
-                        return [4 /*yield*/, this.getUserObjectPermission(userSession, false)];
+                            return [2, true];
+                        return [4, this.getUserObjectPermission(userSession, false)];
                     case 1:
                         userObjectPermission = _a.sent();
                         if (userObjectPermission.allowCreate) {
-                            return [2 /*return*/, true];
+                            return [2, true];
                         }
                         else {
-                            return [2 /*return*/, false];
+                            return [2, false];
                         }
-                        return [2 /*return*/];
+                        return [2];
                 }
             });
         });
@@ -962,17 +919,17 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         if (!userSession)
-                            return [2 /*return*/, true];
-                        return [4 /*yield*/, this.getUserObjectPermission(userSession, false)];
+                            return [2, true];
+                        return [4, this.getUserObjectPermission(userSession, false)];
                     case 1:
                         userObjectPermission = _a.sent();
                         if (userObjectPermission.allowEdit) {
-                            return [2 /*return*/, true];
+                            return [2, true];
                         }
                         else {
-                            return [2 /*return*/, false];
+                            return [2, false];
                         }
-                        return [2 /*return*/];
+                        return [2];
                 }
             });
         });
@@ -984,17 +941,17 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         if (!userSession)
-                            return [2 /*return*/, true];
-                        return [4 /*yield*/, this.getUserObjectPermission(userSession, false)];
+                            return [2, true];
+                        return [4, this.getUserObjectPermission(userSession, false)];
                     case 1:
                         userObjectPermission = _a.sent();
                         if (userObjectPermission.allowDelete) {
-                            return [2 /*return*/, true];
+                            return [2, true];
                         }
                         else {
-                            return [2 /*return*/, false];
+                            return [2, false];
                         }
-                        return [2 /*return*/];
+                        return [2];
                 }
             });
         });
@@ -1006,18 +963,17 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         clonedQuery = Object.assign({}, query);
-                        if (!userSession) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.processUnreadableField(userSession, clonedQuery)];
+                        if (!userSession) return [3, 2];
+                        return [4, this.processUnreadableField(userSession, clonedQuery)];
                     case 1:
                         _a.sent();
                         _a.label = 2;
-                    case 2: return [4 /*yield*/, this.callAdapter('find', this.table_name, clonedQuery, userSession)];
-                    case 3: return [2 /*return*/, _a.sent()];
+                    case 2: return [4, this.callAdapter('find', this.table_name, clonedQuery, userSession)];
+                    case 3: return [2, _a.sent()];
                 }
             });
         });
     };
-    // 此函数支持driver: MeteorMongo
     SteedosObjectType.prototype.aggregate = function (query, externalPipeline, userSession) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var clonedQuery;
@@ -1025,18 +981,17 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         clonedQuery = Object.assign({}, query);
-                        if (!userSession) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.processUnreadableField(userSession, clonedQuery)];
+                        if (!userSession) return [3, 2];
+                        return [4, this.processUnreadableField(userSession, clonedQuery)];
                     case 1:
                         _a.sent();
                         _a.label = 2;
-                    case 2: return [4 /*yield*/, this.callAdapter('aggregate', this.table_name, clonedQuery, externalPipeline, userSession)];
-                    case 3: return [2 /*return*/, _a.sent()];
+                    case 2: return [4, this.callAdapter('aggregate', this.table_name, clonedQuery, externalPipeline, userSession)];
+                    case 3: return [2, _a.sent()];
                 }
             });
         });
     };
-    // 此函数支持driver: MeteorMongo
     SteedosObjectType.prototype.directAggregate = function (query, externalPipeline, userSession) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var clonedQuery;
@@ -1044,18 +999,17 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         clonedQuery = Object.assign({}, query);
-                        if (!userSession) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.processUnreadableField(userSession, clonedQuery)];
+                        if (!userSession) return [3, 2];
+                        return [4, this.processUnreadableField(userSession, clonedQuery)];
                     case 1:
                         _a.sent();
                         _a.label = 2;
-                    case 2: return [4 /*yield*/, this.callAdapter('directAggregate', this.table_name, clonedQuery, externalPipeline, userSession)];
-                    case 3: return [2 /*return*/, _a.sent()];
+                    case 2: return [4, this.callAdapter('directAggregate', this.table_name, clonedQuery, externalPipeline, userSession)];
+                    case 3: return [2, _a.sent()];
                 }
             });
         });
     };
-    // 此函数支持driver: MeteorMongo，类似于aggregate，其参数externalPipeline放在最前面而已
     SteedosObjectType.prototype.directAggregatePrefixalPipeline = function (query, prefixalPipeline, userSession) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var clonedQuery;
@@ -1063,13 +1017,13 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         clonedQuery = Object.assign({}, query);
-                        if (!userSession) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.processUnreadableField(userSession, clonedQuery)];
+                        if (!userSession) return [3, 2];
+                        return [4, this.processUnreadableField(userSession, clonedQuery)];
                     case 1:
                         _a.sent();
                         _a.label = 2;
-                    case 2: return [4 /*yield*/, this.callAdapter('directAggregatePrefixalPipeline', this.table_name, clonedQuery, prefixalPipeline, userSession)];
-                    case 3: return [2 /*return*/, _a.sent()];
+                    case 2: return [4, this.callAdapter('directAggregatePrefixalPipeline', this.table_name, clonedQuery, prefixalPipeline, userSession)];
+                    case 3: return [2, _a.sent()];
                 }
             });
         });
@@ -1081,15 +1035,15 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         clonedQuery = Object.assign({}, query);
-                        if (!userSession) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.processUnreadableField(userSession, clonedQuery)];
+                        if (!userSession) return [3, 2];
+                        return [4, this.processUnreadableField(userSession, clonedQuery)];
                     case 1:
                         _a.sent();
                         _a.label = 2;
-                    case 2: return [4 /*yield*/, this.callAdapter('findOne', this.table_name, id, clonedQuery, userSession)];
+                    case 2: return [4, this.callAdapter('findOne', this.table_name, id, clonedQuery, userSession)];
                     case 3:
                         result = _a.sent();
-                        return [2 /*return*/, result];
+                        return [2, result];
                 }
             });
         });
@@ -1100,8 +1054,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         doc = this.formatRecord(doc);
-                        return [4 /*yield*/, this.callAdapter('insert', this.table_name, doc, userSession)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                        return [4, this.callAdapter('insert', this.table_name, doc, userSession)];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -1114,8 +1068,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                     case 0:
                         doc = this.formatRecord(doc);
                         clonedId = id;
-                        return [4 /*yield*/, this.callAdapter('update', this.table_name, clonedId, doc, userSession)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                        return [4, this.callAdapter('update', this.table_name, clonedId, doc, userSession)];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -1128,13 +1082,12 @@ var SteedosObjectType = /** @class */ (function (_super) {
                     case 0:
                         doc = this.formatRecord(doc);
                         clonedId = id;
-                        return [4 /*yield*/, this.callAdapter('updateOne', this.table_name, clonedId, doc, userSession)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                        return [4, this.callAdapter('updateOne', this.table_name, clonedId, doc, userSession)];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
     };
-    // 此函数支持driver: MeteorMongo、Mongo
     SteedosObjectType.prototype.updateMany = function (queryFilters, doc, userSession) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var clonedQueryFilters;
@@ -1143,8 +1096,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                     case 0:
                         doc = this.formatRecord(doc);
                         clonedQueryFilters = queryFilters;
-                        return [4 /*yield*/, this.callAdapter('updateMany', this.table_name, clonedQueryFilters, doc, userSession)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                        return [4, this.callAdapter('updateMany', this.table_name, clonedQueryFilters, doc, userSession)];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -1156,8 +1109,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         clonedId = id;
-                        return [4 /*yield*/, this.callAdapter('delete', this.table_name, clonedId, userSession)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                        return [4, this.callAdapter('delete', this.table_name, clonedId, userSession)];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -1169,11 +1122,11 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         clonedQuery = Object.assign({}, query);
-                        return [4 /*yield*/, this.processUnreadableField(userSession, clonedQuery)];
+                        return [4, this.processUnreadableField(userSession, clonedQuery)];
                     case 1:
                         _a.sent();
-                        return [4 /*yield*/, this.callAdapter('directFind', this.table_name, clonedQuery, userSession)];
-                    case 2: return [2 /*return*/, _a.sent()];
+                        return [4, this.callAdapter('directFind', this.table_name, clonedQuery, userSession)];
+                    case 2: return [2, _a.sent()];
                 }
             });
         });
@@ -1184,8 +1137,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         doc = this.formatRecord(doc);
-                        return [4 /*yield*/, this.callAdapter('directInsert', this.table_name, doc, userSession)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                        return [4, this.callAdapter('directInsert', this.table_name, doc, userSession)];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -1198,8 +1151,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                     case 0:
                         doc = this.formatRecord(doc);
                         clonedId = id;
-                        return [4 /*yield*/, this.callAdapter('directUpdate', this.table_name, clonedId, doc, userSession)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                        return [4, this.callAdapter('directUpdate', this.table_name, clonedId, doc, userSession)];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -1211,8 +1164,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         clonedId = id;
-                        return [4 /*yield*/, this.callAdapter('directDelete', this.table_name, clonedId, userSession)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                        return [4, this.callAdapter('directDelete', this.table_name, clonedId, userSession)];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -1221,8 +1174,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._datasource._makeNewID(this.table_name)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4, this._datasource._makeNewID(this.table_name)];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -1230,7 +1183,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
     SteedosObjectType.prototype.getFirstListView = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.list_views[0]];
+                return [2, this.list_views[0]];
             });
         });
     };
@@ -1241,21 +1194,16 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         object_name = this.name;
-                        return [4 /*yield*/, this.getFirstListView()];
+                        return [4, this.getFirstListView()];
                     case 1:
                         list_view = _a.sent();
                         list_view_id = list_view ? list_view._id || list_view.name : 'all';
                         if (record_id)
-                            return [2 /*return*/, (0, util_1.absoluteUrl)("/app/" + app_id + "/" + object_name + "/view/" + record_id)];
+                            return [2, (0, util_1.absoluteUrl)("/app/" + app_id + "/" + object_name + "/view/" + record_id)];
                         else {
-                            if (object_name === 'meeting') {
-                                return [2 /*return*/, (0, util_1.absoluteUrl)("/app/" + app_id + "/" + object_name + "/calendar/")];
-                            }
-                            else {
-                                return [2 /*return*/, (0, util_1.absoluteUrl)("/app/" + app_id + "/" + object_name + "/grid/" + list_view_id)];
-                            }
+                            return [2, (0, util_1.absoluteUrl)("/app/" + app_id + "/" + object_name + "/grid/" + list_view_id)];
                         }
-                        return [2 /*return*/];
+                        return [2];
                 }
             });
         });
@@ -1264,8 +1212,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getAbsoluteUrl(app_id, record_id)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4, this.getAbsoluteUrl(app_id, record_id)];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -1274,8 +1222,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getAbsoluteUrl(app_id)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4, this.getAbsoluteUrl(app_id)];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -1283,7 +1231,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
     SteedosObjectType.prototype.isEnableAudit = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.enable_audit];
+                return [2, this.enable_audit];
             });
         });
     };
@@ -1291,8 +1239,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.callMetadataObjectServiceAction("getDetails", { objectApiName: this.name })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4, this.callMetadataObjectServiceAction("getDetails", { objectApiName: this.name })];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -1301,8 +1249,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.callMetadataObjectServiceAction("getMasters", { objectApiName: this.name })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4, this.callMetadataObjectServiceAction("getMasters", { objectApiName: this.name })];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -1311,8 +1259,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.callMetadataObjectServiceAction("getLookupDetails", { objectApiName: this.name })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4, this.callMetadataObjectServiceAction("getLookupDetails", { objectApiName: this.name })];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -1321,8 +1269,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.callMetadataObjectServiceAction("getDetailsInfo", { objectApiName: this.name })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4, this.callMetadataObjectServiceAction("getDetailsInfo", { objectApiName: this.name })];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -1331,8 +1279,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.callMetadataObjectServiceAction("getMastersInfo", { objectApiName: this.name })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4, this.callMetadataObjectServiceAction("getMastersInfo", { objectApiName: this.name })];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -1341,21 +1289,18 @@ var SteedosObjectType = /** @class */ (function (_super) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.callMetadataObjectServiceAction("getLookupDetailsInfo", { objectApiName: this.name })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4, this.callMetadataObjectServiceAction("getLookupDetailsInfo", { objectApiName: this.name })];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
     };
-    /**
-     * 此函数返回getDetailsInfo、getMastersInfo、getLookupDetailsInfo 3个请求的结果，用于优化访问速度
-     */
     SteedosObjectType.prototype.getRelationsInfo = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.callMetadataObjectServiceAction("getRelationsInfo", { objectApiName: this.name })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4, this.callMetadataObjectServiceAction("getRelationsInfo", { objectApiName: this.name })];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -1365,13 +1310,13 @@ var SteedosObjectType = /** @class */ (function (_super) {
             var permissions, userId, user_company_ids, recordOwnerId, isOwner, record_company_id, record_company_ids;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getUserObjectPermission(userSession)];
+                    case 0: return [4, this.getUserObjectPermission(userSession)];
                     case 1:
                         permissions = _a.sent();
                         userId = userSession.userId, user_company_ids = userSession.company_ids;
                         if (record) {
                             if (record.record_permissions) {
-                                return [2 /*return*/, record.record_permissions];
+                                return [2, record.record_permissions];
                             }
                             recordOwnerId = record.owner;
                             if (_.isObject(recordOwnerId)) {
@@ -1426,23 +1371,11 @@ var SteedosObjectType = /** @class */ (function (_super) {
                                 }
                             }
                         }
-                        return [2 /*return*/, permissions];
+                        return [2, permissions];
                 }
             });
         });
     };
-    /**
-     * 获取用户可访问字段
-     * 字段权限设计: https://github.com/steedos/steedos-platform/issues/2943
-     * 字段配置为必填字段:
-     * 1 字段级权限不能设置为只读。
-     * 2 页面布局中不能修改必填选项，始终必填。
-     * 3 页面布局中不能设置为只读。
-     * 4 字段如果不在页面布局中, 则显示在最后
-     * @param objectFields
-     * @param objectLayout
-     * @param objectPermission
-     */
     SteedosObjectType.prototype.getAccessFields = function (objectFields, objectLayout, objectPermission) {
         var accessFields = {};
         var universallyRequiredFields = _.filter(objectFields, function (objectFile) {
@@ -1461,12 +1394,17 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         is_readonly: false,
                     });
                 }
-                // 如果配置了页面布局且没有授权字段时, 不显示此字段
                 if (objectLayout && !fieldLayout) {
                     return;
                 }
+                if (field.generated) {
+                    field.readonly = true;
+                    delete field.omit;
+                    if ((0, lodash_1.isNil)(field.visible_on)) {
+                        field.visible_on = "{{false}}";
+                    }
+                }
                 var _a = fieldPermission || { read: !field.hidden, edit: !field.hidden && !field.readonly }, read = _a.read, edit = _a.edit;
-                // 通用必填字段始终可见、可编辑
                 if (isUniversallyRequiredField) {
                     read = true;
                     edit = true;
@@ -1474,18 +1412,9 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 if (fieldLayout && fieldLayout.is_readonly) {
                     edit = false;
                 }
-                //不可查看: 配置了字段权限且不可查看; 没有配置字段权限，字段的hidden为true
                 if (read === false) {
                     return;
                 }
-                // 自增字段移除omit属性，添加visible_on属性。
-                if (field.generated) {
-                    delete field.omit;
-                    if ((0, lodash_1.isNil)(field.visible_on)) {
-                        field.visible_on = "{{false}}";
-                    }
-                }
-                //可查看不可编辑: 配置了字段权限可查看不可编辑; 没有配置字段权限 字段的hidden 为false 且字段的readonly为true
                 if (read === true && edit === false) {
                     accessFields[field.name] = Object.assign({}, field, {
                         hidden: false,
@@ -1495,7 +1424,6 @@ var SteedosObjectType = /** @class */ (function (_super) {
                     });
                     return;
                 }
-                //可查看可编辑: 配置了字段权限可查看可编辑; 没有配置字段权限 字段的hidden 为false 且字段的readonly为false
                 if (read === true && edit === true) {
                     accessFields[field.name] = Object.assign({}, field, {
                         hidden: false,
@@ -1522,7 +1450,6 @@ var SteedosObjectType = /** @class */ (function (_super) {
                     sort_no_1++;
                 }
             });
-            //处理通用必填字段默认显示顺序
             _.each(universallyRequiredFieldsName, function (fieldName) {
                 var fieldLayout = _.find(objectLayout.fields, function (item) { return item.field_name == fieldName; });
                 if (!fieldLayout) {
@@ -1542,8 +1469,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                     case 0:
                         objectConfig = context.objectConfig, layouts = context.layouts, spaceProcessDefinition = context.spaceProcessDefinition, dbListViews = context.dbListViews, rolesFieldsPermission = context.rolesFieldsPermission, relationsInfo = context.relationsInfo;
                         lng = userSession.language;
-                        if (!!objectConfig) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.callMetadataObjectServiceAction('get', { objectApiName: this.name })];
+                        if (!!objectConfig) return [3, 2];
+                        return [4, this.callMetadataObjectServiceAction('get', { objectApiName: this.name })];
                     case 1:
                         objectMetadataConfig = _b.sent();
                         objectConfig = objectMetadataConfig.metadata;
@@ -1552,11 +1479,11 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         objectConfig.name = this.name;
                         objectConfig.datasource = this.datasource.name;
                         _a = objectConfig;
-                        return [4 /*yield*/, this.getUserObjectPermission(userSession, rolesFieldsPermission)];
+                        return [4, this.getUserObjectPermission(userSession, rolesFieldsPermission)];
                     case 3:
                         _a.permissions = _b.sent();
-                        if (!!relationsInfo) return [3 /*break*/, 5];
-                        return [4 /*yield*/, this.getRelationsInfo()];
+                        if (!!relationsInfo) return [3, 5];
+                        return [4, this.getRelationsInfo()];
                     case 4:
                         relationsInfo = _b.sent();
                         _b.label = 5;
@@ -1566,8 +1493,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         objectConfig.lookup_details = relationsInfo.lookup_details;
                         delete objectConfig.db;
                         (0, i18n_1.translationObject)(lng, objectConfig.name, objectConfig, true);
-                        if (!!layouts) return [3 /*break*/, 7];
-                        return [4 /*yield*/, (0, object_layouts_1.getObjectLayouts)(userSession.profile, userSession.spaceId, this.name)];
+                        if (!!layouts) return [3, 7];
+                        return [4, (0, object_layouts_1.getObjectLayouts)(userSession.profile, userSession.spaceId, this.name)];
                     case 6:
                         layouts = _b.sent();
                         _b.label = 7;
@@ -1601,8 +1528,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             });
                         }
                         objectConfig.fields = this.getAccessFields(objectConfig.fields, objectLayout, objectConfig.permissions);
-                        if (!!spaceProcessDefinition) return [3 /*break*/, 9];
-                        return [4 /*yield*/, getObject("process_definition").directFind({ filters: [['space', '=', userSession.spaceId], ['object_name', '=', this.name], ['active', '=', true]] })];
+                        if (!!spaceProcessDefinition) return [3, 9];
+                        return [4, getObject("process_definition").directFind({ filters: [['space', '=', userSession.spaceId], ['object_name', '=', this.name], ['active', '=', true]] })];
                     case 8:
                         spaceProcessDefinition = _b.sent();
                         _b.label = 9;
@@ -1610,14 +1537,13 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         if (spaceProcessDefinition.length > 0) {
                             objectConfig.enable_process = true;
                         }
-                        //清理数据
                         _.each(objectConfig.triggers, function (trigger, key) {
                             if ((trigger === null || trigger === void 0 ? void 0 : trigger.on) != 'client') {
                                 delete objectConfig.triggers[key];
                             }
                         });
-                        if (!!dbListViews) return [3 /*break*/, 11];
-                        return [4 /*yield*/, getObject("object_listviews").directFind({ filters: [['space', '=', userSession.spaceId], ['object_name', '=', this.name], [['owner', '=', userSession.userId], 'or', ['shared', '=', true]]] })];
+                        if (!!dbListViews) return [3, 11];
+                        return [4, getObject("object_listviews").directFind({ filters: [['space', '=', userSession.spaceId], ['object_name', '=', this.name], [['owner', '=', userSession.userId], 'or', ['shared', '=', true]]] })];
                     case 10:
                         dbListViews = _b.sent();
                         _b.label = 11;
@@ -1633,7 +1559,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         delete objectConfig.listeners;
                         delete objectConfig.__filename;
                         delete objectConfig.extend;
-                        return [2 /*return*/, objectConfig];
+                        return [2, objectConfig];
                 }
             });
         });
@@ -1650,7 +1576,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         buttons = [];
                         fields = [];
                         related_lists = [];
-                        return [4 /*yield*/, this.callMetadataObjectServiceAction('getOriginalObject', { objectApiName: this.name })];
+                        return [4, this.callMetadataObjectServiceAction('getOriginalObject', { objectApiName: this.name })];
                     case 1:
                         objectConfig = _b.sent();
                         sortedFields = [];
@@ -1664,17 +1590,16 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             layoutField.is_readonly = field.readonly;
                             layoutField.is_required = field.required;
                             layoutField.group = field.group;
-                            // layoutField.visible_on = `${!field.hidden}`;
                             fields.push(layoutField);
                         });
                         relatedLists = [];
                         if (this.enable_files) {
                             relatedLists.push("cms_files.parent");
                         }
-                        return [4 /*yield*/, this.getDetailsInfo()];
+                        return [4, this.getDetailsInfo()];
                     case 2:
                         details = _b.sent();
-                        return [4 /*yield*/, this.getLookupDetailsInfo()];
+                        return [4, this.getLookupDetailsInfo()];
                     case 3:
                         lookup_details = _b.sent();
                         relatedLists = relatedLists.concat(_.union(details, lookup_details));
@@ -1705,12 +1630,12 @@ var SteedosObjectType = /** @class */ (function (_super) {
                                 switch (_c.label) {
                                     case 0:
                                         related = relatedLists_1_1.value;
-                                        if (!related) return [3 /*break*/, 2];
+                                        if (!related) return [3, 2];
                                         relatedItem = {};
                                         relatedItem.related_field_fullname = related;
                                         foo = related.split('.');
                                         rObjectName = foo[0];
-                                        return [4 /*yield*/, getObject(rObjectName).toConfig()];
+                                        return [4, getObject(rObjectName).toConfig()];
                                     case 1:
                                         relatedObject = _c.sent();
                                         relatedObjectAllListView = _.find(relatedObject.list_views, function (listview) {
@@ -1730,37 +1655,37 @@ var SteedosObjectType = /** @class */ (function (_super) {
                                         }
                                         related_lists.push(relatedItem);
                                         _c.label = 2;
-                                    case 2: return [2 /*return*/];
+                                    case 2: return [2];
                                 }
                             });
                         };
                         relatedLists_1 = tslib_1.__asyncValues(relatedLists);
                         _b.label = 5;
-                    case 5: return [4 /*yield*/, relatedLists_1.next()];
+                    case 5: return [4, relatedLists_1.next()];
                     case 6:
-                        if (!(relatedLists_1_1 = _b.sent(), !relatedLists_1_1.done)) return [3 /*break*/, 9];
-                        return [5 /*yield**/, _loop_1()];
+                        if (!(relatedLists_1_1 = _b.sent(), !relatedLists_1_1.done)) return [3, 9];
+                        return [5, _loop_1()];
                     case 7:
                         _b.sent();
                         _b.label = 8;
-                    case 8: return [3 /*break*/, 5];
-                    case 9: return [3 /*break*/, 16];
+                    case 8: return [3, 5];
+                    case 9: return [3, 16];
                     case 10:
                         e_4_1 = _b.sent();
                         e_4 = { error: e_4_1 };
-                        return [3 /*break*/, 16];
+                        return [3, 16];
                     case 11:
                         _b.trys.push([11, , 14, 15]);
-                        if (!(relatedLists_1_1 && !relatedLists_1_1.done && (_a = relatedLists_1.return))) return [3 /*break*/, 13];
-                        return [4 /*yield*/, _a.call(relatedLists_1)];
+                        if (!(relatedLists_1_1 && !relatedLists_1_1.done && (_a = relatedLists_1.return))) return [3, 13];
+                        return [4, _a.call(relatedLists_1)];
                     case 12:
                         _b.sent();
                         _b.label = 13;
-                    case 13: return [3 /*break*/, 15];
+                    case 13: return [3, 15];
                     case 14:
                         if (e_4) throw e_4.error;
-                        return [7 /*endfinally*/];
-                    case 15: return [7 /*endfinally*/];
+                        return [7];
+                    case 15: return [7];
                     case 16:
                         buttons.push({
                             button_name: 'standard_new'
@@ -1778,7 +1703,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                                 });
                             }
                         });
-                        return [2 /*return*/, {
+                        return [2, {
                                 object_name: object_name,
                                 type: type,
                                 buttons: buttons,
@@ -1802,15 +1727,15 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 4, , 5]);
-                        return [4 /*yield*/, this.getDefaultRecordView(userSession)];
+                        return [4, this.getDefaultRecordView(userSession)];
                     case 2:
                         defaultRecordView = _a.sent();
-                        return [4 /*yield*/, getObject('object_layouts').insert(Object.assign({}, defaultRecordView, { name: name, label: label, profiles: profiles }), userSession)];
-                    case 3: return [2 /*return*/, _a.sent()];
+                        return [4, getObject('object_layouts').insert(Object.assign({}, defaultRecordView, { name: name, label: label, profiles: profiles }), userSession)];
+                    case 3: return [2, _a.sent()];
                     case 4:
                         error_3 = _a.sent();
-                        return [2 /*return*/, { error: error_3.message }];
-                    case 5: return [2 /*return*/];
+                        return [2, { error: error_3.message }];
+                    case 5: return [2];
                 }
             });
         });
@@ -1826,10 +1751,10 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         if (this.enable_files) {
                             related_objects.push({ object_name: "cms_files", foreign_key: "parent" });
                         }
-                        return [4 /*yield*/, this.getDetailsInfo()];
+                        return [4, this.getDetailsInfo()];
                     case 1:
                         detailsInfo = _b.sent();
-                        return [4 /*yield*/, this.getLookupDetailsInfo()];
+                        return [4, this.getLookupDetailsInfo()];
                     case 2:
                         lookupsInfo = _b.sent();
                         relatedInfos = detailsInfo.concat(lookupsInfo);
@@ -1839,13 +1764,13 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         relatedInfos_1 = tslib_1.__values(relatedInfos), relatedInfos_1_1 = relatedInfos_1.next();
                         _b.label = 4;
                     case 4:
-                        if (!!relatedInfos_1_1.done) return [3 /*break*/, 7];
+                        if (!!relatedInfos_1_1.done) return [3, 7];
                         info = relatedInfos_1_1.value;
-                        if (!!info.startsWith('__')) return [3 /*break*/, 6];
+                        if (!!info.startsWith('__')) return [3, 6];
                         infos = info.split('.');
                         detailObjectApiName = infos[0];
                         detailFieldName = infos[1];
-                        return [4 /*yield*/, getObject(detailObjectApiName).getField(detailFieldName)];
+                        return [4, getObject(detailObjectApiName).getField(detailFieldName)];
                     case 5:
                         related_field = _b.sent();
                         if (related_field) {
@@ -1861,18 +1786,18 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         _b.label = 6;
                     case 6:
                         relatedInfos_1_1 = relatedInfos_1.next();
-                        return [3 /*break*/, 4];
-                    case 7: return [3 /*break*/, 10];
+                        return [3, 4];
+                    case 7: return [3, 10];
                     case 8:
                         e_5_1 = _b.sent();
                         e_5 = { error: e_5_1 };
-                        return [3 /*break*/, 10];
+                        return [3, 10];
                     case 9:
                         try {
                             if (relatedInfos_1_1 && !relatedInfos_1_1.done && (_a = relatedInfos_1.return)) _a.call(relatedInfos_1);
                         }
                         finally { if (e_5) throw e_5.error; }
-                        return [7 /*endfinally*/];
+                        return [7];
                     case 10:
                         if (this.enable_tasks) {
                             related_objects.push({ object_name: "tasks", foreign_key: "related_to" });
@@ -1892,7 +1817,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         if (this.enable_process) {
                             related_objects.push({ object_name: "process_instance_history", foreign_key: "target_object" });
                         }
-                        return [2 /*return*/, related_objects];
+                        return [2, related_objects];
                 }
             });
         });
@@ -1907,8 +1832,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         clonedQuery = Object.assign({}, query);
-                        return [4 /*yield*/, this.callAdapter('count', this.table_name, clonedQuery, userSession)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                        return [4, this.callAdapter('count', this.table_name, clonedQuery, userSession)];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -1919,24 +1844,24 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         if (_.isNull(userSession) || _.isUndefined(userSession)) {
-                            return [2 /*return*/, true];
+                            return [2, true];
                         }
-                        if (!(method === 'find' || method === 'findOne' || method === 'count' || method === 'aggregate' || method === 'aggregatePrefixalPipeline')) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.allowRead(userSession)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                        if (!(method === 'find' || method === 'findOne' || method === 'count' || method === 'aggregate' || method === 'aggregatePrefixalPipeline')) return [3, 2];
+                        return [4, this.allowRead(userSession)];
+                    case 1: return [2, _a.sent()];
                     case 2:
-                        if (!(method === 'insert')) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.allowInsert(userSession)];
-                    case 3: return [2 /*return*/, _a.sent()];
+                        if (!(method === 'insert')) return [3, 4];
+                        return [4, this.allowInsert(userSession)];
+                    case 3: return [2, _a.sent()];
                     case 4:
-                        if (!(method === 'update' || method === 'updateOne' || method === 'updateMany')) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this.allowUpdate(userSession)];
-                    case 5: return [2 /*return*/, _a.sent()];
+                        if (!(method === 'update' || method === 'updateOne' || method === 'updateMany')) return [3, 6];
+                        return [4, this.allowUpdate(userSession)];
+                    case 5: return [2, _a.sent()];
                     case 6:
-                        if (!(method === 'delete')) return [3 /*break*/, 8];
-                        return [4 /*yield*/, this.allowDelete(userSession)];
-                    case 7: return [2 /*return*/, _a.sent()];
-                    case 8: return [2 /*return*/];
+                        if (!(method === 'delete')) return [3, 8];
+                        return [4, this.allowDelete(userSession)];
+                    case 7: return [2, _a.sent()];
+                    case 8: return [2];
                 }
             });
         });
@@ -1952,11 +1877,11 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         }
                         meteorWhen = "before".concat(method.charAt(0).toLocaleUpperCase()).concat(_.rest(tslib_1.__spreadArray([], tslib_1.__read(method), false)).join(''));
                         when = "before.".concat(method);
-                        return [4 /*yield*/, this.runTriggers(meteorWhen, context)];
+                        return [4, this.runTriggers(meteorWhen, context)];
                     case 1:
                         _a.sent();
-                        return [4 /*yield*/, this.runTriggerActions(when, context)];
-                    case 2: return [2 /*return*/, _a.sent()];
+                        return [4, this.runTriggerActions(when, context)];
+                    case 2: return [2, _a.sent()];
                 }
             });
         });
@@ -1969,11 +1894,11 @@ var SteedosObjectType = /** @class */ (function (_super) {
                     case 0:
                         meteorWhen = "after".concat(method.charAt(0).toLocaleUpperCase()).concat(_.rest(tslib_1.__spreadArray([], tslib_1.__read(method), false)).join(''));
                         when = "after.".concat(method);
-                        return [4 /*yield*/, this.runTriggers(meteorWhen, context)];
+                        return [4, this.runTriggers(meteorWhen, context)];
                     case 1:
                         _a.sent();
-                        return [4 /*yield*/, this.runTriggerActions(when, context)];
-                    case 2: return [2 /*return*/, _a.sent()];
+                        return [4, this.runTriggerActions(when, context)];
+                    case 2: return [2, _a.sent()];
                 }
             });
         });
@@ -1985,15 +1910,15 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         _ids = _.pluck(records, '_id');
-                        return [4 /*yield*/, this.getUserObjectPermission(userSession, false)];
+                        return [4, this.getUserObjectPermission(userSession, false)];
                     case 1:
                         objPm = _a.sent();
                         permissionFilters = this.getObjectEditPermissionFilters(objPm, userSession);
                         if (_.isEmpty(permissionFilters)) {
-                            return [2 /*return*/];
+                            return [2];
                         }
                         filters = (0, filters_1.formatFiltersToODataQuery)(['_id', 'in', _ids]);
-                        return [4 /*yield*/, this.directFind({
+                        return [4, this.directFind({
                                 fields: ['_id'],
                                 filters: "(".concat(filters, ") and (").concat(permissionFilters.join(' or '), ")")
                             })];
@@ -2009,7 +1934,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                                 };
                             }
                         });
-                        return [2 /*return*/];
+                        return [2];
                 }
             });
         });
@@ -2034,13 +1959,13 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         if (method === 'insert' || method === 'update') {
                             context.doc = args[args.length - 2];
                         }
-                        if (!(when === 'after' && (method === 'update' || method === 'delete'))) return [3 /*break*/, 2];
+                        if (!(when === 'after' && (method === 'update' || method === 'delete'))) return [3, 2];
                         _a = context;
-                        return [4 /*yield*/, this.findOne(recordId, {}, userSession)];
+                        return [4, this.findOne(recordId, {}, userSession)];
                     case 1:
                         _a.previousDoc = _b.sent();
                         _b.label = 2;
-                    case 2: return [2 /*return*/, context];
+                    case 2: return [2, context];
                 }
             });
         });
@@ -2052,9 +1977,9 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         if (!userSession) {
-                            return [2 /*return*/];
+                            return [2];
                         }
-                        return [4 /*yield*/, this.getUserObjectPermission(userSession, false)];
+                        return [4, this.getUserObjectPermission(userSession, false)];
                     case 1:
                         userObjectPermission = _a.sent();
                         userObjectUnreadableFields = userObjectPermission.unreadable_fields;
@@ -2085,27 +2010,11 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             }
                             query.fields = queryFields_1.join(',');
                         }
-                        return [2 /*return*/];
+                        return [2];
                 }
             });
         });
     };
-    // private async processUneditableFields(userSession: SteedosUserSession, doc: JsonMap) {
-    //     后台直接去掉uneditable_fields相关判断逻辑
-    //     [签约对象同时配置了company_ids必填及uneditable_fields造成部分用户新建签约对象时报错 #192](https://github.com/steedos/steedos-project-dzug/issues/192)
-    //     if (!userSession) {
-    //         return
-    //     }
-    //     let userObjectPermission = await this.getUserObjectPermission(userSession)
-    //     let userObjectUneditableFields = userObjectPermission.uneditable_fields
-    //     let intersection = _.intersection(userObjectUneditableFields, _.keys(doc))
-    //     if (intersection.length > 0) {
-    //         throw new Error(`no permissions to edit fields ${intersection.join(', ')}`)
-    //     }
-    //     // _.each(userObjectUneditableFields, (name: string)=>{
-    //     //     delete doc[name]
-    //     // })
-    // }
     SteedosObjectType.prototype.formatRecord = function (doc) {
         var adapterFormat = this._datasource["formatRecord"];
         if (typeof adapterFormat == 'function') {
@@ -2119,7 +2028,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
             args[_i - 1] = arguments[_i];
         }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var adapterMethod, userSession, allow, objectName, recordId, doc, paramRecordId, returnValue, beforeTriggerContext, afterTriggerContext, previousDoc, values, _records;
+            var adapterMethod, userSession, allow, recordId, doc, objectName, paramRecordId, returnValue, beforeTriggerContext, afterTriggerContext, previousDoc, values, _records;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -2128,8 +2037,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             throw new Error('Adapted does not support "' + method + '" method');
                         }
                         userSession = args[args.length - 1];
-                        if (!!_.isEmpty(userSession)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.allow(method, userSession)];
+                        if (!!_.isEmpty(userSession)) return [3, 2];
+                        return [4, this.allow(method, userSession)];
                     case 1:
                         allow = _a.sent();
                         if (!allow) {
@@ -2137,11 +2046,9 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         }
                         _a.label = 2;
                     case 2:
-                        objectName = args[0];
+                        objectName = this.name;
                         if (["insert", "update", "updateMany", "delete"].indexOf(method) > -1) {
-                            // 因下面的代码，比如函数dealWithMethodPermission可能改写args变量，所以需要提前从args取出对应变量值。
                             if (method === "insert") {
-                                // 此处doc不带_id值，得执行完adapterMethod.apply后，doc中才有_id属性，所以这里的doc及recordId都不准确
                                 doc = args[1];
                                 recordId = doc._id;
                             }
@@ -2153,32 +2060,32 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         if (method === 'findOne' || method === 'update' || method === 'delete') {
                             paramRecordId = args[1];
                         }
-                        if (!(!_.isEmpty(userSession) && this._datasource.enable_space)) return [3 /*break*/, 4];
+                        if (!(!_.isEmpty(userSession) && this._datasource.enable_space)) return [3, 4];
                         this.dealWithFilters(method, args);
-                        return [4 /*yield*/, this.dealWithMethodPermission(method, args)];
+                        return [4, this.dealWithMethodPermission(method, args)];
                     case 3:
                         _a.sent();
                         _a.label = 4;
                     case 4:
-                        if (!this.isDirectCRUD(method)) return [3 /*break*/, 6];
+                        if (!this.isDirectCRUD(method)) return [3, 6];
                         args.splice(args.length - 1, 1, userSession ? userSession.userId : undefined);
-                        return [4 /*yield*/, adapterMethod.apply(this._datasource, args)];
+                        return [4, adapterMethod.apply(this._datasource, args)];
                     case 5:
                         returnValue = _a.sent();
-                        return [3 /*break*/, 26];
-                    case 6: return [4 /*yield*/, this.getTriggerContext('before', method, args)];
+                        return [3, 26];
+                    case 6: return [4, this.getTriggerContext('before', method, args)];
                     case 7:
                         beforeTriggerContext = _a.sent();
                         if (paramRecordId) {
                             beforeTriggerContext = Object.assign({}, beforeTriggerContext, { id: paramRecordId });
                         }
-                        return [4 /*yield*/, this.runBeforeTriggers(method, beforeTriggerContext)];
+                        return [4, this.runBeforeTriggers(method, beforeTriggerContext)];
                     case 8:
                         _a.sent();
-                        return [4 /*yield*/, (0, validation_rules_1.runValidationRules)(method, beforeTriggerContext, args[0], userSession)];
+                        return [4, (0, validation_rules_1.runValidationRules)(method, beforeTriggerContext, args[0], userSession)];
                     case 9:
                         _a.sent();
-                        return [4 /*yield*/, this.getTriggerContext('after', method, args, paramRecordId)];
+                        return [4, this.getTriggerContext('after', method, args, paramRecordId)];
                     case 10:
                         afterTriggerContext = _a.sent();
                         if (paramRecordId) {
@@ -2186,21 +2093,21 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         }
                         previousDoc = clone(afterTriggerContext.previousDoc);
                         args.splice(args.length - 1, 1, userSession ? userSession.userId : undefined);
-                        return [4 /*yield*/, adapterMethod.apply(this._datasource, args)];
+                        return [4, adapterMethod.apply(this._datasource, args)];
                     case 11:
                         returnValue = _a.sent();
-                        if (!(method === 'find' || method == 'findOne' || method == 'count' || method == 'aggregate' || method == 'aggregatePrefixalPipeline')) return [3 /*break*/, 15];
+                        if (!(method === 'find' || method == 'findOne' || method == 'count' || method == 'aggregate' || method == 'aggregatePrefixalPipeline')) return [3, 15];
                         values = clone(returnValue) || {};
-                        if (!(method === 'count')) return [3 /*break*/, 12];
+                        if (!(method === 'count')) return [3, 12];
                         values = returnValue || 0;
-                        return [3 /*break*/, 14];
+                        return [3, 14];
                     case 12:
-                        if (!userSession) return [3 /*break*/, 14];
+                        if (!userSession) return [3, 14];
                         _records = returnValue;
                         if (method == 'findOne' && returnValue) {
                             _records = [_records];
                         }
-                        return [4 /*yield*/, this.appendRecordPermission(_records, userSession)];
+                        return [4, this.appendRecordPermission(_records, userSession)];
                     case 13:
                         _a.sent();
                         _a.label = 14;
@@ -2208,33 +2115,32 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         Object.assign(afterTriggerContext, { data: { values: values } });
                         _a.label = 15;
                     case 15:
-                        // 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*/, 18];
-                        if (!returnValue) return [3 /*break*/, 17];
+                        if (!(method == "update")) return [3, 18];
+                        if (!returnValue) return [3, 17];
                         afterTriggerContext.doc = returnValue;
-                        return [4 /*yield*/, this.runAfterTriggers(method, afterTriggerContext)];
+                        return [4, this.runAfterTriggers(method, afterTriggerContext)];
                     case 16:
                         _a.sent();
                         _a.label = 17;
-                    case 17: return [3 /*break*/, 20];
-                    case 18: return [4 /*yield*/, this.runAfterTriggers(method, afterTriggerContext)];
+                    case 17: return [3, 20];
+                    case 18: return [4, this.runAfterTriggers(method, afterTriggerContext)];
                     case 19:
                         _a.sent();
                         _a.label = 20;
                     case 20:
                         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];
+                                return [2, returnValue];
                             }
                             else {
-                                return [2 /*return*/, afterTriggerContext.data.values];
+                                return [2, afterTriggerContext.data.values];
                             }
                         }
-                        return [4 /*yield*/, new actions_1.WorkflowRulesRunner({
+                        return [4, new actions_1.WorkflowRulesRunner({
                                 object_name: this.name,
                                 event: method,
                                 record: returnValue,
@@ -2243,26 +2149,23 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             }).run()];
                     case 21:
                         _a.sent();
-                        if (!returnValue) return [3 /*break*/, 24];
+                        if (!returnValue) return [3, 24];
                         if (method === "insert") {
-                            // 当为insert时，上面代码执行后的doc不带_id，只能从returnValue中取
                             doc = returnValue;
                             recordId = doc._id;
                         }
-                        // 一定要先运行公式再运行汇总，以下两个函数顺序不能反
-                        return [4 /*yield*/, this.runRecordFormula(method, objectName, recordId, doc, userSession)];
+                        return [4, this.runRecordFormula(method, objectName, recordId, doc, userSession)];
                     case 22:
-                        // 一定要先运行公式再运行汇总，以下两个函数顺序不能反
                         _a.sent();
-                        return [4 /*yield*/, this.runRecordSummaries(method, objectName, recordId, doc, previousDoc, userSession)];
+                        return [4, this.runRecordSummaries(method, objectName, recordId, doc, previousDoc, userSession)];
                     case 23:
                         _a.sent();
                         _a.label = 24;
-                    case 24: return [4 /*yield*/, (0, object_events_1.brokeEmitEvents)(objectName, method, afterTriggerContext)];
+                    case 24: return [4, (0, object_events_1.brokeEmitEvents)(objectName, method, afterTriggerContext)];
                     case 25:
                         _a.sent();
                         _a.label = 26;
-                    case 26: return [2 /*return*/, returnValue];
+                    case 26: return [2, returnValue];
                 }
             });
         });
@@ -2270,28 +2173,27 @@ var SteedosObjectType = /** @class */ (function (_super) {
     ;
     SteedosObjectType.prototype.runRecordFormula = function (method, objectName, recordId, doc, userSession) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var currentUserId, onlyForOwn, withoutCurrent;
+            var onlyForOwn, withoutCurrent;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!(["insert", "update", "updateMany", "delete"].indexOf(method) > -1)) return [3 /*break*/, 5];
-                        if (!(method === "updateMany")) return [3 /*break*/, 1];
-                        return [3 /*break*/, 5];
+                        if (!(["insert", "update", "updateMany", "delete"].indexOf(method) > -1)) return [3, 5];
+                        if (!(method === "updateMany")) return [3, 1];
+                        return [3, 5];
                     case 1:
-                        currentUserId = userSession ? userSession.userId : undefined;
-                        if (!(method !== "delete")) return [3 /*break*/, 3];
-                        return [4 /*yield*/, (0, formula_1.runCurrentObjectFieldFormulas)(objectName, recordId, doc, currentUserId, true)];
+                        if (!(method !== "delete")) return [3, 3];
+                        return [4, (0, formula_1.runCurrentObjectFieldFormulas)(objectName, recordId, doc, userSession, true)];
                     case 2:
                         _a.sent();
                         _a.label = 3;
                     case 3:
                         onlyForOwn = method === "insert";
                         withoutCurrent = method === "delete";
-                        return [4 /*yield*/, (0, formula_1.runQuotedByObjectFieldFormulas)(objectName, recordId, userSession, { onlyForOwn: onlyForOwn, withoutCurrent: withoutCurrent })];
+                        return [4, (0, formula_1.runQuotedByObjectFieldFormulas)(objectName, recordId, userSession, { onlyForOwn: onlyForOwn, withoutCurrent: withoutCurrent })];
                     case 4:
                         _a.sent();
                         _a.label = 5;
-                    case 5: return [2 /*return*/];
+                    case 5: return [2];
                 }
             });
         });
@@ -2301,20 +2203,20 @@ var SteedosObjectType = /** @class */ (function (_super) {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!(["insert", "update", "updateMany", "delete"].indexOf(method) > -1)) return [3 /*break*/, 5];
-                        if (!(method === "updateMany")) return [3 /*break*/, 1];
-                        return [3 /*break*/, 5];
+                        if (!(["insert", "update", "updateMany", "delete"].indexOf(method) > -1)) return [3, 5];
+                        if (!(method === "updateMany")) return [3, 1];
+                        return [3, 5];
                     case 1:
-                        if (!(method === "insert")) return [3 /*break*/, 3];
-                        return [4 /*yield*/, (0, summary_1.runCurrentObjectFieldSummaries)(objectName, recordId)];
+                        if (!(method === "insert")) return [3, 3];
+                        return [4, (0, summary_1.runCurrentObjectFieldSummaries)(objectName, recordId)];
                     case 2:
                         _a.sent();
                         _a.label = 3;
-                    case 3: return [4 /*yield*/, (0, summary_1.runQuotedByObjectFieldSummaries)(objectName, recordId, previousDoc, userSession)];
+                    case 3: return [4, (0, summary_1.runQuotedByObjectFieldSummaries)(objectName, recordId, previousDoc, userSession)];
                     case 4:
                         _a.sent();
                         _a.label = 5;
-                    case 5: return [2 /*return*/];
+                    case 5: return [2];
                 }
             });
         });
@@ -2326,10 +2228,6 @@ var SteedosObjectType = /** @class */ (function (_super) {
         }
         return objectPermissionFilters;
     };
-    /**
-     * 把query.filters用formatFiltersToODataQuery转为odata query
-     * 主要是为了把userSession中的utcOffset逻辑传入formatFiltersToODataQuery函数处理
-     */
     SteedosObjectType.prototype.dealWithFilters = function (method, args) {
         var userSession = args[args.length - 1];
         if (userSession) {
@@ -2351,13 +2249,13 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         userSession = args[args.length - 1];
-                        if (!userSession) return [3 /*break*/, 5];
+                        if (!userSession) return [3, 5];
                         spaceId = userSession.spaceId;
                         userId = userSession.userId;
-                        return [4 /*yield*/, this.getUserObjectPermission(userSession, false)];
+                        return [4, this.getUserObjectPermission(userSession, false)];
                     case 1:
                         objPm = _a.sent();
-                        if (!(method === 'find' || method === 'count' || method === 'findOne' || method === 'aggregate' || method === 'aggregatePrefixalPipeline')) return [3 /*break*/, 4];
+                        if (!(method === 'find' || method === 'count' || method === 'findOne' || method === 'aggregate' || method === 'aggregatePrefixalPipeline')) return [3, 4];
                         query = args[args.length - 2];
                         if (method === 'aggregate' || method === 'aggregatePrefixalPipeline') {
                             query = args[args.length - 3];
@@ -2366,17 +2264,15 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             query.filters = (0, filters_1.formatFiltersToODataQuery)(query.filters);
                         }
                         if (this.table_name == 'cfs.files.filerecord' || this.table_name == 'cfs.instances.filerecord') {
-                            return [2 /*return*/];
+                            return [2];
                         }
                         if ((0, util_1.isCloudAdminSpace)(spaceId)) {
-                            return [2 /*return*/];
+                            return [2];
                         }
                         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 '".concat(spaceId, "')");
                         }
-                        // 本公司权限
                         if (spaceId && !objPm.viewAllRecords && objPm.viewCompanyRecords) {
                             if (_.isEmpty(userSession.companies)) {
                                 console.log('objPm', objPm);
@@ -2386,7 +2282,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                                 return "(company_id eq '".concat(comp._id, "') or (company_ids eq '").concat(comp._id, "')");
                             });
                         }
-                        if (!objPm.viewAllRecords && !objPm.viewCompanyRecords && objPm.allowRead) { // owner
+                        if (!objPm.viewAllRecords && !objPm.viewCompanyRecords && objPm.allowRead) {
                             ownerFilter = "(owner eq '".concat(userId, "')");
                         }
                         viewAssignCompanysRecordsFilter_1 = [];
@@ -2398,25 +2294,18 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         if (!_.isEmpty(viewAssignCompanysRecordsFilter_1)) {
                             permissionFilters.push("(".concat(viewAssignCompanysRecordsFilter_1.join(' or '), ")"));
                         }
-                        return [4 /*yield*/, shareRule_1.ShareRules.getUserObjectFilters(this.name, userSession)];
+                        return [4, shareRule_1.ShareRules.getUserObjectFilters(this.name, userSession)];
                     case 2:
-                        //共享规则
                         shareRuleFilters = _a.sent();
                         if (!_.isEmpty(shareRuleFilters)) {
                             permissionFilters.push("(".concat(shareRuleFilters.join(' or '), ")"));
                         }
-                        return [4 /*yield*/, restrictionRule_1.RestrictionRule.getUserObjectFilters(this.name, userSession)];
+                        return [4, restrictionRule_1.RestrictionRule.getUserObjectFilters(this.name, userSession)];
                     case 3:
-                        // 限制规则
                         restrictionRuleFilters = _a.sent();
                         if (!_.isEmpty(restrictionRuleFilters)) {
                             userFilters.push("(".concat(restrictionRuleFilters.join(' or '), ")"));
                         }
-                        // objectPermissionFilters = this.getObjectPermissionFilters(objPm, userSession, false);
-                        // if (!_.isEmpty(objectPermissionFilters)) {
-                        //     permissionFilters.push(`(${objectPermissionFilters.join(' or ')})`);
-                        // }
-                        //共享规则(旧)
                         sharesFilter = (0, util_1.getUserObjectSharesFilters)(this.name, userSession);
                         if (!_.isEmpty(companyFilter)) {
                             permissionFilters.push("(".concat(companyFilter.join(' or '), ")"));
@@ -2440,7 +2329,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             filters = filters ? "(".concat(filters, ") and (").concat(userFilters.join(' and '), ")") : userFilters.join(' and ');
                         }
                         query.filters = filters;
-                        return [3 /*break*/, 5];
+                        return [3, 5];
                     case 4:
                         if (method === 'insert') {
                             if (!objPm.allowCreate) {
@@ -2550,13 +2439,12 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             args[args.length - 2] = id;
                         }
                         _a.label = 5;
-                    case 5: return [2 /*return*/];
+                    case 5: return [2];
                 }
             });
         });
     };
     Object.defineProperty(SteedosObjectType.prototype, "schema", {
-        /***** get/set *****/
         get: function () {
             return this._schema;
         },