@steedos/objectql 2.1.76 → 2.1.78

package/src/index.ts

@@ -1,6 +1,5 @@
 export * from './types'
 export * from "./driver"
-export * from "./graphql"
 export * from "./util"
 export * from "./formula"
 export * from "./summary"

package/src/services/objectService.ts

@@ -148,8 +148,8 @@ function getObjectServiceMethodsSchema() {
             }
         },
         getRecordView: {
-            async handler(userSession) {
-                return await this.object.getRecordView(userSession);
+            async handler(userSession, context?) {
+                return await this.object.getRecordView(userSession, context);
             }
         },
         createDefaulRecordView: {
@@ -472,7 +472,8 @@ function getObjectServiceActionsSchema() {
             },
             async handler(ctx) {
                 const userSession = ctx.meta.user;
-                return await this.getRecordView(userSession);
+                const { context } = ctx.params;
+                return await this.getRecordView(userSession, context);
             }
         },
         createDefaulRecordView: {

package/src/services/objectServiceDispatcher.ts

@@ -159,6 +159,10 @@ class ObjectServiceDispatcher {
         return await this.callMetadataObjectServiceAction(`getLookupDetailsInfo`, {objectApiName: this.objectApiName});
     }
 
+    async getRelationsInfo() {
+        return await this.callMetadataObjectServiceAction(`getRelationsInfo`, { objectApiName: this.objectApiName });
+    }
+
     async getDetailPaths(){
         return await this.callMetadataObjectServiceAction(`getDetailPaths`, {objectApiName: this.objectApiName});
     }
@@ -179,8 +183,8 @@ class ObjectServiceDispatcher {
         return await this.callAction(`getRecordPermissions`, {record, userSession});
     }
 
-    async getRecordView(userSession){
-        return await this.callAction(`getRecordView`, {userSession});
+    async getRecordView(userSession, context?) {
+        return await this.callAction(`getRecordView`, { userSession, context });
     }
 
     async createDefaulRecordView(userSession){

package/src/types/datasource.ts

@@ -436,14 +436,6 @@ export class SteedosDataSourceType implements Dictionary {
         return this._schema;
     }
 
-    buildGraphQLSchema() {
-        return this._schema.buildGraphQLSchema();
-    }
-
-    getGraphQLSchema() {
-        return this._schema.getGraphQLSchema();
-    }
-
     async dropEntities() {
         if (this._adapter.dropEntities) {
             return await this._adapter.dropEntities();

package/src/types/field_permission.ts

@@ -23,4 +23,20 @@ export class FieldPermission {
         })
         return result;
     }
+
+    static async getObjectsFieldsPermissionGroupRole() {
+        const permissions = await this.getObjectFieldsPermission('*', '*');
+        const result = {};
+        _.each(permissions, (permission) => {
+            if (!result[permission.object_name]) {
+                result[permission.object_name] = {};
+            }
+            const { permission_set_id, field, editable, readable } = permission.metadata;
+            if (!result[permission.object_name][permission_set_id]) {
+                result[permission.object_name][permission_set_id] = [];
+            }
+            result[permission.object_name][permission_set_id].push({ field: field, read: readable, edit: editable })
+        })
+        return result;
+    }
 }

package/src/types/index.ts

@@ -7,6 +7,7 @@ export * from "./dashboard";
 export * from "./object";
 export * from "./connection";
 export * from "./object_layouts";
+export * from "./field_permission";
 export { SteedosFieldType, SteedosFieldTypeConfig } from "./field";
 export { SteedosListenerConfig } from './listeners'
 export { SteedosTriggerType } from './trigger'

package/src/types/object.ts

@@ -609,7 +609,7 @@ export class SteedosObjectType extends SteedosObjectProperties {
         return globalPermission
     }
 
-    async getUserObjectPermission(userSession: SteedosUserSession) {
+    async getUserObjectPermission(userSession: SteedosUserSession, rolesFieldsPermission?: any) {
 
         if (!userSession) {
             throw new Error('userSession is required')
@@ -649,7 +649,9 @@ export class SteedosObjectType extends SteedosObjectProperties {
             throw new Error('not find user permission');
         }
 
-        const rolesFieldsPermission = await FieldPermission.getObjectFieldsPermissionGroupRole(this.name);
+        if (!rolesFieldsPermission) {
+            rolesFieldsPermission = await FieldPermission.getObjectFieldsPermissionGroupRole(this.name);
+        }
 
         roles.forEach((role) => {
             let rolePermission = objectRolesPermission[role];
@@ -926,6 +928,13 @@ export class SteedosObjectType extends SteedosObjectProperties {
         return await this.callMetadataObjectServiceAction(`getLookupDetailsInfo`, {objectApiName: this.name});
     }
 
+    /**
+     * 此函数返回getDetailsInfo、getMastersInfo、getLookupDetailsInfo 3个请求的结果，用于优化访问速度
+     */
+    async getRelationsInfo() {
+        return await this.callMetadataObjectServiceAction(`getRelationsInfo`, { objectApiName: this.name });
+    }
+
     async getRecordPermissions(record, userSession){
         const permissions = await this.getUserObjectPermission(userSession);
         const { userId, company_ids: user_company_ids } = userSession;
@@ -985,22 +994,39 @@ export class SteedosObjectType extends SteedosObjectProperties {
         return permissions
     }
 
-    async getRecordView(userSession){
+    async getRecordView(userSession, context?: any) {
+        let objectConfig;
+        let layouts;
+        let spaceProcessDefinition;
+        let dbListViews;
+        let rolesFieldsPermission;
+
+        if (context) {
+            objectConfig = context.objectConfig;
+            layouts = context.layouts;
+            spaceProcessDefinition = context.spaceProcessDefinition;
+            dbListViews = context.dbListViews;
+            rolesFieldsPermission = context.rolesFieldsPermission;
+        }
+
         const lng = userSession.language;
-        const objectMetadataConfig: any = await this.callMetadataObjectServiceAction('get', {objectApiName: this.name});
-        let objectConfig = objectMetadataConfig.metadata;
+        if (!objectConfig) {
+            const objectMetadataConfig: any = await this.callMetadataObjectServiceAction('get', { objectApiName: this.name });
+            objectConfig = objectMetadataConfig.metadata;
+        }
         objectConfig.name = this.name
         objectConfig.datasource = this.datasource.name;
-        objectConfig.permissions = await this.getUserObjectPermission(userSession);
-        objectConfig.details = await this.getDetailsInfo();
-        objectConfig.masters = await this.getMastersInfo();
-        objectConfig.lookup_details = await this.getLookupDetailsInfo();
-
+        objectConfig.permissions = await this.getUserObjectPermission(userSession, rolesFieldsPermission);
+        const relationsInfo = await this.getRelationsInfo();
+        objectConfig.details = relationsInfo.details;
+        objectConfig.masters = relationsInfo.masters;
+        objectConfig.lookup_details = relationsInfo.lookup_details;
         delete objectConfig.db
 
         translationObject(lng, objectConfig.name, objectConfig, true);
-
-        const layouts = await getObjectLayouts(userSession.profile, userSession.spaceId, this.name);
+        if (!layouts) {
+            layouts = await getObjectLayouts(userSession.profile, userSession.spaceId, this.name);
+        }
         if(layouts && layouts.length > 0){
             const layout = layouts[0];
             let _fields = {};
@@ -1084,24 +1110,31 @@ export class SteedosObjectType extends SteedosObjectProperties {
         const userObjectFields = objectConfig.fields;
         _.each(objectConfig.permissions.field_permissions, (field_permission, field) => {
             const { read, edit } = field_permission;
-            if (read) {
-                userObjectFields[field].omit = true;
-            }
-            if (edit) {
-                userObjectFields[field].omit = false;
-                userObjectFields[field].hidden = false;
-                userObjectFields[field].readonly = false;
-                userObjectFields[field].disabled = false;
-            }
-            if (!read && !edit) {
-                delete userObjectFields[field]
+            if (userObjectFields[field]) {
+                if (read) {
+                    userObjectFields[field].hidden = false;
+                    userObjectFields[field].omit = true;
+                    userObjectFields[field].readonly = true;
+                    userObjectFields[field].disabled = true;
+                }
+                if (edit) {
+                    userObjectFields[field].omit = false;
+                    userObjectFields[field].hidden = false;
+                    userObjectFields[field].readonly = false;
+                    userObjectFields[field].disabled = false;
+                }
+                if (!read && !edit) {
+                    delete userObjectFields[field]
+                }
             }
         })
 
         objectConfig.fields = userObjectFields
 
         // TODO object layout 是否需要控制审批记录显示？
-        let spaceProcessDefinition = await getObject("process_definition").directFind({ filters: [['space', '=', userSession.spaceId], ['object_name', '=', this.name], ['active', '=', true]] })
+        if (!spaceProcessDefinition) {
+            spaceProcessDefinition = await getObject("process_definition").directFind({ filters: [['space', '=', userSession.spaceId], ['object_name', '=', this.name], ['active', '=', true]] })
+        }
         if (spaceProcessDefinition.length > 0) {
             objectConfig.enable_process = true
         }
@@ -1113,8 +1146,9 @@ export class SteedosObjectType extends SteedosObjectProperties {
                 delete objectConfig.triggers[key];
             }
         })
-
-        const dbListViews = await getObject("object_listviews").find({ filters: [['space', '=', userSession.spaceId], ['object_name', '=', this.name], [['owner', '=', userSession.userId], 'or', ['shared', '=', true]]] })
+        if (!dbListViews) {
+            dbListViews = await getObject("object_listviews").directFind({ filters: [['space', '=', userSession.spaceId], ['object_name', '=', this.name], [['owner', '=', userSession.userId], 'or', ['shared', '=', true]]] })
+        }
         objectConfig.list_views = Object.assign({}, objectConfig.list_views)
         _.each(dbListViews, function(dbListView){
             delete dbListView.created;

package/src/types/object_dynamic_load.ts

@@ -24,6 +24,7 @@ const _routers: Array<any> = [];
 const _objectsData: Dictionary<any> = {};
 const delayLoadExtendObjectConfigQueue: Dictionary<any> = {};
 let standardObjectsLoaded: boolean = false;
+let dbMetadataLoaing: boolean = false;
 
 const addDelayLoadExtendObjectConfig = function (extend: string, config: SteedosObjectTypeConfig){
     if(!delayLoadExtendObjectConfigQueue[extend]){
@@ -323,10 +324,17 @@ export const removeObjectListenerConfig = (_id, listenTo, when)=>{
     }
 }
 
-export const loadStandardMetadata = async (serviceName: string, datasourceApiName: string) =>{
+export const loadStandardMetadata = async (serviceName: string, datasourceApiName: string) => {
     await loadStandardProfiles(serviceName);
     await loadStandardPermissionsets(serviceName);
     await loadStandardBaseObjects(serviceName);
+    if (dbMetadataLoaing != true) {
+        dbMetadataLoaing = true;
+        await loadDbMetadatas(datasourceApiName);
+    }
+}
+
+export const loadDbMetadatas = async (datasourceApiName: string) => {
     if(datasourceApiName === 'default' || datasourceApiName === 'meteor'){
         const datasource = getDataSource(datasourceApiName)
         if(datasource && datasourceApiName === 'default'){

package/src/types/schema.ts

@@ -7,7 +7,6 @@ import { getFromContainer } from 'typeorm';
 // import { loadCoreValidators } from '../validators';
 // import { loadStandardBaseObjects } from './object_dynamic_load';
 // import { preloadDBObjectFields, preloadDBObjectButtons } from '../dynamic-load';
-import { buildGraphQLSchema } from '../graphql';
 import { MetadataRegister } from '../metadata-register';
 import { MetadataDriver } from '../driver/metadata';
 
@@ -22,7 +21,6 @@ export type SteedosSchemaConfig = {
 export class SteedosSchema {
     private _datasources: Dictionary<SteedosDataSourceType> = {};
     private _objectsMap: Dictionary<{ datasourceName: string, filePath?: string }> = {};
-    private graphQLSchema: any = null;
     private _broker: any = null;
     private _metadataBroker: any = null;
     metadataRegister: MetadataRegister = null;
@@ -230,17 +228,6 @@ export class SteedosSchema {
         return this._datasources
     }
 
-    buildGraphQLSchema() {
-        this.graphQLSchema = buildGraphQLSchema(this);
-    }
-
-    getGraphQLSchema() {
-        if (!this.graphQLSchema) {
-            this.buildGraphQLSchema();
-        }
-        return this.graphQLSchema;
-    }
-
     async getAllObject() {
         return await this.metadataBroker.call("objects.getAll");
     }

package/lib/graphql/index.d.ts

@@ -1,3 +0,0 @@
-import { SteedosSchema, SteedosDataSourceType } from "../types";
-import { GraphQLSchema } from 'graphql';
-export declare function buildGraphQLSchema(steedosSchema: SteedosSchema, datasource?: SteedosDataSourceType): GraphQLSchema;