@steedos/service-plugin-amis 2.2.52-beta.7 → 2.2.52

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

@@ -252,15 +252,19 @@ module.exports = {
                                     operators: getFieldOperators(field.type)
                                 });
                                 break;
+                            // 以下date 、datetime、time 不能作为amis 表单项的格式 . filters 对此格式做个特殊兼容,
                             case 'date':
+                                // 华炎魔方中日期字段存的是utc的0点
                                 fields.push({
                                     label: field.label,
                                     type: field.type,
                                     name: field.name,
+                                    format: "YYYY-MM-DDT00:00:00+00:00",
                                     operators: getFieldOperators(field.type)
                                 });
                                 break;
                             case 'datetime':
+                                // 即amis中日期时间控件的format默认值为"YYYY-MM-DDTHH:mm+08:00"正好满足需求
                                 fields.push({
                                     label: field.label,
                                     type: field.type,
@@ -269,10 +273,12 @@ module.exports = {
                                 });
                                 break;
                             case 'time':
+                                // 华炎魔方中时间字段存的是1970-01-01的utc时间
                                 fields.push({
                                     label: field.label,
                                     type: field.type,
                                     name: field.name,
+                                    format: "1970-01-01THH:mm+00:00",
                                     operators: getFieldOperators(field.type)
                                 });
                                 break;

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

@@ -5,6 +5,8 @@ const Lookup = require('./lookup');
 const AmisFormInputs = [
     'text',
     'date',
+    'file',
+    'image',
     'datetime',
     'time',
     'number',
@@ -205,6 +207,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 +316,66 @@ 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 'file':
+            rootUrl = Meteor.absoluteUrl('/api/files/files/');
+            convertData = {
+                type: getAmisStaticFieldType('file', readonly),
+                receiver: {
+                    method: "post",
+                    url: "${context.rootUrl}/s3/files",
+                    adaptor: `
+var rootUrl = ${JSON.stringify(rootUrl)};
+payload = {
+    status: response.status == 200 ? 0 : response.status,
+    msg: response.statusText,
+    data: {
+        value: payload._id,
+        name: 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

@@ -20,7 +20,7 @@ function getFieldsTemplate(fields, expand){
                 fieldsName.push(`${field.name}`)
             }
 
-            if(field.type === 'date' || field.type == 'datetime' || field.type == 'boolean' || field.type == 'select'){
+            if(field.type === 'date' || field.type == 'datetime' || field.type == 'boolean' || field.type == 'select' || field.type == 'file'){
                 displayFields.push(`${field.name}`)
             }
         }
@@ -67,16 +67,108 @@ 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];
+                }
+            }
+        })
+    `
+}
+
+/*
+    file字段值重写使其保存时正常保存id。
+*/
+function getScriptForSimplifiedValueForFileFields(fields){
+    let fileFieldsKeys = [];
+    let fileFields = {};
+    fields.forEach((item)=>{
+        if(item.type === 'file'){
+            fileFieldsKeys.push(item.name);
+            fileFields[item.name] = {
+                name: item.name,
+                multiple: item.multiple
+            };
+        }
+    })
+    if(!fileFieldsKeys.length){
+        return '';
+    }
+    return  `
+        let fileFieldsKeys = ${JSON.stringify(fileFieldsKeys)};
+        let fileFields = ${JSON.stringify(fileFields)};
+        fileFieldsKeys.forEach((item)=>{
+            let fileFieldValue = formData[item];
+            if(fileFieldValue){
+                // 因为表单初始化接口的接收适配器中为file字段值重写了值及格式（为了字段编辑时正常显示附件名、点击附件名正常下载），所以保存时还原（为了字段值保存时正常保存id）。
+                if(fileFields[item].multiple){
+                    if(fileFieldValue instanceof Array && fileFieldValue.length){
+                        formData[item] = fileFieldValue.map((value)=>{ 
+                            if(typeof value === 'object'){
+                                return value.value;
+                            }else{
+                                return value;
+                            }
+                        });
+                    }
+                }else{
+                    formData[item] = typeof fileFieldValue === 'object' ? fileFieldValue.value : fileFieldValue;
+                }
+            }
+        })
+    `
+}
+
+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;
-
+        delete formData._display;
+        ${getScriptForRemoveUrlPrefixForImgFields(fields)}
+        ${getScriptForSimplifiedValueForFileFields(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 +178,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,97 @@ 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;
+                        }
+                    }
+                })
+    `
+}
+
+/*
+    file字段值重写使其在amis中正常显示附件名、点击附件名下载文件。
+*/
+function getScriptForRewriteValueForFileFields(fields){
+    let fileFieldsKeys = [];
+    let fileFields = {};
+    let fileRootUrl = Meteor.absoluteUrl('/api/files/files/');
+    fields.forEach((item)=>{
+        if(item.type === 'file'){
+            fileFieldsKeys.push(item.name);
+            fileFields[item.name] = {
+                name: item.name,
+                multiple: item.multiple
+            };
+        }
+    })
+    if(!fileFieldsKeys.length){
+        return '';
+    }
+    return `
+                // file字段值重写以便编辑时正常显示附件名、点击附件名正常下载附件
+                let fileFieldsKeys = ${JSON.stringify(fileFieldsKeys)};
+                let fileFields = ${JSON.stringify(fileFields)};
+                let fileRootUrl = ${JSON.stringify(fileRootUrl)};
+                fileFieldsKeys.forEach((item)=>{
+                    let fileFieldValue = data[item];
+                    if(fileFieldValue && fileFieldValue.length){
+                        const fileFieldNames = data._display[item].split(',');
+                        if(fileFields[item].multiple){
+                            if(fileFieldValue instanceof Array){
+                                data[item] = fileFieldValue.map((value, index)=>{ 
+                                    return {
+                                        value: value,
+                                        name: fileFieldNames[index],
+                                        url: fileRootUrl + value + "?download=true",
+                                        state: "uploaded"
+                                    }
+                                });
+                            }
+                        }else{
+                            data[item] = {
+                                value: fileFieldValue,
+                                name: fileFieldNames[0],
+                                url: fileRootUrl + fileFieldValue + "?download=true",
+                                state: "uploaded"
+                            };
+                        }
+                    }
+                })
+    `
+}
+
 function getEditFormInitApi(object, recordId, fields){
     return {
         method: "post",
@@ -89,6 +180,14 @@ function getEditFormInitApi(object, recordId, fields){
             var data = payload.data.data[0];
             if(data){
                 ${getConvertDataScriptStr(fields)}
+                ${getScriptForAddUrlPrefixForImgFields(fields)}
+                ${getScriptForRewriteValueForFileFields(fields)}
+                //初始化接口返回的字段移除字段值为null的字段
+                for (key in data){
+                    if(data[key] === null){
+                        delete data[key];
+                    }
+                }
             };
             payload.data = data;
             delete payload.extensions;
@@ -103,7 +202,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,12 +1,14 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.2.52-beta.7",
+  "version": "2.2.52",
   "main": "package.service.js",
-  "scripts": {},
+  "scripts": {
+    "build": "node .scripts/build.tailwind.js"
+  },
   "license": "MIT",
   "private": false,
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ecf8b1cc86813d63697cca572cde7a4d996643d6"
+  "gitHead": "1447c9ca4fb57a49233704f50a7d757aff0c5027"
 }