@steedos-widgets/amis-object 1.3.15 → 1.3.16

package/dist/amis-object.cjs.js

@@ -4652,7 +4652,7 @@ async function getSelectUserSchema(field, readonly, ctx) {
         ctx = {};
     }
     const amisSchema = {
-        "type": getAmisStaticFieldType('select', readonly)
+        "type": getAmisStaticFieldType$1('select', readonly)
     };
 
     if (readonly) {
@@ -6250,6 +6250,17 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     crudService && crudService.setData({isFieldsFilterEmpty, showFieldsFilter});
   `;
   const onCancelScript = `
+    doAction(
+      {
+        "componentId": 'service_${ctx.crudId}',
+        "actionType": "setValue",
+        "args": {
+          "value": {
+            "__filterFormValues": null
+          }
+        }
+      }
+    )
     const scope = event.context.scoped;
     var filterForm = scope.parent.parent.getComponents().find(function(n){
       return n.props.type === "form";
@@ -6284,7 +6295,9 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
       removedValues[keywordsSearchBoxName] = filterFormValues[keywordsSearchBoxName];
     }
     filterForm.reset();
-    listView.handleFilterSubmit(removedValues);
+    setTimeout(()=>{
+      listView.handleFilterSubmit(removedValues);
+    }, 100); 
     const filterService = filterForm.context.getComponents().find(function(n){
       return n.props.type === "service";
     });
@@ -8160,7 +8173,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 // }
 `;
 
-function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup = false, keywordsSearchBoxName = "__keywords" } = {}){
+function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup = false, keywordsSearchBoxName = "__keywords", crudId } = {}){
   const searchableFieldsLabel = [];
   _.each(mainObject.fields, function (field) {
     if (isFieldQuickSearchable(field, mainObject.NAME_FIELD_KEY)) {
@@ -8197,23 +8210,22 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
         "clearAndSubmit": true,
         "searchImediately": false,
         "onEvent": {
-          "blur": {
+          "change": {
             "actions": [
               {
                 "actionType": "custom",
                 "script": `
-                    try {
-                        const scope = event.context.scoped;
-                        const filterCrud = scope.parent.getComponents().find(function(n) {
-                            return n.props.type === "crud";
-                        });
-                        if (filterCrud && typeof filterCrud.reload === 'function') {
-                            const keyWords = { '${keywordsSearchBoxName}': event.data.value };
-                            filterCrud.reload(null, keyWords);
+                  doAction(
+                      {
+                        "componentId": 'service_${crudId}',
+                        "actionType": "setValue",
+                        "args": {
+                          "value": {
+                            "__serachBoxValues": event.data
+                          }
                         }
-                    } catch (error) {
-                        console.error('An error occurred:', error);
-                    }
+                      }
+                  )
                 `
               }
             ]
@@ -8225,7 +8237,7 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
 }
 
 function getObjectHeaderToolbar(mainObject, fields, formFactor, { 
-  showDisplayAs = false, hiddenCount = false, headerToolbarItems, 
+  showDisplayAs = false, hiddenCount = false, headerToolbarItems, crudId,
   filterVisible = true, isLookup = false, keywordsSearchBoxName } = {}){
   // console.log(`getObjectHeaderToolbar====>`, filterVisible)
   // console.log(`getObjectHeaderToolbar`, mainObject)
@@ -8329,7 +8341,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
     };
   }
   let toolbarDisplayAsButton = getDisplayAsButton(mainObject?.name);
-  let toolbarDQuickSearchBox = getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup, keywordsSearchBoxName });
+  let toolbarDQuickSearchBox = getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup, keywordsSearchBoxName, crudId });
 
   // toolbars返回的数组元素不可以是空对象{}，比如hiddenCount ? {} : {"type": "tpl",...}，因为空对象最终还是会生成一个空的.antd-Crud-toolbar-item dom
   // 当出现空的.antd-Crud-toolbar-item dom时会影响toolbar元素的maring-right css样式计算，如果有动态需要应该加到动态数组变量toolbars中
@@ -8495,6 +8507,26 @@ async function getObjectFilter(objectSchema, fields, options) {
             "script": onSubmitSuccScript
           }
         ]
+      },
+      "change": {
+        "actions": [
+          {
+            "actionType": "custom",
+            "script": `
+              doAction(
+                  {
+                    "componentId": 'service_${options.crudId}',
+                    "actionType": "setValue",
+                    "args": {
+                      "value": {
+                        "__filterFormValues": event.data
+                      }
+                    }
+                  }
+              )
+            `
+          }
+        ]
       }
     }
   }
@@ -8658,7 +8690,7 @@ async function lookupToAmisTreeSelect(field, readonly, ctx) {
         ctx = {};
     }
     const amisSchema = {
-        "type": getAmisStaticFieldType('tree-select', readonly)
+        "type": getAmisStaticFieldType$1('tree-select', readonly)
     };
 
     if (readonly) {
@@ -8698,19 +8730,12 @@ async function lookupToAmisTreeSelect(field, readonly, ctx) {
 
 const keywordsSearchBoxName = `__keywords_lookup`;
 
-const getReferenceTo = async (field)=>{
+const getReferenceToFieldSchema = (field, refObjectConfig)=>{
     let referenceTo = field.reference_to;
     if(!referenceTo){
-        return ;
-    }
-
-    if(referenceTo === 'users'){
-        referenceTo = 'space_users';
-        field.reference_to_field = 'user';
+        return;
     }
 
-    const refObjectConfig = await getUISchema(referenceTo);
-
     // 如果lookup 引用的对象未定义
     if (!refObjectConfig)
         return null;
@@ -8733,6 +8758,28 @@ const getReferenceTo = async (field)=>{
     }
 };
 
+const getReferenceTo = async (field)=>{
+    let referenceTo = field.reference_to;
+    if(referenceTo === 'users'){
+        field.reference_to = 'space_users';
+        field.reference_to_field = 'user';
+    }
+
+    const refObjectConfig = await getUISchema(field.reference_to);
+    return getReferenceToFieldSchema(field, refObjectConfig);
+};
+
+function getReferenceToSync(field) {
+    let referenceTo = field.reference_to;
+    if(referenceTo === 'users'){
+        field.reference_to = 'space_users';
+        field.reference_to_field = 'user';
+    }
+
+    const refObjectConfig = getUISchemaSync(field.reference_to);
+    return getReferenceToFieldSchema(field, refObjectConfig);
+}
+
 function getLookupSapceUserTreeSchema(isMobile){
     const treeSchema = {
         "type": "input-tree",
@@ -9223,7 +9270,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
     }
 
     const data = {
-        type: getAmisStaticFieldType('picker', readonly),
+        type: getAmisStaticFieldType$1('picker', readonly),
         modalTitle:  instance.t('frontend_form_please_select') + " " + refObjectConfig.label,
         labelField: referenceTo.labelField.name,
         valueField: referenceTo.valueField.name,
@@ -9326,7 +9373,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
     // [["_id", "=", "$${field.name}._id"],"or",["name", "contains", "$term"]]
     apiInfo.requestAdaptor = `
         var filters = [];
-        var top = 10;
+        var top = 200;
         if(api.data.$term){
             filters = [["${referenceTo?.NAME_FIELD_KEY || 'name'}", "contains", api.data.$term]];
         }
@@ -9406,7 +9453,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
     }
 
     const data = {
-        type: getAmisStaticFieldType('select', readonly),
+        type: getAmisStaticFieldType$1('select', readonly),
         joinValues: false,
         extractValue: true,
         clearable: true,
@@ -9460,7 +9507,7 @@ async function lookupToAmis(field, readonly, ctx){
     // console.log(`lookupToAmis====`, field, readonly, ctx)
     if(readonly){
         return {
-            type: getAmisStaticFieldType('picker', readonly),
+            type: getAmisStaticFieldType$1('picker', readonly),
             tpl: getRelatedFieldTpl(field, ctx)
         }
     }
@@ -9605,7 +9652,7 @@ async function getIdsPickerSchema(field, readonly, ctx){
     }
 
     const data = {
-        type: getAmisStaticFieldType('picker', readonly),
+        type: getAmisStaticFieldType$1('picker', readonly),
         labelField: referenceTo.labelField.name,
         valueField: referenceTo.valueField.name,
         modalMode: 'dialog', 
@@ -9636,6 +9683,12 @@ async function getIdsPickerSchema(field, readonly, ctx){
     return data;
 }
 
+
+if(typeof window != 'undefined'){
+    window.getReferenceTo = getReferenceTo;
+    window.getReferenceToSync = getReferenceToSync;
+}
+
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-01-13 17:27:54
@@ -9770,7 +9823,7 @@ const getHtmlFieldSchema = (field, readonly, ctx)=>{
  * @Description: 
  */
 
-const AmisFormInputs = [
+const AmisFormInputs$1 = [
     'text',
     'date',
     'file',
@@ -9786,9 +9839,9 @@ const AmisFormInputs = [
     'email'
 ];
 
-function getAmisStaticFieldType(type, readonly, options){
+function getAmisStaticFieldType$1(type, readonly, options){
     if(!readonly){
-        if(_$1__namespace.includes(AmisFormInputs, type)){
+        if(_$1__namespace.includes(AmisFormInputs$1, type)){
             return `input-${type}`;
         }else if(type === 'location'){
             return "location-picker"
@@ -9830,7 +9883,7 @@ const getFileTableName = (steedosField)=>{
 };
 
 const getAmisFieldType$1 = (steedosField, readonly)=>{
-    return getAmisStaticFieldType(steedosField.type === 'avatar' ? 'image' : steedosField.type, readonly, {multiple: steedosField.multiple});
+    return getAmisStaticFieldType$1(steedosField.type === 'avatar' ? 'image' : steedosField.type, readonly, {multiple: steedosField.multiple});
 };
 
 const getAmisFileReadonlySchema = (steedosField)=>{
@@ -9994,6 +10047,8 @@ function getAmisFieldType(sField){
             break;
         case 'grid':
             return 'table';
+        case 'table':
+            return 'steedos-input-table';
         default:
             console.log('convertData default', sField.type);
             // convertData.type = field.type
@@ -10027,6 +10082,19 @@ function getGridFieldSubFields(mainField, fields){
     return newMainField;
 }
 
+function getTabledFieldSubFields(mainField, fields){
+    const newMainField = Object.assign({subFields: []}, mainField);
+    const subFields = _$1__namespace.filter(fields, function(field){
+        let result = field.name.startsWith(`${mainField.name}.`);
+        if(result){
+            field._prefix = `${mainField.name}.`;
+        }
+        return result;
+    });
+    newMainField.subFields = subFields;
+    return newMainField;
+}
+
 /**
  * TODO 处理权限
  * @param {*} object steedos object
@@ -10082,10 +10150,10 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
     // }
     switch (field.type) {
         case 'text':
-            convertData.type = getAmisStaticFieldType('text', readonly, field);
+            convertData.type = getAmisStaticFieldType$1('text', readonly, field);
             break;
         case 'textarea':
-            convertData.type = getAmisStaticFieldType('textarea', readonly);
+            convertData.type = getAmisStaticFieldType$1('textarea', readonly);
             // convertData.tpl = `<b><%=data.${field.name}%></b>`;
             convertData.tpl = `<%=(data.${field.name} || "").split("\\n").join('<br>')%>`;
             break;
@@ -10114,7 +10182,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                 };
             }else {
                 convertData = {
-                    type: getAmisStaticFieldType('select', readonly),
+                    type: getAmisStaticFieldType$1('select', readonly),
                     joinValues: false,
                     options: getSelectFieldOptions(field),
                     extractValue: true,
@@ -10142,7 +10210,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             break;
         case 'boolean':
             convertData = {
-                type: getAmisStaticFieldType('checkbox', readonly),
+                type: getAmisStaticFieldType$1('checkbox', readonly),
                 // option: field.inlineHelpText,
                 tpl: readonly ? getSwitchTpl(field) : null
             };
@@ -10185,7 +10253,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             //     // utc: true
             // }
             convertData = {
-                type: getAmisStaticFieldType('date', readonly),
+                type: getAmisStaticFieldType$1('date', readonly),
                 inputFormat: "YYYY-MM-DD",
                 format:'YYYY-MM-DDT00:00:00.000[Z]',
                 tpl: readonly ? getDateTpl(field) : null,
@@ -10248,7 +10316,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             // }
 
             convertData = {
-                type: getAmisStaticFieldType('datetime', readonly),
+                type: getAmisStaticFieldType$1('datetime', readonly),
                 inputFormat: 'YYYY-MM-DD HH:mm',
                 format: 'YYYY-MM-DDTHH:mm:ss.SSSZ',
                 tpl: readonly ? getDateTimeTpl(field) : null,
@@ -10295,7 +10363,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             //     // utc: true
             // }
             convertData = {
-                type: getAmisStaticFieldType('time', readonly),
+                type: getAmisStaticFieldType$1('time', readonly),
                 inputFormat: 'HH:mm',
                 timeFormat:'HH:mm',
                 format:'1970-01-01THH:mm:00.000[Z]',
@@ -10312,7 +10380,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                 };
             }else {
                 convertData = {
-                    type: getAmisStaticFieldType('number', readonly),
+                    type: getAmisStaticFieldType$1('number', readonly),
                     min: field.min,
                     max: field.max,
                     precision: field.scale
@@ -10341,7 +10409,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                 };
             }else {
                 convertData = {
-                    type: getAmisStaticFieldType('number', readonly),
+                    type: getAmisStaticFieldType$1('number', readonly),
                     min: field.min,
                     max: field.max,
                     precision: field.scale,
@@ -10365,7 +10433,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             break;
         case 'password':
             convertData = {
-                type: getAmisStaticFieldType('password', readonly),
+                type: getAmisStaticFieldType$1('password', readonly),
                 tpl: readonly ? getPasswordTpl(field) : null
             };
             break;
@@ -10384,7 +10452,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             break;
         case 'url':
             convertData = {
-                type: getAmisStaticFieldType('url', readonly, field),
+                type: getAmisStaticFieldType$1('url', readonly, field),
                 static: readonly ? true : false
             };
             if(readonly && field.show_as_qr){
@@ -10401,7 +10469,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             break;
         case 'email':
             convertData = {
-                type: getAmisStaticFieldType('email', readonly)
+                type: getAmisStaticFieldType$1('email', readonly)
             };
             break;
         case 'location':
@@ -10422,7 +10490,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             
             const coordinatesType = field.coordinatesType || "bd09";
             convertData = {
-                type: getAmisStaticFieldType('location', readonly),
+                type: getAmisStaticFieldType$1('location', readonly),
                 tpl: readonly ? getLocationTpl(field) : null,
                 ak,
                 vendor,
@@ -10530,6 +10598,29 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                 }
             }
             break;
+        case 'table':
+            if(field.subFields){
+                convertData = {
+                    type: 'steedos-input-table',
+                    showIndex: true,
+                    editable: !readonly,
+                    addable: !readonly,
+                    removable: !readonly,
+                    draggable: !readonly,
+                    fields: [],
+                    amis:{
+                        columnsTogglable: false
+                    }
+                };
+                for (const subField of field.subFields) {
+                    const subFieldName = subField.name.replace(`${field._prefix || ''}${field.name}.$.`, '').replace(`${field.name}.`, '');
+                    const gridSub = await convertSFieldToAmisField(Object.assign({}, subField, {name: subFieldName, isTableField: true}), readonly, ctx);
+                    if(gridSub){
+                        convertData.fields.push(Object.assign({}, subField, {name: subFieldName}));
+                    }
+                }
+            }
+            break;
         case 'object':
             if(field.subFields){
                 convertData = {
@@ -10601,7 +10692,9 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             return  convertData
         }
         // if(ctx.mode === 'edit'){
-        return Object.assign({}, baseData, convertData, { labelClassName: 'text-left', clearValueOnHidden: true, fieldName: field.name}, field.amis, {name: baseData.name});
+        let convertDataResult = Object.assign({}, baseData, convertData, { labelClassName: 'text-left', clearValueOnHidden: true, fieldName: field.name}, field.amis, {name: baseData.name});
+        // console.log("convertDataResult:", convertDataResult);
+        return convertDataResult;
         // }else{
         //     return Object.assign({}, baseData, convertData, { labelClassName: 'text-left', clearValueOnHidden: true, fieldName: field.name});
         // }
@@ -10693,38 +10786,9 @@ async function getFieldSearchable(perField, permissionFields, ctx){
 
         const amisField = await convertSFieldToAmisField(_field, false, Object.assign({}, ctx, {fieldNamePrefix: fieldNamePrefix, required: false, showSystemFields: true, inFilterForm: true}));
         if(amisField){
-            const changeActionsFields = ['select', 'boolean', 'toggle', 'date', 'datetime', 'time', 'number', 'currency', 'lookup', 'master_detail'];
-            const isChangeActions = changeActionsFields.indexOf(field.type) > -1;
-            let additionalProps = {
+            return Object.assign({}, amisField,{
                 submitOnChange: false
-            };
-            if (isChangeActions) {
-                additionalProps.submitOnChange = true;
-            } else {
-                additionalProps.onEvent = {
-                    blur: {
-                        actions: [
-                            {
-                                actionType: "custom",
-                                script: `
-                                    try {
-                                        const scope = event.context.scoped;
-                                        const filterForm = scope.parent.parent.parent.getComponents().find(function(n) {
-                                            return n.props.type === "form";
-                                        });
-                                        if (filterForm && typeof filterForm.handleFormSubmit === 'function') {
-                                            filterForm.handleFormSubmit(event);
-                                        }
-                                    } catch (error) {
-                                        console.error('An error occurred:', error);
-                                    }
-                                `
-                            }
-                        ]
-                    }
-                };
-            }
-            return Object.assign({}, amisField, additionalProps);
+            });
         }
     }
 }
@@ -10777,13 +10841,14 @@ var index = /*#__PURE__*/Object.freeze({
   getAmisFieldType: getAmisFieldType,
   getObjectFieldSubFields: getObjectFieldSubFields,
   getGridFieldSubFields: getGridFieldSubFields,
+  getTabledFieldSubFields: getTabledFieldSubFields,
   getPermissionFields: getPermissionFields,
   getSelectFieldOptions: getSelectFieldOptions,
   convertSFieldToAmisField: convertSFieldToAmisField,
   getFieldSearchable: getFieldSearchable,
   isFieldTypeSearchable: isFieldTypeSearchable,
   isFieldQuickSearchable: isFieldQuickSearchable,
-  getAmisStaticFieldType: getAmisStaticFieldType
+  getAmisStaticFieldType: getAmisStaticFieldType$1
 });
 
 const API_CACHE = 100;
@@ -11892,7 +11957,7 @@ function deleteVariable(data, key) {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-26 16:02:08
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-10-12 18:25:05
+ * @LastEditTime: 2023-11-28 17:00:28
  * @Description: 
  */
 
@@ -11943,6 +12008,8 @@ const getSection = async (formFields, permissionFields, fieldSchemaArray, sectio
     if (perField.type === 'grid') {
       field = await getGridFieldSubFields(perField, formFields);
       // console.log(`perField.type grid ===> field`, field)
+    } else if (perField.type === 'table') {
+      field = await getTabledFieldSubFields(perField, formFields);
     } else if (perField.type === 'object') {
       field = await getObjectFieldSubFields(perField, formFields);
       // console.log(`perField.type object ===> field`, field)
@@ -11950,6 +12017,13 @@ const getSection = async (formFields, permissionFields, fieldSchemaArray, sectio
     if (field.name.indexOf(".") < 0) {
       ctx.__formFields = formFields;
       const amisField = await convertSFieldToAmisField(field, field.readonly, ctx);
+      // 如果steedos-field稳定了，可以放开下面的代码直接用组件统一渲染字段
+      // const amisField = {
+      //   "type": "steedos-field",
+      //   "config": field,
+      //   "readonly": field.readonly,
+      //   "ctx": ctx
+      // };
       // console.log(`${field.name} amisField`, field, amisField)
       if (amisField) {
         fieldSetBody.push(amisField);
@@ -12158,6 +12232,7 @@ async function getObjectCRUD(objectSchema, fields, options){
     const bulkActions = getBulkActions(objectSchema);
     const defaults = options.defaults;
     const listSchema = (defaults && defaults.listSchema) || {};
+    const id = `listview_${objectSchema.name}`;
 
     const bodyProps = {
       // toolbar: getToolbar(),
@@ -12167,7 +12242,7 @@ async function getObjectCRUD(objectSchema, fields, options){
         ...options,
         disableStatistics: options.queryCount === false
       }), 
-      filter: options.filterVisible !== false && await getObjectFilter(objectSchema, fields, options),
+      filter: options.filterVisible !== false && await getObjectFilter(objectSchema, fields,  Object.assign({}, options, {crudId: id})),
     };
     if(options.formFactor !== 'SMALL' || ["split"].indexOf(options.displayAs) == -1){
       if(listSchema.mode !== "cards"){
@@ -12196,7 +12271,8 @@ async function getObjectCRUD(objectSchema, fields, options){
       showDisplayAs, 
       hiddenCount: options.queryCount === false, 
       headerToolbarItems: options.headerToolbarItems,
-      filterVisible: options.filterVisible
+      filterVisible: options.filterVisible,
+      crudId: id
     });
 
     options.amisData = createObject(options.amisData, {
@@ -12209,7 +12285,6 @@ async function getObjectCRUD(objectSchema, fields, options){
 
 
     let body = null;
-    const id = `listview_${objectSchema.name}`;
     if(options.formFactor === 'SMALL' && false){
       delete bodyProps.bulkActions;
       delete bodyProps.headerToolbar;
@@ -13203,7 +13278,7 @@ async function getUISchema(objectName, force) {
     return getUISchemaCache(objectName);
 }
 
-function getUISchemaSync(objectName, force) {
+function getUISchemaSync$1(objectName, force) {
     if (!objectName) {
         return;
     }
@@ -13713,7 +13788,7 @@ async function getObjectRelated(
 
 if(typeof window != 'undefined'){
     window.getUISchema = getUISchema;
-    window.getUISchemaSync = getUISchemaSync;
+    window.getUISchemaSync = getUISchemaSync$1;
     window.getListSchema = getListSchema;
 }
 
@@ -15032,6 +15107,8 @@ async function getTableApi(mainObject, fields, options){
     api.data.$self = "$$";
     api.data.self = "$$";
     api.data.filter = "$filter";
+    api.data.__filterFormValues = "${__filterFormValues}";
+    api.data.__serachBoxValues = "${__serachBoxValues}";
     api.data.loaded = "${loaded}";
     api.data.listViewId = "${listViewId}";
     api.data.listName = "${listName}";
@@ -15104,9 +15181,12 @@ async function getTableApi(mainObject, fields, options){
         }else if(selfData.op === 'loadOptions' && selfData.value){
             userFilters = [["${valueField.name}", "=", selfData.value]];
         }
-        
-        var searchableFilter = SteedosUI.getSearchFilter(selfData) || [];
 
+        const __filterFormValues = api.data.__filterFormValues;
+        const __serachBoxValues = api.data.__serachBoxValues;
+        // 筛选按钮
+        const filterSelfData = __filterFormValues ? __filterFormValues : selfData;
+        var searchableFilter = SteedosUI.getSearchFilter(filterSelfData) || [];
         if(searchableFilter.length > 0){
             if(userFilters.length > 0 ){
                 userFilters = [userFilters, 'and', searchableFilter];
@@ -15115,6 +15195,7 @@ async function getTableApi(mainObject, fields, options){
             }
         }
 
+        // "搜索此列表"搜索框
         if(allowSearchFields){
             allowSearchFields.forEach(function(key){
                 const keyValue = selfData[key];
@@ -15126,7 +15207,8 @@ async function getTableApi(mainObject, fields, options){
             })
         }
 
-        var keywordsFilters = SteedosUI.getKeywordsSearchFilter(selfData.__keywords, allowSearchFields);
+        const keyWords = __serachBoxValues ? __serachBoxValues.__keywords : selfData.__keywords;
+        var keywordsFilters = SteedosUI.getKeywordsSearchFilter(keyWords, allowSearchFields);
         if(keywordsFilters && keywordsFilters.length > 0){
             userFilters.push(keywordsFilters);
         }
@@ -15336,7 +15418,7 @@ function getRecordPermissionsApi(object, recordId, options){
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-11-17 20:17:56
+ * @LastEditTime: 2023-11-28 11:34:24
  */
 
 /**
@@ -15345,10 +15427,14 @@ function getRecordPermissionsApi(object, recordId, options){
  */
 function getFormFields(props, mode = "edit") {
     return (props.fields || []).map(function (item) {
-        return {
+        let formItem = {
             "type": "steedos-field",
             "config": item
+        };
+        if(mode === "readonly"){
+            formItem.static = true;
         }
+        return formItem;
     }) || [];
 }
 
@@ -15357,32 +15443,59 @@ function getFormFields(props, mode = "edit") {
  * @param {*} mode edit/new/readonly
  */
 async function getInputTableColumns(props) {
-    // return props.fields.map(function(item){
-    //     return {
-    //         "type": "steedos-field",
-    //         "config": item,
-    //         "static": true,
-    //         "readonly": true
-    //     }
-    // }) || [];
-
-    let columns = await getTableColumns$1(props.fields || [], {
-        isInputTable: true,
-        permissions: {
-            allowEdit: false //快速编辑开关与权限有关
-        }
-    });
-    // columns = columns.map(function(item){
-    //     if(["text"].indexOf(item.type) > -1){
-    //         return Object.assign({}, item, {
-    //             "type": "static"
-    //         });
-    //     }
-    //     else{
-    //         return item;
-    //     }
-    // }) || [];
-    return columns;
+    let columns = props.columns || [];
+    // 实测过，直接不生成对应的隐藏column并不会对input-table值造成丢失问题，隐藏的列字段值能正常维护
+    let fields = props.fields;
+    if(columns && columns.length){
+        return columns.map(function(column){
+            let field, extendColumnProps = {};
+            if(typeof column === "string"){
+                // 如果字符串，则取出要显示的列配置
+                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){
+                    return fieldItem.name === column.name;
+                });
+                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
+                }
+            }
+            else {
+                return column;
+            }
+        });
+    }
+    else {
+        return fields.map(function(field){
+            return {
+                "type": "steedos-field",
+                "config": field,
+                "static": true,
+                "readonly": true,
+                label: field.label,
+                name: field.name,
+                hideLabel: true
+            }
+        }) || [];
+    }
 }
 
 /**
@@ -15393,6 +15506,7 @@ function getForm(props, mode = "edit") {
     let schema = {
         "type": "form",
         "title": "表单",
+        "debug": false,
         "body": getFormFields(props, mode)
     };
     if (mode === "edit") {
@@ -15466,10 +15580,11 @@ function getButtonNew(props) {
                         "actionType": "dialog",
                         "dialog": {
                             "type": "dialog",
-                            "title": "弹框标题",
+                            "title": "新增行",
                             "body": [
                                 getForm(props, "new")
                             ],
+                            "size": "md",
                             "showCloseButton": true,
                             "showErrorMsg": true,
                             "showLoading": true,
@@ -15487,7 +15602,9 @@ function getButtonNew(props) {
 function getButtonEdit(props) {
     return {
         "type": "button",
-        "label": "编辑",
+        "label": "",
+        "icon": "fa fa-pencil",
+        "level": "link",
         "onEvent": {
             "click": {
                 "actions": [
@@ -15495,10 +15612,42 @@ function getButtonEdit(props) {
                         "actionType": "dialog",
                         "dialog": {
                             "type": "dialog",
-                            "title": "弹框标题",
+                            "title": "编辑行",
                             "body": [
                                 getForm(props, "edit")
                             ],
+                            "size": "md",
+                            "showCloseButton": true,
+                            "showErrorMsg": true,
+                            "showLoading": true,
+                            "className": "app-popover",
+                            "closeOnEsc": false
+                        }
+                    }
+                ]
+            }
+        }
+    };
+}
+
+function getButtonView(props) {
+    return {
+        "type": "button",
+        "label": "",
+        "icon": "fa fa-external-link",
+        "level": "link",
+        "onEvent": {
+            "click": {
+                "actions": [
+                    {
+                        "actionType": "dialog",
+                        "dialog": {
+                            "type": "dialog",
+                            "title": "查看行",
+                            "body": [
+                                getForm(props, "readonly")
+                            ],
+                            "size": "md",
                             "showCloseButton": true,
                             "showErrorMsg": true,
                             "showLoading": true,
@@ -15515,7 +15664,9 @@ function getButtonEdit(props) {
 function getButtonDelete(props) {
     return {
         "type": "button",
-        "label": "删除",
+        "label": "",
+        "icon": "fa fa-minus",
+        "level": "link",
         "onEvent": {
             "click": {
                 "actions": [
@@ -15536,14 +15687,21 @@ const getAmisInputTableSchema = async (props, readonly) => {
     if (!props.id) {
         props.id = "steedos_input_table_" + props.name + "_" + Math.random().toString(36).substr(2, 9);
     }
-    let buttonNewSchema = getButtonNew(props);
-    let buttonEditSchema = getButtonEdit(props);
-    let buttonDeleteSchema = getButtonDelete(props);
     let buttonsForColumnOperations = [];
     if (props.editable) {
+        let buttonEditSchema = getButtonEdit(props);
         buttonsForColumnOperations.push(buttonEditSchema);
     }
+    else {
+        // 只读时显示查看按钮
+        if(props.columns && props.columns.length > 0 && props.columns.length < props.fields.length){
+            // 只在有列被隐藏时才需要显示查看按钮
+            let buttonViewSchema = getButtonView(props);
+            buttonsForColumnOperations.push(buttonViewSchema);
+        }
+    }
     if (props.removable) {
+        let buttonDeleteSchema = getButtonDelete(props);
         buttonsForColumnOperations.push(buttonDeleteSchema);
     }
     let inputTableSchema = {
@@ -15568,7 +15726,8 @@ const getAmisInputTableSchema = async (props, readonly) => {
         inputTableSchema.columns.push({
             "name": "__op__",
             "type": "operation",
-            "buttons": buttonsForColumnOperations
+            "buttons": buttonsForColumnOperations,
+            "width": buttonsForColumnOperations.length > 1 ? "46px" : "20px"
         });
     }
     let schema = {
@@ -15579,8 +15738,12 @@ const getAmisInputTableSchema = async (props, readonly) => {
         ]
     };
     if (props.addable) {
+        let buttonNewSchema = getButtonNew(props);
         schema.body.push(buttonNewSchema);
     }
+    if (props.amis) {
+        Object.assign(schema.body[0], props.amis);
+    }
     return schema;
 };
 
@@ -18322,6 +18485,8 @@ var index_esm$1 = /*#__PURE__*/Object.freeze({
     getRecordPermissions: getRecordPermissions,
     getRecordServiceSchema: getRecordServiceSchema,
     getReferenceTo: getReferenceTo,
+    getReferenceToFieldSchema: getReferenceToFieldSchema,
+    getReferenceToSync: getReferenceToSync,
     getRelatedFieldValue: getRelatedFieldValue,
     getRelatedListSchema: getRelatedListSchema,
     getRelatedsCount: getRelatedsCount,
@@ -18333,7 +18498,7 @@ var index_esm$1 = /*#__PURE__*/Object.freeze({
     getTableSchema: getTableSchema$1,
     getTenantId: getTenantId,
     getUISchema: getUISchema,
-    getUISchemaSync: getUISchemaSync,
+    getUISchemaSync: getUISchemaSync$1,
     getUserId: getUserId,
     getViewSchema: getViewSchema,
     isExpression: isExpression$1,
@@ -20503,15 +20668,62 @@ var AmisGlobalHeader = function (props) { return __awaiter(void 0, void 0, void
     });
 }); };
 
+var defaultImageValue = "data:image/svg+xml,%3C%3Fxml version='1.0' standalone='no'%3F%3E%3C!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'%3E%3Csvg t='1631083237695' class='icon' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='2420' xmlns:xlink='http://www.w3.org/1999/xlink' width='1024' height='1024'%3E%3Cdefs%3E%3Cstyle type='text/css'%3E%3C/style%3E%3C/defs%3E%3Cpath d='M959.872 128c0.032 0.032 0.096 0.064 0.128 0.128v767.776c-0.032 0.032-0.064 0.096-0.128 0.128H64.096c-0.032-0.032-0.096-0.064-0.128-0.128V128.128c0.032-0.032 0.064-0.096 0.128-0.128h895.776zM960 64H64C28.8 64 0 92.8 0 128v768c0 35.2 28.8 64 64 64h896c35.2 0 64-28.8 64-64V128c0-35.2-28.8-64-64-64z' p-id='2421' fill='%23bfbfbf'%3E%3C/path%3E%3Cpath d='M832 288c0 53.024-42.976 96-96 96s-96-42.976-96-96 42.976-96 96-96 96 42.976 96 96zM896 832H128V704l224-384 256 320h64l224-192z' p-id='2422' fill='%23bfbfbf'%3E%3C/path%3E%3C/svg%3E";
+var AmisFormInputs = [
+    'text',
+    'date',
+    // 'file',
+    // "avatar",
+    // 'image',
+    'datetime',
+    'time',
+    'number',
+    'password',
+    'url',
+    'email'
+];
+function getAmisStaticFieldType(type, data_type, options) {
+    if (_$1.includes(AmisFormInputs, type)) {
+        return "input-".concat(type);
+    }
+    else if (type === 'boolean') {
+        return "checkbox";
+    }
+    else if (type === 'toggle') {
+        return "switch";
+    }
+    else if (type === 'currency') {
+        return "number";
+    }
+    else if (type === 'autonumber') {
+        return "text";
+    }
+    else if (type === 'percent') {
+        return "number";
+    }
+    else if (type === 'formula' || type === 'summary') {
+        return getAmisStaticFieldType(data_type, null, options);
+    }
+    else if (type === 'location') {
+        return "location-picker";
+    }
+    else if (type === 'image') {
+        if (options && options.multiple) {
+            return "static-images";
+        }
+        return "static-image";
+    }
+    return type;
+}
 var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var steedosField, field, _a, readonly, _b, ctx, config, fStatic, objectName, filters, valueFieldKey, labelFieldKey, referenceTo, referenceToField, value, _steedosField, referenceTo, referenceToField, schema, schema, error_1;
-    var _c, _d, _e, _f, _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    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) {
             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;
-                // console.log(`AmisSteedosField`, props)
+                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);
                 // if($schema.config && isString($schema.config)){
                 //     $schema.config = JSON.parse($schema.config)
                 //     props.config = $schema.config
@@ -20531,66 +20743,182 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         steedosField = JSON.parse(field);
                     }
                 }
-                _h.label = 1;
+                _d.label = 1;
             case 1:
-                _h.trys.push([1, 9, , 10]);
-                if (!(fStatic && (steedosField.type === 'lookup' || steedosField.type === 'master_detail'))) return [3 /*break*/, 6];
-                objectName = void 0, filters = void 0, valueFieldKey = void 0, labelFieldKey = void 0;
-                if (!props.data[steedosField.name]) {
-                    return [2 /*return*/, {}];
-                }
-                if (!_$1.isString(steedosField.reference_to)) return [3 /*break*/, 3];
-                return [4 /*yield*/, getReferenceTo(steedosField)];
-            case 2:
-                referenceTo = _h.sent();
-                referenceToField = steedosField.reference_to_field || '_id';
-                objectName = referenceTo.objectName;
-                valueFieldKey = referenceTo && ((_c = referenceTo.valueField) === null || _c === void 0 ? void 0 : _c.name) || '_id';
-                labelFieldKey = referenceTo && ((_d = referenceTo.labelField) === null || _d === void 0 ? void 0 : _d.name) || 'name';
-                value = props.data[steedosField.name];
-                if (_$1.isString(value)) {
-                    value = [value];
-                }
-                filters = [referenceToField, "in", value];
-                return [3 /*break*/, 5];
-            case 3:
-                _steedosField = __assign$2(__assign$2({}, steedosField), { reference_to: props.data[steedosField.name].o });
-                return [4 /*yield*/, getReferenceTo(_steedosField)];
-            case 4:
-                referenceTo = _h.sent();
-                referenceToField = _steedosField.reference_to_field || '_id';
-                objectName = referenceTo.objectName;
-                valueFieldKey = referenceTo && ((_e = referenceTo.valueField) === null || _e === void 0 ? void 0 : _e.name) || '_id';
-                labelFieldKey = referenceTo && ((_f = referenceTo.labelField) === null || _f === void 0 ? void 0 : _f.name) || 'name';
-                filters = [referenceToField, "in", props.data[_steedosField.name].ids];
-                _h.label = 5;
-            case 5:
+                _d.trys.push([1, 15, , 16]);
+                if (!(fStatic && (steedosField.type === 'lookup' || steedosField.type === 'master_detail'))) return [3 /*break*/, 2];
                 schema = Object.assign({}, {
                     type: 'select',
                     multiple: steedosField.multiple,
                     name: steedosField.name,
                     label: steedosField.label,
                     static: true,
-                    className: (_g = steedosField.amis) === null || _g === void 0 ? void 0 : _g.className,
+                    className: (_c = steedosField.amis) === null || _c === void 0 ? void 0 : _c.className,
                     source: {
                         "method": "post",
                         "url": "${context.rootUrl}/graphql",
-                        "requestAdaptor": "\n                        api.data = {\n                            query: '{options:".concat(objectName, "(filters: ").concat(JSON.stringify(filters), "){label: ").concat(labelFieldKey, ",value: ").concat(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                            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                        }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
+                    },
                 }, _$1.pick(steedosField.amis || {}, ['className', 'inline', 'label', 'labelAlign', 'name', 'labelRemark', 'description', 'placeholder', 'staticClassName', 'staticLabelClassName', 'staticInputClassName', 'staticSchema']));
-                // console.log(`AmisSteedosField return schema`, schema)
+                schema.placeholder = "";
+                if (hideLabel) {
+                    delete schema.label;
+                }
                 return [2 /*return*/, schema];
-            case 6: return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
+            case 2:
+                if (!fStatic) return [3 /*break*/, 12];
+                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()];
+            case 4:
+                schema = Object.assign({}, steedosField, {
+                    type: getAmisStaticFieldType(steedosField.type, steedosField.data_type, steedosField),
+                    static: true,
+                    label: steedosField.label
+                });
+                if (!(steedosField.type === "time")) return [3 /*break*/, 5];
+                Object.assign(schema, {
+                    inputFormat: 'HH:mm',
+                    timeFormat: 'HH:mm',
+                    format: '1970-01-01THH:mm:00.000[Z]',
+                });
+                return [3 /*break*/, 11];
+            case 5:
+                if (!(steedosField.type === "percent")) return [3 /*break*/, 6];
+                Object.assign(schema, {
+                    "percent": steedosField.scale ? steedosField.scale : true
+                });
+                return [3 /*break*/, 11];
+            case 6:
+                if (!(steedosField.type === "password")) return [3 /*break*/, 7];
+                Object.assign(schema, {
+                    "revealPassword": false //没生效，需要用样式隐藏
+                });
+                return [3 /*break*/, 11];
             case 7:
-                schema = _h.sent();
+                if (!(steedosField.type === "select")) return [3 /*break*/, 8];
+                Object.assign(schema, {
+                    "placeholder": ""
+                });
+                return [3 /*break*/, 11];
+            case 8:
+                if (!(steedosField.type === "image")) return [3 /*break*/, 9];
+                Object.assign(schema, {
+                    enlargeAble: true,
+                    showToolbar: true,
+                    pipeIn: function (value, data) {
+                        if (steedosField.multiple) {
+                            if (!value) {
+                                value = [defaultImageValue];
+                            }
+                            value = value.map(function (item) {
+                                if (item && item.split("/").length === 1) {
+                                    // 不是url格式时转为url格式显示
+                                    return window.getImageFieldUrl(window.Meteor.absoluteUrl("/api/files/images/".concat(item)));
+                                }
+                                else {
+                                    return item;
+                                }
+                            });
+                        }
+                        else {
+                            if (_$1.isArray(value)) {
+                                value = value[0];
+                            }
+                            if (value && value.split("/").length === 1) {
+                                // 不是url格式时转为url格式显示
+                                return window.getImageFieldUrl(window.Meteor.absoluteUrl("/api/files/images/".concat(value)));
+                            }
+                        }
+                        return value;
+                    }
+                });
+                return [3 /*break*/, 11];
+            case 9:
+                if (!(steedosField.type === "file")) return [3 /*break*/, 11];
+                return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
+            case 10: 
+            // 附件static模式先保持原来的逻辑，依赖_display，审批王中相关功能在creator中
+            // convertSFieldToAmisField中会合并steedosField.amis，所以也不需要再次合并steedosField.amis，直接return就好
+            return [2 /*return*/, _d.sent()];
+            case 11:
+                Object.assign(schema, steedosField.amis || {});
+                if (hideLabel) {
+                    delete schema.label;
+                }
+                return [2 /*return*/, schema];
+            case 12:
+                fieldAmis = steedosField.amis || {};
+                if (!props.data.hasOwnProperty("_display")) {
+                    // 有_display时保持原来的逻辑不变，不走以下新的逻辑，审批王中会特意传入_display以跳过后面新加的代码
+                    // 重写amis中相关属性，但是允许用户通过配置组件的config.amis覆盖下面重写的逻辑
+                    if (steedosField.type === "image") {
+                        fieldAmis = Object.assign({}, {
+                            pipeIn: function (value, data) {
+                                if (steedosField.multiple) {
+                                    value = value && value.map(function (item) {
+                                        if (item && item.split("/").length === 1) {
+                                            // 不是url格式时转为url格式显示
+                                            return window.getImageFieldUrl(window.Meteor.absoluteUrl("/api/files/images/".concat(item)));
+                                        }
+                                        else {
+                                            return item;
+                                        }
+                                    });
+                                }
+                                else {
+                                    if (_$1.isArray(value)) {
+                                        value = value[0];
+                                    }
+                                    if (value && value.split("/").length === 1) {
+                                        // 不是url格式时转为url格式显示
+                                        return window.getImageFieldUrl(window.Meteor.absoluteUrl("/api/files/images/".concat(value)));
+                                    }
+                                }
+                                return value;
+                            },
+                            pipeOut: function (value, data) {
+                                if (steedosField.multiple) {
+                                    value = value && value.map(function (item) {
+                                        if (item && item.split("/").length > 1) {
+                                            // 是url格式时转_id值输出用于保存
+                                            return item.split("/").pop();
+                                        }
+                                        else {
+                                            return item;
+                                        }
+                                    });
+                                }
+                                else {
+                                    if (_$1.isArray(value)) {
+                                        value = value[0];
+                                    }
+                                    if (value && value.split("/").length > 1) {
+                                        // 是url格式时转_id值输出用于保存
+                                        return value.split("/").pop();
+                                    }
+                                }
+                                return value;
+                            }
+                        }, fieldAmis);
+                        steedosField.amis = fieldAmis;
+                    }
+                }
+                return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
+            case 13:
+                schema = _d.sent();
                 // console.log(`AmisSteedosField return schema`, schema)
                 return [2 /*return*/, schema];
-            case 8: return [3 /*break*/, 10];
-            case 9:
-                error_1 = _h.sent();
+            case 14: return [3 /*break*/, 16];
+            case 15:
+                error_1 = _d.sent();
                 console.log("error", error_1);
-                return [3 /*break*/, 10];
-            case 10: return [2 /*return*/, null];
+                return [3 /*break*/, 16];
+            case 16: return [2 /*return*/, null];
         }
     });
 }); };
@@ -20833,10 +21161,11 @@ 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.$schema, props.fields, props.name, props.id, props.data, props.columns, props.amis;
                 return [4 /*yield*/, getAmisInputTableSchema(props)];
             case 1:
                 amisSchema = _a.sent();
+                // console.log("=AmisInputTable==amisSchema====", amisSchema);
                 return [2 /*return*/, amisSchema];
         }
     });