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

package/dist/index.cjs.js

@@ -1653,6 +1653,7 @@ async function getQuickEditSchema(field, options){
                         {
                             "actionType": "custom",
                             "script": `
+
                                     var _display = _.cloneDeep(event.data._display);
                                     ${displayField}
                                     doAction({actionType: 'setValue', "args": {"value": {_display}},componentId: "${quickEditId}"});
@@ -1824,7 +1825,7 @@ async function getQuickEditSchema(field, options){
                         "actions":[
                             {
                                 "actionType": "setValue",
-                                "componentId": `service_listview_${options.objectName}`,
+                                "componentId": quickEditId,
                                 "args": {
                                     "value":{
                                         "quickedit_record_permissions_loading": true
@@ -1849,7 +1850,7 @@ async function getQuickEditSchema(field, options){
                             },
                             {
                                 "actionType": "setValue",
-                                "componentId": `service_listview_${options.objectName}`,
+                                "componentId": quickEditId,
                                 "args": {
                                     "value":{
                                         "quickedit_record_permissions_loading": false
@@ -1858,7 +1859,7 @@ async function getQuickEditSchema(field, options){
                             },
                             {
                                 "actionType": "setValue",
-                                "componentId": `service_listview_${options.objectName}`,
+                                "componentId": quickEditId,
                                 "args": {
                                     "value":{
                                         "quickedit_record_permissions": "${event.data}"
@@ -2037,9 +2038,9 @@ function getFieldWidth(width){
 async function getTableColumns(fields, options){
     const columns = [];
     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;
     
@@ -2581,6 +2582,7 @@ async function getTableSchema$1(fields, options){
         if(!isLookup && !hiddenColumnOperation){
             columns.push(await getTableOperation(options));
         }
+        
     }
 
     return {
@@ -2890,7 +2892,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;
@@ -2898,6 +2914,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(() => {
@@ -3674,6 +3691,7 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
         "dialog": {
           "type": "dialog",
           "title": title,
+          data,
           "body": [
             {
               "type": "steedos-object-form",
@@ -8254,7 +8272,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);
@@ -8346,6 +8364,11 @@ async function getObjectCRUD(objectSchema, fields, options){
       crudModeClassName = `steedos-crud-mode-${body.mode}`;
     }
 
+    if(body.columns && options.formFactor != 'SMALL'){
+      //将_display放入crud的columns的倒数第二列中（最后一列会影响固定列），可以通过setvalue修改行内数据域的_display，而不影响上层items的_display,用于批量编辑
+      body.columns.splice(body.columns.length - 1, 0, {name: '_display',type: 'static', width: 32, placeholder: "",id: "_display_${_index}", className: "hidden"});
+    }
+
     if (defaults) {
       const headerSchema = defaults.headerSchema;
       const footerSchema = defaults.footerSchema;
@@ -8370,6 +8393,7 @@ async function getObjectCRUD(objectSchema, fields, options){
         body = wrappedBody;
       }
     }
+    
     // console.timeEnd('getObjectCRUD');
     // TODO: data应该只留loaded，其他属性都改为从上层传递下来
     return {
@@ -10572,6 +10596,9 @@ async function lookupToAmisPicker(field, readonly, ctx){
         */
         return payload;
     }
+    if(!payload.data.rows){
+        payload.data.rows = [];
+    }
     if(enable_tree){
         const records = payload.data.rows;
         const treeRecords = [];
@@ -12441,7 +12468,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-23 22:13:22
+ * @LastEditTime: 2023-12-27 13:50:26
  */
 
 /**
@@ -12469,20 +12496,22 @@ function getInputTableCell(field, showAsInlineEditMode) {
             name: field.name,
             quickEdit: {
                 "type": "steedos-field",
-                "config": field,
-                hideLabel: true
+                "config": Object.assign({}, field, {
+                    label: false
+                })
             }
         }
     }
     else {
         return {
             "type": "steedos-field",
-            "config": field,
+            "config": Object.assign({}, field, {
+                label: false
+            }),
             "static": true,
             "readonly": true,
             label: field.label,
-            name: field.name,
-            hideLabel: true
+            name: field.name
         }
     }
 }
@@ -12688,7 +12717,7 @@ function getFormPagination(props, mode) {
  * @returns 带翻页容器的wrapper
  */
 function getFormPaginationWrapper(props, form, mode) {
-    console.log("==getFormPaginationWrapper===", props, mode);
+    // console.log("==getFormPaginationWrapper===", props, mode);
     let serviceId = getComponentId("form_pagination", props.id);
     let tableServiceId = getComponentId("table_service", props.id);
     let innerForm = Object.assign({}, form, {
@@ -12728,8 +12757,28 @@ function getFormPaginationWrapper(props, form, mode) {
         let __wrapperServiceId = "${tableServiceId}";
         let wrapperService = scope.getComponentById(__wrapperServiceId);
         let wrapperServiceData = wrapperService.getData();
-        let lastestFieldValue = wrapperServiceData["${props.name}"];//这里不可以用event.data["${props.name}"]因为amis input talbe有一层单独的作用域，其值会延迟一拍
+        // 这里不可以用event.data["${props.name}"]因为amis input talbe有一层单独的作用域，其值会延迟一拍
+        // 这里如果不.clone的话，在弹出窗口中显示的子表组件，添加行后点窗口的取消按钮关闭窗口后无法把之前的操作还原，即把之前添加的行自动移除
+        let lastestFieldValue = _.clone(wrapperServiceData["${props.name}"] || []);
         //不可以直接像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];
         });
@@ -12793,7 +12842,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，直接变更其值即可改变表单中的值
@@ -12832,66 +12882,66 @@ 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{
-                // 这里不可以执行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": {
-                        //             "&": "$$"
-                        //         }
-                        //     }
-                        // }
-                    ]
-                }
-            }
-        });
-    }
+    // 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
+ * 编辑、新增、删除、查看按钮actions
  * @param {*} props 
- * @param {*} mode edit/new/readonly
+ * @param {*} mode edit/new/readonly/delete
  */
 async function getButtonActions(props, mode) {
     let actions = [];
@@ -12982,6 +13032,7 @@ async function getButtonActions(props, mode) {
             }
         ];
         if(props.addable){
+            // 有新增行权限时额外添加新增和复制按钮
             dialogButtons = [
                 {
                     "type": "button",
@@ -13046,7 +13097,8 @@ async function getButtonActions(props, mode) {
                     // "__tableItems": `\${${props.name}}`
                     // 为了解决"弹出的dialog窗口中子表组件会影响页面布局界面中父作用域字段值"，比如设计字段布局微页面中的设置分组功能，弹出的就是子表dialog
                     // 所以这里使用json|toJson转一次，断掉event.data.__tableItems与上层任用域中props.name的联系
-                    "__tableItems": `\${${props.name}|json|toJson}`
+                    // "__tableItems": `\${${props.name}|json|toJson}`
+                    "__tableItems": `\${(${props.name} || [])|json|toJson}`
                 },
                 "actions": dialogButtons,
                 "onEvent": {
@@ -13069,11 +13121,12 @@ async function getButtonActions(props, mode) {
             Object.assign(actionShowEditDialog.dialog, props.dialog);
         }
         if (mode == "new") {
-            let onNewLineScript = `
+            `
                 let newItem = {};
                 if(event.data["${props.name}"]){
                     // let fieldValue = event.data.__tableItems;
                     // 这里不用__tableItems是因为新建的时候没有翻页，里面没有也不需要走__tableItems变量
+                    // let fieldValue = _.clone(event.data["${props.name}"]);
                     let fieldValue = event.data["${props.name}"];
                     fieldValue.push(newItem);
                     doAction({
@@ -13097,11 +13150,9 @@ async function getButtonActions(props, mode) {
                     event.data.index = 1;
                 }
             `;
-            let actionNewLine = {
-                "actionType": "custom",
-                "script": onNewLineScript
-            };
-            actions = [actionNewLine, actionShowEditDialog];
+            // 新增行时不需要在弹出编辑表单前先加一行，因为会在编辑表单所在service初始化时判断到是新增就自动增加一行，因为这里拿不到event.data.__tableItems，也无法变更其值
+            // actions = [actionNewLine, actionShowEditDialog];
+            actions = [actionShowEditDialog];
         }
         else if (mode == "edit") {
             actions = [actionShowEditDialog];
@@ -13139,9 +13190,44 @@ async function getButtonActions(props, mode) {
                         // "__tableItems": `\${${props.name}}`
                         // 为了解决"弹出的dialog窗口中子表组件会影响页面布局界面中父作用域字段值"，比如设计字段布局微页面中的设置分组功能，弹出的就是子表dialog
                         // 所以这里使用json|toJson转一次，断掉event.data.__tableItems与上层任用域中props.name的联系
-                        "__tableItems": `\${${props.name}|json|toJson}`
-                    },
+                        // "__tableItems": `\${${props.name}|json|toJson}`
+                        "__tableItems": `\${(${props.name} || [])|json|toJson}`
+                },
+                }
+            }
+        ];
+    }
+    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
             }
         ];
     }
@@ -13190,24 +13276,7 @@ async function getButtonView(props) {
     };
 }
 
-function getButtonDelete(props) {
-    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();
-        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": "",
@@ -13215,19 +13284,7 @@ function getButtonDelete(props) {
         "level": "link",
         "onEvent": {
             "click": {
-                "actions": [
-                    // {
-                    //     "actionType": "deleteItem",
-                    //     "args": {
-                    //         "index": "${index+','}" //这里不加逗号后续会报错，语法是逗号分隔可以删除多行
-                    //     },
-                    //     "componentId": props.id
-                    // },
-                    {
-                        "actionType": "custom",
-                        "script": onDeleteItemScript
-                    }
-                ]
+                "actions": await getButtonActions(props, "delete")
             }
         }
     };
@@ -13267,7 +13324,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 = {
@@ -13294,7 +13351,7 @@ const getAmisInputTableSchema = async (props) => {
             "name": "__op__",
             "type": "operation",
             "buttons": buttonsForColumnOperations,
-            "width": buttonsForColumnOperations.length > 1 ? "46px" : "20px"
+            "width": buttonsForColumnOperations.length > 1 ? "60px" : "20px"
         });
     }
     if (showAsInlineEditMode) {