@steedos-widgets/sortable 3.6.2-beta.2 → 3.6.2-beta.21

package/dist/sortable.umd.js

@@ -20238,22 +20238,29 @@
      * @Description:
      */
 
-
     const Router = {
         getTabDisplayAs(tab_id){
+            const uiSchema = getUISchemaSync$1(tab_id, false);
             var urlSearch = new URLSearchParams(document.location.search); 
             if(urlSearch.has('display')){
                 return urlSearch.get('display')
             }
             const key = `tab_${tab_id}_display`;
             // const key = `page_display`;
-            const value = localStorage.getItem(key);
-            return value ? value : 'grid'
+            const value = sessionStorage.getItem(key);
+            let defaultDisplay = "grid";
+            if(uiSchema.enable_split){
+                defaultDisplay = "split";
+            }
+            if(window.innerWidth <= 768){
+                return "grid";
+            }
+            return value ? value : defaultDisplay;
         },
       
         setTabDisplayAs(tab_id, displayAs){
             const key = `tab_${tab_id}_display`;
-            localStorage.setItem(key, displayAs);
+            sessionStorage.setItem(key, displayAs);
         },
         getAppPath({formFactor, appId}){
             return `/app/${appId}`;
@@ -20280,8 +20287,8 @@
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-07-20 16:29:22
-     * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-     * @LastEditTime: 2023-12-28 14:59:08
+     * @LastEditors: liaodaxue
+     * @LastEditTime: 2024-01-25 14:44:17
      * @Description: 
      */
 
@@ -20353,6 +20360,25 @@
       }
     }
 
+    /**
+     * 判断浏览器类型
+     * @returns 按需返回浏览器类型;
+     */
+     function getBowserType() {
+        const userAgent = navigator.userAgent;
+        if (userAgent.indexOf("Chrome")!== -1 && userAgent.indexOf("Safari") !== -1 && userAgent.indexOf("Edg") === -1) {
+          return "Chrome";
+        } else if (userAgent.indexOf("Firefox") !== -1) {
+          return "Firefox";
+        } else if (userAgent.indexOf("Safari") !== -1 && userAgent.indexOf("Chrome") === -1 && userAgent.indexOf("Edge") === -1) {
+          return "Safari";
+        } else if (userAgent.indexOf("Edg") !== -1) {
+          return "Edge";
+        } else {
+          return "Unknown browser"; // 其他浏览器...（可根据自己需要确定是否新增其他浏览器的判断）
+        }
+    }
+
     function getNumberTpl(field){
         return `<span>\${_display.${field.name}}</span>`
     }
@@ -20407,7 +20433,7 @@
 
     function getNameTplUrl(field, ctx){
         if(ctx.objectName === 'cms_files'){
-            return `\${context.rootUrl}/api/files/files/\${versions[0]}?download=true`
+            return "${(versions[0] && versions[0].url) ? versions[0].url+'?download=true' : context.rootUrl+'/api/files/files/'+versions[0]+'?download=true'}"
         }
         const href = Router.getObjectDetailPath({
             ...ctx,  formFactor: ctx.formFactor, appId: "${appId}", objectName: ctx.objectName || "${objectName}", recordId: `\${${ctx.idFieldName}}`
@@ -20921,6 +20947,7 @@
     var frontend_notifications_allread$1 = "Mark all as read";
     var frontend_notifications_allread_message$1 = "All marked as read";
     var frontend_profile$1 = "Profile";
+    var switch_space$1 = "Switch Space";
     var frontend_about$1 = "About";
     var frontend_log_out$1 = "Log out";
     var frontend_listview_warning_start$1 = "The current ";
@@ -21008,6 +21035,7 @@
     	frontend_notifications_allread: frontend_notifications_allread$1,
     	frontend_notifications_allread_message: frontend_notifications_allread_message$1,
     	frontend_profile: frontend_profile$1,
+    	switch_space: switch_space$1,
     	frontend_about: frontend_about$1,
     	frontend_log_out: frontend_log_out$1,
     	frontend_listview_warning_start: frontend_listview_warning_start$1,
@@ -21047,9 +21075,9 @@
     var frontend_display_as = "显示为";
     var frontend_record_sum = "个项目";
     var frontend_button_reload_tooltip = "刷新";
-    var frontend_button_search_tooltip = "筛选";
+    var frontend_button_search_tooltip = "搜索";
     var frontend_fields_filter_button_search = "搜索";
-    var frontend_fields_filter_button_settings = "设置搜索项";
+    var frontend_fields_filter_button_settings = "选择搜索项";
     var frontend_button_listview_control_tooltip = "列表视图控制";
     var frontend_button_listview_control_label = "列表视图控制";
     var frontend_listview_control_columns = "显示的列";
@@ -21097,6 +21125,7 @@
     var frontend_notifications_allread = "全部标记为已读";
     var frontend_notifications_allread_message = "已全部标记为已读";
     var frontend_profile = "个人资料";
+    var switch_space = "切换工作区";
     var frontend_about = "关于";
     var frontend_log_out = "注销";
     var frontend_listview_warning_start = "当前";
@@ -21185,6 +21214,7 @@
     	frontend_notifications_allread: frontend_notifications_allread,
     	frontend_notifications_allread_message: frontend_notifications_allread_message,
     	frontend_profile: frontend_profile,
+    	switch_space: switch_space,
     	frontend_about: frontend_about,
     	frontend_log_out: frontend_log_out,
     	frontend_listview_warning_start: frontend_listview_warning_start,
@@ -21498,7 +21528,8 @@
                                             "failed": "失败了呢。。"
                                           }
                                         }
-                                    }
+                                    },
+                                    "expression": "${!recordPermissions.modifyAllRecords}"
                                 },
                                 {
                                     "actionType": "setValue",
@@ -21514,7 +21545,7 @@
                                     "componentId": quickEditId,
                                     "args": {
                                         "value":{
-                                            "quickedit_record_permissions": "${event.data}"
+                                            "quickedit_record_permissions": "${recordPermissions.modifyAllRecords ? {'allowEdit': true} : event.data}"
                                         }
                                     }
                                 }
@@ -21578,7 +21609,7 @@
                                           `
                                             }
                                         },
-                                        "expression":"${event.data.value}"
+                                        "expression":"${event.data.value && !recordPermissions.modifyAllRecords}"
                                     },
                                     {
                                         "actionType": "setValue",
@@ -21609,10 +21640,20 @@
                                                             "script": `
                                                             const noPermission = event.data.noPermission;
                                                             const crudComponent = event.context.scoped.getComponentById("${options.crudId}");
-                                                            const selectedItems = crudComponent && crudComponent.props.store.selectedItems.concat();
+                                                            let selectedItems = crudComponent && crudComponent.props.store.selectedItems.concat();
                                                             noPermission.forEach(function (item) {
                                                                 crudComponent && crudComponent.unSelectItem(_.find(selectedItems,{_id:item}));
+                                                                _.remove(selectedItems, (selected) => selected._id === item);
                                                             })
+                                                            doAction({
+                                                                "componentId": "${quickEditId}",
+                                                                "actionType": "setValue",
+                                                                "args": {
+                                                                    "value": {
+                                                                        selectedItems
+                                                                    }
+                                                                }
+                                                            });
                                                         `
                                                         },
                                                         {
@@ -21673,7 +21714,7 @@
     }
 
     function getFieldWidth(width){
-        const defaultWidth = "unset";//用于使table内的td标签下生成div，实现将快速编辑按钮固定在右侧的效果，并不是为了unset效果
+        const defaultWidth = null;
         if(typeof width == 'string'){
             if(isNaN(width)){
                 return width || defaultWidth;
@@ -21703,18 +21744,35 @@
             //增加quickEdit属性，实现快速编辑
             const quickEditSchema = allowEdit ? await getQuickEditSchema(field, options) : allowEdit;
             let className = "";
-            if(field.wrap != true){
+            const bowserType = getBowserType();
+            if(bowserType === "Safari"){
                 className += " whitespace-nowrap ";
             }else {
-                className += " break-all ";
+                if(field.wrap != true){
+                    className += " whitespace-nowrap ";
+                }else {
+                    className += " break-words ";
+                }
+            }
+
+            if (typeof field.amis?.className == "object") {
+                className = {
+                    [className]: "true",
+                    ...field.amis.className
+                };
+            } else if (typeof field.amis?.className == "string") {
+                className = `${className} ${field.amis.className} `;
             }
+            let fieldAmis = lodash.exports.clone(field.amis);
+            delete fieldAmis?.className;
+
             let columnItem;
             if((field.is_name || field.name === options.labelFieldName) && options.objectName === 'cms_files'){
                 const previewFileScript = `
                 var data = event.data;
                 var file_name = data.versions ? data.name : "${field.label}";
-                var file_id = data._id;
-                SteedosUI.previewFile && SteedosUI.previewFile({file_name, file_id});
+                var file_id = data.versions && data.versions[0] && data.versions[0]._id;
+                window.previewFile && window.previewFile({file_name, file_id});
             `;
                 columnItem = {
                     "type": "button",
@@ -21739,11 +21797,11 @@
                                 "expression": "!!!(window && window.nw && window.nw.require)"//浏览器上直接下载
                             },
                             {
-                              "args": {},
-                              "actionType": "custom",
-                              "script": previewFileScript,
-                            //   "expression": "!!window?.nw?.require" //PC客户端预览附件
-                              "expression": "!!!(window && window.nw && window.nw.require)"//PC客户端预览附件
+                                "args": {},
+                                "actionType": "custom",
+                                "script": previewFileScript,
+                                // "expression": "!!window?.nw?.require" //PC客户端预览附件
+                                "expression": "!!(window && window.nw && window.nw.require)"//PC客户端预览附件
                             }
                         ]
                       }
@@ -21758,7 +21816,7 @@
                     toggled: field.toggled,
                     static: true,
                     className,
-                }, field.amis, {name: field.name});
+                }, fieldAmis, {name: field.name});
             }else if(field.type === 'avatar' || field.type === 'image' || field.type === 'file'){
                 columnItem = Object.assign({}, {
                     type: "switch",
@@ -21769,7 +21827,7 @@
                     static: true,
                     className,
                     ...getAmisFileReadonlySchema(field)
-                }, field.amis, {name: field.name});
+                }, fieldAmis, {name: field.name});
             }
             else if(field.type === 'select'){
                 const map = getSelectMap(field.options);
@@ -21784,7 +21842,7 @@
                     className,
                     inputClassName: "inline",
                     static: true,
-                }, field.amis, {name: field.name});
+                }, fieldAmis, {name: field.name});
             }
             else {
                 const tpl = await getFieldTpl(field, options);
@@ -21803,23 +21861,14 @@
                 if(field.type === 'textarea'){
                     className += 'min-w-56';
                 }
-                if(field.type === 'date'){
-                    className += 'date-min-w';
-                }
-                if(field.type === 'datetime'){
-                    className += 'datetime-min-w';
-                }
+                // if(field.type === 'date'){
+                //     className += 'date-min-w';
+                // }
+                // if(field.type === 'datetime'){
+                //     className += 'datetime-min-w';
+                // }
 
                 //field上的amis属性里的clssname需要单独判断类型合并
-                if (typeof field.amis?.className == "object") {
-                    className = {
-                        [className]: "true",
-                        ...field.amis.className
-                    };
-                } else if (typeof field.amis?.className == "string") {
-                    className = `${className} ${field.amis.className} `;
-                }
-                delete field.amis?.className;
 
                 if(!field.hidden && !field.extra){
                     columnItem = Object.assign({}, {
@@ -21836,7 +21885,7 @@
                         static: true,
                         options: field.type === 'html' ? {html: true} : null
                         // toggled: true 
-                    }, field.amis, {name: field.name});
+                    }, fieldAmis, {name: field.name});
                     
                     if(field.type === 'color'){
                         columnItem.type = 'color';
@@ -21903,7 +21952,7 @@
             }
             if(isLeft){
                 // 左侧半行
-                lineChildrenClassName = "steedos-listview-item-left truncate";
+                lineChildrenClassName = "steedos-listview-item-left truncate h-5";
                 if(item.field.is_wide){
                     // 左侧全行样式可以单独写，如果需要配置两行省略号效果，可以加样式类 two-lines-truncate
                     lineChildrenClassName = "steedos-listview-item-wide";
@@ -21915,7 +21964,7 @@
             }
             else {
                 // 右侧半行，这里加样式类 flex flex-shrink-0，是为了省略号只显示在左半行，右半行文字一般比较短，如果也加省略号效果的话，左侧文字多的话，右侧没几个字就显示省略号了
-                lineChildrenClassName = "steedos-listview-item-right truncate ml-2 flex flex-shrink-0";
+                lineChildrenClassName = "steedos-listview-item-right truncate ml-2 flex flex-shrink-0 h-5";
             }
             //支持字段amis属性配置classname，识别classname的类型，与原样式合并
             var className;
@@ -22026,8 +22075,16 @@
                             "actions": [
                                 {
                                     "script": `
-                                    let cms_url = "/api/files/files/"+event.data.versions[0]+"?download=true"
-                                    Steedos.cordovaDownload(encodeURI(Steedos.absoluteUrl(cms_url)), event.data.name);
+                                    let cms_url = '';
+                                    let value = event.data.versions[0];
+                                    if(value){
+                                        if(value.url){
+                                            cms_url = value.url;
+                                        }else{
+                                            cms_url = Steedos.absoluteUrl("/api/files/files/"+value+"?download=true");
+                                        }
+                                    }
+                                    Steedos.cordovaDownload(encodeURI(cms_url), event.data.name);
                                 `,
                                     "actionType": "custom"
                                 }
@@ -22142,7 +22199,8 @@
             label: "&nbsp;",
             fixed: 'right',
             labelClassName: 'text-center',
-            className: 'text-center steedos-listview-operation w-10',
+            //TODO:目前3.6.3-patch.3版本中对于动态classname处理存在问题，简单处理固定列问题，等待amis解决crud的columns不支持动态classname的问题
+            className: 'text-center steedos-listview-operation w-10 is-sticky is-sticky-right is-sticky-first-right',
             buttons: [
                   {
                     "type": "steedos-dropdown-button",
@@ -22238,7 +22296,7 @@
                 }
                 return {
                     mode: "cards",
-                    perPageAvailable: [5, 10, 20, 50, 100, 500],
+                    perPageAvailable: [20, 50, 100, 500],
                     name: "thelist",
                     headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
                     className: "",
@@ -22271,7 +22329,7 @@
 
         return {
             mode: "table",
-            perPageAvailable: [5, 10, 20, 50, 100, 500],
+            perPageAvailable: [20, 50, 100, 500],
             name: "thelist",
             headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
             className: "",
@@ -22397,7 +22455,7 @@
 
     function getDefaultParams(options){
         return {
-            perPage: options.top || options.perPage || 10
+            perPage: options.top || options.perPage || 20
         }
     }
 
@@ -22451,7 +22509,6 @@
             "objectApiName": "\${objectName}",
             "recordId": "",
             "mode": "edit",
-            "layout": "normal"
         };
 
         if (payload && payload.schema) {
@@ -22660,7 +22717,7 @@
       const formSchema = {
         "type": "service",
         "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
-        "className": ctx.formFactor === 'SMALL' ? "slds-filters__body p-0 mb-2 overflow-y-auto overflow-x-hidden" : "slds-filters__body p-0 sm:grid sm:gap-2 sm:grid-cols-4 mb-2",
+        "className": ctx.formFactor === 'SMALL' ? "slds-filters__body p-0 mb-2 overflow-y-auto overflow-x-hidden" : "slds-filters__body p-0 sm:grid sm:gap-4 sm:grid-cols-4 p-2",
         "style":{
           "max-height":ctx.formFactor === 'SMALL'?"30vh":"unset"
         },
@@ -23247,7 +23304,7 @@
             "className": "slds-filters"
           },
           "size": "xs",
-          "className": `border-gray-300 border-y slds-grid slds-grid_vertical slds-nowrap ${!ctx.isLookup && "mt-2"}`,
+          "className": `border-y slds-grid slds-grid_vertical slds-nowrap ${!ctx.isLookup && "mt-2"}`,
           "visibleOn": "this.showFieldsFilter",
         },
         "className": "bg-white"
@@ -24208,7 +24265,7 @@
             "icon": "fa fa-cog",
             //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
             // "tooltip": i18next.t('frontend_button_listview_control_tooltip'),
-            "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded border-gray-300 text-gray-500",
+            "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded text-gray-500",
             "align": "right",
             "visibleOn": "${!isLookup}",
             "buttons": [
@@ -24235,14 +24292,14 @@
         {
           "type": "button",
           "label": instance.t('frontend_display_type_is_table'),
-          "onClick": "const key = 'tab_"+objectName+"_display';localStorage.setItem(key, 'grid');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');",
+          "onClick": "const key = 'tab_"+objectName+"_display';sessionStorage.setItem(key, 'grid');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": instance.t('frontend_display_type_is_split'),
-          "onClick": "const key = 'tab_"+objectName+"_display';localStorage.setItem(key, 'split');const url = document.location.pathname + '?display=split'; props.env.jumpTo(url);",
+          "onClick": "const key = 'tab_"+objectName+"_display';sessionStorage.setItem(key, 'split');const url = document.location.pathname + '?display=split'; props.env.jumpTo(url);",
           "rightIcon": displayAs === 'split' ? "fa fa-check" : null,
           "rightIconClassName": "m-l-sm"
         }
@@ -24253,7 +24310,7 @@
         "icon": "fa fa-table-columns",
         //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
         // "tooltip": `${i18next.t('frontend_display_as')} ${displayAsLabel}`,
-        "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded border-gray-300 text-gray-500",
+        "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded text-gray-500",
         "align": "right",
         "visibleOn": "${window:innerWidth > 768 && !!!isLookup}",
         "buttons": [ 
@@ -24385,7 +24442,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           {
             "type": "search-box",
             "name": keywordsSearchBoxName,
-            "placeholder": "搜索此列表",
+            "placeholder": "快捷搜索",
             "value": crudKeywords,
             // "clearable": true,//因为清除并不会触发失去焦点事件，只有禁用，但是它会触发change事件，所以等升级到amis 3.4+后可以重新放开
             "clearAndSubmit": true,
@@ -24446,7 +24503,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         //   //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
         //   // "tooltip": i18next.t('frontend_button_reload_tooltip'),
         //   "tooltipPlacement": "top",
-        //   "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+        //   "className": "bg-white p-2 rounded text-gray-500",
         //   "label": "",
         //   "icon": "fa fa-sync",
         //   "visibleOn": "${!showFieldsFilter}",
@@ -24470,7 +24527,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           // "tooltip": i18next.t('frontend_button_reload_tooltip'),
           "tooltip":"",
           "tooltipPlacement": "top",
-          "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
+          "className": "bg-white p-2 rounded text-gray-500"
         };
       }
       else {
@@ -24481,7 +24538,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           // "tooltip": i18next.t('frontend_button_reload_tooltip'),
           "tooltip":"",
           "tooltipPlacement": "top",
-          "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
+          "className": "bg-white p-2 rounded text-gray-500"
         };
       }
       let toolbarFilter;
@@ -24503,7 +24560,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             "visibleOn": "${isFieldsFilterEmpty == false && isLookup != true}"
           },
           "align": "right",
-          "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+          "className": "bg-white p-2 rounded text-gray-500",
           "onEvent": {
             "click": {
               "actions": [
@@ -24589,7 +24646,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         // ]
         if(options.displayAs === 'split'){
           return [
-            "switch-per-page",
+            {
+              "type": "switch-per-page",
+              "visibleOn": "${count >= 20}"
+            },
             {
               "type": "pagination",
               "maxButtons": 5,
@@ -24611,7 +24671,6 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       else {
         if(options && options.isRelated){
           return [
-            "statistics",
             {
               "type": "pagination",
               "maxButtons": 10,
@@ -24624,7 +24683,6 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           const no_pagination = mainObject.paging && (mainObject.paging.enabled === false);
           const is_lookup = options.isLookup;
           const commonConfig = [
-            "statistics",
             {
               "type": "pagination",
               "maxButtons": 10,
@@ -24635,7 +24693,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           if (no_pagination && is_lookup) {
             return commonConfig;
           } else {
-            return ["switch-per-page", ...commonConfig];
+            return [{
+              "type": "switch-per-page",
+              "visibleOn": "${count >= 20}"
+            }, ...commonConfig];
           }
         }
       }
@@ -24659,7 +24720,6 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         "timeOut": 1000
       }
     });
-    resizeWindow();
     const scope = event.context.scoped;
     // let filterFormValues = event.data;
     let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
@@ -24735,8 +24795,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-07-05 15:55:39
-     * @LastEditors: liaodaxue
-     * @LastEditTime: 2023-10-20 11:38:25
+     * @LastEditors: baozhoutao@steedos.com
+     * @LastEditTime: 2024-01-16 11:14:34
      * @Description:
      */
 
@@ -25303,17 +25363,13 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
     function getLookupSapceUserTreeSchema(isMobile){
         let apiAdaptor = `
-        // console.log("===getLookupSapceUserTreeSchema===", JSON.stringify(payload));
         const records = payload.data.options;
-        let isTreeOptionsComputed = false;
-        if(records.length === 1 && records[0].children){
-            isTreeOptionsComputed = true;
-        }
-        if(isTreeOptionsComputed){
-            return payload;
-        }
         const treeRecords = [];
-        const getChildren = (records, childrenIds) => {
+        const getChildren = (currentRecord, records, childrenIds) => {
+            if (currentRecord.children && typeof currentRecord.children[0] === "object") {
+                // 考虑api配置了cache缓存的话，不会请求接口但是会重新进这个接收适配器脚本且payload.data.options返回的会是上一次计算结果，这里直接返回计算过的children
+                return currentRecord.children;
+            }
             if (!childrenIds) {
                 return;
             }
@@ -25322,7 +25378,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             });
             _.each(children, (item) => {
                 if (item.children) {
-                    item.children = getChildren(records, item.children)
+                    item.children = getChildren(item, records, item.children)
                 }else{
                     item.children = [];
                 }
@@ -25348,7 +25404,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         
         _.each(records, (record) => {
             if (record.noParent == 1) {
-                treeRecords.push(Object.assign({}, record, { children: getChildren(records, record.children) }));
+                treeRecords.push(Object.assign({}, record, { children: getChildren(record, records, record.children) }));
             }
         });
         console.log(treeRecords)
@@ -25398,6 +25454,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
               }
             },
             "label": "",
+            "mode": "normal",
             "name": "organizations",
             "multiple": false,
             "joinValues": false,
@@ -25540,6 +25597,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             }
         });
 
+        let listviewFilter = getListViewFilter(listView);
+        let listviewFiltersFunction = listView && listView._filters;
+
         let sort = "";
         if(listView){
             sort = getListViewSort(listView);
@@ -25586,7 +25646,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             Object.assign(api.data.$self, __changedSearchBoxValues, __changedFilterFormValues);
         }
         const selfData = JSON.parse(JSON.stringify(api.data.$self));
-        var filters = [];
+        ${listviewFilter && !ctx.inFilterForm ? `var filters = ${JSON.stringify(listviewFilter)};` : 'var filters = [];'}
         var pageSize = api.data.pageSize || 10;
         var pageNo = api.data.pageNo || 1;
         var skip = (pageNo - 1) * pageSize;
@@ -25648,6 +25708,16 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         }
         
         const inFilterForm = ${ctx.inFilterForm};
+
+        const listviewFiltersFunction = ${listviewFiltersFunction};
+
+        if(listviewFiltersFunction && !inFilterForm){
+            const _filters0 = listviewFiltersFunction(filters, api.data.$self.__super);
+            if(_filters0 && _filters0.length){
+                filters.push(_filters0);
+            }
+        }
+        
         const filtersFunction = ${field.filtersFunction || field._filtersFunction};
 
         if(filtersFunction && !inFilterForm){
@@ -25766,13 +25836,15 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
             pickerSchema.affixHeader = false;
 
-            var headerToolbarItems = [];
+            
+
+            pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, fieldsArr, ctx.formFactor, { isLookup: true, keywordsSearchBoxName });
+            
             if(referenceTo.objectName === "space_users" && field.reference_to_field === "user"){
-                headerToolbarItems = getLookupSapceUserTreeSchema(isMobile);
+                pickerSchema.headerToolbar.push(getLookupSapceUserTreeSchema(isMobile));
                 pickerSchema.className = pickerSchema.className || "" + " steedos-select-user";
             }
-
-            pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, fieldsArr, ctx.formFactor, { headerToolbarItems, isLookup: true, keywordsSearchBoxName });
+            
             const isAllowCreate = refObjectConfig.permissions.allowCreate;
             const isCreate = lodash.exports.isBoolean(field.create) ? field.create : true;
             // lookup字段配置过滤条件就强制不显示新建按钮
@@ -25885,6 +25957,16 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             pickerSchema.footerToolbar = ["pagination"];
         }
 
+        if(field.inlineHelpText){
+            pickerSchema.toolbarClassName = "hasHelpText";
+            pickerSchema.headerToolbar = [{
+                "type": "tpl",
+                "tpl": field.inlineHelpText,
+                "className": "text-secondary"
+            }, ...pickerSchema.headerToolbar];
+        }
+        pickerSchema.className = (pickerSchema.className || "") + " steedos-lookup-crud";
+        
         const data = {
             type: getAmisStaticFieldType('picker', readonly),
             modalTitle:  instance.t('frontend_form_please_select') + " " + refObjectConfig.label,
@@ -25960,6 +26042,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         const refObjectConfig = referenceTo && await getUISchema(referenceTo.objectName);
         let listView = getLookupListView(refObjectConfig);
 
+        let listviewFilter = getListViewFilter(listView);
+        let listviewFiltersFunction = listView && listView._filters;
+
         let sort = "";
         if(listView){
             sort = getListViewSort(listView);
@@ -25989,7 +26074,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         apiInfo.data['rfield'] = `\${object_name}`;
         // [["_id", "=", "$${field.name}._id"],"or",["name", "contains", "$term"]]
         apiInfo.requestAdaptor = `
-        var filters = [];
+        ${listviewFilter && !ctx.inFilterForm ? `var filters = ${JSON.stringify(listviewFilter)};` : 'var filters = [];'}
         var top = 200;
         if(api.data.$term){
             filters = [["${referenceTo?.NAME_FIELD_KEY || 'name'}", "contains", api.data.$term]];
@@ -26012,6 +26097,16 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         }
 
         const inFilterForm = ${ctx.inFilterForm};
+
+        const listviewFiltersFunction = ${listviewFiltersFunction};
+
+        if(listviewFiltersFunction && !inFilterForm){
+            const _filters0 = listviewFiltersFunction(filters, api.data.$);
+            if(_filters0 && _filters0.length){
+                filters.push(_filters0);
+            }
+        }
+        
         const filtersFunction = ${field.filtersFunction || field._filtersFunction};
 
         if(filtersFunction && !inFilterForm){
@@ -26134,9 +26229,17 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         }
         // console.log(`lookupToAmis====`, field, readonly, ctx)
         if(readonly){
-            return {
-                type: getAmisStaticFieldType('picker', readonly),
-                tpl: getRelatedFieldTpl(field, ctx)
+            if(field.reference_to){
+                return {
+                    type: 'steedos-field',
+                    config: field,
+                    static: true
+                }
+            }else {
+                return {
+                    type: getAmisStaticFieldType('picker', readonly),
+                    tpl: getRelatedFieldTpl(field, ctx)
+                }
             }
         }
         if(field.reference_to && !lodash.exports.isString(field.reference_to) && !readonly){
@@ -26677,13 +26780,31 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 };
                 break;
             case 'input-datetime-range':
+                // convertData = {
+                //     type: "input-datetime-range",
+                //     inputFormat: 'YYYY-MM-DD HH:mm',
+                //     format:'YYYY-MM-DDTHH:mm:ss.SSSZ',
+                //     tpl: readonly ? Tpl.getDateTimeTpl(field) : null,
+                //     utc: true,
+                //     joinValues: false
+                // }
+                // 日期时间字段，按日期方式展现显示控件，用户不用关心小时分钟
                 convertData = {
-                    type: "input-datetime-range",
-                    inputFormat: 'YYYY-MM-DD HH:mm',
+                    type: "input-date-range",
+                    inputFormat: "YYYY-MM-DD HH:mm",
                     format:'YYYY-MM-DDTHH:mm:ss.SSSZ',
                     tpl: readonly ? getDateTimeTpl(field) : null,
                     utc: true,
-                    joinValues: false
+                    joinValues: false,
+                    "shortcuts": [
+                        "thismonth",
+                        "2monthsago",
+                        "3monthslater",
+                        "prevquarter",
+                        "thisquarter",
+                        "thisyear",
+                        "lastYear"
+                      ]
                 };
                 break;
             case 'datetime':
@@ -26734,7 +26855,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 convertData = {
                     type: getAmisStaticFieldType('datetime', readonly),
                     inputFormat: 'YYYY-MM-DD HH:mm',
-                    format: 'YYYY-MM-DDTHH:mm:ss.SSSZ',
+                    format: 'YYYY-MM-DDTHH:mm:00.000Z',
                     tpl: readonly ? getDateTimeTpl(field) : null,
                     utc: true,
                 };
@@ -26865,6 +26986,36 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     convertData = {
                         type: 'static-text'
                     };
+                }else if(field.autonumber_enable_modify){
+                    convertData = {
+                        "type": "input-group",
+                        "body": [
+                            {
+                                "type": "input-text",
+                                "name": field.name
+                            },
+                            {
+                                "type": "button",
+                                "label": "自动获取",
+                                "actionType": "ajax",
+                                "api": {
+                                    "url": `\${context.rootUrl}/api/autonumber/generator/\${objectName}/${field.name}`,
+                                    "method": "post",
+                                    "headers": {
+                                        "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                    },
+                                    "adaptor": `
+                                    payload.data["${field.name}"] = payload.data && payload.data.autonumber;
+                                    delete payload.data.autonumber;
+                                    return payload;
+                                `
+                                },
+                                "messages": {
+                                    "success": "获取成功"
+                                }
+                            }
+                        ]
+                    };
                 }
                 break;
             case 'url':
@@ -27019,11 +27170,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 if(field.subFields){
                     convertData = {
                         type: 'steedos-input-table',
-                        showIndex: true,
                         editable: !readonly,
                         addable: !readonly,
                         removable: !readonly,
-                        draggable: !readonly,
                         fields: [],
                         amis:{
                             columnsTogglable: false
@@ -27075,9 +27224,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             if(field.is_wide || convertData.type === 'group'){
                 convertData.className = 'col-span-2 m-0';
             }else {
-                convertData.className = 'm-1';
+                convertData.className = 'm-0';
             }
-            if(readonly){
+            if(readonly && ctx.mode !== 'edit'){
                 convertData.className = `${convertData.className} border-b`;
             }
             if(readonly){
@@ -27100,6 +27249,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 }
             }
 
+            if(ctx.amisData && ctx.amisData._master && ctx.amisData._master.relatedKey === field.name){
+                convertData.className = `${convertData.className || ''} hidden`;
+            }
+
             if(lodash.exports.isString(baseData.required)){
                 if(baseData.required.startsWith("{{")){
                     baseData.requiredOn = `${baseData.required.substring(2, baseData.required.length -2).replace(/formData./g, 'data.')}`;
@@ -27168,8 +27321,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 fieldNamePrefix = `${fieldNamePrefix}between__`;
             }
             if(_field.type === 'datetime'){
-                // 特意改为日期范围而不是日期时间范围，因为搜索时一般精确到日期就足够了，需要精确到日期时间范围需要在字段上配置amis属性来实现
-                _field.type = 'input-date-range';
+                // 这里如果想把搜索范围展示效果改为日期范围，不可以直接改为input-date-range，因为它们规则不一样，包括时区规则和小时分秒的存值规则都不一样
+                // 所以想改为展示日期范围效果，只能改input-datetime-range类型本身的属性来实现
+                _field.type = 'input-datetime-range';
                 _field.is_wide = true;
                 fieldNamePrefix = `${fieldNamePrefix}between__`;
             }