@steedos/objectql 2.1.57 → 2.1.61

package/lib/util/field.js.map

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

package/lib/util/function_expression.d.ts

@@ -1,2 +1,2 @@
 export declare const isExpression: (func: any) => boolean;
-export declare const parseSingleExpression: (func: any, formData: any, dataPath: any, global: any) => any;
+export declare const parseSingleExpression: (func: any, formData: any, dataPath: any, global: any, userSession?: {}) => any;

package/lib/util/function_expression.js

@@ -39,7 +39,8 @@ exports.isExpression = function (func) {
     }
     return false;
 };
-exports.parseSingleExpression = function (func, formData, dataPath, global) {
+exports.parseSingleExpression = function (func, formData, dataPath, global, userSession) {
+    if (userSession === void 0) { userSession = {}; }
     var error, funcBody, parent, parentPath, str;
     if (formData === void 0) {
         formData = {};
@@ -48,7 +49,7 @@ exports.parseSingleExpression = function (func, formData, dataPath, global) {
     parent = getValueByPath(formData, parentPath) || {};
     if (typeof func === 'string') {
         funcBody = func.substring(2, func.length - 2);
-        str = '\n    return ' + funcBody.replace(/\bformData\b/g, JSON.stringify(formData).replace(/\bglobal\b/g, globalTag)).replace(/\bglobal\b/g, JSON.stringify(global)).replace(new RegExp('\\b' + globalTag + '\\b', 'g'), 'global').replace(/rootValue/g, JSON.stringify(parent));
+        str = "\n  var $user=" + JSON.stringify(userSession) + ";   return " + funcBody.replace(/\bformData\b/g, JSON.stringify(formData).replace(/\bglobal\b/g, globalTag)).replace(/\bglobal\b/g, JSON.stringify(global)).replace(new RegExp('\\b' + globalTag + '\\b', 'g'), 'global').replace(/rootValue/g, JSON.stringify(parent));
         try {
             return Function(str)();
         }

package/lib/util/function_expression.js.map

@@ -1 +1 @@
-{"version":3,"file":"function_expression.js","sourceRoot":"","sources":["../../src/util/function_expression.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"function_expression.js","sourceRoot":"","sources":["../../src/util/function_expression.ts"],"names":[],"mappings":";;;AAAA,0BAA2B;AAE3B,IAAM,SAAS,GAAG,iBAAiB,CAAC;AAEpC,IAAM,aAAa,GAAG,UAAU,IAAI;IAChC,IAAI,OAAO,CAAC;IACZ,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC1B,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,OAAO,GAAG,CAAC;SACd;QACD,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KAC5B;IACD,OAAO,GAAG,CAAC;AACf,CAAC,CAAA;AAED,IAAM,cAAc,GAAG,UAAU,QAAQ,EAAE,IAAI;IAC3C,IAAI,IAAI,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE;QACvB,OAAO,QAAQ,IAAI,EAAE,CAAC;KACzB;SAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QACjC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;KAChC;SAAM;QACH,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;KAC5C;AACL,CAAC,CAAC;AAEW,QAAA,YAAY,GAAG,UAAU,IAAI;IACtC,IAAI,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC;IACxB,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC1B,OAAO,KAAK,CAAC;KAChB;IACD,OAAO,GAAG,YAAY,CAAC;IACvB,IAAI,GAAG,oBAAoB,CAAC;IAC5B,IAAI,GAAG,gBAAgB,CAAC;IACxB,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QAC3F,OAAO,IAAI,CAAC;KACf;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAEW,QAAA,qBAAqB,GAAG,UAAU,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAgB;IAAhB,4BAAA,EAAA,gBAAgB;IAC7F,IAAI,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,CAAC;IAE7C,IAAI,QAAQ,KAAK,KAAK,CAAC,EAAE;QACrB,QAAQ,GAAG,EAAE,CAAC;KACjB;IACD,UAAU,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IACrC,MAAM,GAAG,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC;IACpD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC1B,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC9C,GAAG,GAAG,mBAAiB,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,gBAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,GAAG,SAAS,GAAG,KAAK,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3T,IAAI;YACA,OAAO,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;SAC1B;QAAC,OAAO,MAAM,EAAE;YACb,KAAK,GAAG,MAAM,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;YACnC,OAAO,IAAI,CAAC;SACf;KACJ;SAAM;QACH,OAAO,IAAI,CAAC;KACf;AACL,CAAC,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@steedos/objectql",
   "private": false,
-  "version": "2.1.57",
+  "version": "2.1.61",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -18,12 +18,12 @@
     "@salesforce/dev-config": "^1.4.4",
     "@salesforce/kit": "^1.0.4",
     "@salesforce/ts-types": "^1.1.1",
-    "@steedos/filters": "2.1.57",
-    "@steedos/formula": "2.1.57",
-    "@steedos/metadata-core": "2.1.57",
+    "@steedos/filters": "2.1.61",
+    "@steedos/formula": "2.1.61",
+    "@steedos/metadata-core": "2.1.61",
     "@steedos/odata-v4-typeorm": "^1.20.1",
-    "@steedos/schemas": "2.1.57",
-    "@steedos/standard-objects": "2.1.57",
+    "@steedos/schemas": "2.1.61",
+    "@steedos/standard-objects": "2.1.61",
     "@types/express": "^4.16.1",
     "@types/mongodb": "^3.1.22",
     "@types/node": "^11.10.4",
@@ -57,7 +57,7 @@
   },
   "devDependencies": {
     "@salesforce/dev-scripts": "0.3.12",
-    "@steedos/meteor-bundle-runner": "2.1.57",
+    "@steedos/meteor-bundle-runner": "2.1.61",
     "@types/chai": "^4.1.7",
     "@types/chai-as-promised": "7.1.0",
     "@types/mocha": "^5.2.6",
@@ -77,5 +77,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ded65c3ad95afec8827dd81d505684459a3ba019"
+  "gitHead": "ffa72e7758fdc53be405c3b95f371477500ed602"
 }

package/src/dynamic-load/preload_data.ts

@@ -2,6 +2,10 @@ import { addObjectFieldConfig } from './field'
 import { addObjectButtonsConfig } from './button'
 import { addAppConfig, loadObjectLayoutMetadata, SteedosDataSourceType } from '..';
 import { addTabConfig } from './tabs';
+import { registerRestrictionRules } from '../metadata-register/restrictionRules';
+import { registerShareRules } from '../metadata-register/shareRules';
+import { registerPermissionFields } from '../metadata-register/permissionFields';
+import { getSteedosSchema } from '../types/schema';
 
 declare var Creator: any;
 
@@ -59,3 +63,43 @@ export const preloadDBObjectLayouts = async function(datasource: SteedosDataSour
         await loadObjectLayoutMetadata(element, `~database-${tableName}`);
     }
 }
+
+
+export const preloadDBRestrictionRules = async function (datasource: SteedosDataSourceType) {
+    const schema = getSteedosSchema();
+    const tableName = "restriction_rules";
+    if (datasource.name === 'meteor') {
+        Creator.Collections[tableName] = Creator.createCollection({ name: tableName });
+    }
+    let records: any = await datasource.find(tableName, {});
+
+    for await (const element of records) {
+        await registerRestrictionRules.register(schema.broker, `~database-${tableName}`, element);
+    }
+}
+
+export const preloadDBShareRules = async function (datasource: SteedosDataSourceType) {
+    const schema = getSteedosSchema();
+    const tableName = "share_rules";
+    if (datasource.name === 'meteor') {
+        Creator.Collections[tableName] = Creator.createCollection({ name: tableName });
+    }
+    let records: any = await datasource.find(tableName, {});
+
+    for await (const element of records) {
+        await registerShareRules.register(schema.broker, `~database-${tableName}`, element);
+    }
+}
+
+export const preloadDBPermissionFields = async function (datasource: SteedosDataSourceType) {
+    const schema = getSteedosSchema();
+    const tableName = "permission_fields";
+    if (datasource.name === 'meteor') {
+        Creator.Collections[tableName] = Creator.createCollection({ name: tableName });
+    }
+    let records: any = await datasource.find(tableName, {});
+
+    for await (const element of records) {
+        await registerPermissionFields.register(schema.broker, `~database-${tableName}`, element);
+    }
+}

package/src/dynamic-load/restrictionRules.ts

@@ -0,0 +1,19 @@
+import { LoadRestrictionRules } from '@steedos/metadata-core';
+import { registerRestrictionRules } from '../metadata-register/restrictionRules';
+import { getSteedosSchema } from '../types'
+const loadRestrictionRules = new LoadRestrictionRules();
+
+export const registerPackageRestrictionRules = async (packagePath: string, packageServiceName: string) => {
+    const metadata = loadRestrictionRules.load(packagePath);
+    const schema = getSteedosSchema();
+    for (const apiName in metadata) {
+        const item = metadata[apiName];
+        await registerRestrictionRules.register(schema.broker, packageServiceName, Object.assign(item, {
+            is_system: true, record_permissions: {
+                allowEdit: false,
+                allowDelete: false,
+                allowRead: true,
+            }
+        }))
+    }
+}

package/src/dynamic-load/shareRules.ts

@@ -0,0 +1,19 @@
+import { LoadShareRules } from '@steedos/metadata-core';
+import { registerRestrictionRules } from '../metadata-register/restrictionRules';
+import { getSteedosSchema } from '../types'
+const loadShareRules = new LoadShareRules();
+
+export const registerPackageRestrictionRules = async (packagePath: string, packageServiceName: string) => {
+    const metadata = loadShareRules.load(packagePath);
+    const schema = getSteedosSchema();
+    for (const apiName in metadata) {
+        const item = metadata[apiName];
+        await registerRestrictionRules.register(schema.broker, packageServiceName, Object.assign(item, {
+            is_system: true, record_permissions: {
+                allowEdit: false,
+                allowDelete: false,
+                allowRead: true,
+            }
+        }))
+    }
+}

package/src/index.ts

@@ -10,4 +10,7 @@ export * from "./dynamic-load"
 export * from './metadata-register/query'
 export * from './metadata-register/chart'
 export * from './metadata-register/page'
-export * from './metadata-register/tab'
+export * from './metadata-register/tab'
+export * from './metadata-register/shareRules'
+export * from './metadata-register/restrictionRules'
+export * from './metadata-register/permissionFields'

package/src/metadata-register/_base.ts

@@ -1,3 +1,5 @@
+import { JsonMap } from "@salesforce/ts-types"
+import * as _ from 'lodash';
 const clone = require('clone');
 export class RegisterBase{
     serviceName;
@@ -5,9 +7,14 @@ export class RegisterBase{
         this.serviceName = serviceName;
     }
 
+    getApiName(metadata) {
+        return metadata._id || metadata.name;
+    }
+
     async register(broker, packageServiceName, config){
         const metadata = clone(config);
-        const res = await broker.call(`${this.serviceName}.add`, {apiName: metadata._id || metadata.name ,data: metadata}, {meta: {
+        const res = await broker.call(`${this.serviceName}.add`, { apiName: this.getApiName(metadata), data: metadata }, {
+            meta: {
             metadataServiceName: packageServiceName,
             caller: {
                 nodeID: broker.nodeID,
@@ -19,8 +26,12 @@ export class RegisterBase{
         return res;
     }
 
-    async remove(broker, metadataApiName){
-        const res = await broker.call(`${this.serviceName}.delete`, {fullName: metadataApiName});
+    async remove(broker, metadataApiNameOrConfig: string | JsonMap) {
+        let metadataApiName = metadataApiNameOrConfig;
+        if (_.isObject(metadataApiName)) {
+            metadataApiName = this.getApiName(metadataApiNameOrConfig);
+        }
+        const res = await broker.call(`${this.serviceName}.delete`, { fullName: metadataApiName, metadataApiName: metadataApiName });
         return res;
     }
 

package/src/metadata-register/permissionFields.ts

@@ -0,0 +1,13 @@
+import { RegisterBase } from "./_base";
+const SERVICE_NAME = 'permission_fields';
+class RegisterPermissionFields extends RegisterBase {
+    constructor() {
+        super(SERVICE_NAME);
+    }
+
+    getApiName(config) {
+        return `${config.name}`
+    }
+}
+
+export const registerPermissionFields = new RegisterPermissionFields();

package/src/metadata-register/restrictionRules.ts

@@ -0,0 +1,12 @@
+import { RegisterBase } from "./_base";
+const SERVICE_NAME = 'restriction_rules';
+class RegisterRestrictionRules extends RegisterBase {
+    constructor() {
+        super(SERVICE_NAME);
+    }
+
+    getApiName(config) {
+        return `${config.object_name}.${config.name}`
+    }
+}
+export const registerRestrictionRules = new RegisterRestrictionRules();

package/src/metadata-register/shareRules.ts

@@ -0,0 +1,13 @@
+import { RegisterBase } from "./_base";
+const SERVICE_NAME = 'share_rules';
+class RegisterShareRules extends RegisterBase {
+    constructor() {
+        super(SERVICE_NAME);
+    }
+
+    getApiName(config) {
+        return `${config.object_name}.${config.name}`
+    }
+}
+
+export const registerShareRules = new RegisterShareRules();

package/src/types/field_permission.ts

@@ -0,0 +1,26 @@
+import { registerPermissionFields } from '../metadata-register/permissionFields';
+import { getSteedosSchema } from '../types'
+import * as _ from 'lodash'
+
+export class FieldPermission {
+
+    static async getObjectFieldsPermission(objectApiName, permissionSetApiName) {
+        const schema = getSteedosSchema();
+        return await registerPermissionFields.find(schema.broker, {
+            pattern: `${permissionSetApiName}.${objectApiName}.*`
+        })
+    }
+
+    static async getObjectFieldsPermissionGroupRole(objectApiName) {
+        const permissions = await this.getObjectFieldsPermission(objectApiName, '*');
+        const result = {};
+        _.each(permissions, (permission) => {
+            const { permission_set_id, field, editable, readable } = permission.metadata;
+            if (!result[permission_set_id]) {
+                result[permission_set_id] = [];
+            }
+            result[permission_set_id].push({ field: field, read: readable, edit: editable })
+        })
+        return result;
+    }
+}

package/src/types/object.ts

@@ -1,6 +1,6 @@
 import { Dictionary, JsonMap } from "@salesforce/ts-types";
 import { SteedosTriggerType, SteedosFieldType, SteedosFieldTypeConfig, SteedosSchema, SteedosListenerConfig, SteedosObjectListViewTypeConfig, SteedosObjectListViewType, SteedosIDType, SteedosObjectPermissionTypeConfig, SteedosActionType, SteedosActionTypeConfig, SteedosUserSession, getSteedosSchema } from ".";
-import { getUserObjectSharesFilters, isTemplateSpace, isCloudAdminSpace, generateActionParams, absoluteUrl, isExpression, parseSingleExpression } from '../util'
+import { getUserObjectSharesFilters, isTemplateSpace, isCloudAdminSpace, generateActionParams, absoluteUrl } from '../util'
 import _ = require("underscore");
 import { SteedosTriggerTypeConfig, SteedosTriggerContextConfig } from "./trigger";
 import { SteedosQueryOptions, SteedosQueryFilters } from "./query";
@@ -15,6 +15,9 @@ import { brokeEmitEvents } from "./object_events";
 import { translationObject } from "@steedos/i18n";
 import { getObjectLayouts } from "./object_layouts";
 import { sortBy, forEach } from 'lodash';
+import { ShareRules } from './shareRule';
+import { RestrictionRule } from './restrictionRule';
+import { FieldPermission } from './field_permission';
 
 const clone = require('clone')
 
@@ -636,19 +639,25 @@ export class SteedosObjectType extends SteedosObjectProperties {
             uneditable_fields: null,
             unrelated_objects: null,
             field_permissions: null,
-            read_filters: [],
-            edit_filters: []
+            // read_filters: [],
+            // edit_filters: []
         }
 
         if (_.isEmpty(roles)) {
             throw new Error('not find user permission');
         }
 
+        const rolesFieldsPermission = await FieldPermission.getObjectFieldsPermissionGroupRole(this.name);
+
         roles.forEach((role) => {
-            let rolePermission = objectRolesPermission[role]
+            let rolePermission = objectRolesPermission[role];
             if (rolePermission) {
+                let roleFieldsPermission = rolesFieldsPermission[role];
                 _.each(userObjectPermission, (v, k) => {
-                    let _v = rolePermission[k]
+                    let _v = rolePermission[k];
+                    if (k === 'field_permissions') {
+                        _v = roleFieldsPermission
+                    }
                     if (_.isBoolean(v)) {
                         if (v === false && _v === true) {
                             userObjectPermission[k] = _v
@@ -1315,31 +1324,31 @@ export class SteedosObjectType extends SteedosObjectProperties {
         return await this.runTriggerActions(when, context)
     }
 
-    private async appendRecordPermission(records, userSession) {
-        const _ids = _.pluck(records, '_id');
-        const objPm = await this.getUserObjectPermission(userSession);
-        const permissionFilters = this.getObjectPermissionFilters(objPm, userSession, true);
-        if (_.isEmpty(permissionFilters)) {
-            return;
-        }
-        const filters = formatFiltersToODataQuery(['_id', 'in', _ids])
-
-        const results = await this.directFind({
-            fields: ['_id'],
-            filters: `(${filters}) and (${permissionFilters.join(' or ')})`
-        });
-        const allowEditIds = _.pluck(results, '_id');
-        _.each(records, (record) => {
-            if (_.include(allowEditIds, record._id)) {
-                record.record_permissions = {
-                    allowRead: true,
-                    allowEdit: true,
-                    allowDelete: true,
-                }
-            }
-        })
-
-    }
+    // private async appendRecordPermission(records, userSession) {
+    //     const _ids = _.pluck(records, '_id');
+    //     const objPm = await this.getUserObjectPermission(userSession);
+    //     const permissionFilters = this.getObjectPermissionFilters(objPm, userSession, true);
+    //     if (_.isEmpty(permissionFilters)) {
+    //         return;
+    //     }
+    //     const filters = formatFiltersToODataQuery(['_id', 'in', _ids])
+
+    //     const results = await this.directFind({
+    //         fields: ['_id'],
+    //         filters: `(${filters}) and (${permissionFilters.join(' or ')})`
+    //     });
+    //     const allowEditIds = _.pluck(results, '_id');
+    //     _.each(records, (record) => {
+    //         if (_.include(allowEditIds, record._id)) {
+    //             record.record_permissions = {
+    //                 allowRead: true,
+    //                 allowEdit: true,
+    //                 allowDelete: true,
+    //             }
+    //         }
+    //     })
+
+    // }
 
     private async getTriggerContext(when: string, method: string, args: any[], recordId?: string) {
 
@@ -1491,15 +1500,16 @@ export class SteedosObjectType extends SteedosObjectProperties {
                 let values = returnValue || {}
                 if (method === 'count') {
                     values = returnValue || 0
-                } else {
-                    if (userSession) {
-                        let _records = returnValue
-                        if (method == 'findOne' && returnValue) {
-                            _records = [_records]
-                        }
-                        await this.appendRecordPermission(_records, userSession);
-                    }
-                }
+                } 
+                // else{
+                //     if (userSession) {
+                //         let _records = returnValue
+                //         if (method == 'findOne' && returnValue) {
+                //             _records = [_records]
+                //         }
+                //         await this.appendRecordPermission(_records, userSession);
+                //     }
+                // }
                 Object.assign(afterTriggerContext, { data: { values: values } })
             }
             // console.log("==returnValue==", returnValue);
@@ -1577,32 +1587,32 @@ export class SteedosObjectType extends SteedosObjectProperties {
         }
     }
 
-    private getObjectPermissionFilters(objectPermission, userSession, isEdit) {
-        const objectPermissionFilters = [];
+    // private getObjectPermissionFilters(objectPermission, userSession, isEdit) {
+    //     const objectPermissionFilters = [];
 
-        let permissionFiltersKey = 'read_filters';
-        if (isEdit) {
-            permissionFiltersKey = 'edit_filters';
-        }
+    //     let permissionFiltersKey = 'read_filters';
+    //     if (isEdit) {
+    //         permissionFiltersKey = 'edit_filters';
+    //     }
 
-        const globalData = Object.assign({}, userSession, { now: new Date() });
+    //     const globalData = Object.assign({}, userSession, { now: new Date() });
 
-        let permissionFilters = objectPermission[permissionFiltersKey];
+    //     let permissionFilters = objectPermission[permissionFiltersKey];
 
-        _.each(permissionFilters, (permissionFilter) => {
-            if (_.isString(permissionFilter) && isExpression(permissionFilter.trim())) {
-                try {
-                    const filters = parseSingleExpression(permissionFilter, {}, "#", globalData);
-                    if (filters && !_.isString(filters)) {
-                        objectPermissionFilters.push(`(${formatFiltersToODataQuery(filters, userSession)})`)
-                    }
-                } catch (error) {
-                    console.error(`getObjectPermissionFilters error`, permissionFilter, error.message);
-                }
-            }
-        })
-        return objectPermissionFilters;
-    }
+    //     _.each(permissionFilters, (permissionFilter) => {
+    //         if (_.isString(permissionFilter) && isExpression(permissionFilter.trim())) {
+    //             try {
+    //                 const filters = parseSingleExpression(permissionFilter, {}, "#", globalData);
+    //                 if (filters && !_.isString(filters)) {
+    //                     objectPermissionFilters.push(`(${formatFiltersToODataQuery(filters, userSession)})`)
+    //                 }
+    //             } catch (error) {
+    //                 console.error(`getObjectPermissionFilters error`, permissionFilter, error.message);
+    //             }
+    //         }
+    //     })
+    //     return objectPermissionFilters;
+    // }
 
     /**
      * 把query.filters用formatFiltersToODataQuery转为odata query
@@ -1646,7 +1656,7 @@ export class SteedosObjectType extends SteedosObjectProperties {
                     return
                 }
 
-                let spaceFilter, companyFilter, ownerFilter, sharesFilter, objectPermissionFilters, clientFilter = query.filters, filters, permissionFilters = [], userFilters = [];
+                let spaceFilter, companyFilter, ownerFilter, sharesFilter, shareRuleFilters, restrictionRuleFilters, clientFilter = query.filters, filters, permissionFilters = [], userFilters = [];
 
                 if (spaceId) {
                     spaceFilter = `(space eq '${spaceId}')`;
@@ -1666,16 +1676,27 @@ export class SteedosObjectType extends SteedosObjectProperties {
                     ownerFilter = `(owner eq '${userId}')`;
                 }
 
-                objectPermissionFilters = this.getObjectPermissionFilters(objPm, userSession, false);
+                shareRuleFilters = await ShareRules.getUserObjectFilters(this.name, userSession);
+
+                if (!_.isEmpty(shareRuleFilters)) {
+                    permissionFilters.push(`(${shareRuleFilters.join(' or ')})`);
+                }
+
+                restrictionRuleFilters = await RestrictionRule.getUserObjectFilters(this.name, userSession);
 
-                if (!_.isEmpty(objectPermissionFilters)) {
-                    permissionFilters.push(`(${objectPermissionFilters.join(' or ')})`);
+                if (!_.isEmpty(restrictionRuleFilters)) {
+                    userFilters.push(`(${restrictionRuleFilters.join(' or ')})`);
                 }
+                // objectPermissionFilters = this.getObjectPermissionFilters(objPm, userSession, false);
+
+                // if (!_.isEmpty(objectPermissionFilters)) {
+                //     permissionFilters.push(`(${objectPermissionFilters.join(' or ')})`);
+                // }
 
                 sharesFilter = getUserObjectSharesFilters(this.name, userSession);
 
                 if (!_.isEmpty(companyFilter)) {
-                    permissionFilters.push(`(${companyFilter.join(' or ')})`);
+                    permissionFilters.push(`(${companyFilter.join(' and ')})`);
                 }
 
                 if (ownerFilter) {
@@ -1710,7 +1731,7 @@ export class SteedosObjectType extends SteedosObjectProperties {
                 }
             }
             else if (method === 'update' || method === 'updateOne') {
-                const permissionFilters = this.getObjectPermissionFilters(objPm, userSession, true);
+                const permissionFilters = null; //this.getObjectPermissionFilters(objPm, userSession, true);
                 if (!objPm.allowEdit && _.isEmpty(permissionFilters)) {
                     throw new Error(`no ${method} permission!`);
                 }
@@ -1777,7 +1798,7 @@ export class SteedosObjectType extends SteedosObjectProperties {
                 }
             }
             else if (method === 'delete') {
-                const permissionFilters = this.getObjectPermissionFilters(objPm, userSession, true);
+                const permissionFilters = null; //this.getObjectPermissionFilters(objPm, userSession, true);
                 if (!objPm.allowDelete && _.isEmpty(permissionFilters)) {
                     throw new Error(`no ${method} permission!`);
                 }

package/src/types/object_dynamic_load.ts

@@ -3,7 +3,7 @@ import path = require('path')
 import { SteedosObjectTypeConfig, SteedosObjectPermissionTypeConfig, SteedosActionTypeConfig, getDataSource } from '.'
 // import { isMeteor } from '../util'
 import { Dictionary } from '@salesforce/ts-types';
-import { loadObjectFields, loadObjectListViews, loadObjectButtons, loadObjectMethods, loadObjectActions, loadObjectTriggers, addObjectListenerConfig, loadObjectLayouts, getLazyLoadFields, getLazyLoadButtons, loadObjectPermissions, loadSourceProfiles, loadSourcePermissionset, loadObjectValidationRules, loadSourceRoles, loadSourceFlowRoles, loadSourceApprovalProcesses, loadSourceWorkflows, loadStandardProfiles, loadStandardPermissionsets, preloadDBObjectFields, preloadDBObjectButtons, preloadDBApps, preloadDBObjectLayouts, preloadDBTabs } from '../dynamic-load'
+import { loadObjectFields, loadObjectListViews, loadObjectButtons, loadObjectMethods, loadObjectActions, loadObjectTriggers, addObjectListenerConfig, loadObjectLayouts, getLazyLoadFields, getLazyLoadButtons, loadObjectPermissions, loadSourceProfiles, loadSourcePermissionset, loadObjectValidationRules, loadSourceRoles, loadSourceFlowRoles, loadSourceApprovalProcesses, loadSourceWorkflows, loadStandardProfiles, loadStandardPermissionsets, preloadDBObjectFields, preloadDBObjectButtons, preloadDBApps, preloadDBObjectLayouts, preloadDBTabs, preloadDBShareRules, preloadDBRestrictionRules, preloadDBPermissionFields } from '../dynamic-load'
 import { transformListenersToTriggers } from '..';
 import { getSteedosSchema } from './schema';
 
@@ -338,6 +338,9 @@ export const loadStandardMetadata = async (serviceName: string, datasourceApiNam
             await preloadDBObjectLayouts(datasource);
             await preloadDBObjectFields(datasource);
             await preloadDBObjectButtons(datasource);
+            await preloadDBShareRules(datasource);
+            await preloadDBRestrictionRules(datasource);
+            await preloadDBPermissionFields(datasource);
         }
     }
 }

package/src/types/restrictionRule.ts

@@ -0,0 +1,57 @@
+import { registerRestrictionRules } from '../metadata-register/restrictionRules';
+import { getSteedosSchema } from '../types'
+import * as _ from 'lodash'
+import { isExpression, parseSingleExpression } from '../util'
+import { formatFiltersToODataQuery } from "@steedos/filters";
+
+export type SteedosRestrictionRuleConfig = {
+    _id: string,
+    name: string,
+    object_name: string,
+    active: boolean,
+    record_filter: string,
+    entry_criteria: string,
+    description: string
+}
+
+export class RestrictionRule {
+    static async find(objectApiName) {
+        const schema = getSteedosSchema();
+        return await registerRestrictionRules.find(schema.broker, {
+            pattern: `${objectApiName}.*`
+        })
+    }
+    static async getUserObjectFilters(objectApiName, userSession: any) {
+        const rules = await this.find(objectApiName);
+        if (_.isEmpty(rules)) {
+            return;
+        }
+        const rulesFilters = [];
+        const globalData = { now: new Date() };
+        _.each(rules, (rule) => {
+            const { active, entry_criteria, record_filter } = rule.metadata;
+            if (active) {
+                if (_.isString(entry_criteria) && isExpression(entry_criteria.trim())) {
+                    try {
+                        const meetCriteria = parseSingleExpression(entry_criteria, {}, "#", globalData, userSession);
+                        if (_.isBoolean(meetCriteria) && meetCriteria) {
+                            if (_.isString(record_filter) && isExpression(record_filter.trim())) {
+                                try {
+                                    const filters = parseSingleExpression(record_filter, {}, "#", globalData, userSession);
+                                    if (filters && !_.isString(filters)) {
+                                        rulesFilters.push(`(${formatFiltersToODataQuery(filters, userSession)})`)
+                                    }
+                                } catch (error) {
+                                    console.error(`RestrictionRule.getUserObjectFilters record_filter error`, objectApiName, record_filter, error.message);
+                                }
+                            }
+                        }
+                    } catch (error) {
+                        console.error(`RestrictionRule.getUserObjectFilters entry_criteria error`, objectApiName, entry_criteria, error.message);
+                    }
+                }
+            }
+        })
+        return rulesFilters;
+    }
+}