@steedos/service-plugin-amis 2.2.51 → 2.2.52-beta.1

package/main/default/services/utils/fields/lookup.js

@@ -85,7 +85,7 @@ function lookupToAmisPicker(field, readonly){
 
     const source = getApi({
         name: referenceTo.objectName
-    }, null, fields, {alias: 'rows', queryOptions: `filters: {__filters}, top: {__top}, skip: {__skip}, sort: "{__sort}"`});
+    }, null, fields, {expand: true, alias: 'rows', queryOptions: `filters: {__filters}, top: {__top}, skip: {__skip}, sort: "{__sort}"`});
     source.data.$term = "$term";
     source.data.$self = "$$";
    
@@ -156,9 +156,9 @@ function lookupToAmisSelect(field, readonly){
         apiInfo = getApi({
             name: referenceTo.objectName
         }, null, {
-            [referenceTo.labelField.name]: referenceTo.labelField,
-            [referenceTo.valueField.name]: referenceTo.valueField
-        }, {alias: 'options', queryOptions: `filters: {__filters}, top: {__top}`})
+            [referenceTo.labelField.name]: Object.assign({}, referenceTo.labelField, {alias: 'label'}),
+            [referenceTo.valueField.name]: Object.assign({}, referenceTo.valueField, {alias: 'value'})
+        }, {expand: false, alias: 'options', queryOptions: `filters: {__filters}, top: {__top}`})
     }else{
         apiInfo = {
             method: "post",
@@ -225,7 +225,7 @@ function getApi(object, recordId, fields, options){
     return {
         method: "post",
         url: graphql.getApi(),
-        data: graphql.getFindQuery(object, recordId, fields, Object.assign(options, {expand: true}))
+        data: graphql.getFindQuery(object, recordId, fields, options)
     }
 }
 

package/main/default/services/utils/graphql.js

@@ -13,7 +13,7 @@ function getFieldsTemplate(fields, expand){
                 const NAME_FIELD_KEY = objectql.getObject(field.reference_to).NAME_FIELD_KEY;
                 fieldsName.push(`${field.name}:${field.name}__expand{_id,${NAME_FIELD_KEY}}`)
             }else{
-                fieldsName.push(field.name)
+                fieldsName.push( field.alias ? `${field.alias}:${field.name}` : field.name)
             }
 
             if(field.type === 'date' || field.type == 'datetime' || field.type == 'boolean'){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.2.51",
+  "version": "2.2.52-beta.1",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -8,5 +8,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1ca3a0c01c174f25f793a4cb6abb1e3334694344"
+  "gitHead": "deba56dae254d9d14d80e46a564a49059e5c7a16"
 }