@steedos/objectql 2.2.24 → 2.2.27

package/src/services/helpers/graphql.ts

@@ -13,8 +13,9 @@ const BASIC_TYPE_MAPPING = {
     'select': 'String',
     'url': 'String',
     'email': 'String',
-    'date': 'String',
-    'datetime': 'String',
+    'date': 'Date',
+    'datetime': 'Date',
+    'time': 'Date',
     'number': 'Float',
     'currency': 'Float',
     'boolean': 'Boolean'
@@ -103,7 +104,7 @@ export function generateSettingsGraphql(objectConfig: SteedosObjectTypeConfig) {
       let refTo = field.reference_to;
       // 判断能否根据refTo找到对象，如果找到则说明对象已加载，否则return
       let objMetaData = getLocalService(refTo);
-      if (!objMetaData || objMetaData.settings.deleted) {
+      if (refTo != objectName && (!objMetaData || objMetaData.settings.deleted)) {
         return;
       }
       if (field.multiple) {
@@ -538,6 +539,9 @@ async function translateToDisplay(objectName, doc, userSession: any) {
           let lookupLabel = "";
           let refTo = field.reference_to;
           let refValue = doc[name];
+          if (!refValue) {
+            continue;
+          }
           let refObj = steedosSchema.getObject(refTo);
           let nameFieldKey = await refObj.getNameFieldKey();
           if (field.multiple) {
@@ -562,6 +566,9 @@ async function translateToDisplay(objectName, doc, userSession: any) {
           let masterDetailLabel = "";
           let refTo = field.reference_to;
           let refValue = doc[name];
+          if (!refValue) {
+            continue;
+          }
           let refObj = steedosSchema.getObject(refTo);
           let nameFieldKey = await refObj.getNameFieldKey();
           if (field.multiple) {

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) {

package/src/types/object_dynamic_load.ts

@@ -326,7 +326,7 @@ export const loadStandardBaseObjects = async (serviceName: string) => {
     let baseObjectJs = util.loadFile(path.join(standardObjectsDir, "base.object.js"))
     baseObjectJs.extend = MONGO_BASE_OBJECT;
     await addObjectConfig(baseObjectJs, SYSTEM_DATASOURCE, serviceName);
-    const baseTriggers = ['base.trigger.js', 'base.autonumber.trigger.js','base.masterDetail.trigger.js','base.objectwebhooks.trigger.js','base.recordFieldAudit.trigger.js','base.recordRecentView.trigger.js','base.tree.trigger.js','base.calendar.trigger.js'];
+    const baseTriggers = ['base.trigger.js', 'base.autonumber.trigger.js','base.masterDetail.trigger.js','base.objectwebhooks.trigger.js','base.recordFieldAudit.trigger.js','base.recordRecentView.trigger.js','base.tree.trigger.js','base.calendar.trigger.js','base.defaultValue.trigger.js'];
     _.forEach(baseTriggers, function(triggerFileName){
         let baseObjectTrigger = util.loadFile(path.join(standardObjectsDir, triggerFileName))
         baseObjectTrigger.listenTo = MONGO_BASE_OBJECT
@@ -336,9 +336,13 @@ export const loadStandardBaseObjects = async (serviceName: string) => {
     let coreObject = util.loadFile(path.join(standardObjectsDir, "core.object.yml"))
     coreObject.name = SQL_BASE_OBJECT;
     await addObjectConfig(coreObject, SYSTEM_DATASOURCE, serviceName);
-    let coreObjectTrigger = util.loadFile(path.join(standardObjectsDir, "core.objectwebhooks.trigger.js"))
-    coreObjectTrigger.listenTo = SQL_BASE_OBJECT
-    addObjectListenerConfig(coreObjectTrigger)
+
+    const coreTriggers = ['core.objectwebhooks.trigger.js','core.defaultValue.trigger.js'];
+    _.forEach(coreTriggers, function(triggerFileName){
+        let coreObjectTrigger = util.loadFile(path.join(standardObjectsDir, triggerFileName))
+        coreObjectTrigger.listenTo = SQL_BASE_OBJECT
+        addObjectListenerConfig(coreObjectTrigger)
+    })
 
     // addAllConfigFiles(path.join(standardObjectsDir, "**"), 'default');
 }