@steedos-widgets/amis-lib 1.3.22-beta.1 → 1.3.22-beta.3

package/dist/index.esm.js

@@ -1626,6 +1626,7 @@ async function getQuickEditSchema(field, options){
                         {
                             "actionType": "custom",
                             "script": `
+
                                     var _display = _.cloneDeep(event.data._display);
                                     ${displayField}
                                     doAction({actionType: 'setValue', "args": {"value": {_display}},componentId: "${quickEditId}"});
@@ -2012,7 +2013,9 @@ async function getTableColumns(fields, options){
     if(!options.isLookup && !options.isInputTable){
         //将_display放入crud的columns中，可以通过setvalue修改行内数据域的_display，而不影响上层items的_display,用于批量编辑
         columns.push({name: '_display',type: 'static', width: 32, placeholder: "",id: "_display_${_index}", className: "hidden"});
-        columns.push({name: '_index',type: 'text', width: 32, placeholder: ""});
+        if(!options.enable_tree){
+            columns.push({name: '_index',type: 'text', width: 32, placeholder: ""});
+        }
     }
     const allowEdit = options.permissions?.allowEdit && !options.isLookup && options.enable_inline_edit != false;
     
@@ -2863,7 +2866,21 @@ async function getTableApi(mainObject, fields, options){
     
     if(enable_tree){
         const records = payload.data.rows || [];
-        const getTreeOptions = SteedosUI.getTreeOptions
+        const getTreeOptions = SteedosUI.getTreeOptions;
+        const assignIndexToTreeRecords = function(tree, parentIndex) {
+            tree.forEach(function (node, index) {
+                // 构建当前节点的 _index
+                var currentIndex = parentIndex ? parentIndex + '-' + (index + 1) : '' + (index + 1);
+        
+                // 赋值给节点
+                node._index = currentIndex;
+        
+                // 如果有子节点，递归调用函数
+                if (node.children && node.children.length > 0) {
+                    assignIndexToTreeRecords(node.children, currentIndex);
+                }
+            });
+        };
         let isTreeOptionsComputed = false;
         if(records.length === 1 && records[0].children){
             isTreeOptionsComputed = true;
@@ -2871,6 +2888,7 @@ async function getTableApi(mainObject, fields, options){
         if(!isTreeOptionsComputed){
             // 如果api接口设置在缓存，缓存期间并不会重新请求接口，payload.data.rows是上次计算后的结果
             payload.data.rows = getTreeOptions(records,{"valueField":"_id"});
+            assignIndexToTreeRecords(payload.data.rows, '');
         }
         try{
             setTimeout(() => {
@@ -7973,7 +7991,8 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
         {
           "type": "pagination",
           "maxButtons": 5,
-          "showPageInput": false
+          "showPageInput": true,
+          "layout": "total,pager,go"
         }
       ]
     }
@@ -8226,7 +8245,7 @@ async function getObjectCRUD(objectSchema, fields, options){
       let tableOptions = Object.assign({
         idFieldName: objectSchema.idFieldName, labelFieldName: labelFieldName, 
         permissions:objectSchema.permissions,enable_inline_edit:objectSchema.enable_inline_edit,
-        crudId: listSchema.id || id
+        crudId: listSchema.id || id, enable_tree: objectSchema.enable_tree
       }, options);
       tableOptions.amisData = createObject(options.amisData || {}, {});
       const table = await getTableSchema$1(fields, tableOptions);
@@ -11562,7 +11581,16 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                 format:'YYYY-MM-DDT00:00:00.000[Z]',
                 tpl: readonly ? getDateTpl(field) : null,
                 // utc: true,
-                joinValues: false
+                joinValues: false,
+                "shortcuts": [
+                    "thismonth",
+                    "2monthsago",
+                    "3monthslater",
+                    "prevquarter",
+                    "thisquarter",
+                    "thisyear",
+                    "lastYear"
+                  ]
             };
             break;
         case 'date':
@@ -11973,6 +12001,8 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     let subFieldName = subField.name.replace(`${field.name}.$.`, '').replace(`${field.name}.`, '');
                     if(subField.type === 'grid'){
                         subField = await getGridFieldSubFields(subField, ctx.__formFields);
+                    }else if(subField.type === 'table'){
+                        subField = await getTabledFieldSubFields(subField, ctx.__formFields);
                     }else {
                         if(readonly){
                             subFieldName = `${field.name}.${subFieldName}`;
@@ -12089,7 +12119,8 @@ async function getFieldSearchable(perField, permissionFields, ctx){
             fieldNamePrefix = `${fieldNamePrefix}between__`;
         }
         if(_field.type === 'datetime'){
-            _field.type = 'input-datetime-range';
+            // 特意改为日期范围而不是日期时间范围，因为搜索时一般精确到日期就足够了，需要精确到日期时间范围需要在字段上配置amis属性来实现
+            _field.type = 'input-date-range';
             _field.is_wide = true;
             fieldNamePrefix = `${fieldNamePrefix}between__`;
         }
@@ -12401,7 +12432,7 @@ async function getFormBody(permissionFields, formFields, ctx){
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-12-19 15:53:32
+ * @LastEditTime: 2023-12-25 13:13:56
  */
 
 /**
@@ -12447,6 +12478,28 @@ function getInputTableCell(field, showAsInlineEditMode) {
     }
 }
 
+function getComponentId(name, tag) {
+    let id = "";
+    switch (name) {
+        case "table_service":
+            id = `service_wrapper__${tag}`;
+            break;
+        case "form_pagination":
+            id = `service_popup_pagination_wrapper__${tag}`;
+            break;
+        case "form":
+            id = `form_popup__${tag}`;
+            break;
+        case "dialog":
+            id = `dialog_popup__${tag}`;
+            break;
+        default:
+            id = `${name}__${tag}`;
+            break;
+    }
+    return id;
+}
+
 /**
  * @param {*} props 
  * @param {*} mode edit/new/readonly
@@ -12494,17 +12547,35 @@ async function getInputTableColumns(props) {
     }
 }
 
-function getFormPagination(props) {
+/**
+ * @param {*} props input-table组件props
+ * @param {*} mode edit/new/readonly
+ * @returns 翻页组件
+ */
+function getFormPagination(props, mode) {
+    let showPagination = true;
+    if(mode === "new" && !!!props.editable){
+        //不允许编辑只允许新建时不应该让用户操作翻页
+        showPagination = false;
+    }
+    let buttonPrevId = getComponentId("button_prev", props.id);
+    let buttonNextId = getComponentId("button_next", props.id);
+    let formId = getComponentId("form", props.id);
+    let tableServiceId = getComponentId("table_service", props.id);
+    let formPaginationId = getComponentId("form_pagination", props.id);
     let onPageChangeScript = `
         let scope = event.context.scoped;
-        let __paginationServiceId = event.data.__paginationServiceId;
-        let __wrapperServiceId = event.data.__wrapperServiceId;
-        let __formId = event.data.__formId;
+        let __paginationServiceId = "${formPaginationId}";
+        let __wrapperServiceId = "${tableServiceId}";
+        let __formId = "${formId}";
         let fieldValue = event.data.__tableItems;//这里不可以_.cloneDeep，因为翻页form中用的是event.data.__tableItems，直接变更其值即可改变表单中的值
         let pageChangeDirection = context.props.pageChangeDirection;
+        // event.data中的index和__page分别表示当前要把表单数据提交到的行索引和用于标定下一页页码的当前页页码
+        // 一般来说__page = index + 1，但是可以让event.data中传入__page和index值不是这种联系。
+        // 比如__page设置为3，index设置为0表示把当前表单数据提交到第一页，但是跳转到第4页，弹出的表单中底下的新增和复制按钮依赖了此功能
+        // let currentPage = currentIndex + 1;
         let currentPage = event.data.__page;
         let currentIndex = event.data.index;
-
         // 翻页到下一页之前需要先把当前页改动的内容保存到中间变量__tableItems中
         let currentFormValues = scope.getComponentById(__formId).getValues();
         fieldValue[currentIndex] = currentFormValues;
@@ -12549,7 +12620,8 @@ function getFormPagination(props) {
     `;
     return {
         "type": "wrapper",
-        "className": "py-2",
+        "size": "none",
+        "className": "mr-1",
         "body": [
             {
                 "type": "button",
@@ -12557,8 +12629,9 @@ function getFormPagination(props) {
                 "icon": `fa fa-angle-left`,
                 "level": "link",
                 "pageChangeDirection": "prev",
-                "disabledOn": "${__page <= 1}",
+                "disabledOn": showPagination ? "${__page <= 1}" : "true",
                 "size": "sm",
+                "id": buttonPrevId,
                 "onEvent": {
                     "click": {
                         "actions": [
@@ -12572,7 +12645,7 @@ function getFormPagination(props) {
             },
             {
                 "type": "tpl",
-                "tpl": "${__page}/${__total}"
+                "tpl": "${__page}/${__tableItems.length}"
             },
             {
                 "type": "button",
@@ -12580,8 +12653,9 @@ function getFormPagination(props) {
                 "icon": `fa fa-angle-right`,
                 "level": "link",
                 "pageChangeDirection": "next",
-                "disabledOn": "${__page >= __total}",
+                "disabledOn": showPagination ? "${__page >= __tableItems.length}" : "true",
                 "size": "sm",
+                "id": buttonNextId,
                 "onEvent": {
                     "click": {
                         "actions": [
@@ -12601,11 +12675,13 @@ function getFormPagination(props) {
  * 传入formSchema输出带翻页容器的wrapper
  * @param {*} props input-table组件props
  * @param {*} form formSchema
- * @param {*} mode edit/readonly
+ * @param {*} mode edit/new/readonly
  * @returns 带翻页容器的wrapper
  */
 function getFormPaginationWrapper(props, form, mode) {
-    let serviceId = `service_popup_pagination_wrapper__${props.id}`;
+    // console.log("==getFormPaginationWrapper===", props, mode);
+    let serviceId = getComponentId("form_pagination", props.id);
+    let tableServiceId = getComponentId("table_service", props.id);
     let innerForm = Object.assign({}, form, {
         "data": {
             // 这里加__super前缀是因为__parentForm变量（即主表单）中可能会正好有名为index的字段
@@ -12617,9 +12693,9 @@ function getFormPaginationWrapper(props, form, mode) {
         {
             "type": "wrapper",
             "size": "none",
-            "className": "flex justify-end border-y border-gray-200 -mx-6 shadow-inner sticky top-0 right-0 left-0 z-20 bg-white mb-4",
+            "className": "flex justify-end sticky top-0 right-0 left-0 z-20 bg-white -mt-2",
             "body": [
-                getFormPagination(props)
+                getFormPagination(props, mode)
             ]
         },
         {
@@ -12640,11 +12716,29 @@ function getFormPaginationWrapper(props, form, mode) {
         // 处理思路是每次弹出form之前先把其__tableItems同步更新为最新值，这样就能在弹出form中包含单元格中做的修改
         // 注意：service init事件只会在每次弹出窗口时才执行，在触发翻页时并不会触发service init事件
         let scope = event.context.scoped;
-        let __wrapperServiceId = event.data.__wrapperServiceId;
+        let __wrapperServiceId = "${tableServiceId}";
         let wrapperService = scope.getComponentById(__wrapperServiceId);
         let wrapperServiceData = wrapperService.getData();
-        let lastestFieldValue = wrapperServiceData["${props.name}"];//这里不可以用event.data["${props.name}"]因为amis input talbe有一层单独的作用域，其值会延迟一拍
+        let lastestFieldValue = wrapperServiceData["${props.name}"] || [];//这里不可以用event.data["${props.name}"]因为amis input talbe有一层单独的作用域，其值会延迟一拍
         //不可以直接像event.data.__tableItems = lastestFieldValue; 这样整个赋值，否则作用域会断
+        let mode = "${mode}";
+        if(mode === "new"){
+            // 点击子表组件底部新增按钮时新增一条空白行并自动翻页到新增行
+            // 注意点击弹出的子表行详细表单中的新增按钮不会进此service init事件函数中
+            let newItem = {};
+            event.data.__tableItems.push(newItem);
+            lastestFieldValue.push(newItem);
+            event.data.index = lastestFieldValue.length - 1;
+            event.data.__page = lastestFieldValue.length;
+            // 这里新增空白行时要把值同步保存到子表组件中，如果不同步保存的话，用户点击弹出表单右上角的关闭窗口时不会自动删除这里自动增加的空白行，同步后可以让用户手动删除此行
+            doAction({
+                "componentId": "${props.id}",
+                "actionType": "setValue",
+                "args": {
+                    "value": lastestFieldValue
+                }
+            });
+        }
         event.data.__tableItems.forEach(function(n,i){
             event.data.__tableItems[i] = lastestFieldValue[i];
         });
@@ -12669,9 +12763,9 @@ function getFormPaginationWrapper(props, form, mode) {
         "data": {
             "__page": "${index + 1}",
             // "__total": `\${${props.name}.length}`,
-            "__total": "${__tableItems.length}",
-            "__paginationServiceId": serviceId,
-            "__formId": form.id
+            // "__total": "${__tableItems.length}",
+            // "__paginationServiceId": serviceId,
+            // "__formId": form.id
         },
         "onEvent": {
             "init": {
@@ -12694,8 +12788,8 @@ function getFormPaginationWrapper(props, form, mode) {
 async function getForm(props, mode = "edit", formId) {
     let formFields = getFormFields(props, mode);
     let body = await getFormBody(null, formFields);
-    if(!formId){
-        formId = `form_popup__${props.id}`;
+    if (!formId) {
+        formId = getComponentId("form", props.id);
     }
     let schema = {
         "type": "form",
@@ -12708,7 +12802,8 @@ async function getForm(props, mode = "edit", formId) {
         "canAccessSuperData": false,
         "className": "steedos-object-form steedos-amis-form"
     };
-    if (mode === "edit") {
+    if (mode === "edit" || mode === "new") {
+        // 新增行弹出编辑行表单，在弹出之前已经不用先增加一行，因为在翻页service初始化的时候会判断mode为new时自动新增一行
         let onEditItemSubmitScript = `
             // let fieldValue = _.cloneDeep(event.data["${props.name}"]);
             let fieldValue = event.data.__tableItems;//这里不可以_.cloneDeep，因为翻页form中用的是event.data.__tableItems，直接变更其值即可改变表单中的值
@@ -12747,103 +12842,366 @@ async function getForm(props, mode = "edit", formId) {
             }
         });
     }
-    else if (mode === "new") {
-        let onNewItemSubmitScript = `
-            let newItem = JSON.parse(JSON.stringify(event.data));
-            if(event.data["${props.name}"]){
-                // let fieldValue = event.data.__tableItems;
-                // 这里不用__tableItems是因为新建的时候没有翻页，里面没有也不需要走__tableItems变量
-                let fieldValue = event.data["${props.name}"];
-                fieldValue.push(newItem);
-                doAction({
-                    "componentId": "${props.id}",
-                    "actionType": "setValue",
-                    "args": {
-                        "value": fieldValue
-                    }
-                });
+    // else if (mode === "new") {
+    //     let onNewItemSubmitScript = `
+    //         let newItem = JSON.parse(JSON.stringify(event.data));
+    //         if(event.data["${props.name}"]){
+    //             // let fieldValue = event.data.__tableItems;
+    //             // 这里不用__tableItems是因为新建的时候没有翻页，里面没有也不需要走__tableItems变量
+    //             let fieldValue = event.data["${props.name}"];
+    //             fieldValue.push(newItem);
+    //             doAction({
+    //                 "componentId": "${props.id}",
+    //                 "actionType": "setValue",
+    //                 "args": {
+    //                     "value": fieldValue
+    //                 }
+    //             });
+    //         }
+    //         else{
+    //             // 这里不可以执行event.data["${props.name}"]=[newItem]，数据域会断掉
+    //             doAction({
+    //                 "componentId": "${props.id}",
+    //                 "actionType": "setValue",
+    //                 "args": {
+    //                     "value": [newItem]
+    //                 }
+    //             });
+    //         }
+    //     `;
+    //     Object.assign(schema, {
+    //         "onEvent": {
+    //             "submit": {
+    //                 "weight": 0,
+    //                 "actions": [
+    //                     {
+    //                         "actionType": "custom",
+    //                         "script": onNewItemSubmitScript
+    //                     },
+    //                     // {
+    //                     //     "componentId": props.id,
+    //                     //     "actionType": "addItem",//input-table组件的needConfirm属性为true时，addItem动作会把新加的行显示为编辑状态，所以只能使用上面的custom script来setValue实现添加行
+    //                     //     "args": {
+    //                     //         "index": `\${${props.name}.length || 9000}`,//这里加9000是因为字段如果没放在form组件内，props.name.length拿不到值
+    //                     //         "item": {
+    //                     //             "&": "$$"
+    //                     //         }
+    //                     //     }
+    //                     // }
+    //                 ]
+    //             }
+    //         }
+    //     });
+    // }
+    schema = getFormPaginationWrapper(props, schema, mode);
+    return schema;
+}
+
+
+/**
+ * 编辑、新增、删除、查看按钮actions
+ * @param {*} props 
+ * @param {*} mode edit/new/readonly/delete
+ */
+async function getButtonActions(props, mode) {
+    let actions = [];
+    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);
+    if (mode == "new" || mode == "edit") {
+        // let actionShowNewDialog = {
+        //     "actionType": "dialog",
+        //     "dialog": {
+        //         "type": "dialog",
+        //         "title": "新增行",
+        //         "body": [
+        //             await getForm(props, "new", formId)
+        //         ],
+        //         "size": "lg",
+        //         "showCloseButton": true,
+        //         "showErrorMsg": true,
+        //         "showLoading": true,
+        //         "className": "app-popover",
+        //         "closeOnEsc": false,
+        //         "onEvent": {
+        //             "confirm": {
+        //                 "actions": [
+        //                     {
+        //                         "actionType": "validate",
+        //                         "componentId": formId
+        //                     },
+        //                     {
+        //                         "preventDefault": true,
+        //                         "expression": "${event.data.validateResult.error}" //触发表单校验结果会存入validateResult，amis 3.2不支持，高版本比如 3.5.3支持
+        //                     }
+        //                 ]
+        //             }
+        //         }
+        //     }
+        // };
+        let onSaveAndNewItemScript = `
+            let scope = event.context.scoped;
+            let fieldValue = event.data.__tableItems;//这里不可以_.cloneDeep，因为翻页form中用的是event.data.__tableItems，直接变更其值即可改变表单中的值
+            // 新建一条空白行并保存到子表组件
+            fieldValue.push({});
+            doAction({
+                "componentId": "${props.id}",
+                "actionType": "setValue",
+                "args": {
+                    "value": fieldValue
+                }
+            });
+            let buttonNextId = "${buttonNextId}";
+            let __paginationServiceId = "${formPaginationId}";
+            let __paginationData = scope.getComponentById(__paginationServiceId).getData();
+            event.data.index = __paginationData.index;
+            event.data.__page = fieldValue.length - 1;//这里不可以用Object.assign否则，event.data中上层作用域数据会丢失
+            // 触发翻页按钮事件，实现保存当前页数据并跳转到最后一行
+            scope.getComponentById(buttonNextId).props.dispatchEvent("click", event.data);
+        `;
+        let onSaveAndCopyItemScript = `
+            let scope = event.context.scoped;
+            let __formId = "${formId}";
+            // let newItem = JSON.parse(JSON.stringify(event.data));
+            let newItem = scope.getComponentById(__formId).getValues();//这里不可以用event.data，因为其拿到的是弹出表单时的初始值，不是用户实时填写的数据
+            let fieldValue = event.data.__tableItems;//这里不可以_.cloneDeep，因为翻页form中用的是event.data.__tableItems，直接变更其值即可改变表单中的值
+            // 复制当前页数据到新建行并保存到子表组件
+            fieldValue.push(newItem);
+            doAction({
+                "componentId": "${props.id}",
+                "actionType": "setValue",
+                "args": {
+                    "value": fieldValue
+                }
+            });
+            let buttonNextId = "${buttonNextId}";
+            let __paginationServiceId = "${formPaginationId}";
+            let __paginationData = scope.getComponentById(__paginationServiceId).getData();
+            event.data.index = __paginationData.index;
+            event.data.__page = fieldValue.length - 1;//这里不可以用Object.assign否则，event.data中上层作用域数据会丢失
+            // 触发翻页按钮事件，实现保存当前页数据并跳转到最后一行
+            scope.getComponentById(buttonNextId).props.dispatchEvent("click", event.data);
+        `;
+        let dialogButtons = [
+            {
+            "type": "button",
+            "label": "完成",
+            "actionType": "confirm",
+            "level": "primary"
             }
-            else{
-                // 这里不可以执行event.data["${props.name}"]=[newItem]，数据域会断掉
-                doAction({
-                    "componentId": "${props.id}",
-                    "actionType": "setValue",
-                    "args": {
-                        "value": [newItem]
+        ];
+        if(props.addable){
+            // 有新增行权限时额外添加新增和复制按钮
+            dialogButtons = [
+                {
+                    "type": "button",
+                    "label": "新增",
+                    "tooltip": "保存并新增一行，即保存当前行数据并新增一条空白行",
+                    "onEvent": {
+                        "click": {
+                            "actions": [
+                                {
+                                    "actionType": "custom",
+                                    "script": onSaveAndNewItemScript
+                                }
+                            ]
+                        }
                     }
-                });
+                },
+                {
+                    "type": "button",
+                    "label": "复制",
+                    "tooltip": "复制并新增一行，即保存当前行数据并复制当前行数据到新增行",
+                    "onEvent": {
+                        "click": {
+                            "actions": [
+                                {
+                                    "actionType": "custom",
+                                    "script": onSaveAndCopyItemScript
+                                }
+                            ]
+                        }
+                    }
+                },
+                dialogButtons[0]
+            ];
+        }
+        let actionShowEditDialog = {
+            "actionType": "dialog",
+            "dialog": {
+                "type": "dialog",
+                "id": dialogId,
+                "title": `\${uiSchema.fields.${props.name}.label} 明细`,
+                "body": [
+                    await getForm(props, mode, formId)
+                ],
+                "size": "lg",
+                "showCloseButton": true,
+                "showErrorMsg": true,
+                "showLoading": true,
+                "className": "app-popover",
+                "closeOnEsc": false,
+                "data": {
+                    // 这里必须加data数据映射，否则翻页功能中取__tableItems值时会乱，比如翻页编辑后会把上一页中没改过的字段值带过去
+                    // 额外把华炎魔方主表记录ObjectForm中的字段值从record变量中映射到子表form中，因为子表lookup字段filtersFunction中可能依赖了主表记录中的字段值，比如“工作流规则”对象“时间触发器”字段中的“日期字段”字段
+                    // 额外把global、uiSchema也映射过去，有可能要用，后续需要用到其他变更可以这里加映射
+                    // "&": "${record || {}}",
+                    // 换成从__super来映射上级表单数据是因为对象列表视图界面中每行下拉菜单中的编辑按钮弹出的表单中的子表所在作用域中没有record变量
+                    // 映射到中间变量__parentForm而不是直接用&展开映射是为了避免表单中字段名与作用域中变量重名
+                    // "__parentForm": "${__super.__super || {}}",
+                    "__parentForm": mode == "new" ? "$$" : "${__super.__super || {}}",
+                    "global": "${global}",
+                    "uiSchema": "${uiSchema}",
+                    "index": "${index}",
+                    // "__tableItems": `\${${props.name}}`
+                    // 为了解决"弹出的dialog窗口中子表组件会影响页面布局界面中父作用域字段值"，比如设计字段布局微页面中的设置分组功能，弹出的就是子表dialog
+                    // 所以这里使用json|toJson转一次，断掉event.data.__tableItems与上层任用域中props.name的联系
+                    // "__tableItems": `\${${props.name}|json|toJson}`
+                    "__tableItems": `\${(${props.name} || [])|json|toJson}`
+                },
+                "actions": dialogButtons,
+                "onEvent": {
+                    "confirm": {
+                        "actions": [
+                            {
+                                "actionType": "validate",
+                                "componentId": formId
+                            },
+                            {
+                                "preventDefault": true,
+                                "expression": "${event.data.validateResult.error}" //触发表单校验结果会存入validateResult，amis 3.2不支持，高版本比如 3.5.3支持
+                            }
+                        ]
+                    }
+                }
             }
-        `;
-        Object.assign(schema, {
-            "onEvent": {
-                "submit": {
-                    "weight": 0,
-                    "actions": [
-                        {
-                            "actionType": "custom",
-                            "script": onNewItemSubmitScript
-                        },
-                        // {
-                        //     "componentId": props.id,
-                        //     "actionType": "addItem",//input-table组件的needConfirm属性为true时，addItem动作会把新加的行显示为编辑状态，所以只能使用上面的custom script来setValue实现添加行
-                        //     "args": {
-                        //         "index": `\${${props.name}.length || 9000}`,//这里加9000是因为字段如果没放在form组件内，props.name.length拿不到值
-                        //         "item": {
-                        //             "&": "$$"
-                        //         }
-                        //     }
-                        // }
-                    ]
+        };
+        if (props.dialog) {
+            Object.assign(actionShowEditDialog.dialog, props.dialog);
+        }
+        if (mode == "new") {
+            `
+                let newItem = {};
+                if(event.data["${props.name}"]){
+                    // let fieldValue = event.data.__tableItems;
+                    // 这里不用__tableItems是因为新建的时候没有翻页，里面没有也不需要走__tableItems变量
+                    // let fieldValue = _.clone(event.data["${props.name}"]);
+                    let fieldValue = event.data["${props.name}"];
+                    fieldValue.push(newItem);
+                    doAction({
+                        "componentId": "${props.id}",
+                        "actionType": "setValue",
+                        "args": {
+                            "value": fieldValue
+                        }
+                    });
+                    event.data.index = fieldValue.length - 1;
+                }
+                else{
+                    // 这里不可以执行event.data["${props.name}"]=[newItem]，数据域会断掉
+                    doAction({
+                        "componentId": "${props.id}",
+                        "actionType": "setValue",
+                        "args": {
+                            "value": [newItem]
+                        }
+                    });
+                    event.data.index = 1;
+                }
+            `;
+            // 新增行时不需要在弹出编辑表单前先加一行，因为会在编辑表单所在service初始化时判断到是新增就自动增加一行，因为这里拿不到event.data.__tableItems，也无法变更其值
+            // actions = [actionNewLine, actionShowEditDialog];
+            actions = [actionShowEditDialog];
+        }
+        else if (mode == "edit") {
+            actions = [actionShowEditDialog];
+        }
+    }
+    else if (mode == "readonly") {
+        actions = [
+            {
+                "actionType": "dialog",
+                "dialog": {
+                    "type": "dialog",
+                    "title": `\${uiSchema.fields.${props.name}.label} 明细`,
+                    "body": [
+                        await getForm(props, "readonly")
+                    ],
+                    "size": "lg",
+                    "showCloseButton": true,
+                    "showErrorMsg": true,
+                    "showLoading": true,
+                    "className": "app-popover",
+                    "closeOnEsc": false,
+                    "actions": [],
+                    "data": {
+                        // 这里必须加data数据映射，否则翻页功能中取__tableItems值时会乱，比如翻页编辑后会把上一页中没改过的字段值带过去
+                        // 额外把华炎魔方主表记录ObjectForm中的字段值从record变量中映射到子表form中，因为子表lookup字段filtersFunction中可能依赖了主表记录中的字段值，比如“工作流规则”对象“时间触发器”字段中的“日期字段”字段
+                        // 额外把global、uiSchema也映射过去，有可能要用，后续需要用到其他变更可以这里加映射
+                        // "&": "${record || {}}",
+                        // 换成从__super来映射上级表单数据是因为对象列表视图界面中每行下拉菜单中的编辑按钮弹出的表单中的子表所在作用域中没有record变量
+                        // 映射到中间变量__parentForm而不是直接用&展开映射是为了避免表单中字段名与作用域中变量重名
+                        // "__parentForm": "${__super.__super || {}}",
+                        "__parentForm": "${__super.__super || {}}",
+                        "global": "${global}",
+                        "uiSchema": "${uiSchema}",
+                        "index": "${index}",
+                        // "__tableItems": `\${${props.name}}`
+                        // 为了解决"弹出的dialog窗口中子表组件会影响页面布局界面中父作用域字段值"，比如设计字段布局微页面中的设置分组功能，弹出的就是子表dialog
+                        // 所以这里使用json|toJson转一次，断掉event.data.__tableItems与上层任用域中props.name的联系
+                        // "__tableItems": `\${${props.name}|json|toJson}`
+                        "__tableItems": `\${(${props.name} || [])|json|toJson}`
+                },
                 }
             }
-        });
+        ];
     }
-    if (mode === "edit" || mode === "readonly") {
-        schema = getFormPaginationWrapper(props, schema);
+    else if (mode == "delete") {
+        let tableServiceId = getComponentId("table_service", props.id);
+        let onDeleteItemScript = `
+            // let fieldValue = event.data["${props.name}"];
+            let scope = event.context.scoped;
+            let __wrapperServiceId = "${tableServiceId}";
+            let wrapperService = scope.getComponentById(__wrapperServiceId);
+            let wrapperServiceData = wrapperService.getData();
+            // 这里不可以用event.data["${props.name}"]因为amis input talbe有一层单独的作用域，其值会延迟一拍
+            // 这里_.clone是因为字段设计布局设置分组这种弹出窗口中的子表组件，直接删除后，点取消无法还原
+            let lastestFieldValue = _.clone(wrapperServiceData["${props.name}"]);
+            lastestFieldValue.splice(event.data.index, 1);
+            doAction({
+                "componentId": "${props.id}",
+                "actionType": "setValue",
+                "args": {
+                    "value": lastestFieldValue
+                }
+            });
+        `;
+        actions = [
+            // {
+            //     "actionType": "deleteItem",
+            //     "args": {
+            //         "index": "${index+','}" //这里不加逗号后续会报错，语法是逗号分隔可以删除多行
+            //     },
+            //     "componentId": props.id
+            // },
+            {
+                "actionType": "custom",
+                "script": onDeleteItemScript
+            }
+        ];
     }
-    return schema;
+    return actions;
 }
 
 async function getButtonNew(props) {
-    let formId = `form_popup__${props.id}`;
     return {
         "label": "新增",
         "type": "button",
         "icon": "fa fa-plus",
         "onEvent": {
             "click": {
-                "actions": [
-                    {
-                        "actionType": "dialog",
-                        "dialog": {
-                            "type": "dialog",
-                            "title": "新增行",
-                            "body": [
-                                await getForm(props, "new", formId)
-                            ],
-                            "size": "lg",
-                            "showCloseButton": true,
-                            "showErrorMsg": true,
-                            "showLoading": true,
-                            "className": "app-popover",
-                            "closeOnEsc": false,
-                            "onEvent": {
-                                "confirm": {
-                                  "actions": [
-                                    {
-                                      "actionType": "validate",
-                                      "componentId": formId
-                                    },
-                                    {
-                                      "preventDefault": true,
-                                      "expression": "${event.data.validateResult.error}" //触发表单校验结果会存入validateResult，amis 3.2不支持，高版本比如 3.5.3支持
-                                    }
-                                  ]
-                                }
-                            }
-                        }
-                    }
-                ]
+                "actions": await getButtonActions(props, "new")
             }
         },
         "level": "primary"
@@ -12851,60 +13209,14 @@ async function getButtonNew(props) {
 }
 
 async function getButtonEdit(props, showAsInlineEditMode) {
-    let formId = `form_popup__${props.id}`;
     return {
         "type": "button",
         "label": "",
-        "icon": `fa fa-${showAsInlineEditMode ? "expand" : "pencil"}`,//inline edit模式时显示为放开按钮，只读时显示为笔按钮
+        "icon": `fa fa-${showAsInlineEditMode ? "expand-alt" : "pencil"}`,//inline edit模式时显示为放开按钮，只读时显示为笔按钮
         "level": "link",
         "onEvent": {
             "click": {
-                "actions": [
-                    {
-                        "actionType": "dialog",
-                        "dialog": {
-                            "type": "dialog",
-                            "title": "编辑行",
-                            "body": [
-                                await getForm(props, "edit", formId)
-                            ],
-                            "size": "lg",
-                            "showCloseButton": true,
-                            "showErrorMsg": true,
-                            "showLoading": true,
-                            "className": "app-popover",
-                            "closeOnEsc": false,
-                            "data": {
-                                // 这里必须加data数据映射，否则翻页功能中取__tableItems值时会乱，比如翻页编辑后会把上一页中没改过的字段值带过去
-                                // 额外把华炎魔方主表记录ObjectForm中的字段值从record变量中映射到子表form中，因为子表lookup字段filtersFunction中可能依赖了主表记录中的字段值，比如“工作流规则”对象“时间触发器”字段中的“日期字段”字段
-                                // 额外把global、uiSchema也映射过去，有可能要用，后续需要用到其他变更可以这里加映射
-                                // "&": "${record || {}}",
-                                // 换成从__super来映射上级表单数据是因为对象列表视图界面中每行下拉菜单中的编辑按钮弹出的表单中的子表所在作用域中没有record变量
-                                // 映射到中间变量__parentForm而不是直接用&展开映射是为了避免表单中字段名与作用域中变量重名
-                                "__parentForm": "${__super.__super || {}}",
-                                "global": "${global}",
-                                "uiSchema": "${uiSchema}",
-                                "index": "${index}",
-                                "__tableItems": `\${${props.name}}`,
-                                "__wrapperServiceId": "${__wrapperServiceId}"
-                            },
-                            "onEvent": {
-                                "confirm": {
-                                  "actions": [
-                                    {
-                                      "actionType": "validate",
-                                      "componentId": formId
-                                    },
-                                    {
-                                      "preventDefault": true,
-                                      "expression": "${event.data.validateResult.error}" //触发表单校验结果会存入validateResult，amis 3.2不支持，高版本比如 3.5.3支持
-                                    }
-                                  ]
-                                }
-                            }
-                        }
-                    }
-                ]
+                "actions": await getButtonActions(props, "edit")
             }
         }
     };
@@ -12914,83 +13226,25 @@ async function getButtonView(props) {
     return {
         "type": "button",
         "label": "",
-        "icon": "fa fa-expand",//fa-external-link
+        "icon": "fa fa-expand-alt",//fa-external-link
         "level": "link",
         "onEvent": {
             "click": {
-                "actions": [
-                    {
-                        "actionType": "dialog",
-                        "dialog": {
-                            "type": "dialog",
-                            "title": "查看行",
-                            "body": [
-                                await getForm(props, "readonly")
-                            ],
-                            "size": "lg",
-                            "showCloseButton": true,
-                            "showErrorMsg": true,
-                            "showLoading": true,
-                            "className": "app-popover",
-                            "closeOnEsc": false,
-                            "actions": [],
-                            "data": {
-                                // 这里必须加data数据映射，否则翻页功能中取__tableItems值时会乱，比如翻页编辑后会把上一页中没改过的字段值带过去
-                                // 额外把华炎魔方主表记录ObjectForm中的字段值从formData变量中映射到子表form中，因为子表lookup字段filtersFunction中可能依赖了主表记录中的字段值，比如“工作流规则”对象“时间触发器”字段中的“日期字段”字段
-                                // global、uiSchema等常用变量本来就在formData变量已经存在了，无需另外映射
-                                // "&": "${formData || {}}",
-                                // 换成从__super来映射上级表单数据是因为对象列表视图界面中每行下拉菜单中的编辑按钮弹出的表单中的子表所在作用域中没有formData变量
-                                // 映射到中间变量__parentForm而不是直接用&展开映射是为了避免表单中字段名与作用域中变量重名
-                                "__parentForm": "${__super.__super || {}}",
-                                "index": "${index}",
-                                "__tableItems": `\${${props.name}}`,
-                                "__wrapperServiceId": "${__wrapperServiceId}"
-                            }
-                        }
-                    }
-                ]
+                "actions": await getButtonActions(props, "readonly")
             }
         }
     };
 }
 
-function getButtonDelete(props) {
-    let onDeleteItemScript = `
-        // let fieldValue = event.data["${props.name}"];
-        let scope = event.context.scoped;
-        let __wrapperServiceId = event.data.__wrapperServiceId;
-        let wrapperService = scope.getComponentById(__wrapperServiceId);
-        let wrapperServiceData = wrapperService.getData();
-        let lastestFieldValue = wrapperServiceData["${props.name}"];//这里不可以用event.data["${props.name}"]因为amis input talbe有一层单独的作用域，其值会延迟一拍
-        lastestFieldValue.splice(event.data.index, 1);
-        doAction({
-            "componentId": "${props.id}",
-            "actionType": "setValue",
-            "args": {
-                "value": lastestFieldValue
-            }
-        });
-    `;
+async function getButtonDelete(props) {
     return {
         "type": "button",
         "label": "",
-        "icon": "fa fa-minus",
+        "icon": "fa fa-trash-alt",//不可以用fa-trash-o，因为设计字段布局界面中弹出的设置分组列表中显示不了这个图标
         "level": "link",
         "onEvent": {
             "click": {
-                "actions": [
-                    // {
-                    //     "actionType": "deleteItem",
-                    //     "args": {
-                    //         "index": "${index+','}" //这里不加逗号后续会报错，语法是逗号分隔可以删除多行
-                    //     },
-                    //     "componentId": props.id
-                    // },
-                    {
-                        "actionType": "custom",
-                        "script": onDeleteItemScript
-                    }
-                ]
+                "actions": await getButtonActions(props, "delete")
             }
         }
     };
@@ -13000,7 +13254,7 @@ const getAmisInputTableSchema = async (props) => {
     if (!props.id) {
         props.id = "steedos_input_table_" + props.name + "_" + Math.random().toString(36).substr(2, 9);
     }
-    let serviceId = `service_wrapper__${props.id}`;
+    let serviceId = getComponentId("table_service", props.id);
     let buttonsForColumnOperations = [];
     let inlineEditMode = props.inlineEditMode;
     let showAsInlineEditMode = inlineEditMode && props.editable;
@@ -13030,7 +13284,7 @@ const getAmisInputTableSchema = async (props) => {
         buttonsForColumnOperations.push(buttonViewSchema);
     }
     if (props.removable) {
-        let buttonDeleteSchema = getButtonDelete(props);
+        let buttonDeleteSchema = await getButtonDelete(props);
         buttonsForColumnOperations.push(buttonDeleteSchema);
     }
     let inputTableSchema = {
@@ -13091,24 +13345,22 @@ const getAmisInputTableSchema = async (props) => {
             "body": footerToolbar
         });
     }
-    // 不可以直接把headerToolbar unshift进schemaBody，因为它没有显示在label下面，而是显示在上面了，这没有意义
+    // 直接把headerToolbar unshift进schemaBody，不会显示在label下面，而是显示在上面了，这个暂时没有解决办法，只能等amis 升级
     // 看起来amis官方后续会支持给input-table组件配置headerToolbar，见：https://github.com/baidu/amis/issues/7246
-    // let headerToolbar = clone(props.headerToolbar || []); //这里不clone的话，会造成死循环，应该是因为props属性变更会让组件重新渲染
-    // if (headerToolbar.length) {
-    //     schemaBody.unshift({
-    //         "type": "wrapper",
-    //         "size": "none",
-    //         "body": headerToolbar
-    //     });
-    // }
+    // 不过依然放开此功能的意义在于有的场景字段label本来就不需要显示出来，此时headerToolbar就有意义
+    let headerToolbar = clone(props.headerToolbar || []); //这里不clone的话，会造成死循环，应该是因为props属性变更会让组件重新渲染
+    if (headerToolbar.length) {
+        schemaBody.unshift({
+            "type": "wrapper",
+            "size": "none",
+            "body": headerToolbar
+        });
+    }
     let schema = {
         "type": "service",
         "body": schemaBody,
         "className": props.className,
-        "id": serviceId,
-        "data": {
-            "__wrapperServiceId": serviceId
-        }
+        "id": serviceId
     };
     // console.log("===schema===", schema);
     return schema;