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

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

@@ -252,15 +252,21 @@ module.exports = {
                                     operators: getFieldOperators(field.type)
                                 });
                                 break;
+                            //  以下date 、datetime、time 不能作为amis 表单项的格式 . filters 对此格式做个特殊兼容,
                             case 'date':
+                                // amins的format不支持Z后缀，只能用+offset格式 . 
+                                // 华炎魔方中日期字段存的是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':
+                                // 这里不需要配置format，因为日期时间是记时区的，amins中日期时间控件输出本地时间值的
+                                // 即amins中日期时间控件的format默认值为"YYYY-MM-DDTHH:mm+08:00"正好满足需求
                                 fields.push({
                                     label: field.label,
                                     type: field.type,
@@ -269,10 +275,13 @@ module.exports = {
                                 });
                                 break;
                             case 'time':
+                                //amins的format不支持Z后缀，只能用+offset格式
+                                // 华炎魔方中时间字段存的是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,7 @@ const Lookup = require('./lookup');
 const AmisFormInputs = [
     'text',
     'date',
+    'file',
     'image',
     'datetime',
     'time',
@@ -332,6 +333,37 @@ payload = {
         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: {

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}`)
             }
         }
@@ -108,6 +108,49 @@ function getScriptForRemoveUrlPrefixForImgFields(fields){
     `
 }
 
+/*
+    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.$;
@@ -123,7 +166,9 @@ function getSaveDataTpl(fields){
         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}}\`;

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

@@ -118,6 +118,58 @@ function getScriptForAddUrlPrefixForImgFields(fields){
     `
 }
 
+/*
+    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",
@@ -129,6 +181,7 @@ function getEditFormInitApi(object, recordId, fields){
             if(data){
                 ${getConvertDataScriptStr(fields)}
                 ${getScriptForAddUrlPrefixForImgFields(fields)}
+                ${getScriptForRewriteValueForFileFields(fields)}
                 //初始化接口返回的字段移除字段值为null的字段
                 for (key in data){
                     if(data[key] === null){

package/package.json

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