@steedos/objectql 2.1.16 → 2.1.20

package/lib/actions/field_updates.js

@@ -44,12 +44,12 @@ exports.getFieldUpdateActionTargetObjectName = getFieldUpdateActionTargetObjectN
 function runFieldUpdateAction(action, recordId, userSession) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var record, recordIdToUpdate, previousRecord, needToReevaluate, isCrossedObject, mainObjectName, _a, objectToUpdate, fieldToUpdate, newFieldValue;
-        var _b;
-        return tslib_1.__generator(this, function (_c) {
-            switch (_c.label) {
+        var _b, _c;
+        return tslib_1.__generator(this, function (_d) {
+            switch (_d.label) {
                 case 0: return [4 /*yield*/, index_1.getObject(action.object_name).findOne(recordId, null)];
                 case 1:
-                    record = _c.sent();
+                    record = _d.sent();
                     needToReevaluate = false;
                     isCrossedObject = action.target_object != action.object_name;
                     mainObjectName = getFieldUpdateActionTargetObjectName(action);
@@ -60,8 +60,8 @@ function runFieldUpdateAction(action, recordId, userSession) {
                     if (!_a) return [3 /*break*/, 3];
                     return [4 /*yield*/, index_1.getObject(mainObjectName).findOne(recordIdToUpdate, null)];
                 case 2:
-                    _a = (_c.sent());
-                    _c.label = 3;
+                    _a = (_d.sent());
+                    _d.label = 3;
                 case 3:
                     previousRecord = _a;
                     //对于跨对象的字段更新，虽然始终不会重新评估字段更新关联对象的工作流规则，但是始终会重新评估其要更新的对象的所有工作流规则。
@@ -73,7 +73,7 @@ function runFieldUpdateAction(action, recordId, userSession) {
                     previousRecord = record;
                     //对于非跨对象的字段更新，是否重新评估字段更新关联对象的工作流规则由其属性reevaluate_on_change决定。
                     needToReevaluate = action.reevaluate_on_change;
-                    _c.label = 5;
+                    _d.label = 5;
                 case 5:
                     objectToUpdate = index_1.getObject(mainObjectName);
                     fieldToUpdate = objectToUpdate.getField(action.field_name);
@@ -83,33 +83,40 @@ function runFieldUpdateAction(action, recordId, userSession) {
                     }
                     return [4 /*yield*/, getFieldValue(action, recordId, userSession)];
                 case 6:
-                    newFieldValue = _c.sent();
-                    if (!(recordIdToUpdate && newFieldValue !== (previousRecord && previousRecord[action.field_name]))) return [3 /*break*/, 10];
-                    // 只有值变更时才执行字段更新、级联公式重算、级联汇总字段重算、重新评估工作流规则等操作
-                    return [4 /*yield*/, objectToUpdate.directUpdate(recordIdToUpdate, (_b = {}, _b[action.field_name] = newFieldValue, _b))];
+                    newFieldValue = _d.sent();
+                    if (!(recordIdToUpdate && newFieldValue !== (previousRecord && previousRecord[action.field_name]))) return [3 /*break*/, 13];
+                    if (!(action.undirect === true)) return [3 /*break*/, 8];
+                    return [4 /*yield*/, objectToUpdate.update(recordIdToUpdate, (_b = {}, _b[action.field_name] = newFieldValue, _b))];
                 case 7:
+                    _d.sent();
+                    return [3 /*break*/, 12];
+                case 8: 
+                // 只有值变更时才执行字段更新、级联公式重算、级联汇总字段重算、重新评估工作流规则等操作
+                return [4 /*yield*/, objectToUpdate.directUpdate(recordIdToUpdate, (_c = {}, _c[action.field_name] = newFieldValue, _c))];
+                case 9:
                     // 只有值变更时才执行字段更新、级联公式重算、级联汇总字段重算、重新评估工作流规则等操作
-                    _c.sent();
+                    _d.sent();
                     // 字段更新后，需要找到引用了该字段的公式字段并更新其值
                     return [4 /*yield*/, formula_1.runQuotedByObjectFieldFormulas(mainObjectName, recordIdToUpdate, userSession, {
                             fieldNames: [action.field_name]
                         })];
-                case 8:
+                case 10:
                     // 字段更新后，需要找到引用了该字段的公式字段并更新其值
-                    _c.sent();
+                    _d.sent();
                     // 字段更新后，需要找到引用了该字段的累计汇总字段并更新其值
                     return [4 /*yield*/, summary_1.runQuotedByObjectFieldSummaries(mainObjectName, recordIdToUpdate, null, userSession, {
                             fieldNames: [action.field_name]
                         })];
-                case 9:
+                case 11:
                     // 字段更新后，需要找到引用了该字段的累计汇总字段并更新其值
-                    _c.sent();
-                    return [3 /*break*/, 11];
-                case 10:
+                    _d.sent();
+                    _d.label = 12;
+                case 12: return [3 /*break*/, 14];
+                case 13:
                     // 值没变更时强制重置needToReevaluate为false，即不需要执行相关工作流规则重新评估
                     needToReevaluate = false;
-                    _c.label = 11;
-                case 11:
+                    _d.label = 14;
+                case 14:
                     if (needToReevaluate) {
                         return [2 /*return*/, {
                                 object_name: mainObjectName,
@@ -137,7 +144,7 @@ function runFieldUpdateActions(ids, recordId, userSession) {
                     filters = [];
                     targets = [];
                     if (!_.isEmpty(ids)) {
-                        filters.push(['name', 'in', ids]);
+                        filters.push([['name', 'in', ids], 'or', ['_id', 'in', ids]]);
                     }
                     if (!!_.isEmpty(filters)) return [3 /*break*/, 9];
                     return [4 /*yield*/, index_1.getObject("action_field_updates").find({ filters: filters })];

package/lib/actions/field_updates.js.map

@@ -1 +1 @@
-{"version":3,"file":"field_updates.js","sourceRoot":"","sources":["../../src/actions/field_updates.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"field_updates.js","sourceRoot":"","sources":["../../src/actions/field_updates.ts"],"names":[],"mappings":"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"}

package/lib/actions/workflow_notifications.js

@@ -20,7 +20,7 @@ function runWorkflowNotifyActions(ids, recordId, userSession) {
                     if (_.isEmpty(ids) || _.isEmpty(recordId) || _.isEmpty(userSession)) {
                         return [2 /*return*/];
                     }
-                    filters = ['name', 'in', ids];
+                    filters = [['name', 'in', ids], 'or', ['_id', 'in', ids]];
                     return [4 /*yield*/, index_1.getObject("workflow_notifications").find({ filters: filters })];
                 case 1:
                     notifications = _b.sent();

package/lib/actions/workflow_notifications.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow_notifications.js","sourceRoot":"","sources":["../../src/actions/workflow_notifications.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflow_notifications.js","sourceRoot":"","sources":["../../src/actions/workflow_notifications.ts"],"names":[],"mappings":"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"}

package/lib/actions/workflow_rule.js

@@ -183,13 +183,13 @@ function runWFRule(rule, record, userSession, previousRecord) {
                     previousIsTrue = false;
                     targets = [];
                     if (!previousRecord) return [3 /*break*/, 2];
-                    return [4 /*yield*/, formula_1.computeFormula(rule.formula, rule.object_name, previousRecord, userSession.userId, userSession.spaceId)];
+                    return [4 /*yield*/, formula_1.computeFormula(rule.formula, rule.object_name, previousRecord, userSession === null || userSession === void 0 ? void 0 : userSession.userId, userSession === null || userSession === void 0 ? void 0 : userSession.spaceId)];
                 case 1:
                     previousIsTrue = _a.sent();
                     _a.label = 2;
                 case 2:
                     if (!!previousIsTrue) return [3 /*break*/, 6];
-                    return [4 /*yield*/, formula_1.computeFormula(rule.formula, rule.object_name, record, userSession.userId, userSession.spaceId)];
+                    return [4 /*yield*/, formula_1.computeFormula(rule.formula, rule.object_name, record, userSession === null || userSession === void 0 ? void 0 : userSession.userId, userSession === null || userSession === void 0 ? void 0 : userSession.spaceId)];
                 case 3:
                     isTrue = _a.sent();
                     if (!isTrue) return [3 /*break*/, 6];

package/lib/actions/workflow_rule.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow_rule.js","sourceRoot":"","sources":["../../src/actions/workflow_rule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflow_rule.js","sourceRoot":"","sources":["../../src/actions/workflow_rule.ts"],"names":[],"mappings":"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"}

package/lib/driver/metadata.d.ts

@@ -0,0 +1,40 @@
+import { Dictionary } from "@salesforce/ts-types";
+import { SteedosDriver } from ".";
+import { SteedosQueryOptions, SteedosIDType, SteedosObjectType } from "../types";
+import { SteedosDriverConfig } from "./driver";
+import { SteedosFieldDBType } from "./fieldDBType";
+export declare class MetadataDriver implements SteedosDriver {
+    databaseVersion?: string;
+    config?: SteedosDriverConfig;
+    connect(): void;
+    close(): void;
+    formatFiltersToMongoQuery(filters: any): any;
+    getMongoFilters(filters: any): any;
+    getMongoFieldsOptions(fields: any): {};
+    getMongoOptions(options: any): any;
+    getMongoSortOptions(sort: any): any;
+    getAggregateOptions(options: any): any[];
+    queryMetadata(collection: any, queryOptions: any, spaceId: any): import("mingo/cursor").Cursor;
+    getSupportedColumnTypes(): SteedosFieldDBType[];
+    find(collection: any, query: SteedosQueryOptions, spaceId?: SteedosIDType): import("mingo/types").RawArray;
+    aggregate(collection: any, query: SteedosQueryOptions, externalPipeline: any, spaceId?: SteedosIDType): import("mingo/types").RawArray;
+    findOne(collection: any, id: SteedosIDType, query: SteedosQueryOptions, spaceId?: SteedosIDType): void;
+    insert(collection: any, doc: Dictionary<any>, spaceId?: SteedosIDType): void;
+    update(collection: any, id: SteedosQueryOptions | SteedosIDType, doc: Dictionary<any>, spaceId?: SteedosIDType): void;
+    updateOne(collection: any, id: SteedosQueryOptions | SteedosIDType, doc: Dictionary<any>, spaceId?: SteedosIDType): void;
+    updateMany?(collection: any, queryFilters: any, doc: Dictionary<any>, spaceId?: SteedosIDType): void;
+    delete(collection: any, id: SteedosQueryOptions | SteedosIDType, spaceId?: SteedosIDType): void;
+    directUpdate(collection: any, id: SteedosQueryOptions | SteedosIDType, doc: Dictionary<any>, spaceId?: SteedosIDType): void;
+    directFind(collection: any, query: SteedosQueryOptions, spaceId?: SteedosIDType): void;
+    directInsert(collection: any, doc: Dictionary<any>, spaceId?: SteedosIDType): void;
+    directDelete(collection: any, id: SteedosQueryOptions | SteedosIDType, spaceId?: SteedosIDType): void;
+    directAggregate?(collection: any, query: SteedosQueryOptions, externalPipeline: any, spaceId?: SteedosIDType): void;
+    directAggregatePrefixalPipeline?(collection: any, query: SteedosQueryOptions, prefixalPipeline: any, spaceId?: SteedosIDType): void;
+    count(collection: any, query: SteedosQueryOptions, spaceId?: SteedosIDType): number;
+    dropEntities?(): void;
+    registerEntities?(objects: Dictionary<SteedosObjectType>): void;
+    dropTables?(): void;
+    createTables?(objects: Dictionary<SteedosObjectType>): void;
+    init(objects: Dictionary<SteedosObjectType>): void;
+    _makeNewID?(tableName?: string): void;
+}

package/lib/driver/metadata.js

@@ -0,0 +1,201 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MetadataDriver = void 0;
+var mingo = require("mingo");
+var steedosFilters = require("@steedos/filters");
+var odataV4Mongodb = require("odata-v4-mongodb");
+var clone = require("clone");
+var _ = require("underscore");
+var MetadataDriver = /** @class */ (function () {
+    function MetadataDriver() {
+    }
+    MetadataDriver.prototype.connect = function () {
+    };
+    MetadataDriver.prototype.close = function () {
+    };
+    MetadataDriver.prototype.formatFiltersToMongoQuery = function (filters) {
+        var emptyFilters = {};
+        var odataQuery = "";
+        if (_.isString(filters)) {
+            odataQuery = filters;
+        }
+        else {
+            odataQuery = steedosFilters.formatFiltersToODataQuery(filters);
+        }
+        if (!odataQuery) {
+            return emptyFilters;
+        }
+        var query = odataV4Mongodb.createFilter(odataQuery);
+        return query;
+    };
+    MetadataDriver.prototype.getMongoFilters = function (filters) {
+        var emptyFilters = {};
+        if (_.isUndefined(filters)) {
+            return emptyFilters;
+        }
+        if (_.isString(filters) && !filters.length) {
+            return emptyFilters;
+        }
+        if (_.isArray(filters) && !filters.length) {
+            return emptyFilters;
+        }
+        var mongoFilters = this.formatFiltersToMongoQuery(filters);
+        return mongoFilters;
+    };
+    MetadataDriver.prototype.getMongoFieldsOptions = function (fields) {
+        if (typeof fields == "string") {
+            fields = (fields).split(",").map(function (n) { return n.trim(); });
+        }
+        if (!(fields && fields.length)) {
+            return {};
+        }
+        var projection = {};
+        (fields).forEach(function (field) {
+            if (field) {
+                projection[field] = 1;
+            }
+        });
+        return projection;
+    };
+    MetadataDriver.prototype.getMongoOptions = function (options) {
+        if (_.isUndefined(options)) {
+            return {};
+        }
+        var result = {};
+        var projection = this.getMongoFieldsOptions(options.fields);
+        var sort = this.getMongoSortOptions(options.sort);
+        result.projection = projection;
+        result.sort = sort;
+        result.limit = options.top;
+        result.skip = options.skip;
+        return result;
+    };
+    MetadataDriver.prototype.getMongoSortOptions = function (sort) {
+        var result = undefined;
+        if (sort && typeof sort === "string") {
+            var arraySort = sort.split(",").map(function (n) { return n.trim(); });
+            var stringSort_1 = "";
+            arraySort.forEach(function (n) {
+                if (n) {
+                    stringSort_1 += n + ",";
+                }
+            });
+            stringSort_1 = stringSort_1.replace(/,$/g, "");
+            result = odataV4Mongodb.createQuery("$orderby=" + stringSort_1).sort;
+        }
+        return result;
+    };
+    MetadataDriver.prototype.getAggregateOptions = function (options) {
+        if (_.isUndefined(options)) {
+            return [];
+        }
+        var result = [];
+        var projection = this.getMongoFieldsOptions(options.fields);
+        var sort = this.getMongoSortOptions(options.sort);
+        if (!_.isEmpty(projection)) {
+            result.push({ $project: projection });
+        }
+        if (!_.isEmpty(sort)) {
+            result.push({ $sort: sort });
+        }
+        if (options.skip) {
+            result.push({ $skip: options.skip });
+        }
+        if (options.top) {
+            result.push({ $limit: options.top });
+        }
+        return result;
+    };
+    MetadataDriver.prototype.queryMetadata = function (collection, queryOptions, spaceId) {
+        var _collection = clone(collection);
+        _.each(_collection, function (item) { item.space = spaceId; });
+        var mongoFilters = this.getMongoFilters(queryOptions.filters);
+        var mongoOptions = this.getMongoOptions(queryOptions);
+        // console.log(`mongoFilters`, JSON.stringify(mongoFilters));
+        // console.log(`mongoOptions`, mongoOptions);
+        var query = new mingo.Query(mongoFilters, mongoOptions.projectio);
+        var cursor = query.find(_collection);
+        if (mongoOptions.sort) {
+            cursor.sort(mongoOptions.sort);
+        }
+        // if(mongoOptions.skip){
+        //     cursor.skip(mongoOptions.skip)
+        // }
+        // if(mongoOptions.limit){
+        //     cursor.limit(mongoOptions.limit)
+        // }
+        return cursor;
+    };
+    MetadataDriver.prototype.getSupportedColumnTypes = function () {
+        throw new Error("Method not implemented.");
+    };
+    MetadataDriver.prototype.find = function (collection, query, spaceId) {
+        var result = this.queryMetadata(collection, query, spaceId).all();
+        return result;
+    };
+    MetadataDriver.prototype.aggregate = function (collection, query, externalPipeline, spaceId) {
+        var result = this.queryMetadata(collection, query, spaceId).all();
+        return result;
+    };
+    MetadataDriver.prototype.findOne = function (collection, id, query, spaceId) {
+        throw new Error("Method not implemented.");
+    };
+    MetadataDriver.prototype.insert = function (collection, doc, spaceId) {
+        throw new Error("Method not implemented.");
+    };
+    MetadataDriver.prototype.update = function (collection, id, doc, spaceId) {
+        throw new Error("Method not implemented.");
+    };
+    MetadataDriver.prototype.updateOne = function (collection, id, doc, spaceId) {
+        throw new Error("Method not implemented.");
+    };
+    MetadataDriver.prototype.updateMany = function (collection, queryFilters, doc, spaceId) {
+        throw new Error("Method not implemented.");
+    };
+    MetadataDriver.prototype.delete = function (collection, id, spaceId) {
+        throw new Error("Method not implemented.");
+    };
+    MetadataDriver.prototype.directUpdate = function (collection, id, doc, spaceId) {
+        throw new Error("Method not implemented.");
+    };
+    MetadataDriver.prototype.directFind = function (collection, query, spaceId) {
+        throw new Error("Method not implemented.");
+    };
+    MetadataDriver.prototype.directInsert = function (collection, doc, spaceId) {
+        throw new Error("Method not implemented.");
+    };
+    MetadataDriver.prototype.directDelete = function (collection, id, spaceId) {
+        throw new Error("Method not implemented.");
+    };
+    MetadataDriver.prototype.directAggregate = function (collection, query, externalPipeline, spaceId) {
+        throw new Error("Method not implemented.");
+    };
+    MetadataDriver.prototype.directAggregatePrefixalPipeline = function (collection, query, prefixalPipeline, spaceId) {
+        throw new Error("Method not implemented.");
+    };
+    MetadataDriver.prototype.count = function (collection, query, spaceId) {
+        var result = this.queryMetadata(collection, query, spaceId).count();
+        return result;
+    };
+    MetadataDriver.prototype.dropEntities = function () {
+        throw new Error("Method not implemented.");
+    };
+    MetadataDriver.prototype.registerEntities = function (objects) {
+        throw new Error("Method not implemented.");
+    };
+    MetadataDriver.prototype.dropTables = function () {
+        throw new Error("Method not implemented.");
+    };
+    MetadataDriver.prototype.createTables = function (objects) {
+        throw new Error("Method not implemented.");
+    };
+    MetadataDriver.prototype.init = function (objects) {
+        throw new Error("Method not implemented.");
+    };
+    MetadataDriver.prototype._makeNewID = function (tableName) {
+        throw new Error("Method not implemented.");
+    };
+    return MetadataDriver;
+}());
+exports.MetadataDriver = MetadataDriver;
+//# sourceMappingURL=metadata.js.map

package/lib/driver/metadata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../src/driver/metadata.ts"],"names":[],"mappings":";;;AAKA,6BAAgC;AAChC,iDAAoD;AACpD,iDAAoD;AACpD,6BAAgC;AAChC,8BAAiC;AAEjC;IAAA;IAyMA,CAAC;IAtMG,gCAAO,GAAP;IAEA,CAAC;IACD,8BAAK,GAAL;IAEA,CAAC;IAED,kDAAyB,GAAzB,UAA0B,OAAO;QAC7B,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YACrB,UAAU,GAAG,OAAO,CAAC;SACxB;aACI;YACD,UAAU,GAAG,cAAc,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAA;SACjE;QACD,IAAG,CAAC,UAAU,EAAC;YACX,OAAO,YAAY,CAAC;SACvB;QACD,IAAI,KAAK,GAAG,cAAc,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QACpD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,wCAAe,GAAf,UAAgB,OAAO;QACnB,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;YACxB,OAAO,YAAY,CAAC;SACvB;QACD,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACxC,OAAO,YAAY,CAAA;SACtB;QACD,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACvC,OAAO,YAAY,CAAA;SACtB;QACD,IAAI,YAAY,GAAG,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;QAC3D,OAAO,YAAY,CAAA;IACvB,CAAC;IAED,8CAAqB,GAArB,UAAsB,MAAM;QACxB,IAAI,OAAO,MAAM,IAAI,QAAQ,EAAE;YAC3B,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,UAAC,CAAC,IAAO,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SACjE;QACD,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE;YAC5B,OAAO,EAAE,CAAA;SACZ;QACD,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,UAAC,KAAK;YACnB,IAAI,KAAK,EAAE;gBACP,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aACzB;QACL,CAAC,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,wCAAe,GAAf,UAAgB,OAAO;QACnB,IAAI,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;YACxB,OAAO,EAAE,CAAC;SACb;QACD,IAAI,MAAM,GAAQ,EAAE,CAAC;QACrB,IAAI,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC5D,IAAI,IAAI,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC;QAC/B,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;QACnB,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC;QAC3B,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QAC3B,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,4CAAmB,GAAnB,UAAoB,IAAI;QACpB,IAAI,MAAM,GAAG,SAAS,CAAC;QACvB,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAClC,IAAI,SAAS,GAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,UAAC,CAAC,IAAO,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,IAAI,YAAU,GAAG,EAAE,CAAC;YACpB,SAAS,CAAC,OAAO,CAAC,UAAC,CAAC;gBAChB,IAAI,CAAC,EAAE;oBACH,YAAU,IAAO,CAAC,MAAG,CAAA;iBACxB;YACL,CAAC,CAAC,CAAC;YACH,YAAU,GAAG,YAAU,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC3C,MAAM,GAAG,cAAc,CAAC,WAAW,CAAC,cAAY,YAAY,CAAC,CAAC,IAAI,CAAC;SACtE;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,4CAAmB,GAAnB,UAAoB,OAAO;QACvB,IAAI,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;YACxB,OAAO,EAAE,CAAC;SACb;QACD,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC5D,IAAI,IAAI,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACxB,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;SACzC;QACD,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAClB,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SAChC;QACD,IAAI,OAAO,CAAC,IAAI,EAAE;YACd,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;SACxC;QACD,IAAI,OAAO,CAAC,GAAG,EAAE;YACb,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;SACxC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,sCAAa,GAAb,UAAc,UAAU,EAAE,YAAY,EAAE,OAAO;QAC3C,IAAM,WAAW,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;QACtC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,UAAS,IAAI,IAAG,IAAI,CAAC,KAAK,GAAG,OAAO,CAAA,CAAA,CAAC,CAAC,CAAA;QAC1D,IAAI,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC9D,IAAI,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QACtD,6DAA6D;QAC7D,6CAA6C;QAC7C,IAAI,KAAK,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,YAAY,CAAC,SAAS,CAAC,CAAA;QACjE,IAAI,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACrC,IAAG,YAAY,CAAC,IAAI,EAAC;YACjB,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;SACjC;QACD,yBAAyB;QACzB,qCAAqC;QACrC,IAAI;QACJ,0BAA0B;QAC1B,uCAAuC;QACvC,IAAI;QACJ,OAAO,MAAM,CAAC;IAClB,CAAC;IAGD,gDAAuB,GAAvB;QACI,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,6BAAI,GAAJ,UAAK,UAAe,EAAE,KAA0B,EAAE,OAAuB;QACrE,IAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC;QACpE,OAAO,MAAM,CAAC;IAClB,CAAC;IACD,kCAAS,GAAT,UAAU,UAAe,EAAE,KAA0B,EAAE,gBAAqB,EAAE,OAAuB;QACjG,IAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC;QACpE,OAAO,MAAM,CAAC;IAClB,CAAC;IACD,gCAAO,GAAP,UAAQ,UAAe,EAAE,EAAiB,EAAE,KAA0B,EAAE,OAAuB;QAC3F,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,+BAAM,GAAN,UAAO,UAAe,EAAE,GAAoB,EAAE,OAAuB;QACjE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,+BAAM,GAAN,UAAO,UAAe,EAAE,EAAuC,EAAE,GAAoB,EAAE,OAAuB;QAC1G,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,kCAAS,GAAT,UAAU,UAAe,EAAE,EAAuC,EAAE,GAAoB,EAAE,OAAuB;QAC7G,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,mCAAU,GAAV,UAAY,UAAe,EAAE,YAAiB,EAAE,GAAoB,EAAE,OAAuB;QACzF,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,+BAAM,GAAN,UAAO,UAAe,EAAE,EAAuC,EAAE,OAAuB;QACpF,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,qCAAY,GAAZ,UAAa,UAAe,EAAE,EAAuC,EAAE,GAAoB,EAAE,OAAuB;QAChH,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,mCAAU,GAAV,UAAW,UAAe,EAAE,KAA0B,EAAE,OAAuB;QAC3E,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,qCAAY,GAAZ,UAAa,UAAe,EAAE,GAAoB,EAAE,OAAuB;QACvE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,qCAAY,GAAZ,UAAa,UAAe,EAAE,EAAuC,EAAE,OAAuB;QAC1F,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,wCAAe,GAAf,UAAiB,UAAe,EAAE,KAA0B,EAAE,gBAAqB,EAAE,OAAuB;QACxG,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,wDAA+B,GAA/B,UAAiC,UAAe,EAAE,KAA0B,EAAE,gBAAqB,EAAE,OAAuB;QACxH,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,8BAAK,GAAL,UAAM,UAAe,EAAE,KAA0B,EAAE,OAAuB;QACtE,IAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;QACtE,OAAO,MAAM,CAAC;IAClB,CAAC;IACD,qCAAY,GAAZ;QACI,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,yCAAgB,GAAhB,UAAkB,OAAsC;QACpD,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,mCAAU,GAAV;QACI,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,qCAAY,GAAZ,UAAc,OAAsC;QAChD,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,6BAAI,GAAJ,UAAK,OAAsC;QACvC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,mCAAU,GAAV,UAAY,SAAkB;QAC1B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAEL,qBAAC;AAAD,CAAC,AAzMD,IAyMC;AAzMY,wCAAc"}

package/lib/types/object.js

@@ -15,6 +15,7 @@ var validation_rules_1 = require("./validation_rules");
 var object_events_1 = require("./object_events");
 var i18n_1 = require("@steedos/i18n");
 var object_layouts_1 = require("./object_layouts");
+var lodash_1 = require("lodash");
 var clone = require('clone');
 // 主子表有层级限制，超过3层就报错，该函数判断当前对象作为主表对象往下的层级最多不越过3层，
 // 其3层指的是A-B-C-D，它们都有父子关系，A作为最顶层，该对象上不可以再创建主表子表关系字段，但是B、C、D上可以；
@@ -1282,7 +1283,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
     };
     SteedosObjectType.prototype.getRecordView = function (userSession) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var lng, objectMetadataConfig, objectConfig, _a, _b, _c, _d, layouts, layout, _fields_1, layoutFieldKeys, objectFieldKeys, difference, _buttons_1, spaceProcessDefinition, dbListViews;
+            var lng, objectMetadataConfig, objectConfig, _a, _b, _c, _d, layouts, layout, _fields_1, sort_no_1, layoutFieldKeys, objectFieldKeys, difference, layoutButtonsName_1, spaceProcessDefinition, dbListViews;
             return tslib_1.__generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
@@ -1317,6 +1318,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         if (layouts && layouts.length > 0) {
                             layout = layouts[0];
                             _fields_1 = {};
+                            sort_no_1 = 1;
                             _.each(layout.fields, function (_item) {
                                 _fields_1[_item.field_name] = objectConfig.fields[_item.field_name];
                                 if (_fields_1[_item.field_name]) {
@@ -1336,6 +1338,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                                     if (_item.visible_on) {
                                         _fields_1[_item.field_name].visible_on = _item.visible_on;
                                     }
+                                    _fields_1[_item.field_name].sort_no = sort_no_1;
+                                    sort_no_1++;
                                 }
                             });
                             layoutFieldKeys = _.keys(_fields_1);
@@ -1346,21 +1350,34 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             });
                             _.each(difference, function (fieldApiName) {
                                 objectConfig.fields[fieldApiName].hidden = true;
+                                objectConfig.fields[fieldApiName].sort_no = 99999;
                             });
-                            _buttons_1 = {};
                             _.each(layout.buttons, function (button) {
                                 var action = objectConfig.actions[button.button_name];
                                 if (action) {
                                     if (button.visible_on) {
-                                        action.visible = button.visible_on;
+                                        action._visible = button.visible_on;
                                     }
-                                    _buttons_1[button.button_name] = action;
                                 }
                             });
-                            objectConfig.actions = _buttons_1;
+                            layoutButtonsName_1 = _.pluck(layout.buttons, 'button_name');
+                            _.each(objectConfig.actions, function (action) {
+                                if (!_.include(layoutButtonsName_1, action.name)) {
+                                    action.visible = false;
+                                    action._visible = function () { return false; }.toString();
+                                }
+                            });
                             // _object.allow_customActions = userObjectLayout.custom_actions || []
                             // _object.exclude_actions = userObjectLayout.exclude_actions || []
                             objectConfig.related_lists = layout.related_lists || [];
+                            _.each(objectConfig.related_lists, function (related_list) {
+                                if (related_list.sort_field_name && _.isArray(related_list.sort_field_name) && related_list.sort_field_name.length > 0) {
+                                    related_list.sort = [];
+                                    _.each(related_list.sort_field_name, function (fName) {
+                                        related_list.sort.push({ field_name: fName, order: related_list.sort_order || 'asc' });
+                                    });
+                                }
+                            });
                         }
                         return [4 /*yield*/, getObject("process_definition").directFind({ filters: [['space', '=', userSession.spaceId], ['object_name', '=', this.name], ['active', '=', true]] })];
                     case 7:
@@ -1408,7 +1425,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.callMetadataObjectServiceAction('getOriginalObject', { objectApiName: this.name })];
                     case 1:
                         objectConfig = _b.sent();
-                        _.each(objectConfig.fields, function (field, key) {
+                        _.each(lodash_1.sortBy(objectConfig.fields, function (o) { return o.sort_no; }), function (field, key) {
                             var layoutField = {};
                             layoutField.field_name = field.name || key;
                             layoutField.is_readonly = field.readonly;
@@ -1680,7 +1697,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (method === 'count') {
+                        if (method === 'count' || method === "findOne") {
                             method = 'find';
                         }
                         meteorWhen = "before" + method.charAt(0).toLocaleUpperCase() + _.rest(tslib_1.__spread(method)).join('');