@steedos-widgets/amis-lib 6.10.1-beta.31 → 6.10.1-beta.32

package/dist/index.cjs.js

@@ -532,8 +532,8 @@ function getComparableAmisVersion() {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-23 09:53:08
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-11-17 13:10:08
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-04-08 10:55:41
  * @Description: 
  */
 
@@ -687,9 +687,10 @@ function getRelatedFieldTpl(field, ctx){
                 const href = Router.getObjectDetailPath({
                     formFactor: ctx.formFactor, appId: "${appId}", objectName: `${objectNameTpl}`, recordId: `${recordIdTpl}`
                 });
-                if(ctx.isRelated && window.innerWidth >= 768){
+                if (window.innerWidth >= 768) { //(ctx.isRelated || isObjectListview) && window.innerWidth >= 768
+                    // 相关表字段，包括列表视图、对象表格组件中的lookup/master_detail字段，在PC端显示时，点击字段值，不跳转到详情页而是右侧弹出drawer
                     labelTpl = `<a href="${href}" ${linkTarget} onclick="return false;">${labelTpl}</a>`;
-                }else {
+                } else {
                     labelTpl = `<a href="${href}" ${linkTarget}>${labelTpl}</a>`;
                 }
                 
@@ -1487,6 +1488,7 @@ var frontend_download$1 = "Download";
 var frontend_form_save$1 = "Save";
 var frontend_form_save_and_new$1 = "Save and New";
 var frontend_form_cancel$1 = "Cancel";
+var frontend_form_reset$1 = "Reset";
 var frontend_form_new$1 = "New";
 var frontend_form_edit$1 = "Edit";
 var frontend_form_preview$1 = "Preview";
@@ -1505,7 +1507,7 @@ var frontend_display_type_is_split$1 = "Split View";
 var frontend_display_as$1 = "Displayed as";
 var frontend_record_sum$1 = "items";
 var frontend_button_reload_tooltip$1 = "Refresh";
-var frontend_button_search_tooltip$1 = "Advanced Search";
+var frontend_button_search_tooltip$1 = "Filter";
 var frontend_fields_filter_button_search$1 = "Search";
 var frontend_fields_filter_button_settings$1 = "Set search options";
 var frontend_button_listview_control_tooltip$1 = "List View Controls";
@@ -1577,6 +1579,7 @@ var en_us = {
 	frontend_form_save: frontend_form_save$1,
 	frontend_form_save_and_new: frontend_form_save_and_new$1,
 	frontend_form_cancel: frontend_form_cancel$1,
+	frontend_form_reset: frontend_form_reset$1,
 	frontend_form_new: frontend_form_new$1,
 	frontend_form_edit: frontend_form_edit$1,
 	frontend_form_preview: frontend_form_preview$1,
@@ -1668,6 +1671,7 @@ var frontend_download = "下载";
 var frontend_form_save = "保存";
 var frontend_form_save_and_new = "保存并新建";
 var frontend_form_cancel = "取消";
+var frontend_form_reset = "重置";
 var frontend_form_new = "新建";
 var frontend_form_edit = "编辑";
 var frontend_form_preview = "预览";
@@ -1686,7 +1690,7 @@ var frontend_display_type_is_split = "分栏视图";
 var frontend_display_as = "显示为";
 var frontend_record_sum = "个项目";
 var frontend_button_reload_tooltip = "刷新";
-var frontend_button_search_tooltip = "高级搜索";
+var frontend_button_search_tooltip = "筛选";
 var frontend_fields_filter_button_search = "搜索";
 var frontend_fields_filter_button_settings = "选择搜索项";
 var frontend_button_listview_control_tooltip = "列表视图控制";
@@ -1759,6 +1763,7 @@ var zh_cn = {
 	frontend_form_save: frontend_form_save,
 	frontend_form_save_and_new: frontend_form_save_and_new,
 	frontend_form_cancel: frontend_form_cancel,
+	frontend_form_reset: frontend_form_reset,
 	frontend_form_new: frontend_form_new,
 	frontend_form_edit: frontend_form_edit,
 	frontend_form_preview: frontend_form_preview,
@@ -1926,7 +1931,12 @@ async function getQuickEditSchema(object, columnField, options){
     if (field.disabled) {
         quickEditSchema = false;
     } else {
-        var fieldSchema = await convertSFieldToAmisField(field, false, ___namespace.omit(options, 'buttons'));
+        var fieldCtx = Object.assign({}, ___namespace.omit(options, 'buttons'), {
+            defaults: Object.assign({}, options.defaults, {
+                formSchema: quickEditSchema
+            })
+        });
+        var fieldSchema = await convertSFieldToAmisField(field, false, fieldCtx);
         //存在属性上可编辑，实际不可编辑的字段，convertSFieldToAmisField函数可能会返回undefined，如summary
         if (!!fieldSchema) {
             quickEditSchema.body.push(fieldSchema);
@@ -2359,14 +2369,19 @@ function getFieldWidth(width){
 }
 
 async function getColumnItemOnClick(field, options){
-    const recordPage = await getPage({ type: 'record', appId: options.appId, objectName: options.objectName, formFactor: options.formFactor });
+    let objectApiName = options.objectName;
+    if(!(field.is_name || field.name === options.labelFieldName)){
+        objectApiName = field.reference_to;
+    }
+    const recordPage = await getPage({ type: 'record', appId: options.appId, objectName: objectApiName, formFactor: options.formFactor });
     const drawerRecordDetailSchema = recordPage ? Object.assign({}, recordPage.schema, {
         "recordId": `\${${options.idFieldName}}`,
         "data": {
             ...recordPage.schema.data,
             "_inDrawer": true,  // 用于判断是否在抽屉中
             "recordLoaded": false, // 重置数据加载状态
-            "recordId": `\${${options.idFieldName}}`//审批微页面依赖了作用域中的recordId
+            "recordId": `\${${options.idFieldName}}`,//审批微页面依赖了作用域中的recordId
+            "_tableObjectName": options.objectName
         }
     }) : {
         "type": "steedos-record-detail",
@@ -2377,12 +2392,16 @@ async function getColumnItemOnClick(field, options){
         "data": {
             "_inDrawer": true,  // 用于判断是否在抽屉中
             "recordLoaded": false, // 重置数据加载状态
+            "_tableObjectName": options.objectName
         }
     };
 
     if(!(field.is_name || field.name === options.labelFieldName)){
         drawerRecordDetailSchema.objectApiName = field.reference_to;
         drawerRecordDetailSchema.recordId = `\${_display.${field.name}.value}`;
+        // if (recordPage){
+        //     drawerRecordDetailSchema.data.recordId = `\${_display.${field.name}.value}`
+        // }
     }
     return {
         "click": {
@@ -2532,6 +2551,33 @@ async function getTableColumns(object, fields, options){
                 static: true,
             }, fieldAmis, {name: field.name});
         }
+        else if(field.type === 'lookup' || field.type === 'master_detail'){
+            columnItem = Object.assign({}, {
+                type: "static-wrapper",
+                name: field.name,
+                label: field.label,
+                sortable: field.sortable,
+                width: getFieldWidth(field.width),
+                toggled: field.toggled,
+                className,
+                size: "none",
+                inputClassName: "inline",
+                body: {
+                    type: "steedos-field",
+                    static: true,
+                    tableObjectName: options.objectName,
+                    config: {
+                        type: "lookup",
+                        reference_to: field.reference_to,
+                        name: field.name,
+                        is_name: field.is_name,
+                        label: null,
+                        multiple: field.multiple,
+                        amis: Object.assign({}, fieldAmis, { label: null })
+                    }
+                }
+            }, fieldAmis, {name: field.name});
+        }
         else {
             const tpl = await getFieldTpl(field, options);
             let type = 'static-text';
@@ -2580,10 +2626,20 @@ async function getTableColumns(object, fields, options){
                     columnItem.defaultColor = null;
                 }
 
-                if(window.innerWidth >= 768 && ((field.is_name || field.name === options.labelFieldName) || ((field.type == 'lookup' || field.type == 'master_detail') && ___namespace.isString(field.reference_to) && field.multiple != true)) && options.isRelated){
+                let needClickEvent = false;
+                // if (options.isRelated){
+                //     // 子表列表上，Lookup字段和名称字段都需要点击事件
+                //     needClickEvent = ((field.is_name || field.name === options.labelFieldName) || ((field.type == 'lookup' || field.type == 'master_detail') && _.isString(field.reference_to) && field.multiple != true));
+                // }
+                // else {// if (isObjectListview)
+                //     // 列表视图、对象表格中，Lookup字段需要点击事件
+                //     needClickEvent = (field.type == 'lookup' || field.type == 'master_detail') && _.isString(field.reference_to) && field.multiple != true;
+                // }
+                // lookup字段走steedos-field组件了，所以这里只需要判断子表名称字段才额外加点击事件弹出右侧详情
+                needClickEvent = options.isRelated && (field.is_name || field.name === options.labelFieldName);
+                if(window.innerWidth >= 768 && needClickEvent){
                     columnItem.onEvent = await getColumnItemOnClick(field, options);
                 }
-
             }
         }
         if(columnItem){
@@ -4935,9 +4991,9 @@ const getSchema$5 = async (uiSchema, ctx) => {
         "body": [
             {
                 "type": "button",
+                "level": "primary",
                 "label": i18next__default["default"].t('frontend_form_new'),
                 "id": "u:standard_new",
-                "level": "default",
                 "onEvent": {
                     "click": {
                         "weight": 0,
@@ -5138,8 +5194,8 @@ const getSchema$4 = async (uiSchema, ctx) => {
 /*
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-03-22 09:31:21
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-02-18 16:06:21
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-04-07 16:02:53
  */
 const getSchema$3 = (uiSchema)=>{
     return {
@@ -5199,6 +5255,17 @@ const getSchema$3 = (uiSchema)=>{
                                   "_isRelated": "${_isRelated}"
                                 },
                                 "expression": `\${_master.objectName != '${uiSchema.name}' && _master.objectName}`
+                            },
+                            // 列表视图、对象表格组件上的lookup字段，点开右侧弹出drawer窗口，删除记录后刷新列表
+                            {
+                                "actionType": "broadcast",
+                                "args": {
+                                  "eventName": "@data.changed.${_tableObjectName}"
+                                },
+                                "data": {
+                                  "objectName": "${_tableObjectName}"
+                                },
+                                "expression": `\${_tableObjectName != '${uiSchema.name}' && _tableObjectName}`
                             }
                           ]
                     }
@@ -6113,7 +6180,7 @@ async function getObjectFieldsFilterFormSchema(ctx) {
   const formSchema = {
     "type": "service",
     "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
-    "className": ctx.formFactor === 'SMALL' ? "slds-filters__body p-0 mb-2 overflow-y-auto overflow-x-hidden" : "slds-filters__body p-0 sm:grid sm:gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5 2xl:grid-cols-6 p-1",
+    "className": ctx.formFactor === 'SMALL' ? "slds-filters__body p-0 mb-2 overflow-y-auto overflow-x-hidden" : "slds-filters__body p-0 sm:grid sm:gap-4 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 p-1",
     "style":{
       "max-height":ctx.formFactor === 'SMALL'?"30vh":"unset"
     },
@@ -6348,6 +6415,21 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service", {name: "service_object_table_crud"});
     crudService && crudService.setData({isFieldsFilterEmpty: true, showFieldsFilter: false});
     `;
+  /**
+  给lookup字段配置filter_form_data时可以配置为amis变量，也可以配置为事态key-value键值对象值：
+  ```
+  "filter_form_data": "${selectedPublicGroupFilterFormData|toJson}"
+  ```
+  or
+  ```
+  "filter_form_data": {
+      "public_group_ids": [
+          "67addbef39f9a4503789b38d"
+      ]
+  }
+  ```
+   */
+  const filterFormValues = ctx.filter_form_data;
   const dataProviderInited = `
     const searchableFields = ${JSON.stringify(searchableFields)};
     const autoOpenFilter = ${autoOpenFilter};
@@ -6385,6 +6467,16 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     }
     setData({ filterFormSearchableFields: defaultSearchableFields });
     if(isLookup){
+      let filterFormValues = ${_.isObject(filterFormValues) ? JSON.stringify(filterFormValues) : ('"' + filterFormValues + '"')} || {};
+      const isAmisFormula = typeof filterFormValues === "string" && filterFormValues.indexOf("\${") > -1;
+      if (isAmisFormula){
+        filterFormValues = AmisCore.evaluate(filterFormValues, data) || {};
+      }
+      if (_.isObject(filterFormValues) || !_.isEmpty(filterFormValues)){
+        let fields = data.uiSchema && data.uiSchema.fields;
+        filterFormValues = SteedosUI.getSearchFilterFormValues(filterFormValues, fields);
+        setData({ ...filterFormValues });
+      }
       // looup字段过滤器不在本地缓存记住过滤条件，所以初始始终隐藏过滤器
       setData({ showFieldsFilter: autoOpenFilter });
     }
@@ -6541,6 +6633,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
             "body": [
               {
                 "type": "button",
+                "level": "primary",
                 "id": btnSearchId,
                 "label": i18next__default["default"].t('frontend_fields_filter_button_search'),
                 "icon": "fa fa-search",
@@ -6558,7 +6651,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
               },
               {
                 "type": "button",
-                "label": i18next__default["default"].t('frontend_form_cancel'),
+                "label": i18next__default["default"].t('frontend_form_reset'),
                 "name": "btn_filter_form_cancel",
                 // "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
                 "onEvent": {
@@ -6648,7 +6741,6 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
                               "className": "steedos-amis-form"
                             }
                           ],
-                          "id": "u:ca99fa9fe1b1",
                           "actions": [
                             {
                               "type": "button",
@@ -6676,13 +6768,15 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
                                       "actionType": "custom",
                                       "script": onSearchableFieldsChangeScript
                                     },
-                                    {
-                                      "actionType": "click",
-                                      "componentId": btnSearchId,
-                                      "args": {
-                                        "__from_fields_filter_settings_confirm": true
-                                      }
-                                    },
+                                    // 自动触发搜索事件会造成bug，应该是升级amis到6.4造成的，见：https://github.com/steedos/steedos-platform/issues/7121
+                                    // 变更搜索项后，用户一般会点击搜索按钮，所以这里不自动触发搜索事件
+                                    // {
+                                    //   "actionType": "click",
+                                    //   "componentId": btnSearchId,
+                                    //   "args": {
+                                    //     "__from_fields_filter_settings_confirm": true
+                                    //   }
+                                    // },
                                     {
                                       "componentId": "",
                                       "args": {},
@@ -6713,12 +6807,11 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
                     ]
                   }
                 },
-                "id": "u:b96d84868a5a",
                 "level": "link"
               }
             ],
             "size": "xs",
-            "className": "space-x-4"
+            "className": "space-x-2"
           },
           "size": "xs",
           "className": "slds-filters__footer slds-grid slds-shrink-none flex justify-between p-0"
@@ -7664,7 +7757,7 @@ function getObjectListHeader(objectSchema, listViewName, ctx) {
   let headerSchema = [{
     "type": "wrapper",
     "body": body,
-    "className": `p-3 m-4 shadow rounded bg-white`
+    "className": `px-3 pt-3 pb-0 m-1 bg-white`
   }];
   // console.log(`getObjectListHeader`, objectSchema, listViewName, ctx)
   return headerSchema;
@@ -9046,7 +9139,7 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
   return {
     "type": "tooltip-wrapper",
     "id": "steedos_crud_toolbar_quick_search",
-    "align": "left",
+    "align": "right",
     "title": "",
     "content": "可搜索字段：" + searchableFieldsLabel.join(","),
     "placement": "bottom",
@@ -9060,6 +9153,7 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
         "name": keywordsSearchBoxName,
         "placeholder": "快捷搜索",
         "value": crudKeywords,
+        "mini": true,
         "clearable": true,//因为清除并不会触发失去焦点事件，只有禁用，但是它会触发change事件，所以等升级到amis 3.4+后可以重新放开
         "clearAndSubmit": true,
         "searchImediately": false,
@@ -9108,7 +9202,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
   if(!hiddenCount){
     toolbarCount = {
       "type": "tpl",
-      "align": "right",
+      "align": "left",
       "className": "text-gray-500 mr-2",
       "tpl":  "${count} " + i18next__default["default"].t('frontend_record_sum')
     };
@@ -9192,7 +9286,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
         "animation": true,
         "visibleOn": "${isFieldsFilterEmpty == false && isLookup != true}"
       },
-      "align": "left",
+      "align": "right",
       "className": "bg-white p-2 rounded text-gray-500",
       "onEvent": {
         "click": {
@@ -9214,27 +9308,27 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
   // 当出现空的.antd-Crud-toolbar-item dom时会影响toolbar元素的maring-right css样式计算，如果有动态需要应该加到动态数组变量toolbars中
   let toolbars = [];
   if(formFactor === 'SMALL'){
-    if(toolbarCount){
-      toolbars.push(toolbarCount);
-    }
-    toolbars.push(toolbarReloadButton);
-    toolbars.push(toolbarDisplayAsButton);
+    // if(toolbarCount){
+    //   toolbars.push(toolbarCount);
+    // }
+    // toolbars.push(toolbarReloadButton);
+    toolbars.push(toolbarDQuickSearchBox);
     if(toolbarFilter){
       toolbars.push(toolbarFilter);
     }
-    toolbars.push(toolbarDQuickSearchBox);
+    toolbars.push(toolbarDisplayAsButton);
     return [
       // "bulkActions",
       ...(headerToolbarItems || []),
       ...toolbars,
   ]
   }else {
+    toolbars.push(toolbarDQuickSearchBox);
     toolbars.push(toolbarReloadButton);
     toolbars.push(toolbarDisplayAsButton);
     if(mainObject?.permissions?.allowCreateListViews){
       toolbars.push(getSettingListviewToolbarButtonSchema());
     }
-    toolbars.push(toolbarDQuickSearchBox);
     if(toolbarFilter){
       toolbars.push(toolbarFilter);
     }
@@ -9914,6 +10008,17 @@ async function getObjectForm(objectSchema, ctx){
                 },
                 "expression": `\${_master.objectName != '${objectSchema.name}' && _master.objectName}`
               },
+              // 列表视图、对象表格组件上的lookup字段，点开右侧弹出drawer窗口，修改记录后刷新列表
+              {
+                "actionType": "broadcast",
+                "args": {
+                  "eventName": "@data.changed.${_tableObjectName}"
+                },
+                "data": {
+                  "objectName": "${_tableObjectName}"
+                },
+                "expression": `\${_tableObjectName != '${objectSchema.name}' && _tableObjectName}`
+              },
               ...submitSuccActions,
               // {
               //   "actionType": "custom",
@@ -11042,7 +11147,8 @@ async function getRecordDetailHeaderSchema(objectName,recordId, options){
 }
 
 async function getRecordDetailSchema(objectName, appId, props = {}){
-    const uiSchema = await getUISchema(objectName);
+    const uiSchema = await getUISchema(objectName);    
+
     const relatedLists = await getObjectRelatedList(objectName);
     const detailed = {
         "title": i18next__default["default"].t('frontend_record_detail_tab_detailed'),
@@ -11083,6 +11189,21 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
     if(relatedLists.length){
         content.tabs.push(related);
     }
+    const contents = [content];
+    if (uiSchema.enable_chatter && window.BuilderLiveblocks) {
+        const chatter = {
+            "type": "rooms-provider",
+            "baseUrl": "${context.rootUrl}",
+            "body": [
+              {
+                "type": "rooms-comments",
+                "className": "flex flex-col gap-3 m-4",
+                "roomId": "objects:${objectName}:${recordId}",
+              }
+            ]
+        };
+        contents.push(chatter);
+    }
     // content.tabs = reverse(content.tabs)
     if(content.tabs.length == 1){
         content.className += " steedos-record-tabs--single";
@@ -11102,7 +11223,7 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
                     "showBackButton": props.showBackButton,
                     _reloadKey: props._reloadKey
                 },
-                content
+                ...contents,
             ],
             "objectApiName": "${objectName}",
             "recordId": "${recordId}",
@@ -11886,14 +12007,42 @@ function getLookupSapceUserTreeSchema(isMobile){
               {
                 "actionType": "custom",
                 "script": `
+                console.log("lookup-tree-event.data:",event.data);
+                console.log("lookup-tree-event.data.value.label:",event.data.value.label);
+                console.log("lookup-tree-event.data.value.value:",event.data.value.value);
                 const scope = event.context.scoped;
-                var filterFormValues={
+                var treeFilterFormValues={
                     "__searchable__organizations_parents":event.data.value.value
                 }
-                var listView = scope.parent.getComponents().find(function(n){
-                  return n.props.type === "crud";
+                // var listView = scope.parent.getComponents().find(function(n){
+                //   return n.props.type === "crud";
+                // });
+                // listView.handleFilterSubmit(Object.assign({}, filterFormValues));
+                let __lookupField = event.data.__lookupField;
+                let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
+                var filterForm = scope.getComponents().find(function(n){
+                    return n.props.type === "form";
                 });
-                listView.handleFilterSubmit(Object.assign({}, filterFormValues));
+                let filterFormValues = filterForm.getData();
+                filterFormValues = JSON.parse(JSON.stringify(filterFormValues)); //只取当层数据域中数据，去除__super层数据
+                const changedFilterFormValues = _.pickBy(filterFormValues, function(n,k){return /^__searchable__/.test(k);});
+                Object.assign(changedFilterFormValues, treeFilterFormValues);
+                // 同步__changedFilterFormValues中的值
+                let __changedFilterFormValuesKey = "__changedFilterFormValues";
+                if(__lookupField){
+                    let lookupTag = "__lookup__" + __lookupField.name + "__" + __lookupField.reference_to;
+                    if(__lookupField.reference_to_field){
+                        lookupTag += "__" + __lookupField.reference_to_field;
+                    }
+                    __changedFilterFormValuesKey += lookupTag;
+                }
+                if(crud){
+                    let crudData = crud.getData();
+                    crudData[__changedFilterFormValuesKey] = changedFilterFormValues;
+                    crud.setData(crudData);
+                }
+                filterForm.setData(treeFilterFormValues);
+                filterForm.handleFormSubmit(event);
               `
               },
               {
@@ -12111,6 +12260,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
     // field.name可能是带点的名称，比如审批王中子表字段'instances.instances_submitter'，如果不替换掉点，会造成审批王表单中新建子表行时报错
     let keywordsSearchBoxName = `__keywords_lookup__${field.name.replace(/\./g, "_")}__to__${refObjectConfig.name}`;
 
+    const filterFormValues = field.filter_form_data;
     source.requestAdaptor = `
         let __changedFilterFormValuesKey = "__changedFilterFormValues";
         let __lookupField = api.data.$self.__lookupField;
@@ -12153,7 +12303,20 @@ async function lookupToAmisPicker(field, readonly, ctx){
             }
         }
 
-        var searchableFilter = SteedosUI.getSearchFilter(selfData) || [];
+        let filterFormValues = {};
+        if (selfData.op !== 'loadOptions'){
+            filterFormValues = ${___namespace.isObject(filterFormValues) ? JSON.stringify(filterFormValues) : ('"' + filterFormValues + '"')} || {};
+            const isAmisFormula = typeof filterFormValues === "string" && filterFormValues.indexOf("\${") > -1;
+            if (isAmisFormula){
+                filterFormValues = AmisCore.evaluate(filterFormValues, context) || {};
+            }
+            if (_.isObject(filterFormValues) || !_.isEmpty(filterFormValues)){
+                let fields = api.data.$self.uiSchema && api.data.$self.uiSchema.fields;
+                filterFormValues = SteedosUI.getSearchFilterFormValues(filterFormValues, fields);
+            }
+        }
+
+        var searchableFilter = SteedosUI.getSearchFilter(Object.assign({}, { ...filterFormValues }, selfData)) || [];
 
         if(searchableFilter.length > 0){
             if(filters.length > 0 ){
@@ -12343,7 +12506,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
         return payload;
         `;
     }
-    let top = 20;
+    let top = 500;
 
     if(refObjectConfig.paging && refObjectConfig.paging.enabled === false){
         top = 1000;
@@ -12393,7 +12556,8 @@ async function lookupToAmisPicker(field, readonly, ctx){
                 keywordsSearchBoxName,
                 searchable_fields: field.searchable_fields,
                 auto_open_filter: field.auto_open_filter,
-                show_left_filter: field.show_left_filter
+                show_left_filter: field.show_left_filter,
+                filter_form_data: field.filter_form_data
             });
         }
         pickerSchema.data = Object.assign({}, pickerSchema.data, {
@@ -12466,7 +12630,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
                     }
                     
                     const ctx = ${JSON.stringify(ctx)};
-                    const componentId = ctx.defaults.formSchema.id;
+                    const componentId = ctx.defaults && ctx.defaults.formSchema && ctx.defaults.formSchema.id;
                     doAction({
                         actionType: 'setValue',
                         componentId: componentId, 
@@ -12893,6 +13057,10 @@ async function lookupToAmis(field, readonly, ctx){
     }
     let amisSchema;
     // 默认使用下拉框模式显示lookup选项，只能配置了enable_enhanced_lookup才使用弹出增强模式
+    if(enableEnhancedLookup == true && field.amis && field.amis.type && field.amis.type !== 'picker'){
+        // 如果配置了amis.type且其值不是picker，则不使用弹出增强模式
+        enableEnhancedLookup = false;
+    }
     if(enableEnhancedLookup == true){
         amisSchema = await lookupToAmisPicker(field, readonly, ctx);
     }else if(refObject.enable_tree) {
@@ -14024,7 +14192,16 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             return  convertData
         }
         // if(ctx.mode === 'edit'){
-        let convertDataResult = Object.assign({}, baseData, convertData, { labelClassName: 'text-left', clearValueOnHidden: true, fieldName: field.name}, field.amis, {name: baseData.name});
+        let convertDataResult;
+        if(convertData.type == "steedos-field"){
+            // 如果是steedos-field，不能把amis属性合并到steedos-field根属性中，要合并也是合并到steedos-field的config.amis中
+            // 而steedos-field字段的amis属性本身就在config.amis中了，所以这里不需要再合并field.amis
+            // 目前测试到受影响的是，把字段的amis属性配置为{"type": "checkboxes"}时，ObjectForm只读模式下，lookup字段返回的是type为steedos-field的组件，此时field.amis中的type不应该合并到steedos-field根属性中
+            convertDataResult = Object.assign({}, baseData, convertData, { labelClassName: 'text-left', clearValueOnHidden: true, fieldName: field.name}, {name: baseData.name});
+        }
+        else {
+            convertDataResult = Object.assign({}, baseData, convertData, { labelClassName: 'text-left', clearValueOnHidden: true, fieldName: field.name}, field.amis, {name: baseData.name});
+        }
         // 只读时file字段的外层control层若存在name，内部each组件存在问题
         if(readonly && field.type == "file") {
             convertDataResult.name = "";