@steedos-widgets/amis-lib 1.2.0-beta.0 → 1.2.0-beta.1

package/dist/index.esm.js

@@ -1,7 +1,7 @@
 import * as _$1 from 'lodash';
 import ___default, { isEmpty, isArray, each, find, endsWith, cloneDeep, includes, get, map, keys, sortBy, compact, toArray, mergeWith, isBoolean, omitBy, isNil, isString, slice, defaultsDeep as defaultsDeep$1, isObject as isObject$1, has, filter, startsWith } from 'lodash';
-import isPlainObject from 'lodash/isPlainObject';
 import { Router as Router$1, getSteedosAuth as getSteedosAuth$1, lookupToAmis as lookupToAmis$1, fetchAPI as fetchAPI$1 } from '@steedos-widgets/amis-lib';
+import isPlainObject from 'lodash/isPlainObject';
 
 /*
  * @Author: baozhoutao@steedos.com
@@ -652,11 +652,7 @@ function getRecordPermissionsTemplate(){
 }
 
 async function getFindOneQuery$1(object, recordId, fields, options){
-    let queryOptions = "";
-    
-    if(recordId){
-        queryOptions = `(filters:["${object.idFieldName}", "=", "${recordId}"])`;
-    }
+    let queryOptions = `(filters:["${object.idFieldName}", "=", "\${recordId}"])`;
     let alias = "data";
     if(options){
         if(options.alias){
@@ -1365,8 +1361,8 @@ var config = {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:51:00
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-03-27 15:42:24
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-04-08 12:05:19
  * @Description: 
  */
 
@@ -1384,6 +1380,32 @@ const getSchema$4 = async (uiSchema, ctx) => {
         if (payload && payload.schema) {
             formSchema = _.isString(payload.schema) ? JSON.parse(payload.schema) : payload.schema;
         }
+
+        const _master = api.body._master;
+        if(_master && _master._isRelated){
+            const relatedKey = _master.relatedKey;
+            const masterObjectName = _master.objectName;
+            const recordId = _master.recordId;
+            const fields = ${JSON.stringify(uiSchema.fields)};
+            const relatedField = fields[relatedKey];
+            let defaultData = {}; 
+            let relatedKeyValue; 
+            if(!_.isString(relatedField.reference_to)){
+                relatedKeyValue = { o: masterObjectName, ids: [recordId] };
+            }else if (relatedField.multiple) {
+                relatedKeyValue = [recordId];
+            } else {
+                relatedKeyValue = recordId;
+            }
+            defaultData[relatedKey]=relatedKeyValue;
+            if(payload.schema){
+                // 表单微页面第一层要求是page
+                formSchema.data.defaultData = defaultData;
+            }else{
+                formSchema.defaultData = defaultData;
+            }
+        }
+
         return {
             data: formSchema
         };
@@ -1407,6 +1429,8 @@ const getSchema$4 = async (uiSchema, ctx) => {
                                     "data": {
                                         "$master": "$$",
                                         "_master": "${_master}",
+                                        "_master._isRelated": "${_isRelated}",
+                                        "_master.relatedKey": "${relatedKey}",
                                         "defaultData": "${defaultData}",
                                         "appId": "${appId}",
                                         "objectName": "${objectName}",
@@ -1425,7 +1449,8 @@ const getSchema$4 = async (uiSchema, ctx) => {
                                             "messages": {},
                                             "schemaApi": {
                                                 "data": {
-                                                    "isLookup": "${isLookup}"
+                                                    "isLookup": "${isLookup}",
+                                                    "_master": "${_master}"
                                                 },
                                                 "url": "${context.rootUrl}/api/pageSchema/form?app=${appId}&objectApiName=${objectName}&formFactor=${formFactor}",
                                                 "method": "get",
@@ -1548,8 +1573,8 @@ const getSchema$3 = async (uiSchema, ctx) => {
 /*
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-03-22 09:31:21
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-03-28 14:06:47
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-04-06 16:04:20
  */
 const getSchema$2 = (uiSchema)=>{
     return {
@@ -1579,15 +1604,11 @@ const getSchema$2 = (uiSchema)=>{
                                     },
                                     "adaptor": `
                                         if(payload.errors){
-                                            payload.status = 2;
-                                            payload.msg = payload.errors[0].message;
+                                          payload.status = 2;
+                                          payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
                                         }
                                         return payload;
                                     `,
-                                },
-                                "messages": {
-                                    "success": "删除成功",
-                                    "failed": "删除失败"
                                 }
                               },
                               "actionType": "ajax"
@@ -1950,7 +1971,7 @@ const StandardButtons = {
     getStandardNew: async (uiSchema, ctx)=>{
         return {
             type: 'amis_button',
-            amis_schema: await getSchema$4()
+            amis_schema: await getSchema$4(uiSchema)
         }
     },
     getStandardEdit: async (uiSchema, ctx)=>{
@@ -2034,7 +2055,7 @@ function getButtonVisibleOn$1(button){
         if(visible.trim().startsWith('function')){
             return `${visible}.apply({
                 object: uiSchema
-            }, [objectName, _id, typeof record === 'undefined' ? (typeof recordPermissions === 'undefined' ? {} : recordPermissions) : record.recordPermissions, data])`
+            }, [objectName, typeof _id === 'undefined' ? null: _id, typeof record === 'undefined' ? (typeof recordPermissions === 'undefined' ? {} : recordPermissions) : record.recordPermissions, data])`
         }
         return visible;
     }
@@ -3164,9 +3185,8 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
 
   let body = [
     {
-      "type": "service",
-      "id": `page_readonly_${name}_header`,
-      data: { "&":"$$", objectName: name, _id: recordId, recordPermissions: "${record.recordPermissions}", uiSchema: objectSchema},
+      "type": "wrapper",
+      "className": "p-0",
       "body": [
         {
           "type": "grid",
@@ -3174,14 +3194,14 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
           "className": "flex justify-between"
         }
       ],
-      "messages": {},
       "hiddenOn": "${recordLoaded != true}"
     }
   ];
 
   if(showRecordTitle){
     body.push({
-      "type": "service",
+      "type": "wrapper",
+      "className": "p-0",
       "body": [
         {
           "type": "grid",
@@ -3189,16 +3209,15 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
           "className": "flex justify-between"
         }
       ],
-      "messages": {},
       "hiddenOn": "${recordLoaded == true}"
     });
   }
 
   return {
     type: 'service',
-    bodyClassName: '',
+    id: `page_readonly_${name}_header`,
     name: `page`,
-    data: { "&":"$$", objectName: name, _id: recordId, recordPermissions: objectSchema.permissions, uiSchema: objectSchema, record: "${record}"},
+    data: { objectName: name, _id: recordId, recordPermissions: objectSchema.permissions, uiSchema: objectSchema, record: "${record}" },
     body: body, 
     className: ''
   }
@@ -3253,7 +3272,7 @@ async function getObjectRecordDetailRelatedListHeader(relatedObjectSchema, relat
                     "body": [
                       {
                         "type": "tpl",
-                        "tpl": `<a class="text-black text-base font-bold" href="/app/\${appId}/\${masterObjectName}/\${masterRecordId}/\${objectName}/grid?related_field_name=\${relatedKey}">${relatedLabel}(\${$count})</a>`,
+                        "tpl": `<a class="text-black text-base font-bold" href="/app/\${appId}/\${_master.objectName}/\${_master.recordId}/\${objectName}/grid?related_field_name=\${relatedKey}">${relatedLabel}(\${$count})</a>`,
                         "inline": false,
                         "wrapperComponent": "",
                         "className": "",
@@ -3294,17 +3313,22 @@ async function getObjectRecordDetailRelatedListHeader(relatedObjectSchema, relat
 async function getObjectRelatedListHeader(objectSchema, recordId, relatedObjectName) {
 }
 
-const getDisplayAsButton = function(showDisplayAs){
+const getDisplayAsButton = function(objectName, showDisplayAs){
+  let displayAs = Router$1.getTabDisplayAs(objectName);
   let buttons = [
     {
       "type": "button",
       "label": "表格",
-      "onClick": "const url = document.location.pathname + '?display=grid'; props.env.jumpTo(url);"
+      "onClick": "let url = document.location.pathname; var urlSearch = new URLSearchParams(document.location.search); if(urlSearch.get(\"side_object\") && urlSearch.get(\"side_listview_id\")){url=`/app/${props.data.appId}/${urlSearch.get(\"side_object\")}/grid/${urlSearch.get(\"side_listview_id\")}`;}; props.env.jumpTo(url + '?display=grid');",
+      "rightIcon": displayAs != 'split' ? "fa fa-check" : null,
+      "rightIconClassName": "m-l-sm"
     },
     {
       "type": "button",
       "label": "分栏视图",
-      "onClick": "const url = document.location.pathname + '?display=split'; props.env.jumpTo(url);"
+      "onClick": "const url = document.location.pathname + '?display=split'; props.env.jumpTo(url);",
+      "rightIcon": displayAs === 'split' ? "fa fa-check" : null,
+      "rightIconClassName": "m-l-sm"
     }
   ];
   return {
@@ -3446,7 +3470,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
           }
         }
       },
-      showDisplayAs? getDisplayAsButton() : {}
+      showDisplayAs? getDisplayAsButton(mainObject?.name) : {}
   ]
   }else {
     return [
@@ -3527,7 +3551,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
           }
         }
       },
-      showDisplayAs? getDisplayAsButton() : {}
+      showDisplayAs? getDisplayAsButton(showDisplayAs) : {}
       // {
       //   "type": "search-box",
       //   "align": "right",
@@ -3817,13 +3841,14 @@ function getLookupSapceUserTreeSchema(){
           "headers": {
             "Authorization": "Bearer ${context.tenantId},${context.authToken}"
           },
-          "adaptor": "        const records = payload.data.options;\n        const treeRecords = [];\n        const getChildren = (records, childrenIds) => {\n                if (!childrenIds) {\n                        return;\n                }\n                const children = _.filter(records, (record) => {\n                        return _.includes(childrenIds, record.value)\n                });\n                _.each(children, (item) => {\n                        if (item.children) {\n                                item.children = getChildren(records, item.children)\n                        }\n                })\n                return children;\n        }\n\n        const getRoot = (records) => {\n                for (var i = 0; i < records.length; i++){\n                        records[i].noParent = 0;\n                        if (!!records[i].parent) {\n                                biaozhi = 1\n                                for (var j = 0; j < records.length; j++){\n                                        if (records[i].parent == records[j].value)\n                                                biaozhi = 0;\n                                }\n                                if (biaozhi == 1) records[i].noParent = 1;\n                        } else records[i].noParent = 1;\n                }\n        }\n        getRoot(records);\n        console.log(records)\n\n        _.each(records, (record) => {\n                if (record.noParent ==1) {\n                        treeRecords.push(Object.assign({}, record, { children: getChildren(records, record.children) }));\n                }\n        });\n        console.log(treeRecords)\n\n        payload.data.options = treeRecords;\n        return payload;\n    ",
+          "adaptor": "if (payload.data.treeCache == true) {\n                return payload;\n        }\n        const records = payload.data.options;\n        const treeRecords = [];\n        const getChildren = (records, childrenIds) => {\n                if (!childrenIds) {\n                        return;\n                }\n                const children = _.filter(records, (record) => {\n                        return _.includes(childrenIds, record.value)\n                });\n                _.each(children, (item) => {\n                        if (item.children) {\n                                item.children = getChildren(records, item.children)\n                        }\n                })\n                return children;\n        }\n\n        const getRoot = (records) => {\n                for (var i = 0; i < records.length; i++){\n                        records[i].noParent = 0;\n                        if (!!records[i].parent) {\n                                biaozhi = 1\n                                for (var j = 0; j < records.length; j++){\n                                        if (records[i].parent == records[j].value)\n                                                biaozhi = 0;\n                                }\n                                if (biaozhi == 1) records[i].noParent = 1;\n                        } else records[i].noParent = 1;\n                }\n        }\n        getRoot(records);\n        console.log(records)\n\n        _.each(records, (record) => {\n                if (record.noParent ==1) {\n                        treeRecords.push(Object.assign({}, record, { children: getChildren(records, record.children) }));\n                }\n        });\n        console.log(treeRecords)\n\n        payload.data.options = treeRecords;\n       payload.data.treeCache = true;\n       return payload;\n    ",
           "requestAdaptor": "\n    ",
           "data": {
             "query": "{options:organizations(filters:[\"hidden\", \"!=\", true],sort:\"sort_no desc\"){value:_id label:name,parent,children}}"
           },
           "messages": {
-          }
+          },
+          "cache": 300000
         },
         "onEvent": {
           "change": {
@@ -4214,20 +4239,20 @@ async function lookupToAmisSelect(field, readonly, ctx){
 
     if(referenceTo){
         // 字段值单独走一个请求合并到source的同一个GraphQL接口中
-        const defaultValueOptionsQueryData = await getFindQuery({ name: referenceTo.objectName }, null, {
-            [referenceTo.labelField.name]: Object.assign({}, referenceTo.labelField, {alias: 'label'}),
-            [referenceTo.valueField.name]: Object.assign({}, referenceTo.valueField, {alias: 'value'})
-        }, {
+        const defaultValueOptionsQueryData = await getFindQuery({ name: referenceTo.objectName }, null, [
+            Object.assign({}, referenceTo.labelField, {alias: 'label'}),
+            Object.assign({}, referenceTo.valueField, {alias: 'value'})
+        ], {
             alias: "defaultValueOptions",
             filters: "{__options_filters}",
             count: false
         });
         apiInfo = await getApi$1({
             name: referenceTo.objectName
-        }, null, {
-            [referenceTo.labelField.name]: Object.assign({}, referenceTo.labelField, {alias: 'label'}),
-            [referenceTo.valueField.name]: Object.assign({}, referenceTo.valueField, {alias: 'value'})
-        }, {expand: false, alias: 'options', queryOptions: `filters: {__filters}, top: {__top}, sort: "{__sort}"`, moreQueries: [defaultValueOptionsQueryData.query]});
+        }, null, [
+            Object.assign({}, referenceTo.labelField, {alias: 'label'}),
+            Object.assign({}, referenceTo.valueField, {alias: 'value'})
+        ], {expand: false, alias: 'options', queryOptions: `filters: {__filters}, top: {__top}, sort: "{__sort}"`, moreQueries: [defaultValueOptionsQueryData.query]});
 
         apiInfo.adaptor = `
             const data = payload.data;
@@ -5388,8 +5413,9 @@ function getReadonlyFormAdaptor(fields){
 async function getReadonlyFormInitApi(object, recordId, fields, options){
     return {
         method: "post",
-        url: getApi$2()+"?rf="+ (new Date()).getTime(),
+        url: getApi$2()+"&recordId=${recordId}",
         cache: API_CACHE,
+        // requestAdaptor: "console.log('getReadonlyFormInitApi requestAdaptor', api);return api;",
         adaptor: getReadonlyFormAdaptor(fields),
         data: await getFindOneQuery$1(object, recordId, fields, options),
         headers: {
@@ -5496,6 +5522,7 @@ async function getEditFormInitApi(object, recordId, fields, options){
     data.global = "${global}";
     data.context = "${context}";
     data.defaultData = "${defaultData}";
+
     return {
         method: "post",
         url: getApi$2(),
@@ -5864,7 +5891,7 @@ async function getObjectCRUD(objectSchema, fields, options){
         keepItemSelectionOnPageChange: true, 
         api: await getTableApi(objectSchema, fields, options),
         hiddenOn: options.tableHiddenOn,
-        autoFillHeight: true,
+        autoFillHeight: options.isRelated ? false : true,
         className: `flex-auto ${crudClassName || ""}`,
         crudClassName: crudClassName,
       }, 
@@ -5907,11 +5934,11 @@ async function getObjectCRUD(objectSchema, fields, options){
       id: `service_${id}`,
       name: `page`,
       data: {
-        objectName: objectSchema.name,
-        _id: null,
+        // objectName: objectSchema.name,
+        // _id: null,
         recordPermissions: objectSchema.permissions,
         uiSchema: objectSchema,
-        loaded: false //crud接收适配器中设置为true，否则就是刷新浏览器第一次加载
+        // loaded: false //crud接收适配器中设置为true，否则就是刷新浏览器第一次加载
       },
       body: body
     }
@@ -6024,6 +6051,10 @@ async function getObjectForm(objectSchema, ctx){
                   "objectName": "${_master.objectName}"
                 },
                 "expression": `\${_master.objectName != '${objectSchema.name}' && _master.objectName}`
+              },
+              {
+                "args": {},
+                "actionType": "closeDialog"
               }
             ]
           }
@@ -6370,7 +6401,7 @@ function getButtonVisibleOn(button){
         //     return 'false';
         // }
         if(visible.trim().startsWith('function')){
-            return `${visible}(objectName, _id, typeof record === 'undefined' ? (typeof recordPermissions === 'undefined' ? {} : recordPermissions) : record.recordPermissions, data)`
+            return `${visible}(objectName, typeof _id === 'undefined' ? null: _id, typeof record === 'undefined' ? (typeof recordPermissions === 'undefined' ? {} : recordPermissions) : record.recordPermissions, data)`
         }
         return visible;
     }
@@ -6535,6 +6566,11 @@ async function getTableApi(mainObject, fields, options){
 
     let valueField = mainObject.key_field || '_id';
     const api = await getApi(mainObject, null, fields, {count: options.queryCount, alias: 'rows', limit: top, queryOptions: `filters: {__filters}, top: {__top}, skip: {__skip}, sort: "{__sort}"`});
+
+    if(options.isRelated){
+        api.url += "&recordId=${recordId}";
+    }
+
     api.data.$term = "$term";
     api.data.$self = "$$";
     api.data.filter = "$filter";
@@ -6654,11 +6690,36 @@ async function getTableApi(mainObject, fields, options){
         if(!_.isEmpty(systemFilters)){
             filters = systemFilters;
         };
-
         if(api.data.$self.additionalFilters){
             userFilters.push(api.data.$self.additionalFilters)
         }
 
+        if(api.data.$self._isRelated){
+            const self = api.data.$self;
+            const relatedKey = self.relatedKey;
+            const recordId = self.recordId;
+            const refField = self.uiSchema.fields[relatedKey];
+            const masterRecord = self._master.record;
+            const masterObjectName = self._master.objectName;
+            let relatedValue = recordId;
+            if(refField.reference_to_field && refField.reference_to_field != '_id'){
+                relatedValue = masterRecord[refField.reference_to_field]
+            }
+            let relatedFilters;
+            if (
+                refField._reference_to ||
+                (refField.reference_to && !_.isString(refField.reference_to))
+            ) {
+                relatedFilters = [
+                    [relatedKey + "/o", "=", masterObjectName],
+                    [relatedKey + "/ids", "=", relatedValue],
+                ];
+            } else {
+                relatedFilters = [relatedKey, "=", relatedValue];
+            }
+            userFilters.push(relatedFilters)
+        }
+
         if(!_.isEmpty(userFilters)){
             if(_.isEmpty(filters)){
                 filters = userFilters;
@@ -6781,7 +6842,7 @@ async function getApi(object, recordId, fields, options){
     const data = await getFindQuery(object, recordId, fields, options);
     return {
         method: "post",
-        url: getApi$2(),
+        url: getApi$2(), // + "&recordId=${recordId}"
         data: data,
         headers: {
             Authorization: "Bearer ${context.tenantId},${context.authToken}"
@@ -7415,8 +7476,8 @@ const getRecordPermissions = async (objectName, recordId)=>{
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-03-30 17:44:53
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-04-08 18:14:55
  * @Description:
  */
 
@@ -7488,7 +7549,7 @@ async function getObjectRelatedList(
 
 // 获取单个相关表
 async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObjectName, relatedKey, ctx){
-    let { top, perPage, hiddenEmptyTable, appId, relatedLabel, className, columns, sort, filters, visible_on } = ctx;
+    let { top, perPage, appId, relatedLabel, className, columns, sort, filters, visible_on } = ctx;
     // console.log('getRecordDetailRelatedListSchema==>',objectName,recordId,relatedObjectName)
     const relatedObjectUiSchema = await getUISchema(relatedObjectName);
     if(!relatedObjectUiSchema){
@@ -7523,6 +7584,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         relatedKey = mainRelated[relatedObjectName];
     }
     let globalFilter = null;
+    // TODO: refField变量去掉，写到amis运行时脚本中，uiSchema.fields[relatedKey];可以取到
     const refField = await getField(relatedObjectName, relatedKey);
 
     if(!refField){
@@ -7538,23 +7600,23 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         }
     }
 
-    let relatedValue = recordId;
-    if(refField.reference_to_field && refField.reference_to_field != '_id'){
-        const masterRecord = await getRecord(objectName, recordId, [refField.reference_to_field]);
-        relatedValue = masterRecord[refField.reference_to_field];
-    }
+    let relatedValue = "${recordId}";
+    // if(refField.reference_to_field && refField.reference_to_field != '_id'){
+    //     const masterRecord = await getRecord(objectName, recordId, [refField.reference_to_field]);
+    //     relatedValue = masterRecord[refField.reference_to_field]
+    // }
     
-    if (
-        refField._reference_to ||
-        (refField.reference_to && !isString(refField.reference_to))
-    ) {
-        globalFilter = [
-            [`${relatedKey}/o`, "=", objectName],
-            [`${relatedKey}/ids`, "=", relatedValue],
-        ];
-    } else {
-        globalFilter = [`${relatedKey}`, "=", relatedValue];
-    }
+    // if (
+    //     refField._reference_to ||
+    //     (refField.reference_to && !isString(refField.reference_to))
+    // ) {
+    //     globalFilter = [
+    //         [`${relatedKey}/o`, "=", objectName],
+    //         [`${relatedKey}/ids`, "=", relatedValue],
+    //     ];
+    // } else {
+    //     globalFilter = [`${relatedKey}`, "=", relatedValue];
+    // }
     const recordRelatedListHeader = await getObjectRecordDetailRelatedListHeader(relatedObjectUiSchema, relatedLabel);
     const componentId = `steedos-record-related-list-${relatedObjectName}`;
     const options = {
@@ -7579,9 +7641,9 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         top: top,
         perPage: perPage,
         setDataToComponentId: componentId,
-        tableHiddenOn: hiddenEmptyTable ? "this.$count === 0" : null,
+        // tableHiddenOn: hiddenEmptyTable ? "this.$count === 0" : null,
         appId: appId,
-        crudClassName: 'border-t border-slate-300',
+        crudClassName: 'border-t border-slate-300 hidden',
         ...ctx
     };
     const amisSchema= (await getRelatedListSchema(relatedObjectName, 'all', options)).amisSchema;
@@ -7593,15 +7655,9 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         amisSchema: {
             type: "service",
             id: componentId,
-            className: `steedos-record-related-list rounded border border-slate-300 bg-gray-100 mb-4 ${className}`,
+            className: `steedos-record-related-list ${componentId} rounded border border-slate-300 bg-gray-100 mb-4 ${className}`,
             data: {
-                "&": "$$",
-                appId: "${appId}",
-                app_id: "${appId}",
-                masterObjectName: objectName,
-                masterRecordId: "${recordId}",
                 relatedKey: relatedKey,   
-                objectName: relatedObjectName,
                 listViewId: `amis-\${appId}-${relatedObjectName}-listview`,
                 _isRelated: true
             },
@@ -7609,12 +7665,6 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
                 {
                     ...amisSchema,
                     data: {
-                        "&": "$$",
-                        appId: "${appId}",
-                        app_id: "${appId}",
-                        relatedKey: relatedKey,
-                        objectName: "${objectName}",
-                        recordId: "${masterRecordId}",
                         defaultData: {
                             ...{[relatedKey]: getRelatedFieldValue(objectName, relatedValue, relatedObjectUiSchema, relatedKey)}
                         }
@@ -7658,13 +7708,13 @@ function getDefaultRelatedListProps(uiSchema, listName, ctx) {
         columns = getListViewColumns(listView, ctx.formFactor);
         sort = getListViewSort(listView);
         filter = getListViewFilter(listView);
-        if(isArray(ctx.globalFilter) && ctx.globalFilter.length && isArray(filter) && filter.length){
-            // 都有值
-            filter = [ctx.globalFilter, 'and', filter];
-        }else if(ctx.globalFilter && (!filter || !filter.length)){
-            // globalFilter有值，filter无值
-            filter = ctx.globalFilter;
-        }
+        // if(isArray(ctx.globalFilter) && ctx.globalFilter.length && isArray(filter) && filter.length){
+        //     // 都有值
+        //     filter = [ctx.globalFilter, 'and', filter]
+        // }else if(ctx.globalFilter && (!filter || !filter.length)){
+        //     // globalFilter有值，filter无值
+        //     filter = ctx.globalFilter;
+        // }
         filtersFunction = listView && listView._filters;
     }else {
         const isNameField = find(
@@ -7674,9 +7724,9 @@ function getDefaultRelatedListProps(uiSchema, listName, ctx) {
             }
         );
         columns = isNameField ? [isNameField.name] : ['name'];
-        if(ctx.globalFilter){
-            filter = ctx.globalFilter;
-        }
+        // if(ctx.globalFilter){
+        //     filter = ctx.globalFilter;
+        // }
     }
 
     return {
@@ -7700,7 +7750,7 @@ function getRelatedListProps(uiSchema, listViewName, ctx) {
         return {
             columns: ctx.columns,
             sort,
-            filter: ctx.globalFilter,
+            // filter: ctx.globalFilter,
             filtersFunction: filtersFunction
         }
     } else {
@@ -7739,6 +7789,16 @@ async function getRelatedListSchema(
     delete ctx.filters;
 
     delete ctx.globalFilter;
+
+    const adaptor = `
+        if(setDataToComponentId){
+            if(payload.data.count){
+                setTimeout(function(){
+                    window.$("." + setDataToComponentId + " .antd-Crud").removeClass("hidden");
+                }, 10);
+            }
+        };
+    `;
     const amisSchema = {
         "type": "steedos-object-table",
         "objectApiName": objectName,
@@ -7747,6 +7807,8 @@ async function getRelatedListSchema(
         "filters": listviewFilter,
         "filtersFunction": filtersFunction,
         "sort": listViewSort,
+        "filterVisible": false,
+        adaptor,
         "ctx": ctx
     };
     // console.log(`getRelatedListSchema amisSchema`, amisSchema);
@@ -7759,8 +7821,8 @@ async function getRelatedListSchema(
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-03-11 17:02:30
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-04-08 17:31:57
  * @Description:
  */
 
@@ -7932,14 +7994,14 @@ async function getField(objectName, fieldName) {
 async function getFormSchema(objectName, ctx) {
     const uiSchema = await getUISchema(objectName);
     const amisSchema = await getObjectForm(uiSchema, ctx);
-    // console.log(`getFormSchema====>`, amisSchema)
+    console.log(`getFormSchema====>`, amisSchema);
     return {
         uiSchema,
         amisSchema,
     };
 }
 
-// 获取只读页面
+// 获取只读页面 recordId 已废弃, 函数签名保持不变, 但recordId变量不可再使用, 请使用运行时的${recordId}
 async function getViewSchema(objectName, recordId, ctx) {
     const uiSchema = await getUISchema(objectName);
     const amisSchema = await getObjectDetail(uiSchema, recordId, ctx);
@@ -8124,6 +8186,7 @@ async function getTableSchema(
         headerToolbarItems: ctx.headerToolbarItems,
         buttons: await getListViewItemButtons(uiSchema, ctx)
     });
+    // console.log('getTableSchema====>amisSchema', amisSchema)
     return {
         uiSchema,
         amisSchema,
@@ -8222,15 +8285,8 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
                                 "data": {
                                     "name": `\${event.data.record.${uiSchema?.NAME_FIELD_KEY || 'name'}}`,
                                     "record": `\${event.data.record}`,
-                                    "recordLoaded": true,
-                                }
-                            },
-                            {
-                                "actionType": "reload",
-                                "componentId": `page_readonly_${objectName}_header`,  //刷新标题, 详细页面header service 嵌套太多, 导致仅刷新第一层service无法更新recordName
-                                "data": {
-                                    "name": `\${event.data.record.${uiSchema?.NAME_FIELD_KEY || 'name'}}`,
-                                    "record": `\${event.data.record}`,
+                                    "_id": "\${event.data.record._id}",
+                                    "recordId": "\${event.data.record._id}",
                                     "recordLoaded": true,
                                 }
                             }
@@ -8240,10 +8296,10 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
               },
               content
             ],
-            data: {
-                "_master.objectName": "${objectName}",  
-                "_master.recordId": "${recordId}"
-            },
+            // data: {
+            //     "_master.objectName": "${objectName}",  
+            //     "_master.recordId": "${recordId}"
+            // },
             onEvent: {
                 "recordLoaded": {
                     "actions": [
@@ -8251,10 +8307,10 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
                             "actionType": "reload",
                             "data": {
                                 "name": `\${record.${uiSchema.NAME_FIELD_KEY || 'name'}}`,
-                                "_master.record": `\${record}`, 
-                                // 不清楚reload 如何给对象下的某个key复制, 所以此处重复设置_master的objectName、recordId
-                                "_master.objectName": "${objectName}", 
-                                "_master.recordId": "${recordId}"
+                                // "_master.record": `\${record}`, 
+                                // // 不清楚reload 如何给对象下的某个key复制, 所以此处重复设置_master的objectName、recordId
+                                // "_master.objectName": "${objectName}", 
+                                // "_master.recordId": "${recordId}"
                             }
                         }
                     ]
@@ -8265,51 +8321,6 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
     }
 }
 
-// export async function getRecordDetailRelatedListSchema(objectName,recordId,relatedObjectName){
-//     // console.log('b==>',objectName,recordId,relatedObjectName)
-//     const relatedObjectUiSchema = await getUISchema(relatedObjectName);
-//     const { list_views, label , icon, fields } = relatedObjectUiSchema;
-//     const firstListViewName = keys(list_views)[0];
-//     const relatedKey = findKey(fields, function(field) { 
-//         return ["lookup","master_detail"].indexOf(field.type) > -1 && field.reference_to === objectName; 
-//     });
-//     const globalFilter = [relatedKey,'=',recordId];
-//     const recordRelatedListHeader = await getObjectRecordDetailRelatedListHeader(relatedObjectUiSchema);
-//     const options = {
-//         globalFilter,
-//         defaults: {
-//             listSchema: { headerToolbar:[],columnsTogglable:false },
-//             headerSchema: recordRelatedListHeader
-//         },
-//         showHeader: true
-//     }
-//     const amisSchema= (await getListSchema(null, relatedObjectName, firstListViewName, options)).amisSchema;
-//     return {
-//         uiSchema: relatedObjectUiSchema,
-//         amisSchema: {
-//             type: "service",
-//             data: {
-//                 masterObjectName: objectName,
-//                 masterRecordId: "${recordId}",
-//                 relatedKey: relatedKey,   
-//                 objectName: relatedObjectName,
-//                 listViewId: `amis-\${appId}-${relatedObjectName}-listview`,
-//             },
-//             body:[
-//                 {
-//                     ...amisSchema,
-//                     data: {
-//                         filter: ["${relatedKey}", "=", "${masterRecordId}"],
-//                         objectName: "${objectName}",
-//                         recordId: "${masterRecordId}",
-//                         ...{[relatedKey]: getRelatedFieldValue(objectName, "${recordId}", relatedSchema.uiSchema, relatedKey)}
-//                     }
-//                 }
-//             ]
-//         }
-//     };
-// }
-
 
 // 获取单个相关表
 async function getObjectRelated(