@steedos-widgets/amis-lib 3.6.2-beta.9 → 3.6.3-beta.1

package/dist/index.cjs.js

@@ -362,14 +362,13 @@ const getSteedosAuth = () => {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-08-16 17:02:08
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-06-20 13:50:15
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2024-02-02 10:15:00
  * @Description:
  */
 
 const Router = {
-    getTabDisplayAs(tab_id){
-        const uiSchema = getUISchemaSync$1(tab_id, false);
+    getTabDisplayAs(tab_id, defaultEnableSplit){
         var urlSearch = new URLSearchParams(document.location.search); 
         if(urlSearch.has('display')){
             return urlSearch.get('display')
@@ -378,9 +377,12 @@ const Router = {
         // const key = `page_display`;
         const value = sessionStorage.getItem(key);
         let defaultDisplay = "grid";
-        if(uiSchema.enable_split){
+        if(defaultEnableSplit === true){
             defaultDisplay = "split";
         }
+        if(window.innerWidth <= 768){
+            return "grid";
+        }
         return value ? value : defaultDisplay;
     },
   
@@ -413,8 +415,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: 
  */
 
@@ -486,6 +488,25 @@ 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
@@ -548,7 +569,7 @@ function getSelectMap(selectOptions){
     _$1.forEach(selectOptions,(option)=>{
         const optionValue = option.value + '';
         const optionColor = option.color + '';
-        if(optionColor){
+        if(optionColor && optionColor != "undefined"){
             const background = optionColor.charAt(0) === '#' ? optionColor : '#'+optionColor;
             const color = getContrastColor(background);
             const optionColorStyle = 'background:'+background+';color:'+color+';line-height:1.5rem';
@@ -1164,7 +1185,31 @@ const getAmisFileReadonlySchema = (steedosField)=>{
         }
     }
     if(type === 'file'){
-        return {
+        return window.Meteor?.isCordova ? {
+            "type": "control",
+            "body": {
+                "type": "each",
+                "name": "_display." + steedosField.name,
+                "items": {
+                    "type": "tpl",
+                    "tpl": "${name}",
+                    "className": "antd-Button--link inline-block",
+                    "onEvent": {
+                        "click": {
+                            "actions": [
+                                {
+                                    "script": `
+                                        Steedos.cordovaDownload(encodeURI(event.data.url), event.data.name);
+                                    `,
+                                    "actionType": "custom"
+                                }
+                            ],
+                            "weight": 0
+                        }
+                    }
+                }
+            }
+        } : {
             type: amisFieldType,
             tpl: `
                 <% let fileData = data._display.${steedosField.name}; if (fileData) { %>
@@ -1308,6 +1353,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 ";
@@ -1395,6 +1441,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,
@@ -1450,7 +1497,7 @@ var frontend_listview_control_delete_label = "删除";
 var frontend_listview_control_delete_confirm_text = "如果您删除此列表视图，该视图将为所有具备访问权限的用户永久删除。是否确定要删除？";
 var frontend_listview_control_delete_message_success = "删除成功";
 var frontend_listview_control_filters = "过滤设置";
-var frontend_listview_control_filters_fields_extend = "条件组件1";
+var frontend_listview_control_filters_fields_extend = "条件组件";
 var frontend_listview_control_new_label = "新建";
 var frontend_listview_control_new_title = "新建 列表视图";
 var frontend_listview_control_new_message_success = "成功";
@@ -1484,6 +1531,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 = "当前";
@@ -1572,6 +1620,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,
@@ -1626,7 +1675,7 @@ async function getQuickEditSchema(field, options){
         isAmisVersionforBatchEdit = window.Amis.version[0] >= 3 && window.Amis.version[2] >= 2;
     }
     const quickEditId = options.objectName + "_" + field.name + "_quickEdit";//定义快速编辑的表单id，用于setvalue传值
-    var quickEditSchema = { body: [], id: quickEditId };
+    var quickEditSchema = { body: [], id: quickEditId, className: "steedos-table-quickEdit" };
     //select,avatar,image,file等组件无法行记录字段赋值，暂不支持批量编辑；
     if(field.type != 'avatar' && field.type != 'image' && field.type != 'file' && isAmisVersionforBatchEdit){
         const submitEvent = {
@@ -1885,7 +1934,8 @@ async function getQuickEditSchema(field, options){
                                         "failed": "失败了呢。。"
                                       }
                                     }
-                                }
+                                },
+                                "expression": "${!recordPermissions.modifyAllRecords}"
                             },
                             {
                                 "actionType": "setValue",
@@ -1901,7 +1951,7 @@ async function getQuickEditSchema(field, options){
                                 "componentId": quickEditId,
                                 "args": {
                                     "value":{
-                                        "quickedit_record_permissions": "${event.data}"
+                                        "quickedit_record_permissions": "${recordPermissions.modifyAllRecords ? {'allowEdit': true} : event.data}"
                                     }
                                 }
                             }
@@ -1965,7 +2015,7 @@ async function getQuickEditSchema(field, options){
                                           `
                                         }
                                     },
-                                    "expression":"${event.data.value}"
+                                    "expression":"${event.data.value && !recordPermissions.modifyAllRecords}"
                                 },
                                 {
                                     "actionType": "setValue",
@@ -1996,10 +2046,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
+                                                                    }
+                                                                }
+                                                            });
                                                         `
                                                     },
                                                     {
@@ -2060,7 +2120,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;
@@ -2090,22 +2150,35 @@ async function getTableColumns(fields, options){
         //增加quickEdit属性，实现快速编辑
         const quickEditSchema = allowEdit ? await getQuickEditSchema(field, options) : allowEdit;
         let className = "";
-        if(field.wrap != true){
-            if(field.wrap != false && field.is_wide){
-                className += " break-words ";
-            }else {
+        const bowserType = getBowserType();
+        if(bowserType === "Safari"){
+            className += " whitespace-nowrap ";
+        }else {
+            if(field.wrap != true){
                 className += " whitespace-nowrap ";
+            }else {
+                className += " break-words ";
             }
-        }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 = ___namespace.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",
@@ -2130,11 +2203,11 @@ async function getTableColumns(fields, options){
                             "expression": "!!!(window && window.nw && window.nw.require)"//浏览器上直接下载
                         },
                         {
-                          "args": {},
-                          "actionType": "custom",
-                          "script": previewFileScript,
-                        //   "expression": "!!window?.nw?.require" //PC客户端预览附件
-                          "expression": "!!!(window && window.nw && window.nw.require)"//PC客户端预览附件
+                            "args": {},
+                            "actionType": "custom",
+                            "script": previewFileScript,
+                            // "expression": "!!window?.nw?.require" //PC客户端预览附件
+                            "expression": "!!(window && window.nw && window.nw.require)"//PC客户端预览附件
                         }
                     ]
                   }
@@ -2149,7 +2222,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",
@@ -2160,7 +2233,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);
@@ -2175,7 +2248,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);
@@ -2202,15 +2275,6 @@ async function getTableColumns(fields, options){
             // }
 
             //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({}, {
@@ -2227,7 +2291,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';
@@ -2423,10 +2487,10 @@ async function getMobileTableColumns(fields, options){
                                         if(value.url){
                                             cms_url = value.url;
                                         }else{
-                                            cms_url = "/api/files/files/"+value+"?download=true"
+                                            cms_url = Steedos.absoluteUrl("/api/files/files/"+value+"?download=true");
                                         }
                                     }
-                                    Steedos.cordovaDownload(encodeURI(Steedos.absoluteUrl(cms_url)), event.data.name);
+                                    Steedos.cordovaDownload(encodeURI(cms_url), event.data.name);
                                 `,
                                 "actionType": "custom"
                             }
@@ -2926,6 +2990,21 @@ async function getTableApi(mainObject, fields, options){
         return api;
     `;
     api.adaptor = `
+    let fields = ${JSON.stringify(___namespace.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)
@@ -2950,7 +3029,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'){
@@ -2992,15 +3077,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, '');
     }
 
 
@@ -3059,11 +3137,10 @@ async function getTableApi(mainObject, fields, options){
     };
     let formFactor = "${options.formFactor}";
     if(formFactor !== "SMALL"){
-        const listviewComponent = $(".steedos-object-listview .antd-Table-table");
-        const firstListviewComponent = listviewComponent && listviewComponent[0];
-        if(firstListviewComponent){
+        const lisviewDom = document.querySelector(".steedos-object-listview .antd-Table-table");
+        if(lisviewDom){
             setTimeout(()=>{
-                firstListviewComponent.scrollIntoView();
+                lisviewDom.scrollIntoView();
             }, 600);
         }
     }
@@ -4896,9 +4973,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}"
                           }
@@ -5770,7 +5854,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"
     },
@@ -6357,7 +6441,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"
@@ -6545,7 +6629,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,
           // {
@@ -6553,7 +6637,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": {
@@ -6601,7 +6685,7 @@ 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;
 }
@@ -6736,7 +6820,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
   let body = [
     {
       "type": "wrapper",
-      "className": "p-4 bg-gray-100 border-b",
+      "className": "p-4 border-b",
       "body": [
         {
           "type": "grid",
@@ -6801,25 +6885,25 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
     });
 
     // 注意: 以下注释不能删除. tailwind css 动态编译时会识别以下注释, 生成对应的样式
-    // xl:grid-cols-1
-    // xl:grid-cols-2
-    // xl:grid-cols-3
-    // xl:grid-cols-4
-    // xl:grid-cols-5
-    // xl:grid-cols-6
-    // xl:grid-cols-7
-    // xl:grid-cols-8
-    // xl:grid-cols-9
-    // xl:grid-cols-10
-    // xl:grid-cols-11
-    // xl:grid-cols-12
+    // 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 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-5 xl:grid-cols-${max}`,
+        "className": `gap-2 grid grid-cols-1 lg:grid-cols-${max}`,
         "wrapWithPanel": false,
         "actions": [],
         "body": details,
@@ -6904,7 +6988,7 @@ async function getObjectRecordDetailRelatedListHeader(relatedObjectSchema, relat
         "className": "flex justify-between"
       }
     ],
-    "className": "steedos-record-related-header py-2 px-0"
+    "className": "steedos-record-related-header py-2 px-3 bg-gray-50 border"
   };
   return recordRelatedListHeader;
 }
@@ -6947,6 +7031,7 @@ const getNewListviewButtonSchema = ()=>{
                       "objectApiName": "object_listviews",
                       "recordId": "",
                       "mode": "edit",
+                      "layout": "normal",
                       "defaultData": {
                         "&": "${list_view}",
                         "name":"",
@@ -6954,8 +7039,16 @@ const getNewListviewButtonSchema = ()=>{
                         "filters":"",
                         "shared":false,
                         "object_name": "${targetObjectName}",
+                        "_id":"",
+                        "shared_to": null,
+                        "shared_to_organizations": null,
+                        "locked": false,
+                        "owner": null,
+                        "company_id": null,
+                        "company_ids": null,
+                        "is_system": false
                       },
-                      "fieldsExtend": fieldsExtend$4(),
+                      "fieldsExtend": fieldsExtend$5(),
                       "fields": fields$1(),
                       "onEvent": {
                         "submitSucc": {
@@ -7006,14 +7099,17 @@ function fields$1(){
     "mobile_columns",
     "searchable_fields",
     "is_system",
-    "shared"
+    "shared",
+    "shared_to",
+    "shared_to_organizations"
   ]
 }
 
-function fieldsExtend$4(){
+function fieldsExtend$5(){
   return {
     "group": "",
     "label": {
+      "group": "",
       "is_wide": true
     },
     "name": {
@@ -7095,9 +7191,19 @@ function fieldsExtend$4(){
     "shared": {
       "group": "",
       "amis": {
-        "visibleOn": "${global.user.is_space_admin}"
+        "visibleOn": "${false}"
+      }
+    },
+    "shared_to": {
+      "group": "",
+      "amis":{
+        "type": "radios",
+        "inline": false
       }
     },
+    "shared_to_organizations": {
+      "group": ""
+    },
     "filters": {
       "group": "",
       "amis": {
@@ -7135,14 +7241,23 @@ const getCopyListviewButtonSchema = ()=>{
                       "objectApiName": "object_listviews",
                       "recordId": "",
                       "mode": "edit",
+                      "layout": "normal",
                       "defaultData": {
                         "&": "${list_view}",
                         "name":"",
                         "label": i18next__default["default"].t('frontend_listview_control_clone_defaultData_label_start') + " ${list_view.label} " + i18next__default["default"].t('frontend_listview_control_clone_defaultData_label_end'),
                         "shared":false,
                         "object_name": "${targetObjectName}",
+                        "_id":"",
+                        "shared_to": null,
+                        "shared_to_organizations": null,
+                        "locked": false,
+                        "owner": null,
+                        "company_id": null,
+                        "company_ids": null,
+                        "is_system": false
                       },
-                      "fieldsExtend": fieldsExtend$3(),
+                      "fieldsExtend": fieldsExtend$4(),
                       "fields": fields(),
                       "onEvent": {
                         "submitSucc": {
@@ -7190,13 +7305,16 @@ function fields(){
     "mobile_columns.$.field",
     "searchable_fields.$.field",
     "is_system",
-    "shared"
+    "shared",
+    "shared_to",
+    "shared_to_organizations"
   ]
 }
 
-function fieldsExtend$3(){
+function fieldsExtend$4(){
   return {
     "label": {
+      "group": "",
       "is_wide": true
     },
     "name": {
@@ -7246,10 +7364,21 @@ function fieldsExtend$3(){
       }
     },
     "shared": {
+      "group": "",
       "amis": {
-        "visibleOn": "${global.user.is_space_admin}"
+        "visibleOn": "${false}"
       }
     },
+    "shared_to": {
+      "group": "",
+      "amis":{
+        "type": "radios",
+        "inline": false
+      }
+    },
+    "shared_to_organizations": {
+      "group": ""
+    },
     "filters": {
       "group": "",
       "amis": {
@@ -7259,6 +7388,12 @@ function fieldsExtend$3(){
   }
 }
 
+/*
+ * @Author: 殷亮辉 yinlianghui@hotoa.com
+ * @Date: 2023-06-13 13:51:19
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2024-02-05 11:25:09
+ */
 const getRenameListviewButtonSchema = ()=>{
     return {
         "type": "button",
@@ -7284,6 +7419,7 @@ const getRenameListviewButtonSchema = ()=>{
                       "label": "对象表单",
                       "objectApiName": "object_listviews",
                       "recordId": "${recordId}",
+                      "layout": "normal",
                       "mode": "edit",
                       "fields": [
                         "label"
@@ -7318,6 +7454,12 @@ const getRenameListviewButtonSchema = ()=>{
     }
 };
 
+/*
+ * @Author: 殷亮辉 yinlianghui@hotoa.com
+ * @Date: 2023-06-13 13:51:19
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2024-02-06 15:38:49
+ */
 const getSetListviewShareButtonSchema = ()=>{
     return {
         "type": "button",
@@ -7333,6 +7475,8 @@ const getSetListviewShareButtonSchema = ()=>{
                   "title": i18next__default["default"].t('frontend_listview_control_share'),
                   "data": {
                     "recordId": "${uiSchema.list_views[listName]._id}",
+                    "appId": "${appId}",
+                    "global": "${global}",
                     "context": "${context}"
                   },
                   "body": [
@@ -7342,9 +7486,12 @@ const getSetListviewShareButtonSchema = ()=>{
                       "objectApiName": "object_listviews",
                       "recordId": "${recordId}",
                       "mode": "edit",
+                      "layout": "normal",
                       "fields": [
-                        "shared"
-                      ]
+                        "shared_to",
+                        "shared_to_organizations"
+                      ],
+                      "fieldsExtend": fieldsExtend$3(),
                     }
                   ],
                   "showCloseButton": true,
@@ -7362,6 +7509,21 @@ const getSetListviewShareButtonSchema = ()=>{
     }
 };
 
+function fieldsExtend$3(){
+  return {
+    "shared_to": {
+      "group": "",
+      "amis":{
+        "type": "radios",
+        "inline": false
+      }
+    },
+    "shared_to_organizations": {
+      "group": ""
+    }
+  }
+}
+
 const getSetListviewFiltersButtonSchema = ()=>{
     return {
         "type": "button",
@@ -7493,10 +7655,12 @@ function apiRequestAdaptor$2(){
 function fieldsExtend$2(){
   return {
     "filters": {
+      "label": "",
+      "group": "",
       "visible_on": "true",
       "amis": {
         "type": "condition-builder",
-        "label": i18next__default["default"].t('frontend_listview_control_filters_fields_extend'),
+        // "label": i18next.t('frontend_listview_control_filters_fields_extend'),
         "source": {
           "method": "get",
           "url": "${context.rootUrl}/service/api/amis-metadata-listviews/getFilterFields?objectName=${targetObjectName}",
@@ -7539,6 +7703,7 @@ const getSetListviewColumnsButtonSchema = ()=>{
                       "objectApiName": "object_listviews",
                       "recordId": "${recordId}",
                       "mode": "edit",
+                      "layout": "normal",
                       "fieldsExtend": fieldsExtend$1(),
                       "initApiAdaptor": initApiAdaptor$1(),
                       "apiRequestAdaptor": apiRequestAdaptor$1(),
@@ -7735,6 +7900,8 @@ const getSetListviewSortButtonSchema = ()=>{
 function fieldsExtend(){
   return {
     "sort": {
+      "label": "",
+      "group": "",
       "amis": {
         "type": "tabs-transfer",
         "sortable": true,
@@ -7862,7 +8029,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": [
@@ -7883,8 +8050,8 @@ const getSettingListviewToolbarButtonSchema = ()=>{
     }
 };
 
-const getDisplayAsButton = function(objectName, showDisplayAs){
-  let displayAs = amisLib.Router.getTabDisplayAs(objectName);
+const getDisplayAsButton = function(objectName, defaultEnableSplit){
+  let displayAs = amisLib.Router.getTabDisplayAs(objectName, defaultEnableSplit);
   let buttons = [
     {
       "type": "button",
@@ -7907,7 +8074,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": [ 
@@ -8100,7 +8267,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}",
@@ -8124,7 +8291,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 {
@@ -8135,7 +8302,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;
@@ -8157,7 +8324,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": [
@@ -8171,7 +8338,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
       "id": "steedos_crud_toolbar_filter"
     };
   }
-  let toolbarDisplayAsButton = getDisplayAsButton(mainObject?.name);
+  let toolbarDisplayAsButton = getDisplayAsButton(mainObject?.name, mainObject?.enable_split);
   let toolbarDQuickSearchBox = getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup, keywordsSearchBoxName });
 
   // toolbars返回的数组元素不可以是空对象{}，比如hiddenCount ? {} : {"type": "tpl",...}，因为空对象最终还是会生成一个空的.antd-Crud-toolbar-item dom
@@ -8317,7 +8484,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");
@@ -8484,7 +8650,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
@@ -8631,14 +8797,7 @@ 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
         },
         // 外层data发生变化的时候, 不会重新渲染rowClassNameExpr, 所以先用css标记tr唯一标识
         // 使用表达式给tr添加初始选中状态
@@ -8655,6 +8814,20 @@ 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: 1, placeholder: "",id: objectSchema.name + "_display_${_index}", tpl: "${''}"});
@@ -9019,8 +9192,8 @@ const getRecordPermissions = async (objectName, recordId)=>{
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-01-15 10:34:46
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2024-02-08 16:10:52
  * @Description:
  */
 
@@ -9119,7 +9292,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 = _$1.union(mainObjectUiSchema.details,mainObjectUiSchema.lookup_details) || [];
                 for (const detail of details) {
                     const arr = detail.split(".");
@@ -9135,19 +9310,6 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
     let globalFilter = null;
     // TODO: refField变量去掉，写到amis运行时脚本中，uiSchema.fields[relatedKey];可以取到
     const refField = await getField(relatedObjectName, relatedKey);
-
-    if(!refField){
-        return {
-            uiSchema: relatedObjectUiSchema,
-            amisSchema: {
-                "type": "alert",
-                "body": `${i18next__default["default"].t('frontend_objects_related_alert_start')} ${relatedObjectName} ${i18next__default["default"].t('frontend_objects_related_alert_end')}`,
-                "level": "warning",
-                "showIcon": true,
-                "className": "mb-3"
-            }
-        }
-    }
     // if(refField.reference_to_field && refField.reference_to_field != '_id'){
     //     const masterRecord = await getRecord(objectName, recordId, [refField.reference_to_field]);
     //     relatedValue = masterRecord[refField.reference_to_field]
@@ -9208,7 +9370,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         amisSchema: {
             type: "service",
             id: componentId,
-            className: `steedos-record-related-list py-2 first:pt-0 border-b last:border-b-0 ${componentId} ${className}`,
+            className: `steedos-record-related-list mb-4 last:mb-0 ${componentId} ${className}`,
             data: {
                 relatedKey: relatedKey,   
                 listViewId: `amis-\${appId}-${relatedObjectName}-listview`,
@@ -9391,7 +9553,10 @@ async function getRelatedListSchema(
         "filterVisible": false,
         "requestAdaptor": ctx.requestAdaptor,  
         "adaptor": adaptor + ctx.adaptor || '',
-        "ctx": ctx
+        "ctx": ctx,
+        "crud": ctx.crud,
+        "crudDataFilter": ctx.crudDataFilter,
+        "onCrudDataFilter": ctx.onCrudDataFilter
     };
     // console.log(`getRelatedListSchema amisSchema`, amisSchema);
     return {
@@ -9436,8 +9601,8 @@ async function getObjectRelatedListsMiniSchema(objectApiName){
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-01-16 11:14:34
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2024-02-05 17:56:27
  * @Description:
  */
 
@@ -9793,6 +9958,8 @@ async function convertColumnsToTableFields(columns, uiSchema, ctx = {}) {
                     const rfUiSchema = await getUISchema(filedInfo.reference_to);
                     const rfFieldInfo = rfUiSchema.fields[displayName];
                     fields.push(Object.assign({}, rfFieldInfo, { name: `${fieldName}__expand.${displayName}`, expand: true, expandInfo: { fieldName, displayName } }, ctx));
+                }else if(filedInfo && filedInfo.type === 'object'){
+                    fields.push(uiSchema.fields[column]);
                 }
             } else {
                 if (uiSchema.fields[column]) {
@@ -9954,7 +10121,7 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
     };
     const content = {
         "type": "tabs",
-        "className": "steedos-record-tabs bg-white p-4 m-0 mt-2 border-y",
+        "className": "steedos-record-tabs bg-white p-4 mt-3 border-y",
         "contentClassName": "bg-none",
         "tabs": [
             detailed
@@ -10655,17 +10822,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;
             }
@@ -10674,7 +10837,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 = [];
                 }
@@ -10700,7 +10863,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)
@@ -10750,6 +10913,7 @@ function getLookupSapceUserTreeSchema(isMobile){
           }
         },
         "label": "",
+        "mode": "normal",
         "name": "organizations",
         "multiple": false,
         "joinValues": false,
@@ -10892,6 +11056,9 @@ async function lookupToAmisPicker(field, readonly, ctx){
         }
     });
 
+    let listviewFilter = getListViewFilter(listView);
+    let listviewFiltersFunction = listView && listView._filters;
+
     let sort = "";
     if(listView){
         sort = getListViewSort(listView);
@@ -10938,7 +11105,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;
@@ -11000,6 +11167,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){
@@ -11087,6 +11264,16 @@ async function lookupToAmisPicker(field, readonly, ctx){
         });
         payload.data.rows = treeRecords;
     }
+    const result = payload.data.rows;
+    if(result && result.length){
+        const updatedResult = _.map(result, (element) => {
+            const data = { ...element };
+            // image字段值添加URL前缀
+            ${getScriptForAddUrlPrefixForImgFields(___namespace.values(refObjectConfig.fields))}
+            return data;
+        });
+        payload.data.rows = updatedResult;
+    }
     return payload;
     `;
     if(field.optionsFunction || field._optionsFunction){
@@ -11118,13 +11305,15 @@ async function lookupToAmisPicker(field, readonly, ctx){
 
         pickerSchema.affixHeader = false;
 
-        var headerToolbarItems = [];
+        
+
+        pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, fieldsArr, ctx.formFactor, { isLookup: true, keywordsSearchBoxName });
+        
         if(referenceTo.objectName === "space_users" && field.reference_to_field === "user"){
-            headerToolbarItems = getLookupSapceUserTreeSchema(isMobile);
+            pickerSchema.headerToolbar.push(getLookupSapceUserTreeSchema(isMobile));
             pickerSchema.className = pickerSchema.className || "" + " steedos-select-user";
         }
-
-        pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, fieldsArr, ctx.formFactor, { headerToolbarItems, isLookup: true, keywordsSearchBoxName });
+        
         const isAllowCreate = refObjectConfig.permissions.allowCreate;
         const isCreate = ___namespace.isBoolean(field.create) ? field.create : true;
         // lookup字段配置过滤条件就强制不显示新建按钮
@@ -11237,8 +11426,19 @@ async function lookupToAmisPicker(field, readonly, ctx){
         pickerSchema.footerToolbar = ["pagination"];
     }
 
+    if(field.inlineHelpText){
+        pickerSchema.toolbarClassName = "hasHelpText";
+        pickerSchema.headerToolbar = [{
+            "type": "tpl",
+            "tpl": field.inlineHelpText,
+            "className": "text-secondary"
+        }, ...pickerSchema.headerToolbar];
+    }
+    pickerSchema.className = (pickerSchema.className || "") + " steedos-lookup-crud";
+    
     const data = {
         type: getAmisStaticFieldType('picker', readonly),
+        className: ctx.className || '',
         modalTitle:  i18next__default["default"].t('frontend_form_please_select') + " " + refObjectConfig.label,
         labelField: referenceTo.labelField.name,
         valueField: referenceTo.valueField.name,
@@ -11312,6 +11512,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);
@@ -11341,7 +11544,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]];
@@ -11364,6 +11567,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){
@@ -11440,6 +11653,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
         // 但是同时配置autoComplete和source会多请求一次接口
         // TODO:应该想办法把是否字段在子表组件内，即ctx.isInputTable，如果不在子表组件内不需要加source
         data.source = apiInfo;
+        delete data.autoComplete;
     }
     //删除xlink:href中的rootUrl前缀，解决客户端svg为空的问题
     const select_menuTpl = `<span class='flex items-center mt-0.5'>
@@ -11486,7 +11700,8 @@ async function lookupToAmis(field, readonly, ctx){
     }
     // console.log(`lookupToAmis====`, field, readonly, ctx)
     if(readonly){
-        if(field.reference_to){
+        if(field.reference_to && !field.isTableField){
+            //isTableField只在grid字段内存在
             return {
                 type: 'steedos-field',
                 config: field,
@@ -11701,8 +11916,8 @@ if(typeof window != 'undefined'){
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-01-13 17:27:54
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-08-28 17:45:38
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2024-02-04 17:29:54
  * @Description: 
  */
 
@@ -11803,7 +12018,8 @@ const getHtmlFieldSchema = (field, readonly, ctx)=>{
                   "title": "Insert",
                   "items": "image link media addcomment pageembed codesample inserttable | charmap emoticons hr | pagebreak nonbreaking anchor tableofcontents | insertdatetime"
                 }
-              }
+              },
+              "statusbar": false
             },
             "name": field.name
         }
@@ -12148,13 +12364,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':
@@ -12205,7 +12439,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,
             };
@@ -12336,6 +12570,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':
@@ -12541,12 +12805,13 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             break;
     }
     if(!___namespace.isEmpty(convertData)){
+        const className = convertData.className;
         if(field.is_wide || convertData.type === 'group'){
-            convertData.className = 'col-span-2 m-0';
+            convertData.className = className ? 'col-span-2 m-0 ' + className : 'col-span-2 m-0';
         }else {
-            convertData.className = 'm-0';
+            convertData.className = className ? 'm-0 ' + className : 'm-0';
         }
-        if(readonly){
+        if(readonly && ctx.mode !== 'edit'){
             convertData.className = `${convertData.className} border-b`;
         }
         if(readonly){
@@ -12554,11 +12819,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
         }
 
         let fieldTypeClassName = ' steedos-' + convertData.type + (readonly ? '-readonly' : '-edit');
-        if (convertData.className) {
-            convertData.className = convertData.className + fieldTypeClassName;
-        } else {
-            convertData.className = fieldTypeClassName;
-        }
+        convertData.className = convertData.className + fieldTypeClassName;
 
         if(field.visible_on && !ctx.inFilterForm){
             // convertData.visibleOn = `\$${field.visible_on.substring(1, field.visible_on.length -1).replace(/formData./g, '')}`;
@@ -12641,8 +12902,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__`;
         }
@@ -12828,6 +13090,13 @@ const getSection = async (formFields, permissionFields, fieldSchemaArray, sectio
     }
   }
 
+  fieldSetBody.forEach((field)=>{
+    //判断label是否存在，不存在时将label的空占位元素隐藏
+    if(!field.label){
+      field.labelClassName = "none";
+    }
+  });
+
   // fieldSet 已支持显隐控制
   const sectionFieldsVisibleOn = ___namespace.map(___namespace.compact(___namespace.map(fieldSetBody, 'visibleOn')), (visibleOn) => {
     let visible = visibleOn;
@@ -12950,12 +13219,130 @@ 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: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-01-18 10:29:57
+ * @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 = _$1.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 = _$1.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 = _$1.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 = _$1.clone(itemValue);
+        if (newItemValue.children) {
+            newItemValue.children = getTableValueWithoutPrimaryKeyValue(newItemValue.children, primaryKey);
+        }
+        delete newItemValue[primaryKey];
+        return newItemValue;
+    });
+}
 
 /**
  * 子表组件字段值中每行数据的键值key移除指定前缀
@@ -12963,12 +13350,14 @@ async function getFormBody(permissionFields, formFields, ctx){
  * @param {*} fieldPrefix 字段前缀
  * @returns 转换后的子表组件字段值
  */
-function getTableValueWithoutFieldPrefix(value, fieldPrefix){
+function getTableValueWithoutFieldPrefix(value, fieldPrefix) {
     let convertedValue = [];
-    (value || []).forEach((itemValue)=>{
+    (value || []).forEach((itemValue) => {
         var newItemValue = {};
-        for(let n in itemValue){
-            newItemValue[n.replace(new RegExp(`^${fieldPrefix}`), "")] = itemValue[n];
+        for (let n in itemValue) {
+            if (itemValue.hasOwnProperty(n)) {
+                newItemValue[n.replace(new RegExp(`^${fieldPrefix}`), "")] = itemValue[n];
+            }
         }
         convertedValue.push(newItemValue);
     });
@@ -12979,17 +13368,21 @@ function getTableValueWithoutFieldPrefix(value, fieldPrefix){
  * 子表组件字段值中每行数据的键值key补上指定前缀
  * @param {*} value 子表组件字段值，数组
  * @param {*} fieldPrefix 字段前缀
+ * @param {*} primaryKey 主键字段名，主键不参与被键值key规则，需要排除，审批王amis表单也是这个规则
  * @returns 转换后的子表组件字段值
  */
-function getTableValuePrependFieldPrefix(value, fieldPrefix){
+function getTableValuePrependFieldPrefix(value, fieldPrefix, primaryKey) {
     let convertedValue = [];
-    (value || []).forEach((itemValue)=>{
+    (value || []).forEach((itemValue) => {
         var newItemValue = {};
-        for(let n in itemValue){
-            if(typeof itemValue[n] !== undefined){
+        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;
@@ -13001,7 +13394,7 @@ function getTableValuePrependFieldPrefix(value, fieldPrefix){
  * @param {*} fieldPrefix 字段前缀
  * @returns 转换后的子表组件字段值
  */
-function getTableFieldsWithoutFieldPrefix(fields, fieldPrefix){
+function getTableFieldsWithoutFieldPrefix(fields, fieldPrefix) {
     return (fields || []).map((item) => {
         const newItem = _$1.clone(item);//这里不clone的话，会造成子表组件重新render，从而审批王那边点开子表行编辑窗口时报错
         newItem.name = newItem.name.replace(new RegExp(`^${fieldPrefix}`), "");
@@ -13014,7 +13407,12 @@ function getTableFieldsWithoutFieldPrefix(fields, fieldPrefix){
  * @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,
@@ -13034,6 +13432,7 @@ function getInputTableCell(field, showAsInlineEditMode) {
             name: field.name,
             quickEdit: {
                 "type": "steedos-field",
+                "mode": "inline",
                 "config": Object.assign({}, field, {
                     label: false
                 })
@@ -13086,7 +13485,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 = {};
@@ -13108,8 +13512,26 @@ async function getInputTableColumns(props) {
                 }
             }
             if (field) {
-                let tableCell = getInputTableCell(field, showAsInlineEditMode);
-                return Object.assign({}, tableCell, extendColumnProps);
+                let mode = typeof extendColumnProps.inlineEditMode === "boolean" ?
+                    extendColumnProps.inlineEditMode : showAsInlineEditMode;
+                let tableCell = getInputTableCell(field, mode);
+                let className = "";
+                //判断是否换行，目前规则默认换行
+                if(extendColumnProps.wrap != true){
+                    className += " whitespace-nowrap ";
+                }else {
+                    className += " break-words ";
+                }
+                //合并classname
+                if (typeof extendColumnProps.className == "object") {
+                    className = {
+                        [className]: "true",
+                        ...extendColumnProps.className
+                    };
+                } else if (typeof extendColumnProps.className == "string") {
+                    className = `${className} ${extendColumnProps.className} `;
+                }
+                return Object.assign({}, tableCell, extendColumnProps, {className});
             }
             else {
                 return column;
@@ -13119,6 +13541,7 @@ async function getInputTableColumns(props) {
     else {
         return fields.map(function (field) {
             let tableCell = getInputTableCell(field, showAsInlineEditMode);
+            tableCell.className = " whitespace-nowrap ";
             return tableCell;
         }) || [];
     }
@@ -13131,7 +13554,7 @@ async function getInputTableColumns(props) {
  */
 function getFormPagination(props, mode) {
     let showPagination = true;
-    if(mode === "new" && !!!props.editable){
+    if (mode === "new" && !!!props.editable) {
         //不允许编辑只允许新建时不应该让用户操作翻页
         showPagination = false;
     }
@@ -13147,35 +13570,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();
-        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()
+        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
+                }
             });
         }
-        else{
-            fieldValue[currentIndex] = currentFormValues;
-        }
-        // 翻页到下一页前需要同时把改动的内容保存到最终正式的表单字段中，所以额外给正式表单字段执行一次setValue
-        doAction({
-            "componentId": "${props.id}",
-            "actionType": "setValue",
-            "args": {
-                "value": fieldValue
-            }
-        });
 
         // 以下是翻页逻辑，翻到下一页并把下一页内容显示到表单上
         let targetPage;
@@ -13224,9 +13653,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支持
                             }
                         ]
                     }
@@ -13235,7 +13669,7 @@ function getFormPagination(props, mode) {
             {
                 "type": "tpl",
                 // 这里用__super.parent，加__super是为了防止当前记录有字段名为parent的重名变量
-                "tpl": "${__page}/${__super.parent ? __tableItems[__parentIndex]['children'].length : __tableItems.length}"
+                "tpl": "${__page}/${__super.parent ? COMPACT(__tableItems[__parentIndex]['children']).length : COMPACT(__tableItems).length}"
             },
             {
                 "type": "button",
@@ -13245,15 +13679,20 @@ function getFormPagination(props, mode) {
                 "pageChangeDirection": "next",
                 // "disabledOn": showPagination ? "${__page >= __tableItems.length}" : "true",
                 // 这里用__super.parent，加__super是为了防止当前记录有字段名为parent的重名变量
-                "disabledOn": showPagination ? "${__page >= (__super.parent ? __tableItems[__parentIndex]['children'].length : __tableItems.length)}" : "true",
+                "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支持
                             }
                         ]
                     }
@@ -13274,6 +13713,7 @@ 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的字段
@@ -13301,7 +13741,6 @@ function getFormPaginationWrapper(props, form, mode) {
         }
     ];
     let onServiceInitedScript = `
-
         // 以下脚本解决了有时弹出编辑表单时，表单中的值比最后一次编辑保存的值会延迟一拍。
         // 比如：inlineEditMode模式时，用户在表格单元格中直接修改数据，然后弹出的表单form中并没有包含单元格中修改的内容
         // 另外有的地方在非inlineEditMode模式时也会有这种延迟一拍问题，比如对象字段中下拉框类型字段的”选择项“属性
@@ -13315,13 +13754,13 @@ function getFormPaginationWrapper(props, form, mode) {
         // 这里不可以用event.data["${props.name}"]因为amis input talbe有一层单独的作用域，其值会延迟一拍
         // 这里如果不.clone的话，在弹出窗口中显示的子表组件，添加行后点窗口的取消按钮关闭窗口后无法把之前的操作还原，即把之前添加的行自动移除
         let lastestFieldValue = _.clone(wrapperServiceData["${props.name}"] || []);
-        let fieldPrefix = "${props.fieldPrefix}";
+        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事件函数中
@@ -13347,10 +13786,20 @@ function getFormPaginationWrapper(props, form, mode) {
         var fieldValue = event.data.__tableItems;
         if(parent){
             // 如果是子行，即在节点嵌套情况下，当前节点如果是children属性下的子节点时，则算出其所属父行的索引值
-            var primaryKey = "${props.primaryKey}";
+            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 = {
@@ -13399,6 +13848,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);
     }
@@ -13417,6 +13867,18 @@ 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的字段
@@ -13425,6 +13887,8 @@ async function getForm(props, mode = "edit", formId) {
             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;
                 // 重写父节点，并且改变其某个属性以让子节点修改的内容回显到界面上
@@ -13434,6 +13898,8 @@ async function getForm(props, mode = "edit", formId) {
                 });
             }
             else{
+                // 这里currentFormValues中如果没有primaryKey字段值不用处理，因为组件的pipeIn/pipeOut中会为每行自动生成
+                // 也不用担心复制行时_id会重复，因为点击复制按钮时已经处理过了
                 fieldValue[currentIndex] = currentFormValues;
             }
             doAction({
@@ -13531,13 +13997,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") {
@@ -13573,13 +14040,35 @@ 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，直接变更其值即可改变表单中的值
             // 新建一条空白行并保存到子表组件
             var parent = event.data.__super.parent;
-            var primaryKey = "${props.primaryKey}";
+            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] = ... 来重写整个父行让子表回显，所以没加相关代码
@@ -13613,14 +14102,42 @@ 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);
             var parent = event.data.__super.parent;
-            var primaryKey = "${props.primaryKey}";
+            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] = ... 来重写整个父行让子表回显，所以没加相关代码
@@ -13651,13 +14168,13 @@ async function getButtonActions(props, mode) {
         `;
         let dialogButtons = [
             {
-            "type": "button",
-            "label": "完成",
-            "actionType": "confirm",
-            "level": "primary"
+                "type": "button",
+                "label": "完成",
+                "actionType": "confirm",
+                "level": "primary"
             }
         ];
-        if(props.addable){
+        if (props.addable) {
             // 有新增行权限时额外添加新增和复制按钮
             dialogButtons = [
                 {
@@ -13667,9 +14184,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支持
                                 }
                             ]
                         }
@@ -13682,9 +14204,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支持
                                 }
                             ]
                         }
@@ -13730,7 +14257,7 @@ async function getButtonActions(props, mode) {
                     // 在节点嵌套情况下，当前节点正好是带children属性的节点的话，这里弹出的dialog映射到的会是children数组，这是amis目前的规则，
                     // 所以这里加判断有children时，用__super.__super让映射到正确的作用域层，如果不加，则__tableItems取到的会是children数组，而不是整个子表组件的值
                     "__tableItems": `\${((children ? __super.__super.${props.name} : __super.${props.name}) || [])|json|toJson}`
-        },
+                },
                 "actions": dialogButtons,
                 "onEvent": {
                     "confirm": {
@@ -13828,7 +14355,10 @@ async function getButtonActions(props, mode) {
                         // 为了解决"弹出的dialog窗口中子表组件会影响页面布局界面中父作用域字段值"，比如设计字段布局微页面中的设置分组功能，弹出的就是子表dialog
                         // 所以这里使用json|toJson转一次，断掉event.data.__tableItems与上层任用域中props.name的联系
                         // "__tableItems": `\${${props.name}|json|toJson}`
-                        "__tableItems": `\${((__super.parent ? __super.__super.${props.name} : __super.${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}`
                     },
                 }
             }
@@ -13844,13 +14374,24 @@ 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}"]);
             var currentIndex = event.data.index;
             var parent = event.data.__super.parent;
-            var primaryKey = "${props.primaryKey}";
+            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);
                 // 重写父节点，并且改变其某个属性以让子节点修改的内容回显到界面上
@@ -13862,6 +14403,11 @@ async function getButtonActions(props, mode) {
             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",
@@ -13931,45 +14477,77 @@ 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);
     }
-    if (!props.primaryKey) {
-        props.primaryKey = "_id";
-    }
+    let primaryKey = getTablePrimaryKey(props);
     let showOperation = props.showOperation;
-    if(showOperation !== false){
+    if (showOperation !== false) {
         showOperation = true;
     }
-    // props.fieldPrefix = "project_milestone_";
-    if (props.fieldPrefix) {
-        props.fields = getTableFieldsWithoutFieldPrefix(props.fields, props.fieldPrefix);
+    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(showOperation){
+    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 < props.fields.length) {
+                // if (props.columns && props.columns.length > 0 && props.columns.length < fields.length) {
                 //     showEditButton = true;
                 // }
                 // else {
@@ -13984,7 +14562,7 @@ const getAmisInputTableSchema = async (props) => {
         }
         else {
             // 只读时显示查看按钮
-            // 如果想只在有列被隐藏时才需要显示查看按钮可以加上判断：if (props.columns && props.columns.length > 0 && props.columns.length < props.fields.length)
+            // 如果想只在有列被隐藏时才需要显示查看按钮可以加上判断：if (props.columns && props.columns.length > 0 && props.columns.length < fields.length)
             let buttonViewSchema = await getButtonView(props);
             buttonsForColumnOperations.push(buttonViewSchema);
         }
@@ -13993,10 +14571,10 @@ const getAmisInputTableSchema = async (props) => {
             buttonsForColumnOperations.push(buttonDeleteSchema);
         }
     }
-    let amis = props["input-table"] || props.amis;//额外支持"input-table"代替amis属性，是因为在字段yml文件中用amis作为key不好理解
+    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,
@@ -14012,36 +14590,53 @@ const getAmisInputTableSchema = async (props) => {
         "showTableAddBtn": false,
         "showFooterAddBtn": false,
         "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){
+            value = (value || []).map(function (item) {
                 delete item.__fix_rerender_after_children_modified_tag;
                 return item;
             });
-            if(props.fieldPrefix){
-                value = getTableValuePrependFieldPrefix(value, props.fieldPrefix);
+            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'){
+            if (amis.pipeOut) {
+                if (typeof amis.pipeOut === 'function') {
                     return amis.pipeOut(value, data);
                 }
             }
             return value;
         }
     };
-    if(amis.pipeIn){
-        inputTableSchema.pipeIn = amis.pipeIn;
-    }
-    if(props.fieldPrefix){
-        inputTableSchema.pipeIn = (value, data) => {
-            value = getTableValueWithoutFieldPrefix(value, props.fieldPrefix);
-            if(amis.pipeIn){
-                if(typeof amis.pipeIn === 'function'){
-                    return amis.pipeIn(value, data);
-                }
-            }
-            return value;
-        };
-    }
     if (buttonsForColumnOperations.length) {
         inputTableSchema.columns.push({
             "name": "__op__",
@@ -14050,9 +14645,10 @@ const getAmisInputTableSchema = async (props) => {
             "width": buttonsForColumnOperations.length > 1 ? "60px" : "20px"
         });
     }
-    if (showAsInlineEditMode) {
-        inputTableSchema.needConfirm = false;
-    }
+    // if (showAsInlineEditMode) {
+    //     // 因为要支持不同的列上配置inlineEditMode属性，所有不可以把整个子表组件都设置为inlineEditMode
+    //     inputTableSchema.needConfirm = false;
+    // }
     if (amis) {
         // 支持配置amis属性重写或添加最终生成的input-table中任何属性。
         delete amis.id;//如果steedos-input-table组件配置了amis.id属性，会造成新建编辑行功能不生效
@@ -14060,7 +14656,7 @@ const getAmisInputTableSchema = async (props) => {
         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) {
@@ -14093,11 +14689,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;