@steedos/objectql 2.2.34 → 2.2.37

package/src/types/object.ts

@@ -4,7 +4,7 @@ import { getUserObjectSharesFilters, isTemplateSpace, isCloudAdminSpace, generat
 import _ = require("underscore");
 import { SteedosTriggerTypeConfig, SteedosTriggerContextConfig } from "./trigger";
 import { SteedosQueryOptions, SteedosQueryFilters } from "./query";
-import { SteedosDataSourceType, SteedosDatabaseDriverType } from "./datasource";
+import { SteedosDataSourceType, SteedosDatabaseDriverType, getDataSource } from "./datasource";
 import { SteedosFieldDBType } from '../driver/fieldDBType';
 import { runCurrentObjectFieldFormulas, runQuotedByObjectFieldFormulas } from '../formula';
 import { runQuotedByObjectFieldSummaries, runCurrentObjectFieldSummaries } from '../summary';
@@ -116,7 +116,7 @@ export interface SteedosObjectTypeConfig extends SteedosObjectProperties {
 
 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"]
+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", "paging"]
 
 export class SteedosObjectType extends SteedosObjectProperties {
 
@@ -557,10 +557,15 @@ export class SteedosObjectType extends SteedosObjectProperties {
     }
 
     async refreshIndexes(){
-        if(this.datasource.driver === SteedosDatabaseDriverType.Mongo){
+        if(this.datasource.driver === SteedosDatabaseDriverType.Mongo  || this.datasource.driver === SteedosDatabaseDriverType.MeteorMongo){
             const adapter = this.datasource.adapter;
             await adapter.connect()
-            const collection = (adapter as any).collection(this.name);
+            let collection = (adapter as any).collection(this.name);
+            if (this.datasource.driver === SteedosDatabaseDriverType.MeteorMongo) {
+                let defaultAdapter = getDataSource('default').adapter
+                await defaultAdapter.connect();
+                collection = (defaultAdapter as any).collection(this.name);
+            }
             const indexesInfo = [];
             const dropIndexNames = [];
             for (const key in this.fields) {
@@ -580,7 +585,7 @@ export class SteedosObjectType extends SteedosObjectProperties {
                         try {
                             await collection.createIndex(key, indexInfo)
                         } catch (error) {
-                            console.error(error)
+                            // DO NOTHING
                         }
                     }
                     // await collection.createIndexes(indexesInfo)
@@ -588,20 +593,20 @@ export class SteedosObjectType extends SteedosObjectProperties {
                     console.error(error)
                 }
             }
-            if(dropIndexNames && dropIndexNames.length > 0){
-                try {
-                    for await (const indexName of dropIndexNames) {
-                        try {
-                            await collection.dropIndex(indexName)
-                        } catch (error) {
+            // if(dropIndexNames && dropIndexNames.length > 0){
+            //     try {
+            //         for await (const indexName of dropIndexNames) {
+            //             try {
+            //                 await collection.dropIndex(indexName)
+            //             } catch (error) {
                             
-                        }
-                    }
+            //             }
+            //         }
                     
-                } catch (error) {
-                    console.error(error)
-                }
-            }
+            //     } catch (error) {
+            //         console.error(error)
+            //     }
+            // }
         }
     }
 
@@ -854,22 +859,26 @@ export class SteedosObjectType extends SteedosObjectProperties {
     }
 
     async insert(doc: Dictionary<any>, userSession?: SteedosUserSession) {
+        doc = this.formatRecord(doc);
         return await this.callAdapter('insert', this.table_name, doc, userSession)
     }
 
     async update(id: SteedosIDType, doc: Dictionary<any>, userSession?: SteedosUserSession) {
+        doc = this.formatRecord(doc);
         await this.processUneditableFields(userSession, doc)
         let clonedId = id;
         return await this.callAdapter('update', this.table_name, clonedId, doc, userSession)
     }
 
     async updateOne(id: SteedosIDType, doc: Dictionary<any>, userSession?: SteedosUserSession) {
+        doc = this.formatRecord(doc);
         await this.processUneditableFields(userSession, doc)
         let clonedId = id;
         return await this.callAdapter('updateOne', this.table_name, clonedId, doc, userSession)
     }
     // 此函数支持driver: MeteorMongo、Mongo
     async updateMany(queryFilters: SteedosQueryFilters, doc: Dictionary<any>, userSession?: SteedosUserSession) {
+        doc = this.formatRecord(doc);
         await this.processUneditableFields(userSession, doc)
         let clonedQueryFilters = queryFilters;
         return await this.callAdapter('updateMany', this.table_name, clonedQueryFilters, doc, userSession)
@@ -887,10 +896,12 @@ export class SteedosObjectType extends SteedosObjectProperties {
     }
 
     async directInsert(doc: Dictionary<any>, userSession?: SteedosUserSession) {
+        doc = this.formatRecord(doc);
         return await this.callAdapter('directInsert', this.table_name, doc, userSession)
     }
 
     async directUpdate(id: SteedosIDType, doc: Dictionary<any>, userSession?: SteedosUserSession) {
+        doc = this.formatRecord(doc);
         await this.processUneditableFields(userSession, doc)
         let clonedId = id;
         return await this.callAdapter('directUpdate', this.table_name, clonedId, doc, userSession)
@@ -1661,6 +1672,14 @@ export class SteedosObjectType extends SteedosObjectProperties {
         // // })
     }
 
+    private formatRecord(doc: JsonMap) {
+        let adapterFormat = this._datasource["formatRecord"];
+        if (typeof adapterFormat == 'function') {
+            doc = adapterFormat.apply(this._datasource, [doc, this.toConfig()]);
+        }
+        return doc;
+    }
+
     private async callAdapter(method: string, ...args: any[]) {
 
         const adapterMethod = this._datasource[method];
@@ -1779,7 +1798,7 @@ export class SteedosObjectType extends SteedosObjectProperties {
     };
 
     private async runRecordFormula(method: string, objectName: string, recordId: string, doc: any, userSession: any) {
-        if (["insert", "update", "updateMany"].indexOf(method) > -1) {
+        if (["insert", "update", "updateMany", "delete"].indexOf(method) > -1) {
             if (method === "updateMany") {
                 // TODO:暂时不支持updateMany公式计算，因为拿不到修改了哪些数据
                 // let filters: SteedosQueryFilters = args[1];
@@ -1787,11 +1806,13 @@ export class SteedosObjectType extends SteedosObjectProperties {
             }
             else {
                 let currentUserId = userSession ? userSession.userId : undefined;
-                await runCurrentObjectFieldFormulas(objectName, recordId, doc, currentUserId, true);
-                if (method === "update") {
-                    // 新建记录时肯定不会有字段被引用，不需要重算被引用的公式字段值
-                    await runQuotedByObjectFieldFormulas(objectName, recordId, userSession);
+                if(method !== "delete"){
+                    await runCurrentObjectFieldFormulas(objectName, recordId, doc, currentUserId, true);
                 }
+                // 新建记录时肯定不会有字段被其它对象引用，但是会有当前对象上的字段之间互相引用，所以也需要重算被引用的公式字段值
+                // 见issue: a公式字段，其中应用了b公式字段，记录保存后a字段没计算，编辑后再保存字段计算 #2946
+                const isOnlyForCurrentObject = method === "insert";
+                await runQuotedByObjectFieldFormulas(objectName, recordId, userSession, { isOnlyForCurrentObject });
             }
         }
     }