@steedos-widgets/amis-lib 3.6.2-beta.4 → 3.6.2-beta.5

package/dist/index.cjs.js

@@ -2086,11 +2086,12 @@ async function getTableColumns(fields, options){
         //增加quickEdit属性，实现快速编辑
         const quickEditSchema = allowEdit ? await getQuickEditSchema(field, options) : allowEdit;
         let className = "";
-        if(field.wrap != true){
-            className += " whitespace-nowrap ";
-        }else {
-            className += " break-all ";
-        }
+        //crud内默认换行
+        // if(field.wrap != true){
+        //     className += " whitespace-nowrap "
+        // }else{
+        //     className += " break-words "
+        // }
         let columnItem;
         if((field.is_name || field.name === options.labelFieldName) && options.objectName === 'cms_files'){
             const previewFileScript = `
@@ -2525,7 +2526,8 @@ async function getTableOperation(ctx){
         label: " ",
         fixed: 'right',
         labelClassName: 'text-center',
-        className: 'text-center steedos-listview-operation w-10',
+        //TODO:目前3.6.3-patch.3版本中对于动态classname处理存在问题，简单处理固定列问题，等待amis解决crud的columns不支持动态classname的问题
+        className: 'text-center steedos-listview-operation w-10 is-sticky is-sticky-right is-sticky-first-right',
         buttons: [
               {
                 "type": "steedos-dropdown-button",
@@ -3158,12 +3160,21 @@ function getReadonlyFormAdaptor(object, fields, options){
         }
         payload.data = data;
         payload.data.__objectName = "${object.name}";
-        payload.data.__record = record;
+        payload.data.record = record;
+
+        payload.data.name = record.${object.NAME_FIELD_KEY || 'name'};
+        payload.data._master = {
+            record: record,
+            objectName: "${object.name}",
+            recordId: record._id
+        }
         window.postMessage(Object.assign({type: "record.loaded"}, {record: record}), "*")
     }
     if(payload.errors){
         payload.status = 2;
         payload.msg = payload.errors[0].message;
+    }else{
+        payload.data.recordLoaded = true;
     }
     ${options && options.initApiAdaptor || ''}
     return payload;
@@ -5140,7 +5151,7 @@ const StandardButtons = {
     }
 };
 
-const getGlobalData$1 = () => {
+const getGlobalData = () => {
     return {
         now: new Date(),
     };
@@ -5199,7 +5210,7 @@ const getButtonVisible = (button, ctx) => {
                     button._visible,
                     props.record,
                     "#",
-                    getGlobalData$1(),
+                    getGlobalData(),
                     props.userSession
                 );
             };
@@ -6577,6 +6588,48 @@ function getObjectListHeader$1(objectSchema, listViewName, ctx) {
   return headerSchema;
 }
 
+function getBackButtonSchema(){
+  return {
+    "type": "service",
+    "onEvent": {
+        "@history_paths.changed": {
+            "actions": [
+                {
+                    "actionType": "reload",
+                    // amis 3.6需要传入data来触发下面的window:historyPaths重新计算，此问题随机偶发，加上data后正常
+                    "data": {
+                    }
+                }
+            ]
+        }
+    },
+    "body":[{
+      "type": "button",
+      "visibleOn": "${window:innerWidth > 768 && (window:historyPaths.length > 1 || window:historyPaths[0].params.record_id) && display !== 'split'}",
+      "className":"flex mr-4",
+      "onEvent": {
+          "click": {
+              "actions": [
+                  {
+                      "actionType": "custom",
+                      "script": "window.goBack()"
+                  }
+              ]
+          }
+      },
+      "body": [
+          {
+              "type": "steedos-icon",
+              "category": "utility",
+              "name": "back",
+              "colorVariant": "default",
+              "className": "slds-button_icon slds-global-header__icon w-4"
+          }
+      ]
+    }]
+  }
+}
+
 /**
  * 记录详细界面顶部头amisSchema，也是标题面板组件的amisSchema
  * @param {*} objectSchema 对象UISchema
@@ -6585,11 +6638,21 @@ function getObjectListHeader$1(objectSchema, listViewName, ctx) {
  * @returns amisSchema
  */
 async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
+  // console.log(`getObjectRecordDetailHeader====>`, options)
   const { showRecordTitle = true } = options || {};
   // console.log('getObjectRecordDetailHeader==>', objectSchema, recordId)
   const { name, label, icon, NAME_FIELD_KEY } = objectSchema;
   
-  let amisButtonsSchema = getObjectDetailButtonsSchemas(objectSchema, recordId, options);
+  let amisButtonsSchema = [];
+  if(options.showButtons != false){
+    amisButtonsSchema = getObjectDetailButtonsSchemas(objectSchema, recordId, options);
+  }
+
+  let backButtonsSchema = null;
+
+  if(options.showBackButton != false){
+    backButtonsSchema = getBackButtonSchema();
+  }
 
   // console.log(`getObjectRecordDetailHeader==>`, amisButtonsSchema)
   
@@ -6604,45 +6667,9 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
           "type": "grid",
           "columns": [
             {
-              "body": [{
-                "type": "service",
-                "onEvent": {
-                    "@history_paths.changed": {
-                        "actions": [
-                            {
-                                "actionType": "reload",
-                                // amis 3.6需要传入data来触发下面的window:historyPaths重新计算，此问题随机偶发，加上data后正常
-                                "data": {
-                                }
-                            }
-                        ]
-                    }
-                },
-                "body":[{
-                  "type": "button",
-                  "visibleOn": "${window:innerWidth > 768 && (window:historyPaths.length > 1 || window:historyPaths[0].params.record_id) && display !== 'split'}",
-                  "className":"flex mr-4",
-                  "onEvent": {
-                      "click": {
-                          "actions": [
-                              {
-                                  "actionType": "custom",
-                                  "script": "window.goBack()"
-                              }
-                          ]
-                      }
-                  },
-                  "body": [
-                      {
-                          "type": "steedos-icon",
-                          "category": "utility",
-                          "name": "back",
-                          "colorVariant": "default",
-                          "className": "slds-button_icon slds-global-header__icon w-4"
-                      }
-                  ]
-                }]
-              },{
+              "body": [
+                backButtonsSchema
+              ,{
                 "type": "tpl",
                 "className": "block",
                 // "tpl": `<img class='slds-icon slds-icon_container slds-icon-standard-${standardIcon}' src='\${context.rootUrl}/unpkg.com/@salesforce-ux/design-system/assets/icons/standard/${icon}.svg'>`
@@ -6692,7 +6719,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
   let body = [
     {
       "type": "wrapper",
-      "className": "p-0",
+      "className": "p-4",
       "body": [
         {
           "type": "grid",
@@ -6707,7 +6734,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
   if(showRecordTitle){
     body.push({
       "type": "wrapper",
-      "className": "p-0",
+      "className": "p-4",
       "body": [
         {
           "type": "grid",
@@ -6719,6 +6746,34 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
     });
   }
 
+  let max = 10;
+  if(options.formFactor === 'SMALL'){
+    max = 4;
+  }
+
+  if(objectSchema.compactLayouts){
+    const details = [];
+    _.each(_.slice(_.difference(objectSchema.compactLayouts, [objectSchema.NAME_FIELD_KEY]), 0, max), (fieldName)=>{
+      const field = objectSchema.fields[fieldName];
+      if(field){
+        details.push({
+          type: 'steedos-field',
+          static: true,
+          config: field,
+        });
+      }
+    });
+
+    body.push({
+      "type": "form",
+      "className": "p-4 pb-0 bg-white compact-layouts",
+      "wrapWithPanel": false,
+      "actions": [],
+      "body": details,
+      "hiddenOn": "${recordLoaded != true}"
+    });
+  }
+
   return {
     type: 'service',
     id: `page_readonly_${name}_header`,
@@ -8546,7 +8601,7 @@ async function getObjectCRUD(objectSchema, fields, options){
 
     if(body.columns && options.formFactor != 'SMALL'){
       //将_display放入crud的columns的倒数第二列中（最后一列会影响固定列），可以通过setvalue修改行内数据域的_display，而不影响上层items的_display,用于批量编辑
-      body.columns.splice(body.columns.length - 1, 0, {name: '_display',type: 'static', width: 32, placeholder: "",id: objectSchema.name + "_display_${_index}", className: "hidden"});
+      body.columns.splice(body.columns.length -1 , 0, {name: '_display',type: 'static', width: 1, placeholder: "",id: objectSchema.name + "_display_${_index}", tpl: "${}"});
     }
 
     if (defaults) {
@@ -8604,11 +8659,6 @@ async function getObjectCRUD(objectSchema, fields, options){
     }
 }
 
-const getGlobalData = (mode)=>{
-  const user = getSteedosAuth();
-  return {mode: mode, user: user, spaceId: user.spaceId, userId: user.userId}
-};
-
 const getFormFields$1 = (objectSchema, formProps)=>{
   /**
    * fieldsExtend: 重写字段定义
@@ -8770,8 +8820,7 @@ async function getObjectDetail(objectSchema, recordId, ctx){
         type: 'service',
         name: `page_readonly_${recordId}`,
         id: serviceId,
-        data: {global: getGlobalData('read'), context: {rootUrl: getRootUrl(), tenantId: getTenantId(), authToken: getAuthToken()}},
-        api: await getReadonlyFormInitApi(objectSchema, recordId, fields, ctx),
+        // api: await getReadonlyFormInitApi(objectSchema, recordId, fields, ctx),
         body: [
           {
             "type": "wrapper",   //form 的 hiddenOn 会导致 form onEvent 异常, 使用wrapper包裹一次form,并在wrapper上控制显隐
@@ -8797,60 +8846,41 @@ async function getObjectDetail(objectSchema, recordId, ctx){
               ),
               className: 'steedos-amis-form bg-white',
               actions: [], // 不显示表单默认的提交按钮
-              onEvent: {
-                [`@data.changed.${objectSchema.name}`]: {  // 由于amis service 组件的 onEvent 存在bug ,此处借助form来刷新 上层 service https://github.com/baidu/amis/issues/6294
-                  "actions": [
-                    {
-                      "actionType": "reload",
-                      "componentId": serviceId,
-                      "expression": "this.__deletedRecord != true"
-                    },
-                    {
-                      // "args": {
-                      //   "url": "/app/${appId}/${objectName}/grid/${side_listview_id}",
-                      //   "blank": false
-                      // },
-                      "actionType": "custom",
-                      "script": "window.goBack()",
-                      "expression": "this.__deletedRecord === true"
-                    }
-                  ]
-                }
-              }
           },
           }
         ],
-        onEvent: {
-          "fetchInited": {
-            "weight": 0,
-            "actions": [
-              {
-                actionType: 'broadcast',
-                eventName: "recordLoaded",
-                args: {
-                  eventName: "recordLoaded"
-                },
-                data: {
-                  objectName: "${event.data.__objectName}",
-                  record: "${event.data.__record}"
-                },
-                expression: "${event.data.__response.error != true}"
-              },
-              {
-                "actionType": "setValue",
-                "args": {
-                   value: {
-                    "recordLoaded": true,
-                   }
-                },
-                expression: "${event.data.__response.error != true}"
-            }
-            ]
-          }
-        }
+        // onEvent: {
+        //   "fetchInited": {
+        //     "weight": 0,
+        //     "actions": [
+        //       {
+        //         actionType: 'broadcast',
+        //         eventName: "recordLoaded",
+        //         args: {
+        //           eventName: "recordLoaded"
+        //         },
+        //         data: {
+        //           objectName: "${event.data.__objectName}",
+        //           record: "${event.data.__record}"
+        //         },
+        //         expression: "${event.data.__response.error != true}"
+        //       },
+        //       {
+        //         "actionType": "setValue",
+        //         "args": {
+        //            value: {
+        //             "recordLoaded": true,
+        //            }
+        //         },
+        //         expression: "${event.data.__response.error != true}"
+        //     }
+        //     ]
+        //   }
+        // }
     };
 
     amisSchema.body[0].body = await getFormSchemaWithDataFilter(amisSchema.body[0].body, { formDataFilter, onFormDataFilter, amisData, env });
+    // console.log('getObjectDetail=====>', amisSchema);
     return amisSchema;
 }
 
@@ -8930,8 +8960,8 @@ const getRecordPermissions = async (objectName, recordId)=>{
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: liaodaxue
- * @LastEditTime: 2023-11-14 15:55:32
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2024-01-15 10:34:46
  * @Description:
  */
 
@@ -9311,11 +9341,44 @@ async function getRelatedListSchema(
     };
   }
 
+async function getObjectRelatedListsMiniSchema(objectApiName){
+    const relatedLists = await getObjectRelatedList(objectApiName);
+
+    const relatedListsMiniSchema = [];
+
+    for (const relatedList of relatedLists) {
+        relatedListsMiniSchema.push(
+            {
+                type: 'steedos-record-detail-list-mini',
+                objectApiName: objectApiName,
+                // recordId: recordId,
+                formFactor: formFactor,
+                relatedObjectApiName: relatedList.object_name,
+                foreign_key: relatedList.foreign_key,
+                relatedKey: relatedList.foreign_key,
+                columns: relatedList.columns,
+                sort: relatedList.sort,
+                filters: relatedList.filters,
+                visible_on: relatedList.visible_on,
+                perPage: relatedList.page_size || perPage,
+                hiddenEmptyTable: true,
+                relatedLabel: relatedList.label
+            }
+        );
+    }
+
+    return {
+        type: 'wrapper',
+        className: "steedos-record-detail-related-lists-mini",
+        body: relatedListsMiniSchema
+    }
+}
+
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: liaodaxue
- * @LastEditTime: 2023-10-20 11:38:25
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2024-01-15 15:50:40
  * @Description:
  */
 
@@ -9487,7 +9550,7 @@ 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,
@@ -9845,61 +9908,95 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
     if(relatedLists.length){
         content.tabs.push(related);
     }
+    content.tabs = _$1.reverse(content.tabs);
     return {
         uiSchema,
         amisSchema: {
-            "type": "service",
+            "type": "steedos-record-service",
             "body": [
                 {
                     "type": "steedos-record-detail-header",
                     "label": "标题面板",
                     "objectApiName": "${objectName}",
                     "recordId": "${recordId}",
-                    "id": "u:48d2c28eb755"
+                    "id": "u:48d2c28eb755",
+                    "showButtons": props.showButtons,
+                    "showBackButton": props.showBackButton,
                 },
                 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}"
-                            }
-                        }
-                    ]
-                },
-                ...props.onEvent
-            },
+            "objectApiName": "${objectName}",
+            "recordId": "${recordId}",
+            onEvent: props.onEvent,
           }
     }
 }
 
 async function getRecordServiceSchema(objectName, appId, props = {}) {
     const uiSchema = await getUISchema(objectName);
+    const fields = ___default["default"].values(uiSchema.fields);
     return {
         uiSchema,
         amisSchema: {
             "type": "service",
-            "body": [],
+            className: 'steedos-record-service p-0 md:p-2',
+            api: await getReadonlyFormInitApi(uiSchema, props.recordId, fields, props),
+            "body":  {
+                "type": "wrapper",
+                "className": "p-0 m-0",
+                "body": [],
+                "hiddenOn": "${recordLoaded != true}"
+              },
             data: {
                 "_master.objectName": "${objectName}",
-                "_master.recordId": "${recordId}"
+                "_master.recordId": "${recordId}",
+                ...(props.data || {})
             },
             "style": {
-                "padding": "var(--Page-body-padding)",
+                // "padding": "var(--Page-body-padding)",
                 ...props.style
             },
             onEvent: {
+                [`@data.changed.${objectName}`]: {
+                    "actions": [
+                      {
+                        "actionType": "reload",
+                        "expression": "this.__deletedRecord != true"
+                      },
+                      {
+                        "actionType": "custom",
+                        "script": "window.goBack()",
+                        "expression": "this.__deletedRecord === true"
+                      }
+                    ]
+                },
+                // 如果定义了fetchInited,则无法接收到广播事件@data.changed
+                // "fetchInited": {  
+                //     "weight": 0,
+                //     "actions": [
+                //     //   {
+                //     //     actionType: 'broadcast',
+                //     //     eventName: "recordLoaded",
+                //     //     args: {
+                //     //       eventName: "recordLoaded"
+                //     //     },
+                //     //     data: {
+                //     //       objectName: "${event.data.__objectName}",
+                //     //       record: "${event.data.__record}"
+                //     //     },
+                //     //     expression: "${event.data.__response.error != true}"
+                //     //   },
+                //       {
+                //         "actionType": "setValue",
+                //         "args": {
+                //            value: {
+                //             "recordLoaded": true,
+                //            }
+                //         },
+                //         expression: "${event.data.__response.error != true}"
+                //     }
+                //     ]
+                // },
                 "recordLoaded": {
                     "actions": [
                         {
@@ -9920,6 +10017,45 @@ async function getRecordServiceSchema(objectName, appId, props = {}) {
     }
 }
 
+async function getRecordDetailMiniSchema(objectName, appId, props = {}){
+    const uiSchema = await getUISchema(objectName);
+    const fields = ___default["default"].values(uiSchema.fields);
+
+    props.initApiAdaptor = 'payload.data=Object.assign({}, payload.data, payload.data.record); payload.data._finished=true; console.log("payload data is ====>", payload)';
+
+    // TODO 处理相关表
+    // getObjectRelatedListsMiniSchema
+
+    return {
+        type: "form",
+        wrapWithPanel: false,
+        actions: [],
+        initApi: await getReadonlyFormInitApi(uiSchema, props.recordId, fields, props),
+        body: {
+            "type": "wrapper",
+            "className": "p-0 m-0",
+            "body": [
+                {
+                    "type": "steedos-record-detail-header",
+                    "showButtons": false,
+                    "showBackButton": false,
+                    "objectApiName": "${objectName}",
+                    "recordId": "${recordId}",
+                },
+                // {
+                //     "type": "steedos-object-related-lists",
+                //     "label": "相关列表",
+                //     "objectApiName": "${objectName}",
+                //     "staticRecordId": "${recordId}",
+                //     formFactor: "SMALL",                
+                //     appId: appId
+                // }
+            ],
+            "hiddenOn": "${_finished != true}"
+          }
+    }
+}
+
 // 获取单个相关表
 async function getObjectRelated(
     {appName,
@@ -11067,7 +11203,8 @@ async function lookupToAmisPicker(field, readonly, ctx){
         labelField: referenceTo.labelField.name,
         valueField: referenceTo.valueField.name,
         // disabledOn: this._master目的是相关表新建时禁止编辑关联字段； this.relatedKey目的是相关表编辑时禁止编辑关联字段，多选字段可以编辑。
-        disabledOn:  `${readonly} || ( (this._master && (this._master.relatedKey ==='${field.name}')) || ((this.relatedKey ==='${field.name}') && (${field.multiple} != true)) )`,
+        disabledOn:  `${readonly}`,
+        hiddenOn: `( (this._master && (this._master.relatedKey ==='${field.name}')) || ((this.relatedKey ==='${field.name}') && (${field.multiple} != true)) )`,
         modalMode: 'dialog', //TODO 设置 dialog 或者 drawer，用来配置弹出方式
         source: source,
         size: "lg",
@@ -11311,9 +11448,15 @@ async function lookupToAmis(field, readonly, ctx){
     // console.log(`lookupToAmis====`, field, readonly, ctx)
     if(readonly){
         return {
-            type: getAmisStaticFieldType('picker', readonly),
-            tpl: getRelatedFieldTpl(field, ctx)
+            type: 'steedos-field',
+            config: field,
+            static: true
         }
+
+        // return {
+        //     type: Field.getAmisStaticFieldType('picker', readonly),
+        //     tpl: Tpl.getRelatedFieldTpl(field, ctx)
+        // }
     }
     if(field.reference_to && !___namespace.isString(field.reference_to) && !readonly){
         return {
@@ -12306,11 +12449,9 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             if(field.subFields){
                 convertData = {
                     type: 'steedos-input-table',
-                    showIndex: true,
                     editable: !readonly,
                     addable: !readonly,
                     removable: !readonly,
-                    draggable: !readonly,
                     fields: [],
                     amis:{
                         columnsTogglable: false
@@ -12768,7 +12909,7 @@ async function getFormBody(permissionFields, formFields, ctx){
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-01-14 21:08:32
+ * @LastEditTime: 2024-01-15 17:50:02
  */
 
 /**
@@ -12917,8 +13058,15 @@ function getFormPagination(props, mode) {
         let currentIndex = event.data.index;
         // 翻页到下一页之前需要先把当前页改动的内容保存到中间变量__tableItems中
         let currentFormValues = scope.getComponentById(__formId).getValues();
-        if(event.data.parent){
-            fieldValue[event.data.__parentIndex].children[currentIndex] = currentFormValues;
+        var parent = event.data.parent;
+        var __parentIndex = event.data.__parentIndex;
+        if(parent){
+            fieldValue[__parentIndex].children[currentIndex] = currentFormValues;
+            // 重写父节点，并且改变其某个属性以让子节点修改的内容回显到界面上
+            fieldValue[__parentIndex] = Object.assign({}, fieldValue[__parentIndex], {
+                children: fieldValue[__parentIndex].children,
+                __fix_rerender_after_children_modified_tag: new Date().getTime()
+            });
         }
         else{
             fieldValue[currentIndex] = currentFormValues;
@@ -13056,9 +13204,14 @@ function getFormPaginationWrapper(props, form, mode) {
         }
     ];
     let onServiceInitedScript = `
-        if(event.data.parent){
+        var parent = event.data.parent;
+        var fieldValue = event.data.__tableItems;
+        if(parent){
             // 如果是子行，即在节点嵌套情况下，当前节点如果是children属性下的子节点时，则算出其所属父行的索引值
-            event.data.__parentIndex = _.findIndex(event.data.__tableItems, {_id: event.data.parent._id});
+            var primaryKey = "${props.primaryKey}";
+            event.data.__parentIndex = _.findIndex(fieldValue, function(item){
+                return item[primaryKey] == parent[primaryKey];
+            });
         }
         // 以下脚本是为了解决有时弹出编辑表单时，表单中的值比最后一次编辑保存的值会延迟一拍。
         // 比如：inlineEditMode模式时，用户在表格单元格中直接修改数据，然后弹出的表单form中并没有包含单元格中修改的内容
@@ -13170,6 +13323,11 @@ async function getForm(props, mode = "edit", formId) {
             var __parentIndex = event.data.__super.__super.__parentIndex;
             if(parent){
                 fieldValue[__parentIndex].children[currentIndex] = currentFormValues;
+                // 重写父节点，并且改变其某个属性以让子节点修改的内容回显到界面上
+                fieldValue[__parentIndex] = Object.assign({}, fieldValue[__parentIndex], {
+                    children: fieldValue[__parentIndex].children,
+                    __fix_rerender_after_children_modified_tag: new Date().getTime()
+                });
             }
             else{
                 fieldValue[currentIndex] = currentFormValues;
@@ -13314,9 +13472,13 @@ async function getButtonActions(props, mode) {
             let fieldValue = event.data.__tableItems;//这里不可以_.cloneDeep，因为翻页form中用的是event.data.__tableItems，直接变更其值即可改变表单中的值
             // 新建一条空白行并保存到子表组件
             var parent = event.data.__super.parent;
-            var __parentIndex = parent && _.findIndex(fieldValue, {_id: parent._id});
+            var primaryKey = "${props.primaryKey}";
+            var __parentIndex = parent && _.findIndex(fieldValue, function(item){
+                return item[primaryKey] == parent[primaryKey];
+            });
             if(parent){
                 fieldValue[__parentIndex].children.push({});
+                // 这里实测不需要fieldValue[__parentIndex] = ... 来重写整个父行让子表回显，所以没加相关代码
             }
             else{
                 fieldValue.push({});
@@ -13351,9 +13513,13 @@ async function getButtonActions(props, mode) {
             // 复制当前页数据到新建行并保存到子表组件
             // fieldValue.push(newItem);
             var parent = event.data.__super.parent;
-            var __parentIndex = parent && _.findIndex(fieldValue, {_id: parent._id});
+            var primaryKey = "${props.primaryKey}";
+            var __parentIndex = parent && _.findIndex(fieldValue, function(item){
+                return item[primaryKey] == parent[primaryKey];
+            });
             if(parent){
                 fieldValue[__parentIndex].children.push(newItem);
+                // 这里实测不需要fieldValue[__parentIndex] = ... 来重写整个父行让子表回显，所以没加相关代码
             }
             else{
                 fieldValue.push(newItem);
@@ -13369,7 +13535,6 @@ async function getButtonActions(props, mode) {
             let __paginationServiceId = "${formPaginationId}";
             let __paginationData = scope.getComponentById(__paginationServiceId).getData();
             event.data.index = __paginationData.index;
-            // event.data.__page = fieldValue.length - 1;//这里不可以用Object.assign否则，event.data中上层作用域数据会丢失
             if(parent){
                 event.data.__page = fieldValue[__parentIndex].children.length - 1;//这里不可以用Object.assign否则，event.data中上层作用域数据会丢失
                 event.data.__parentIndex = __parentIndex; //执行下面的翻页按钮事件中依赖了__parentIndex值
@@ -13458,8 +13623,9 @@ async function getButtonActions(props, mode) {
                     // 为了解决"弹出的dialog窗口中子表组件会影响页面布局界面中父作用域字段值"，比如设计字段布局微页面中的设置分组功能，弹出的就是子表dialog
                     // 所以这里使用json|toJson转一次，断掉event.data.__tableItems与上层任用域中props.name的联系
                     // "__tableItems": `\${${props.name}|json|toJson}`
-                    // 这里加__super.__super是因为要让映射到准确的作用域层，如果不加，在节点嵌套情况下，当前节点正好是带children属性的节点的话，这里弹出的dialog映射到的会是children数组
-                    "__tableItems": `\${((__super.parent ? __super.__super.${props.name} : __super.${props.name}) || [])|json|toJson}`
+                    // 在节点嵌套情况下，当前节点正好是带children属性的节点的话，这里弹出的dialog映射到的会是children数组，这是amis目前的规则，
+                    // 所以这里加判断有children时，用__super.__super让映射到正确的作用域层，如果不加，则__tableItems取到的会是children数组，而不是整个子表组件的值
+                    "__tableItems": `\${((children ? __super.__super.${props.name} : __super.${props.name}) || [])|json|toJson}`
         },
                 "actions": dialogButtons,
                 "onEvent": {
@@ -13577,9 +13743,17 @@ async function getButtonActions(props, mode) {
             let lastestFieldValue = _.clone(wrapperServiceData["${props.name}"]);
             var currentIndex = event.data.index;
             var parent = event.data.__super.parent;
-            var __parentIndex = parent && _.findIndex(lastestFieldValue, {_id: parent._id});
+            var primaryKey = "${props.primaryKey}";
+            var __parentIndex = parent && _.findIndex(lastestFieldValue, function(item){
+                return item[primaryKey] == parent[primaryKey];
+            });
             if(parent){
                 lastestFieldValue[__parentIndex].children.splice(currentIndex, 1);
+                // 重写父节点，并且改变其某个属性以让子节点修改的内容回显到界面上
+                lastestFieldValue[__parentIndex] = Object.assign({}, lastestFieldValue[__parentIndex], {
+                    children: lastestFieldValue[__parentIndex].children,
+                    __fix_rerender_after_children_modified_tag: new Date().getTime()
+                });
             }
             else{
                 lastestFieldValue.splice(currentIndex, 1);
@@ -13669,6 +13843,9 @@ const getAmisInputTableSchema = async (props) => {
     if (!props.id) {
         props.id = "steedos_input_table_" + props.name + "_" + Math.random().toString(36).substr(2, 9);
     }
+    if (!props.primaryKey) {
+        props.primaryKey = "_id";
+    }
     let serviceId = getComponentId("table_service", props.id);
     let buttonsForColumnOperations = [];
     let inlineEditMode = props.inlineEditMode;
@@ -13719,7 +13896,13 @@ const getAmisInputTableSchema = async (props) => {
         "strictMode": props.strictMode,
         "showTableAddBtn": false,
         "showFooterAddBtn": false,
-        "className": props.tableClassName
+        "className": props.tableClassName,
+        "pipeOut": (value, data) => {
+            return (value || []).map(function(item){
+                delete item.__fix_rerender_after_children_modified_tag;
+                return item;
+            });
+        }
     };
     if (buttonsForColumnOperations.length) {
         inputTableSchema.columns.push({
@@ -16511,9 +16694,11 @@ exports.getObjectRelated = getObjectRelated;
 exports.getObjectRelatedList = getObjectRelatedList;
 exports.getObjectRelatedListButtons = getObjectRelatedListButtons;
 exports.getObjectRelatedListHeader = getObjectRelatedListHeader;
+exports.getObjectRelatedListsMiniSchema = getObjectRelatedListsMiniSchema;
 exports.getPage = getPage;
 exports.getRecord = getRecord;
 exports.getRecordDetailHeaderSchema = getRecordDetailHeaderSchema;
+exports.getRecordDetailMiniSchema = getRecordDetailMiniSchema;
 exports.getRecordDetailRelatedListSchema = getRecordDetailRelatedListSchema;
 exports.getRecordDetailSchema = getRecordDetailSchema;
 exports.getRecordPageInitSchema = getRecordPageInitSchema;