@steedos/service-plugin-amis 2.3.0-beta.3 → 2.3.0-beta.30

package/main/default/pages/object_layouts.page.yml

@@ -0,0 +1,12 @@
+name: object_layouts
+is_active: true
+label: 页面布局表单
+object_name: object_layouts
+pageAssignments:
+  - desktop: true
+    mobile: true
+    page: object_layouts
+    type: orgDefault
+render_engine: amis
+type: form
+widgets: []

package/main/default/services/amis-design.service.js

@@ -47,6 +47,24 @@ module.exports = {
             async handler(ctx) {
                 return await this.getObjects(ctx);
             }
+        },
+        getRelatedObjects: {
+            rest: {
+                method: "GET",
+                path: "/related_objects/:objectName"
+            },
+            async handler(ctx) {
+                return await this.getRelatedObjects(ctx);
+            }
+        },
+        getObject: {
+            rest: {
+                method: "GET",
+                path: "/object/:objectName"
+            },
+            async handler(ctx) {
+                return await this.getObject(ctx);
+            }
         }
     },
 
@@ -82,6 +100,145 @@ module.exports = {
 
                 const dbListViews = await objectql.getObject('object_listviews').directFind({filters: [['shared', '!=', false]]})
 
+                _.each(objects, (object)=>{
+                    if(object && object.name){
+
+                        steedosI18n.translationObject(lng, object.name, object)
+
+                        if(object.list_views && !_.isEmpty(object.list_views)){
+                            _.each(object.list_views, (list_view, name)=>{
+                                list_view.name = name;
+                                list_view._id = list_view._id || list_view.name;
+                                list_view.label = list_view.label || list_view.name;
+                            })
+                            
+                            object.list_views = objectql.getSteedosSchema().metadataDriver.find(_.values(object.list_views), {
+                                projection: {
+                                    _id: 1, 
+                                    name: 1, 
+                                    label: 1
+                                }
+                            }, spaceId);
+                            
+                        }
+
+                        if(_.isEmpty(object.list_views)){
+                            object.list_views = [];
+                        }
+
+                        const objectListViews = objectql.getSteedosSchema().metadataDriver.find(dbListViews, {
+                            filters: [['object_name', '=', object.name],  ['shared', '=', true] ],
+                            fields: "_id, name, label"
+                        }, spaceId);
+
+                        _.each(object.list_views, (listView)=>{
+                            if(!_.find(objectListViews, (dbListView)=>{ return dbListView.name === listView.name})){
+                                objectListViews.push(listView);
+                            }
+                        })
+                        object.list_views = objectListViews;
+                    }
+                })
+                return objects;
+            }
+        },
+        /* 复制getObjects函数根据objectName筛选下单独的对象信息 */
+        getObject: {
+            async handler(ctx) {
+                const objectName = ctx.params.objectName;
+                const userSession = ctx.meta.user;
+                const lng = userSession.language || 'zh-CN';
+                const spaceId = userSession.spaceId;
+                const allMetadataObjects = await objectql.getSteedosSchema().getAllObject();
+                const allObjects = _.pluck(clone(allMetadataObjects), 'metadata');
+
+                const query = {
+                    filters: [ ['hidden', '!=', true] , ['name', '<>', ExcludeObjectNames]],
+                    projection: {
+                        name: 1, 
+                        label: 1, 
+                        list_views: 1
+                    }
+                };
+
+                const objects = objectql.getSteedosSchema().metadataDriver.find(allObjects, query, spaceId);
+
+                const dbListViews = await objectql.getObject('object_listviews').directFind({filters: [['shared', '!=', false]]})
+
+                _.each(objects, (object)=>{
+                    if(object && object.name){
+
+                        steedosI18n.translationObject(lng, object.name, object)
+
+                        if(object.list_views && !_.isEmpty(object.list_views)){
+                            _.each(object.list_views, (list_view, name)=>{
+                                list_view.name = name;
+                                list_view._id = list_view._id || list_view.name;
+                                list_view.label = list_view.label || list_view.name;
+                            })
+                            
+                            object.list_views = objectql.getSteedosSchema().metadataDriver.find(_.values(object.list_views), {
+                                projection: {
+                                    _id: 1, 
+                                    name: 1, 
+                                    label: 1
+                                }
+                            }, spaceId);
+                            
+                        }
+
+                        if(_.isEmpty(object.list_views)){
+                            object.list_views = [];
+                        }
+
+                        const objectListViews = objectql.getSteedosSchema().metadataDriver.find(dbListViews, {
+                            filters: [['object_name', '=', object.name],  ['shared', '=', true] ],
+                            fields: "_id, name, label"
+                        }, spaceId);
+
+                        _.each(object.list_views, (listView)=>{
+                            if(!_.find(objectListViews, (dbListView)=>{ return dbListView.name === listView.name})){
+                                objectListViews.push(listView);
+                            }
+                        })
+                        object.list_views = objectListViews;
+                    }
+                })
+                const object = objects.find(function (obj) {
+                    return obj.name === objectName;
+                });
+                return object;
+            }
+        },
+        getRelatedObjects: {
+            async handler(ctx) {
+                const objectName = ctx.params.objectName;
+                const userSession = ctx.meta.user;
+                const lng = userSession.language || 'zh-CN';
+                const spaceId = userSession.spaceId;
+                const allMetadataObjects = await objectql.getSteedosSchema().getAllObject();
+                const allObjects = _.pluck(clone(allMetadataObjects), 'metadata');
+
+                const query = {
+                    filters: [ ['hidden', '!=', true] , ['name', '<>', ExcludeObjectNames]],
+                    projection: {
+                        name: 1, 
+                        label: 1, 
+                        list_views: 1,
+                        fields: 1
+                    }
+                };
+
+                let objects = objectql.getSteedosSchema().metadataDriver.find(allObjects, query, spaceId);
+                objects = objects.filter(function(object){
+                    let relatedFieldKey = _.findKey(object.fields, function(field){
+                        return (field.type === "lookup" || field.type === "master_detail") && field.reference_to === objectName;
+                    });
+                    return !!relatedFieldKey;
+                });
+
+                const dbListViews = await objectql.getObject('object_listviews').directFind({filters: [['shared', '!=', false]]})
+
                 _.each(objects, (object)=>{
                     if(object && object.name){
 

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

@@ -343,11 +343,17 @@ module.exports = {
                 if(field.type === 'select'){
                     return field.options;
                 }else if(field.reference_to){
-                    const records = await objectql.getObject(field.reference_to).find({filters: [[]]})
+                    let referenceTo = field.reference_to;
+                    let reference_to_field = field.reference_to_field || objectConfig._idFieldName || '_id'
+                    if(referenceTo === 'users'){
+                        referenceTo = 'space_users';
+                        reference_to_field = 'user'
+                    }
+                    const records = await objectql.getObject(referenceTo).find({filters: [[]]})
                     return _.map(records, (record)=>{
                         return {
                             label: record[objectConfig._NAME_FIELD_KEY || 'name'],
-                            value: record[objectConfig._idFieldName || '_id']
+                            value: record[reference_to_field]
                         };
                     })
                 }

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

@@ -127,6 +127,26 @@ module.exports = {
 
                 return { status: 0, data: { options } }
             },
+        },
+        getObjectsForGenerateTabsOptions: {
+            rest: {
+                method: "GET",
+                path: "/objects/generate_tabs_options"
+            },
+            async handler(ctx) {
+                const options = await this.getObjectsGenerateTabsOptions(ctx);
+                return { status: 0, data: { options } }
+            }
+        },
+        generateTabs: {
+            rest: {
+                method: "POST",
+                path: "/objects/generate/tabs"
+            },
+            async handler(ctx) {
+                const result = await this.generateTabs(ctx);
+                return { status: 0, data: result }
+            }
         }
     },
 
@@ -312,7 +332,10 @@ module.exports = {
                         type: "detail",
                     }
                 */
-                relatedLists = relatedLists.concat(_.union(object.details, object.lookup_details));
+                const relationsInfo = await object.getRelationsInfo();
+                const details = relationsInfo && relationsInfo.details;
+                const lookupDetails = relationsInfo && relationsInfo.lookup_details;
+                relatedLists = relatedLists.concat(_.union(details, lookupDetails));
 
                 if(objectConfig.enable_tasks){
                     relatedLists.push("tasks.related_to")
@@ -354,6 +377,123 @@ module.exports = {
                 })
                 return options;
             }
+        },
+        getObjectsGenerateTabsOptions: {
+            async handler(ctx) {
+                const userSession = ctx.meta.user;
+                const lng = userSession.language || 'zh-CN';
+                const spaceId = userSession.spaceId;
+                const objectTabs = await objectql.getObject('tabs').find({filters: [['type', '=', "object"]]});
+                const tabObjects = _.map(objectTabs, "object");
+                const allMetadataObjects = await objectql.getSteedosSchema().getAllObject();
+                const allObjects = _.map(clone(allMetadataObjects), 'metadata');
+                const query = {
+                    filters: [['hidden', '!=', true], ['name', '<>', tabObjects]],
+                    projection: {
+                        name: 1, 
+                        label: 1
+                    }
+                };
+                // 只列出未找到tabs记录的对象清单
+                const objects = objectql.getSteedosSchema().metadataDriver.find(allObjects, query, spaceId);
+
+                _.each(objects, (object)=>{
+                    if(object && object.name){
+                        steedosI18n.translationObject(lng, object.name, object)
+                    }
+                })
+                return _.map(objects, (object)=>{
+                    return {
+                        value: object.name,
+                        label: object.label || object.name
+                    }
+                });
+            }
+        },
+        generateTabs: {
+            async handler(ctx) {
+                let selectedObjects = ctx.params && ctx.params.objects && ctx.params.objects.split(",");
+                if(!selectedObjects || !selectedObjects.length){
+                    return {
+                        doneCount:0,
+                        errors: []
+                    }
+                }
+                const userSession = ctx.meta.user;
+                const lng = userSession.language || 'zh-CN';
+                const spaceId = userSession.spaceId;
+                const userId = userSession.userId;
+                const companyId = userSession.company_id;
+                const companyIds = userSession.company_ids;
+                const allMetadataObjects = await objectql.getSteedosSchema().getAllObject();
+                const allObjects = _.map(clone(allMetadataObjects), 'metadata');
+                const query = {
+                    filters: [['name', 'in', selectedObjects]], //['hidden', '!=', true] ,
+                    projection: {
+                        name: 1,
+                        label: 1
+                    }
+                };
+
+                const objects = objectql.getSteedosSchema().metadataDriver.find(allObjects, query, spaceId);
+
+                _.each(objects, (object) => {
+                    if (object && object.name) {
+                        steedosI18n.translationObject(lng, object.name, object)
+                    }
+                })
+                const errors = [];
+                let doneCount = 0;
+                for(let i = 0;i < objects.length; i++) {
+                    const object = objects[i];
+                    try{
+                        const existCount = await objectql.getObject('tabs').count({filters: [['object', '=', object.name]]});
+                        if(existCount > 0){
+                            return;
+                        }
+                        const tabLabel = object.label || object.name;
+                        const tabName = "object_" + object.name.replace(/__c$/, "");
+                        const now = new Date();
+                        const doc = {
+                            label: tabLabel, 
+                            name: tabName, 
+                            icon: object.icon,
+                            type: "object", 
+                            mobile: true,
+                            desktop: true,
+                            object: object.name,
+                            space: spaceId,
+                            owner: userId,
+                            created_by: userId,
+                            created: now,
+                            modified_by: userId,
+                            modified: now,
+                            company_id: companyId,
+                            company_ids: companyIds
+                        };
+                        const tab = await objectql.getObject('tabs').insert(doc);
+                        if(tab && tab._id){
+                            doneCount++;
+                        }
+                        else{
+                            errors.push({
+                                object: (object.label || object.name) + `(${object.name})`,
+                                message: ""
+                            });
+                        }
+                    }
+                    catch(ex){
+                        errors.push({
+                            object: (object.label || object.name) + `(${object.name})`,
+                            message: ex.message
+                        });
+                    }
+                };
+                return {
+                    doneCount:doneCount,
+                    errors: errors
+                }
+            }
         }
     }
 };

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/package.json

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

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;