@steedos/service-plugin-amis 2.2.52-beta.18 → 2.2.52-beta.21

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

@@ -5,6 +5,7 @@ const Lookup = require('./lookup');
 const AmisFormInputs = [
     'text',
     'date',
+    'image',
     'datetime',
     'time',
     'number',
@@ -205,6 +206,7 @@ function convertSFieldToAmisField(field, readonly) {
                 joinValues: false,
                 options: getSelectFieldOptions(field),
                 extractValue: true,
+                clearable: true,
                 labelField: 'label',
                 valueField: 'value',
                 tpl: readonly ? Tpl.getSelectTpl(field) : null
@@ -313,7 +315,35 @@ function convertSFieldToAmisField(field, readonly) {
             }
             break;
         case 'image':
-            //TODO
+            rootUrl = Meteor.absoluteUrl('/api/files/images/');
+            convertData = {
+                type: getAmisStaticFieldType('image', readonly),
+                receiver: {
+                    method: "post",
+                    url: "${context.rootUrl}/s3/images",
+                    adaptor: `
+var rootUrl = ${JSON.stringify(rootUrl)};
+payload = {
+    status: response.status == 200 ? 0 : response.status,
+    msg: response.statusText,
+    data: {
+        value: payload._id,
+        filename: payload.original.name,
+        url: rootUrl + payload._id,
+    }
+}
+return payload;
+                    `,
+                    headers: {
+                        Authorization: "Bearer ${context.tenantId},${context.authToken}"
+                    }
+                }
+            }
+            if(field.multiple){
+                convertData.multiple = true;
+                convertData.joinValues = false;
+                convertData.extractValue = true;
+            }
             break;
         case 'formula':
             //TODO

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

@@ -67,16 +67,63 @@ function getSaveQuery(object, recordId, fields, options){
     }
 }
 
-function getSaveDataTpl(){
+/*
+    img字段值移除URL前缀使其保存时正常保存id,而不是url。
+*/
+function getScriptForRemoveUrlPrefixForImgFields(fields){
+    let imgFieldsKeys = [];
+    let imgFields = {};
+    fields.forEach((item)=>{
+        if(item.type === 'image'){
+            imgFieldsKeys.push(item.name);
+            imgFields[item.name] = {
+                name: item.name,
+                multiple: item.multiple
+            };
+        }
+    })
+    if(!imgFieldsKeys.length){
+        return '';
+    }
+    return  `
+        let imgFieldsKeys = ${JSON.stringify(imgFieldsKeys)};
+        let imgFields = ${JSON.stringify(imgFields)};
+        imgFieldsKeys.forEach((item)=>{
+            let imgFieldValue = formData[item];
+            if(imgFieldValue && imgFieldValue.length){
+                // 因为表单初始化接口的接收适配器中为image字段值添加了url前缀（为了字段编辑时正常显示图片），所以保存时移除（为了字段值保存时正常保存id,而不是url）。
+                if(imgFields[item].multiple){
+                    if(imgFieldValue instanceof Array){
+                        formData[item] = imgFieldValue.map((value)=>{ 
+                            let itemValue = value?.split('/');
+                            return itemValue[itemValue.length - 1];
+                        });
+                    }
+                }else{
+                    let imgValue = imgFieldValue.split('/');
+                    formData[item] = imgValue[imgValue.length - 1];
+                }
+            }
+        })
+    `
+}
+
+function getSaveDataTpl(fields){
     return `
         const formData = api.data.$;
+        for (key in formData){
+            // image、select等字段清空值后保存的空字符串转换为null。
+            if(formData[key] === ''){
+                formData[key] = null;
+            }
+        }
         const objectName = api.data.objectName;
         const fieldsName = Object.keys(formData);
         delete formData.created;
         delete formData.created_by;
         delete formData.modified;
         delete formData.modified_by;
-
+        ${getScriptForRemoveUrlPrefixForImgFields(fields)}
         let query = \`mutation{record: \${objectName}__insert(doc: {__saveData}){_id}}\`;
         if(formData.recordId){
             query = \`mutation{record: \${objectName}__update(id: "\${formData.recordId}", doc: {__saveData}){_id}}\`;
@@ -86,9 +133,9 @@ function getSaveDataTpl(){
     `
 }
 
-function getSaveRequestAdaptor(){
+function getSaveRequestAdaptor(fields){
     return `
-        ${getSaveDataTpl()}
+        ${getSaveDataTpl(fields)}
         api.data = {query: query.replace('{__saveData}', __saveData)};
         return api;
     `

package/main/default/services/utils/object-record.js

@@ -79,6 +79,45 @@ function getConvertDataScriptStr(fields){
     return scriptStr;
 }
 
+/*
+    img字段值添加URL前缀使其在amis中正常显示图片。
+*/
+function getScriptForAddUrlPrefixForImgFields(fields){
+    let imgFieldsKeys = [];
+    let imgFields = {};
+    let rootUrl = Meteor.absoluteUrl('/api/files/images/');
+    fields.forEach((item)=>{
+        if(item.type === 'image'){
+            imgFieldsKeys.push(item.name);
+            imgFields[item.name] = {
+                name: item.name,
+                multiple: item.multiple
+            };
+        }
+    })
+    if(!imgFieldsKeys.length){
+        return '';
+    }
+    return `
+                // image字段值添加URL前缀
+                let imgFieldsKeys = ${JSON.stringify(imgFieldsKeys)};
+                let imgFields = ${JSON.stringify(imgFields)};
+                let rootUrl = ${JSON.stringify(rootUrl)};
+                imgFieldsKeys.forEach((item)=>{
+                    let imgFieldValue = data[item];
+                    if(imgFieldValue && imgFieldValue.length){
+                        if(imgFields[item].multiple){
+                            if(imgFieldValue instanceof Array){
+                                data[item] = imgFieldValue.map((value)=>{ return rootUrl + value});
+                            }
+                        }else{
+                            data[item] = rootUrl + imgFieldValue;
+                        }
+                    }
+                })
+    `
+}
+
 function getEditFormInitApi(object, recordId, fields){
     return {
         method: "post",
@@ -89,6 +128,13 @@ function getEditFormInitApi(object, recordId, fields){
             var data = payload.data.data[0];
             if(data){
                 ${getConvertDataScriptStr(fields)}
+                ${getScriptForAddUrlPrefixForImgFields(fields)}
+                //初始化接口返回的字段移除字段值为null的字段
+                for (key in data){
+                    if(data[key] === null){
+                        delete data[key];
+                    }
+                }
             };
             payload.data = data;
             delete payload.extensions;
@@ -103,7 +149,7 @@ function getSaveApi(object, recordId, fields, options){
         method: 'post',
         url: graphql.getApi(),
         data: graphql.getSaveQuery(object, recordId, fields, options),
-        requestAdaptor: graphql.getSaveRequestAdaptor(),
+        requestAdaptor: graphql.getSaveRequestAdaptor(fields),
         responseData: {
             "recordId": "${record._id}"
         },

package/package.json

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