@steedos/objectql 2.2.26 → 2.2.29

package/src/dynamic-load/trigger.ts

@@ -5,14 +5,25 @@ import { getMD5, JSONStringify, transformListenersToTriggers } from '../util'
 import _ = require('lodash');
 var util = require('../util');
 var clone = require('clone');
+import { _TRIGGERKEYS } from '../types';
 
 const _lazyLoadListeners: Dictionary<any> = {};
 
+// 用于存放通配触发器，即listenTo的值是通配符
+const _patternListerners: Dictionary<any> = {}; 
+
 const addLazyLoadListeners = function(objectName: string, json: SteedosListenerConfig){
     if(!_lazyLoadListeners[objectName]){
         _lazyLoadListeners[objectName] = []
     }
     _lazyLoadListeners[objectName].push(json)
+
+    if (isPatternListener(json)) {
+        if(!_patternListerners[objectName]){
+            _patternListerners[objectName] = []
+        }
+        _patternListerners[objectName].push(json)
+    }
 }
 
 export const getLazyLoadListeners = function(objectName?: string){
@@ -125,6 +136,23 @@ export const removePackageObjectTriggers = (serviceName: string)=>{
         //     console.log(error)
         // }
     })
+
+    _.each(_patternListerners, (listeners, objectName)=>{
+        let objectConfig = getObjectConfig(objectName);
+        _patternListerners[objectName] = _.filter(listeners, function(listener: any) { 
+            const drop = listener.metadataServiceName === serviceName; 
+            if(drop){
+                try {
+                    if(objectConfig && objectConfig.listeners){
+                        delete objectConfig.listeners[listener.name]
+                    }
+                } catch (error) {
+                    
+                }
+            }
+            return drop != true;
+        });
+    })
 }
 
 export const loadObjectTriggers = function (filePath: string, serviceName: string){
@@ -137,4 +165,72 @@ export const loadObjectTriggers = function (filePath: string, serviceName: strin
         triggers.push(addObjectListenerConfig(Object.assign(json, {metadataServiceName: serviceName})));
     })
     return triggers;
+}
+
+/**
+ * 判断是否通配触发器
+ * @param data 
+ * @returns 
+ */
+function isPatternListener(data){
+    const {listenTo} = data;
+    if(listenTo === '*'){
+        return true;
+    }else if(_.isRegExp(listenTo)){
+        return true;
+    }else if(_.isString(listenTo) && listenTo.startsWith("/")){
+        try {
+            if(_.isRegExp(eval(listenTo))){
+                return true;
+            }
+        } catch (error) {
+            return false
+        }
+        return false;
+    }
+    return false;
+}
+
+/**
+ * 获取旧版触发器中写了通配符的触发器
+ * @param objectApiName 
+ * @returns 
+ */
+export function getPatternListeners(objectApiName: string) {
+    let patternListeners = {};
+
+    const pushTrigger = (listeners: [any]) => {
+        for (const listener of listeners) {
+            _TRIGGERKEYS.forEach((key) => {
+                let event = listener[key];
+                if (_.isFunction(event)) {
+                    patternListeners[listener.name] = listener;
+                }
+            })
+        }
+    }
+
+    _.each(_patternListerners, (listeners, objectName) => {
+        try {
+            if (objectName === '*') {
+                pushTrigger(listeners);
+            } 
+            else if (_.isRegExp(objectName) && objectName.test(objectApiName)) {
+                pushTrigger(listeners);
+            } 
+            else if (_.isString(objectName) && objectName.startsWith("/")) {
+                try {
+                    if (_.isRegExp(eval(objectName)) && eval(objectName).test(objectApiName)) {
+                        pushTrigger(listeners);
+                    }
+                } catch (error) {
+                    // DO NOTHING
+                }
+            }
+        } catch (error) {
+            console.log(`[getPatternListeners] `, error);
+        }
+    })
+
+    return patternListeners;
 }

package/src/services/helpers/graphql.ts

@@ -33,20 +33,27 @@ export function generateActionGraphqlProp(actionName: string, objectConfig: Stee
         return gplObj;
     }
     switch (actionName) {
-        case 'count':
+        case 'graphqlCount':
             gplObj.query = gql`
                 type Query {
-                    ${objectName}__${actionName}(fields: JSON, filters: JSON, top: Int, skip: Int, sort: String): Int
+                    ${objectName}__count(fields: JSON, filters: JSON, top: Int, skip: Int, sort: String): Int
                 }
             `;
             break;
-        case 'find':
+        case 'graphqlFind':
             gplObj.query = gql`
                 type Query {
                     ${objectName}(fields: JSON, filters: JSON, top: Int, skip: Int, sort: String): [${objectName}]
                 }
             `;
             break;
+        case 'findOne':
+            gplObj.query = gql`
+                type Query {
+                    ${objectName}__${actionName}(id: JSON): ${objectName}
+                }
+            `;
+            break;
         case 'insert':
             gplObj.mutation = gql`
                 type Mutation {

package/src/services/objectService.ts

@@ -1,11 +1,12 @@
 import { SteedosObjectType } from '../types/object';
-import { getDataSource } from '../types/datasource';
+import { getDataSource, SteedosDatabaseDriverType } from '../types/datasource';
 import { getObjectConfig } from '../types/object_dynamic_load';
 import _ = require('underscore');
 import { generateActionRestProp, generateActionGraphqlProp, generateSettingsGraphql, RELATED_PREFIX, _getRelatedType, correctName, getGraphqlActions, getRelatedResolver, dealWithRelatedFields, getLocalService } from './helpers';
 import { getObjectServiceName } from '.';
 import { jsonToObject } from '../util/convert';
 import { extend } from '../util';
+import { formatFiltersToODataQuery } from "@steedos/filters";
 const Future = require('fibers/future');
 import { getSteedosSchema } from '../';
 // import { parse } from '@steedos/formula';
@@ -194,6 +195,73 @@ function getObjectServiceActionsSchema() {
                 return await this.aggregate(query, externalPipeline, userSession)
             }
         },
+        // meteor、default database 默认不返回is_deleted = true的数据
+        graphqlFind:{
+            params: {
+                fields: { type: 'array', items: "string", optional: true },
+                filters: [{ type: 'array', optional: true }, { type: 'string', optional: true }],
+                top: { type: 'number', optional: true },
+                skip: { type: 'number', optional: true },
+                sort: { type: 'string', optional: true }
+            },
+            async handler(ctx) {
+                //TODO filters: 如果filters中没有查询 is_deleted 则自动添加is_deleted != true 条件
+                if(this.object.datasource.driver === SteedosDatabaseDriverType.MeteorMongo ||  this.object.datasource.driver === SteedosDatabaseDriverType.Mongo){
+                    const { filters } = ctx.params;
+                    if (filters) {
+                        if(_.isString(filters)){
+                            if(filters.indexOf('(is_deleted eq true)') < 0){
+                                ctx.params.filters =  `(${filters}) and (is_deleted ne true)`;
+                            }
+                        }
+                        if(_.isArray(filters)){
+                            const filtersStr = formatFiltersToODataQuery(filters);
+                            if(filtersStr.indexOf('(is_deleted eq true)') < 0){
+                                ctx.params.filters.push(['is_deleted', '!=', true])
+                            }
+                        }
+                    }else{
+                        ctx.params.filters = '(is_deleted ne true)'
+                    }
+                }
+
+                const userSession = ctx.meta.user;
+                return this.find(ctx.params, userSession)
+            }
+        },
+        graphqlCount:{
+            params: {
+                fields: { type: 'array', items: "string", optional: true },
+                filters: [{ type: 'array', optional: true }, { type: 'string', optional: true }],
+                top: { type: 'number', optional: true },
+                skip: { type: 'number', optional: true },
+                sort: { type: 'string', optional: true }
+            },
+            async handler(ctx) {
+                //TODO filters: 如果filters中没有查询 is_deleted 则自动添加is_deleted != true 条件
+                if(this.object.datasource.driver === SteedosDatabaseDriverType.MeteorMongo ||  this.object.datasource.driver === SteedosDatabaseDriverType.Mongo){
+                    const { filters } = ctx.params;
+                    if (filters) {
+                        if(_.isString(filters)){
+                            if(filters.indexOf('(is_deleted eq true)') < 0){
+                                ctx.params.filters =  `(${filters}) and (is_deleted ne true)`;
+                            }
+                        }
+                        if(_.isArray(filters)){
+                            const filtersStr = formatFiltersToODataQuery(filters);
+                            if(filtersStr.indexOf('(is_deleted eq true)') < 0){
+                                ctx.params.filters.push(['is_deleted', '!=', true])
+                            }
+                        }
+                    }else{
+                        ctx.params.filters = '(is_deleted ne true)'
+                    }
+                }
+
+                const userSession = ctx.meta.user;
+                return this.count(ctx.params, userSession)
+            }
+        },
         find: {
             params: {
                 fields: { type: 'array', items: "string", optional: true },

package/src/types/object.ts

@@ -18,6 +18,7 @@ import { sortBy, forEach } from 'lodash';
 import { ShareRules } from './shareRule';
 import { RestrictionRule } from './restrictionRule';
 import { FieldPermission } from './field_permission';
+import { getPatternListeners } from '../dynamic-load';
 
 const clone = require('clone')
 
@@ -113,7 +114,7 @@ export interface SteedosObjectTypeConfig extends SteedosObjectProperties {
     permission_set?: Dictionary<SteedosObjectPermissionTypeConfig> //TODO remove ; 目前为了兼容现有object的定义保留
 }
 
-const _TRIGGERKEYS = ['beforeFind', 'beforeInsert', 'beforeUpdate', 'beforeDelete', 'afterFind', 'afterCount', 'afterFindOne', 'afterInsert', 'afterUpdate', 'afterDelete', 'beforeAggregate', 'afterAggregate']
+export const _TRIGGERKEYS = ['beforeFind', 'beforeInsert', 'beforeUpdate', 'beforeDelete', 'afterFind', 'afterCount', 'afterFindOne', 'afterInsert', 'afterUpdate', 'afterDelete', 'beforeAggregate', 'afterAggregate']
 
 const 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"]
 
@@ -361,16 +362,35 @@ export class SteedosObjectType extends SteedosObjectProperties {
 
     async runTriggers(when: string, context: SteedosTriggerContextConfig) {
         let triggers = this._triggersQueue[when]
-        if (!triggers) {
-            return;
-        }
+        if (triggers) {
+            let triggerKeys = _.keys(triggers)
 
-        let triggerKeys = _.keys(triggers)
+            for (let index = 0; index < triggerKeys.length; index++) {
+                let trigger = triggers[triggerKeys[index]];
+                await this.runTirgger(trigger, context)
+            }
+        }
 
-        for (let index = 0; index < triggerKeys.length; index++) {
-            let trigger = triggers[triggerKeys[index]];
-            await this.runTirgger(trigger, context)
+        // 获取通配的trigger，如果有则生成SteedosTriggerType执行
+        let wildcardListeners = getPatternListeners(this.name);
+        if (wildcardListeners) {
+            for (const key in wildcardListeners) {
+                if (Object.prototype.hasOwnProperty.call(wildcardListeners, key)) {
+                    const listener = wildcardListeners[key];
+                    if (listener && listener[when]) {
+                        let triggerConfig: SteedosTriggerTypeConfig = {
+                            name: `${key}_${when}`,
+                            on: 'server',
+                            when: when,
+                            todo: listener[when],
+                        }
+                        let trigger = new SteedosTriggerType(triggerConfig)
+                        await this.runTirgger(trigger, context)
+                    }
+                }
+            }
         }
+        
     }
 
     async runTriggerActions(when: string, context: SteedosTriggerContextConfig) {
@@ -1896,7 +1916,7 @@ export class SteedosObjectType extends SteedosObjectProperties {
                 sharesFilter = getUserObjectSharesFilters(this.name, userSession);
 
                 if (!_.isEmpty(companyFilter)) {
-                    permissionFilters.push(`(${companyFilter.join(' and ')})`);
+                    permissionFilters.push(`(${companyFilter.join(' or ')})`);
                 }
 
                 if (ownerFilter) {