@steedos-widgets/amis-lib 3.6.2-beta.2 → 3.6.2-beta.20

package/dist/index.esm.js

@@ -340,22 +340,29 @@ const getSteedosAuth = () => {
  * @Description:
  */
 
-
 const Router = {
     getTabDisplayAs(tab_id){
+        const uiSchema = getUISchemaSync$1(tab_id, false);
         var urlSearch = new URLSearchParams(document.location.search); 
         if(urlSearch.has('display')){
             return urlSearch.get('display')
         }
         const key = `tab_${tab_id}_display`;
         // const key = `page_display`;
-        const value = localStorage.getItem(key);
-        return value ? value : 'grid'
+        const value = sessionStorage.getItem(key);
+        let defaultDisplay = "grid";
+        if(uiSchema.enable_split){
+            defaultDisplay = "split";
+        }
+        if(window.innerWidth <= 768){
+            return "grid";
+        }
+        return value ? value : defaultDisplay;
     },
   
     setTabDisplayAs(tab_id, displayAs){
         const key = `tab_${tab_id}_display`;
-        localStorage.setItem(key, displayAs);
+        sessionStorage.setItem(key, displayAs);
     },
     getAppPath({formFactor, appId}){
         return `/app/${appId}`;
@@ -382,8 +389,8 @@ const Router = {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-20 16:29:22
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-12-28 14:59:08
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2024-01-25 14:44:17
  * @Description: 
  */
 
@@ -455,11 +462,30 @@ function getComparableAmisVersion() {
   }
 }
 
+/**
+ * 判断浏览器类型
+ * @returns 按需返回浏览器类型;
+ */
+ function getBowserType() {
+    const userAgent = navigator.userAgent;
+    if (userAgent.indexOf("Chrome")!== -1 && userAgent.indexOf("Safari") !== -1 && userAgent.indexOf("Edg") === -1) {
+      return "Chrome";
+    } else if (userAgent.indexOf("Firefox") !== -1) {
+      return "Firefox";
+    } else if (userAgent.indexOf("Safari") !== -1 && userAgent.indexOf("Chrome") === -1 && userAgent.indexOf("Edge") === -1) {
+      return "Safari";
+    } else if (userAgent.indexOf("Edg") !== -1) {
+      return "Edge";
+    } else {
+      return "Unknown browser"; // 其他浏览器...（可根据自己需要确定是否新增其他浏览器的判断）
+    }
+}
+
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-23 09:53:08
  * @LastEditors: liaodaxue
- * @LastEditTime: 2023-10-11 17:32:17
+ * @LastEditTime: 2024-01-17 16:00:27
  * @Description: 
  */
 
@@ -531,7 +557,7 @@ function getSelectMap(selectOptions){
 
 function getNameTplUrl(field, ctx){
     if(ctx.objectName === 'cms_files'){
-        return `\${context.rootUrl}/api/files/files/\${versions[0]}?download=true`
+        return "${(versions[0] && versions[0].url) ? versions[0].url+'?download=true' : context.rootUrl+'/api/files/files/'+versions[0]+'?download=true'}"
     }
     const href = Router.getObjectDetailPath({
         ...ctx,  formFactor: ctx.formFactor, appId: "${appId}", objectName: ctx.objectName || "${objectName}", recordId: `\${${ctx.idFieldName}}`
@@ -1277,6 +1303,7 @@ var frontend_notifications$1 = "Notifications";
 var frontend_notifications_allread$1 = "Mark all as read";
 var frontend_notifications_allread_message$1 = "All marked as read";
 var frontend_profile$1 = "Profile";
+var switch_space$1 = "Switch Space";
 var frontend_about$1 = "About";
 var frontend_log_out$1 = "Log out";
 var frontend_listview_warning_start$1 = "The current ";
@@ -1364,6 +1391,7 @@ var en_us = {
 	frontend_notifications_allread: frontend_notifications_allread$1,
 	frontend_notifications_allread_message: frontend_notifications_allread_message$1,
 	frontend_profile: frontend_profile$1,
+	switch_space: switch_space$1,
 	frontend_about: frontend_about$1,
 	frontend_log_out: frontend_log_out$1,
 	frontend_listview_warning_start: frontend_listview_warning_start$1,
@@ -1403,9 +1431,9 @@ var frontend_display_type_is_split = "分栏视图";
 var frontend_display_as = "显示为";
 var frontend_record_sum = "个项目";
 var frontend_button_reload_tooltip = "刷新";
-var frontend_button_search_tooltip = "筛选";
+var frontend_button_search_tooltip = "搜索";
 var frontend_fields_filter_button_search = "搜索";
-var frontend_fields_filter_button_settings = "设置搜索项";
+var frontend_fields_filter_button_settings = "选择搜索项";
 var frontend_button_listview_control_tooltip = "列表视图控制";
 var frontend_button_listview_control_label = "列表视图控制";
 var frontend_listview_control_columns = "显示的列";
@@ -1453,6 +1481,7 @@ var frontend_notifications = "通知";
 var frontend_notifications_allread = "全部标记为已读";
 var frontend_notifications_allread_message = "已全部标记为已读";
 var frontend_profile = "个人资料";
+var switch_space = "切换工作区";
 var frontend_about = "关于";
 var frontend_log_out = "注销";
 var frontend_listview_warning_start = "当前";
@@ -1541,6 +1570,7 @@ var zh_cn = {
 	frontend_notifications_allread: frontend_notifications_allread,
 	frontend_notifications_allread_message: frontend_notifications_allread_message,
 	frontend_profile: frontend_profile,
+	switch_space: switch_space,
 	frontend_about: frontend_about,
 	frontend_log_out: frontend_log_out,
 	frontend_listview_warning_start: frontend_listview_warning_start,
@@ -1854,7 +1884,8 @@ async function getQuickEditSchema(field, options){
                                         "failed": "失败了呢。。"
                                       }
                                     }
-                                }
+                                },
+                                "expression": "${!recordPermissions.modifyAllRecords}"
                             },
                             {
                                 "actionType": "setValue",
@@ -1870,7 +1901,7 @@ async function getQuickEditSchema(field, options){
                                 "componentId": quickEditId,
                                 "args": {
                                     "value":{
-                                        "quickedit_record_permissions": "${event.data}"
+                                        "quickedit_record_permissions": "${recordPermissions.modifyAllRecords ? {'allowEdit': true} : event.data}"
                                     }
                                 }
                             }
@@ -1934,7 +1965,7 @@ async function getQuickEditSchema(field, options){
                                           `
                                         }
                                     },
-                                    "expression":"${event.data.value}"
+                                    "expression":"${event.data.value && !recordPermissions.modifyAllRecords}"
                                 },
                                 {
                                     "actionType": "setValue",
@@ -1965,10 +1996,20 @@ async function getQuickEditSchema(field, options){
                                                         "script": `
                                                             const noPermission = event.data.noPermission;
                                                             const crudComponent = event.context.scoped.getComponentById("${options.crudId}");
-                                                            const selectedItems = crudComponent && crudComponent.props.store.selectedItems.concat();
+                                                            let selectedItems = crudComponent && crudComponent.props.store.selectedItems.concat();
                                                             noPermission.forEach(function (item) {
                                                                 crudComponent && crudComponent.unSelectItem(_.find(selectedItems,{_id:item}));
+                                                                _.remove(selectedItems, (selected) => selected._id === item);
                                                             })
+                                                            doAction({
+                                                                "componentId": "${quickEditId}",
+                                                                "actionType": "setValue",
+                                                                "args": {
+                                                                    "value": {
+                                                                        selectedItems
+                                                                    }
+                                                                }
+                                                            });
                                                         `
                                                     },
                                                     {
@@ -2029,7 +2070,7 @@ async function getQuickEditSchema(field, options){
 }
 
 function getFieldWidth(width){
-    const defaultWidth = "unset";//用于使table内的td标签下生成div，实现将快速编辑按钮固定在右侧的效果，并不是为了unset效果
+    const defaultWidth = null;
     if(typeof width == 'string'){
         if(isNaN(width)){
             return width || defaultWidth;
@@ -2059,18 +2100,35 @@ async function getTableColumns(fields, options){
         //增加quickEdit属性，实现快速编辑
         const quickEditSchema = allowEdit ? await getQuickEditSchema(field, options) : allowEdit;
         let className = "";
-        if(field.wrap != true){
+        const bowserType = getBowserType();
+        if(bowserType === "Safari"){
             className += " whitespace-nowrap ";
         }else {
-            className += " break-all ";
+            if(field.wrap != true){
+                className += " whitespace-nowrap ";
+            }else {
+                className += " break-words ";
+            }
         }
+
+        if (typeof field.amis?.className == "object") {
+            className = {
+                [className]: "true",
+                ...field.amis.className
+            };
+        } else if (typeof field.amis?.className == "string") {
+            className = `${className} ${field.amis.className} `;
+        }
+        let fieldAmis = _$1.clone(field.amis);
+        delete fieldAmis?.className;
+
         let columnItem;
         if((field.is_name || field.name === options.labelFieldName) && options.objectName === 'cms_files'){
             const previewFileScript = `
                 var data = event.data;
                 var file_name = data.versions ? data.name : "${field.label}";
-                var file_id = data._id;
-                SteedosUI.previewFile && SteedosUI.previewFile({file_name, file_id});
+                var file_id = data.versions && data.versions[0] && data.versions[0]._id;
+                window.previewFile && window.previewFile({file_name, file_id});
             `;
             columnItem = {
                 "type": "button",
@@ -2099,7 +2157,7 @@ async function getTableColumns(fields, options){
                           "actionType": "custom",
                           "script": previewFileScript,
                         //   "expression": "!!window?.nw?.require" //PC客户端预览附件
-                          "expression": "!!!(window && window.nw && window.nw.require)"//PC客户端预览附件
+                          "expression": "!!(window && window.nw && window.nw.require)"//PC客户端预览附件
                         }
                     ]
                   }
@@ -2114,7 +2172,7 @@ async function getTableColumns(fields, options){
                 toggled: field.toggled,
                 static: true,
                 className,
-            }, field.amis, {name: field.name});
+            }, fieldAmis, {name: field.name});
         }else if(field.type === 'avatar' || field.type === 'image' || field.type === 'file'){
             columnItem = Object.assign({}, {
                 type: "switch",
@@ -2125,7 +2183,7 @@ async function getTableColumns(fields, options){
                 static: true,
                 className,
                 ...getAmisFileReadonlySchema(field)
-            }, field.amis, {name: field.name});
+            }, fieldAmis, {name: field.name});
         }
         else if(field.type === 'select'){
             const map = getSelectMap(field.options);
@@ -2140,7 +2198,7 @@ async function getTableColumns(fields, options){
                 className,
                 inputClassName: "inline",
                 static: true,
-            }, field.amis, {name: field.name});
+            }, fieldAmis, {name: field.name});
         }
         else {
             const tpl = await getFieldTpl(field, options);
@@ -2159,23 +2217,14 @@ async function getTableColumns(fields, options){
             if(field.type === 'textarea'){
                 className += 'min-w-56';
             }
-            if(field.type === 'date'){
-                className += 'date-min-w';
-            }
-            if(field.type === 'datetime'){
-                className += 'datetime-min-w';
-            }
+            // if(field.type === 'date'){
+            //     className += 'date-min-w';
+            // }
+            // if(field.type === 'datetime'){
+            //     className += 'datetime-min-w';
+            // }
 
             //field上的amis属性里的clssname需要单独判断类型合并
-            if (typeof field.amis?.className == "object") {
-                className = {
-                    [className]: "true",
-                    ...field.amis.className
-                };
-            } else if (typeof field.amis?.className == "string") {
-                className = `${className} ${field.amis.className} `;
-            }
-            delete field.amis?.className;
 
             if(!field.hidden && !field.extra){
                 columnItem = Object.assign({}, {
@@ -2192,7 +2241,7 @@ async function getTableColumns(fields, options){
                     static: true,
                     options: field.type === 'html' ? {html: true} : null
                     // toggled: true 
-                }, field.amis, {name: field.name});
+                }, fieldAmis, {name: field.name});
                 
                 if(field.type === 'color'){
                     columnItem.type = 'color';
@@ -2259,7 +2308,7 @@ function getMobileLines(tpls){
         }
         if(isLeft){
             // 左侧半行
-            lineChildrenClassName = "steedos-listview-item-left truncate";
+            lineChildrenClassName = "steedos-listview-item-left truncate h-5";
             if(item.field.is_wide){
                 // 左侧全行样式可以单独写，如果需要配置两行省略号效果，可以加样式类 two-lines-truncate
                 lineChildrenClassName = "steedos-listview-item-wide";
@@ -2271,7 +2320,7 @@ function getMobileLines(tpls){
         }
         else {
             // 右侧半行，这里加样式类 flex flex-shrink-0，是为了省略号只显示在左半行，右半行文字一般比较短，如果也加省略号效果的话，左侧文字多的话，右侧没几个字就显示省略号了
-            lineChildrenClassName = "steedos-listview-item-right truncate ml-2 flex flex-shrink-0";
+            lineChildrenClassName = "steedos-listview-item-right truncate ml-2 flex flex-shrink-0 h-5";
         }
         //支持字段amis属性配置classname，识别classname的类型，与原样式合并
         var className;
@@ -2382,7 +2431,15 @@ async function getMobileTableColumns(fields, options){
                         "actions": [
                             {
                                 "script": `
-                                    let cms_url = "/api/files/files/"+event.data.versions[0]+"?download=true"
+                                    let cms_url = '';
+                                    let value = event.data.versions[0];
+                                    if(value){
+                                        if(value.url){
+                                            cms_url = value.url;
+                                        }else{
+                                            cms_url = "/api/files/files/"+value+"?download=true"
+                                        }
+                                    }
                                     Steedos.cordovaDownload(encodeURI(Steedos.absoluteUrl(cms_url)), event.data.name);
                                 `,
                                 "actionType": "custom"
@@ -2498,7 +2555,8 @@ async function getTableOperation(ctx){
         label: "&nbsp;",
         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",
@@ -2594,7 +2652,7 @@ async function getTableSchema$1(fields, options){
             }
             return {
                 mode: "cards",
-                perPageAvailable: [5, 10, 20, 50, 100, 500],
+                perPageAvailable: [20, 50, 100, 500],
                 name: "thelist",
                 headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
                 className: "",
@@ -2627,7 +2685,7 @@ async function getTableSchema$1(fields, options){
 
     return {
         mode: "table",
-        perPageAvailable: [5, 10, 20, 50, 100, 500],
+        perPageAvailable: [20, 50, 100, 500],
         name: "thelist",
         headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
         className: "",
@@ -2882,6 +2940,21 @@ async function getTableApi(mainObject, fields, options){
         return api;
     `;
     api.adaptor = `
+    let fields = ${JSON.stringify(_$1.map(fields, 'name'))};
+    // 这里把行数据中所有为空的字段值配置为空字符串，是因为amis有bug：crud的columns中的列如果type为static-前缀的话，行数据中该字段为空的话会显示为父作用域中同名变量值，见：https://github.com/baidu/amis/issues/9556
+    (payload.data.rows || []).forEach((itemRow) => {
+        (fields || []).forEach((itemField) => {
+            if(itemField && itemField.indexOf(".") > -1){
+                return;
+            }
+            if(itemField && (itemRow[itemField] === undefined || itemRow[itemField] === null)){
+                // 这里itemRow中不存在 itemField 属性，或者值为null时都会有“显示为父作用域中的同名变量值”的问题，所以null和undefined都要重置为空字符串
+                // 实测数字、下拉框、多选lookup等字段类型重置为空字符串都不会有问题，而且实测amis from组件的清空表单字段值功能就是把表单中的各种字段类型设置为空字符串，所以看起来也符合amis规范
+                itemRow[itemField] = "";
+            }
+        });
+    });
+    
     if(api.body.listName == "recent"){
         payload.data.rows = _.sortBy(payload.data.rows, function(item){
             return _.indexOf(api.body._ids, item._id)
@@ -2906,7 +2979,13 @@ async function getTableApi(mainObject, fields, options){
                     value = [value]
                 };
                 if(field.type === 'file'){
-                    item[key] = value
+                    // item[key] = value
+                    // PC客户端附件子表列表点击标题预览附件功能依赖了_id，所以这里拼出来
+                    let itemKeyValue = item[key];
+                    item[key] = value.map(function(item, index){
+                        item._id = itemKeyValue[index];
+                        return item;
+                    });
                 }else{
                     item[key] = _.map(value, (item)=>{
                         if(field.type === 'image'){
@@ -2948,15 +3027,8 @@ async function getTableApi(mainObject, fields, options){
                 }
             });
         };
-        let isTreeOptionsComputed = false;
-        if(records.length === 1 && records[0].children){
-            isTreeOptionsComputed = true;
-        }
-        if(!isTreeOptionsComputed){
-            // 如果api接口设置在缓存，缓存期间并不会重新请求接口，payload.data.rows是上次计算后的结果
-            payload.data.rows = getTreeOptions(records,{"valueField":"_id"});
-            assignIndexToTreeRecords(payload.data.rows, '');
-        }
+        payload.data.rows = getTreeOptions(records,{"valueField":"_id"});
+        assignIndexToTreeRecords(payload.data.rows, '');
     }
 
 
@@ -3013,12 +3085,15 @@ async function getTableApi(mainObject, fields, options){
         }
         // SteedosUI.getRef(api.body.$self.$scopeId)?.parent?.getComponentById(setDataToComponentId)?.setData({$count: payload.data.count})
     };
-    const listviewComponent = $(".steedos-object-listview .antd-Table-table");
-    const firstListviewComponent = listviewComponent && listviewComponent[0];
-    if(firstListviewComponent){
-        setTimeout(()=>{
-            firstListviewComponent.scrollIntoView();
-        }, 600);
+    let formFactor = "${options.formFactor}";
+    if(formFactor !== "SMALL"){
+        const listviewComponent = $(".steedos-object-listview .antd-Table-table");
+        const firstListviewComponent = listviewComponent && listviewComponent[0];
+        if(firstListviewComponent){
+            setTimeout(()=>{
+                firstListviewComponent.scrollIntoView();
+            }, 600);
+        }
     }
     ${options.adaptor || ''}
     return payload;
@@ -3131,12 +3206,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_FIELD_VALUE = 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;
@@ -3279,7 +3363,7 @@ async function getEditFormInitApi(object, recordId, fields, options){
         cache: API_CACHE,
         requestAdaptor: `
             // 所有不想在network请求中发送的数据都应该从data中分离出来，data变量只需要留下query才需要发送出去
-            var { recordId, objectName, uiSchema, global, context, ...data} = api.data;
+            var { recordId, objectName, uiSchema, global, context, _master, ...data} = api.data;
             if(!recordId){
                 // 新建则不请求任何数据
                 data.query = "{data:" + objectName + "(filters: " + JSON.stringify(["_id", "=", null]) + ", top: 1){_id}}";
@@ -3357,10 +3441,11 @@ async function getEditFormInitApi(object, recordId, fields, options){
                 ...initialValues
             }
             ${options.initApiAdaptor || ''}
+            // console.log('getEditFormInitApi======>', payload);
             return payload;
         `,
         responseData: {
-            initialValues: "$$",
+            "&": "$$",
             editFormInited: true
         },
         data: data,
@@ -3399,6 +3484,18 @@ function getBatchDelete(objectName){
     return {
         method: 'post',
         url: getApi$2(),
+        adaptor: `
+            if(payload.errors){
+                payload.data.deleteErrorMessage = [];
+                payload.errors.forEach(function(error){
+                    let errorRecord = error.path.map(function (item) {
+                        return item.split('delete__')[1].to_float() + 1;
+                    }).toString();
+                    payload.data.deleteErrorMessage.push("第" + errorRecord + "条记录删除出现异常，报错信息为(" + (window.t ? window.t(error.message) : error.message) + ")");
+                })
+            }
+            return payload;
+        `,
         requestAdaptor: `
             var ids = api.data.ids.split(",");
             var deleteArray = [];
@@ -4193,7 +4290,7 @@ async function getListBody(fields, options){
 
 function getDefaultParams(options){
     return {
-        perPage: options.top || options.perPage || 10
+        perPage: options.top || options.perPage || 20
     }
 }
 
@@ -4396,7 +4493,6 @@ const getSchema$5 = async (uiSchema, ctx) => {
             "objectApiName": "\${objectName}",
             "recordId": "",
             "mode": "edit",
-            "layout": "normal"
         };
 
         if (payload && payload.schema) {
@@ -4828,9 +4924,16 @@ const getSchema$2 = (uiSchema) => {
                       "form": {
                         debug: false,
                         resetAfterSubmit: false,
+                        data: {
+                          editFormInited: true,
+                        },
                         initApi: {
+                          method: 'GET',
                           url: '/api/v1/queue_import_history/${recordId}?fields=["state"]',
                           sendOn: 'this.recordId',
+                          data: null,
+                          requestAdaptor: "return api;",
+                          adaptor: "return payload;",
                           responseData: {
                             importState: "${state}"
                           }
@@ -5101,7 +5204,7 @@ const StandardButtons = {
     }
 };
 
-const getGlobalData$1 = () => {
+const getGlobalData = () => {
     return {
         now: new Date(),
     };
@@ -5160,7 +5263,7 @@ const getButtonVisible = (button, ctx) => {
                     button._visible,
                     props.record,
                     "#",
-                    getGlobalData$1(),
+                    getGlobalData(),
                     props.userSession
                 );
             };
@@ -5702,7 +5805,7 @@ async function getObjectFieldsFilterFormSchema(ctx) {
   const formSchema = {
     "type": "service",
     "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
-    "className": ctx.formFactor === 'SMALL' ? "slds-filters__body p-0 mb-2 overflow-y-auto overflow-x-hidden" : "slds-filters__body p-0 sm:grid sm:gap-2 sm:grid-cols-4 mb-2",
+    "className": ctx.formFactor === 'SMALL' ? "slds-filters__body p-0 mb-2 overflow-y-auto overflow-x-hidden" : "slds-filters__body p-0 sm:grid sm:gap-4 sm:grid-cols-4 p-2",
     "style":{
       "max-height":ctx.formFactor === 'SMALL'?"30vh":"unset"
     },
@@ -6289,7 +6392,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
         "className": "slds-filters"
       },
       "size": "xs",
-      "className": `border-gray-300 border-y slds-grid slds-grid_vertical slds-nowrap ${!ctx.isLookup && "mt-2"}`,
+      "className": `border-y slds-grid slds-grid_vertical slds-nowrap ${!ctx.isLookup && "mt-2"}`,
       "visibleOn": "this.showFieldsFilter",
     },
     "className": "bg-white"
@@ -6477,7 +6580,7 @@ async function getObjectListHeaderSecordLine(objectSchema, listViewName, ctx) {
             "icon": "fa fa-refresh",
             "actionType": "reload",
             "target": amisListViewId,
-            "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
+            "className": "bg-white p-2 rounded text-gray-500"
           },
           fieldsFilterButtonSchema,
           // {
@@ -6485,7 +6588,7 @@ async function getObjectListHeaderSecordLine(objectSchema, listViewName, ctx) {
           //   "label": "",
           //   "icon": "fa fa-filter",
           //   "actionType": "custom",
-          //   "className": "bg-transparent p-2 rounded border-gray-300 text-gray-500",
+          //   "className": "bg-transparent p-2 rounded text-gray-500",
           //   "id": "u:c20cb87d96c9",
           //   "onEvent": {
           //     "click": {
@@ -6533,11 +6636,53 @@ function getObjectListHeader$1(objectSchema, listViewName, ctx) {
   let headerSchema = [{
     "type": "wrapper",
     "body": body,
-    "className": `bg-gray-100 sm:rounded-tl sm:rounded-tr p-4 -mb-4`
+    "className": `sm:rounded-tl sm:rounded-tr p-4 -mb-4`
   }];
   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
@@ -6546,11 +6691,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)
   
@@ -6565,45 +6720,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'>`
@@ -6624,8 +6743,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
                 },
                 {
                   "type": "tpl",
-                  "tpl": "${name}",
-                  // "tpl": "${(record && uiSchema && record[uiSchema.NAME_FIELD_KEY]) || name}",
+                  "tpl": "${NAME_FIELD_VALUE}",
                   "inline": false,
                   "wrapperComponent": "",
                   "className": "record-detail-header-name leading-5 text-xl font-bold"
@@ -6653,7 +6771,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
   let body = [
     {
       "type": "wrapper",
-      "className": "p-0",
+      "className": "p-4 border-b",
       "body": [
         {
           "type": "grid",
@@ -6668,7 +6786,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
   if(showRecordTitle){
     body.push({
       "type": "wrapper",
-      "className": "p-0",
+      "className": "p-4",
       "body": [
         {
           "type": "grid",
@@ -6680,11 +6798,76 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
     });
   }
 
+  let max = 10;
+  if(options.formFactor === 'SMALL'){
+    max = 4;
+  }else {
+
+    let divWidth = window.innerWidth;
+
+    if(options.display === 'split'){
+      divWidth = divWidth - 388;
+    }
+
+    if(document.body.classList.contains('sidebar')){
+      divWidth = divWidth - 210;
+    }
+
+    // 根据屏幕宽度计算显示数量, 使高亮字段只占1行
+    max = Math.trunc(divWidth / 200 );
+    if(max > 10){
+      max = 10;
+    }
+  }
+
+  // console.log('=======================max=========================', max)
+
+  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,
+        });
+      }
+    });
+
+    // 注意: 以下注释不能删除. tailwind css 动态编译时会识别以下注释, 生成对应的样式
+    // lg:grid-cols-1
+    // lg:grid-cols-2
+    // lg:grid-cols-3
+    // lg:grid-cols-4
+    // lg:grid-cols-5
+    // lg:grid-cols-6
+    // lg:grid-cols-7
+    // lg:grid-cols-8
+    // lg:grid-cols-9
+    // lg:grid-cols-10
+    // lg:grid-cols-11
+    // lg:grid-cols-12
+
+    body.push({
+      "type": "wrapper",
+      "body": {
+        "type": "form",
+        // "className": "gap-2 grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5 2xl:grid-cols-5 3xl:grid-cols-8 4xl:grid-cols-8 5xl:grid-cols-10", //max-h-12 overflow-hidden 
+        "className": `gap-2 grid grid-cols-1 lg:grid-cols-${max}`,
+        "wrapWithPanel": false,
+        "actions": [],
+        "body": details,
+        "hiddenOn": "${recordLoaded != true}"
+      },
+      "className": "steedos-record-compact-layouts p-4 bg-white compact-layouts border-b"
+    });
+  }
+
   return {
     type: 'service',
     id: `page_readonly_${name}_header`,
     name: `page`,
-    data: { objectName: name, _id: recordId, recordPermissions: objectSchema.permissions, uiSchema: objectSchema, record: "${record}" },
     body: body, 
     className: ''
   }
@@ -6756,7 +6939,7 @@ async function getObjectRecordDetailRelatedListHeader(relatedObjectSchema, relat
         "className": "flex justify-between"
       }
     ],
-    "className": "p-3"
+    "className": "steedos-record-related-header py-2 px-3 bg-gray-50 border"
   };
   return recordRelatedListHeader;
 }
@@ -7714,7 +7897,7 @@ const getSettingListviewToolbarButtonSchema = ()=>{
         "icon": "fa fa-cog",
         //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
         // "tooltip": i18next.t('frontend_button_listview_control_tooltip'),
-        "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded border-gray-300 text-gray-500",
+        "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded text-gray-500",
         "align": "right",
         "visibleOn": "${!isLookup}",
         "buttons": [
@@ -7741,14 +7924,14 @@ const getDisplayAsButton = function(objectName, showDisplayAs){
     {
       "type": "button",
       "label": i18next.t('frontend_display_type_is_table'),
-      "onClick": "const key = 'tab_"+objectName+"_display';localStorage.setItem(key, 'grid');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');",
+      "onClick": "const key = 'tab_"+objectName+"_display';sessionStorage.setItem(key, 'grid');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": i18next.t('frontend_display_type_is_split'),
-      "onClick": "const key = 'tab_"+objectName+"_display';localStorage.setItem(key, 'split');const url = document.location.pathname + '?display=split'; props.env.jumpTo(url);",
+      "onClick": "const key = 'tab_"+objectName+"_display';sessionStorage.setItem(key, 'split');const url = document.location.pathname + '?display=split'; props.env.jumpTo(url);",
       "rightIcon": displayAs === 'split' ? "fa fa-check" : null,
       "rightIconClassName": "m-l-sm"
     }
@@ -7759,7 +7942,7 @@ const getDisplayAsButton = function(objectName, showDisplayAs){
     "icon": "fa fa-table-columns",
     //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
     // "tooltip": `${i18next.t('frontend_display_as')} ${displayAsLabel}`,
-    "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded border-gray-300 text-gray-500",
+    "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded text-gray-500",
     "align": "right",
     "visibleOn": "${window:innerWidth > 768 && !!!isLookup}",
     "buttons": [ 
@@ -7891,7 +8074,7 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
       {
         "type": "search-box",
         "name": keywordsSearchBoxName,
-        "placeholder": "搜索此列表",
+        "placeholder": "快捷搜索",
         "value": crudKeywords,
         // "clearable": true,//因为清除并不会触发失去焦点事件，只有禁用，但是它会触发change事件，所以等升级到amis 3.4+后可以重新放开
         "clearAndSubmit": true,
@@ -7952,7 +8135,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
     //   //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
     //   // "tooltip": i18next.t('frontend_button_reload_tooltip'),
     //   "tooltipPlacement": "top",
-    //   "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+    //   "className": "bg-white p-2 rounded text-gray-500",
     //   "label": "",
     //   "icon": "fa fa-sync",
     //   "visibleOn": "${!showFieldsFilter}",
@@ -7976,7 +8159,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
       // "tooltip": i18next.t('frontend_button_reload_tooltip'),
       "tooltip":"",
       "tooltipPlacement": "top",
-      "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
+      "className": "bg-white p-2 rounded text-gray-500"
     };
   }
   else {
@@ -7987,7 +8170,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
       // "tooltip": i18next.t('frontend_button_reload_tooltip'),
       "tooltip":"",
       "tooltipPlacement": "top",
-      "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
+      "className": "bg-white p-2 rounded text-gray-500"
     };
   }
   let toolbarFilter;
@@ -8009,7 +8192,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
         "visibleOn": "${isFieldsFilterEmpty == false && isLookup != true}"
       },
       "align": "right",
-      "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+      "className": "bg-white p-2 rounded text-gray-500",
       "onEvent": {
         "click": {
           "actions": [
@@ -8095,7 +8278,10 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
     // ]
     if(options.displayAs === 'split'){
       return [
-        "switch-per-page",
+        {
+          "type": "switch-per-page",
+          "visibleOn": "${count >= 20}"
+        },
         {
           "type": "pagination",
           "maxButtons": 5,
@@ -8117,7 +8303,6 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
   else {
     if(options && options.isRelated){
       return [
-        "statistics",
         {
           "type": "pagination",
           "maxButtons": 10,
@@ -8130,7 +8315,6 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
       const no_pagination = mainObject.paging && (mainObject.paging.enabled === false);
       const is_lookup = options.isLookup;
       const commonConfig = [
-        "statistics",
         {
           "type": "pagination",
           "maxButtons": 10,
@@ -8141,7 +8325,10 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
       if (no_pagination && is_lookup) {
         return commonConfig;
       } else {
-        return ["switch-per-page", ...commonConfig];
+        return [{
+          "type": "switch-per-page",
+          "visibleOn": "${count >= 20}"
+        }, ...commonConfig];
       }
     }
   }
@@ -8165,7 +8352,6 @@ async function getObjectFilter(objectSchema, fields, options) {
         "timeOut": 1000
       }
     });
-    resizeWindow();
     const scope = event.context.scoped;
     // let filterFormValues = event.data;
     let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
@@ -8249,6 +8435,29 @@ function getBulkActions(objectSchema){
         "className": "hidden",
         "id": "batchDelete",
         "api": getBatchDelete(objectSchema.name),
+        "feedback": {
+          "title": "删除警告",
+          "visibleOn": "${deleteErrorMessage}",
+          "body": [
+            {
+              "type": "each",
+              "name": "deleteErrorMessage",
+              "items": {
+                "type": "alert",
+                "body": "${item}",
+                "level": "danger",
+                "className": "mb-3"
+              }
+            }
+          ],
+          "actions": [
+            {
+              "type": "button",
+              "actionType": "close",
+              "label": "关闭"
+            }
+          ]
+        }
       }
         // {
         //   "label": "批量修改",
@@ -8309,7 +8518,7 @@ async function getObjectCRUD(objectSchema, fields, options){
     const bodyProps = {
       // toolbar: getToolbar(),
       // headerToolbar: getObjectHeaderToolbar(objectSchema, options.formFactor, {showDisplayAs}),
-      headerToolbarClassName: "px-4 py-2 border-gray-300 bg-gray-100 border-solid border-b",
+      headerToolbarClassName: "px-4 py-2 border-b",
       footerToolbar: getObjectFooterToolbar(objectSchema, options.formFactor, {
         ...options,
         disableStatistics: options.queryCount === false
@@ -8445,7 +8654,7 @@ async function getObjectCRUD(objectSchema, fields, options){
         //   "is-steedos-crud-data-empty": "${!items || COUNT(items) == 0}"
         // },
         bodyClassName: {
-          "bg-white": "true",
+          "mb-0": true,
           "is-steedos-crud-data-empty": "${!items || COUNT(items) == 0}"
         },
         crudClassName: crudClassName,
@@ -8456,16 +8665,11 @@ async function getObjectCRUD(objectSchema, fields, options){
           headers: {
             Authorization: "Bearer ${context.tenantId},${context.authToken}",
           },
-          requestAdaptor: quickSaveApiRequestAdaptor,
-          adaptor: `
-              if(payload.errors){
-                  payload.status = 2;
-                  payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
-              }
-              return payload;
-          `
+          requestAdaptor: quickSaveApiRequestAdaptor
         },
-        rowClassNameExpr: options.rowClassNameExpr
+        // 外层data发生变化的时候, 不会重新渲染rowClassNameExpr, 所以先用css标记tr唯一标识
+        // 使用表达式给tr添加初始选中状态
+        rowClassNameExpr: options.rowClassNameExpr || "<%= data._id === data.recordId ? 'steedos-record-tr steedos-record-tr-' + data._id + ' steedos-record-selected' : 'steedos-record-tr steedos-record-tr-' + data._id %>" 
       }, bodyProps);
 
     }
@@ -8478,9 +8682,23 @@ async function getObjectCRUD(objectSchema, fields, options){
       crudModeClassName = `steedos-crud-mode-${body.mode}`;
     }
 
+    body.quickSaveApi.adaptor = `
+      if(payload.errors){
+          payload.status = 2;
+          payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
+      }
+      var scope = SteedosUI.getRef(context.scopeId);
+      var scopeParent = scope && scope.parent;
+      var crudScoped = scopeParent.getComponentById('${body.id}');
+      setTimeout(()=>{
+        crudScoped && crudScoped.control.updateAutoFillHeight();
+      }, 500);
+      return payload;
+    `;
+
     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) {
@@ -8538,11 +8756,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: 重写字段定义
@@ -8604,7 +8817,7 @@ async function getFormSchemaWithDataFilter(form, options = {}){
 }
 
 async function getObjectForm(objectSchema, ctx){
-    const { recordId, formFactor, layout = formFactor === 'SMALL' ? 'normal' : "normal", labelAlign, tabId, appId, defaults, submitSuccActions = [], 
+    const { recordId, formFactor, layout = formFactor === 'SMALL' ? 'normal' : "horizontal", labelAlign, tabId, appId, defaults, submitSuccActions = [], 
       formDataFilter, onFormDataFilter, amisData, env } = ctx;
     const fields = ___default.values(objectSchema.fields);
     const formFields = getFormFields$1(objectSchema, ctx);
@@ -8620,9 +8833,7 @@ async function getObjectForm(objectSchema, ctx){
       id: `service_${formSchema.id}`,
       className: 'p-0',
       name: `page_edit_${recordId}`,
-      api: await getEditFormInitApi(objectSchema, recordId, fields, ctx),
       data:{
-        editFormInited: false,
         ...amisData
       },
       // data: {global: getGlobalData('edit'), recordId: recordId, objectName: objectSchema.name, context: {rootUrl: getRootUrl(), tenantId: getTenantId(), authToken: getAuthToken()}},
@@ -8631,8 +8842,9 @@ async function getObjectForm(objectSchema, ctx){
       body: [defaultsDeep({}, formSchema, {
         type: "form",
         mode: layout,
+        initApi: await getEditFormInitApi(objectSchema, recordId, fields, ctx),
         data: {
-          "&": "${initialValues}"
+          editFormInited: false,
         },
         labelAlign,
         persistData: false,
@@ -8646,11 +8858,15 @@ async function getObjectForm(objectSchema, ctx){
         submitText: "", // amis 表单不显示提交按钮, 表单提交由项目代码接管
         api: await getSaveApi(objectSchema, recordId, fields, ctx),
         initFetch: recordId != 'new',
-        body: await getFormBody(fields, formFields, Object.assign({}, ctx, {fieldGroups: objectSchema.field_groups})),
+        body: {
+          type: 'wrapper',
+          className: 'p-0 m-0',
+          body: await getFormBody(fields, formFields, Object.assign({}, ctx, {fieldGroups: objectSchema.field_groups})),
+          hiddenOn: "${editFormInited != true}",
+        },
         panelClassName:'m-0 sm:rounded-lg shadow-none border-none',
         bodyClassName: 'p-0',
         className: 'steedos-amis-form',
-        hiddenOn: "${editFormInited != true}",
         onEvent: {
           "submitSucc": {
             "weight": 0,
@@ -8695,7 +8911,7 @@ async function getObjectForm(objectSchema, ctx){
 }
 
 async function getObjectDetail(objectSchema, recordId, ctx){
-    const { formFactor, layout = formFactor === 'SMALL' ? 'normal' : "normal", labelAlign, 
+    const { formFactor, layout = formFactor === 'SMALL' ? 'normal' : "horizontal", labelAlign, 
       formDataFilter, onFormDataFilter, amisData, env } = ctx;
     const fields = ___default.values(objectSchema.fields);
     const formFields = getFormFields$1(objectSchema, ctx);
@@ -8704,8 +8920,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上控制显隐
@@ -8731,60 +8946,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;
 }
 
@@ -8864,8 +9060,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-24 10:18:17
  * @Description:
  */
 
@@ -8964,7 +9160,9 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
                     const foreign_key_value = arr[2] ? arr[1]+'.'+arr[2] : arr[1];
                     mainRelated[arr[0]] = foreign_key_value;
                 }
-            }else {
+            }
+            // 防止related_lists中没有相关子表，但是details中有相关子表的情况
+            if(!mainRelated[relatedObjectName]){
                 const details = union(mainObjectUiSchema.details,mainObjectUiSchema.lookup_details) || [];
                 for (const detail of details) {
                     const arr = detail.split(".");
@@ -9040,7 +9238,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         setDataToComponentId: componentId,
         // tableHiddenOn: hiddenEmptyTable ? "this.$count === 0" : null,
         appId: appId,
-        crudClassName: 'border-t border-gray-300 hidden',
+        crudClassName: 'steedos-record-related-crud border-l border-r hidden',
         refField,
         ...ctx
     };
@@ -9053,7 +9251,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         amisSchema: {
             type: "service",
             id: componentId,
-            className: `steedos-record-related-list ${componentId} rounded border border-gray-300 bg-gray-100 mb-4 ${className}`,
+            className: `steedos-record-related-list mb-4 last:mb-0 ${componentId} ${className}`,
             data: {
                 relatedKey: relatedKey,   
                 listViewId: `amis-\${appId}-${relatedObjectName}-listview`,
@@ -9245,11 +9443,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-16 11:14:34
  * @Description:
  */
 
@@ -9421,7 +9652,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,
@@ -9747,120 +9978,174 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
                 "label": "对象表单",
                 "objectApiName": "${objectName}",
                 "recordId": "${recordId}",
-                "id": "u:d4a495811d57",
                 appId: appId
             }
         ],
-        "id": "u:5d4e7e3f6ecc"
     };
     const related = {
         "title": i18next.t('frontend_record_detail_tab_related'),
-        "className": "px-0 pt-4",
+        "className": "px-0 py-4",
         "body": [
             {
                 "type": "steedos-object-related-lists",
                 "label": "相关列表",
                 "objectApiName": "${objectName}",
                 "recordId": "${recordId}",
-                "id": "u:3b85b7b7a7f6",
                 appId: appId
             }
         ],
-        "id": "u:1a0326aeec2b"
     };
     const content = {
         "type": "tabs",
-        "className": "sm:mt-3 bg-white sm:rounded sm:border border-gray-300 p-4",
+        "className": "steedos-record-tabs bg-white p-4 mt-3 border-y",
+        "contentClassName": "bg-none",
         "tabs": [
             detailed
         ],
-        "id": "u:a649e4094a12"
     };
     if(relatedLists.length){
         content.tabs.push(related);
     }
+    // content.tabs = 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 = {}) {
+async function getRecordServiceSchema(objectName, appId, props = {}, body) {
     const uiSchema = await getUISchema(objectName);
+    const fields = ___default.values(uiSchema.fields);
+    const serviceId = `u:steedos-record-service-${objectName}`;
     return {
         uiSchema,
         amisSchema: {
-            "type": "service",
-            "body": [],
-            data: {
-                "_master.objectName": "${objectName}",
-                "_master.recordId": "${recordId}"
-            },
-            "style": {
-                "padding": "var(--Page-body-padding)",
-                ...props.style
-            },
+            type: 'service',
+            className: "p-0 m-0",
             onEvent: {
-                "recordLoaded": {
+                [`@data.changed.${objectName}`]: {
                     "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}"
-                            }
+                            "componentId": serviceId,
+                            "expression": "this.__deletedRecord != true"
+                        },
+                        {
+                            "actionType": "custom",
+                            "script": "window.goBack()",
+                            "expression": "this.__deletedRecord === true"
                         }
                     ]
                 },
-                ...props.onEvent
+            },
+            body: {
+                "type": "service",
+                id: serviceId,
+                className: 'steedos-record-service p-0',
+                api: await getReadonlyFormInitApi(uiSchema, props.recordId, fields, props),
+                body:  {
+                    "type": "wrapper",
+                    "className": "p-0 m-0",
+                    "body": body || [],
+                    "hiddenOn": "${recordLoaded != true}"
+                  },
+                data: {
+                    "_master.objectName": "${objectName}",
+                    "_master.recordId": "${recordId}",
+                    ...(props.data || {})
+                },
+                "style": {
+                    // "padding": "var(--Page-body-padding)",
+                    ...props.style
+                },
+                onEvent: {
+                    // 如果定义了fetchInited,则无法接收到广播事件@data.changed
+                    "fetchInited": {  
+                        "weight": 0,
+                        "actions": [
+                            {
+                                actionType: 'broadcast',
+                                eventName: "recordLoaded",
+                                data: {
+                                    objectName: "${event.data.__objectName}",
+                                    record: "${event.data.record}"
+                                },
+                                expression: "${event.data.__response.error != true}"
+                            },
+                        ]
+                    },
+                    ...props.onEvent
+                }
             }
         }
+        
+        
     }
 }
 
-// 获取单个相关表
-async function getObjectRelated(
-    {appName,
-    masterObjectName,
-    objectName,
-    relatedFieldName,
-    recordId,
+async function getRecordDetailMiniSchema(objectName, appId, props = {}){
+    const uiSchema = await getUISchema(objectName);
+    const fields = ___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,
+    masterObjectName,
+    objectName,
+    relatedFieldName,
+    recordId,
     formFactor}
 ) {
     let filter = null;
@@ -10413,17 +10698,13 @@ function getReferenceToSync(field) {
 
 function getLookupSapceUserTreeSchema(isMobile){
     let apiAdaptor = `
-        // console.log("===getLookupSapceUserTreeSchema===", JSON.stringify(payload));
         const records = payload.data.options;
-        let isTreeOptionsComputed = false;
-        if(records.length === 1 && records[0].children){
-            isTreeOptionsComputed = true;
-        }
-        if(isTreeOptionsComputed){
-            return payload;
-        }
         const treeRecords = [];
-        const getChildren = (records, childrenIds) => {
+        const getChildren = (currentRecord, records, childrenIds) => {
+            if (currentRecord.children && typeof currentRecord.children[0] === "object") {
+                // 考虑api配置了cache缓存的话，不会请求接口但是会重新进这个接收适配器脚本且payload.data.options返回的会是上一次计算结果，这里直接返回计算过的children
+                return currentRecord.children;
+            }
             if (!childrenIds) {
                 return;
             }
@@ -10432,7 +10713,7 @@ function getLookupSapceUserTreeSchema(isMobile){
             });
             _.each(children, (item) => {
                 if (item.children) {
-                    item.children = getChildren(records, item.children)
+                    item.children = getChildren(item, records, item.children)
                 }else{
                     item.children = [];
                 }
@@ -10458,7 +10739,7 @@ function getLookupSapceUserTreeSchema(isMobile){
         
         _.each(records, (record) => {
             if (record.noParent == 1) {
-                treeRecords.push(Object.assign({}, record, { children: getChildren(records, record.children) }));
+                treeRecords.push(Object.assign({}, record, { children: getChildren(record, records, record.children) }));
             }
         });
         console.log(treeRecords)
@@ -10508,6 +10789,7 @@ function getLookupSapceUserTreeSchema(isMobile){
           }
         },
         "label": "",
+        "mode": "normal",
         "name": "organizations",
         "multiple": false,
         "joinValues": false,
@@ -10650,6 +10932,9 @@ async function lookupToAmisPicker(field, readonly, ctx){
         }
     });
 
+    let listviewFilter = getListViewFilter(listView);
+    let listviewFiltersFunction = listView && listView._filters;
+
     let sort = "";
     if(listView){
         sort = getListViewSort(listView);
@@ -10696,7 +10981,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
             Object.assign(api.data.$self, __changedSearchBoxValues, __changedFilterFormValues);
         }
         const selfData = JSON.parse(JSON.stringify(api.data.$self));
-        var filters = [];
+        ${listviewFilter && !ctx.inFilterForm ? `var filters = ${JSON.stringify(listviewFilter)};` : 'var filters = [];'}
         var pageSize = api.data.pageSize || 10;
         var pageNo = api.data.pageNo || 1;
         var skip = (pageNo - 1) * pageSize;
@@ -10758,6 +11043,16 @@ async function lookupToAmisPicker(field, readonly, ctx){
         }
         
         const inFilterForm = ${ctx.inFilterForm};
+
+        const listviewFiltersFunction = ${listviewFiltersFunction};
+
+        if(listviewFiltersFunction && !inFilterForm){
+            const _filters0 = listviewFiltersFunction(filters, api.data.$self.__super);
+            if(_filters0 && _filters0.length){
+                filters.push(_filters0);
+            }
+        }
+        
         const filtersFunction = ${field.filtersFunction || field._filtersFunction};
 
         if(filtersFunction && !inFilterForm){
@@ -11070,6 +11365,9 @@ async function lookupToAmisSelect(field, readonly, ctx){
     const refObjectConfig = referenceTo && await getUISchema(referenceTo.objectName);
     let listView = getLookupListView(refObjectConfig);
 
+    let listviewFilter = getListViewFilter(listView);
+    let listviewFiltersFunction = listView && listView._filters;
+
     let sort = "";
     if(listView){
         sort = getListViewSort(listView);
@@ -11099,7 +11397,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
     apiInfo.data['rfield'] = `\${object_name}`;
     // [["_id", "=", "$${field.name}._id"],"or",["name", "contains", "$term"]]
     apiInfo.requestAdaptor = `
-        var filters = [];
+        ${listviewFilter && !ctx.inFilterForm ? `var filters = ${JSON.stringify(listviewFilter)};` : 'var filters = [];'}
         var top = 200;
         if(api.data.$term){
             filters = [["${referenceTo?.NAME_FIELD_KEY || 'name'}", "contains", api.data.$term]];
@@ -11122,6 +11420,16 @@ async function lookupToAmisSelect(field, readonly, ctx){
         }
 
         const inFilterForm = ${ctx.inFilterForm};
+
+        const listviewFiltersFunction = ${listviewFiltersFunction};
+
+        if(listviewFiltersFunction && !inFilterForm){
+            const _filters0 = listviewFiltersFunction(filters, api.data.$);
+            if(_filters0 && _filters0.length){
+                filters.push(_filters0);
+            }
+        }
+        
         const filtersFunction = ${field.filtersFunction || field._filtersFunction};
 
         if(filtersFunction && !inFilterForm){
@@ -11244,9 +11552,17 @@ async function lookupToAmis(field, readonly, ctx){
     }
     // console.log(`lookupToAmis====`, field, readonly, ctx)
     if(readonly){
-        return {
-            type: getAmisStaticFieldType('picker', readonly),
-            tpl: getRelatedFieldTpl(field, ctx)
+        if(field.reference_to){
+            return {
+                type: 'steedos-field',
+                config: field,
+                static: true
+            }
+        }else {
+            return {
+                type: getAmisStaticFieldType('picker', readonly),
+                tpl: getRelatedFieldTpl(field, ctx)
+            }
         }
     }
     if(field.reference_to && !_$1.isString(field.reference_to) && !readonly){
@@ -11898,13 +12214,31 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             };
             break;
         case 'input-datetime-range':
+            // convertData = {
+            //     type: "input-datetime-range",
+            //     inputFormat: 'YYYY-MM-DD HH:mm',
+            //     format:'YYYY-MM-DDTHH:mm:ss.SSSZ',
+            //     tpl: readonly ? Tpl.getDateTimeTpl(field) : null,
+            //     utc: true,
+            //     joinValues: false
+            // }
+            // 日期时间字段，按日期方式展现显示控件，用户不用关心小时分钟
             convertData = {
-                type: "input-datetime-range",
-                inputFormat: 'YYYY-MM-DD HH:mm',
+                type: "input-date-range",
+                inputFormat: "YYYY-MM-DD HH:mm",
                 format:'YYYY-MM-DDTHH:mm:ss.SSSZ',
                 tpl: readonly ? getDateTimeTpl(field) : null,
                 utc: true,
-                joinValues: false
+                joinValues: false,
+                "shortcuts": [
+                    "thismonth",
+                    "2monthsago",
+                    "3monthslater",
+                    "prevquarter",
+                    "thisquarter",
+                    "thisyear",
+                    "lastYear"
+                  ]
             };
             break;
         case 'datetime':
@@ -11955,7 +12289,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             convertData = {
                 type: getAmisStaticFieldType('datetime', readonly),
                 inputFormat: 'YYYY-MM-DD HH:mm',
-                format: 'YYYY-MM-DDTHH:mm:ss.SSSZ',
+                format: 'YYYY-MM-DDTHH:mm:00.000Z',
                 tpl: readonly ? getDateTimeTpl(field) : null,
                 utc: true,
             };
@@ -12086,6 +12420,36 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                 convertData = {
                     type: 'static-text'
                 };
+            }else if(field.autonumber_enable_modify){
+                convertData = {
+                    "type": "input-group",
+                    "body": [
+                        {
+                            "type": "input-text",
+                            "name": field.name
+                        },
+                        {
+                            "type": "button",
+                            "label": "自动获取",
+                            "actionType": "ajax",
+                            "api": {
+                                "url": `\${context.rootUrl}/api/autonumber/generator/\${objectName}/${field.name}`,
+                                "method": "post",
+                                "headers": {
+                                    "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                },
+                                "adaptor": `
+                                    payload.data["${field.name}"] = payload.data && payload.data.autonumber;
+                                    delete payload.data.autonumber;
+                                    return payload;
+                                `
+                            },
+                            "messages": {
+                                "success": "获取成功"
+                            }
+                        }
+                    ]
+                };
             }
             break;
         case 'url':
@@ -12240,11 +12604,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
@@ -12296,9 +12658,9 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
         if(field.is_wide || convertData.type === 'group'){
             convertData.className = 'col-span-2 m-0';
         }else {
-            convertData.className = 'm-1';
+            convertData.className = 'm-0';
         }
-        if(readonly){
+        if(readonly && ctx.mode !== 'edit'){
             convertData.className = `${convertData.className} border-b`;
         }
         if(readonly){
@@ -12321,6 +12683,10 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             }
         }
 
+        if(ctx.amisData && ctx.amisData._master && ctx.amisData._master.relatedKey === field.name){
+            convertData.className = `${convertData.className || ''} hidden`;
+        }
+
         if(_$1.isString(baseData.required)){
             if(baseData.required.startsWith("{{")){
                 baseData.requiredOn = `${baseData.required.substring(2, baseData.required.length -2).replace(/formData./g, 'data.')}`;
@@ -12389,8 +12755,9 @@ async function getFieldSearchable(perField, permissionFields, ctx){
             fieldNamePrefix = `${fieldNamePrefix}between__`;
         }
         if(_field.type === 'datetime'){
-            // 特意改为日期范围而不是日期时间范围，因为搜索时一般精确到日期就足够了，需要精确到日期时间范围需要在字段上配置amis属性来实现
-            _field.type = 'input-date-range';
+            // 这里如果想把搜索范围展示效果改为日期范围，不可以直接改为input-date-range，因为它们规则不一样，包括时区规则和小时分秒的存值规则都不一样
+            // 所以想改为展示日期范围效果，只能改input-datetime-range类型本身的属性来实现
+            _field.type = 'input-datetime-range';
             _field.is_wide = true;
             fieldNamePrefix = `${fieldNamePrefix}between__`;
         }
@@ -12576,6 +12943,13 @@ const getSection = async (formFields, permissionFields, fieldSchemaArray, sectio
     }
   }
 
+  fieldSetBody.forEach((field)=>{
+    //判断label是否存在，不存在时将label的空占位元素隐藏
+    if(!field.label){
+      field.labelClassName = "none";
+    }
+  });
+
   // fieldSet 已支持显隐控制
   const sectionFieldsVisibleOn = _$1.map(_$1.compact(_$1.map(fieldSetBody, 'visibleOn')), (visibleOn) => {
     let visible = visibleOn;
@@ -12698,19 +13072,200 @@ async function getFormBody(permissionFields, formFields, ctx){
     return await getSections(permissionFields, formFields, ctx);
 }
 
+/*
+ * @Author: 殷亮辉 yinlianghui@hotoa.com
+ * @Date: 2024-01-18 15:12:41
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2024-01-18 15:12:49
+ */
+/**
+ * 生成符合标准uuid格式的36位满足唯一性的随机串
+ * @returns uuid
+ */
+function uuidv4() {
+    return "10000000-1000-4000-8000-100000000000".replace(/[018]/g, c =>
+        (c ^ window.crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
+    );
+}
+
 /*
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
- * @LastEditors: liaodaxue
- * @LastEditTime: 2024-01-09 18:12:28
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2024-01-26 17:47:16
+ */
+
+/**
+ * 子表组件字段值中每行数据补上字段值为空的的字段值，把值统一设置为空字符串，是为了解决amis amis 3.6/6.0 input-table组件bug:行中字段值为空时会显示为父作用域中的同名变量值，见：https://github.com/baidu/amis/issues/9520
+ * amis #9520修正后此函数及相关代码可以移除
+ * @param {*} value 子表组件字段值，数组
+ * @param {*} fields 子表组件fields属性，数组
+ * @returns 转换后的子表组件字段值
+ */
+function getTableValueWithEmptyValue(value, fields) {
+    return (value || []).map((itemValue) => {
+        //这里不clone的话，会造成在pipeIn函数执行该函数后像pipeOut一样最终输出到表单项中，即库里字段值会被改了
+        const newItemValue = clone(itemValue);
+        (fields || []).forEach((itemField) => {
+            if(itemField.name && (newItemValue[itemField.name] === undefined || newItemValue[itemField.name] === null)){
+                // 这里newItemValue中不存在 itemField.name 属性，或者值为null时都会有“显示为父作用域中的同名变量值”的问题，所以null和undefined都要重置为空字符串
+                // 实测数字、下拉框、多选lookup等字段类型重置为空字符串都不会有问题，而且实测amis from组件的清空表单字段值功能就是把表单中的各种字段类型设置为空字符串，所以看起来也符合amis规范
+                newItemValue[itemField.name] = "";
+            }
+            if (newItemValue.children) {
+                newItemValue.children = getTableValueWithEmptyValue(newItemValue.children, fields);
+            }
+        });
+        return newItemValue;
+    });
+}
+
+/**
+ * 把子表组件字段值中每行数据中经过上面getTableValueWithEmptyValue函数空字段值移除
+ * amis #9520修正后此函数及相关代码可以移除
+ * @param {*} value 子表组件字段值，数组
+ * @param {*} fields 子表组件fields属性，数组
+ * @returns 转换后的子表组件字段值
+ */
+function getTableValueWithoutEmptyValue(value, fields) {
+    return (value || []).map((itemValue) => {
+        const newItemValue = clone(itemValue);
+        (fields || []).forEach((itemField) => {
+            if(itemField.name && (newItemValue[itemField.name] === "" || newItemValue[itemField.name] === undefined || newItemValue[itemField.name] === null)){
+                // 这里额外把null和undefined值也删除掉纯粹是没必要输出保存它们
+                delete newItemValue[itemField.name];
+            }
+            if (newItemValue.children) {
+                newItemValue.children = getTableValueWithoutEmptyValue(newItemValue.children, fields);
+            }
+        });
+        return newItemValue;
+    });
+}
+
+function getTablePrimaryKey(props) {
+    return props.primaryKey || "_id";
+}
+
+/**
+ * 子表组件字段值中每行数据的补上唯一标识字段值，其值为随机uuid
+ * @param {*} value 子表组件字段值，数组
+ * @param {*} primaryKey 主键字段名，一般为_id
+ * @returns 转换后的子表组件字段值
+ */
+function getTableValueWithPrimaryKeyValue(value, primaryKey) {
+    if (!primaryKey) {
+        return value;
+    }
+    return (value || []).map((itemValue) => {
+        //这里不clone的话，会造成在pipeIn函数执行该函数后像pipeOut一样最终输出到表单项中，即库里把primaryKey字段值保存了
+        const newItemValue = clone(itemValue);
+        if (newItemValue[primaryKey]) {
+            if (newItemValue.children) {
+                newItemValue.children = getTableValueWithPrimaryKeyValue(newItemValue.children, primaryKey);
+            }
+            return newItemValue;
+        }
+        else {
+            newItemValue[primaryKey] = uuidv4();
+            if (newItemValue.children) {
+                newItemValue.children = getTableValueWithPrimaryKeyValue(newItemValue.children, primaryKey);
+            }
+            return newItemValue;
+        }
+    });
+}
+
+/**
+ * 子表组件字段值中每行数据的移除唯一标识字段值，因为该字段值一般只作临时标记，不存库
+ * @param {*} value 子表组件字段值，数组
+ * @param {*} primaryKey 主键字段名，一般为_id
+ * @returns 转换后的子表组件字段值
+ */
+function getTableValueWithoutPrimaryKeyValue(value, primaryKey) {
+    if (!primaryKey) {
+        return value;
+    }
+    return (value || []).map((itemValue) => {
+        //这里clone只是为了保险，不是必须的，每次修改子表数据是否都会生成新的primaryKey字段值是由pipeOut中识别autoGeneratePrimaryKeyValue决定的，跟这里没关系
+        const newItemValue = clone(itemValue);
+        if (newItemValue.children) {
+            newItemValue.children = getTableValueWithoutPrimaryKeyValue(newItemValue.children, primaryKey);
+        }
+        delete newItemValue[primaryKey];
+        return newItemValue;
+    });
+}
+
+/**
+ * 子表组件字段值中每行数据的键值key移除指定前缀
+ * @param {*} value 子表组件字段值，数组
+ * @param {*} fieldPrefix 字段前缀
+ * @returns 转换后的子表组件字段值
+ */
+function getTableValueWithoutFieldPrefix(value, fieldPrefix) {
+    let convertedValue = [];
+    (value || []).forEach((itemValue) => {
+        var newItemValue = {};
+        for (let n in itemValue) {
+            if (itemValue.hasOwnProperty(n)) {
+                newItemValue[n.replace(new RegExp(`^${fieldPrefix}`), "")] = itemValue[n];
+            }
+        }
+        convertedValue.push(newItemValue);
+    });
+    return convertedValue;
+}
+
+/**
+ * 子表组件字段值中每行数据的键值key补上指定前缀
+ * @param {*} value 子表组件字段值，数组
+ * @param {*} fieldPrefix 字段前缀
+ * @param {*} primaryKey 主键字段名，主键不参与被键值key规则，需要排除，审批王amis表单也是这个规则
+ * @returns 转换后的子表组件字段值
  */
+function getTableValuePrependFieldPrefix(value, fieldPrefix, primaryKey) {
+    let convertedValue = [];
+    (value || []).forEach((itemValue) => {
+        var newItemValue = {};
+        for (let n in itemValue) {
+            if (itemValue.hasOwnProperty(n) && typeof itemValue[n] !== undefined && n !== primaryKey) {
+                newItemValue[`${fieldPrefix}${n}`] = itemValue[n];
+            }
+        }
+        if (primaryKey && itemValue[primaryKey]) {
+            newItemValue[primaryKey] = itemValue[primaryKey];
+        }
+        convertedValue.push(newItemValue);
+    });
+    return convertedValue;
+}
+
+/**
+ * 子表组件字段集合属性中每个字段name移除指定前缀
+ * @param {*} fields 子表组件字段集合，数组
+ * @param {*} fieldPrefix 字段前缀
+ * @returns 转换后的子表组件字段值
+ */
+function getTableFieldsWithoutFieldPrefix(fields, fieldPrefix) {
+    return (fields || []).map((item) => {
+        const newItem = clone(item);//这里不clone的话，会造成子表组件重新render，从而审批王那边点开子表行编辑窗口时报错
+        newItem.name = newItem.name.replace(new RegExp(`^${fieldPrefix}`), "");
+        return newItem;
+    });
+}
 
 /**
  * @param {*} props 
  * @param {*} mode edit/new/readonly
  */
 function getFormFields(props, mode = "edit") {
-    return (props.fields || []).map(function (item) {
+    let fieldPrefix = props.fieldPrefix;
+    let fields = props.fields || [];
+    if (fieldPrefix) {
+        fields = getTableFieldsWithoutFieldPrefix(fields, fieldPrefix);
+    }
+    return (fields || []).map(function (item) {
         let formItem = {
             "type": "steedos-field",
             "name": item.name,
@@ -12730,6 +13285,7 @@ function getInputTableCell(field, showAsInlineEditMode) {
             name: field.name,
             quickEdit: {
                 "type": "steedos-field",
+                "mode": "inline",
                 "config": Object.assign({}, field, {
                     label: false
                 })
@@ -12782,7 +13338,12 @@ async function getInputTableColumns(props) {
     let inlineEditMode = props.inlineEditMode;
     let showAsInlineEditMode = inlineEditMode && props.editable;
     // 实测过，直接不生成对应的隐藏column并不会对input-table值造成丢失问题，隐藏的列字段值能正常维护
-    let fields = props.fields;
+
+    let fieldPrefix = props.fieldPrefix;
+    let fields = props.fields || [];
+    if (fieldPrefix) {
+        fields = getTableFieldsWithoutFieldPrefix(fields, fieldPrefix);
+    }
     if (columns && columns.length) {
         return columns.map(function (column) {
             let field, extendColumnProps = {};
@@ -12804,7 +13365,9 @@ async function getInputTableColumns(props) {
                 }
             }
             if (field) {
-                let tableCell = getInputTableCell(field, showAsInlineEditMode);
+                let mode = typeof extendColumnProps.inlineEditMode === "boolean" ?
+                    extendColumnProps.inlineEditMode : showAsInlineEditMode;
+                let tableCell = getInputTableCell(field, mode);
                 return Object.assign({}, tableCell, extendColumnProps);
             }
             else {
@@ -12827,7 +13390,7 @@ async function getInputTableColumns(props) {
  */
 function getFormPagination(props, mode) {
     let showPagination = true;
-    if(mode === "new" && !!!props.editable){
+    if (mode === "new" && !!!props.editable) {
         //不允许编辑只允许新建时不应该让用户操作翻页
         showPagination = false;
     }
@@ -12843,23 +13406,41 @@ function getFormPagination(props, mode) {
         let __formId = "${formId}";
         let fieldValue = event.data.__tableItems;//这里不可以_.cloneDeep，因为翻页form中用的是event.data.__tableItems，直接变更其值即可改变表单中的值
         let pageChangeDirection = context.props.pageChangeDirection;
+        let mode = "${mode}";
         // event.data中的index和__page分别表示当前要把表单数据提交到的行索引和用于标定下一页页码的当前页页码
         // 一般来说__page = index + 1，但是可以让event.data中传入__page和index值不是这种联系。
         // 比如__page设置为3，index设置为0表示把当前表单数据提交到第一页，但是跳转到第4页，弹出的表单中底下的新增和复制按钮依赖了此功能
         // let currentPage = currentIndex + 1;
         let currentPage = event.data.__page;
         let currentIndex = event.data.index;
-        // 翻页到下一页之前需要先把当前页改动的内容保存到中间变量__tableItems中
-        let currentFormValues = scope.getComponentById(__formId).getValues();
-        fieldValue[currentIndex] = currentFormValues;
-        // 翻页到下一页前需要同时把改动的内容保存到最终正式的表单字段中，所以额外给正式表单字段执行一次setValue
-        doAction({
-            "componentId": "${props.id}",
-            "actionType": "setValue",
-            "args": {
-                "value": fieldValue
+        if(mode !== "readonly"){
+            // 新建编辑时，翻页才需要把当前页表单保存，只读时直接翻页即可
+            // 翻页到下一页之前需要先把当前页改动的内容保存到中间变量__tableItems中
+            let currentFormValues = scope.getComponentById(__formId).getValues();
+            // 这里不clone的话，其值会带上__super属性
+            currentFormValues = _.clone(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;
+            }
+            // 翻页到下一页前需要同时把改动的内容保存到最终正式的表单字段中，所以额外给正式表单字段执行一次setValue
+            doAction({
+                "componentId": "${props.id}",
+                "actionType": "setValue",
+                "args": {
+                    "value": fieldValue
+                }
+            });
+        }
 
         // 以下是翻页逻辑，翻到下一页并把下一页内容显示到表单上
         let targetPage;
@@ -12908,9 +13489,14 @@ function getFormPagination(props, mode) {
                 "onEvent": {
                     "click": {
                         "actions": [
+                            {
+                                "actionType": "validate",
+                                "componentId": formId
+                            },
                             {
                                 "actionType": "custom",
-                                "script": onPageChangeScript
+                                "script": onPageChangeScript,
+                                "expression": "${!!!event.data.validateResult.error}" //触发表单校验结果会存入validateResult，amis 3.2不支持，高版本比如 3.5.3支持
                             }
                         ]
                     }
@@ -12918,7 +13504,8 @@ function getFormPagination(props, mode) {
             },
             {
                 "type": "tpl",
-                "tpl": "${__page}/${__tableItems.length}"
+                // 这里用__super.parent，加__super是为了防止当前记录有字段名为parent的重名变量
+                "tpl": "${__page}/${__super.parent ? COMPACT(__tableItems[__parentIndex]['children']).length : COMPACT(__tableItems).length}"
             },
             {
                 "type": "button",
@@ -12926,15 +13513,22 @@ function getFormPagination(props, mode) {
                 "icon": `fa fa-angle-right`,
                 "level": "link",
                 "pageChangeDirection": "next",
-                "disabledOn": showPagination ? "${__page >= __tableItems.length}" : "true",
+                // "disabledOn": showPagination ? "${__page >= __tableItems.length}" : "true",
+                // 这里用__super.parent，加__super是为了防止当前记录有字段名为parent的重名变量
+                "disabledOn": showPagination ? "${__page >= (__super.parent ? COMPACT(__tableItems[__parentIndex]['children']).length : COMPACT(__tableItems).length)}" : "true",
                 "size": "sm",
                 "id": buttonNextId,
                 "onEvent": {
                     "click": {
                         "actions": [
+                            {
+                                "actionType": "validate",
+                                "componentId": formId
+                            },
                             {
                                 "actionType": "custom",
-                                "script": onPageChangeScript
+                                "script": onPageChangeScript,
+                                "expression": "${!!!event.data.validateResult.error}" //触发表单校验结果会存入validateResult，amis 3.2不支持，高版本比如 3.5.3支持
                             }
                         ]
                     }
@@ -12955,18 +13549,19 @@ function getFormPaginationWrapper(props, form, mode) {
     // console.log("==getFormPaginationWrapper===", props, mode);
     let serviceId = getComponentId("form_pagination", props.id);
     let tableServiceId = getComponentId("table_service", props.id);
+    let primaryKey = getTablePrimaryKey(props);
     let innerForm = Object.assign({}, form, {
         "data": {
             // 这里加__super前缀是因为__parentForm变量（即主表单）中可能会正好有名为index的字段
             // 比如“对象字段”对象options字段是一个子表字段，但是主表（即“对象字段”对象）中正好有一个名为index的字段
-            "&": "${__tableItems[__super.index]}"
+            "&": "${__super.parent ? __tableItems[__parentIndex]['children'][__super.index] : __tableItems[__super.index]}"
         }
     });
     let formBody = [
         {
             "type": "wrapper",
             "size": "none",
-            "className": "flex justify-end sticky top-0 right-0 left-0 z-20 bg-white -mt-2",
+            "className": "flex justify-end sticky top-0 right-0 left-0 z-20 bg-white",
             "body": [
                 getFormPagination(props, mode)
             ]
@@ -12982,7 +13577,7 @@ function getFormPaginationWrapper(props, form, mode) {
         }
     ];
     let onServiceInitedScript = `
-        // 以下脚本是为了解决有时弹出编辑表单时，表单中的值比最后一次编辑保存的值会延迟一拍。
+        // 以下脚本解决了有时弹出编辑表单时，表单中的值比最后一次编辑保存的值会延迟一拍。
         // 比如：inlineEditMode模式时，用户在表格单元格中直接修改数据，然后弹出的表单form中并没有包含单元格中修改的内容
         // 另外有的地方在非inlineEditMode模式时也会有这种延迟一拍问题，比如对象字段中下拉框类型字段的”选择项“属性
         // 再比如工作流规则详细页面修改了子表字段”时间触发器“值后，在只读界面点击查看按钮弹出的表单中__tableItems值是修改前的值
@@ -12995,8 +13590,13 @@ function getFormPaginationWrapper(props, form, mode) {
         // 这里不可以用event.data["${props.name}"]因为amis input talbe有一层单独的作用域，其值会延迟一拍
         // 这里如果不.clone的话，在弹出窗口中显示的子表组件，添加行后点窗口的取消按钮关闭窗口后无法把之前的操作还原，即把之前添加的行自动移除
         let lastestFieldValue = _.clone(wrapperServiceData["${props.name}"] || []);
+        let fieldPrefix = "${props.fieldPrefix || ''}";
+        if(fieldPrefix){
+            let getTableValueWithoutFieldPrefix = new Function('v', 'f', "return (" + ${getTableValueWithoutFieldPrefix.toString()} + ")(v, f)");
+            lastestFieldValue = getTableValueWithoutFieldPrefix(lastestFieldValue, fieldPrefix);
+        }
         //不可以直接像event.data.__tableItems = lastestFieldValue; 这样整个赋值，否则作用域会断
-        let mode = "${mode}";
+        let mode = "${mode || ''}";
         if(mode === "new"){
             // 点击子表组件底部新增按钮时新增一条空白行并自动翻页到新增行
             // 注意点击弹出的子表行详细表单中的新增按钮不会进此service init事件函数中
@@ -13017,6 +13617,26 @@ function getFormPaginationWrapper(props, form, mode) {
         event.data.__tableItems.forEach(function(n,i){
             event.data.__tableItems[i] = lastestFieldValue[i];
         });
+
+        var parent = event.data.parent;
+        var fieldValue = event.data.__tableItems;
+        if(parent){
+            // 如果是子行，即在节点嵌套情况下，当前节点如果是children属性下的子节点时，则算出其所属父行的索引值
+            var primaryKey = "${primaryKey}";
+            event.data.__parentIndex = _.findIndex(fieldValue, function(item){
+                return item[primaryKey] == parent[primaryKey];
+            });
+            if(event.data.__parentIndex < 0){
+                let tableId = "${props.id}";
+                let table = scope.getComponentById(tableId)
+                // autoGeneratePrimaryKeyValue不为true的情况下，即子表组件input-table的pipeOut函数中会移除表单了子表字段的primaryKey字段值，
+                // 此时行primaryKey字段值为空，但是pipeIn函数中已经为input-table自动生成过primaryKey字段值了，只是没有输出到表单字段值中而已
+                // 所以上面从表单字段值中没找到__parentIndex，是因为此时行primaryKey字段值只经过pipeIn保存到table组件内而没有保存到tableService
+                event.data.__parentIndex = _.findIndex(table.props.value, function(item){
+                    return item[primaryKey] == parent[primaryKey];
+                });
+            }
+        }
     `;
     let schema = {
         "type": "service",
@@ -13037,6 +13657,7 @@ function getFormPaginationWrapper(props, form, mode) {
         // "body": formBody,
         "data": {
             "__page": "${index + 1}",
+            "__parentIndex": null,//兼容节点嵌套情况，即节点中有children属性时，这里记录当前节点所属上层节点index，只支持向上找一层，不支持多层
             // "__total": `\${${props.name}.length}`,
             // "__total": "${__tableItems.length}",
             // "__paginationServiceId": serviceId,
@@ -13063,6 +13684,7 @@ function getFormPaginationWrapper(props, form, mode) {
 async function getForm(props, mode = "edit", formId) {
     let formFields = getFormFields(props, mode);
     let body = await getFormBody(null, formFields);
+    let primaryKey = getTablePrimaryKey(props);
     if (!formId) {
         formId = getComponentId("form", props.id);
     }
@@ -13081,10 +13703,41 @@ async function getForm(props, mode = "edit", formId) {
         // 新增行弹出编辑行表单，在弹出之前已经不用先增加一行，因为在翻页service初始化的时候会判断mode为new时自动新增一行
         let onEditItemSubmitScript = `
             // let fieldValue = _.cloneDeep(event.data["${props.name}"]);
+            let removeEmptyItems = function(items){
+                let i = _.findIndex(items, function(item){
+                    return item === undefined
+                });
+                if(i > -1){
+                    items.splice(i, 1);
+                    removeEmptyItems(items);
+                }
+            }
+            // 因为删除时只是把input-table组件中的行数据删除了，并没有把父层service中的行删除，所以__tableItems会有值为undefined的数据，需要移除掉
+            // 不用event.data.__tableItems = _.compact(event.data.__tableItems)是因为会把__tableItems变量保存到表单中
+            removeEmptyItems(event.data.__tableItems);
             let fieldValue = event.data.__tableItems;//这里不可以_.cloneDeep，因为翻页form中用的是event.data.__tableItems，直接变更其值即可改变表单中的值
             //这里加__super.__super前缀是因为__parentForm变量（即主表单）中可能会正好有名为index的字段
             // 比如“对象字段”对象options字段是一个子表字段，但是主表（即“对象字段”对象）中正好有一个名为index的字段
-            fieldValue[event.data.__super.__super.index] = JSON.parse(JSON.stringify(event.data));
+            // fieldValue[event.data.__super.__super.index] = JSON.parse(JSON.stringify(event.data));
+            var currentIndex = event.data.__super.__super.index;
+            var currentFormValues = JSON.parse(JSON.stringify(event.data));
+            var parent = event.data.__super.__super.parent;
+            var __parentIndex = event.data.__super.__super.__parentIndex;
+            let uuidv4 = new Function("return (" + ${uuidv4.toString()} + ")()");
+            var primaryKey = "${primaryKey}";
+            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{
+                // 这里currentFormValues中如果没有primaryKey字段值不用处理，因为组件的pipeIn/pipeOut中会为每行自动生成
+                // 也不用担心复制行时_id会重复，因为点击复制按钮时已经处理过了
+                fieldValue[currentIndex] = currentFormValues;
+            }
             doAction({
                 "componentId": "${props.id}",
                 "actionType": "setValue",
@@ -13180,13 +13833,14 @@ async function getForm(props, mode = "edit", formId) {
  */
 async function getButtonActions(props, mode) {
     let actions = [];
+    let primaryKey = getTablePrimaryKey(props);
     let formId = getComponentId("form", props.id);
     let dialogId = getComponentId("dialog", props.id);
     let buttonNextId = getComponentId("button_next", props.id);
     let formPaginationId = getComponentId("form_pagination", props.id);
     let parentFormData = "${__super.__super.__super.__super || {}}";
     let amisVersion = getComparableAmisVersion();
-    if(amisVersion < 3.6){
+    if (amisVersion < 3.6) {
         parentFormData = "${__super.__super || {}}";
     }
     if (mode == "new" || mode == "edit") {
@@ -13222,9 +13876,42 @@ async function getButtonActions(props, mode) {
         // };
         let onSaveAndNewItemScript = `
             let scope = event.context.scoped;
+            let removeEmptyItems = function(items){
+                let i = _.findIndex(items, function(item){
+                    return item === undefined
+                });
+                if(i > -1){
+                    items.splice(i, 1);
+                    removeEmptyItems(items);
+                }
+            }
+            // 因为删除时只是把input-table组件中的行数据删除了，并没有把父层service中的行删除，所以__tableItems会有值为undefined的数据，需要移除掉
+            // 不用event.data.__tableItems = _.compact(event.data.__tableItems)是因为会把__tableItems变量保存到表单中
+            removeEmptyItems(event.data.__tableItems);
             let fieldValue = event.data.__tableItems;//这里不可以_.cloneDeep，因为翻页form中用的是event.data.__tableItems，直接变更其值即可改变表单中的值
             // 新建一条空白行并保存到子表组件
-            fieldValue.push({});
+            var parent = event.data.__super.parent;
+            var primaryKey = "${primaryKey}";
+            var __parentIndex = parent && _.findIndex(fieldValue, function(item){
+                return item[primaryKey] == parent[primaryKey];
+            });
+            if(parent && __parentIndex < 0){
+                let tableId = "${props.id}";
+                let table = scope.getComponentById(tableId)
+                // autoGeneratePrimaryKeyValue不为true的情况下，即子表组件input-table的pipeOut函数中会移除表单了子表字段的primaryKey字段值，
+                // 此时行primaryKey字段值为空，但是pipeIn函数中已经为input-table自动生成过primaryKey字段值了，只是没有输出到表单字段值中而已
+                // 所以上面从表单字段值中没找到__parentIndex，是因为此时行primaryKey字段值只经过pipeIn保存到table组件内而没有保存到tableService
+                __parentIndex = _.findIndex(table.props.value, function(item){
+                    return item[primaryKey] == parent[primaryKey];
+                });
+            }
+            if(parent){
+                fieldValue[__parentIndex].children.push({});
+                // 这里实测不需要fieldValue[__parentIndex] = ... 来重写整个父行让子表回显，所以没加相关代码
+            }
+            else{
+                fieldValue.push({});
+            }
             doAction({
                 "componentId": "${props.id}",
                 "actionType": "setValue",
@@ -13236,7 +13923,13 @@ 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值
+            }
+            else{
+                event.data.__page = fieldValue.length - 1;//这里不可以用Object.assign否则，event.data中上层作用域数据会丢失
+            }
             // 触发翻页按钮事件，实现保存当前页数据并跳转到最后一行
             scope.getComponentById(buttonNextId).props.dispatchEvent("click", event.data);
         `;
@@ -13245,9 +13938,49 @@ async function getButtonActions(props, mode) {
             let __formId = "${formId}";
             // let newItem = JSON.parse(JSON.stringify(event.data));
             let newItem = scope.getComponentById(__formId).getValues();//这里不可以用event.data，因为其拿到的是弹出表单时的初始值，不是用户实时填写的数据
+            newItem = _.clone(newItem);
+            let removeEmptyItems = function(items){
+                let i = _.findIndex(items, function(item){
+                    return item === undefined
+                });
+                if(i > -1){
+                    items.splice(i, 1);
+                    removeEmptyItems(items);
+                }
+            }
+            // 因为删除时只是把input-table组件中的行数据删除了，并没有把父层service中的行删除，所以__tableItems会有值为undefined的数据，需要移除掉
+            // 不用event.data.__tableItems = _.compact(event.data.__tableItems)是因为会把__tableItems变量保存到表单中
+            removeEmptyItems(event.data.__tableItems);
             let fieldValue = event.data.__tableItems;//这里不可以_.cloneDeep，因为翻页form中用的是event.data.__tableItems，直接变更其值即可改变表单中的值
             // 复制当前页数据到新建行并保存到子表组件
-            fieldValue.push(newItem);
+            // fieldValue.push(newItem);
+            var parent = event.data.__super.parent;
+            var primaryKey = "${primaryKey}";
+            var __parentIndex = parent && _.findIndex(fieldValue, function(item){
+                return item[primaryKey] == parent[primaryKey];
+            });
+            if(parent && __parentIndex < 0){
+                let tableId = "${props.id}";
+                let table = scope.getComponentById(tableId)
+                // autoGeneratePrimaryKeyValue不为true的情况下，即子表组件input-table的pipeOut函数中会移除表单了子表字段的primaryKey字段值，
+                // 此时行primaryKey字段值为空，但是pipeIn函数中已经为input-table自动生成过primaryKey字段值了，只是没有输出到表单字段值中而已
+                // 所以上面从表单字段值中没找到__parentIndex，是因为此时行primaryKey字段值只经过pipeIn保存到table组件内而没有保存到tableService
+                __parentIndex = _.findIndex(table.props.value, function(item){
+                    return item[primaryKey] == parent[primaryKey];
+                });
+            }
+            if(newItem[primaryKey]){
+                // 如果newItem已经有主键字段值，则重新生成新的主键值，否则会重复。
+                let uuidv4 = new Function("return (" + ${uuidv4.toString()} + ")()");
+                newItem[primaryKey] = uuidv4();
+            }
+            if(parent){
+                fieldValue[__parentIndex].children.push(newItem);
+                // 这里实测不需要fieldValue[__parentIndex] = ... 来重写整个父行让子表回显，所以没加相关代码
+            }
+            else{
+                fieldValue.push(newItem);
+            }
             doAction({
                 "componentId": "${props.id}",
                 "actionType": "setValue",
@@ -13259,19 +13992,25 @@ 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值
+            }
+            else{
+                event.data.__page = fieldValue.length - 1;//这里不可以用Object.assign否则，event.data中上层作用域数据会丢失
+            }
             // 触发翻页按钮事件，实现保存当前页数据并跳转到最后一行
             scope.getComponentById(buttonNextId).props.dispatchEvent("click", event.data);
         `;
         let dialogButtons = [
             {
-            "type": "button",
-            "label": "完成",
-            "actionType": "confirm",
-            "level": "primary"
+                "type": "button",
+                "label": "完成",
+                "actionType": "confirm",
+                "level": "primary"
             }
         ];
-        if(props.addable){
+        if (props.addable) {
             // 有新增行权限时额外添加新增和复制按钮
             dialogButtons = [
                 {
@@ -13281,9 +14020,14 @@ async function getButtonActions(props, mode) {
                     "onEvent": {
                         "click": {
                             "actions": [
+                                {
+                                    "actionType": "validate",
+                                    "componentId": formId
+                                },
                                 {
                                     "actionType": "custom",
-                                    "script": onSaveAndNewItemScript
+                                    "script": onSaveAndNewItemScript,
+                                    "expression": "${!!!event.data.validateResult.error}" //触发表单校验结果会存入validateResult，amis 3.2不支持，高版本比如 3.5.3支持
                                 }
                             ]
                         }
@@ -13296,9 +14040,14 @@ async function getButtonActions(props, mode) {
                     "onEvent": {
                         "click": {
                             "actions": [
+                                {
+                                    "actionType": "validate",
+                                    "componentId": formId
+                                },
                                 {
                                     "actionType": "custom",
-                                    "script": onSaveAndCopyItemScript
+                                    "script": onSaveAndCopyItemScript,
+                                    "expression": "${!!!event.data.validateResult.error}" //触发表单校验结果会存入validateResult，amis 3.2不支持，高版本比如 3.5.3支持
                                 }
                             ]
                         }
@@ -13335,12 +14084,15 @@ async function getButtonActions(props, mode) {
                     "_master": "${_master}",
                     "global": "${global}",
                     "uiSchema": "${uiSchema}",
-                    "index": "${index}",
+                    "index": "${index}",//amis组件自带行索引,在节点嵌套情况下，当前节点如果是children属性下的子节点时，这里的index是当前节点在children中的索引，而不是外层父节点的index
+                    "parent": "${__super.parent}",//amis组件自带父节点数据域数据，即节点嵌套情况下，当前节点为某个节点（比如A节点）的children属性下的子节点时，当前节点的父节点（即A节点）的数据域数据
                     // "__tableItems": `\${${props.name}}`
                     // 为了解决"弹出的dialog窗口中子表组件会影响页面布局界面中父作用域字段值"，比如设计字段布局微页面中的设置分组功能，弹出的就是子表dialog
                     // 所以这里使用json|toJson转一次，断掉event.data.__tableItems与上层任用域中props.name的联系
                     // "__tableItems": `\${${props.name}|json|toJson}`
-                    "__tableItems": `\${(${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": {
@@ -13363,35 +14115,39 @@ async function getButtonActions(props, mode) {
             Object.assign(actionShowEditDialog.dialog, props.dialog);
         }
         if (mode == "new") {
-            `
-                let newItem = {};
-                if(event.data["${props.name}"]){
-                    // let fieldValue = event.data.__tableItems;
-                    // 这里不用__tableItems是因为新建的时候没有翻页，里面没有也不需要走__tableItems变量
-                    // let fieldValue = _.clone(event.data["${props.name}"]);
-                    let fieldValue = event.data["${props.name}"];
-                    fieldValue.push(newItem);
-                    doAction({
-                        "componentId": "${props.id}",
-                        "actionType": "setValue",
-                        "args": {
-                            "value": fieldValue
-                        }
-                    });
-                    event.data.index = fieldValue.length - 1;
-                }
-                else{
-                    // 这里不可以执行event.data["${props.name}"]=[newItem]，数据域会断掉
-                    doAction({
-                        "componentId": "${props.id}",
-                        "actionType": "setValue",
-                        "args": {
-                            "value": [newItem]
-                        }
-                    });
-                    event.data.index = 1;
-                }
-            `;
+            // let onNewLineScript = `
+            //     let newItem = {};
+            //     if(event.data["${props.name}"]){
+            //         // let fieldValue = event.data.__tableItems;
+            //         // 这里不用__tableItems是因为新建的时候没有翻页，里面没有也不需要走__tableItems变量
+            //         // let fieldValue = _.clone(event.data["${props.name}"]);
+            //         let fieldValue = event.data["${props.name}"];
+            //         fieldValue.push(newItem);
+            //         doAction({
+            //             "componentId": "${props.id}",
+            //             "actionType": "setValue",
+            //             "args": {
+            //                 "value": fieldValue
+            //             }
+            //         });
+            //         event.data.index = fieldValue.length - 1;
+            //     }
+            //     else{
+            //         // 这里不可以执行event.data["${props.name}"]=[newItem]，数据域会断掉
+            //         doAction({
+            //             "componentId": "${props.id}",
+            //             "actionType": "setValue",
+            //             "args": {
+            //                 "value": [newItem]
+            //             }
+            //         });
+            //         event.data.index = 1;
+            //     }
+            // `;
+            // let actionNewLine = {
+            //     "actionType": "custom",
+            //     "script": onNewLineScript
+            // };
             // 新增行时不需要在弹出编辑表单前先加一行，因为会在编辑表单所在service初始化时判断到是新增就自动增加一行，因为这里拿不到event.data.__tableItems，也无法变更其值
             // actions = [actionNewLine, actionShowEditDialog];
             actions = [actionShowEditDialog];
@@ -13426,15 +14182,20 @@ async function getButtonActions(props, mode) {
                         // 映射到中间变量__parentForm而不是直接用&展开映射是为了避免表单中字段名与作用域中变量重名
                         // "__parentForm": "${__super.__super || {}}",
                         "__parentForm": parentFormData,
+                        "_master": "${_master}",
                         "global": "${global}",
                         "uiSchema": "${uiSchema}",
                         "index": "${index}",
+                        "parent": "${__super.parent}",//amis组件自带父节点数据域数据，即节点嵌套情况下，当前节点为某个节点（比如A节点）的children属性下的子节点时，当前节点的父节点（即A节点）的数据域数据
                         // "__tableItems": `\${${props.name}}`
                         // 为了解决"弹出的dialog窗口中子表组件会影响页面布局界面中父作用域字段值"，比如设计字段布局微页面中的设置分组功能，弹出的就是子表dialog
                         // 所以这里使用json|toJson转一次，断掉event.data.__tableItems与上层任用域中props.name的联系
                         // "__tableItems": `\${${props.name}|json|toJson}`
-                        "__tableItems": `\${(${props.name} || [])|json|toJson}`
-                },
+                        // "__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}`
+                    },
                 }
             }
         ];
@@ -13449,8 +14210,40 @@ async function getButtonActions(props, mode) {
             let wrapperServiceData = wrapperService.getData();
             // 这里不可以用event.data["${props.name}"]因为amis input talbe有一层单独的作用域，其值会延迟一拍
             // 这里_.clone是因为字段设计布局设置分组这种弹出窗口中的子表组件，直接删除后，点取消无法还原
+            // 也因为这里clone没有直接删除，所以弹出编辑表单提交事件中event.data.__tableItems中取到的值会有被删除的行数据为undefined
             let lastestFieldValue = _.clone(wrapperServiceData["${props.name}"]);
-            lastestFieldValue.splice(event.data.index, 1);
+            var currentIndex = event.data.index;
+            var parent = event.data.__super.parent;
+            var primaryKey = "${primaryKey}";
+            var __parentIndex = parent && _.findIndex(lastestFieldValue, function(item){
+                return item[primaryKey] == parent[primaryKey];
+            });
+            if(parent && __parentIndex < 0){
+                let tableId = "${props.id}";
+                let table = scope.getComponentById(tableId)
+                // autoGeneratePrimaryKeyValue不为true的情况下，即子表组件input-table的pipeOut函数中会移除表单了子表字段的primaryKey字段值，
+                // 此时行primaryKey字段值为空，但是pipeIn函数中已经为input-table自动生成过primaryKey字段值了，只是没有输出到表单字段值中而已
+                // 所以上面从表单字段值中没找到__parentIndex，是因为此时行primaryKey字段值只经过pipeIn保存到table组件内而没有保存到tableService
+                __parentIndex = _.findIndex(table.props.value, 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);
+            }
+            let fieldPrefix = "${props.fieldPrefix || ''}";
+            if(fieldPrefix){
+                let getTableValueWithoutFieldPrefix = new Function('v', 'f', "return (" + ${getTableValueWithoutFieldPrefix.toString()} + ")(v, f)");
+                lastestFieldValue = getTableValueWithoutFieldPrefix(lastestFieldValue, fieldPrefix);
+            }
             doAction({
                 "componentId": "${props.id}",
                 "actionType": "setValue",
@@ -13520,58 +14313,104 @@ async function getButtonView(props) {
 
 async function getButtonDelete(props) {
     return {
-        "type": "button",
-        "label": "",
-        "icon": "fa fa-trash-alt",//不可以用fa-trash-o，因为设计字段布局界面中弹出的设置分组列表中显示不了这个图标
+        "type": "dropdown-button",
         "level": "link",
-        "onEvent": {
-            "click": {
-                "actions": await getButtonActions(props, "delete")
+        "icon": "fa fa-trash-alt",
+        "size": "xs",
+        "hideCaret": true,
+        "closeOnClick": true,
+        "body": [
+            {
+                "type": "wrapper",
+                "size": "md",
+                "className": "w-80",
+                "body": [
+                    {
+                        "tpl": "确定要删除吗？",
+                        "type": "tpl"
+                    },
+                    {
+                        "type": "flex",
+                        "justify": "flex-end",
+                        "className": "mt-3",
+                        "items": [
+                            {
+                                "type": "button",
+                                "label": "取消",
+                                "className": "mr-2"
+                            },
+                            {
+                                "type": "button",
+                                "label": "删除",
+                                "level": "danger",
+                                "onEvent": {
+                                    "click": {
+                                        "actions": await getButtonActions(props, "delete")
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                ]
             }
-        }
-    };
+        ]
+    }
 }
 
+
 const getAmisInputTableSchema = async (props) => {
     if (!props.id) {
         props.id = "steedos_input_table_" + props.name + "_" + Math.random().toString(36).substr(2, 9);
     }
+    let primaryKey = getTablePrimaryKey(props);
+    let showOperation = props.showOperation;
+    if (showOperation !== false) {
+        showOperation = true;
+    }
+    let fieldPrefix = props.fieldPrefix;
+    let fields = props.fields || [];
+    if (fieldPrefix) {
+        fields = getTableFieldsWithoutFieldPrefix(fields, fieldPrefix);
+    }
     let serviceId = getComponentId("table_service", props.id);
     let buttonsForColumnOperations = [];
     let inlineEditMode = props.inlineEditMode;
     let showAsInlineEditMode = inlineEditMode && props.editable;
-    if (props.editable) {
-        let showEditButton = true;
-        if (showAsInlineEditMode) {
-            // 始终显示弹出子表表单按钮，如果需要判断只在有列被隐藏时才需要显示弹出表单按钮放开下面的if逻辑就好
-            showEditButton = true;
-            // // inline edit模式下只在有列被隐藏时才需要显示编辑按钮
-            // if (props.columns && props.columns.length > 0 && props.columns.length < props.fields.length) {
-            //     showEditButton = true;
-            // }
-            // else {
-            //     showEditButton = false;
-            // }
+    if (showOperation) {
+        if (props.editable) {
+            let showEditButton = true;
+            if (showAsInlineEditMode) {
+                // 始终显示弹出子表表单按钮，如果需要判断只在有列被隐藏时才需要显示弹出表单按钮放开下面的if逻辑就好
+                showEditButton = true;
+                // // inline edit模式下只在有列被隐藏时才需要显示编辑按钮
+                // if (props.columns && props.columns.length > 0 && props.columns.length < fields.length) {
+                //     showEditButton = true;
+                // }
+                // else {
+                //     showEditButton = false;
+                // }
+            }
+            // 编辑时显示编辑按钮
+            if (showEditButton) {
+                let buttonEditSchema = await getButtonEdit(props, showAsInlineEditMode);
+                buttonsForColumnOperations.push(buttonEditSchema);
+            }
         }
-        // 编辑时显示编辑按钮
-        if (showEditButton) {
-            let buttonEditSchema = await getButtonEdit(props, showAsInlineEditMode);
-            buttonsForColumnOperations.push(buttonEditSchema);
+        else {
+            // 只读时显示查看按钮
+            // 如果想只在有列被隐藏时才需要显示查看按钮可以加上判断：if (props.columns && props.columns.length > 0 && props.columns.length < fields.length)
+            let buttonViewSchema = await getButtonView(props);
+            buttonsForColumnOperations.push(buttonViewSchema);
+        }
+        if (props.removable) {
+            let buttonDeleteSchema = await getButtonDelete(props);
+            buttonsForColumnOperations.push(buttonDeleteSchema);
         }
     }
-    else {
-        // 只读时显示查看按钮
-        // 如果想只在有列被隐藏时才需要显示查看按钮可以加上判断：if (props.columns && props.columns.length > 0 && props.columns.length < props.fields.length)
-        let buttonViewSchema = await getButtonView(props);
-        buttonsForColumnOperations.push(buttonViewSchema);
-    }
-    if (props.removable) {
-        let buttonDeleteSchema = await getButtonDelete(props);
-        buttonsForColumnOperations.push(buttonDeleteSchema);
-    }
+    let amis = props["input-table"] || props.amis || {};//额外支持"input-table"代替amis属性，是因为在字段yml文件中用amis作为key不好理解
     let inputTableSchema = {
         "type": "input-table",
-        "label": props.label,
+        "mode": "normal",
         "name": props.name,
         //不可以addable/editable/removable设置为true，因为会在原生的操作列显示操作按钮图标，此开关实测只控制这个按钮显示不会影响功能
         // "addable": props.addable,
@@ -13586,7 +14425,53 @@ const getAmisInputTableSchema = async (props) => {
         "strictMode": props.strictMode,
         "showTableAddBtn": false,
         "showFooterAddBtn": false,
-        "className": props.tableClassName
+        "className": props.tableClassName,
+        "pipeIn": (value, data) => {
+            if (fieldPrefix) {
+                value = getTableValueWithoutFieldPrefix(value, fieldPrefix);
+            }
+            value = getTableValueWithEmptyValue(value, fields);
+            if (primaryKey) {
+                // 这里临时给每行数据补上primaryKey字段值，如果库里不需要保存这里补上的字段值，pipeOut中会识别autoGeneratePrimaryKeyValue属性选择最终移除这里补上的字段值
+                // 这里始终自动生成primaryKey字段值，而不是只在pipeOut输出整个子表字段值时才生成，是因为要支持当数据库里保存的子表字段行数据没有primaryKey字段值时的行嵌套模式（即节点的children属性）功能
+                // 这里要注意，流程详细设置界面的字段设置功能中的子表组件中，数据库里保存的子表字段行数据是有primaryKey字段值的，它不依赖这里自动生成行primaryKey值功能
+                value = getTableValueWithPrimaryKeyValue(value, primaryKey);
+            }
+            if (amis.pipeIn) {
+                if (typeof amis.pipeIn === 'function') {
+                    return amis.pipeIn(value, data);
+                }
+            }
+            return value;
+        },
+        "pipeOut": (value, data) => {
+            value = (value || []).map(function (item) {
+                delete item.__fix_rerender_after_children_modified_tag;
+                return item;
+            });
+            if (fieldPrefix) {
+                value = getTableValuePrependFieldPrefix(value, fieldPrefix, primaryKey);
+            }
+            value = getTableValueWithoutEmptyValue(value, fields);
+            if (props.autoGeneratePrimaryKeyValue === true) {
+                // 如果需要把自动生成的primaryKey值输出保存的库中，则补全所有行中的primaryKey值
+                // 这里如果不全部补全的话，初始从库里返回的字段值中拿到的行没primaryKey值的话就不会自动补上
+                value = getTableValueWithPrimaryKeyValue(value, primaryKey);
+            }
+            else {
+                // 默认情况下，也就是没有配置autoGeneratePrimaryKey时，最终输出的字段值要移除行中的primaryKey值
+                // 需要注意如果没有配置autoGeneratePrimaryKey时，因为每次弹出行编辑窗口保存后都会先后进入pipeOut和pipeIn，
+                // 这里删除掉了primaryKey值，所以primaryKey值每次弹出编辑窗口保存后都会给每行重新生成新的primaryKey值
+                // 只有autoGeneratePrimaryKey配置为true时，每行的primaryKey字段值才会始终保持不变
+                value = getTableValueWithoutPrimaryKeyValue(value, primaryKey);
+            }
+            if (amis.pipeOut) {
+                if (typeof amis.pipeOut === 'function') {
+                    return amis.pipeOut(value, data);
+                }
+            }
+            return value;
+        }
     };
     if (buttonsForColumnOperations.length) {
         inputTableSchema.columns.push({
@@ -13596,20 +14481,22 @@ const getAmisInputTableSchema = async (props) => {
             "width": buttonsForColumnOperations.length > 1 ? "60px" : "20px"
         });
     }
-    if (showAsInlineEditMode) {
-        inputTableSchema.needConfirm = false;
-    }
-    let amis = props["input-table"] || props.amis;//额外支持"input-table"代替amis属性，是因为在字段yml文件中用amis作为key不好理解
+    // if (showAsInlineEditMode) {
+    //     // 因为要支持不同的列上配置inlineEditMode属性，所有不可以把整个子表组件都设置为inlineEditMode
+    //     inputTableSchema.needConfirm = false;
+    // }
     if (amis) {
         // 支持配置amis属性重写或添加最终生成的input-table中任何属性。
         delete amis.id;//如果steedos-input-table组件配置了amis.id属性，会造成新建编辑行功能不生效
+        delete amis.pipeIn;//该属性在上面合并过了
+        delete amis.pipeOut;//该属性在上面合并过了
         Object.assign(inputTableSchema, amis);
     }
-    const isAnyFieldHasDependOn = (props.fields || []).find(function (item) {
+    const isAnyFieldHasDependOn = (fields || []).find(function (item) {
         return item.depend_on;
     });
     if (isAnyFieldHasDependOn) {
-        // 有任意一个子字段有depend_on属性时，强制设置禁用静态模式
+        // 有任意一个子字段有depend_on属性时，强制设置禁用静态模式，因为strictMode模式下，dependOn的字段值变更后，不会rerender整个子表
         Object.assign(inputTableSchema, {
             strictMode: false
         });
@@ -13638,11 +14525,31 @@ const getAmisInputTableSchema = async (props) => {
             "body": headerToolbar
         });
     }
+    let className = "steedos-input-table";
+
+    if (typeof props.className == "object") {
+        className = {
+            [className]: "true",
+            ...props.className
+        };
+    } else if (typeof props.className == "string") {
+        className = `${className} ${props.className} `;
+    }
+
     let schema = {
-        "type": "service",
-        "body": schemaBody,
-        "className": props.className,
-        "id": serviceId
+        "type": "control",
+        "body": {
+            "type": "service",
+            "body": schemaBody,
+            "id": serviceId
+        },
+        "label": props.label,
+        "labelClassName": props.label ? props.labelClassName : "none",
+        "labelRemark": props.labelRemark,
+        "labelAlign": props.labelAlign,
+        //控制control的mode属性，https://aisuda.bce.baidu.com/amis/zh-CN/components/form/formitem#表单项展示
+        "mode": props.mode || null,
+        className
     };
     // console.log("===schema===", schema);
     return schema;
@@ -13714,7 +14621,7 @@ async function getListPageInitSchema(objectApiName, formFactor, userSession) {
 // 获取
 async function getRecordPageInitSchema(objectApiName){
     const relatedList = await getObjectRelatedList(objectApiName);
-    const uiSchema = await getUISchema(objectApiName);
+    await getUISchema(objectApiName);
     let body = [
         // detailHeaderAmisSchema,
         {
@@ -13722,28 +14629,7 @@ async function getRecordPageInitSchema(objectApiName){
             "label": "标题面板",
             "objectApiName": "${objectName}",
             "recordId": "${recordId}",
-            "onEvent": {
-                "recordLoaded": {
-                    "actions": [
-                        {
-                            "actionType": "setValue",
-                            "args": {
-                              "value": {
-                                "recordLoaded": true,
-                              }
-                            }
-                        },
-                        {
-                            "actionType": "reload",
-                            "data": {
-                                "name": `\${record.${uiSchema?.NAME_FIELD_KEY || 'name'}}`,
-                                "record": `\${record}`,
-                                "recordLoaded": true,
-                            }
-                        }
-                    ]
-                }
-            }
+            "onEvent": {}
         }
     ];
     let contentBody = {
@@ -16308,5 +17194,5 @@ const getInstanceInfo = async ({ instanceId, box }) => {
   };
 };
 
-export { index as Field, Router, absoluteUrl, amisRender, amisRootClick, cloneObject, conditionsToFilters, createObject, defaultsDeep, deleteVariable, execute, executeButton, extendObject, fetchAPI, filtersToConditions, getAmisInputTableSchema, getApp, getApps, getAuthToken, getAuthorization, getButton, getButtonVisible, getButtonVisibleOn, getButtons, getCalendarSchema, getDefaultRenderData, getEnv, getEnvs, getEvn, getField, getFileSrc, getFlowFormSchema, getFormPageInitSchema, getFormSchema, getGlobalNowData, getIdsPickerSchema, getImageSrc, getInstanceInfo, getListPageInitSchema, getListSchema, getListViewButtons, getListViewColumns, getListViewFilter, getListViewItemButtons, getListViewSort, getListviewInitSchema, getLookupSapceUserTreeSchema, getNotifications, getObjectDetailButtons, getObjectDetailButtonsSchemas, getObjectDetailMoreButtons, getObjectFieldsFilterBarSchema, getObjectFieldsFilterButtonSchema, getObjectFieldsFilterFormSchema, getObjectListHeader$1 as getObjectListHeader, getObjectListHeaderFieldsFilterBar, getObjectListHeaderFirstLine, getObjectListHeaderSecordLine, getObjectListViewButtonsSchemas, getObjectRecordDetailHeader, getObjectRecordDetailRelatedListButtonsSchemas, getObjectRecordDetailRelatedListHeader, getObjectRelated, getObjectRelatedList, getObjectRelatedListButtons, getObjectRelatedListHeader, getPage, getRecord, getRecordDetailHeaderSchema, getRecordDetailRelatedListSchema, getRecordDetailSchema, getRecordPageInitSchema, getRecordPermissions, getRecordServiceSchema, getReferenceTo, getReferenceToFieldSchema, getReferenceToSync, getRelatedFieldValue, getRelatedListSchema, getRelatedsCount, getRootUrl, getSelectUserSchema, getSpaceUsersPickerAmisSchema, getSpaceUsersPickerSchema, getSteedosAuth, getTableSchema, getTenantId, getUISchema, getUISchemaSync$1 as getUISchemaSync, getUserId, getViewSchema, isExpression, isObject, lookupToAmis, lookupToAmisIdsPicker, lookupToAmisPicker, lookupToAmisSelect, lookupToAmisSelectUser, markReadAll, parseSingleExpression, registerRemoteAssets, registerRenders, setEnv, setEnvs, setRootUrl, setSteedosAuth, setUISchemaFunction, setVariable, standardButtonsTodo };
+export { index as Field, Router, absoluteUrl, amisRender, amisRootClick, cloneObject, conditionsToFilters, createObject, defaultsDeep, deleteVariable, execute, executeButton, extendObject, fetchAPI, filtersToConditions, getAmisInputTableSchema, getApp, getApps, getAuthToken, getAuthorization, getButton, getButtonVisible, getButtonVisibleOn, getButtons, getCalendarSchema, getDefaultRenderData, getEnv, getEnvs, getEvn, getField, getFileSrc, getFlowFormSchema, getFormPageInitSchema, getFormSchema, getGlobalNowData, getIdsPickerSchema, getImageSrc, getInstanceInfo, getListPageInitSchema, getListSchema, getListViewButtons, getListViewColumns, getListViewFilter, getListViewItemButtons, getListViewSort, getListviewInitSchema, getLookupSapceUserTreeSchema, getNotifications, getObjectDetailButtons, getObjectDetailButtonsSchemas, getObjectDetailMoreButtons, getObjectFieldsFilterBarSchema, getObjectFieldsFilterButtonSchema, getObjectFieldsFilterFormSchema, getObjectListHeader$1 as getObjectListHeader, getObjectListHeaderFieldsFilterBar, getObjectListHeaderFirstLine, getObjectListHeaderSecordLine, getObjectListViewButtonsSchemas, getObjectRecordDetailHeader, getObjectRecordDetailRelatedListButtonsSchemas, getObjectRecordDetailRelatedListHeader, getObjectRelated, getObjectRelatedList, getObjectRelatedListButtons, getObjectRelatedListHeader, getObjectRelatedListsMiniSchema, getPage, getRecord, getRecordDetailHeaderSchema, getRecordDetailMiniSchema, getRecordDetailRelatedListSchema, getRecordDetailSchema, getRecordPageInitSchema, getRecordPermissions, getRecordServiceSchema, getReferenceTo, getReferenceToFieldSchema, getReferenceToSync, getRelatedFieldValue, getRelatedListSchema, getRelatedsCount, getRootUrl, getSelectUserSchema, getSpaceUsersPickerAmisSchema, getSpaceUsersPickerSchema, getSteedosAuth, getTableSchema, getTenantId, getUISchema, getUISchemaSync$1 as getUISchemaSync, getUserId, getViewSchema, isExpression, isObject, lookupToAmis, lookupToAmisIdsPicker, lookupToAmisPicker, lookupToAmisSelect, lookupToAmisSelectUser, markReadAll, parseSingleExpression, registerRemoteAssets, registerRenders, setEnv, setEnvs, setRootUrl, setSteedosAuth, setUISchemaFunction, setVariable, standardButtonsTodo };
 //# sourceMappingURL=index.esm.js.map