@steedos-widgets/amis-lib 6.3.12-beta.8 → 6.3.12

package/dist/index.esm.js

@@ -505,8 +505,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: 
  */
 
@@ -663,9 +663,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>`;
                 }
                 
@@ -1213,7 +1214,7 @@ async function getPage({type, pageId = '', appId, objectName = '', recordId = ''
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-10-28 14:15:09
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-11-14 10:50:01
+ * @LastEditTime: 2025-02-13 09:31:02
  * @Description: 
  */
 
@@ -1272,7 +1273,7 @@ async function getLookupLinkOnClick(field, options) {
                         "title": "&nbsp;",
                         "headerClassName": "hidden",
                         "size": "lg",
-                        "width": "70%",
+                        "width": window.drawerWidth || "70%",
                         "bodyClassName": "p-0 m-0 bg-gray-100",
                         "closeOnEsc": true,
                         "closeOnOutside": true,
@@ -1868,7 +1869,6 @@ async function getQuickEditSchema(object, columnField, options){
                     {
                         actionType: "custom",
                         script: `
-                            console.log("asdasd");
                             let items = _.cloneDeep(event.data.items);
                             let selectedItems = _.cloneDeep(event.data.selectedItems);
                             if(event.data.isBatchEdit){
@@ -1897,7 +1897,12 @@ async function getQuickEditSchema(object, columnField, options){
     if (field.disabled) {
         quickEditSchema = false;
     } else {
-        var fieldSchema = await convertSFieldToAmisField(field, false, _$1.omit(options, 'buttons'));
+        var fieldCtx = Object.assign({}, _$1.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);
@@ -2330,14 +2335,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",
@@ -2348,12 +2358,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": {
@@ -2365,7 +2379,7 @@ async function getColumnItemOnClick(field, options){
                   "title": "&nbsp;",
                   "headerClassName": "hidden",
                   "size": "lg",
-                  "width": "70%",
+                  "width": window.drawerWidth || "70%",
                   "bodyClassName": "p-0 m-0 bg-gray-100",
                   "closeOnEsc": true,
                   "closeOnOutside": true,
@@ -2503,6 +2517,32 @@ 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,
+                        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';
@@ -2551,10 +2591,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') && _$1.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){
@@ -3409,6 +3459,11 @@ async function getTableApi(mainObject, fields, options){
             }, 600);
         }
     }
+
+    // 列表搜索和快速搜索，有时在某些操作情况下还是会造成crud接口请求使用的过滤条件是上次的，这里强制把正确的过滤条件返回到crud，详细规则见：https://github.com/steedos/steedos-platform/issues/7112
+    // lookup字段的弹出列表搜索不受这里影响，因为lookup字段的弹出列表搜索是单独的接口请求
+    payload.data.__changedFilterFormValues = api.context.__changedFilterFormValues;
+    payload.data.__changedSearchBoxValues = api.context.__changedSearchBoxValues;
     ${options.adaptor || ''}
     return payload;
     `;
@@ -5096,8 +5151,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 {
@@ -5157,6 +5212,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}`
                             }
                           ]
                     }
@@ -6140,15 +6206,38 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
   if (!ctx) {
     ctx = {};
   }
+  const searchableFields = ctx.searchable_fields;
+  const autoOpenFilter = !!ctx.auto_open_filter;
   const btnSearchId = "btn_filter_form_search_" + new Date().getTime();
   const filterFormSchema = await getObjectFieldsFilterFormSchema(ctx);
   const keywordsSearchBoxName = ctx.keywordsSearchBoxName || "__keywords";
   const onSearchScript = `
-    // console.log("===onSearchScript=form==");
+    let isLookup = event.data.isLookup;
+    let __lookupField = event.data.__lookupField;
     const scope = event.context.scoped;
+    let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
     var filterForm = scope.parent.parent.getComponents().find(function(n){
       return n.props.type === "form";
     });
+    // 使用filterForm.getValues()的话，并不能拿到本地存储中的过滤条件，所以需要从event.data中取，因为本地存储中的过滤条件自动填充到表单上时filterForm.getValues()拿不到。
+    let filterFormValues = event.data;
+    filterFormValues = JSON.parse(JSON.stringify(filterFormValues)); //只取当层数据域中数据，去除__super层数据
+    const changedFilterFormValues = _.pickBy(filterFormValues, function(n,k){return /^__searchable__/.test(k);});
+    // 同步__changedFilterFormValues中的值
+    // crud && crud.setData({__changedFilterFormValues: {}});
+    let __changedFilterFormValuesKey = "__changedFilterFormValues";
+    if(isLookup && __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.handleFormSubmit(event);
     // var filterFormValues = filterForm.getValues();
     // var listView = scope.parent.parent.parent.getComponents().find(function(n){
@@ -6197,11 +6286,8 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     }
     filterService.setData({showFieldsFilter});
     // resizeWindow();//已迁移到搜索栏表单提交事件中执行，因为表单项change后也会触发表单提交了
-    // 使用filterForm.getValues()的话，并不能拿到本地存储中的过滤条件，所以需要从event.data中取。
-    let filterFormValues = event.data;
     let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
-    let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
-    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service", {name: "service_object_table_crud"});
     crudService && crudService.setData({isFieldsFilterEmpty, showFieldsFilter});
   `;
   const onCancelScript = `
@@ -6287,10 +6373,27 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     
     // 移除搜索按钮上的红点
     // let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
-    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    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};
     const objectName = data.objectName;
     const isLookup = data.isLookup;
     const listName = data.listName;
@@ -6303,6 +6406,11 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     if(defaultSearchableFields){
       defaultSearchableFields = defaultSearchableFields.split(",");
     }
+    if(_.isEmpty(defaultSearchableFields) && searchableFields){
+      if(searchableFields.length){
+        defaultSearchableFields = _.map(searchableFields, 'field');
+      }
+    }
     if(_.isEmpty(defaultSearchableFields) && data.uiSchema){
       let listView = data.uiSchema.list_views[data.listName];
       const sFields = listView && listView.searchable_fields;
@@ -6320,8 +6428,18 @@ 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: false });
+      setData({ showFieldsFilter: autoOpenFilter });
     }
     else{
       const listViewPropsStoreKey = location.pathname + "/crud";
@@ -6611,13 +6729,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": {},
@@ -7586,7 +7706,7 @@ async function getObjectListHeaderFieldsFilterBar(objectSchema, listViewName, ct
  * @param {*} objectSchema 对象UISchema
  * @returns amisSchema
  */
-function getObjectListHeader$1(objectSchema, listViewName, ctx) {
+function getObjectListHeader(objectSchema, listViewName, ctx) {
   if (!ctx) {
     ctx = {};
   }
@@ -8912,10 +9032,9 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
   }
 
   const onChangeScript = `
-    // console.log("==search=onChangeScript===");
     const scope = event.context.scoped;
     let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
-    // let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    // let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service", {name: "service_object_table_crud"});
     let __changedSearchBoxValues = {};
     __changedSearchBoxValues["${keywordsSearchBoxName}"] = event.data["${keywordsSearchBoxName}"];
     // crudService && crudService.setData({__changedSearchBoxValues: __changedSearchBoxValues});
@@ -9282,10 +9401,28 @@ async function getObjectFilter(objectSchema, fields, options) {
     let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
     let filterFormService = SteedosUI.getClosestAmisComponentByType(filterForm.context, "service");
     // 使用event.data的话，并不能拿到本地存储中的过滤条件，所以需要从filterFormService中取。
-    let filterFormValues = filterFormService.getData()
+    let filterFormValues = filterFormService.getData();
+    filterFormValues = JSON.parse(JSON.stringify(filterFormValues)); //只取当层数据域中数据，去除__super层数据
     let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
     let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
-    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    const changedFilterFormValues = _.pickBy(filterFormValues, function(n,k){return /^__searchable__/.test(k);});
+    // 这里不用crudService而用crud是因为lookup字段弹出的列表中的crudService中的变量无法传入crud的发送适配器中
+    // crud && crud.setData({__changedFilterFormValues: changedFilterFormValues});
+    let __changedFilterFormValuesKey = "__changedFilterFormValues";
+    if(isLookup && __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);
+    }
+
+    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service", {name: "service_object_table_crud"});
     crudService && crudService.setData({isFieldsFilterEmpty});
   `;
   let onChangeScript = `
@@ -9300,7 +9437,7 @@ async function getObjectFilter(objectSchema, fields, options) {
     filterFormValues = JSON.parse(JSON.stringify(filterFormValues)); //只取当层数据域中数据，去除__super层数据
     let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
     const changedFilterFormValues = _.pickBy(filterFormValues, function(n,k){return /^__searchable__/.test(k);});;
-    // let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    // let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service", {name: "service_object_table_crud"});
     // crudService && crudService.setData({__changedFilterFormValues: changedFilterFormValues});
     // 这里不用crudService而用crud是因为lookup字段弹出的列表中的crudService中的变量无法传入crud的发送适配器中
     // crud && crud.setData({__changedFilterFormValues: changedFilterFormValues});
@@ -9656,7 +9793,7 @@ async function getObjectCRUD(objectSchema, fields, options){
       className: crudModeClassName,
       //目前crud的service层id不认用户自定义id，只支持默认规则id，许多地方的格式都写死了service_listview_${objectname}
       id: `service_${id}`,
-      name: `page`,
+      name: "service_object_table_crud",
       data: options.amisData,
       body: body,
       //监听广播事件，重算crud高度
@@ -9820,6 +9957,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",
@@ -10003,8 +10151,8 @@ const getRecordPermissions = async (objectName, recordId)=>{
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-02-18 14:46:50
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-01-08 13:32:51
  * @Description:
  */
 
@@ -10078,7 +10226,7 @@ async function getObjectRelatedList(
 
 // 获取单个相关表
 async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObjectName, relatedKey, ctx){
-    let { top, perPage, appId, relatedLabel, className, columns, sort, filters, visible_on } = ctx;
+    let { top, perPage, appId, relatedLabel, className, columns, sort, filters, visible_on, enableHeaderToolbar } = ctx;
     // console.log('getRecordDetailRelatedListSchema==>',objectName,recordId,relatedObjectName)
     const relatedObjectUiSchema = await getUISchema(relatedObjectName);
     if(!relatedObjectUiSchema){
@@ -10143,6 +10291,10 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
     let headerToolbar = [];
     if(!isMobile){
         headerToolbar.push("bulkActions");
+        if (enableHeaderToolbar) {
+            // 通过 enableHeaderToolbar = true 可以控制是否显示内置的带过滤器的headerToolbar
+            headerToolbar = undefined;
+        }
     }
     const options = {
         globalFilter,
@@ -10181,7 +10333,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         amisSchema: {
             type: "service",
             id: componentId,
-            className: `steedos-record-related-list mb-4 last:mb-0 ${componentId} ${className}`,
+            className: `steedos-record-related-list mb-4 last:mb-0 ${componentId} ${className} ${enableHeaderToolbar ? 'enable-header-toolbar' : ''}`,
             data: {
                 relatedKey: relatedKey,   
                 listViewId: `amis-\${appId}-${relatedObjectName}-listview`,
@@ -10283,6 +10435,7 @@ async function getRelatedListSchema(
     listViewName,
     ctx
   ) {
+    const { enableHeaderToolbar } = ctx;
     const uiSchema = await getUISchema(objectName);
     if(!uiSchema){
         return {}
@@ -10335,10 +10488,14 @@ async function getRelatedListSchema(
     delete ctx.filters;
 
     delete ctx.globalFilter;
+    delete ctx.enableHeaderToolbar;
 
     const adaptor = `
         try{
             if(setDataToComponentId){
+                // 子表列表在headerToolbar过滤器中设置过过滤条件的话，始终显示子表列表，无论是否查询到数据
+                // 改为使用css样式控制子表列表放开headerToolbar时，始终显示crud，只隐藏crud内部的表格，从而始终显示headerToolbar不受这里逻辑影响
+                // var headerToolbarFilterChanged = context.isFieldsFilterEmpty === false;
                 if(payload.data.count){
                     setTimeout(function(){
                         // 设计器中获取不到window.$从而导致报错， 所以用纯js替换下。
@@ -10361,7 +10518,7 @@ async function getRelatedListSchema(
         "filters": listviewFilter,
         "filtersFunction": filtersFunction,
         "sort": listViewSort,
-        "filterVisible": false,
+        "filterVisible": !!enableHeaderToolbar,
         "requestAdaptor": ctx.requestAdaptor,  
         "adaptor": adaptor + ctx.adaptor || '',
         "ctx": ctx,
@@ -10917,7 +11074,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.t('frontend_record_detail_tab_detailed'),
@@ -10956,6 +11114,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)
     return {
         uiSchema,
@@ -10971,7 +11144,7 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
                     "showButtons": props.showButtons,
                     "showBackButton": props.showBackButton,
                 },
-                content
+                ...contents,
             ],
             "objectApiName": "${objectName}",
             "recordId": "${recordId}",
@@ -11755,14 +11928,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);
               `
               },
               {
@@ -11856,6 +12057,9 @@ async function lookupToAmisPicker(field, readonly, ctx){
     ctx.idFieldName = refObjectConfig.idFieldName;
     ctx.objectName = refObjectConfig.name;
 
+    // 是否显示lookup字段左侧的过滤器（如果有的话），默认为true，目前只有lookup选人字段有左侧树过滤器
+    const showLeftFilter = field.show_left_filter !== false;
+
     let tableFields = [];
     const searchableFields = [];
 
@@ -11977,6 +12181,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;
@@ -12019,7 +12224,20 @@ async function lookupToAmisPicker(field, readonly, ctx){
             }
         }
 
-        var searchableFilter = SteedosUI.getSearchFilter(selfData) || [];
+        let filterFormValues = {};
+        if (selfData.op !== 'loadOptions'){
+            filterFormValues = ${_$1.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 ){
@@ -12187,6 +12405,20 @@ async function lookupToAmisPicker(field, readonly, ctx){
         });
         payload.data.rows = updatedResult;
     }
+    let __changedFilterFormValuesKey = "__changedFilterFormValues";
+    let __lookupField = api.data.$self.__lookupField;
+    if(__lookupField){
+        let lookupTag = "__lookup__" + __lookupField.name + "__" + __lookupField.reference_to;
+        if(__lookupField.reference_to_field){
+            lookupTag += "__" + __lookupField.reference_to_field;
+        }
+        __changedFilterFormValuesKey += lookupTag;
+    }
+    let __changedFilterFormValues = api.context[__changedFilterFormValuesKey] || {};
+    let __changedSearchBoxValues = api.context.__changedSearchBoxValues || {};
+    // 列表搜索和快速搜索，有时在某些操作情况下还是会造成crud接口请求使用的过滤条件是上次的，这里强制把正确的过滤条件返回到crud，详细规则见：https://github.com/steedos/steedos-platform/issues/7112
+    payload.data[__changedFilterFormValuesKey] = __changedFilterFormValues;
+    payload.data.__changedSearchBoxValues = __changedSearchBoxValues;
     return payload;
     `;
     if(field.optionsFunction || field._optionsFunction){
@@ -12195,7 +12427,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
         return payload;
         `;
     }
-    let top = 20;
+    let top = 500;
 
     if(refObjectConfig.paging && refObjectConfig.paging.enabled === false){
         top = 1000;
@@ -12222,7 +12454,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
 
         pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, fieldsArr, ctx.formFactor, { isLookup: true, keywordsSearchBoxName });
         
-        if(referenceTo.objectName === "space_users" && field.reference_to_field === "user"){
+        if(referenceTo.objectName === "space_users" && field.reference_to_field === "user" && showLeftFilter){
             pickerSchema.headerToolbar.push(getLookupSapceUserTreeSchema(isMobile));
             pickerSchema.className = pickerSchema.className || "" + " steedos-select-user";
         }
@@ -12242,7 +12474,11 @@ async function lookupToAmisPicker(field, readonly, ctx){
             pickerSchema.filter = await getObjectFilter(refObjectConfig, fields, {
                 ...ctx,
                 isLookup: true,
-                keywordsSearchBoxName
+                keywordsSearchBoxName,
+                searchable_fields: field.searchable_fields,
+                auto_open_filter: field.auto_open_filter,
+                show_left_filter: field.show_left_filter,
+                filter_form_data: field.filter_form_data
             });
         }
         pickerSchema.data = Object.assign({}, pickerSchema.data, {
@@ -12309,7 +12545,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, 
@@ -12736,6 +12972,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) {
@@ -13867,7 +14107,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 = "";
@@ -16012,7 +16261,7 @@ async function getListviewInitSchema(objectApiName, listViewName, ctx) {
         const defaults = ctx.defaults || {};
         if(!defaults.headerSchema){
             //传入isListviewInit是区别于对象列表类型的微页面，即getListPageInitSchema函数中该属性为false
-            const headerSchema = await getObjectListHeader$1(uiSchema, listViewName, {
+            const headerSchema = await getObjectListHeader(uiSchema, listViewName, {
                 onlySecordLine: true,
                 isListviewInit: true
             });
@@ -18495,5 +18744,5 @@ const getInstanceInfo = async ({ instanceId, box }) => {
   };
 };
 
-export { index as Field, Router, absoluteUrl, amisRender, amisRootClick, cloneObject, conditionsToFilters, createObject, defaultsDeep, deleteVariable, execute, executeButton, extendObject, fetchAPI, filtersToConditions, getAmisInputTableSchema, getApp, getApps, getAuthToken, getAuthorization, getButton, getButtonVisible, getButtonVisibleOn, getButtons, getCalendarSchema, getCreatedInfoTpl, getDateTimeTpl, getDateTpl, getDefaultRenderData, getEnv, getEnvs, getEvn, getField, getFieldTpl, getFileSrc, getFlowFormSchema, getFormPageInitSchema, getFormSchema, getGlobalNowData, getIdsPickerSchema, getImageSrc, getInstanceInfo, getListPageInitSchema, getListSchema, getListViewButtons, getListViewColumns, getListViewFilter, getListViewItemButtons, getListViewSort, getListviewInitSchema, getLocationTpl, getLookupSapceUserTreeSchema, getLookupTpl, getModifiedInfoTpl, getNameTpl, getNameTplUrl, getNotifications, getNumberTpl, getObjectDetailButtons, getObjectDetailButtonsSchemas, getObjectDetailMoreButtons, getObjectFieldsFilterBarSchema, getObjectFieldsFilterButtonSchema, getObjectFieldsFilterFormSchema, getObjectListHeader$1 as getObjectListHeader, getObjectListHeaderFieldsFilterBar, getObjectListHeaderFirstLine, getObjectListHeaderSecordLine, getObjectListViewButtonsSchemas, getObjectRecordDetailHeader, getObjectRecordDetailRelatedListButtonsSchemas, getObjectRecordDetailRelatedListHeader, getObjectRelated, getObjectRelatedList, getObjectRelatedListButtons, getObjectRelatedListHeader, getObjectRelatedListsMiniSchema, getPage, getPasswordTpl, getRecord, getRecordDetailHeaderSchema, getRecordDetailMiniSchema, getRecordDetailRelatedListSchema, getRecordDetailSchema, getRecordPageInitSchema, getRecordPermissions, getRecordServiceSchema, getRefObjectNameFieldName, getReferenceTo, getReferenceToFieldSchema, getReferenceToSync, getRelatedFieldTpl, getRelatedFieldValue, getRelatedListSchema, getRelatedsCount, getRootUrl, getSelectMap, getSelectTpl, getSelectUserSchema, getSpaceUsersPickerAmisSchema, getSpaceUsersPickerSchema, getSteedosAuth, getSwitchTpl, getTableSchema, getTenantId, getTimeTpl, getUISchema, getUISchemaSync$1 as getUISchemaSync, getUiFieldTpl, getUiFileSizeTpl, getUserId, getViewSchema, isExpression, isObject, lookupToAmis, lookupToAmisIdsPicker, lookupToAmisPicker, lookupToAmisSelect, lookupToAmisSelectUser, markReadAll, parseSingleExpression, registerRemoteAssets, registerRenders, setEnv, setEnvs, setRootUrl, setSteedosAuth, setUISchemaFunction, setVariable, standardButtonsTodo, uuidv4 };
+export { index as Field, Router, absoluteUrl, amisRender, amisRootClick, cloneObject, conditionsToFilters, createObject, defaultsDeep, deleteVariable, execute, executeButton, extendObject, fetchAPI, filtersToConditions, getAmisInputTableSchema, getApp, getApps, getAuthToken, getAuthorization, getButton, getButtonVisible, getButtonVisibleOn, getButtons, getCalendarSchema, getCreatedInfoTpl, getDateTimeTpl, getDateTpl, getDefaultRenderData, getEnv, getEnvs, getEvn, getField, getFieldTpl, getFileSrc, getFlowFormSchema, getFormPageInitSchema, getFormSchema, getGlobalNowData, getIdsPickerSchema, getImageSrc, getInstanceInfo, getListPageInitSchema, getListSchema, getListViewButtons, getListViewColumns, getListViewFilter, getListViewItemButtons, getListViewSort, getListviewInitSchema, getLocationTpl, getLookupSapceUserTreeSchema, getLookupTpl, getModifiedInfoTpl, getNameTpl, getNameTplUrl, getNotifications, getNumberTpl, getObjectDetailButtons, getObjectDetailButtonsSchemas, getObjectDetailMoreButtons, getObjectFieldsFilterBarSchema, getObjectFieldsFilterButtonSchema, getObjectFieldsFilterFormSchema, getObjectListHeader, getObjectListHeaderFieldsFilterBar, getObjectListHeaderFirstLine, getObjectListHeaderSecordLine, getObjectListViewButtonsSchemas, getObjectRecordDetailHeader, getObjectRecordDetailRelatedListButtonsSchemas, getObjectRecordDetailRelatedListHeader, getObjectRelated, getObjectRelatedList, getObjectRelatedListButtons, getObjectRelatedListHeader, getObjectRelatedListsMiniSchema, getPage, getPasswordTpl, getRecord, getRecordDetailHeaderSchema, getRecordDetailMiniSchema, getRecordDetailRelatedListSchema, getRecordDetailSchema, getRecordPageInitSchema, getRecordPermissions, getRecordServiceSchema, getRefObjectNameFieldName, getReferenceTo, getReferenceToFieldSchema, getReferenceToSync, getRelatedFieldTpl, getRelatedFieldValue, getRelatedListSchema, getRelatedsCount, getRootUrl, getSelectMap, getSelectTpl, getSelectUserSchema, getSpaceUsersPickerAmisSchema, getSpaceUsersPickerSchema, getSteedosAuth, getSwitchTpl, getTableSchema, getTenantId, getTimeTpl, getUISchema, getUISchemaSync$1 as getUISchemaSync, getUiFieldTpl, getUiFileSizeTpl, getUserId, getViewSchema, isExpression, isObject, lookupToAmis, lookupToAmisIdsPicker, lookupToAmisPicker, lookupToAmisSelect, lookupToAmisSelectUser, markReadAll, parseSingleExpression, registerRemoteAssets, registerRenders, setEnv, setEnvs, setRootUrl, setSteedosAuth, setUISchemaFunction, setVariable, standardButtonsTodo, uuidv4 };
 //# sourceMappingURL=index.esm.js.map