@steedos-widgets/amis-object 1.3.19 → 1.3.21

package/dist/amis-object.cjs.js

@@ -4207,7 +4207,7 @@ var config = {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-10-28 14:52:55
  * @LastEditors: liaodaxue
- * @LastEditTime: 2023-07-28 16:16:29
+ * @LastEditTime: 2023-12-14 12:01:22
  * @Description: 
  */
 
@@ -4224,6 +4224,7 @@ const AmisFormInputs$1 = [
     'percent',
     'password',
     'url',
+    "color",
     'email'
 ];
 
@@ -4236,7 +4237,7 @@ function getAmisStaticFieldType$1(type, readonly, options){
         }
         return type;
     }
-    if(_$1__namespace.includes(['text','image'], type)){
+    if(_$1__namespace.includes(['text','image','color'], type)){
         if('text' === type && options && options.amis && options.amis.tpl){
             return 'static';
         }
@@ -4370,6 +4371,7 @@ var frontend_form_please_select$1 = "Please select";
 var frontend_form_confirm$1 = "Confirm";
 var frontend_form_delete$1 = "Delete";
 var frontend_form_view$1 = "view";
+var frontend_form_details$1 = "details";
 var frontend_delete_confirm_text$1 = "Are you sure you want to delete this item?";
 var frontend_delete_many_selected_required$1 = "Please select the item to be deleted";
 var frontend_delete_many_confirm_text$1 = "Are you sure you want to delete?";
@@ -4456,6 +4458,7 @@ var en_us = {
 	frontend_form_confirm: frontend_form_confirm$1,
 	frontend_form_delete: frontend_form_delete$1,
 	frontend_form_view: frontend_form_view$1,
+	frontend_form_details: frontend_form_details$1,
 	frontend_delete_confirm_text: frontend_delete_confirm_text$1,
 	frontend_delete_many_selected_required: frontend_delete_many_selected_required$1,
 	frontend_delete_many_confirm_text: frontend_delete_many_confirm_text$1,
@@ -4543,6 +4546,7 @@ var frontend_form_please_select = "请选择";
 var frontend_form_confirm = "确认";
 var frontend_form_delete = "删除";
 var frontend_form_view = "查看";
+var frontend_form_details = "详情";
 var frontend_delete_confirm_text = "确定要删除此项目?";
 var frontend_delete_many_selected_required = "请选择要删除的项";
 var frontend_delete_many_confirm_text = "确定要删除吗？";
@@ -4630,6 +4634,7 @@ var zh_cn = {
 	frontend_form_confirm: frontend_form_confirm,
 	frontend_form_delete: frontend_form_delete,
 	frontend_form_view: frontend_form_view,
+	frontend_form_details: frontend_form_details,
 	frontend_delete_confirm_text: frontend_delete_confirm_text,
 	frontend_delete_many_selected_required: frontend_delete_many_selected_required,
 	frontend_delete_many_confirm_text: frontend_delete_many_confirm_text,
@@ -5176,6 +5181,9 @@ async function getTableColumns$1(fields, options){
     const allowEdit = options.permissions?.allowEdit && !options.isLookup && options.enable_inline_edit != false;
     
     for (const field of fields) {
+        if(field.hidden || field.extra){
+            continue;
+        }
         //增加quickEdit属性，实现快速编辑
         const quickEditSchema = allowEdit ? await getQuickEditSchema(field, options) : allowEdit;
         let className = "";
@@ -5301,6 +5309,11 @@ async function getTableColumns$1(fields, options){
                     options: field.type === 'html' ? {html: true} : null
                     // toggled: true 
                 }, field.amis, {name: field.name});
+                
+                if(field.type === 'color'){
+                    columnItem.type = 'color';
+                    columnItem.defaultColor = null;
+                }
             }
         }
         if(columnItem){
@@ -7988,8 +8001,8 @@ const getSchema$2 = (uiSchema) => {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-07 17:00:38
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-08-24 16:44:42
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2023-12-13 10:09:05
  * @Description: 
  */
 
@@ -8000,7 +8013,7 @@ const getSchema$1 = (uiSchema)=>{
         "body": [
             {
                 "type": "button",
-                "label": instance.t('frontend_form_view'),
+                "label": instance.t('frontend_form_details'),
                 "className": "border-none",
                 "onEvent": {
                   "click": {
@@ -14681,6 +14694,16 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                 }
             }
 
+            break;
+        case 'color':
+            convertData = {
+                type: getAmisStaticFieldType$1('color', readonly),
+                name: field.name,
+                label: field.label
+            };
+            if(readonly){
+                convertData.defaultColor = null;
+            }
             break;
         case 'boolean':
             convertData = {
@@ -15535,7 +15558,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-04 17:36:50
+ * @LastEditTime: 2023-12-16 16:39:49
  */
 
 /**
@@ -15549,52 +15572,71 @@ function getFormFields(props, mode = "edit") {
             "name": item.name,
             "config": item
         };
-        if(mode === "readonly"){
+        if (mode === "readonly") {
             formItem.static = true;
         }
         return formItem;
     }) || [];
 }
 
+function getInputTableCell(field, showAsInlineEditMode) {
+    if (showAsInlineEditMode) {
+        return {
+            label: field.label,
+            name: field.name,
+            quickEdit: {
+                "type": "steedos-field",
+                "config": field,
+                hideLabel: true
+            }
+        }
+    }
+    else {
+        return {
+            "type": "steedos-field",
+            "config": field,
+            "static": true,
+            "readonly": true,
+            label: field.label,
+            name: field.name,
+            hideLabel: true
+        }
+    }
+}
+
 /**
  * @param {*} props 
  * @param {*} mode edit/new/readonly
  */
 async function getInputTableColumns(props) {
     let columns = props.columns || [];
+    let inlineEditMode = props.inlineEditMode;
+    let showAsInlineEditMode = inlineEditMode && props.editable;
     // 实测过，直接不生成对应的隐藏column并不会对input-table值造成丢失问题，隐藏的列字段值能正常维护
     let fields = props.fields;
-    if(columns && columns.length){
-        return columns.map(function(column){
+    if (columns && columns.length) {
+        return columns.map(function (column) {
             let field, extendColumnProps = {};
-            if(typeof column === "string"){
+            if (typeof column === "string") {
                 // 如果字符串，则取出要显示的列配置
-                field = fields.find(function(fieldItem){
+                field = fields.find(function (fieldItem) {
                     return fieldItem.name === column;
                 });
             }
             else {
                 // 如果是对象，则合并到steedos-field的config.amis属性中，steedos组件会把config.amis属性混合到最终生成的input-table column
-                field = fields.find(function(fieldItem){
+                field = fields.find(function (fieldItem) {
                     return fieldItem.name === column.name;
                 });
-                if(field){
+                if (field) {
                     // field.amis = Object.assign({}, field.amis, column);
                     // 如果把column合并到field.amis，column的label/width等属性不会生效，只能放外层合并
                     extendColumnProps = column;
                 }
             }
-            if(field){
-                return {
-                    "type": "steedos-field",
-                    "config": field,
-                    "static": true,
-                    "readonly": true,
-                    label: field.label,
-                    name: field.name,
-                    hideLabel: true,
-                    ...extendColumnProps
-                }
+            if (field) {
+                let tableCell = getInputTableCell(field, showAsInlineEditMode);
+                return Object.assign({}, tableCell, extendColumnProps);
             }
             else {
                 return column;
@@ -15602,20 +15644,226 @@ async function getInputTableColumns(props) {
         });
     }
     else {
-        return fields.map(function(field){
-            return {
-                "type": "steedos-field",
-                "config": field,
-                "static": true,
-                "readonly": true,
-                label: field.label,
-                name: field.name,
-                hideLabel: true
-            }
+        return fields.map(function (field) {
+            let tableCell = getInputTableCell(field, showAsInlineEditMode);
+            return tableCell;
         }) || [];
     }
 }
 
+function getFormPagination(props) {
+    let onPageChangeScript = `
+        let scope = event.context.scoped;
+        let __paginationServiceId = event.data.__paginationServiceId;
+        let __wrapperServiceId = event.data.__wrapperServiceId;
+        let __formId = event.data.__formId;
+        let fieldValue = event.data.__changedItems;//这里不可以_.cloneDeep，因为翻页form中用的是event.data.changedItems，直接变更其值即可改变表单中的值
+        let pageChangeDirection = context.props.pageChangeDirection;
+        let currentPage = event.data.__page;
+        let currentIndex = event.data.index;
+
+        // 翻页到下一页之前需要先把当前页改动的内容保存到中间变量changedItems中
+        let currentFormValues = scope.getComponentById(__formId).getValues();
+        fieldValue[currentIndex] = currentFormValues;
+        // // 因为翻页form中用的是event.data.changedItems中的数据，所以不需要像下面这样doAction setValue变更中间变量changedItems值
+        // doAction({
+        //     "componentId": __wrapperServiceId,
+        //     "actionType": "setValue",
+        //     "args": {
+        //         "value": {
+        //             "__changedItems": fieldValue
+        //         }
+        //     }
+        // });
+        // 如果翻页到下一页前需要同时把改动的内容保存到最终正式的表单字段中，需要额外给正式表单字段执行一次setValue
+        // 但是同时保存到正式表单字段中会造成翻页后点击取消无法取消翻页之前的改动内容
+        // doAction({
+        //     "componentId": "${props.id}",
+        //     "actionType": "setValue",
+        //     "args": {
+        //         "value": fieldValue
+        //     }
+        // });
+
+        // 以下是翻页逻辑，翻到下一页并把下一页内容显示到表单上
+        let targetPage;
+        if(pageChangeDirection === "next"){
+            targetPage = currentPage + 1;
+        }
+        else{
+            targetPage = currentPage - 1;
+        }
+        let targetIndex = targetPage - 1;//input-table组件行索引，从0开始的索引
+        // let targetFormData = __changedItems[targetIndex];
+        doAction({
+            "actionType": "setValue",
+            "componentId": __paginationServiceId,
+            "args": {
+                "value": {
+                    "__page": targetPage,
+                    "index": targetIndex
+                }
+            }
+        });
+        // 这里不用进一步把表单内容setValue到form中，是因为编辑表单中schemaApi监听了行索引index的变化，其值变化时会重新build整个form
+        // doAction({
+        //     "actionType": "setValue",
+        //     "componentId": __formId,
+        //     "args": {
+        //         "value": targetFormData
+        //     },
+        //     "dataMergeMode": "override"// amis 3.2不支持override模式，高版本才支持
+        // });
+    `;
+    return {
+        "type": "wrapper",
+        "className": "py-2",
+        "body": [
+            {
+                "type": "button",
+                "label": "",
+                "icon": `fa fa-angle-left`,
+                "level": "link",
+                "pageChangeDirection": "prev",
+                "disabledOn": "${__page <= 1}",
+                "size": "sm",
+                "onEvent": {
+                    "click": {
+                        "actions": [
+                            {
+                                "actionType": "custom",
+                                "script": onPageChangeScript
+                            }
+                        ]
+                    }
+                }
+            },
+            {
+                "type": "tpl",
+                "tpl": "${__page}/${__total}"
+            },
+            {
+                "type": "button",
+                "label": "",
+                "icon": `fa fa-angle-right`,
+                "level": "link",
+                "pageChangeDirection": "next",
+                "disabledOn": "${__page >= __total}",
+                "size": "sm",
+                "onEvent": {
+                    "click": {
+                        "actions": [
+                            {
+                                "actionType": "custom",
+                                "script": onPageChangeScript
+                            }
+                        ]
+                    }
+                }
+            }
+        ]
+    }
+}
+
+/**
+ * 传入formSchema输出带翻页容器的wrapper
+ * @param {*} props input-table组件props
+ * @param {*} form formSchema
+ * @param {*} mode edit/readonly
+ * @returns 带翻页容器的wrapper
+ */
+function getFormPaginationWrapper(props, form, mode) {
+    let serviceId = `service_popup_pagination_wrapper__${props.id}`;
+    // 这里加__super前缀是因为__parentForm变量（即主表单）中可能会正好有名为index的字段
+    // 比如“对象字段”对象options字段是一个子表字段，但是主表（即“对象字段”对象）中正好有一个名为index的字段
+    // 只读的时候不可以走中间变量__changedItems，比如工作流规则详细页面修改了子表字段”时间触发器“值后，在只读界面点击查看按钮弹出的表单中__changedItems值是修改前的值
+    let formValues = mode === "readonly" ? `\${${props.name}[__super.index]}` : "${__changedItems[__super.index]}";
+    // 这时用__readonlyItemsLength是因为`\${${props.name}.length}`拿不到值
+    let totalValue = mode === "readonly" ? "${__readonlyItemsLength}" : "${__changedItems.length}";
+    let innerForm = Object.assign({}, form, {
+        "data": {
+            // "&": "${__changedItems[__super.index]}"
+            "&": formValues,
+        }
+    });
+    let formBody = [
+        {
+            "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",
+            "body": [
+                getFormPagination(props)
+            ]
+        },
+        {
+            "type": "service",
+            "body": [
+                innerForm
+            ],
+            "data": {
+                "&": "${__parentForm}"
+            }
+        }
+    ];
+    let onServiceInitedScript = `
+        // 以下脚本在inlineEditMode模式时才有必要执行（不过执行了也没有坏处，纯粹是没必要），是为了解决：
+        // inlineEditMode模式时，用户在表格单元格中直接修改数据，然后弹出的表单form中并没有包含单元格中修改的内容
+        // 思路是每次弹出form之前先把其changedItems同步更新为最新值，这样就能在弹出form中包含单元格中做的修改
+        // 注意：service init事件只会在每次弹出窗口时才执行，在触发翻页时并不会触发service init事件
+        let inlineEditMode = ${props.inlineEditMode};
+        if(!inlineEditMode){
+            return;
+        }
+        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有一层单独的作用域，其值会延迟一拍
+        //不可以直接像event.data.__changedItems = originalFieldValue; 这样整个赋值，否则作用域会断
+        event.data.__changedItems.forEach(function(n,i){
+            event.data.__changedItems[i] = lastestFieldValue[i];
+        });
+    `;
+    let schema = {
+        "type": "service",
+        "id": serviceId,
+        "schemaApi": {
+            "url": "${context.rootUrl}/graphql?rebuildOn=${index}",
+            // "url": "${context.rootUrl}/graphql",
+            "method": "post",
+            "headers": {
+                "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+            },
+            "requestAdaptor": "api.data={query: '{spaces__findOne(id: \"none\"){_id,name}}'};return api;",
+            "adaptor": `
+                const formBody = ${JSON.stringify(formBody)};
+                return {
+                    "body": formBody
+                }
+            `
+        },
+        // "body": formBody,
+        "data": {
+            "__page": "${index + 1}",
+            // "__total": `\${${props.name}.length}`,
+            "__total": totalValue,
+            "__paginationServiceId": serviceId,
+            "__formId": form.id
+        },
+        "onEvent": {
+            "init": {
+                "actions": [
+                    {
+                        "actionType": "custom",
+                        "script": onServiceInitedScript
+                    }
+                ]
+            }
+        }
+    };
+    return schema;
+}
+
 /**
  * @param {*} props 
  * @param {*} mode edit/new/readonly
@@ -15623,29 +15871,62 @@ async function getInputTableColumns(props) {
 async function getForm(props, mode = "edit") {
     let formFields = getFormFields(props, mode);
     let body = await getFormBody(null, formFields);
+    let forId = `form_popup__${props.id}`;
     let schema = {
         "type": "form",
+        "id": forId,
         "title": "表单",
         "debug": false,
         "mode": "normal",
         "body": body,
+        "wrapWithPanel": false,
+        "canAccessSuperData": false,
         "className": "steedos-object-form steedos-amis-form"
     };
     if (mode === "edit") {
+        let onEditItemSubmitScript = `
+            // let fieldValue = _.cloneDeep(event.data["${props.name}"]);
+            let fieldValue = event.data.__changedItems;//这里不可以_.cloneDeep，因为翻页form中用的是event.data.changedItems，直接变更其值即可改变表单中的值
+
+            //这里加__super.__super前缀是因为__parentForm变量（即主表单）中可能会正好有名为index的字段
+            // 比如“对象字段”对象options字段是一个子表字段，但是主表（即“对象字段”对象）中正好有一个名为index的字段
+            fieldValue[event.data.__super.__super.index] = JSON.parse(JSON.stringify(event.data));
+            doAction({
+                "componentId": "${props.id}",
+                "actionType": "setValue",
+                "args": {
+                    "value": fieldValue
+                }
+            });
+            // // 因为翻页form中用的是event.data.changedItems中的数据，所以不需要像下面这样doAction setValue变更中间变量changedItems值
+            // doAction({
+            //     "componentId": event.data.__wrapperServiceId,
+            //     "actionType": "setValue",
+            //     "args": {
+            //         "value": {
+            //             "__changedItems": fieldValue
+            //         }
+            //     }
+            // });
+        `;
         Object.assign(schema, {
             "onEvent": {
                 "submit": {
                     "weight": 0,
                     "actions": [
+                        // {
+                        //     "actionType": "setValue",
+                        //     "args": {
+                        //         "index": "${index}",
+                        //         "value": {
+                        //             "&": "$$"
+                        //         }
+                        //     },
+                        //     "componentId": props.id
+                        // }
                         {
-                            "actionType": "setValue",
-                            "args": {
-                                "index": "${index}",
-                                "value": {
-                                    "&": "$$"
-                                }
-                            },
-                            "componentId": props.id
+                            "actionType": "custom",
+                            "script": onEditItemSubmitScript
                         }
                     ]
                 }
@@ -15654,10 +15935,11 @@ async function getForm(props, mode = "edit") {
     }
     else if (mode === "new") {
         let onNewItemSubmitScript = `
-            let fieldValue = _.cloneDeep(event.data["${props.name}"]);
-            if(!fieldValue){
-                fieldValue = [];
+            // let fieldValue = _.cloneDeep(event.data["${props.name}"]);
+            if(!event.data.__changedItems){
+                event.data.__changedItems = [];
             }
+            let fieldValue = event.data.__changedItems;
             fieldValue.push(JSON.parse(JSON.stringify(event.data)));
             doAction({
                 "componentId": "${props.id}",
@@ -15666,6 +15948,16 @@ async function getForm(props, mode = "edit") {
                     "value": fieldValue
                 }
             });
+            // // 因为翻页form中用的是event.data.changedItems中的数据，所以不需要像下面这样doAction setValue变更中间变量changedItems值
+            // doAction({
+            //     "componentId": event.data.__wrapperServiceId,
+            //     "actionType": "setValue",
+            //     "args": {
+            //         "value": {
+            //             "__changedItems": fieldValue
+            //         }
+            //     }
+            // });
         `;
         Object.assign(schema, {
             "onEvent": {
@@ -15691,6 +15983,9 @@ async function getForm(props, mode = "edit") {
             }
         });
     }
+    if (mode === "edit" || mode === "readonly") {
+        schema = getFormPaginationWrapper(props, schema, mode);
+    }
     return schema;
 }
 
@@ -15725,11 +16020,32 @@ async function getButtonNew(props) {
     };
 }
 
-async function getButtonEdit(props) {
+async function getButtonEdit(props, showAsInlineEditMode) {
+    let onCancelScript = `
+        let scope = event.context.scoped;
+        let __wrapperServiceId = event.data.__wrapperServiceId;
+        let wrapperService = scope.getComponentById(__wrapperServiceId);
+        let wrapperServiceData = wrapperService.getData();
+        let originalFieldValue = wrapperServiceData["${props.name}"];//这里不可以用event.data["${props.name}"]因为amis input talbe有一层单独的作用域，其值会延迟一拍
+        //不可以直接像event.data.__changedItems = originalFieldValue; 这样整个赋值，否则作用域会断，造成无法还原
+        event.data.__changedItems.forEach(function(n,i){
+            event.data.__changedItems[i] = originalFieldValue[i];
+        });
+        // 因为翻页form中用的是event.data.changedItems中的数据，所以像下面这样doAction setValue无法实现还原
+        // doAction({
+        //     "componentId": __wrapperServiceId,
+        //     "actionType": "setValue",
+        //     "args": {
+        //         "value": {
+        //             "__changedItems": originalFieldValue
+        //         }
+        //     }
+        // });
+    `;
     return {
         "type": "button",
         "label": "",
-        "icon": "fa fa-pencil",
+        "icon": `fa fa-${showAsInlineEditMode ? "expand" : "pencil"}`,//inline edit模式时显示为放开按钮，只读时显示为笔按钮
         "level": "link",
         "onEvent": {
             "click": {
@@ -15747,7 +16063,31 @@ async function getButtonEdit(props) {
                             "showErrorMsg": true,
                             "showLoading": true,
                             "className": "app-popover",
-                            "closeOnEsc": false
+                            "closeOnEsc": false,
+                            "data": {
+                                // 这里必须加data数据映射，否则翻页功能中取changedItems值时会乱，比如翻页编辑后会把上一页中没改过的字段值带过去
+                                // 额外把华炎魔方主表记录ObjectForm中的字段值从record变量中映射到子表form中，因为子表lookup字段filtersFunction中可能依赖了主表记录中的字段值，比如“工作流规则”对象“时间触发器”字段中的“日期字段”字段
+                                // 额外把global、uiSchema也映射过去，有可能要用，后续需要用到其他变更可以这里加映射
+                                // "&": "${record || {}}",
+                                // 换成从__super来映射上级表单数据是因为对象列表视图界面中每行下拉菜单中的编辑按钮弹出的表单中的子表所在作用域中没有record变量
+                                // 映射到中间变量__parentForm而不是直接用&展开映射是为了避免表单中字段名与作用域中变量重名
+                                "__parentForm": "${__super.__super || {}}",
+                                "global": "${global}",
+                                "uiSchema": "${uiSchema}",
+                                "index": "${index}",
+                                "__changedItems": "${__changedItems}",
+                                "__wrapperServiceId": "${__wrapperServiceId}"
+                            },
+                            "onEvent": {
+                                "cancel": {
+                                    "actions": [
+                                        {
+                                            "actionType": "custom",
+                                            "script": onCancelScript
+                                        }
+                                    ]
+                                }
+                            }
                         }
                     }
                 ]
@@ -15760,7 +16100,7 @@ async function getButtonView(props) {
     return {
         "type": "button",
         "label": "",
-        "icon": "fa fa-external-link",
+        "icon": "fa fa-expand",//fa-external-link
         "level": "link",
         "onEvent": {
             "click": {
@@ -15778,7 +16118,21 @@ async function getButtonView(props) {
                             "showErrorMsg": true,
                             "showLoading": true,
                             "className": "app-popover",
-                            "closeOnEsc": false
+                            "closeOnEsc": false,
+                            "actions": [],
+                            "data": {
+                                // 这里必须加data数据映射，否则翻页功能中取changedItems值时会乱，比如翻页编辑后会把上一页中没改过的字段值带过去
+                                // 额外把华炎魔方主表记录ObjectForm中的字段值从formData变量中映射到子表form中，因为子表lookup字段filtersFunction中可能依赖了主表记录中的字段值，比如“工作流规则”对象“时间触发器”字段中的“日期字段”字段
+                                // global、uiSchema等常用变量本来就在formData变量已经存在了，无需另外映射
+                                // "&": "${formData || {}}",
+                                // 换成从__super来映射上级表单数据是因为对象列表视图界面中每行下拉菜单中的编辑按钮弹出的表单中的子表所在作用域中没有formData变量
+                                // 映射到中间变量__parentForm而不是直接用&展开映射是为了避免表单中字段名与作用域中变量重名
+                                "__parentForm": "${__super.__super || {}}",
+                                "index": "${index}",
+                                "__changedItems": "${__changedItems}",
+                                "__wrapperServiceId": "${__wrapperServiceId}",
+                                "__readonlyItemsLength": `\${${props.name}.length}`
+                            }
                         }
                     }
                 ]
@@ -15788,6 +16142,32 @@ async function getButtonView(props) {
 }
 
 function getButtonDelete(props) {
+    let onDeleteItemScript = `
+        // let fieldValue = _.cloneDeep(event.data["${props.name}"]);
+        if(!event.data.__changedItems){
+            event.data.__changedItems = [];
+        }
+        let fieldValue = event.data.__changedItems;
+        // fieldValue.push(JSON.parse(JSON.stringify(event.data)));
+        fieldValue.splice(event.data.index, 1)
+        doAction({
+            "componentId": "${props.id}",
+            "actionType": "setValue",
+            "args": {
+                "value": fieldValue
+            }
+        });
+        // // 因为翻页form中用的是event.data.changedItems中的数据，所以不需要像下面这样doAction setValue变更中间变量changedItems值
+        // doAction({
+        //     "componentId": event.data.__wrapperServiceId,
+        //     "actionType": "setValue",
+        //     "args": {
+        //         "value": {
+        //             "__changedItems": fieldValue
+        //         }
+        //     }
+        // });
+    `;
     return {
         "type": "button",
         "label": "",
@@ -15796,12 +16176,16 @@ function getButtonDelete(props) {
         "onEvent": {
             "click": {
                 "actions": [
+                    // {
+                    //     "actionType": "deleteItem",
+                    //     "args": {
+                    //         "index": "${index+','}" //这里不加逗号后续会报错，语法是逗号分隔可以删除多行
+                    //     },
+                    //     "componentId": props.id
+                    // },
                     {
-                        "actionType": "deleteItem",
-                        "args": {
-                            "index": "${index+','}" //这里不加逗号后续会报错，语法是逗号分隔可以删除多行
-                        },
-                        "componentId": props.id
+                        "actionType": "custom",
+                        "script": onDeleteItemScript
                     }
                 ]
             }
@@ -15809,18 +16193,34 @@ function getButtonDelete(props) {
     };
 }
 
-const getAmisInputTableSchema = async (props, readonly) => {
+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 buttonsForColumnOperations = [];
+    let inlineEditMode = props.inlineEditMode;
+    let showAsInlineEditMode = inlineEditMode && props.editable;
     if (props.editable) {
-        let buttonEditSchema = await getButtonEdit(props);
-        buttonsForColumnOperations.push(buttonEditSchema);
+        let showEditButton = true;
+        if (showAsInlineEditMode) {
+            // inline edit模式下只在有列被隐藏时才需要显示编辑按钮
+            if (props.columns && props.columns.length > 0 && props.columns.length < props.fields.length) {
+                showEditButton = true;
+            }
+            else {
+                showEditButton = false;
+            }
+        }
+        // 编辑时显示编辑按钮
+        if (showEditButton) {
+            let buttonEditSchema = await getButtonEdit(props, showAsInlineEditMode);
+            buttonsForColumnOperations.push(buttonEditSchema);
+        }
     }
     else {
         // 只读时显示查看按钮
-        if(props.columns && props.columns.length > 0 && props.columns.length < props.fields.length){
+        if (props.columns && props.columns.length > 0 && props.columns.length < props.fields.length) {
             // 只在有列被隐藏时才需要显示查看按钮
             let buttonViewSchema = await getButtonView(props);
             buttonsForColumnOperations.push(buttonViewSchema);
@@ -15844,7 +16244,7 @@ const getAmisInputTableSchema = async (props, readonly) => {
         "id": props.id,
         "columns": await getInputTableColumns(props),
         // "needConfirm": false, //不可以配置为false，否则，单元格都是可编辑状态，且很多static类型无法正常显示，比如static-mapping
-        "strictMode": true,
+        "strictMode": props.strictMode,
         "showTableAddBtn": false,
         "showFooterAddBtn": false,
         "className": props.tableClassName
@@ -15857,13 +16257,60 @@ const getAmisInputTableSchema = async (props, readonly) => {
             "width": buttonsForColumnOperations.length > 1 ? "46px" : "20px"
         });
     }
+    if (showAsInlineEditMode) {
+        inputTableSchema.needConfirm = false;
+    }
+    let dataProviderInited = `
+        // 单独维护一份中间变量changedItems，因为原变量在input-table组件有单独的作用域，翻页功能中无法维护此作用域中的行记录值
+        setData({ __changedItems: _.cloneDeep(data["${props.name}"]) || []});
+    `;
+    let onInitScript = `
+        // 上面dataProviderInited中setData有时不生效，没有成功给service组件设置__changedItems变量值
+        // 比如设计字段布局界面中的设置分组功能就因为__changedItems变量值不存在而报错，应该是因为把steedos-input-table组件单独放到弹出窗口中会有这个问题
+        // 所以额外在service init事件中手动设置一次__changedItems值
+        let __wrapperServiceId = event.data.__wrapperServiceId;
+        let fieldValue = _.cloneDeep(event.data["${props.name}"]) || [];
+        doAction({
+            "componentId": __wrapperServiceId,
+            "actionType": "setValue",
+            "args": {
+                "value": {
+                    "__changedItems": fieldValue
+                }
+            }
+        });
+        // 下面的doAction好像不是必须的
+        // doAction({
+        //     "componentId": "${props.id}",
+        //     "actionType": "setValue",
+        //     "args": {
+        //         "value": fieldValue
+        //     }
+        // });
+    `;
     let schema = {
-        "type": "wrapper",
-        "size": "none",
+        "type": "service",
         "body": [
             inputTableSchema
         ],
-        "className": props.className
+        "className": props.className,
+        "id": serviceId,
+        "data": {
+            "__wrapperServiceId": serviceId
+        },
+        "dataProvider": {
+            "inited": dataProviderInited
+        },
+        "onEvent": {
+          "init": {
+            "actions": [
+              {
+                "actionType": "custom",
+                "script": onInitScript
+              }
+            ]
+          }
+        }
     };
     let footerToolbar = _$1.clone(props.footerToolbar || []); //这里不clone的话，会造成死循环，应该是因为props属性变更会让组件重新渲染
     if (props.addable) {
@@ -15877,10 +16324,22 @@ const getAmisInputTableSchema = async (props, readonly) => {
             "body": footerToolbar
         });
     }
-    if (props.amis) {
-        delete props.amis.id;
-        Object.assign(schema.body[0], props.amis);
+    let amis = props["input-table"] || props.amis;//额外支持"input-table"代替amis属性，是因为在字段yml文件中用amis作为key不好理解
+    if (amis) {
+        // 支持配置amis属性重写或添加最终生成的input-table中任何属性。
+        delete amis.id;//如果steedos-input-table组件配置了amis.id属性，会造成新建编辑行功能不生效
+        Object.assign(schema.body[0], amis);
+    }
+    const isAnyFieldHasDependOn = (props.fields || []).find(function (item) {
+        return item.depend_on;
+    });
+    if(isAnyFieldHasDependOn){
+        // 有任意一个子字段有depend_on属性时，强制设置禁用静态模式
+        Object.assign(schema.body[0], {
+            strictMode: false
+        });
     }
+    // console.log("===schema===", schema);
     return schema;
 };
 
@@ -20862,14 +21321,14 @@ function getAmisStaticFieldType(type, data_type, options) {
     return type;
 }
 var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var steedosField, field, _a, readonly, _b, ctx, config, fStatic, hideLabel, schema, schema, fieldAmis, schema, error_1;
-    var _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    var steedosField, field, _a, readonly, _b, ctx, config, fStatic, hideLabel, defaultSource, source, schema, schema, fieldAmis, schema, error_1;
+    var _c, _d, _e;
+    return __generator(this, function (_f) {
+        switch (_f.label) {
             case 0:
                 steedosField = null;
                 field = props.field, _a = props.readonly, readonly = _a === void 0 ? false : _a, _b = props.ctx, ctx = _b === void 0 ? {} : _b, config = props.config, props.$schema, fStatic = props.static, hideLabel = props.hideLabel;
-                console.log("AmisSteedosField", props);
+                // console.log(`AmisSteedosField`, props)
                 // if($schema.config && isString($schema.config)){
                 //     $schema.config = JSON.parse($schema.config)
                 //     props.config = $schema.config
@@ -20877,36 +21336,51 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                 if (_$1.isString(ctx)) {
                     ctx = JSON.parse(ctx);
                 }
-                if (config) {
-                    steedosField = config;
-                    if (_$1.isString(steedosField)) {
-                        steedosField = JSON.parse(config);
-                    }
+                steedosField = config ? config : field;
+                if (_$1.isString(steedosField)) {
+                    steedosField = JSON.parse(steedosField);
                 }
                 else {
-                    steedosField = field;
-                    if (_$1.isString(field)) {
-                        steedosField = JSON.parse(field);
-                    }
+                    // 这里要clone是因为后面图片字段类型执行steedosField.amis = ...的时候会造成input-table中的图片字段在弹出编辑表单点击确认后整个input-table组件重新渲染了，从而导致其翻页功能异常
+                    steedosField = _$1.clone(steedosField);
                 }
-                _d.label = 1;
+                if (!fStatic && steedosField.readonly && !props.data.hasOwnProperty("_display")) {
+                    // 字段配置为只读，强制走fStatic模式，加上_display判断是为了不影响历史代码，比如直接在ObjectForm中调用steedos-field组件
+                    fStatic = true;
+                }
+                _f.label = 1;
             case 1:
-                _d.trys.push([1, 15, , 16]);
+                _f.trys.push([1, 16, , 17]);
                 if (!(fStatic && (steedosField.type === 'lookup' || steedosField.type === 'master_detail'))) return [3 /*break*/, 2];
+                defaultSource = {
+                    "method": "post",
+                    "url": "${context.rootUrl}/graphql",
+                    "requestAdaptor": "\n                    var steedosField = ".concat(JSON.stringify(steedosField), ";\n                    var objectName, filters, valueFieldKey, labelFieldKey;\n                    if(_.isString(steedosField.reference_to)){\n                        // reference_to\u4E3A\u5355\u9009\n                        const referenceTo = getReferenceToSync(steedosField);\n                        const referenceToField = steedosField.reference_to_field || '_id';\n\n                        objectName = referenceTo.objectName\n                        valueFieldKey = referenceTo && referenceTo.valueField?.name || '_id' ;\n                        labelFieldKey = referenceTo && referenceTo.labelField?.name || 'name';\n                        let value = api.data[steedosField.name];\n                        if(_.isString(value)){\n                            value = [value]\n                        }\n                        filters = [referenceToField, \"in\", value || []];\n                        if(objectName == \"object_fields\"){\n                            //\u5BF9\u8C61\u4E3Aobject_fields\u65F6\uFF0C\u5FC5\u987B\u52A0\u4E0Aobject\u7684\u8FC7\u6EE4\u6761\u4EF6\n                            const filtersFunction = ").concat(steedosField.filtersFunction || steedosField._filtersFunction, ";\n                            if(filtersFunction){\n                                const _filters = filtersFunction(filters, api.data);\n                                if(_filters && _filters.length > 0){\n                                    filters = [filters,_filters]\n                                }\n                            }\n                        }\n                    }else{\n                        // reference_to\u4E3A\u591A\u9009\n                        const _steedosField = {\n                            ...steedosField,\n                            reference_to: api.data[steedosField.name].o\n                        }\n                        const referenceTo = getReferenceToSync(_steedosField);\n                        const referenceToField = _steedosField.reference_to_field || '_id';\n\n                        objectName = referenceTo.objectName\n                        valueFieldKey = referenceTo && referenceTo.valueField?.name || '_id' ;\n                        labelFieldKey = referenceTo && referenceTo.labelField?.name || 'name';\n                        let value = api.data[_steedosField.name] && api.data[_steedosField.name].ids;\n                        filters = [referenceToField, \"in\", value || []];\n                    }\n                    api.data = {\n                        query: '{options:' + objectName + '(filters: ' + JSON.stringify(filters) + '){label: ' + labelFieldKey + ',value: ' + valueFieldKey + '}}'\n                    }\n                    return api;\n                "),
+                    "trackExpression": "${" + steedosField.name + "}",
+                    "cache": 3000
+                };
+                if (!steedosField.reference_to) {
+                    // 兼容lookup字段未配置reference_to属性的情况，当普通下拉框字段用
+                    defaultSource = {
+                        "url": "${context.rootUrl}/api/v1/spaces/none",
+                        data: { $: "$$" },
+                    };
+                    if (steedosField.optionsFunction || steedosField._optionsFunction) {
+                        defaultSource.adaptor = "\n                        var options = eval(".concat(steedosField.optionsFunction || steedosField._optionsFunction, ")(api.body.$);\n                        if(api.body.$term){\n                            options = _.filter(options, function(o) {\n                                var label = o.label;\n                                return label.toLowerCase().indexOf(api.body.$term.toLowerCase()) > -1;\n                            });\n                        }\n                        if(!payload.data){\n                            payload.data = {};\n                        }\n                        payload.data.options = options;\n                        return payload;\n                    ");
+                    }
+                    else if (steedosField.options) {
+                        defaultSource.adaptor = "\n                        var options = ".concat(JSON.stringify(steedosField.options), "\n                        if(api.body.$term){\n                            options = _.filter(options, function(o) {\n                                var label = o.label;\n                                return label.toLowerCase().indexOf(api.body.$term.toLowerCase()) > -1;\n                            });\n                        }\n                        if(!payload.data){\n                            payload.data = {};\n                        }\n                        payload.data.options = options;\n                        return payload;\n                    ");
+                    }
+                }
+                source = ((_c = steedosField.amis) === null || _c === void 0 ? void 0 : _c.source) || ((_d = steedosField.amis) === null || _d === void 0 ? void 0 : _d.autoComplete) || defaultSource;
                 schema = Object.assign({}, {
                     type: 'select',
                     multiple: steedosField.multiple,
                     name: steedosField.name,
                     label: steedosField.label,
                     static: true,
-                    className: (_c = steedosField.amis) === null || _c === void 0 ? void 0 : _c.className,
-                    source: {
-                        "method": "post",
-                        "url": "${context.rootUrl}/graphql",
-                        "requestAdaptor": "\n                        var steedosField = ".concat(JSON.stringify(steedosField), ";\n                        var objectName, filters, valueFieldKey, labelFieldKey;\n                        if(_.isString(steedosField.reference_to)){\n                            const referenceTo = getReferenceToSync(steedosField);\n                            const referenceToField = steedosField.reference_to_field || '_id';\n\n                            objectName = referenceTo.objectName\n                            valueFieldKey = referenceTo && referenceTo.valueField?.name || '_id' ;\n                            labelFieldKey = referenceTo && referenceTo.labelField?.name || 'name';\n                            let value = api.data[steedosField.name];\n                            if(_.isString(value)){\n                                value = [value]\n                            }\n                            filters = [referenceToField, \"in\", value || []];\n                            if(objectName == \"object_fields\"){\n                                //\u5BF9\u8C61\u4E3Aobject_fields\u65F6\uFF0C\u5FC5\u987B\u52A0\u4E0Aobject\u7684\u8FC7\u6EE4\u6761\u4EF6\n                                const filtersFunction = ").concat(steedosField.filtersFunction || steedosField._filtersFunction, ";\n                                if(filtersFunction){\n                                    const _filters = filtersFunction(filters, api.data);\n                                    if(_filters && _filters.length > 0){\n                                        filters = [filters,_filters]\n                                    }\n                                }\n                            }\n                        }else{\n                            const _steedosField = {\n                                ...steedosField,\n                                reference_to: api.data[steedosField.name].o\n                            }\n                            const referenceTo = getReferenceToSync(_steedosField);\n                            const referenceToField = _steedosField.reference_to_field || '_id';\n\n                            objectName = referenceTo.objectName\n                            valueFieldKey = referenceTo && referenceTo.valueField?.name || '_id' ;\n                            labelFieldKey = referenceTo && referenceTo.labelField?.name || 'name';\n                            let value = api.data[_steedosField.name] && api.data[_steedosField.name].ids;\n                            filters = [referenceToField, \"in\", value || []];\n                        }\n                        api.data = {\n                            query: '{options:' + objectName + '(filters: ' + JSON.stringify(filters) + '){label: ' + labelFieldKey + ',value: ' + valueFieldKey + '}}'\n                        }\n                        return api;\n                    "),
-                        "trackExpression": "${" + steedosField.name + "}",
-                        "cache": 3000
-                    },
+                    className: (_e = steedosField.amis) === null || _e === void 0 ? void 0 : _e.className,
+                    source: source,
                 }, _$1.pick(steedosField.amis || {}, ['className', 'inline', 'label', 'labelAlign', 'name', 'labelRemark', 'description', 'placeholder', 'staticClassName', 'staticLabelClassName', 'staticInputClassName', 'staticSchema']));
                 schema.placeholder = "";
                 if (hideLabel) {
@@ -20914,12 +21388,12 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                 }
                 return [2 /*return*/, schema];
             case 2:
-                if (!fStatic) return [3 /*break*/, 12];
+                if (!fStatic) return [3 /*break*/, 13];
                 if (!props.data.hasOwnProperty("_display")) return [3 /*break*/, 4];
                 return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
             case 3: 
             // 有_display时保持原来的逻辑不变，不走以下新的逻辑，审批王中会特意传入_display以跳过后面新加的代码
-            return [2 /*return*/, _d.sent()];
+            return [2 /*return*/, _f.sent()];
             case 4:
                 schema = Object.assign({}, steedosField, {
                     type: getAmisStaticFieldType(steedosField.type, steedosField.data_type, steedosField),
@@ -20932,27 +21406,33 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     timeFormat: 'HH:mm',
                     format: '1970-01-01THH:mm:00.000[Z]',
                 });
-                return [3 /*break*/, 11];
+                return [3 /*break*/, 12];
             case 5:
                 if (!(steedosField.type === "percent")) return [3 /*break*/, 6];
                 Object.assign(schema, {
                     "percent": steedosField.scale ? steedosField.scale : true
                 });
-                return [3 /*break*/, 11];
+                return [3 /*break*/, 12];
             case 6:
                 if (!(steedosField.type === "password")) return [3 /*break*/, 7];
                 Object.assign(schema, {
                     "revealPassword": false //没生效，需要用样式隐藏
                 });
-                return [3 /*break*/, 11];
+                return [3 /*break*/, 12];
             case 7:
                 if (!(steedosField.type === "select")) return [3 /*break*/, 8];
                 Object.assign(schema, {
                     "placeholder": ""
                 });
-                return [3 /*break*/, 11];
+                return [3 /*break*/, 12];
             case 8:
-                if (!(steedosField.type === "image")) return [3 /*break*/, 9];
+                if (!(steedosField.type === "color")) return [3 /*break*/, 9];
+                Object.assign(schema, {
+                    "defaultColor": null
+                });
+                return [3 /*break*/, 12];
+            case 9:
+                if (!(steedosField.type === "image")) return [3 /*break*/, 10];
                 Object.assign(schema, {
                     enlargeAble: true,
                     showToolbar: true,
@@ -20983,21 +21463,21 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         return value;
                     }
                 });
-                return [3 /*break*/, 11];
-            case 9:
-                if (!(steedosField.type === "file")) return [3 /*break*/, 11];
+                return [3 /*break*/, 12];
+            case 10:
+                if (!(steedosField.type === "file")) return [3 /*break*/, 12];
                 return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
-            case 10: 
+            case 11: 
             // 附件static模式先保持原来的逻辑，依赖_display，审批王中相关功能在creator中
             // convertSFieldToAmisField中会合并steedosField.amis，所以也不需要再次合并steedosField.amis，直接return就好
-            return [2 /*return*/, _d.sent()];
-            case 11:
+            return [2 /*return*/, _f.sent()];
+            case 12:
                 Object.assign(schema, steedosField.amis || {});
                 if (hideLabel) {
                     delete schema.label;
                 }
                 return [2 /*return*/, schema];
-            case 12:
+            case 13:
                 fieldAmis = steedosField.amis || {};
                 if (!props.data.hasOwnProperty("_display")) {
                     // 有_display时保持原来的逻辑不变，不走以下新的逻辑，审批王中会特意传入_display以跳过后面新加的代码
@@ -21055,16 +21535,19 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     }
                 }
                 return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
-            case 13:
-                schema = _d.sent();
+            case 14:
+                schema = _f.sent();
+                if (hideLabel) {
+                    delete schema.label;
+                }
                 // console.log(`AmisSteedosField return schema`, schema)
                 return [2 /*return*/, schema];
-            case 14: return [3 /*break*/, 16];
-            case 15:
-                error_1 = _d.sent();
+            case 15: return [3 /*break*/, 17];
+            case 16:
+                error_1 = _f.sent();
                 console.log("error", error_1);
-                return [3 /*break*/, 16];
-            case 16: return [2 /*return*/, null];
+                return [3 /*break*/, 17];
+            case 17: return [2 /*return*/, null];
         }
     });
 }); };
@@ -21307,7 +21790,7 @@ var AmisInputTable = function (props) { return __awaiter(void 0, void 0, void 0,
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                props.$schema, props.fields, props.name, props.id, props.data, props.columns, props.amis, props.className, props.tableClassName, props.footerToolbar;
+                props.$schema, props.fields, props.name, props.id, props.data, props.columns, props.amis, props.className, props.tableClassName, props.footerToolbar, props.inlineEditMode, props.strictMode;
                 return [4 /*yield*/, getAmisInputTableSchema(props)];
             case 1:
                 amisSchema = _a.sent();