@steedos/service-plugin-amis 2.3.0-beta.8 → 2.3.0

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

@@ -0,0 +1,201 @@
+/*
+ * @Description: 提供amis选人组件需要的数据接口
+ */
+
+const objectql = require("@steedos/objectql");
+const _ = require("lodash");
+const clone = require("clone");
+
+
+module.exports = {
+    name: "amis-metadata-space_users",
+    mixins: [],
+    /**
+     * Settings
+     */
+    settings: {
+
+    },
+
+    /**
+     * Dependencies
+     */
+    dependencies: [],
+
+    /**
+     * Actions
+     */
+    actions: {
+        getSpaceUsersOptions: {
+            rest: {
+                method: "GET",
+                path: "/space_users/options"
+            },
+            async handler(ctx) {
+                const options = await this.getSpaceUsersOptions(ctx);
+                return { status: 0, data: { options } }
+            }
+        }
+    },
+
+    /**
+     * Events
+     */
+    events: {
+
+    },
+
+    /**
+     * Methods
+     */
+    methods: {
+        /**
+            1.当没有传入参数，即第一次请求接口时返回如下格式的数据：
+            [
+                {
+                    "leftOptions": [
+                        {
+                            "label": "总公司",
+                            "value": 1,
+                            "defer": true
+                        }
+                    ],
+                    "children": [
+                        {
+                            "ref": 1,
+                            "defer": true
+                        },
+                        {
+                            "ref": 2,
+                            "defer": true
+                        },
+                        {
+                            "ref": 3,
+                            "defer": true
+                        },
+                        {
+                            "ref": 4,
+                            "defer": true
+                        },
+                        {
+                            "ref": 5,
+                            "defer": true
+                        },
+                        {
+                            "ref": 6,
+                            "defer": true
+                        }
+                    ]
+                }
+            ]
+            2.当传入def参数值时，表示展开左侧组织树某个组织，此时返回如下格式的数据：
+            [
+                {
+                    "label": "部门 A",
+                    "value": 2
+                },
+                {
+                    "label": "部门 B",
+                    "value": 3,
+                    "defer": true
+                },
+                {
+                    "label": "部门 C",
+                    "value": 4
+                }
+            ]
+            2.当传入ref参数值时，表示点击左侧某个组织，按此组织过滤右侧人员列表，此时返回如下格式的数据：
+            [
+                {
+                    "label": "用户 1",
+                    "value": "user1"
+                },
+                {
+                    "label": "用户 2",
+                    "value": "user2"
+                }
+            ]
+         */
+        getSpaceUsersOptions: {
+            async handler(ctx) {
+                const userSession = ctx.meta.user;
+                const spaceId = userSession.spaceId;
+                // 有 dep 值则是懒加载部门树，有 ref 值则是懒加载人员，否则按第一次加载返回第一个 option作为select的基本配置
+                // 需要懒加载的项通过返回相关项的 defer 为 true 来标记。左右两部分都支持懒加载。
+                // 参考 https://aisuda.bce.baidu.com/amis/zh-CN/components/form/select#%E4%BA%BA%E5%91%98%E7%82%B9%E9%80%89
+                const dep = ctx.params.dep;
+                const ref = ctx.params.ref;
+                const valueField = ctx.params.valueField || "user";//user or _id
+                const term = ctx.params.term;
+                if(dep){
+                    // 有 dep 值则是懒加载部门树，返回展开后的部门列表
+                    const fields = "_id,name,children".split(",");
+                    const filters = [['space', '=', spaceId], ['parent', '=', dep]];
+                    const orgs = await objectql.getObject('organizations').find({filters: filters, fields: fields});
+                    const reOptions = _.map(orgs, (org)=>{
+                        return {
+                            value: org._id,
+                            label: org.name,
+                            defer: !!(org.children && org.children.length)
+                        }
+                    });
+                    return reOptions;
+                }
+                else if(ref || term){
+                    // 有 ref 值则是懒加载人员，返回按ref值过滤后的人员列表
+                    const fields = "_id,name,user".split(",");
+                    const filters = [['space', '=', spaceId], ['user_accepted', '=', true]];
+                    if(term){
+                        const fieldsForSearch = ["name", "username", "email", "mobile"];
+                        const termFilters = [];
+                        fieldsForSearch.forEach(function(field){
+                            termFilters.push([field, 'contains', term]);
+                            termFilters.push("or");
+                        });
+                        termFilters.pop();
+                        filters.push(termFilters);
+                    }
+                    else{
+                        filters.push(['organizations_parents', '=', ref]);
+                    }
+                    const sus = await objectql.getObject('space_users').find({filters: filters, fields: fields});
+                    const reOptions = _.map(sus, (su)=>{
+                        return {
+                            value: su[valueField],
+                            label: su.name
+                        }
+                    });
+                    return reOptions;
+                }
+                else{
+                    // 接口返回的选项中，第一个 option 是以下这种格式时，
+                    // 也会把 options[0].leftOptions 当成 leftOptions
+                    // options[0].children 当 options。
+                    // 同时 options[0].leftDefaultValue 可以用来配置左侧选项的默认值。
+                    const reOptions = [{
+                        children: [],
+                        leftOptions: [],
+                        leftDefaultValue: ''
+                    }];
+                    const fields = "_id,name,children".split(",");
+                    const filters = [['space', '=', spaceId], ['parent', '=', null]];
+                    const rootOrgs = await objectql.getObject('organizations').find({filters: filters, fields: fields});
+                    reOptions[0].leftOptions = _.map(rootOrgs, (org)=>{
+                        return {
+                            value: org._id,
+                            label: org.name,
+                            defer: !!(org.children && org.children.length)
+                        }
+                    });
+                    reOptions[0].children = _.map(rootOrgs, (org)=>{
+                        return {
+                            ref: org._id,
+                            defer: !!(org.children && org.children.length)
+                        }
+                    });
+                    return reOptions;
+                }
+            }
+        }
+    }
+};

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

@@ -6,6 +6,7 @@ const AmisFormInputs = [
     'text',
     'date',
     'file',
+    'avatar',
     'image',
     'datetime',
     'time',
@@ -172,6 +173,50 @@ function getSelectFieldOptions(field){
     return options;
 }
 
+function  convertSFieldToAmisFilesField(field,readonly){
+    const type = field.type;
+    let table_name;
+    let fieldType = type;
+    if(type === 'avatar'){
+        table_name = 'avatars';
+        fieldType = "image";
+    }else if(type === 'image'){
+        table_name = 'images';
+    }else if(type === 'file'){
+        table_name = 'files';
+    }
+    const rootUrl = Meteor.absoluteUrl(`/api/files/${table_name}/`);
+    let convertData = {
+        type: getAmisStaticFieldType(fieldType, readonly),
+        receiver: {
+            method: "post",
+            url: `\${context.rootUrl}/s3/${table_name}`,
+            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;
+    }
+    return convertData;
+}
+
 function convertSFieldToAmisField(field, readonly) {
     // 创建人和修改人、创建时间和修改时间不显示
     if(_.include(OMIT_FIELDS, field.name)){
@@ -315,67 +360,14 @@ function convertSFieldToAmisField(field, readonly) {
                 type: getAmisStaticFieldType('email', readonly)
             }
             break;
+        case 'avatar':
+            convertData = convertSFieldToAmisFilesField(field,readonly);
+            break;
         case 'image':
-            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;
-            }
+            convertData = convertSFieldToAmisFilesField(field,readonly);
             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;
-            }
+            convertData = convertSFieldToAmisFilesField(field,readonly);
             break;
         case 'formula':
             //TODO

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

@@ -69,13 +69,13 @@ function getSaveQuery(object, recordId, fields, options){
 }
 
 /*
-    img字段值移除URL前缀使其保存时正常保存id,而不是url。
+    img/avatar字段值移除URL前缀使其保存时正常保存id,而不是url。
 */
 function getScriptForRemoveUrlPrefixForImgFields(fields){
     let imgFieldsKeys = [];
     let imgFields = {};
     fields.forEach((item)=>{
-        if(item.type === 'image'){
+        if(item.type === 'image' || item.type === 'avatar' ){
             imgFieldsKeys.push(item.name);
             imgFields[item.name] = {
                 name: item.name,

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

@@ -85,12 +85,13 @@ function getConvertDataScriptStr(fields){
 function getScriptForAddUrlPrefixForImgFields(fields){
     let imgFieldsKeys = [];
     let imgFields = {};
-    let rootUrl = Meteor.absoluteUrl('/api/files/images/');
+    let rootUrl = Meteor.absoluteUrl('/api/files/');
     fields.forEach((item)=>{
-        if(item.type === 'image'){
+        if(item.type === 'image' || item.type === 'avatar'){
             imgFieldsKeys.push(item.name);
             imgFields[item.name] = {
                 name: item.name,
+                type: item.type,
                 multiple: item.multiple
             };
         }
@@ -106,12 +107,19 @@ function getScriptForAddUrlPrefixForImgFields(fields){
                 imgFieldsKeys.forEach((item)=>{
                     let imgFieldValue = data[item];
                     if(imgFieldValue && imgFieldValue.length){
-                        if(imgFields[item].multiple){
+                        let fieldProps = imgFields[item];
+                        let table_name;
+                        if(fieldProps.type === 'image'){
+                            table_name = 'images';
+                        }else{
+                            table_name = 'avatars';
+                        }
+                        if(fieldProps.multiple){
                             if(imgFieldValue instanceof Array){
-                                data[item] = imgFieldValue.map((value)=>{ return rootUrl + value});
+                                data[item] = imgFieldValue.map((value)=>{ return rootUrl + table_name +  '/' + value});
                             }
                         }else{
-                            data[item] = rootUrl + imgFieldValue;
+                            data[item] = rootUrl + table_name + '/' + imgFieldValue;
                         }
                     }
                 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.3.0-beta.8",
+  "version": "2.3.0",
   "main": "package.service.js",
   "scripts": {
     "build": "node .scripts/build.tailwind.js"
@@ -10,5 +10,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d0bfd52568ee68e3af0f251c06bd8169e823851f"
+  "gitHead": "b00e79e6fb8549b2fabed7b6cd6d4847775ba5df"
 }

package/public/amis/amis.css

@@ -52,7 +52,7 @@ body{
     min-width: 100px;
 }
 
-.steedos-amis-form .antd-Collapse .antd-Form--normal{
+.steedos-amis-form .antd-Collapse .antd-Form--normal, .antd-Form--normal .antd-Tabs .antd-Tabs-content .antd-Tabs-pane .form-content{
     display: grid!important;
     grid-template-columns: repeat(2,minmax(0,1fr))!important;
     grid-row-gap: 1rem!important;