@steedos/service-plugin-amis 2.5.20-beta.2 → 2.5.20-beta.20

package/main/default/services/amis-design.service.js

@@ -85,7 +85,16 @@ module.exports = {
                 const lng = userSession.language || 'zh-CN';
                 const spaceId = userSession.spaceId;
                 const allMetadataObjects = await objectql.getSteedosSchema().getAllObject();
-                const allObjects = _.pluck(clone(allMetadataObjects), 'metadata');
+                const allObjects = _.map(allMetadataObjects, (metadataObject)=>{
+                    return {
+                        name: metadataObject.metadata.name,
+                        label: metadataObject.metadata.label,
+                        NAME_FIELD_KEY: metadataObject.metadata.NAME_FIELD_KEY,
+                        hidden: metadataObject.metadata.hidden,
+                        list_views: clone(metadataObject.metadata.list_views),
+                    };
+                })
+                // _.pluck(clone(allMetadataObjects), 'metadata');
 
                 const query = {
                     filters: [ ['hidden', '!=', true] , ['name', '<>', ExcludeObjectNames]],
@@ -96,11 +105,8 @@ module.exports = {
                         NAME_FIELD_KEY: 1
                     }
                 };
-
                 const objects = objectql.getSteedosSchema().metadataDriver.find(allObjects, query, spaceId);
-
                 const dbListViews = await objectql.getObject('object_listviews').directFind({filters: [['shared', '!=', false]]})
-
                 _.each(objects, (object)=>{
                     if(object && object.name){
 
@@ -120,7 +126,13 @@ module.exports = {
                                     label: 1
                                 }
                             }, spaceId);
-                            
+                            // object.list_views = _.each(_.values(object.list_views), (listview)=>{
+                            //     return {
+                            //         _id: listview._id,
+                            //         name: listview.name,
+                            //         label: listview.label
+                            //     }
+                            // });
                         }
 
                         if(_.isEmpty(object.list_views)){
@@ -218,8 +230,16 @@ module.exports = {
                 const lng = userSession.language || 'zh-CN';
                 const spaceId = userSession.spaceId;
                 const allMetadataObjects = await objectql.getSteedosSchema().getAllObject();
-                const allObjects = _.pluck(clone(allMetadataObjects), 'metadata');
-
+                const allObjects = _.map(allMetadataObjects, (metadataObject)=>{
+                    return {
+                        name: metadataObject.metadata.name,
+                        label: metadataObject.metadata.label,
+                        NAME_FIELD_KEY: metadataObject.metadata.NAME_FIELD_KEY,
+                        hidden: metadataObject.metadata.hidden,
+                        list_views: clone(metadataObject.metadata.list_views),
+                        fields: clone(metadataObject.metadata.fields),
+                    };
+                });
                 const object = await objectql.getSteedosSchema().getObject(objectName);
                 const objectConfig = object.toConfig();
                 steedosI18n.translationObject(lng, objectConfig.name, objectConfig);
@@ -238,7 +258,6 @@ module.exports = {
                 let details = relationsInfo && relationsInfo.details;
                 const lookupDetails = relationsInfo && relationsInfo.lookup_details;
                 details = _.union(details, lookupDetails);
-
                 _.each(details, function(related){
                     /*related可能是一个lookup_details，它是对象而不是字符串，从中取出key值*/
                     if(typeof related !== "string"){
@@ -284,12 +303,19 @@ module.exports = {
                         fields: 1
                     }
                 };
-
-                let objects = objectql.getSteedosSchema().metadataDriver.find(allObjects, query, spaceId);
+                let objects = _.map(_.filter((allObjects), (obj)=>{
+                    return obj.hidden != true;
+                }), (obj)=>{
+                    return {
+                        name: obj.name,
+                        label: obj.label,
+                        list_views: obj.list_views,
+                        fields: obj.fields
+                    }
+                })
                 objects = objects.filter(function(object){
                     return relatedListObjects.includes(object.name);
                 });
-
                 const dbListViews = await objectql.getObject('object_listviews').directFind({filters: [['shared', '!=', false]]})
 
                 _.each(objects, (object)=>{

package/main/default/services/metadata/objects.service.js

@@ -194,7 +194,7 @@ module.exports = {
                 const lng = userSession.language || 'zh-CN';
                 const spaceId = userSession.spaceId;
                 const allMetadataObjects = await objectql.getSteedosSchema().getAllObject();
-                const allObjects = _.map(clone(allMetadataObjects), 'metadata');
+                const allObjects = _.map(allMetadataObjects, 'metadata');
                 const query = {
                     filters: [  ['name', '<>', ExcludeObjectNames]], //['hidden', '!=', true] ,
                     projection: {
@@ -203,7 +203,14 @@ module.exports = {
                     }
                 };
 
-                const objects = objectql.getSteedosSchema().metadataDriver.find(allObjects, query, spaceId);
+                const objects = _.map(_.filter(allObjects, (obj)=>{
+                    return !_.includes(ExcludeObjectNames, obj.name)
+                }), (obj)=>{
+                    return {
+                        name: obj.name,
+                        label: obj.label
+                    }
+                })
 
                 _.each(objects, (object)=>{
                     if(object && object.name){
@@ -585,7 +592,7 @@ module.exports = {
                 const objectTabs = await objectql.getObject('tabs').find({filters: [['type', '=', "object"]]});
                 const tabObjects = _.map(objectTabs, "object");
                 const allMetadataObjects = await objectql.getSteedosSchema().getAllObject();
-                const allObjects = _.map(clone(allMetadataObjects), 'metadata');
+                const allObjects = _.map(allMetadataObjects, 'metadata');
                 const query = {
                     filters: [['hidden', '!=', true], ['name', '<>', tabObjects]],
                     projection: {
@@ -625,7 +632,7 @@ module.exports = {
                 const companyId = userSession.company_id;
                 const companyIds = userSession.company_ids;
                 const allMetadataObjects = await objectql.getSteedosSchema().getAllObject();
-                const allObjects = _.map(clone(allMetadataObjects), 'metadata');
+                const allObjects = _.map(allMetadataObjects, 'metadata');
                 const query = {
                     filters: [['name', 'in', selectedObjects]], //['hidden', '!=', true] ,
                     projection: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.5.20-beta.2",
+  "version": "2.5.20-beta.20",
   "main": "package.service.js",
   "scripts": {
     "build": "yarn build:tailwind-base && yarn build:tailwind",
@@ -13,7 +13,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b9fc3773ae163df5d0062113bf6b21635c898b13",
+  "gitHead": "3e2075bd76af1a521e6dc1bf12c9fabb67e52f7a",
   "devDependencies": {
     "tailwindcss": "3.2.4"
   }