@steedos/objectql 2.2.21 → 2.2.24

package/src/types/object.ts

@@ -299,6 +299,18 @@ export class SteedosObjectType extends SteedosObjectProperties {
         })
     }
 
+    removeListener(listener_name: string, config: SteedosListenerConfig) {
+        this.listeners[listener_name] = config
+        _TRIGGERKEYS.forEach((key) => {
+            try {
+                let event = config[key];
+                delete this._triggersQueue[key][`${listener_name}_${event.name}`]
+            } catch (error) {
+                
+            }
+        })
+    }
+
     private setTrigger(name: string, when: string, todo: Function, on = 'server') {
         let triggerConfig: SteedosTriggerTypeConfig = {
             name: name,

package/src/types/object_dynamic_load.ts

@@ -100,7 +100,8 @@ export const addObjectConfigFiles = async (filePath: string, datasource: string,
     // await loadObjectPermissions(filePath, serviceName);
     await loadSourceProfiles(filePath, serviceName);
     await loadSourcePermissionset(filePath, serviceName);
-    loadObjectValidationRules(filePath);
+    
+    loadObjectValidationRules(filePath, serviceName);
 
     loadSourceRoles(filePath);
 
@@ -285,10 +286,10 @@ export const removeObjectListenerConfig = (_id, listenTo, when)=>{
 export const loadStandardMetadata = async (serviceName: string, datasourceApiName: string) => {
     await loadStandardBaseObjects(serviceName);
     if (dbMetadataLoaing != true) {
-        dbMetadataLoaing = true;
         await loadStandardProfiles(serviceName);
         await loadStandardPermissionsets(serviceName);
         await loadDbMetadatas(datasourceApiName);
+        dbMetadataLoaing = true;
     }
 }
 

package/src/types/validation_rules.ts

@@ -1,3 +1,8 @@
+/*
+ * @Author: sunhaolin@hotoa.com
+ * @Date: 2021-05-24 12:32:57
+ * @Description: 
+ */
 
 import { computeFormula } from '../formula';
 import { SteedosTriggerContextConfig } from "./trigger";
@@ -8,13 +13,13 @@ export async function runValidationRules(method: string, context: SteedosTrigger
         let spaceId = userSession.spaceId;
         let userId = userSession.userId + '';
         let doc = context.doc;
-        let validationRules = await getObject('object_validation_rules').find({ filters: [['space', '=', spaceId], ['object_name', '=', objectName], ['active', '=', true]] });
+        let validationRules = await getObject('object_validation_rules').find({ filters: [['object_name', '=', objectName], ['active', '=', true]] });
         for (const vr of validationRules) {
             let result;
             try {
                 result = await computeFormula(vr.error_condition_formula, objectName, doc, userId, spaceId);
             } catch (error) {
-                throw new Error('object_validation_rules_wrong_formula');
+                throw new Error(`公式错误，请检查错误条件公式。${error.message.replace(/\:/g, '：')}`);
             }
             if (result) {
                 throw new Error(vr.error_message);

package/src/util/index.ts

@@ -1014,4 +1014,20 @@ export function parserFilters(filters){
     return query;
 }
 
+
+export function clearRequireCache(filename) {
+    /* istanbul ignore next */
+    Object.keys(require.cache).forEach(function (key) {
+        if (key == filename) {
+            delete require.cache[key];
+        }
+    });
+};
+
+export function loadService(broker, filename){
+    clearRequireCache(filename);
+    return broker.loadService(filename);
+}
+
+
 loadCoreValidators();

package/src/util/transform.ts

@@ -44,7 +44,8 @@ function transformListenerToTrigger(object: SteedosObjectTypeConfig, when: strin
     let trigger: any = {
         on: 'server',
         when: getTriggerWhen(when),
-        todo: transformTrigger(object, when, todo)
+        todo: transformTrigger(object, when, todo),
+        metadataServiceName: json.metadataServiceName
     }
 
     if (json._id) {