@steedos-widgets/amis-lib 1.2.8 → 1.2.9

package/dist/index.esm.js

@@ -1,5 +1,5 @@
 import * as _$1 from 'lodash';
-import ___default, { isEmpty, isArray, each, find, endsWith, cloneDeep, includes, get, map, toArray, mergeWith, forEach, isBoolean, omitBy, isNil, isString, union, has, slice, defaultsDeep as defaultsDeep$1, isObject as isObject$1, filter, startsWith } from 'lodash';
+import ___default, { isEmpty, isArray, each, find, endsWith, cloneDeep, includes, get, toArray, mergeWith, map, forEach, isBoolean, omitBy, isNil, isString, union, has, slice, defaultsDeep as defaultsDeep$1, isObject as isObject$1, filter, startsWith } from 'lodash';
 import { Router as Router$1, getSteedosAuth as getSteedosAuth$1, lookupToAmis as lookupToAmis$1, fetchAPI as fetchAPI$1 } from '@steedos-widgets/amis-lib';
 import isPlainObject from 'lodash/isPlainObject';
 
@@ -2238,7 +2238,7 @@ const getListViewItemButtons = async (uiSchema, ctx)=>{
     return listButtons;
 };
 
-const getObjectRelatedListButtons = async (uiSchema, ctx)=>{
+const getObjectRelatedListButtons = (uiSchema, ctx)=>{
     // const buttons = getButtons(uiSchema, ctx);
     // const relatedListButtons = _.filter(buttons, (button) => {
     //     if(button.objectName === 'cms_files'){
@@ -2525,6 +2525,67 @@ const getObjectListViewButtonsSchemas = (objectSchema, ctx)=>{
     }
 };
 
+const getObjectRecordDetailRelatedListButtonsSchemas = (objectSchema, ctx)=>{
+    const buttons = getObjectRelatedListButtons(objectSchema, ctx);
+    if(ctx.formFactor === 'SMALL'){
+        return {
+            "type": "button",
+            "icon": "fa fa-angle-down",
+            "onEvent": {
+              "click": {
+                "actions": [
+                  {
+                    "actionType": "drawer",
+                    "drawer": {
+                      "type": "drawer",
+                      "title": "操作",
+                      "body": [
+                        {
+                          "type": "button-group",
+                          "vertical": true,
+                          "tiled": true,
+                          "buttons": [
+                            ...___default.map(buttons, (button)=>{
+                                return {
+                                    type: 'steedos-object-button',
+                                    name: button.name,
+                                    objectName: button.objectName,
+                                    visibleOn: getButtonVisibleOn$1(button),
+                                    className: `button_${button.name} w-full`
+                                }
+                            })
+                          ],
+                          "btnLevel": "enhance",
+                          "className": "w-full",
+                          "btnClassName": "w-full",
+                          "size": "lg"
+                        }
+                      ],
+                      "position": "bottom",
+                      "closeOnOutside": true,
+                      "resizable": false,
+                      "className": "buttons-drawer",
+                      "bodyClassName": "m-none p-none",
+                      "actions": []
+                    }
+                  }
+                ]
+              }
+            }
+          }
+    }else {
+        return ___default.map(buttons, (button) => {
+            return {
+                type: 'steedos-object-button',
+                name: button.name,
+                objectName: button.objectName,
+                visibleOn: getButtonVisibleOn$1(button),
+                className: `button_${button.name}`
+            }
+        });
+    }
+};
+
 async function getObjectFieldsFilterButtonSchema(objectSchema) {
   // const amisListViewId = `listview_${objectSchema.name}`;
   return {
@@ -2577,11 +2638,11 @@ async function getObjectFieldsFilterFormSchema(ctx) {
               payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
           }
           const selfData = api.body.$self;
-          const filterFormSearchableFields = selfData.filterFormSearchableFields;
           const uiSchema = selfData.uiSchema;
           const fields = uiSchema.fields;
-          const searchableFields = [];
-
+          const filterFormSearchableFields = (selfData.filterFormSearchableFields || []).filter(function(item){
+            return !!fields[item]
+          });
           const resolveAll = function(values){
             payload.data = {
               "body": values
@@ -2596,21 +2657,7 @@ async function getObjectFieldsFilterFormSchema(ctx) {
           return Promise.all(filterFormSearchableFields.map(function (item) {
             const field = _.clone(fields[item]);
             if (
-              field && !_.includes(
-                [
-                  "grid",
-                  "avatar",
-                  "image",
-                  "object",
-                  "[object]",
-                  "[Object]",
-                  "[grid]",
-                  "[text]",
-                  "audio",
-                  "file",
-                ],
-                field.type
-              )
+              field && window.isFieldTypeSearchable(field.type)
             ) {
               delete field.defaultValue;
               delete field.required;
@@ -2707,6 +2754,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
         }
       }
     }
+    filterForm.reset();
     listView.handleFilterSubmit(removedValues);
     const filterService = filterForm.context.getComponents().find(function(n){
       return n.props.type === "service";
@@ -2969,9 +3017,27 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
                                     "headers": {
                                       "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                     },
-                                    "data": null,
+                                    "data": {
+                                      "$self": "$$"
+                                    },
                                     "requestAdaptor": "",
-                                    "adaptor": ""
+                                    "adaptor": `
+                                      if(payload.errors){
+                                          payload.status = 2;
+                                          payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
+                                      }
+                                      const selfData = api.body.$self;
+                                      const uiSchema = selfData.uiSchema;
+                                      const fields = uiSchema.fields;
+                                      const options = (payload.data?.options || []).filter(function(item){
+                                        let field = fields[item.value];
+                                        return !!field && window.isFieldTypeSearchable(field.type)
+                                      });
+                                      payload.data = {
+                                        "options": options
+                                      };
+                                      return payload;
+                                    `
                                   },
                                   "options": [],
                                   "required": true,
@@ -3134,6 +3200,7 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
                     "rightIcon": "fa fa-caret-down",
                     "size": "sm",
                     "hideCaret": true,
+                    "closeOnClick": true,
                     "btnClassName": "!bg-transparent !border-none !hover:border-none text-lg h-5 font-bold p-0 text-black leading-none",
                     "buttons": listViewButtonOptions
                   }
@@ -3318,12 +3385,47 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
           "type": "grid",
           "columns": [
             {
-              "body": {
+              "body": [{
+                "type": "service",
+                "onEvent": {
+                    "@history_paths.changed": {
+                        "actions": [
+                            {
+                                "actionType": "reload"
+                            }
+                        ]
+                    }
+                },
+                "body":[{
+                  "type": "button",
+                  "visibleOn": "${window:innerWidth > 768 && window:historyPaths.length > 1}",
+                  "className":"flex mr-2",
+                  "onEvent": {
+                      "click": {
+                          "actions": [
+                              {
+                                  "actionType": "custom",
+                                  "script": "Steedos.goBack()"
+                              }
+                          ]
+                      }
+                  },
+                  "body": [
+                      {
+                          "type": "steedos-icon",
+                          "category": "utility",
+                          "name": "back",
+                          "colorVariant": "default",
+                          "className": "slds-button_icon slds-global-header__icon"
+                      }
+                  ]
+                }]
+              },{
                 "type": "tpl",
                 "className": "block",
                 // "tpl": `<img class='slds-icon slds-icon_container slds-icon-standard-${standardIcon}' src='\${context.rootUrl}/unpkg.com/@salesforce-ux/design-system/assets/icons/standard/${icon}.svg'>`
                 "tpl":`<svg class="slds-icon slds-icon_container slds-icon-standard-${standardIcon} slds-page-header__icon" aria-hidden="true"><use xlink:href="/assets/icons/standard-sprite/svg/symbols.svg#${icon}"></use></svg>`
-              },
+              }],
               "md": "auto",
               "className": "",
               "columnClassName": "flex justify-center items-center"
@@ -3410,18 +3512,9 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
  * @param {*} relatedObjectSchema 相关对象UISchema
  * @returns amisSchema
  */
-async function getObjectRecordDetailRelatedListHeader(relatedObjectSchema, relatedLabel) {
+async function getObjectRecordDetailRelatedListHeader(relatedObjectSchema, relatedLabel, ctx) {
   const { icon, label } = relatedObjectSchema;
-  const buttons = await getObjectRelatedListButtons(relatedObjectSchema, {});
-  let amisButtonsSchema = map(buttons, (button) => {
-    return {
-      type: 'steedos-object-button',
-      name: button.name,
-      objectName: button.objectName,
-      visibleOn: getButtonVisibleOn$1(button),
-      className: `button_${button.name}`
-    }
-  });
+  let amisButtonsSchema = getObjectRecordDetailRelatedListButtonsSchemas(relatedObjectSchema, {formFactor: ctx.formFactor});
   const reg = new RegExp('_', 'g');
   const standardIcon = icon && icon.replace(reg, '-');
   const recordRelatedListHeader = {
@@ -3494,83 +3587,44 @@ async function getObjectRecordDetailRelatedListHeader(relatedObjectSchema, relat
 async function getObjectRelatedListHeader(objectSchema, recordId, relatedObjectName) {
 }
 
-const getDisplayAsButton = function(objectName, showDisplayAs){
-  let displayAs = Router$1.getTabDisplayAs(objectName);
-  let buttons = [
-    {
-      "type": "button",
-      "label": "表格",
-      "onClick": "let url = document.location.pathname; var urlSearch = new URLSearchParams(document.location.search); if(urlSearch.get(\"side_object\") && urlSearch.get(\"side_listview_id\")){url=`/app/${props.data.appId}/${urlSearch.get(\"side_object\")}/grid/${urlSearch.get(\"side_listview_id\")}`;}; props.env.jumpTo(url + '?display=grid');",
-      "rightIcon": displayAs != 'split' ? "fa fa-check" : null,
-      "rightIconClassName": "m-l-sm"
-    },
-    {
-      "type": "button",
-      "label": "分栏视图",
-      "onClick": "const url = document.location.pathname + '?display=split'; props.env.jumpTo(url);",
-      "rightIcon": displayAs === 'split' ? "fa fa-check" : null,
-      "rightIconClassName": "m-l-sm"
+const getExportExcelToolbarButtonSchema = ()=>{
+    return {
+        "type": "button",
+        "icon": "fa fa-download",
+        "align": "right", 
+        "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+        "tooltipPlacement": "bottom",
+        "visibleOn": "${!isLookup && global.user.is_space_admin}",
+        "tooltip": "导出Excel",
+        "onEvent": {
+          "click": { 
+            "weight": 0,
+            "actions": [
+              {
+                "args": {
+                  "api": {
+                    "url": "${context.rootUrl}/api/record/export/${objectName}",
+                    "method": "get",
+                    "messages": {},
+                    "requestAdaptor": `${requestAdaptor$1()}`,
+                    "data": {
+                      "uiSchema": "${uiSchema}",
+                      "listName": "${listName}"
+                    },
+                    "headers": {
+                      "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                    }
+                  }
+                },
+                "actionType": "download"
+              }
+            ]
+          }
+        }
     }
-  ];
-  return {
-    "type": "dropdown-button",
-    "icon": "fa fa-table-columns",
-    "btnClassName": "antd-Button--iconOnly bg-white p-2 rounded border-gray-300 text-gray-500",
-    "align": "right",
-    "visibleOn": "${window:innerWidth > 768 && !!!isLookup}",
-    "buttons": [ 
-      {
-        "label": "显示为",
-        "children": buttons
-      }
-    ]
-  };
 };
 
-
-
-
-const onFieldsFilterToggleScript = `
-const scope = event.context.scoped;
-const filterForm = scope.getComponents().find(function(n){
-  return n.props.type === "form";
-});
-const filterService = filterForm.context.getComponents().find(function(n){
-  return n.props.type === "service";
-});
-// filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsFilter});
-let resizeWindow = function(){
-  //触发amis crud 高度重算
-  setTimeout(()=>{
-    window.dispatchEvent(new Event("resize"))
-  }, 500);
-}
-let isMobile = Steedos.isMobile();
-if(filterService.props.data.showFieldsFilter){
-  if(isMobile){
-    // 手机上只能通过取消按钮来关闭搜索栏
-    return;
-  }
-  let buttonCancel = SteedosUI.getClosestAmisComponentByType(filterForm.context, "button", { 
-    direction: "down", 
-    name: "btn_filter_form_cancel" 
-  });
-  buttonCancel.props.dispatchEvent('click', {}).then(function(){
-    resizeWindow();
-  });
-}
-else{
-  filterService.setData({showFieldsFilter: true});
-  resizeWindow();
-  if(isMobile){
-    // 手机端在显示搜索栏时隐藏刷新按钮
-    let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
-    crudService && crudService.setData({showFieldsFilter: true});
-  }
-}
-`;
-
-function getExportApiRequestAdaptorScript(){
+function requestAdaptor$1(){
   return `
     // 获取列表视图的属性
     let uiSchema = api.body.uiSchema;
@@ -3624,667 +3678,1101 @@ function getExportApiRequestAdaptorScript(){
   `
 }
 
-function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false, hiddenCount = false, headerToolbarItems, filterVisible = true} = {}){
-  // console.log(`getObjectHeaderToolbar====>`, filterVisible)
-  const isMobile = window.innerWidth < 768;
-  if(isMobile){
-    showDisplayAs = false;
-  }
-  if(formFactor === 'SMALL'){
-    const onReloadScript = `
-      const scope = event.context.scoped;
-      var listView = scope.parent.getComponents().find(function(n){
-        return n.props.type === "crud";
-      });
-      listView.handleChangePage(1);
-    `;
-    return [
-      // "bulkActions",
-      ...(headerToolbarItems || []),
-      hiddenCount ? {} :{
-        "type": "tpl",
-        "tpl": "${count} 个项目"
-      },
-      {
-        // "type": "reload",//不可以直接使用reload，因为它不会设置页码到第一页
+const getNewListviewButtonSchema = ()=>{
+    return {
         "type": "button",
-        "align": "right",
-        "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
-        "label": "",
-        "icon": "fa fa-sync",
-        "visibleOn": "${!showFieldsFilter}",
+        "label": "新建",
         "onEvent": {
           "click": {
+            "weight": 0,
             "actions": [
               {
-                "actionType": "custom",
-                "script": onReloadScript
+                "dialog": {
+                  "type": "dialog",
+                  "title": "新建 列表视图",
+                  "data": {
+                    "&": "$$",
+                    "all": "${uiSchema.list_views.all}",
+                    "list_view": "${uiSchema.list_views[listName]}",
+                    "appId": "${appId}",
+                    "global": "${global}",
+                    "targetObjectName": "${objectName}",
+                  },
+                  "body": [
+                    {
+                      "type": "steedos-object-form",
+                      "label": "对象表单",
+                      "objectApiName": "object_listviews",
+                      "recordId": "",
+                      "mode": "edit",
+                      "defaultData": {
+                        "&": "${list_view}",
+                        "name":"",
+                        "label":"",
+                        "filters":"",
+                        "shared":false
+                      },
+                      "fieldsExtend": fieldsExtend$4(),
+                      "fields": fields$1(),
+                      "onEvent": {
+                        "submitSucc": {
+                          "weight": 0,
+                          "actions": [
+                            {
+                              "args": {
+                                // 直接使用recordId不能拿到数据，只能通过result里面拿数据
+                                "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/listview_${result.data.recordId|lowerCase}",
+                                "blank": false
+                              },
+                              "actionType": "url",
+                            }
+                          ]
+                        }
+                      },
+                      "messages": {
+                        "success": "成功",
+                        "failed": "失败"
+                      },
+                    }
+                  ],
+                  "showCloseButton": true,
+                  "showErrorMsg": true,
+                  "showLoading": true,
+                  "closeOnEsc": false,
+                  "dataMapSwitch": false,
+                  "size": "lg"
+                },
+                "actionType": "dialog"
               }
             ]
           }
-        },
-      },
-      filterVisible ? {
-        "label": "",
-        "icon": "fa fa-search",
-        "type": "button",
-        "badge": {
-          "offsetx": [
-            -2,
-            2
-          ],
-          "size":8,
-          "animation": true,
-          "visibleOn": "${isFieldsFilterEmpty == false}"
-        },
-        "align": "right",
-        "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+        }
+    }
+};
+
+function fields$1(){
+  return [
+    "label",
+    "name",
+    "object_name",
+    "filter_scope",
+    "show_count",
+    "columns.$.field",
+    "columns.$.width",
+    "sort.$.field_name",
+    "sort.$.order",
+    "filters",
+    "mobile_columns.$.field",
+    "searchable_fields.$.field",
+    "is_system",
+    "shared"
+  ]
+}
+
+function fieldsExtend$4(){
+  return {
+    "label": {
+      "is_wide": true
+    },
+    "name": {
+      "amis": {
+        "hidden": true
+      }
+    },
+    "object_name": {
+      "amis": {
+        "hidden": true
+      }
+    },
+    "filter_scope": {
+      "amis": {
+        "hidden": true
+      }
+    },
+    "columns": {
+      "amis": {
+        "hidden": true
+      }
+    },
+    "filter_fields": {
+      "amis": {
+        "hidden": true
+      }
+    },
+    "scrolling_mode": {
+      "amis": {
+        "hidden": true
+      }
+    },
+    "sort": {
+      "amis": {
+        "hidden": true
+      }
+    },
+    "show_count": {
+      "amis": {
+        "hidden": true
+      }
+    },
+    "type": {
+      "amis": {
+        "hidden": true
+      }
+    },
+    "shared": {
+      "amis": {
+        "visibleOn": "${global.user.is_space_admin}"
+      }
+    }
+  }
+}
+
+const getCopyListviewButtonSchema = ()=>{
+    return {
+        "type": "button",
+        "label": "复制",
         "onEvent": {
           "click": {
+            "weight": 0,
             "actions": [
               {
-                "actionType": "custom",
-                "script": onFieldsFilterToggleScript
+                "dialog": {
+                  "type": "dialog",
+                  "title": "复制 列表视图",
+                  "data": {
+                    "&": "$$",
+                    "listName": "${listName}",
+                    "targetObjectName": "${objectName}",
+                    "list_view": "${uiSchema.list_views[listName]}",
+                    "appId": "${appId}",
+                    "global": "${global}"
+                  },
+                  "body": [
+                    {
+                      "type": "steedos-object-form",
+                      "label": "对象表单",
+                      "objectApiName": "object_listviews",
+                      "recordId": "",
+                      "mode": "edit",
+                      "defaultData": {
+                        "&": "${list_view}",
+                        "name":"",
+                        "label": "${list_view.label} 的副本",
+                        "shared":false
+                      },
+                      "fieldsExtend": fieldsExtend$3(),
+                      "fields": fields(),
+                      "onEvent": {
+                        "submitSucc": {
+                          "weight": 0,
+                          "actions": [
+                            {
+                              "args": {
+                                "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/listview_${result.data.recordId|lowerCase}",
+                                "blank": false
+                              },
+                              "actionType": "url",
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  ],
+                  "showCloseButton": true,
+                  "showErrorMsg": true,
+                  "showLoading": true,
+                  "closeOnEsc": false,
+                  "dataMapSwitch": false,
+                  "size": "lg"
+                },
+                "actionType": "dialog"
               }
             ]
           }
         }
-      } : {},
-      getDisplayAsButton(mainObject?.name)
+    }
+};
+
+function fields(){
+  return [
+    "label",
+    "name",
+    "object_name",
+    "filter_scope",
+    "show_count",
+    "columns.$.field",
+    "columns.$.width",
+    "sort.$.field_name",
+    "sort.$.order",
+    "filters",
+    "mobile_columns.$.field",
+    "searchable_fields.$.field",
+    "is_system",
+    "shared"
   ]
-  }else {
-    return [
-      // "filter-toggler",
-      ...(headerToolbarItems || []),
-      "bulkActions",
-      {
-        "type": "columns-toggler",
-        "className": "hidden"
-      },
-      // {
-      //     "type": "columns-toggler",
-      //     "className": "mr-2"
-      // },
-      hiddenCount ? {} : {
-        "type": "tpl",
-        "tpl":  "${count} 个项目"
-      },
-      {
-        "type": "reload",
-        "align": "right",
-        "tooltipPlacement": "bottom",
-        "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
-      },
-      {
+}
+
+function fieldsExtend$3(){
+  return {
+    "label": {
+      "is_wide": true
+    },
+    "name": {
+      "is_wide": true,
+      "amis": {
+        "hidden": true
+      }
+    },
+    "object_name": {
+      "amis": {
+        "hidden": true
+      }
+    },
+    "filter_scope": {
+      "amis": {
+        "hidden": true
+      }
+    },
+    "columns": {
+      "amis": {
+        "hidden": true
+      }
+    },
+    "filter_fields": {
+      "amis": {
+        "hidden": true
+      }
+    },
+    "scrolling_mode": {
+      "amis": {
+        "hidden": true
+      }
+    },
+    "sort": {
+      "amis": {
+        "hidden": true
+      }
+    },
+    "show_count": {
+      "amis": {
+        "hidden": true
+      }
+    },
+    "type": {
+      "amis": {
+        "hidden": true
+      }
+    },
+    "shared": {
+      "amis": {
+        "visibleOn": "${global.user.is_space_admin}"
+      }
+    }
+  }
+}
+
+const getRenameListviewButtonSchema = ()=>{
+    return {
         "type": "button",
-        "label": "",
-        "icon": "fa fa-download",
-        "align": "right", 
-        "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
-        "tooltipPlacement": "bottom",
-        "visibleOn": "${!isLookup && global.user.is_space_admin}",
-        "tooltip": "导出Excel",
+        "label": "重命名",
+        "disabledOn": "!((global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && !!uiSchema.list_views[listName].owner)",
         "onEvent": {
           "click": {
             "weight": 0,
             "actions": [
               {
-                "args": {
-                  "api": {
-                    "url": "${context.rootUrl}/api/record/export/${objectName}",
-                    "method": "get",
-                    "messages": {},
-                    "requestAdaptor": `${getExportApiRequestAdaptorScript()}`,
-                    "data": {
-                      "uiSchema": "${uiSchema}",
-                      "listName": "${listName}"
-                    },
-                    "headers": {
-                      "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                "dialog": {
+                  "type": "dialog",
+                  "title": "重命名 列表视图",
+                  "data": {
+                    "targetObjectName": "${objectName}",
+                    "recordId": "${uiSchema.list_views[listName]._id}",
+                    "appId": "${appId}"
+                  },
+                  "body": [
+                    {
+                      "type": "steedos-object-form",
+                      "label": "对象表单",
+                      "objectApiName": "object_listviews",
+                      "recordId": "${recordId}",
+                      "mode": "edit",
+                      "fields": [
+                        "label"
+                      ],
+                      "fieldsExtend": "{\n  \"label\":{\n    \"is_wide\": true\n  }\n}",
+                      "onEvent": {
+                        "submitSucc": {
+                          "weight": 0,
+                          "actions": [
+                            {
+                              "args": {
+                                "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${name}",
+                                "blank": false
+                              },
+                              "actionType": "url",
+                            },
+                          ]
+                        }
+                      }
                     }
-                  }
+                  ],
+                  "showCloseButton": true,
+                  "showErrorMsg": true,
+                  "showLoading": true,
+                  "size": "lg"
                 },
-                "actionType": "download"
+                "actionType": "dialog"
               }
             ]
           }
         }
-      },
-      filterVisible ? {
-        "label": "",
-        "icon": "fa fa-search",
+    }
+};
+
+const getSetListviewShareButtonSchema = ()=>{
+    return {
         "type": "button",
-        "align": "right",
-        "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+        "label": "共享设置",
+        "disabledOn": "!(global.user.is_space_admin && !!uiSchema.list_views[listName].owner)",
         "onEvent": {
           "click": {
+            "weight": 0,
             "actions": [
               {
-                "actionType": "custom",
-                "script": onFieldsFilterToggleScript
+                "dialog": {
+                  "type": "dialog",
+                  "title": "共享设置",
+                  "data": {
+                    "recordId": "${uiSchema.list_views[listName]._id}",
+                  },
+                  "body": [
+                    {
+                      "type": "steedos-object-form",
+                      "label": "对象表单",
+                      "objectApiName": "object_listviews",
+                      "recordId": "${recordId}",
+                      "mode": "edit",
+                      "fields": [
+                        "shared"
+                      ]
+                    }
+                  ],
+                  "showCloseButton": true,
+                  "showErrorMsg": true,
+                  "showLoading": true,
+                  "closeOnEsc": false,
+                  "dataMapSwitch": false,
+                  "size": "md"
+                },
+                "actionType": "dialog"
               }
             ]
           }
         }
-      } : {},
-      {
-        "type": "dropdown-button",
-        "trigger": "click",
-        "icon": "fa fa-cog",
-        "btnClassName": "antd-Button--iconOnly bg-white p-2 rounded border-gray-300 text-gray-500",
-        "align": "right",
-        "visibleOn": "${!isLookup}",
-        "buttons": [
-          {
-            "label": "列表视图操作",
-            "children": [
+    }
+};
+
+const getSetListviewFiltersButtonSchema = ()=>{
+    return {
+        "type": "button",
+        "label": "过滤设置",
+        "disabledOn": "!((global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && !!uiSchema.list_views[listName].owner)",
+        "onEvent": {
+          "click": {
+            "weight": 0,
+            "actions": [
               {
-                "type": "button",
-                "label": "新建",
-                "onEvent": {
-                  "click": {
-                    "weight": 0,
-                    "actions": [
-                      {
-                        "dialog": {
-                          "type": "dialog",
-                          "title": "新建 列表视图",
-                          "data": {
-                            "&": "$$",
-                            "all": "${uiSchema.list_views.all}",
-                            "list_view": "${uiSchema.list_views[listName]}",
-                            "appId": "${appId}",
-                            "global": "${global}",
-                            "targetObjectName": "${objectName}",
-                          },
-                          "body": [
+                "dialog": {
+                  "type": "dialog",
+                  "title": "过滤设置",
+                  "data": {
+                    "targetObjectName": "${objectName}",
+                    "recordId": "${uiSchema.list_views[listName]._id}",
+                    "listName": "${listName}",
+                    "appId": "${appId}"
+                  },
+                  "body": [
+                    {
+                      "type": "steedos-object-form",
+                      "label": "对象表单",
+                      "objectApiName": "object_listviews",
+                      "recordId": "${recordId}",
+                      "mode": "edit",
+                      "fields": [
+                        "filters"
+                      ],
+                      "initApiAdaptor": initApiAdaptor$2(),
+                      "apiRequestAdaptor": apiRequestAdaptor$2(),
+                      "fieldsExtend": fieldsExtend$2(),
+                      "onEvent": {
+                        "submitSucc": {
+                          "weight": 0,
+                          "actions": [
                             {
-                              "type": "steedos-object-form",
-                              "label": "对象表单",
-                              "objectApiName": "object_listviews",
-                              "recordId": "",
-                              "mode": "edit",
-                              "defaultData": {
-                                "&": "${list_view}",
-                                "name":"",
-                                "label":"",
-                                "filters":"",
-                                "shared":false
-                              },
-                              "fieldsExtend": "{\n  \"label\": {\n    \"is_wide\": true\n  },\n  \"name\": {\n    \"is_wide\": true,\n    \"amis\": {\n      \"hidden\": true\n    }\n  },\n  \"object_name\": {\n    \"amis\": {\n      \"hidden\": true\n    }\n  },\n  \"filter_scope\": {\n    \"amis\": {\n      \"hidden\": true\n    }\n  },\n  \"columns\": {\n    \"amis\": {\n      \"hidden\": true\n    }\n  },\n  \"filter_fields\": {\n    \"amis\": {\n      \"hidden\": true\n    }\n  },\n  \"scrolling_mode\": {\n    \"amis\": {\n      \"hidden\": true\n    }\n  },\n  \"sort\": {\n    \"amis\": {\n      \"hidden\": true\n    }\n  },\n  \"show_count\": {\n    \"amis\": {\n      \"hidden\": true\n    }\n  },\n  \"type\": {\n    \"amis\": {\n      \"hidden\": true\n    }\n  },\n  \"shared\":{\n    \"amis\":{\n      \"visibleOn\":\"${global.user.is_space_admin}\"\n  }\n}\n}",
-                              "fields": [
-                                "label",
-                                "name",
-                                "object_name",
-                                "filter_scope",
-                                "show_count",
-                                "columns.$.field",
-                                "columns.$.width",
-                                "sort.$.field_name",
-                                "sort.$.order",
-                                "filters",
-                                "mobile_columns.$.field",
-                                "searchable_fields.$.field",
-                                "is_system",
-                                "shared"
-                              ],
-                              "onEvent": {
-                                "submitSucc": {
-                                  "weight": 0,
-                                  "actions": [
-                                    {
-                                      "args": {
-                                        // 直接使用recordId不能拿到数据，只能通过result里面拿数据
-                                        "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/listview_${result.data.recordId|lowerCase}",
-                                        "blank": false
-                                      },
-                                      "actionType": "url",
-                                    }
-                                  ]
-                                }
-                              },
-                              "messages": {
-                                "success": "成功",
-                                "failed": "失败"
+                              "args": {
+                                "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${listName}",
+                                "blank": false
                               },
+                              "actionType": "url",
                             }
-                          ],
-                          "showCloseButton": true,
-                          "showErrorMsg": true,
-                          "showLoading": true,
-                          "closeOnEsc": false,
-                          "dataMapSwitch": false,
-                          "size": "lg"
-                        },
-                        "actionType": "dialog"
+                          ]
+                        }
                       }
-                    ]
-                  }
-                }
-              },
-              {
-                "type": "button",
-                "label": "复制",
-                "onEvent": {
-                  "click": {
-                    "weight": 0,
-                    "actions": [
-                      {
-                        "dialog": {
-                          "type": "dialog",
-                          "title": "复制 列表视图",
-                          "data": {
-                            "&": "$$",
-                            "listName": "${listName}",
-                            "targetObjectName": "${objectName}",
-                            "list_view": "${uiSchema.list_views[listName]}",
-                            "appId": "${appId}",
-                            "global": "${global}"
-                          },
-                          "body": [
-                            {
-                              "type": "steedos-object-form",
-                              "label": "对象表单",
-                              "objectApiName": "object_listviews",
-                              "recordId": "",
-                              "mode": "edit",
-                              "fields": [
-                              ],
-                              "defaultData": {
-                                "&": "${list_view}",
-                                "name":"",
-                                "label": "${list_view.label}的副本",
-                                "shared":false
-                              },
-                              "fieldsExtend": "{\n  \"label\": {\n    \"is_wide\": true\n  },\n  \"name\": {\n    \"is_wide\": true,\n    \"amis\": {\n      \"hidden\": true\n    }\n  },\n  \"object_name\": {\n    \"amis\": {\n      \"hidden\": true\n    }\n  },\n  \"filter_scope\": {\n    \"amis\": {\n      \"hidden\": true\n    }\n  },\n  \"columns\": {\n    \"amis\": {\n      \"hidden\": true\n    }\n  },\n  \"filter_fields\": {\n    \"amis\": {\n      \"hidden\": true\n    }\n  },\n  \"scrolling_mode\": {\n    \"amis\": {\n      \"hidden\": true\n    }\n  },\n  \"sort\": {\n    \"amis\": {\n      \"hidden\": true\n    }\n  },\n  \"show_count\": {\n    \"amis\": {\n      \"hidden\": true\n    }\n  },\n  \"type\": {\n    \"amis\": {\n      \"hidden\": true\n    }\n  },\n  \"shared\":{\n    \"amis\":{\n      \"visibleOn\":\"${global.user.is_space_admin}\"\n  }\n}\n}",
-                              "fields": [
-                                "label",
-                                "name",
-                                "object_name",
-                                "filter_scope",
-                                "show_count",
-                                "columns.$.field",
-                                "columns.$.width",
-                                "sort.$.field_name",
-                                "sort.$.order",
-                                "filters",
-                                "mobile_columns.$.field",
-                                "searchable_fields.$.field",
-                                "is_system",
-                                "shared"
-                              ],
-                              "onEvent": {
-                                "submitSucc": {
-                                  "weight": 0,
-                                  "actions": [
-                                    {
-                                      "args": {
-                                        "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/listview_${result.data.recordId|lowerCase}",
-                                        "blank": false
-                                      },
-                                      "actionType": "url",
-                                    }
-                                  ]
-                                }
-                              }
-                            }
-                          ],
-                          "showCloseButton": true,
-                          "showErrorMsg": true,
-                          "showLoading": true,
-                          "closeOnEsc": false,
-                          "dataMapSwitch": false,
-                          "size": "lg"
-                        },
-                        "actionType": "dialog"
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "type": "button",
-                "label": "重命名",
-                "disabledOn": "!((global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && !!uiSchema.list_views[listName].owner)",
-                "onEvent": {
-                  "click": {
-                    "weight": 0,
-                    "actions": [
-                      {
-                        "dialog": {
-                          "type": "dialog",
-                          "title": "重命名 列表视图",
-                          "data": {
-                            "targetObjectName": "${objectName}",
-                            "recordId": "${uiSchema.list_views[listName]._id}",
-                            "appId": "${appId}"
-                          },
-                          "body": [
-                            {
-                              "type": "steedos-object-form",
-                              "label": "对象表单",
-                              "objectApiName": "object_listviews",
-                              "recordId": "${recordId}",
-                              "mode": "edit",
-                              "fields": [
-                                "label"
-                              ],
-                              "fieldsExtend": "{\n  \"label\":{\n    \"is_wide\": true\n  }\n}",
-                              "onEvent": {
-                                "submitSucc": {
-                                  "weight": 0,
-                                  "actions": [
-                                    {
-                                      "args": {
-                                        "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${name}",
-                                        "blank": false
-                                      },
-                                      "actionType": "url",
-                                    },
-                                  ]
-                                }
-                              }
-                            }
-                          ],
-                          "showCloseButton": true,
-                          "showErrorMsg": true,
-                          "showLoading": true,
-                          "size": "lg"
-                        },
-                        "actionType": "dialog"
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "type": "button",
-                "label": "共享设置",
-                "disabledOn": "!(global.user.is_space_admin && !!uiSchema.list_views[listName].owner)",
-                "onEvent": {
-                  "click": {
-                    "weight": 0,
-                    "actions": [
-                      {
-                        "dialog": {
-                          "type": "dialog",
-                          "title": "共享设置",
-                          "data": {
-                            "recordId": "${uiSchema.list_views[listName]._id}",
-                          },
-                          "body": [
-                            {
-                              "type": "steedos-object-form",
-                              "label": "对象表单",
-                              "objectApiName": "object_listviews",
-                              "recordId": "${recordId}",
-                              "mode": "edit",
-                              "fields": [
-                                "shared"
-                              ]
-                            }
-                          ],
-                          "showCloseButton": true,
-                          "showErrorMsg": true,
-                          "showLoading": true,
-                          "closeOnEsc": false,
-                          "dataMapSwitch": false,
-                          "size": "md"
-                        },
-                        "actionType": "dialog"
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "type": "button",
-                "label": "过滤设置",
-                "disabledOn": "!((global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && !!uiSchema.list_views[listName].owner)",
-                "onEvent": {
-                  "click": {
-                    "weight": 0,
-                    "actions": [
-                      {
-                        "dialog": {
-                          "type": "dialog",
-                          "title": "过滤设置",
-                          "data": {
-                            "targetObjectName": "${objectName}",
-                            "objectName": "${objectName}",
-                            "recordId": "${uiSchema.list_views[listName]._id}",
-                            "listName": "${listName}",
-                            "appId": "${appId}"
-                          },
-                          "body": [
-                            {
-                              "type": "steedos-object-form",
-                              "label": "对象表单",
-                              "objectApiName": "object_listviews",
-                              "recordId": "${recordId}",
-                              "mode": "edit",
-                              "fields": [
-                                "filters"
-                              ],
-                              "initApiRequestAdaptor": "",
-                              "initApiAdaptor": "const recordId_tmp = api.body.recordId;\nlet data_tmp;\nif (recordId_tmp) {\n  data_tmp = payload.data;\n  // 数据格式转换\n  if (data_tmp) {\n    if (data_tmp.filters && lodash.isString(data_tmp.filters)) {\n      try {\n        data_tmp.filters = JSON.parse(data_tmp.filters);\n      } catch (e) { }\n    }\n\n    if (data_tmp.filters && lodash.isString(data_tmp.filters)) {\n      data_tmp._filters_type_controller = 'function';\n    } else {\n      data_tmp._filters_type_controller = 'conditions'\n    }\n\n    if (data_tmp._filters_type_controller === 'conditions') {\n      data_tmp._filters_conditions = window.amisConvert.filtersToConditions(data_tmp.filters || []);\n      data_tmp.filters = data_tmp._filters_conditions;\n    } else {\n      data_tmp._filters_function = data_tmp.filters;\n    }\n  }\n}\nfor (key in data_tmp) {\n  if (data_tmp[key] === null) {\n    delete data_tmp[key];\n  }\n}\npayload.data = Object.assign(payload.data, data_tmp);\ndelete payload.extensions;",
-                              "apiRequestAdaptor": "const recordId = api.body.recordId;\nif (formData._filters_type_controller === 'conditions' && formData._filters_conditions) {\n  formData.filters = window.amisConvert.conditionsToFilters(formData.filters);\n} else {\n  formData.filters = formData._filters_function || null;\n}\n\ndelete formData._filters_type_controller;\ndelete formData._filters_conditions;\ndelete formData._filters_function;\n// 字符串拼接（不支持ES6``语法）\nquery = 'mutation{record: ' + objectName + '__insert(doc: {__saveData}){_id}}';\nif (api.body.recordId) {\n  query = 'mutation{record: ' + objectName + '__update(id: \"' + recordId + '\", doc: {__saveData}){_id}}';\n};\n__saveData = JSON.stringify(JSON.stringify(formData));\napi.data = { query: query.replace('{__saveData}', __saveData) };\n",
-                              "fieldsExtend": "{\"filters\": {\n    \"visible_on\": \"true\",\n   \"amis\": {\n      \"type\": \"condition-builder\",\n      \"label\": \"条件组件\",\n      \"source\": {\n        \"method\": \"get\",\n        \"url\": \"${context.rootUrl}/service/api/amis-metadata-listviews/getFilterFields?objectName=${objectName}\",\n        \"dataType\": \"json\",\n        \"headers\": {\n          \"Authorization\": \"Bearer ${context.tenantId},${context.authToken}\"\n        }\n      }\n    }\n  }\n}",
-                              "onEvent": {
-                                "submitSucc": {
-                                  "weight": 0,
-                                  "actions": [
-                                    {
-                                      "args": {
-                                        "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${listName}",
-                                        "blank": false
-                                      },
-                                      "actionType": "url",
-                                    }
-                                  ]
-                                }
-                              }
-                            }
-                          ],
-                          "showCloseButton": true,
-                          "showErrorMsg": true,
-                          "showLoading": true,
-                          "closeOnEsc": false,
-                          "dataMapSwitch": false,
-                          "size": "lg"
-                        },
-                        "actionType": "dialog"
-                      }
-                    ]
-                  }
-                }
-              },
+                    }
+                  ],
+                  "showCloseButton": true,
+                  "showErrorMsg": true,
+                  "showLoading": true,
+                  "closeOnEsc": false,
+                  "dataMapSwitch": false,
+                  "size": "lg"
+                },
+                "actionType": "dialog"
+              }
+            ]
+          }
+        }
+    }
+};
+
+
+function initApiAdaptor$2(){
+  return `
+    const recordId_tmp = api.body.recordId;
+    let data_tmp;
+    if (recordId_tmp) {
+      data_tmp = payload.data;
+      // 数据格式转换
+      if (data_tmp) {
+        if (data_tmp.filters && lodash.isString(data_tmp.filters)) {
+          try {
+            data_tmp.filters = JSON.parse(data_tmp.filters);
+          } catch (e) { }
+        }
+    
+        if (data_tmp.filters && lodash.isString(data_tmp.filters)) {
+          data_tmp._filters_type_controller = 'function';
+        } else {
+          data_tmp._filters_type_controller = 'conditions'
+        }
+    
+        if (data_tmp._filters_type_controller === 'conditions') {
+          data_tmp._filters_conditions = window.amisConvert.filtersToConditions(data_tmp.filters || []);
+          data_tmp.filters = data_tmp._filters_conditions;
+        } else {
+          data_tmp._filters_function = data_tmp.filters;
+        }
+      }
+    }
+    for (key in data_tmp) {
+      if (data_tmp[key] === null) {
+        delete data_tmp[key];
+      }
+    }
+    payload.data = Object.assign(payload.data, data_tmp);
+    delete payload.extensions;
+    return payload;
+  `
+}
+
+function apiRequestAdaptor$2(){
+  return `
+    const recordId = api.body.recordId;
+    if (formData._filters_type_controller === 'conditions' && formData._filters_conditions) {
+      formData.filters = window.amisConvert.conditionsToFilters(formData.filters);
+    } else {
+      formData.filters = formData._filters_function || null;
+    }
+    
+    delete formData._filters_type_controller;
+    delete formData._filters_conditions;
+    delete formData._filters_function;
+    
+    query = 'mutation{record: ' + objectName + '__insert(doc: {__saveData}){_id}}';
+    if (api.body.recordId) {
+      query = 'mutation{record: ' + objectName + '__update(id: "' + recordId + '", doc: {__saveData}){_id}}';
+    };
+    __saveData = JSON.stringify(JSON.stringify(formData));
+    api.data = { query: query.replace('{__saveData}', __saveData) };
+    return api;
+  `
+}
+
+function fieldsExtend$2(){
+  return {
+    "filters": {
+      "visible_on": "true",
+      "amis": {
+        "type": "condition-builder",
+        "label": "条件组件1",
+        "source": {
+          "method": "get",
+          "url": "${context.rootUrl}/service/api/amis-metadata-listviews/getFilterFields?objectName=${targetObjectName}",
+          "dataType": "json",
+          "headers": {
+            "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+          }
+        }
+      }
+    }
+  }
+}
+
+const getSetListviewColumnsButtonSchema = ()=>{
+    return {
+        "type": "button",
+        "label": "显示的列",
+        "disabledOn": "!((global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && !!uiSchema.list_views[listName].owner)",
+        "onEvent": {
+          "click": {
+            "weight": 0,
+            "actions": [
               {
-                "type": "button",
-                "label": "显示的列",
-                "disabledOn": "!((global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && !!uiSchema.list_views[listName].owner)",
-                "onEvent": {
-                  "click": {
-                    "weight": 0,
-                    "actions": [
-                      {
-                        "args": {},
-                        "dialog": {
-                          "type": "dialog",
-                          "title": "显示的列",
-                          "data": {
-                            "&": "$$",
-                            "targetObjectName": "${objectName}",
-                            "objectName": "${objectName}",
-                            "recordId": "${uiSchema.list_views[listName]._id}",
-                            "listName": "${listName}",
-                            "appId": "${appId}"
-                          },
-                          "body": [
+                "args": {},
+                "dialog": {
+                  "type": "dialog",
+                  "title": "显示的列",
+                  "data": {
+                    "&": "$$",
+                    "targetObjectName": "${objectName}",
+                    "recordId": "${uiSchema.list_views[listName]._id}",
+                    "listName": "${listName}",
+                    "appId": "${appId}"
+                  },
+                  "body": [
+                    {
+                      "type": "steedos-object-form",
+                      "label": "对象表单",
+                      "objectApiName": "object_listviews",
+                      "recordId": "${recordId}",
+                      "mode": "edit",
+                      "fieldsExtend": fieldsExtend$1(),
+                      "initApiAdaptor": initApiAdaptor$1(),
+                      "apiRequestAdaptor": apiRequestAdaptor$1(),
+                      "fields": [
+                        "columns",
+                        "mobile_columns"
+                      ],
+                      "onEvent": {
+                        "submitSucc": {
+                          "weight": 0,
+                          "actions": [
                             {
-                              "type": "steedos-object-form",
-                              "label": "对象表单",
-                              "objectApiName": "object_listviews",
-                              "recordId": "${recordId}",
-                              "mode": "edit",
-                              "fieldsExtend": "{\n  \"columns\": {\n    \"amis\": {\n      \"type\": \"transfer\",\n      \"sortable\": true,\n      \"searchable\": true,\n      \"source\": {\n        \"method\": \"get\",\n        \"url\": \"${context.rootUrl}/service/api/amis-metadata-objects/objects/${objectName}/fields/options\",\n        \"headers\": {\n          \"Authorization\": \"Bearer ${context.tenantId},${context.authToken}\"\n        }\n      }\n    }\n  },\n  \"mobile_columns\": {\n    \"group\": \"手机端\",\n    \"amis\": {\n      \"type\": \"transfer\",\n      \"sortable\": true,\n      \"searchable\": true,\n      \"source\": {\n        \"method\": \"get\",\n        \"url\": \"${context.rootUrl}/service/api/amis-metadata-objects/objects/${objectName}/fields/options\",\n        \"headers\": {\n          \"Authorization\": \"Bearer ${context.tenantId},${context.authToken}\"\n        }\n      }\n    }\n  }\n}",
-                              "initApiAdaptor": "const recordId_tmp = api.body.recordId;\nlet columns_tmp = {}, mobile_columns_tmp = {};\nif (recordId_tmp) {\n  columns_tmp = payload.data.columns;\n  mobile_columns_tmp = payload.data.mobile_columns;\n  if (columns_tmp) {\n    columns_tmp = lodash.map(columns_tmp, 'field');\n  }\n  if (mobile_columns_tmp) {\n    mobile_columns_tmp = lodash.map(mobile_columns_tmp, 'field');\n  }\n}\npayload.data.columns = columns_tmp;\npayload.data.mobile_columns = mobile_columns_tmp;\n\ndelete payload.extensions;\nreturn payload;",
-                              "apiRequestAdaptor": "const formData_tmp = api.body.$;\nconst objectName_tmp = api.body.objectName;\nconst recordId_tmp = api.body.recordId;\n\nif (typeof formData_tmp.columns == 'string') {\n  formData_tmp.columns = formData_tmp.columns?.split(',');\n}\nif (typeof formData_tmp.mobile_columns == 'string') {\n  formData_tmp.mobile_columns = formData_tmp.mobile_columns?.split(',');\n}\n\n// 数据格式转换\nformData_tmp.columns = lodash.map(formData_tmp.columns, (item) => {\n  return { field: item };\n});\nformData.mobile_columns = lodash.map(formData.mobile_columns, (item) => {\n  return { field: item };\n});\n\n// 字符串拼接（不支持ES6语法）\nlet query_tmp = 'mutation{record: ' + objectName_tmp + '__insert(doc: {__saveData}){_id}}';\nif (api.body.recordId) {\n  query_tmp = 'mutation{record: ' + objectName_tmp + '__update(id: \"' + recordId_tmp +'\", doc: {__saveData}){_id}}';\n};\ndelete formData_tmp._id;\nlet __saveData_tmp = JSON.stringify(JSON.stringify(formData_tmp));\napi.data = { query: query_tmp.replace('{__saveData}', __saveData_tmp) };\n\nreturn api;",
-                              "fields": [
-                                "columns",
-                                "mobile_columns"
-                              ],
-                              "onEvent": {
-                                "submitSucc": {
-                                  "weight": 0,
-                                  "actions": [
-                                    {
-                                      "args": {
-                                        "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${listName}",
-                                        "blank": false
-                                      },
-                                      "actionType": "url"
-                                    }
-                                  ]
-                                }
-                              }
+                              "args": {
+                                "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${listName}",
+                                "blank": false
+                              },
+                              "actionType": "url"
                             }
-                          ],
-                          "searchable": true,
-                          "showCloseButton": true,
-                          "showErrorMsg": true,
-                          "showLoading": true,
-                          "size": "lg"
-                        },
-                        "actionType": "dialog"
+                          ]
+                        }
                       }
-                    ]
-                  }
-                }
-              },
+                    }
+                  ],
+                  "searchable": true,
+                  "showCloseButton": true,
+                  "showErrorMsg": true,
+                  "showLoading": true,
+                  "size": "lg"
+                },
+                "actionType": "dialog"
+              }
+            ]
+          }
+        }
+    }
+};
+
+function fieldsExtend$1(){
+  return {
+    "columns": {
+      "amis": {
+        "type": "transfer",
+        "sortable": true,
+        "searchable": true,
+        "source": {
+          "method": "get",
+          "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${targetObjectName}/fields/options",
+          "headers": {
+            "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+          }
+        }
+      }
+    },
+    "mobile_columns": {
+      "group": "手机端",
+      "amis": {
+        "type": "transfer",
+        "sortable": true,
+        "searchable": true,
+        "source": {
+          "method": "get",
+          "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${targetObjectName}/fields/options",
+          "headers": {
+            "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+          }
+        }
+      }
+    }
+  }
+}
+
+function initApiAdaptor$1(){
+  return `
+    const recordId_tmp = api.body.recordId;
+    let columns_tmp = {}, mobile_columns_tmp = {};
+    if (recordId_tmp) {
+      columns_tmp = payload.data.columns;
+      mobile_columns_tmp = payload.data.mobile_columns;
+      if (columns_tmp) {
+        columns_tmp = lodash.map(columns_tmp, 'field');
+      }
+      if (mobile_columns_tmp) {
+        mobile_columns_tmp = lodash.map(mobile_columns_tmp, 'field');
+      }
+    }
+    payload.data.columns = columns_tmp;
+    payload.data.mobile_columns = mobile_columns_tmp;
+    
+    delete payload.extensions;
+    return payload;
+  `
+}
+
+function apiRequestAdaptor$1(){
+  return `
+    const formData_tmp = api.body.$;
+    const objectName_tmp = api.body.objectName;
+    const recordId_tmp = api.body.recordId;
+    
+    if (typeof formData_tmp.columns == 'string') {
+      formData_tmp.columns = formData_tmp.columns?.split(',');
+    }
+    if (typeof formData_tmp.mobile_columns == 'string') {
+      formData_tmp.mobile_columns = formData_tmp.mobile_columns?.split(',');
+    }
+    
+    // 数据格式转换
+    formData_tmp.columns = lodash.map(formData_tmp.columns, (item) => {
+      return { field: item };
+    });
+    formData.mobile_columns = lodash.map(formData.mobile_columns, (item) => {
+      return { field: item };
+    });
+    
+    let query_tmp = 'mutation{record: ' + objectName_tmp + '__insert(doc: {__saveData}){_id}}';
+    if (api.body.recordId) {
+      query_tmp = 'mutation{record: ' + objectName_tmp + '__update(id: "' + recordId_tmp +'", doc: {__saveData}){_id}}';
+    };
+    delete formData_tmp._id;
+    let __saveData_tmp = JSON.stringify(JSON.stringify(formData_tmp));
+    api.data = { query: query_tmp.replace('{__saveData}', __saveData_tmp) };
+    
+    return api;
+  `
+}
+
+const getSetListviewSortButtonSchema = ()=>{
+    return {
+        "type": "button",
+        "label": "默认排序规则",
+        "disabledOn": "!((global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && !!uiSchema.list_views[listName].owner)",
+        "onEvent": {
+          "click": {
+            "weight": 0,
+            "actions": [
               {
-                "type": "button",
-                "label": "默认排序规则",
-                "disabledOn": "!((global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && !!uiSchema.list_views[listName].owner)",
-                "onEvent": {
-                  "click": {
-                    "weight": 0,
-                    "actions": [
-                      {
-                        "dialog": {
-                          "type": "dialog",
-                          "title": "弹框标题",
-                          "data": {
-                            "&": "$$",
-                            "targetObjectName": "${objectName}",
-                            "objectName": "${objectName}",
-                            "recordId": "${uiSchema.list_views[listName]._id}",
-                            "listName": "${listName}",
-                            "appId": "${appId}"
-                          },
-                          "body": [
+                "dialog": {
+                  "type": "dialog",
+                  "title": "弹框标题",
+                  "data": {
+                    "&": "$$",
+                    "targetObjectName": "${objectName}",
+                    "recordId": "${uiSchema.list_views[listName]._id}",
+                    "listName": "${listName}",
+                    "appId": "${appId}"
+                  },
+                  "body": [
+                    {
+                      "type": "steedos-object-form",
+                      "label": "对象表单",
+                      "objectApiName": "object_listviews",
+                      "recordId": "${recordId}",
+                      "className": "",
+                      "id": "u:061f158b4c5a",
+                      "mode": "edit",
+                      "fields": [
+                        "sort",
+                        "sort.$.field_name",
+                        "sort.$.order"
+                      ],
+                      "onEvent": {
+                        "submitSucc": {
+                          "weight": 0,
+                          "actions": [
                             {
-                              "type": "steedos-object-form",
-                              "label": "对象表单",
-                              "objectApiName": "object_listviews",
-                              "recordId": "${recordId}",
-                              "className": "",
-                              "id": "u:061f158b4c5a",
-                              "mode": "edit",
-                              "fields": [
-                                "sort",
-                                "sort.$.field_name",
-                                "sort.$.order"
-                              ],
-                              "onEvent": {
-                                "submitSucc": {
-                                  "weight": 0,
-                                  "actions": [
-                                    {
-                                      "args": {
-                                        "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${listName}",
-                                        "blank": false
-                                      },
-                                      "actionType": "url"
-                                    }
-                                  ]
-                                }
+                              "args": {
+                                "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${listName}",
+                                "blank": false
                               },
-                              "fieldsExtend": "{\n  \"sort\": {\n    \"amis\": {\n      \"type\": \"tabs-transfer\",\n      \"sortable\": true,\n      \"searchable\": true,\n      \"source\": {\n        \"method\": \"get\",\n        \"url\": \"${context.rootUrl}/service/api/amis-metadata-objects/objects/${objectName}/sortFields/options\",\n        \"headers\": {\n          \"Authorization\": \"Bearer ${context.tenantId},${context.authToken}\"\n        }\n      }\n    }\n  }\n}",
-                              "initApiAdaptor": "let sort;\nif (recordId) {\n  sort = payload.data.sort;\n  //数据格式转换\n  if (sort instanceof Array) {\n    sort = lodash.map(sort, (item) => {\n      return item.field_name + ':' + (item.order || 'asc')\n    });\n  }\n}\npayload.data.sort = sort;\ndelete payload.extensions;",
-                              "apiRequestAdaptor": "const recordId = api.body.recordId;\n//数据格式转换\nif (typeof formData.sort == 'string') {\n  formData.sort = formData.sort?.split(',');\n}\nformData.sort = lodash.map(formData.sort, (item) => {\n  const arr = item.split(':');\n  return { field_name: arr[0], order: arr[1] };\n});\nif (recordId) {\n  query = 'mutation{record: ' + objectName + '__update(id: \"' + recordId + '\", doc: {__saveData}){_id}}';\n}\n__saveData = JSON.stringify(JSON.stringify(formData));\napi.data = { query: query.replace('{__saveData}', __saveData) };\n"
+                              "actionType": "url"
                             }
-                          ],
-                          "showCloseButton": true,
-                          "showErrorMsg": true,
-                          "showLoading": true,
-                          "id": "u:d3f6947b6acf",
-                          "size": "lg"
-                        },
-                        "actionType": "dialog"
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "type": "button",
-                "label": "删除",
-                "disabledOn": "!((global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && !!uiSchema.list_views[listName].owner)",
-                "confirmText": "如果您删除此列表视图，该视图将为所有具备访问权限的用户永久删除。是否确定要删除？",
-                "onEvent": {
-                  "click": {
-                    "actions": [
-                      {
-                        "actionType": "ajax",
-                        "args": {
-                          "api": {
-                            "url": "${context.rootUrl}/graphql",
-                            "method": "post",
-                            "headers": {
-                              "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                            },
-                            "data": {
-                              "&": "$$",
-                              "uiSchema": "${uiSchema}",
-                              "recordId": "${uiSchema.list_views[listName]._id}"
-                            },
-                            "messages": {
-                              "success": "删除成功"
-                            },
-                            "requestAdaptor": "const { recordId } = api.body;\nvar deleteArray = [];\nif (recordId) { deleteArray.push(`delete:object_listviews__delete(id: \"${recordId}\")`); }\napi.data = { query: `mutation{${deleteArray.join(',')}}` };\n  return api;\n",
-                            "adaptor": "if (payload.errors) {\n  payload.status = 2;\n  payload.msg = payload.errors[0].message;\n}\nreturn payload;",
-                          }
+                          ]
                         }
                       },
-                      {
-                        "actionType": "url",
-                        "args": {
-                          "url": "${context.rootUrl}/app/${appId}/${objectName}/grid/all",
-                          "blank": false
-                        },
-                        "expression": "data.delete == 1"
-                      }
-                    ]
+                      "fieldsExtend": fieldsExtend(),
+                      "initApiAdaptor": initApiAdaptor(),
+                      "apiRequestAdaptor": apiRequestAdaptor()
+                    }
+                  ],
+                  "showCloseButton": true,
+                  "showErrorMsg": true,
+                  "showLoading": true,
+                  "id": "u:d3f6947b6acf",
+                  "size": "lg"
+                },
+                "actionType": "dialog"
+              }
+            ]
+          }
+        }
+    }
+};
+
+function fieldsExtend(){
+  return {
+    "sort": {
+      "amis": {
+        "type": "tabs-transfer",
+        "sortable": true,
+        "searchable": true,
+        "source": {
+          "method": "get",
+          "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${targetObjectName}/sortFields/options",
+          "headers": {
+            "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+          }
+        }
+      }
+    }
+  }
+}
+
+function initApiAdaptor(){
+  return `
+    let sort;
+    if (recordId) {
+      sort = payload.data.sort;
+      //数据格式转换
+      if (sort instanceof Array) {
+        sort = lodash.map(sort, (item) => {
+          return item.field_name + ':' + (item.order || 'asc')
+        });
+      }
+    }
+    payload.data.sort = sort;
+    delete payload.extensions;
+    return payload;
+  `
+}
+
+function apiRequestAdaptor(){
+  return `
+    const recordId = api.body.recordId;
+    //数据格式转换
+    if (typeof formData.sort == 'string') {
+      formData.sort = formData.sort?.split(',');
+    }
+    formData.sort = lodash.map(formData.sort, (item) => {
+      const arr = item.split(':');
+      return { field_name: arr[0], order: arr[1] };
+    });
+    if (recordId) {
+      query = 'mutation{record: ' + objectName + '__update(id: "' + recordId + '", doc: {__saveData}){_id}}';
+    }
+    __saveData = JSON.stringify(JSON.stringify(formData));
+    api.data = { query: query.replace('{__saveData}', __saveData) };
+    return api;
+  `
+}
+
+const getDeleteListviewButtonSchema = ()=>{
+    return {
+        "type": "button",
+        "label": "删除",
+        "disabledOn": "!((global.user.is_space_admin || global.userId == uiSchema.list_views[listName].owner) && !!uiSchema.list_views[listName].owner)",
+        "confirmText": "如果您删除此列表视图，该视图将为所有具备访问权限的用户永久删除。是否确定要删除？",
+        "onEvent": {
+          "click": {
+            "actions": [
+              {
+                "actionType": "ajax",
+                "args": {
+                  "api": {
+                    "url": "${context.rootUrl}/graphql",
+                    "method": "post",
+                    "headers": {
+                      "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                    },
+                    "data": {
+                      "&": "$$",
+                      "uiSchema": "${uiSchema}",
+                      "recordId": "${uiSchema.list_views[listName]._id}"
+                    },
+                    "messages": {
+                      "success": "删除成功"
+                    },
+                    "requestAdaptor": requestAdaptor(),
+                    "adaptor": adaptor(),
                   }
                 }
               },
               {
-                "type": "button",
-                "visibleOn": "${false}",
-                "label": "保存宽度(todo)"
-              },
-              // {
-              //   type: 'steedos-object-button',
-              //   name: 'standard_delete',
-              //   objectName: 'test0321__c',
-              //   // visibleOn: getButtonVisibleOn(button),
-              //   className: 'antd-Button--default'
-              // }
+                "actionType": "url",
+                "args": {
+                  "url": "${context.rootUrl}/app/${appId}/${objectName}/grid/all",
+                  "blank": false
+                },
+                "expression": "data.delete == 1"
+              }
+            ]
+          }
+        }
+    }
+};
+
+
+function requestAdaptor(){
+  return `
+    const { recordId } = api.body;
+    var deleteArray = [];
+    if (recordId) { deleteArray.push(\`delete:object_listviews__delete(id: "\${recordId}")\`); }
+    api.data = { query: \`mutation{\${deleteArray.join(',')}}\` };
+    return api;
+  `
+}
+
+function adaptor(){
+  return  `
+    if (payload.errors) {
+      payload.status = 2;
+      payload.msg = payload.errors[0].message;
+    }
+    return payload;
+  `
+}
+
+const getSettingListviewToolbarButtonSchema = ()=>{
+    return {
+        "type": "dropdown-button",
+        "trigger": "click",
+        "icon": "fa fa-cog",
+        "btnClassName": "antd-Button--iconOnly bg-white p-2 rounded border-gray-300 text-gray-500",
+        "align": "right",
+        "visibleOn": "${!isLookup}",
+        "buttons": [
+          {
+            "label": "列表视图操作",
+            "children": [
+              getNewListviewButtonSchema(),
+              getCopyListviewButtonSchema(),
+              getRenameListviewButtonSchema(),
+              getSetListviewShareButtonSchema(),
+              getSetListviewFiltersButtonSchema(),
+              getSetListviewColumnsButtonSchema(),
+              getSetListviewSortButtonSchema(),
+              getDeleteListviewButtonSchema()
             ]
           }
         ]
+    }
+};
+
+const getDisplayAsButton = function(objectName, showDisplayAs){
+  let displayAs = Router$1.getTabDisplayAs(objectName);
+  let buttons = [
+    {
+      "type": "button",
+      "label": "表格",
+      "onClick": "let url = document.location.pathname; var urlSearch = new URLSearchParams(document.location.search); if(urlSearch.get(\"side_object\") && urlSearch.get(\"side_listview_id\")){url=`/app/${props.data.appId}/${urlSearch.get(\"side_object\")}/grid/${urlSearch.get(\"side_listview_id\")}`;}; props.env.jumpTo(url + '?display=grid');",
+      "rightIcon": displayAs != 'split' ? "fa fa-check" : null,
+      "rightIconClassName": "m-l-sm"
+    },
+    {
+      "type": "button",
+      "label": "分栏视图",
+      "onClick": "const url = document.location.pathname + '?display=split'; props.env.jumpTo(url);",
+      "rightIcon": displayAs === 'split' ? "fa fa-check" : null,
+      "rightIconClassName": "m-l-sm"
+    }
+  ];
+  return {
+    "type": "dropdown-button",
+    "icon": "fa fa-table-columns",
+    "btnClassName": "antd-Button--iconOnly bg-white p-2 rounded border-gray-300 text-gray-500",
+    "align": "right",
+    "visibleOn": "${window:innerWidth > 768 && !!!isLookup}",
+    "buttons": [ 
+      {
+        "label": "显示为",
+        "children": buttons
+      }
+    ]
+  };
+};
+
+
+const onFieldsFilterToggleScript = `
+const scope = event.context.scoped;
+const filterForm = scope.getComponents().find(function(n){
+  return n.props.type === "form";
+});
+const filterService = filterForm.context.getComponents().find(function(n){
+  return n.props.type === "service";
+});
+// filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsFilter});
+let resizeWindow = function(){
+  //触发amis crud 高度重算
+  setTimeout(()=>{
+    window.dispatchEvent(new Event("resize"))
+  }, 500);
+}
+let isMobile = Steedos.isMobile();
+if(filterService.props.data.showFieldsFilter){
+  if(isMobile){
+    // 手机上只能通过取消按钮来关闭搜索栏
+    return;
+  }
+  let buttonCancel = SteedosUI.getClosestAmisComponentByType(filterForm.context, "button", { 
+    direction: "down", 
+    name: "btn_filter_form_cancel" 
+  });
+  buttonCancel.props.dispatchEvent('click', {}).then(function(){
+    resizeWindow();
+  });
+}
+else{
+  filterService.setData({showFieldsFilter: true});
+  resizeWindow();
+  if(isMobile){
+    // 手机端在显示搜索栏时隐藏刷新按钮
+    let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
+    crudService && crudService.setData({showFieldsFilter: true});
+  }
+}
+`;
+
+
+function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false, hiddenCount = false, headerToolbarItems, filterVisible = true} = {}){
+  // console.log(`getObjectHeaderToolbar====>`, filterVisible)
+  const isMobile = window.innerWidth < 768;
+  if(isMobile){
+    showDisplayAs = false;
+  }
+  if(formFactor === 'SMALL'){
+    const onReloadScript = `
+      const scope = event.context.scoped;
+      var listView = scope.parent.getComponents().find(function(n){
+        return n.props.type === "crud";
+      });
+      listView.handleChangePage(1);
+    `;
+    return [
+      // "bulkActions",
+      ...(headerToolbarItems || []),
+      hiddenCount ? {} :{
+        "type": "tpl",
+        "tpl": "${count} 个项目"
+      },
+      {
+        // "type": "reload",//不可以直接使用reload，因为它不会设置页码到第一页
+        "type": "button",
+        "align": "right",
+        "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+        "label": "",
+        "icon": "fa fa-sync",
+        "visibleOn": "${!showFieldsFilter}",
+        "onEvent": {
+          "click": {
+            "actions": [
+              {
+                "actionType": "custom",
+                "script": onReloadScript
+              }
+            ]
+          }
+        },
+      },
+      filterVisible ? {
+        "label": "",
+        "icon": "fa fa-search",
+        "type": "button",
+        "badge": {
+          "offset": [
+            -5,
+            1
+          ],
+          "size":8,
+          "animation": true,
+          "visibleOn": "${isFieldsFilterEmpty == false}"
+        },
+        "align": "right",
+        "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+        "onEvent": {
+          "click": {
+            "actions": [
+              {
+                "actionType": "custom",
+                "script": onFieldsFilterToggleScript
+              }
+            ]
+          }
+        }
+      } : {},
+      getDisplayAsButton(mainObject?.name)
+  ]
+  }else {
+    return [
+      // "filter-toggler",
+      ...(headerToolbarItems || []),
+      "bulkActions",
+      {
+        "type": "columns-toggler",
+        "className": "hidden"
+      },
+      // {
+      //     "type": "columns-toggler",
+      //     "className": "mr-2"
+      // },
+      hiddenCount ? {} : {
+        "type": "tpl",
+        "tpl":  "${count} 个项目"
+      },
+      {
+        "type": "reload",
+        "align": "right",
+        "tooltipPlacement": "bottom",
+        "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
       },
+      getExportExcelToolbarButtonSchema(),
+      filterVisible ? {
+        "label": "",
+        "icon": "fa fa-search",
+        "type": "button",
+        "align": "right",
+        "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+        "onEvent": {
+          "click": {
+            "actions": [
+              {
+                "actionType": "custom",
+                "script": onFieldsFilterToggleScript
+              }
+            ]
+          }
+        }
+      } : {},
+      getSettingListviewToolbarButtonSchema(),
       getDisplayAsButton(showDisplayAs)
       // {
       //   "type": "search-box",
@@ -4763,20 +5251,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
             }
         }
 
-        var searchableFilter = [];
-        _.each(selfData, (value, key)=>{
-            if(!_.isEmpty(value) || _.isBoolean(value)){
-                if(_.startsWith(key, '__searchable__between__')){
-                    searchableFilter.push([\`\${key.replace("__searchable__between__", "")}\`, "between", value])
-                }else if(_.startsWith(key, '__searchable__')){
-                    if(_.isString(value)){
-                        searchableFilter.push([\`\${key.replace("__searchable__", "")}\`, "contains", value])
-                    }else{
-                        searchableFilter.push([\`\${key.replace("__searchable__", "")}\`, "=", value])
-                    }
-                }
-            }
-        });
+        var searchableFilter = SteedosUI.getSearchFilter(selfData) || [];
 
         if(searchableFilter.length > 0){
             if(filters.length > 0 ){
@@ -6198,6 +6673,29 @@ if(typeof window != 'undefined'){
     window.getFieldSearchable = getFieldSearchable;
 }
 
+
+function isFieldTypeSearchable(fieldType) {
+    return !_$1.includes(
+        [
+            "grid",
+            "avatar",
+            "image",
+            "object",
+            "[object]",
+            "[Object]",
+            "[grid]",
+            "[text]",
+            "audio",
+            "file",
+        ],
+        fieldType
+    )
+}
+
+if (typeof window != 'undefined') {
+    window.isFieldTypeSearchable = isFieldTypeSearchable;
+}
+
 var index = /*#__PURE__*/Object.freeze({
   __proto__: null,
   OMIT_FIELDS: OMIT_FIELDS,
@@ -6209,6 +6707,7 @@ var index = /*#__PURE__*/Object.freeze({
   getSelectFieldOptions: getSelectFieldOptions,
   convertSFieldToAmisField: convertSFieldToAmisField,
   getFieldSearchable: getFieldSearchable,
+  isFieldTypeSearchable: isFieldTypeSearchable,
   getAmisStaticFieldType: getAmisStaticFieldType
 });
 
@@ -6820,7 +7319,7 @@ async function getObjectCRUD(objectSchema, fields, options){
       id: `service_${id}`,
       name: `page`,
       data: {
-        // objectName: objectSchema.name,
+        objectName: objectSchema.name,
         // _id: null,
         recordPermissions: objectSchema.permissions,
         uiSchema: objectSchema,
@@ -7638,20 +8137,8 @@ async function getTableApi(mainObject, fields, options){
         }else if(selfData.op === 'loadOptions' && selfData.value){
             userFilters = [["${valueField.name}", "=", selfData.value]];
         }
-        var searchableFilter = [];
-        _.each(selfData, (value, key)=>{
-            if(!_.isEmpty(value) || _.isBoolean(value)){
-                if(_.startsWith(key, '__searchable__between__')){
-                    searchableFilter.push([\`\${key.replace("__searchable__between__", "")}\`, "between", value])
-                }else if(_.startsWith(key, '__searchable__')){
-                    if(_.isString(value)){
-                        searchableFilter.push([\`\${key.replace("__searchable__", "")}\`, "contains", value])
-                    }else{
-                        searchableFilter.push([\`\${key.replace("__searchable__", "")}\`, "=", value])
-                    }
-                }
-            }
-        });
+        
+        var searchableFilter = SteedosUI.getSearchFilter(selfData) || [];
 
         if(searchableFilter.length > 0){
             if(userFilters.length > 0 ){
@@ -7922,20 +8409,7 @@ async function getCalendarApi(mainObject, fields, options) {
     }else if(selfData.op === 'loadOptions' && selfData.value){
         filters = [["${valueField.name}", "=", selfData.value]];
     }
-    var searchableFilter = [];
-    _.each(selfData, (value, key)=>{
-        if(!_.isEmpty(value) || _.isBoolean(value)){
-            if(_.startsWith(key, '__searchable__between__')){
-                searchableFilter.push([\`\${key.replace("__searchable__between__", "")}\`, "between", value])
-            }else if(_.startsWith(key, '__searchable__')){
-                if(_.isString(value)){
-                    searchableFilter.push([\`\${key.replace("__searchable__", "")}\`, "contains", value])
-                }else{
-                    searchableFilter.push([\`\${key.replace("__searchable__", "")}\`, "=", value])
-                }
-            }
-        }
-    });
+    var searchableFilter = SteedosUI.getSearchFilter(selfData) || [];
 
     if(searchableFilter.length > 0){
         if(filters.length > 0 ){
@@ -8461,7 +8935,7 @@ const getRecordPermissions = async (objectName, recordId)=>{
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-05-08 16:34:25
+ * @LastEditTime: 2023-05-17 09:09:33
  * @Description:
  */
 
@@ -8601,7 +9075,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
     // } else {
     //     globalFilter = [`${relatedKey}`, "=", relatedValue];
     // }
-    const recordRelatedListHeader = await getObjectRecordDetailRelatedListHeader(relatedObjectUiSchema, relatedLabel);
+    const recordRelatedListHeader = await getObjectRecordDetailRelatedListHeader(relatedObjectUiSchema, relatedLabel, ctx);
     const componentId = `steedos-record-related-list-${relatedObjectName}`;
     const options = {
         globalFilter,
@@ -12190,5 +12664,5 @@ const getInstanceInfo = async ({ instanceId, box }) => {
   };
 };
 
-export { index as Field, Router, absoluteUrl, amisRender, amisRootClick, cloneObject, conditionsToFilters, createObject, defaultsDeep, deleteVariable, execute, executeButton, extendObject, fetchAPI, filtersToConditions, getApp, getApps, getAuthToken, getAuthorization, getButton, getButtonVisible, getButtonVisibleOn$1 as getButtonVisibleOn, getButtons, getCalendarSchema, getDefaultRenderData, getEnv, getEnvs, getEvn, getField, getFileSrc, getFlowFormSchema, getFormPageInitSchema, getFormSchema, getIdsPickerSchema, getImageSrc, getInstanceInfo, getListPageInitSchema, getListSchema, getListViewButtons, getListViewColumns, getListViewFilter, getListViewItemButtons, getListViewSort, getListviewInitSchema, getLookupSapceUserTreeSchema, getNotifications, getObjectDetailButtons, getObjectDetailButtonsSchemas, getObjectDetailMoreButtons, getObjectFieldsFilterBarSchema, getObjectFieldsFilterButtonSchema, getObjectFieldsFilterFormSchema, getObjectListHeader$1 as getObjectListHeader, getObjectListHeaderFieldsFilterBar, getObjectListHeaderFirstLine, getObjectListHeaderSecordLine, getObjectListViewButtonsSchemas, getObjectRecordDetailHeader, getObjectRecordDetailRelatedListHeader, getObjectRelated, getObjectRelatedList, getObjectRelatedListButtons, getObjectRelatedListHeader, getPage, getRecord, getRecordDetailHeaderSchema, getRecordDetailRelatedListSchema, getRecordDetailSchema, getRecordPageInitSchema, getRecordPermissions, getRecordServiceSchema, getRelatedFieldValue, getRelatedListSchema, getRelatedsCount, getRootUrl, getSelectUserSchema, getSpaceUsersPickerAmisSchema, getSpaceUsersPickerSchema, getSteedosAuth, getTableSchema, getTenantId, getUISchema, getUISchemaSync, getUserId, getViewSchema, isExpression, isObject, lookupToAmis, lookupToAmisIdsPicker, lookupToAmisPicker, lookupToAmisSelect, lookupToAmisSelectUser, markReadAll, parseSingleExpression, registerRemoteAssets, registerRenders, setEnv, setEnvs, setRootUrl, setSteedosAuth, setUISchemaFunction, setVariable, standardButtonsTodo };
+export { index as Field, Router, absoluteUrl, amisRender, amisRootClick, cloneObject, conditionsToFilters, createObject, defaultsDeep, deleteVariable, execute, executeButton, extendObject, fetchAPI, filtersToConditions, getApp, getApps, getAuthToken, getAuthorization, getButton, getButtonVisible, getButtonVisibleOn$1 as getButtonVisibleOn, getButtons, getCalendarSchema, getDefaultRenderData, getEnv, getEnvs, getEvn, getField, getFileSrc, getFlowFormSchema, getFormPageInitSchema, getFormSchema, getIdsPickerSchema, getImageSrc, getInstanceInfo, getListPageInitSchema, getListSchema, getListViewButtons, getListViewColumns, getListViewFilter, getListViewItemButtons, getListViewSort, getListviewInitSchema, getLookupSapceUserTreeSchema, getNotifications, getObjectDetailButtons, getObjectDetailButtonsSchemas, getObjectDetailMoreButtons, getObjectFieldsFilterBarSchema, getObjectFieldsFilterButtonSchema, getObjectFieldsFilterFormSchema, getObjectListHeader$1 as getObjectListHeader, getObjectListHeaderFieldsFilterBar, getObjectListHeaderFirstLine, getObjectListHeaderSecordLine, getObjectListViewButtonsSchemas, getObjectRecordDetailHeader, getObjectRecordDetailRelatedListButtonsSchemas, getObjectRecordDetailRelatedListHeader, getObjectRelated, getObjectRelatedList, getObjectRelatedListButtons, getObjectRelatedListHeader, getPage, getRecord, getRecordDetailHeaderSchema, getRecordDetailRelatedListSchema, getRecordDetailSchema, getRecordPageInitSchema, getRecordPermissions, getRecordServiceSchema, getRelatedFieldValue, getRelatedListSchema, getRelatedsCount, getRootUrl, getSelectUserSchema, getSpaceUsersPickerAmisSchema, getSpaceUsersPickerSchema, getSteedosAuth, getTableSchema, getTenantId, getUISchema, getUISchemaSync, getUserId, getViewSchema, isExpression, isObject, lookupToAmis, lookupToAmisIdsPicker, lookupToAmisPicker, lookupToAmisSelect, lookupToAmisSelectUser, markReadAll, parseSingleExpression, registerRemoteAssets, registerRenders, setEnv, setEnvs, setRootUrl, setSteedosAuth, setUISchemaFunction, setVariable, standardButtonsTodo };
 //# sourceMappingURL=index.esm.js.map