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

package/dist/amis-object.cjs.js

@@ -108,6 +108,18 @@ function __generator(thisArg, body) {
     }
 }
 
+function __values(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+}
+
 function __read(o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -4795,6 +4807,7 @@ async function getQuickEditSchema(field, options){
                         {
                             "actionType": "custom",
                             "script": `
+
                                     var _display = _.cloneDeep(event.data._display);
                                     ${displayField}
                                     doAction({actionType: 'setValue', "args": {"value": {_display}},componentId: "${quickEditId}"});
@@ -4966,7 +4979,7 @@ async function getQuickEditSchema(field, options){
                         "actions":[
                             {
                                 "actionType": "setValue",
-                                "componentId": `service_listview_${options.objectName}`,
+                                "componentId": quickEditId,
                                 "args": {
                                     "value":{
                                         "quickedit_record_permissions_loading": true
@@ -4991,7 +5004,7 @@ async function getQuickEditSchema(field, options){
                             },
                             {
                                 "actionType": "setValue",
-                                "componentId": `service_listview_${options.objectName}`,
+                                "componentId": quickEditId,
                                 "args": {
                                     "value":{
                                         "quickedit_record_permissions_loading": false
@@ -5000,7 +5013,7 @@ async function getQuickEditSchema(field, options){
                             },
                             {
                                 "actionType": "setValue",
-                                "componentId": `service_listview_${options.objectName}`,
+                                "componentId": quickEditId,
                                 "args": {
                                     "value":{
                                         "quickedit_record_permissions": "${event.data}"
@@ -5179,9 +5192,9 @@ function getFieldWidth(width){
 async function getTableColumns$1(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;
     
@@ -5723,6 +5736,7 @@ async function getTableSchema$1(fields, options){
         if(!isLookup && !hiddenColumnOperation){
             columns.push(await getTableOperation(options));
         }
+        
     }
 
     return {
@@ -6032,7 +6046,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;
@@ -6040,6 +6068,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(() => {
@@ -6816,6 +6845,7 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
         "dialog": {
           "type": "dialog",
           "title": title,
+          data,
           "body": [
             {
               "type": "steedos-object-form",
@@ -11396,7 +11426,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);
@@ -11488,6 +11518,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;
@@ -11512,6 +11547,7 @@ async function getObjectCRUD(objectSchema, fields, options){
         body = wrappedBody;
       }
     }
+    
     // console.timeEnd('getObjectCRUD');
     // TODO: data应该只留loaded，其他属性都改为从上层传递下来
     return {
@@ -13714,6 +13750,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 = [];
@@ -15583,7 +15622,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
  */
 
 /**
@@ -15611,20 +15650,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
         }
     }
 }
@@ -15830,7 +15871,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, {
@@ -15870,8 +15911,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];
         });
@@ -15935,7 +15996,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，直接变更其值即可改变表单中的值
@@ -15974,66 +16036,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 = [];
@@ -16124,6 +16186,7 @@ async function getButtonActions(props, mode) {
             }
         ];
         if(props.addable){
+            // 有新增行权限时额外添加新增和复制按钮
             dialogButtons = [
                 {
                     "type": "button",
@@ -16188,7 +16251,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": {
@@ -16211,11 +16275,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({
@@ -16239,11 +16304,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];
@@ -16281,12 +16344,47 @@ 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
+            }
+        ];
+    }
     return actions;
 }
 
@@ -16332,24 +16430,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": "",
@@ -16357,19 +16438,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")
             }
         }
     };
@@ -16409,7 +16478,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 = {
@@ -16436,7 +16505,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) {
@@ -19855,6 +19924,7 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                             },
                             {
                                 "actionType": "reload",
+                                "componentId": "listview_" + objectApiName,
                                 "expression": "${(event.data.recordId || event.data.__deletedRecord === true || event.data.displayAs === 'split') && event.data._isRelated != true}" //不是新建, 或分栏模式下新建主对象记录, 则刷新列表
                             }
                         ]
@@ -20752,7 +20822,7 @@ var AmisAppMenu = function (props) { return __awaiter(void 0, void 0, void 0, fu
             schemaApi: {
                 "method": "get",
                 "url": "${context.rootUrl}/service/api/apps/".concat(appId, "/menus"),
-                "adaptor": "\n                  try {\n                    //   console.log('payload====>', payload)\n                      if(payload.nav_schema){\n                        payload.data = payload.nav_schema;\n                        return payload\n                      }\n\n                      const data = { nav: [] };\n                      const stacked = ".concat(stacked, ";\n                      const showIcon = ").concat(showIcon, ";\n                      const selectedId = '").concat(selectedId, "';\n                      const tab_groups = payload.tab_groups;\n                      const locationPathname = window.location.pathname;\n                      var customTabId = \"\";\n                      var objectTabId = \"").concat(data.tabId, "\";\n                      if(stacked){\n                          _.each(_.groupBy(payload.children, 'group'), (tabs, groupName) => {\n                              if (groupName === 'undefined' || groupName === '') {\n                                  _.each(tabs, (tab) => {\n                                      if(locationPathname == tab.path){\n                                        customTabId = tab.id;\n                                      }else if(locationPathname.startsWith(tab.path + \"/\")){\n                                        objectTabId = tab.id;\n                                      }\n                                      data.nav.push({\n                                          \"label\": showIcon ? {\n                                            type: 'tpl',\n                                            tpl: `<span class='fill-slate-500 whitespace-normal leading-6 block -ml-px no-underline group flex items-center text-[14px] rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                                          } : tab.name,\n                                          \"to\": tab.path,\n                                          \"target\":tab.target,\n                                          \"id\": tab.id,\n                                          \"activeOn\": \"\\\\${tabId == '\"+ tab.id +\"'}\",\n                                          \"index\": tab.index\n                                          // active: selectedId === tab.id,\n                                      })\n                                  })\n                              } else {\n                                  var tabGroup = _.find(tab_groups, {\"group_name\": groupName});\n                                  data.nav.push({\n                                      \"label\": groupName,\n                                      \"unfolded\": tabGroup && tabGroup.default_open != false,\n                                      \"isGroup\": true,\n                                      \"children\": _.sortBy(_.map(tabs, (tab) => {\n                                            if(locationPathname == tab.path){\n                                                customTabId = tab.id;\n                                            }else if(locationPathname.startsWith(tab.path + \"/\")){\n                                                objectTabId = tab.id;\n                                            }\n                                            return {\n                                            \"label\": showIcon ? {\n                                                type: 'tpl',\n                                                tpl: `<span class='fill-slate-500 whitespace-normal leading-6 block -ml-px no-underline group flex items-center text-[14px] rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                                            }  : tab.name,\n                                            \"to\": tab.path,\n                                            \"target\":tab.target,\n                                            \"id\": tab.id,\n                                            \"activeOn\": \"\\\\${tabId == '\"+ tab.id +\"'}\",\n                                            \"index\": tab.index\n                                            // active: selectedId === tab.id,\n                                            }\n                                        }),(tab) => {return tab.index})\n                                  })   \n                              }\n                              });\n                        \n                      }else{\n                          _.each(payload.children, (tab)=>{\n                              if(locationPathname == tab.path){\n                                customTabId = tab.id;\n                              }else if(locationPathname.startsWith(tab.path + \"/\")){\n                                objectTabId = tab.id;\n                              }\n                              data.nav.push({\n                              \"label\": showIcon ? {\n                                  type: 'tpl',\n                                  tpl: `<span class='fill-slate-500 whitespace-normal leading-6 block -ml-px no-underline group flex items-center text-[14px] rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                              } : tab.name,\n                              \"to\": tab.path,\n                              \"target\":tab.target,\n                              \"id\": tab.id,\n                              \"activeOn\": \"\\\\${tabId == '\"+ tab.id +\"'}\",\n                              \"index\": tab.index\n                              // active: selectedId === tab.id,\n                              });\n                          })\n                      }\n                      //\u4EE5\u4E0B\u4E3Anav\u7B2C\u4E00\u5C42\u6392\u5E8F\uFF0C\u5305\u62EC\u5206\u7EC4\u4E0E\u9009\u9879\u5361\n                      // let groupLength = ((payload.tab_groups && payload.tab_groups.length) || 0) + 1000;\n                      data.nav = _.sortBy(data.nav, function(tab){\n                        if(tab.isGroup){\n                            return _.findIndex(payload.tab_groups, function(group){\n                                return group.group_name === tab.label;\n                            });\n                        }else{\n                            // \u6CA1\u6709\u5206\u7EC4\u7684\u9009\u9879\u5361\u6309index\u6392\u5217\u5728\u6709\u5206\u7EC4\u7684\u9009\u9879\u5361\u524D\u65B9\n                            return (tab.index || 0) - 1000;\n                        }\n                      })\n                      payload.data = {\n                        \"type\":\"service\",\n                        \"data\":{\n                            \"tabId\": customTabId || objectTabId,\n                            \"items\": data.nav\n                        },\n                        \"id\": \"appMenuService\",\n                        \"body\":{\n                            \"type\": \"nav\",\n                            className: \"").concat(className, " text-black\",\n                            \"stacked\": ").concat(stacked, ",\n                            \"overflow\": ").concat(JSON.stringify(overflow), ",\n                            \"indentSize\": ").concat(indentSize, ",\n                            \"source\": \"${items}\",\n                            //\u5DE6\u5C42\u663E\u793A\u65F6\u5BA1\u6279\u5355\u663E\u793Abadge\u6570\u91CF\n                            \"itemBadge\": {\n                                \"mode\": \"text\",\n                                \"text\": \"").concat(badgeText, "\",\n                                \"visibleOn\": \"${id == 'instances'}\",\n                                \"overflowCount\": 99,\n                                \"style\": stacked?{\n                                  \"right\": \"20%\",\n                                  \"margin-right\": \"-23px\",\n                                  \"height\": \"20px\",\n                                  \"border-radius\": \"10px\",\n                                  \"font-size\": \"16px\",\n                                  \"line-height\": \"18px\",\n                                  \"top\": \"50%\"\n                                }:{\n                                    \"transform\": \"translate(calc(50% - 17px), calc(-50% + 10px))\",\n                                    \"border-radius\": \"6.5px\",\n                                    \"height\": \"15px\",\n                                    \"line-height\": \"13px\",\n                                    \"padding\": \"0px 4px\",\n                                    \"font-size\": \"12px\"\n                                }\n                            },\n                            \"onEvent\": {\n                                \"click\": {\n                                    \"actions\": [\n                                        {\n                                            \"actionType\": \"setValue\",\n                                            \"componentId\": \"appMenuService\",\n                                            \"args\": {\n                                                \"value\": {\n                                                    \"tabId\": \"${event.data.item.id}\",\n                                                    \"items\": data.nav\n                                                }\n                                            },\n                                            \"expression\":\"${event.data.item.id}\"\n                                        },\n                                        {\n                                            \"actionType\": \"custom\",\n                                            \"script\" : \"window.postMessage(Object.assign({type: 'nav.click', data: event.data.item}), '*');\"\n                                        }\n                                    ]\n                                },\n                                \"@tabId.changed\":{\n                                    \"actions\":[\n                                        {\n                                            \"actionType\": \"setValue\",\n                                            \"componentId\": \"appMenuService\",\n                                            \"args\": {\n                                                \"value\": {\n                                                    \"tabId\": \"${event.data.tabId}\",\n                                                    \"items\": data.nav\n                                                }\n                                            },\n                                            \"expression\":\"${event.data.tabId}\"\n                                        },\n                                        {\n                                            \"actionType\": \"custom\",\n                                            \"script\" : \"window.postMessage(Object.assign({type: 'nav.click', data: event.data.item}), '*');\"\n                                        }\n                                    ]\n                                }\n                            }\n                        }\n                      };\n                  } catch (error) {\n                      console.log(`error`, error)\n                  }\n                //   console.log('payload===2==>', payload)\n                  return payload;\n            "),
+                "adaptor": "\n                  try {\n                    //   console.log('payload====>', payload)\n                      if(payload.nav_schema){\n                        payload.data = payload.nav_schema;\n                        return payload\n                      }\n\n                      const data = { nav: [] };\n                      const stacked = ".concat(stacked, ";\n                      const showIcon = ").concat(showIcon, ";\n                      const selectedId = '").concat(selectedId, "';\n                      const tab_groups = payload.tab_groups;\n                      const locationPathname = window.location.pathname;\n                      var customTabId = \"\";\n                      var objectTabId = \"").concat(data.tabId, "\";\n                      if(stacked){\n                          _.each(_.groupBy(payload.children, 'group'), (tabs, groupName) => {\n                              if (groupName === 'undefined' || groupName === '') {\n                                  _.each(tabs, (tab) => {\n                                      if(locationPathname == tab.path){\n                                        customTabId = tab.id;\n                                      }else if(locationPathname.startsWith(tab.path + \"/\")){\n                                        objectTabId = tab.id;\n                                      }\n                                      data.nav.push({\n                                          \"label\": showIcon ? {\n                                            type: 'tpl',\n                                            tpl: `<span class='fill-slate-500 whitespace-normal leading-6 block -ml-px no-underline group flex items-center text-[14px] rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                                          } : tab.name,\n                                          \"to\": tab.path,\n                                          \"target\":tab.target,\n                                          \"id\": tab.id,\n                                          \"activeOn\": \"\\\\${tabId == '\"+ tab.id +\"'}\",\n                                          \"index\": tab.index\n                                          // active: selectedId === tab.id,\n                                      })\n                                  })\n                              } else {\n                                  var tabGroup = _.find(tab_groups, {\"group_name\": groupName});\n                                  data.nav.push({\n                                      \"label\": groupName,\n                                      \"unfolded\": tabGroup && tabGroup.default_open != false,\n                                      \"isGroup\": true,\n                                      \"children\": _.sortBy(_.map(tabs, (tab) => {\n                                            if(locationPathname == tab.path){\n                                                customTabId = tab.id;\n                                            }else if(locationPathname.startsWith(tab.path + \"/\")){\n                                                objectTabId = tab.id;\n                                            }\n                                            return {\n                                            \"label\": showIcon ? {\n                                                type: 'tpl',\n                                                tpl: `<span class='fill-slate-500 whitespace-normal leading-6 block -ml-px no-underline group flex items-center text-[14px] rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                                            }  : tab.name,\n                                            \"to\": tab.path,\n                                            \"target\":tab.target,\n                                            \"id\": tab.id,\n                                            \"activeOn\": \"\\\\${tabId == '\"+ tab.id +\"'}\",\n                                            \"index\": tab.index\n                                            // active: selectedId === tab.id,\n                                            }\n                                        }),(tab) => {return tab.index})\n                                  })   \n                              }\n                              });\n                        \n                      }else{\n                          _.each(payload.children, (tab)=>{\n                              if(locationPathname == tab.path){\n                                customTabId = tab.id;\n                              }else if(locationPathname.startsWith(tab.path + \"/\")){\n                                objectTabId = tab.id;\n                              }\n                              data.nav.push({\n                              \"label\": showIcon ? {\n                                  type: 'tpl',\n                                  tpl: `<span class='fill-slate-500 whitespace-normal leading-6 block -ml-px no-underline group flex items-center text-[14px] rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                              } : tab.name,\n                              \"to\": tab.path,\n                              \"target\":tab.target,\n                              \"id\": tab.id,\n                              \"activeOn\": \"\\\\${tabId == '\"+ tab.id +\"'}\",\n                              \"index\": tab.index\n                              // active: selectedId === tab.id,\n                              });\n                          })\n                      }\n                      //\u4EE5\u4E0B\u4E3Anav\u7B2C\u4E00\u5C42\u6392\u5E8F\uFF0C\u5305\u62EC\u5206\u7EC4\u4E0E\u9009\u9879\u5361\n                      // let groupLength = ((payload.tab_groups && payload.tab_groups.length) || 0) + 1000;\n                      data.nav = _.sortBy(data.nav, function(tab){\n                        if(tab.isGroup){\n                            return _.findIndex(payload.tab_groups, function(group){\n                                return group.group_name === tab.label;\n                            });\n                        }else{\n                            // \u6CA1\u6709\u5206\u7EC4\u7684\u9009\u9879\u5361\u6309index\u6392\u5217\u5728\u6709\u5206\u7EC4\u7684\u9009\u9879\u5361\u524D\u65B9\n                            return (tab.index || 0) - 1000;\n                        }\n                      })\n                      payload.data = {\n                        \"type\":\"service\",\n                        \"data\":{\n                            \"tabId\": customTabId || objectTabId,\n                            \"items\": data.nav\n                        },\n                        \"id\": \"appMenuService\",\n                        \"body\":{\n                            \"type\": \"nav\",\n                            className: \"").concat(className, " text-black\",\n                            \"stacked\": ").concat(stacked, ",\n                            \"overflow\": ").concat(JSON.stringify(overflow), ",\n                            \"indentSize\": ").concat(indentSize, ",\n                            \"source\": \"${items}\",\n                            //\u5DE6\u5C42\u663E\u793A\u65F6\u5BA1\u6279\u5355\u663E\u793Abadge\u6570\u91CF\n                            \"itemBadge\": {\n                                \"mode\": \"text\",\n                                \"text\": \"").concat(badgeText, "\",\n                                \"visibleOn\": \"${id == 'instance_tasks'}\",\n                                \"overflowCount\": 99,\n                                \"style\": stacked?{\n                                  \"right\": \"20%\",\n                                  \"margin-right\": \"-23px\",\n                                  \"height\": \"20px\",\n                                  \"border-radius\": \"10px\",\n                                  \"font-size\": \"16px\",\n                                  \"line-height\": \"18px\",\n                                  \"top\": \"50%\"\n                                }:{\n                                    \"transform\": \"translate(calc(50% - 17px), calc(-50% + 10px))\",\n                                    \"border-radius\": \"6.5px\",\n                                    \"height\": \"15px\",\n                                    \"line-height\": \"13px\",\n                                    \"padding\": \"0px 4px\",\n                                    \"font-size\": \"12px\"\n                                }\n                            },\n                            \"onEvent\": {\n                                \"click\": {\n                                    \"actions\": [\n                                        {\n                                            \"actionType\": \"setValue\",\n                                            \"componentId\": \"appMenuService\",\n                                            \"args\": {\n                                                \"value\": {\n                                                    \"tabId\": \"${event.data.item.id}\",\n                                                    \"items\": data.nav\n                                                }\n                                            },\n                                            \"expression\":\"${event.data.item.id}\"\n                                        },\n                                        {\n                                            \"actionType\": \"custom\",\n                                            \"script\" : \"window.postMessage(Object.assign({type: 'nav.click', data: event.data.item}), '*');\"\n                                        }\n                                    ]\n                                },\n                                \"@tabId.changed\":{\n                                    \"actions\":[\n                                        {\n                                            \"actionType\": \"setValue\",\n                                            \"componentId\": \"appMenuService\",\n                                            \"args\": {\n                                                \"value\": {\n                                                    \"tabId\": \"${event.data.tabId}\",\n                                                    \"items\": data.nav\n                                                }\n                                            },\n                                            \"expression\":\"${event.data.tabId}\"\n                                        },\n                                        {\n                                            \"actionType\": \"custom\",\n                                            \"script\" : \"window.postMessage(Object.assign({type: 'nav.click', data: event.data.item}), '*');\"\n                                        }\n                                    ]\n                                }\n                            }\n                        }\n                      };\n                  } catch (error) {\n                      console.log(`error`, error)\n                  }\n                //   console.log('payload===2==>', payload)\n                  return payload;\n            "),
                 "headers": {
                     "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                 }
@@ -21451,7 +21521,7 @@ function getAmisStaticFieldType(type, data_type, options) {
         return "number";
     }
     else if (type === 'autonumber') {
-        return "text";
+        return "input-text"; //不可以用text，因为会出现字段label显示不出来的问题
     }
     else if (type === 'percent') {
         return "number";
@@ -21471,13 +21541,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, defaultSource, source, schema, schema, fieldAmis, schema, error_1;
-    var _c, _d, _e;
-    return __generator(this, function (_f) {
-        switch (_f.label) {
+    var steedosField, field, _a, readonly, _b, ctx, config, fStatic, defaultSource, source, schema, fieldSchema, fieldValue, hasImageOrFile_1, fieldHtml_1, schema, tableFields, _c, _d, subField, subFieldName, fieldAmis, schema, error_1;
+    var e_1, _e;
+    var _f, _g, _h;
+    return __generator(this, function (_j) {
+        switch (_j.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;
+                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;
                 // console.log(`AmisSteedosField`, props)
                 // if($schema.config && isString($schema.config)){
                 //     $schema.config = JSON.parse($schema.config)
@@ -21494,18 +21565,25 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     // 这里要clone是因为后面图片字段类型执行steedosField.amis = ...的时候会造成input-table中的图片字段在弹出编辑表单点击确认后整个input-table组件重新渲染了，从而导致其翻页功能异常
                     steedosField = _$1.clone(steedosField);
                 }
+                // if (props.label && !steedosField.label) {
+                //     steedosField.label = props.label;
+                // }
+                if (typeof props.label === "string" || props.label === false) {
+                    // 始终优先取组件上配置的label，且可以通过配置组件的label属性值为false来隐藏字段label
+                    steedosField.label = props.label;
+                }
                 if (!fStatic && steedosField.readonly && !props.data.hasOwnProperty("_display")) {
                     // 字段配置为只读，强制走fStatic模式，加上_display判断是为了不影响历史代码，比如直接在ObjectForm中调用steedos-field组件
                     fStatic = true;
                 }
-                _f.label = 1;
+                _j.label = 1;
             case 1:
-                _f.trys.push([1, 16, , 17]);
+                _j.trys.push([1, 18, , 19]);
                 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 = _.get(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                "),
+                    "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 = _.get(api.data, steedosField.name);\n                        if(_.isString(value)){\n                            value = [value]\n                        }\n                        filters = [referenceToField, \"in\", value || []];\n                        if(objectName == \"object_fields\" || objectName == \"object_actions\"){\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
                 };
@@ -21522,28 +21600,59 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         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;
+                source = ((_f = steedosField.amis) === null || _f === void 0 ? void 0 : _f.source) || ((_g = steedosField.amis) === null || _g === void 0 ? void 0 : _g.autoComplete) || defaultSource;
                 schema = Object.assign({}, {
                     type: 'select',
                     multiple: steedosField.multiple,
                     name: steedosField.name,
                     label: steedosField.label,
                     static: true,
-                    className: (_e = steedosField.amis) === null || _e === void 0 ? void 0 : _e.className,
+                    className: (_h = steedosField.amis) === null || _h === void 0 ? void 0 : _h.className,
                     source: source,
                 }, _$1.pick(steedosField.amis || {}, ['className', 'inline', 'label', 'labelAlign', 'name', 'labelRemark', 'description', 'placeholder', 'staticClassName', 'staticLabelClassName', 'staticInputClassName', 'staticSchema']));
                 schema.placeholder = "";
-                if (hideLabel) {
-                    delete schema.label;
-                }
                 return [2 /*return*/, schema];
             case 2:
-                if (!fStatic) return [3 /*break*/, 13];
+                if (!fStatic) return [3 /*break*/, 15];
                 if (!props.data.hasOwnProperty("_display")) return [3 /*break*/, 4];
                 return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
-            case 3: 
-            // 有_display时保持原来的逻辑不变，不走以下新的逻辑，审批王中会特意传入_display以跳过后面新加的代码
-            return [2 /*return*/, _f.sent()];
+            case 3:
+                fieldSchema = _j.sent();
+                if (steedosField.type === 'file' && fieldSchema.disabled) {
+                    fieldValue = fieldSchema.value;
+                    if (fieldValue && fieldValue.length) {
+                        hasImageOrFile_1 = false;
+                        _$1.forEach(fieldValue, function (item) {
+                            var fileName = item.name;
+                            if ([".pdf", ".jpg", ".jpeg", ".png", ".gif"].indexOf(fileName.slice(-4)) > -1) {
+                                hasImageOrFile_1 = true;
+                            }
+                        });
+                        if (!hasImageOrFile_1) {
+                            return [2 /*return*/, fieldSchema];
+                        }
+                        fieldHtml_1 = "";
+                        _$1.forEach(fieldValue, function (item) {
+                            var fileName = item.name;
+                            var fileUrl = item.url;
+                            var filePreviewHtml = '';
+                            if ([".pdf", ".jpg", ".jpeg", ".png", ".gif"].indexOf(fileName.slice(-4)) > -1) {
+                                var indexOfQuestionMark = fileUrl.indexOf('?');
+                                if (indexOfQuestionMark > -1) {
+                                    var filePreviewUrl = fileUrl.substring(0, indexOfQuestionMark);
+                                    filePreviewHtml = "&ensp;<a href=\"".concat(filePreviewUrl, "\" target=\"_blank\" class=\"antd-Link\"><span class=\"antd-TplField\"><span>\u9884\u89C8</span></span></a>");
+                                }
+                            }
+                            var tpl = "\n                                <div class=\"antd-FileControl-itemInfo flex-wrap\">\n                                    <span class=\"antd-FileControl-itemInfoIcon flex justify-center items-center\"><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 14 16\" class=\"icon icon-file\"><path d=\"M0 0v16h14V4.001L9.939 0H0Zm1 1h8v4h4v10H1V1Zm9 .464 2.575 2.537H10V1.464Z\"></path><path d=\"M4 12h6v-1H4zM4 9h6V8H4z\"></path></svg></span>\n                                    <a class=\"antd-FileControl-itemInfoText\" target=\"_blank\" rel=\"noopener\" href=\"".concat(fileUrl, "\">").concat(fileName, "</a>\n                                    ").concat(filePreviewHtml ? filePreviewHtml : '', "\n                                </div>\n                            ");
+                            fieldHtml_1 += tpl;
+                        });
+                        return [2 /*return*/, {
+                                "type": "tpl",
+                                "tpl": fieldHtml_1
+                            }];
+                    }
+                }
+                return [2 /*return*/, fieldSchema];
             case 4:
                 schema = Object.assign({}, steedosField, {
                     type: getAmisStaticFieldType(steedosField.type, steedosField.data_type, steedosField),
@@ -21556,33 +21665,75 @@ 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*/, 12];
+                return [3 /*break*/, 14];
             case 5:
                 if (!(steedosField.type === "percent")) return [3 /*break*/, 6];
                 Object.assign(schema, {
                     "percent": steedosField.scale ? steedosField.scale : true
                 });
-                return [3 /*break*/, 12];
+                return [3 /*break*/, 14];
             case 6:
                 if (!(steedosField.type === "password")) return [3 /*break*/, 7];
                 Object.assign(schema, {
                     "revealPassword": false //没生效，需要用样式隐藏
                 });
-                return [3 /*break*/, 12];
+                return [3 /*break*/, 14];
             case 7:
                 if (!(steedosField.type === "select")) return [3 /*break*/, 8];
                 Object.assign(schema, {
                     "placeholder": ""
                 });
-                return [3 /*break*/, 12];
+                return [3 /*break*/, 14];
             case 8:
                 if (!(steedosField.type === "color")) return [3 /*break*/, 9];
                 Object.assign(schema, {
                     "defaultColor": null
                 });
-                return [3 /*break*/, 12];
+                return [3 /*break*/, 14];
             case 9:
-                if (!(steedosField.type === "image")) return [3 /*break*/, 10];
+                if (!(steedosField.type === "number")) return [3 /*break*/, 10];
+                // amis input-number和number组件中的precision表示小数位数，并不是魔方平台的精度概念，要转换下，否则小数点后会显示很多的0
+                Object.assign(schema, {
+                    "precision": steedosField.scale || 0
+                });
+                return [3 /*break*/, 14];
+            case 10:
+                if (!(steedosField.type === "table")) return [3 /*break*/, 11];
+                if (steedosField.subFields) {
+                    tableFields = [];
+                    try {
+                        for (_c = __values(field.subFields), _d = _c.next(); !_d.done; _d = _c.next()) {
+                            subField = _d.value;
+                            if (!subField.name.endsWith(".$")) {
+                                subFieldName = subField.name.replace("".concat(field._prefix || '').concat(field.name, ".$."), '').replace("".concat(field.name, "."), '');
+                                // const gridSub = await convertSFieldToAmisField(Object.assign({}, subField, {name: subFieldName, isTableField: true}), readonly, ctx);
+                                tableFields.push(Object.assign({}, subField, { name: subFieldName }));
+                            }
+                        }
+                    }
+                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                    finally {
+                        try {
+                            if (_d && !_d.done && (_e = _c.return)) _e.call(_c);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                    }
+                    Object.assign(schema, {
+                        type: 'steedos-input-table',
+                        showIndex: true,
+                        editable: false,
+                        addable: false,
+                        removable: false,
+                        draggable: false,
+                        fields: tableFields,
+                        amis: {
+                            columnsTogglable: false
+                        }
+                    });
+                }
+                return [3 /*break*/, 14];
+            case 11:
+                if (!(steedosField.type === "image")) return [3 /*break*/, 12];
                 Object.assign(schema, {
                     enlargeAble: true,
                     showToolbar: true,
@@ -21613,21 +21764,18 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         return value;
                     }
                 });
-                return [3 /*break*/, 12];
-            case 10:
-                if (!(steedosField.type === "file")) return [3 /*break*/, 12];
+                return [3 /*break*/, 14];
+            case 12:
+                if (!(steedosField.type === "file")) return [3 /*break*/, 14];
                 return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
-            case 11: 
+            case 13: 
             // 附件static模式先保持原来的逻辑，依赖_display，审批王中相关功能在creator中
             // convertSFieldToAmisField中会合并steedosField.amis，所以也不需要再次合并steedosField.amis，直接return就好
-            return [2 /*return*/, _f.sent()];
-            case 12:
+            return [2 /*return*/, _j.sent()];
+            case 14:
                 Object.assign(schema, steedosField.amis || {});
-                if (hideLabel) {
-                    delete schema.label;
-                }
                 return [2 /*return*/, schema];
-            case 13:
+            case 15:
                 fieldAmis = steedosField.amis || {};
                 if (!props.data.hasOwnProperty("_display")) {
                     // 有_display时保持原来的逻辑不变，不走以下新的逻辑，审批王中会特意传入_display以跳过后面新加的代码
@@ -21685,19 +21833,16 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     }
                 }
                 return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
-            case 14:
-                schema = _f.sent();
-                if (hideLabel) {
-                    delete schema.label;
-                }
+            case 16:
+                schema = _j.sent();
                 // console.log(`AmisSteedosField return schema`, schema)
                 return [2 /*return*/, schema];
-            case 15: return [3 /*break*/, 17];
-            case 16:
-                error_1 = _f.sent();
+            case 17: return [3 /*break*/, 19];
+            case 18:
+                error_1 = _j.sent();
                 console.log("error", error_1);
-                return [3 /*break*/, 17];
-            case 17: return [2 /*return*/, null];
+                return [3 /*break*/, 19];
+            case 19: return [2 /*return*/, null];
         }
     });
 }); };