@steedos-widgets/amis-lib 6.3.13-beta.3 → 6.10.1-beta.11

package/dist/index.cjs.js

@@ -532,8 +532,8 @@ function getComparableAmisVersion() {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-23 09:53:08
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2025-04-08 10:55:41
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2024-11-17 13:10:08
  * @Description: 
  */
 
@@ -690,10 +690,9 @@ function getRelatedFieldTpl(field, ctx){
                 const href = Router.getObjectDetailPath({
                     formFactor: ctx.formFactor, appId: "${appId}", objectName: `${objectNameTpl}`, recordId: `${recordIdTpl}`
                 });
-                if (window.innerWidth >= 768) { //(ctx.isRelated || isObjectListview) && window.innerWidth >= 768
-                    // 相关表字段，包括列表视图、对象表格组件中的lookup/master_detail字段，在PC端显示时，点击字段值，不跳转到详情页而是右侧弹出drawer
+                if(ctx.isRelated && window.innerWidth >= 768){
                     labelTpl = `<a href="${href}" ${linkTarget} onclick="return false;">${labelTpl}</a>`;
-                } else {
+                }else {
                     labelTpl = `<a href="${href}" ${linkTarget}>${labelTpl}</a>`;
                 }
                 
@@ -1423,7 +1422,7 @@ const getAmisFileEditSchema = (steedosField)=>{
         receiver: {
             method: "post",
             dataType: "form-data",
-            url: `\${context.rootUrl}/s3/${tableName}`,
+            url: `\${context.rootUrl}/api/v6/files/cfs.${tableName}.filerecord`,
             requestAdaptor: `
                 const superData = (typeof context != 'undefined') ? context : api.body; 
                 const { _master, global } = superData;
@@ -1446,14 +1445,14 @@ const getAmisFileEditSchema = (steedosField)=>{
             adaptor: `
                 const superData = (typeof context != 'undefined') ? context : api.body; 
                 const { context:pageContext } = superData; 
-                var rootUrl = pageContext.rootUrl + "/api/files/${tableName}/";
+                var rootUrl = pageContext.rootUrl + "/api/v6/files/download/cfs.${tableName}.filerecord/";
                 payload = {
                     status: response.status == 200 ? 0 : response.status,
                     msg: response.statusText,
                     data: {
                         value: payload._id,
                         name: payload.original.name,
-                        url: rootUrl + payload._id,
+                        url: rootUrl + payload._id + "/" + payload.original.name,
                     }
                 }
                 return payload;
@@ -1924,12 +1923,7 @@ async function getQuickEditSchema(object, columnField, options){
     if (field.disabled) {
         quickEditSchema = false;
     } else {
-        var fieldCtx = Object.assign({}, ___namespace.omit(options, 'buttons'), {
-            defaults: Object.assign({}, options.defaults, {
-                formSchema: quickEditSchema
-            })
-        });
-        var fieldSchema = await convertSFieldToAmisField(field, false, fieldCtx);
+        var fieldSchema = await convertSFieldToAmisField(field, false, ___namespace.omit(options, 'buttons'));
         //存在属性上可编辑，实际不可编辑的字段，convertSFieldToAmisField函数可能会返回undefined，如summary
         if (!!fieldSchema) {
             quickEditSchema.body.push(fieldSchema);
@@ -2362,19 +2356,14 @@ function getFieldWidth(width){
 }
 
 async function getColumnItemOnClick(field, options){
-    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 recordPage = await getPage({ type: 'record', appId: options.appId, objectName: options.objectName, 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
-            "_tableObjectName": options.objectName
+            "recordId": `\${${options.idFieldName}}`//审批微页面依赖了作用域中的recordId
         }
     }) : {
         "type": "steedos-record-detail",
@@ -2385,16 +2374,12 @@ 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": {
@@ -2544,32 +2529,6 @@ 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';
@@ -2618,20 +2577,10 @@ async function getTableColumns(object, fields, options){
                     columnItem.defaultColor = null;
                 }
 
-                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){
+                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){
                     columnItem.onEvent = await getColumnItemOnClick(field, options);
                 }
+
             }
         }
         if(columnItem){
@@ -2898,7 +2847,9 @@ function getButtonVisibleOn$1(button){
         //     return 'false';
         // }
         if(visible.trim().startsWith('function')){
-            return `${visible}(objectName, typeof _id === 'undefined' ? null: _id, typeof record === 'undefined' ? (typeof recordPermissions === 'undefined' ? {} : recordPermissions) : record.recordPermissions, data)`
+            visible = visible.replace('function', 'function __visible');
+            const visibleStr = `(function _visible(){try{return (${visible})(objectName, typeof _id === 'undefined' ? null: _id, typeof record === 'undefined' ? (typeof recordPermissions === 'undefined' ? {} : recordPermissions) : record.recordPermissions, data)}catch(e){console.error(e)}})()`;
+            return visibleStr;
         }
         return visible;
     }
@@ -3287,7 +3238,7 @@ async function getTableApi(mainObject, fields, options){
             const refField = self.uiSchema.fields[relatedKey];
             const masterRecord = self._master.record;
             const masterObjectName = self._master.objectName;
-            let relatedValue = self._master.recordId;
+            let relatedValue = masterRecord._id;
             if(refField && refField.reference_to_field && refField.reference_to_field != '_id'){
                 relatedValue = masterRecord[refField.reference_to_field]
             }
@@ -3328,6 +3279,7 @@ async function getTableApi(mainObject, fields, options){
             skip: skip,
             fields: ${JSON.stringify(___namespace.map(fields, 'name'))}
         }));
+        // console.log('table requestAdaptor', api);
         return api;
     `;
     api.adaptor = `
@@ -3465,17 +3417,15 @@ async function getTableApi(mainObject, fields, options){
     }
     // 标记加载过，后续优先从本地存储中加载相关参数
     payload.data.loaded= true;
-
     const setDataToComponentId = "${setDataToComponentId}";
     if(setDataToComponentId){
         //https://github.com/baidu/amis/pull/6807 .parent的改动是为适应3.2getComponentById的规则改动，不影响2.9
-        var scope = SteedosUI.getRef(api.body.$self.$scopeId);
+        var scope = context._scoped;
         var scopeParent = scope && scope.parent;
         var setDataToComponent = scopeParent && scopeParent.getComponentById(setDataToComponentId);
         if(setDataToComponent){
             setDataToComponent.setData({$count: payload.data.count});
         }
-        // SteedosUI.getRef(api.body.$self.$scopeId)?.parent?.getComponentById(setDataToComponentId)?.setData({$count: payload.data.count})
     };
     let formFactor = "${options.formFactor}";
     if(formFactor !== "SMALL"){
@@ -3588,6 +3538,7 @@ function getReadonlyFormAdaptor(object, fields, options){
             payload.data.data = [emptyDoc];
         }
         else{
+            console.log('无法找到记录', api, payload, context)
             return {
                 status: 2,
                 msg: "${i18next__default["default"].t('frontend_no_records_found')}"
@@ -3614,13 +3565,12 @@ function getReadonlyFormAdaptor(object, fields, options){
             console.error(e)
         }
         payload.data = data;
-        payload.data.__objectName = "${object.name}";
         payload.data.record = record;
         payload.data.NAME_FIELD_VALUE = ${nameLabel} || record.name;
         payload.data._master = {
             record: record,
-            objectName: "${object.name}",
-            recordId: record._id
+            objectName: "\${objectName}",
+            recordId: "\${recordId}"
         }
         window.postMessage(Object.assign({type: "record.loaded"}, {record: record}), "*")
     }
@@ -4529,6 +4479,11 @@ var __assign = function() {
         return t;
     };
     return __assign.apply(this, arguments);
+};
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
 /**
@@ -5178,8 +5133,8 @@ const getSchema$4 = async (uiSchema, ctx) => {
 /*
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-03-22 09:31:21
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2025-04-07 16:02:53
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2024-02-18 16:06:21
  */
 const getSchema$3 = (uiSchema)=>{
     return {
@@ -5239,17 +5194,6 @@ 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}`
                             }
                           ]
                     }
@@ -5541,9 +5485,7 @@ const StandardButtons = {
                     objectName,
                     uiSchema
                 } = this;
-                const scopeId = this.scopeId || `amis-${appId}-${objectName}-listview`;
-                const scope = this.scope || SteedosUI?.getRef(scopeId);
-                //https://github.com/baidu/amis/pull/6807 .parent的改动是为适应3.2getComponentById的规则改动，不影响2.9
+                const scope = this.scope;
                 const listViewRef = scope.parent?.getComponentById(`listview_${uiSchema.name}`);
                 if(_.isEmpty(listViewRef.props.store.toJSON().selectedItems)){
                     listViewRef.handleAction({}, {
@@ -5606,9 +5548,9 @@ function getButtonVisibleOn(button){
         //     return 'false';
         // }
         if(visible.trim().startsWith('function')){
-            visible = `${visible}.apply({
+            visible = `(function(){try{const fun = ${visible}; return fun.apply({
                 object: uiSchema
-            }, [objectName, typeof _id === 'undefined' ? null: _id, typeof record === 'undefined' ? (typeof recordPermissions === 'undefined' ? {} : recordPermissions) : record.recordPermissions, data])`;
+            }, [objectName, typeof _id === 'undefined' ? null: _id, typeof record === 'undefined' ? (typeof recordPermissions === 'undefined' ? {} : recordPermissions) : record.recordPermissions, data])}catch(e){console.error(e)}})()`;
         }
     }
 
@@ -5906,7 +5848,7 @@ const execute = (button, props) => {
             ...props,
             action: button
         };
-        return button.todo.apply(todoThis, [todoThis.objectName, todoThis.recordId]);
+        return button.todo.apply(todoThis, [todoThis.objectName, todoThis.recordId, props.record?.record?.recordPermissions, props.record]);
     }
 };
 
@@ -6403,21 +6345,6 @@ 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};
@@ -6455,16 +6382,6 @@ 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 });
     }
@@ -6756,15 +6673,13 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
                                       "actionType": "custom",
                                       "script": onSearchableFieldsChangeScript
                                     },
-                                    // 自动触发搜索事件会造成bug，应该是升级amis到6.4造成的，见：https://github.com/steedos/steedos-platform/issues/7121
-                                    // 变更搜索项后，用户一般会点击搜索按钮，所以这里不自动触发搜索事件
-                                    // {
-                                    //   "actionType": "click",
-                                    //   "componentId": btnSearchId,
-                                    //   "args": {
-                                    //     "__from_fields_filter_settings_confirm": true
-                                    //   }
-                                    // },
+                                    {
+                                      "actionType": "click",
+                                      "componentId": btnSearchId,
+                                      "args": {
+                                        "__from_fields_filter_settings_confirm": true
+                                      }
+                                    },
                                     {
                                       "componentId": "",
                                       "args": {},
@@ -6875,6 +6790,10 @@ const getNewListviewButtonSchema = ()=>{
                                 "blank": false
                               },
                               "actionType": "url",
+                            },
+                            {
+                              "actionType": "custom",
+                              "script": "window.location.reload();"
                             }
                           ]
                         }
@@ -7744,6 +7663,7 @@ function getObjectListHeader(objectSchema, listViewName, ctx) {
     "body": body,
     "className": `sm:rounded-tl sm:rounded-tr p-4 -mb-4`
   }];
+  // console.log(`getObjectListHeader`, objectSchema, listViewName, ctx)
   return headerSchema;
 }
 
@@ -7765,7 +7685,7 @@ function getBackButtonSchema(){
     },
     "body":[{
       "type": "button",
-      "visibleOn": "${window:innerWidth > 768 && (window:historyPaths.length > 1 || window:historyPaths[0].params.record_id) && display !== 'split'}",
+      "visibleOn": "${window:innerWidth > 768 && display !== 'split'}",
       "className":"flex mr-4",
       "onEvent": {
           "click": {
@@ -7836,12 +7756,12 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
   );
 
   let backButtonsSchema = null;
-
+  
   if(options.showBackButton != false){
     backButtonsSchema = getBackButtonSchema();
   }
 
-  // console.log(`getObjectRecordDetailHeader==>`, amisButtonsSchema)
+  console.log(`getObjectRecordDetailHeader==> backButtonsSchema`, backButtonsSchema);
   
   const reg = new RegExp('_', 'g');
   const standardIcon = icon && icon.replace(reg, '-');
@@ -8081,7 +8001,7 @@ async function getObjectRecordDetailRelatedListHeader(relatedObjectSchema, relat
                     "body": [
                       {
                         "type": "tpl",
-                        "tpl": `<a class="text-black text-base font-bold hover:font-bold" href="/app/\${appId}/\${_master.objectName}/\${_master.recordId}/\${objectName}/grid?related_field_name=\${relatedKey}">${relatedLabel}(\${$count})</a>`,
+                        "tpl": `<a class="text-black text-base font-bold hover:font-bold" href="/app/\${appId}/\${_master.objectName}/\${_master.record._id}/\${objectName}/grid?related_field_name=\${relatedKey}">${relatedLabel}(\${$count})</a>`,
                         "inline": false,
                         "wrapperComponent": "",
                         "className": "",
@@ -8178,6 +8098,10 @@ const getCopyListviewButtonSchema = ()=>{
                                 "blank": false
                               },
                               "actionType": "url",
+                            },
+                            {
+                              "actionType": "custom",
+                              "script": "window.location.reload();"
                             }
                           ]
                         }
@@ -8345,6 +8269,10 @@ const getRenameListviewButtonSchema = ()=>{
                               },
                               "actionType": "url",
                             },
+                            {
+                              "actionType": "custom",
+                              "script": "window.location.reload();"
+                            }
                           ]
                         }
                       }
@@ -8471,11 +8399,8 @@ const getSetListviewFiltersButtonSchema = ()=>{
                           "weight": 0,
                           "actions": [
                             {
-                              "args": {
-                                "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${listName}",
-                                "blank": false
-                              },
-                              "actionType": "url",
+                              "actionType": "custom",
+                              "script": "window.location.reload(); //doAction({'actionType': 'rebuild', 'componentId': `service_listview_${event.data.targetObjectName}`})"
                             }
                           ]
                         }
@@ -8625,11 +8550,8 @@ const getSetListviewColumnsButtonSchema = ()=>{
                           "weight": 0,
                           "actions": [
                             {
-                              "args": {
-                                "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${listName}",
-                                "blank": false
-                              },
-                              "actionType": "url"
+                              "actionType": "custom",
+                              "script": "window.location.reload(); //doAction({'actionType': 'rebuild', 'componentId': `service_listview_${event.data.targetObjectName}`})"
                             }
                           ]
                         }
@@ -8778,11 +8700,8 @@ const getSetListviewSortButtonSchema = ()=>{
                           "weight": 0,
                           "actions": [
                             {
-                              "args": {
-                                "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${listName}",
-                                "blank": false
-                              },
-                              "actionType": "url"
+                              "actionType": "custom",
+                              "script": "window.location.reload(); //doAction({'actionType': 'rebuild', 'componentId': `service_listview_${event.data.targetObjectName}`})"
                             }
                           ]
                         }
@@ -8903,6 +8822,10 @@ const getDeleteListviewButtonSchema = ()=>{
                   "blank": false
                 },
                 "expression": "data.delete == 1"
+              },
+              {
+                "actionType": "custom",
+                "script": "window.location.reload();"
               }
             ]
           }
@@ -9772,12 +9695,12 @@ async function getObjectCRUD(objectSchema, fields, options){
           payload.status = 2;
           payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
       }
-      var scope = SteedosUI.getRef(context.scopeId);
-      var scopeParent = scope && scope.parent;
-      var crudScoped = scopeParent.getComponentById('${body.id}');
-      setTimeout(()=>{
-        crudScoped && crudScoped.control.updateAutoFillHeight();
-      }, 500);
+      // var scope = SteedosUI.getRef(context.scopeId);
+      // var scopeParent = scope && scope.parent;
+      // var crudScoped = scopeParent.getComponentById('${body.id}');
+      // setTimeout(()=>{
+      //   crudScoped && crudScoped.control.updateAutoFillHeight();
+      // }, 500);
       return payload;
     `;
 
@@ -9984,17 +9907,6 @@ 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",
@@ -10098,7 +10010,7 @@ async function getObjectDetail(objectSchema, recordId, ctx){
     }
 
     amisSchema.body[0].body = await getFormSchemaWithDataFilter(amisSchema.body[0].body, { formDataFilter, onFormDataFilter, amisData, env });
-    // console.log('getObjectDetail=====>', amisSchema);
+    // console.log('getObjectDetail=====>', amisSchema, objectSchema, recordId, ctx);
     return amisSchema;
 }
 
@@ -10596,8 +10508,8 @@ async function getObjectRelatedListsMiniSchema(objectApiName){
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-04-26 16:46:44
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2025-03-07 16:48:27
  * @Description:
  */
 
@@ -10706,7 +10618,7 @@ function formatUISchemaCache(objectName, uiSchema){
     });
 }
 
-async function getUISchema(objectName, force) {
+async function getUISchema(objectName, force, retry = true) {
     if (!objectName) {
         return;
     }
@@ -10722,7 +10634,13 @@ async function getUISchema(objectName, force) {
             const url = `/service/api/@${objectName.replace(/\./g, "_")}/uiSchema`;
             uiSchema = await fetchAPI(url, { method: "get" });
         }
-        if(!uiSchema){
+
+        if(!uiSchema && retry){
+            await new Promise(resolve => setTimeout(resolve, 3000));
+            return getUISchema(objectName, force, false);
+        }
+
+        if(!uiSchema && retry == false){
             return ;
         }
         formatUISchemaCache(objectName, uiSchema);
@@ -10733,7 +10651,16 @@ async function getUISchema(objectName, force) {
     return getUISchemaCache(objectName);
 }
 
-function getUISchemaSync$1(objectName, force) {
+// 阻塞等待函数，单位毫秒
+function wait(milliseconds) {
+    const start = new Date().getTime();
+    let now = start;
+    while (now - start < milliseconds) {
+        now = new Date().getTime();
+    }
+}
+
+function getUISchemaSync$1(objectName, force, retry = true) {
     if (!objectName) {
         return;
     }
@@ -10749,7 +10676,12 @@ function getUISchemaSync$1(objectName, force) {
             async: false,
         });
 
-        if(!uiSchema){
+        if(!uiSchema && retry){
+            wait(2000); // 阻塞等待3秒
+            return getUISchemaSync$1(objectName, force, false)
+        }
+
+        if(!uiSchema && retry == false){
             return ;
         }
         formatUISchemaCache(objectName, uiSchema);
@@ -10794,6 +10726,7 @@ async function getListSchema(
     listViewName,
     ctx = {}
 ) {
+    // console.log('getListSchema', objectName, listView, ctx)
     const uiSchema = await getUISchema(objectName);
     if(!uiSchema){
         return {}
@@ -10824,6 +10757,7 @@ async function getListSchema(
     }
 
     let listViewColumns = getListViewColumns(listView, ctx.formFactor);
+    // console.log('getListSchema listViewColumns', objectName, listView, listViewColumns)
     let sort = getListViewSort(listView);
     let listviewFilter = getListViewFilter(listView);
     let listview_filters = listView && listView._filters;
@@ -11030,7 +10964,7 @@ async function getTableSchema(
     columns,
     ctx = {}
 ) {
-    // console.time('getTableSchema', columns);
+    // console.log('getTableSchema', columns);
     const uiSchema = await getUISchema(objectName);
 
     let sort = ctx.sort;
@@ -11064,7 +10998,7 @@ async function getTableSchema(
     };
     crudOptions.amisData = createObject(ctx.amisData || {}, {});
     const amisSchema = await getObjectCRUD(uiSchema, fields, crudOptions);
-    // console.timeEnd('getTableSchema');
+    // console.log('getTableSchema', amisSchema, uiSchema);
     return {
         uiSchema,
         amisSchema,
@@ -11101,8 +11035,7 @@ 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'),
@@ -11141,21 +11074,6 @@ 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,
@@ -11171,7 +11089,7 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
                     "showButtons": props.showButtons,
                     "showBackButton": props.showBackButton,
                 },
-                ...contents,
+                content
             ],
             "objectApiName": "${objectName}",
             "recordId": "${recordId}",
@@ -11955,42 +11873,14 @@ 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 treeFilterFormValues={
+                var filterFormValues={
                     "__searchable__organizations_parents":event.data.value.value
                 }
-                // 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";
+                var listView = scope.parent.getComponents().find(function(n){
+                  return n.props.type === "crud";
                 });
-                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);
+                listView.handleFilterSubmit(Object.assign({}, filterFormValues));
               `
               },
               {
@@ -12208,7 +12098,6 @@ 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;
@@ -12251,20 +12140,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
             }
         }
 
-        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)) || [];
+        var searchableFilter = SteedosUI.getSearchFilter(selfData) || [];
 
         if(searchableFilter.length > 0){
             if(filters.length > 0 ){
@@ -12454,7 +12330,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
         return payload;
         `;
     }
-    let top = 500;
+    let top = 20;
 
     if(refObjectConfig.paging && refObjectConfig.paging.enabled === false){
         top = 1000;
@@ -12504,8 +12380,7 @@ 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,
-                filter_form_data: field.filter_form_data
+                show_left_filter: field.show_left_filter
             });
         }
         pickerSchema.data = Object.assign({}, pickerSchema.data, {
@@ -12572,7 +12447,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
                     }
                     
                     const ctx = ${JSON.stringify(ctx)};
-                    const componentId = ctx.defaults && ctx.defaults.formSchema && ctx.defaults.formSchema.id;
+                    const componentId = ctx.defaults.formSchema.id;
                     doAction({
                         actionType: 'setValue',
                         componentId: componentId, 
@@ -12999,10 +12874,6 @@ 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) {
@@ -14134,16 +14005,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             return  convertData
         }
         // if(ctx.mode === 'edit'){
-        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});
-        }
+        let 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 = "";