@steedos/service-plugin-amis 2.4.0 → 2.4.1

package/main/default/client/amis.render.client.js

@@ -101,11 +101,11 @@
                               })
 
                               if (props.env.enableAMISDebug && schema) {
-                                console.groupCollapsed("steedos debug", `Render ${asset.componentName}`);
+                                console.groupCollapsed(`[steedos render ${comp.amis?.render.type}]`);
                                 console.trace('Component: ', props, 'Generated Amis Schema: ', schema);
                                 console.groupEnd();
                               }
-                              
+
                               return amisReact.createElement(amisReact.Fragment, null, amisReact.createElement(amisReact.Fragment, null, schema && render ? render('body', schema) : ''), amisReact.createElement(amisReact.Fragment, null, render ? render('body', body) : ''));
                             }
                           }

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

@@ -219,8 +219,63 @@ module.exports = {
                 const allMetadataObjects = await objectql.getSteedosSchema().getAllObject();
                 const allObjects = _.pluck(clone(allMetadataObjects), 'metadata');
 
+                const object = await objectql.getSteedosSchema().getObject(objectName);
+                const objectConfig = object.toConfig();
+                steedosI18n.translationObject(lng, objectConfig.name, objectConfig);
+
+                /*
+                    object.details是一个字符串，形如：testb__c.testa__c
+                    object.lookup_details是一个对象，格式如下：
+                    {
+                        key: "testd__c.testa__c",
+                        objectName: "testa__c",
+                        type: "detail",
+                    }
+                */
+                const relatedListObjects = [];
+                const relationsInfo = await object.getRelationsInfo();
+                const details = relationsInfo && relationsInfo.details;
+                // const lookupDetails = relationsInfo && relationsInfo.lookup_details;
+                // const relatedLists = _.union(details, lookupDetails);
+
+                _.each(details, function(related){
+                    /*related可能是一个lookup_details，它是对象而不是字符串，从中取出key值*/
+                    // if(typeof related !== "string"){
+                    //     relatedListObjects.push(related.objectName)
+                    // }
+                    let foo = related.split('.');
+                    let rObjectName = foo[0];
+                    relatedListObjects.push(rObjectName);
+                })
+
+                if(objectConfig.enable_files){
+                    relatedListObjects.push("cms_files")
+                }
+                if(objectConfig.enable_tasks){
+                    relatedListObjects.push("tasks")
+                }
+                if(objectConfig.enable_notes){
+                    relatedListObjects.push("notes")
+                }
+                if(objectConfig.enable_events){
+                    relatedListObjects.push("events")
+                }
+                if(objectConfig.enable_instances){
+                    relatedListObjects.push("instances")
+                }
+                if(objectConfig.enable_approvals){
+                    relatedListObjects.push("approvals")
+                }
+                if(objectConfig.enable_process){
+                    relatedListObjects.push("process_instance_history")
+                }
+                if(objectConfig.enable_audit){
+                    relatedListObjects.push("audit_records")
+                }
+
                 const query = {
-                    filters: [ ['hidden', '!=', true] , ['name', '<>', ExcludeObjectNames]],
+                    // filters: [ ['hidden', '!=', true] , ['name', '<>', ExcludeObjectNames]],
+                    filters: [ ['hidden', '!=', true] ],
                     projection: {
                         name: 1, 
                         label: 1, 
@@ -231,10 +286,7 @@ module.exports = {
 
                 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;
+                    return relatedListObjects.includes(object.name);
                 });
 
                 const dbListViews = await objectql.getObject('object_listviews').directFind({filters: [['shared', '!=', false]]})

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

@@ -1,21 +1,11 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-19 11:38:30
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-12-01 16:20:59
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-03-15 17:37:05
  * @Description: 
  */
-const AmisSchema = require('./utils/amis-schema');
-const objectql = require("@steedos/objectql");
-
-const callObjectServiceAction = async function(actionName, userSession, data){
-    const broker = objectql.getSteedosSchema().broker;
-    return broker.call(actionName, data || {}, { meta: { user: userSession}})
-}
-
-const getUISchema = async function(objectName, userSession){
-    return await callObjectServiceAction(`@${objectName}.getRecordView`, userSession);
-}
+const PageSchema = require('./utils/page-schema');
 
 module.exports = {
     name: "amis",
@@ -40,14 +30,14 @@ module.exports = {
             async handler(ctx) {
                 const userSession = ctx.meta.user;
                 const { type, app, objectApiName, recordId, formFactor } = ctx.params;
-                return this.getDefaultSchema({type, app, objectApiName, recordId, formFactor, userSession});
+                return this.getDefaultSchema({ type, app, objectApiName, recordId, formFactor, userSession });
             }
         },
         getInitSchema: {
             async handler(ctx) {
                 const userSession = ctx.meta.user;
                 const { type, objectApiName, formFactor } = ctx.params;
-                return this.getInitSchema({type, objectApiName, formFactor, userSession} );
+                return this.getInitSchema({ type, objectApiName, formFactor, userSession });
             }
         }
     },
@@ -64,7 +54,7 @@ module.exports = {
      */
     methods: {
         getDefaultSchema: {
-            handler({type, app, objectApiName, recordId, formFactor, userSession}) {
+            handler({ type, app, objectApiName, recordId, formFactor, userSession }) {
                 // if(type === 'list'){
                 //     return {
                 //         type: 'page',
@@ -98,23 +88,23 @@ module.exports = {
             }
         },
         getInitSchema: {
-            async handler({type, objectApiName, formFactor, userSession}) {
+            async handler({ type, objectApiName, formFactor, userSession }) {
 
-                const AmisLib = require('@steedos-widgets/amis-lib');
-                AmisLib.setUISchemaFunction(async function(objectName, force){
-                    return await getUISchema(objectName, userSession);
-                });
-                if(objectApiName){
+                // const AmisLib = require('@steedos-widgets/amis-lib');
+                // AmisLib.setUISchemaFunction(async function (objectName, force) {
+                //     return await getUISchema(objectName, userSession);
+                // });
+                if (objectApiName) {
                     let schema;
-                    switch(type){
+                    switch (type) {
                         case "form":
-                            schema = await AmisLib.getFormPageInitSchema(objectApiName);
+                            schema = PageSchema.getFormPageInitSchema(objectApiName)
                             break;
                         case "list":
-                            schema = await AmisLib.getListPageInitSchema(objectApiName);
+                            schema = PageSchema.getListPageInitSchema(objectApiName);
                             break;
                         case "record":
-                            schema = await AmisLib.getRecordPageInitSchema(objectApiName);
+                            schema = await PageSchema.getRecordPageInitSchema(objectApiName, userSession);
                             break;
                     }
                     return schema;

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

@@ -89,6 +89,16 @@ module.exports = {
                 return { status: 0, data: { options } }
             }
         },
+        getObjectDetailListsOptions: {
+            rest: {
+                method: "GET",
+                path: "/objects/:objectName/detailLists/options"
+            },
+            async handler(ctx) {
+                const options = await this.getObjectDetailListsOptions(ctx);
+                return { status: 0, data: { options } }
+            }
+        },
         getObjectRelatedListsOptions: {
             rest: {
                 method: "GET",
@@ -310,6 +320,35 @@ module.exports = {
                 })));
             }
         },
+        getObjectDetailListsOptions: {
+            async handler(ctx) {
+                const userSession = ctx.meta.user;
+                const lng = userSession.language || 'zh-CN';
+                const objectName = ctx.params.objectName;
+                const object = await objectql.getSteedosSchema().getObject(objectName);
+                const objectConfig = object.toConfig();
+                steedosI18n.translationObject(lng, objectConfig.name, objectConfig);
+
+                const options = [];
+                /*
+                    object.details是一个字符串，形如：testb__c.testa__c
+                */
+                const relationsInfo = await object.getRelationsInfo();
+                const details = relationsInfo && relationsInfo.details;
+
+                _.each(details, async function(related){
+                    if (!related) return;
+                    let foo = related.split('.');
+                    let rObjectName = foo[0];
+                    // let rFieldName = foo[1];
+                    const rObjectConfig = await objectql.getSteedosSchema().getObject(rObjectName).toConfig();
+                    steedosI18n.translationObject(lng, rObjectConfig.name, rObjectConfig);
+                    let rObjectLable = rObjectConfig.label;
+                    options.push({label: rObjectLable, value: rObjectName})
+                })
+                return options;
+            }
+        },
         getObjectRelatedListsOptions: {
             async handler(ctx) {
                 const userSession = ctx.meta.user;

package/main/default/services/utils/page-schema.js

@@ -0,0 +1,174 @@
+
+const objectql = require("@steedos/objectql");
+
+const callObjectServiceAction = async function (actionName, userSession, data) {
+    const broker = objectql.getSteedosSchema().broker;
+    return broker.call(actionName, data || {}, { meta: { user: userSession } })
+}
+
+const getUISchema = async function (objectName, userSession) {
+    return await callObjectServiceAction(`@${objectName}.getRecordView`, userSession);
+}
+
+const getScopeId = function (objectApiName, type) {
+    return `page_${objectApiName}_${type}`;
+}
+
+// 获取对象表单初始化amisSchema
+const getFormPageInitSchema = function (objectApiName) {
+    const amisSchema = {
+        "type": "steedos-object-form",
+        "label": "对象表单",
+        "objectApiName": objectApiName,
+        "recordId": "${recordId}",
+        "className": "sm:border sm:shadow sm:rounded sm:border-gray-300 bg-white p-4",
+        "id": "u:b3d626885b90",
+        "mode": "edit",
+        "layout": "normal"
+    };
+    return {
+        type: 'page',
+        name: getScopeId(objectApiName, "form"),
+        bodyClassName: '',
+        regions: [
+            "body"
+        ],
+        body: [
+            amisSchema
+        ]
+    }
+}
+
+// 获取对象列表页面初始化amisSchema
+const getListPageInitSchema = function (objectApiName) {
+    return {
+        type: 'page',
+        name: getScopeId(objectApiName, "list"),
+        bodyClassName: '',
+        regions: [
+            "body"
+        ],
+        body: [{
+            "type": "steedos-object-listview",
+            "objectApiName": objectApiName,
+            "columnsTogglable": false,
+            "showHeader": true,
+            className: "sm:border bg-white sm:shadow sm:rounded border-slate-300 border-solid"
+        }]
+    }
+}
+
+// 获取对象记录详细页面初始化amisSchema
+const getRecordPageInitSchema = async function (objectApiName, userSession) {
+    var body = [];
+    const uiSchema = await getUISchema(objectApiName, userSession);
+    const hasRelatedLists = !!((uiSchema.related_lists || []).length || (uiSchema.details || []).length)
+    const detailed = {
+        "title": "详细",
+        "className": "px-0 py-4",
+        "body": [
+            {
+                "type": "steedos-object-form",
+                "label": "对象表单",
+                "objectApiName": "${objectName}",
+                "recordId": "${recordId}",
+                "appId": "${appId}"
+            }
+        ],
+        "id": "u:5d4e7e3f6ecc"
+    };
+    const related = {
+        "title": "相关",
+        "className": "px-0 pt-4",
+        "body": [
+            {
+                "type": "steedos-object-related-lists",
+                "label": "相关列表",
+                "objectApiName": "${objectName}",
+                "recordId": "${recordId}",
+                "appId": "${appId}"
+            }
+        ]
+    }
+    const content = {
+        "type": "tabs",
+        "className": "sm:mt-3 bg-white sm:shadow sm:rounded sm:border border-slate-300 p-4",
+        "tabs": [
+            detailed
+        ]
+    };
+    if (hasRelatedLists) {
+        content.tabs.push(related)
+    }
+    const amisSchema = {
+        "type": "service",
+        "body": [
+            {
+                "type": "steedos-record-detail-header",
+                "label": "标题面板",
+                "objectApiName": "${objectName}",
+                "recordId": "${recordId}",
+                onEvent: {
+                    "recordLoaded": {
+                        "actions": [
+                            {
+                                "actionType": "reload",
+                                "data": {
+                                    "name": `\${event.data.record.${uiSchema?.NAME_FIELD_KEY || 'name'}}`,
+                                    "record": `\${event.data.record}`,
+                                    "recordLoaded": true,
+                                }
+                            },
+                            {
+                                "actionType": "reload",
+                                "componentId": `page_readonly_${objectApiName}_header`,  //刷新标题, 详细页面header service 嵌套太多, 导致仅刷新第一层service无法更新recordName
+                                "data": {
+                                    "name": `\${event.data.record.${uiSchema?.NAME_FIELD_KEY || 'name'}}`,
+                                    "record": `\${event.data.record}`,
+                                    "recordLoaded": true,
+                                }
+                            }
+                        ]
+                    }
+                },
+            },
+            content
+        ],
+        data: {
+            "_master.objectName": "${objectName}",
+            "_master.recordId": "${recordId}"
+        },
+        onEvent: {
+            "recordLoaded": {
+                "actions": [
+                    {
+                        "actionType": "reload",
+                        "data": {
+                            "name": `\${record.${uiSchema?.NAME_FIELD_KEY || 'name'}}`,
+                            "_master.record": `\${record}`,
+                            // 不清楚reload 如何给对象下的某个key复制, 所以此处重复设置_master的objectName、recordId
+                            "_master.objectName": "${objectName}",
+                            "_master.recordId": "${recordId}"
+                        }
+                    }
+                ]
+            }
+        },
+    }
+    body.push(amisSchema);
+    return {
+        type: 'page',
+        id: `page_${objectApiName}_record_detail`,
+        name: getScopeId(objectApiName, "record_detail"),
+        bodyClassName: '',
+        regions: [
+            "body"
+        ],
+        body
+    }
+}
+
+
+exports.getFormPageInitSchema = getFormPageInitSchema;
+exports.getListPageInitSchema = getListPageInitSchema;
+exports.getRecordPageInitSchema = getRecordPageInitSchema;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "main": "package.service.js",
   "scripts": {
     "build": "yarn build:tailwind-base && yarn build:tailwind",
@@ -13,10 +13,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "dependencies": {
-    "@steedos-widgets/amis-lib": "^1.0.22"
-  },
-  "gitHead": "70a4e7417d8d86c47cf5c7e3bbe0e89f2cee4222",
+  "gitHead": "ae77c1ed63399245141bf7237cd3966bfc4dc6b1",
   "devDependencies": {
     "tailwindcss": "3.2.4"
   }