@steedos-widgets/sortable 3.6.2-beta.8 → 3.6.2

package/dist/sortable.umd.js

@@ -20233,27 +20233,33 @@
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-08-16 17:02:08
-     * @LastEditors: baozhoutao@steedos.com
-     * @LastEditTime: 2023-06-20 13:50:15
+     * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+     * @LastEditTime: 2024-02-02 10:15:00
      * @Description:
      */
 
-
     const Router = {
-        getTabDisplayAs(tab_id){
+        getTabDisplayAs(tab_id, defaultEnableSplit){
             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(defaultEnableSplit === true){
+                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 +20286,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 +20359,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>`
     }
@@ -20393,7 +20418,7 @@
         lodash.exports.forEach(selectOptions,(option)=>{
             const optionValue = option.value + '';
             const optionColor = option.color + '';
-            if(optionColor){
+            if(optionColor && optionColor != "undefined"){
                 const background = optionColor.charAt(0) === '#' ? optionColor : '#'+optionColor;
                 const color = getContrastColor(background);
                 const optionColorStyle = 'background:'+background+';color:'+color+';line-height:1.5rem';
@@ -20777,7 +20802,31 @@
             }
         }
         if(type === 'file'){
-            return {
+            return window.Meteor?.isCordova ? {
+                "type": "control",
+                "body": {
+                    "type": "each",
+                    "name": "_display." + steedosField.name,
+                    "items": {
+                        "type": "tpl",
+                        "tpl": "${name}",
+                        "className": "antd-Button--link inline-block",
+                        "onEvent": {
+                            "click": {
+                                "actions": [
+                                    {
+                                        "script": `
+                                        Steedos.cordovaDownload(encodeURI(event.data.url), event.data.name);
+                                    `,
+                                        "actionType": "custom"
+                                    }
+                                ],
+                                "weight": 0
+                            }
+                        }
+                    }
+                }
+            } : {
                 type: amisFieldType,
                 tpl: `
                 <% let fileData = data._display.${steedosField.name}; if (fileData) { %>
@@ -20921,6 +20970,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 +21058,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,
@@ -21063,7 +21114,7 @@
     var frontend_listview_control_delete_confirm_text = "如果您删除此列表视图，该视图将为所有具备访问权限的用户永久删除。是否确定要删除？";
     var frontend_listview_control_delete_message_success = "删除成功";
     var frontend_listview_control_filters = "过滤设置";
-    var frontend_listview_control_filters_fields_extend = "条件组件1";
+    var frontend_listview_control_filters_fields_extend = "条件组件";
     var frontend_listview_control_new_label = "新建";
     var frontend_listview_control_new_title = "新建 列表视图";
     var frontend_listview_control_new_message_success = "成功";
@@ -21097,6 +21148,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 +21237,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,
@@ -21239,7 +21292,7 @@
             isAmisVersionforBatchEdit = window.Amis.version[0] >= 3 && window.Amis.version[2] >= 2;
         }
         const quickEditId = options.objectName + "_" + field.name + "_quickEdit";//定义快速编辑的表单id，用于setvalue传值
-        var quickEditSchema = { body: [], id: quickEditId };
+        var quickEditSchema = { body: [], id: quickEditId, className: "steedos-table-quickEdit" };
         //select,avatar,image,file等组件无法行记录字段赋值，暂不支持批量编辑；
         if(field.type != 'avatar' && field.type != 'image' && field.type != 'file' && isAmisVersionforBatchEdit){
             const submitEvent = {
@@ -21498,7 +21551,8 @@
                                             "failed": "失败了呢。。"
                                           }
                                         }
-                                    }
+                                    },
+                                    "expression": "${!recordPermissions.modifyAllRecords}"
                                 },
                                 {
                                     "actionType": "setValue",
@@ -21514,7 +21568,7 @@
                                     "componentId": quickEditId,
                                     "args": {
                                         "value":{
-                                            "quickedit_record_permissions": "${event.data}"
+                                            "quickedit_record_permissions": "${recordPermissions.modifyAllRecords ? {'allowEdit': true} : event.data}"
                                         }
                                     }
                                 }
@@ -21578,7 +21632,7 @@
                                           `
                                             }
                                         },
-                                        "expression":"${event.data.value}"
+                                        "expression":"${event.data.value && !recordPermissions.modifyAllRecords}"
                                     },
                                     {
                                         "actionType": "setValue",
@@ -21609,10 +21663,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 +21737,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 +21767,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-words ";
+                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 +21820,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 +21839,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 +21850,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 +21865,7 @@
                     className,
                     inputClassName: "inline",
                     static: true,
-                }, field.amis, {name: field.name});
+                }, fieldAmis, {name: field.name});
             }
             else {
                 const tpl = await getFieldTpl(field, options);
@@ -21803,23 +21884,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 +21908,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';
@@ -22032,10 +22104,10 @@
                                         if(value.url){
                                             cms_url = value.url;
                                         }else{
-                                            cms_url = "/api/files/files/"+value+"?download=true"
+                                            cms_url = Steedos.absoluteUrl("/api/files/files/"+value+"?download=true");
                                         }
                                     }
-                                    Steedos.cordovaDownload(encodeURI(Steedos.absoluteUrl(cms_url)), event.data.name);
+                                    Steedos.cordovaDownload(encodeURI(cms_url), event.data.name);
                                 `,
                                     "actionType": "custom"
                                 }
@@ -22297,6 +22369,50 @@
         }
     }
 
+    /*
+        img/avatar字段值添加URL前缀使其在amis中正常显示图片。
+    */
+    function getScriptForAddUrlPrefixForImgFields(fields){
+        let imgFieldsKeys = [];
+        let imgFields = {};
+        fields.forEach((item)=>{
+            if(lodash.exports.includes(['image','avatar'], item.type)){
+                imgFieldsKeys.push(item.name);
+                imgFields[item.name] = {
+                    name: item.name,
+                    type: item.type,
+                    multiple: item.multiple
+                };
+            }
+        });
+        if(!imgFieldsKeys.length){
+            return '';
+        }
+        return `
+                // image字段值添加URL前缀
+                let imgFieldsKeys = ${JSON.stringify(imgFieldsKeys)};
+                let imgFields = ${JSON.stringify(imgFields)};
+                imgFieldsKeys.forEach((item)=>{
+                    let imgFieldValue = data[item];
+                    let imgFieldDisplayValue = data._display && data._display[item];
+                    if(imgFieldValue && imgFieldValue.length){
+                        let fieldProps = imgFields[item];
+                        if(fieldProps.multiple){
+                            if(imgFieldDisplayValue instanceof Array){
+                                data[item] = imgFieldDisplayValue.map((i)=>{ 
+                                    const url = window.getImageFieldUrl(i.url);
+                                    return url;
+                                });
+                            }
+                        }else{
+                            const url = imgFieldDisplayValue && window.getImageFieldUrl(imgFieldDisplayValue.url);
+                            data[item] = url;
+                        }
+                    }
+                })
+    `
+    }
+
     /******************************************************************************
     Copyright (c) Microsoft Corporation.
 
@@ -22668,7 +22784,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"
         },
@@ -23255,7 +23371,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"
@@ -23301,6 +23417,7 @@
                           "objectApiName": "object_listviews",
                           "recordId": "",
                           "mode": "edit",
+                          "layout": "normal",
                           "defaultData": {
                             "&": "${list_view}",
                             "name":"",
@@ -23308,8 +23425,16 @@
                             "filters":"",
                             "shared":false,
                             "object_name": "${targetObjectName}",
+                            "_id":"",
+                            "shared_to": null,
+                            "shared_to_organizations": null,
+                            "locked": false,
+                            "owner": null,
+                            "company_id": null,
+                            "company_ids": null,
+                            "is_system": false
                           },
-                          "fieldsExtend": fieldsExtend$4(),
+                          "fieldsExtend": fieldsExtend$5(),
                           "fields": fields$1(),
                           "onEvent": {
                             "submitSucc": {
@@ -23360,14 +23485,17 @@
         "mobile_columns",
         "searchable_fields",
         "is_system",
-        "shared"
+        "shared",
+        "shared_to",
+        "shared_to_organizations"
       ]
     }
 
-    function fieldsExtend$4(){
+    function fieldsExtend$5(){
       return {
         "group": "",
         "label": {
+          "group": "",
           "is_wide": true
         },
         "name": {
@@ -23449,9 +23577,19 @@
         "shared": {
           "group": "",
           "amis": {
-            "visibleOn": "${global.user.is_space_admin}"
+            "visibleOn": "${false}"
           }
         },
+        "shared_to": {
+          "group": "",
+          "amis":{
+            "type": "radios",
+            "inline": false
+          }
+        },
+        "shared_to_organizations": {
+          "group": ""
+        },
         "filters": {
           "group": "",
           "amis": {
@@ -23489,14 +23627,23 @@
                           "objectApiName": "object_listviews",
                           "recordId": "",
                           "mode": "edit",
+                          "layout": "normal",
                           "defaultData": {
                             "&": "${list_view}",
                             "name":"",
                             "label": instance.t('frontend_listview_control_clone_defaultData_label_start') + " ${list_view.label} " + instance.t('frontend_listview_control_clone_defaultData_label_end'),
                             "shared":false,
                             "object_name": "${targetObjectName}",
+                            "_id":"",
+                            "shared_to": null,
+                            "shared_to_organizations": null,
+                            "locked": false,
+                            "owner": null,
+                            "company_id": null,
+                            "company_ids": null,
+                            "is_system": false
                           },
-                          "fieldsExtend": fieldsExtend$3(),
+                          "fieldsExtend": fieldsExtend$4(),
                           "fields": fields(),
                           "onEvent": {
                             "submitSucc": {
@@ -23544,13 +23691,16 @@
         "mobile_columns.$.field",
         "searchable_fields.$.field",
         "is_system",
-        "shared"
+        "shared",
+        "shared_to",
+        "shared_to_organizations"
       ]
     }
 
-    function fieldsExtend$3(){
+    function fieldsExtend$4(){
       return {
         "label": {
+          "group": "",
           "is_wide": true
         },
         "name": {
@@ -23600,10 +23750,21 @@
           }
         },
         "shared": {
+          "group": "",
           "amis": {
-            "visibleOn": "${global.user.is_space_admin}"
+            "visibleOn": "${false}"
           }
         },
+        "shared_to": {
+          "group": "",
+          "amis":{
+            "type": "radios",
+            "inline": false
+          }
+        },
+        "shared_to_organizations": {
+          "group": ""
+        },
         "filters": {
           "group": "",
           "amis": {
@@ -23613,6 +23774,12 @@
       }
     }
 
+    /*
+     * @Author: 殷亮辉 yinlianghui@hotoa.com
+     * @Date: 2023-06-13 13:51:19
+     * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+     * @LastEditTime: 2024-02-05 11:25:09
+     */
     const getRenameListviewButtonSchema = ()=>{
         return {
             "type": "button",
@@ -23638,6 +23805,7 @@
                           "label": "对象表单",
                           "objectApiName": "object_listviews",
                           "recordId": "${recordId}",
+                          "layout": "normal",
                           "mode": "edit",
                           "fields": [
                             "label"
@@ -23672,6 +23840,12 @@
         }
     };
 
+    /*
+     * @Author: 殷亮辉 yinlianghui@hotoa.com
+     * @Date: 2023-06-13 13:51:19
+     * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+     * @LastEditTime: 2024-02-06 15:38:49
+     */
     const getSetListviewShareButtonSchema = ()=>{
         return {
             "type": "button",
@@ -23687,6 +23861,8 @@
                       "title": instance.t('frontend_listview_control_share'),
                       "data": {
                         "recordId": "${uiSchema.list_views[listName]._id}",
+                        "appId": "${appId}",
+                        "global": "${global}",
                         "context": "${context}"
                       },
                       "body": [
@@ -23696,9 +23872,12 @@
                           "objectApiName": "object_listviews",
                           "recordId": "${recordId}",
                           "mode": "edit",
+                          "layout": "normal",
                           "fields": [
-                            "shared"
-                          ]
+                            "shared_to",
+                            "shared_to_organizations"
+                          ],
+                          "fieldsExtend": fieldsExtend$3(),
                         }
                       ],
                       "showCloseButton": true,
@@ -23716,6 +23895,21 @@
         }
     };
 
+    function fieldsExtend$3(){
+      return {
+        "shared_to": {
+          "group": "",
+          "amis":{
+            "type": "radios",
+            "inline": false
+          }
+        },
+        "shared_to_organizations": {
+          "group": ""
+        }
+      }
+    }
+
     const getSetListviewFiltersButtonSchema = ()=>{
         return {
             "type": "button",
@@ -23847,10 +24041,12 @@
     function fieldsExtend$2(){
       return {
         "filters": {
+          "label": "",
+          "group": "",
           "visible_on": "true",
           "amis": {
             "type": "condition-builder",
-            "label": instance.t('frontend_listview_control_filters_fields_extend'),
+            // "label": i18next.t('frontend_listview_control_filters_fields_extend'),
             "source": {
               "method": "get",
               "url": "${context.rootUrl}/service/api/amis-metadata-listviews/getFilterFields?objectName=${targetObjectName}",
@@ -23893,6 +24089,7 @@
                           "objectApiName": "object_listviews",
                           "recordId": "${recordId}",
                           "mode": "edit",
+                          "layout": "normal",
                           "fieldsExtend": fieldsExtend$1(),
                           "initApiAdaptor": initApiAdaptor$1(),
                           "apiRequestAdaptor": apiRequestAdaptor$1(),
@@ -24089,6 +24286,8 @@
     function fieldsExtend(){
       return {
         "sort": {
+          "label": "",
+          "group": "",
           "amis": {
             "type": "tabs-transfer",
             "sortable": true,
@@ -24216,7 +24415,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": [
@@ -24237,20 +24436,20 @@
         }
     };
 
-    const getDisplayAsButton = function(objectName, showDisplayAs){
-      let displayAs = Router.getTabDisplayAs(objectName);
+    const getDisplayAsButton = function(objectName, defaultEnableSplit){
+      let displayAs = Router.getTabDisplayAs(objectName, defaultEnableSplit);
       let buttons = [
         {
           "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"
         }
@@ -24261,7 +24460,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": [ 
@@ -24454,7 +24653,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}",
@@ -24478,7 +24677,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 {
@@ -24489,7 +24688,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;
@@ -24511,7 +24710,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": [
@@ -24525,7 +24724,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           "id": "steedos_crud_toolbar_filter"
         };
       }
-      let toolbarDisplayAsButton = getDisplayAsButton(mainObject?.name);
+      let toolbarDisplayAsButton = getDisplayAsButton(mainObject?.name, mainObject?.enable_split);
       let toolbarDQuickSearchBox = getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup, keywordsSearchBoxName });
 
       // toolbars返回的数组元素不可以是空对象{}，比如hiddenCount ? {} : {"type": "tpl",...}，因为空对象最终还是会生成一个空的.antd-Crud-toolbar-item dom
@@ -24671,7 +24870,6 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         "timeOut": 1000
       }
     });
-    resizeWindow();
     const scope = event.context.scoped;
     // let filterFormValues = event.data;
     let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
@@ -24747,8 +24945,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-07-05 15:55:39
-     * @LastEditors: baozhoutao@steedos.com
-     * @LastEditTime: 2024-01-16 11:14:34
+     * @LastEditors: liaodaxue
+     * @LastEditTime: 2024-02-05 17:56:27
      * @Description:
      */
 
@@ -25315,17 +25513,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;
             }
@@ -25334,7 +25528,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 = [];
                 }
@@ -25360,7 +25554,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)
@@ -25410,6 +25604,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
               }
             },
             "label": "",
+            "mode": "normal",
             "name": "organizations",
             "multiple": false,
             "joinValues": false,
@@ -25552,6 +25747,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             }
         });
 
+        let listviewFilter = getListViewFilter(listView);
+        let listviewFiltersFunction = listView && listView._filters;
+
         let sort = "";
         if(listView){
             sort = getListViewSort(listView);
@@ -25598,7 +25796,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;
@@ -25660,6 +25858,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){
@@ -25747,6 +25955,16 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         });
         payload.data.rows = treeRecords;
     }
+    const result = payload.data.rows;
+    if(result && result.length){
+        const updatedResult = _.map(result, (element) => {
+            const data = { ...element };
+            // image字段值添加URL前缀
+            ${getScriptForAddUrlPrefixForImgFields(lodash.exports.values(refObjectConfig.fields))}
+            return data;
+        });
+        payload.data.rows = updatedResult;
+    }
     return payload;
     `;
         if(field.optionsFunction || field._optionsFunction){
@@ -25778,13 +25996,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字段配置过滤条件就强制不显示新建按钮
@@ -25897,8 +26117,19 @@ 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),
+            className: ctx.className || '',
             modalTitle:  instance.t('frontend_form_please_select') + " " + refObjectConfig.label,
             labelField: referenceTo.labelField.name,
             valueField: referenceTo.valueField.name,
@@ -25972,6 +26203,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);
@@ -26001,7 +26235,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]];
@@ -26024,6 +26258,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){
@@ -26100,6 +26344,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             // 但是同时配置autoComplete和source会多请求一次接口
             // TODO:应该想办法把是否字段在子表组件内，即ctx.isInputTable，如果不在子表组件内不需要加source
             data.source = apiInfo;
+            delete data.autoComplete;
         }
         //删除xlink:href中的rootUrl前缀，解决客户端svg为空的问题
         const select_menuTpl = `<span class='flex items-center mt-0.5'>
@@ -26146,7 +26391,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         }
         // console.log(`lookupToAmis====`, field, readonly, ctx)
         if(readonly){
-            if(field.reference_to){
+            if(field.reference_to && !field.isTableField){
+                //isTableField只在grid字段内存在
                 return {
                     type: 'steedos-field',
                     config: field,
@@ -26357,8 +26603,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2023-01-13 17:27:54
-     * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-     * @LastEditTime: 2023-08-28 17:45:38
+     * @LastEditors: liaodaxue
+     * @LastEditTime: 2024-02-04 17:29:54
      * @Description: 
      */
 
@@ -26459,7 +26705,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                       "title": "Insert",
                       "items": "image link media addcomment pageembed codesample inserttable | charmap emoticons hr | pagebreak nonbreaking anchor tableofcontents | insertdatetime"
                     }
-                  }
+                  },
+                  "statusbar": false
                 },
                 "name": field.name
             }
@@ -26697,13 +26944,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':
@@ -26754,7 +27019,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,
                 };
@@ -26885,6 +27150,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':
@@ -27090,12 +27385,13 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 break;
         }
         if(!lodash.exports.isEmpty(convertData)){
+            const className = convertData.className;
             if(field.is_wide || convertData.type === 'group'){
-                convertData.className = 'col-span-2 m-0';
+                convertData.className = className ? 'col-span-2 m-0 ' + className : 'col-span-2 m-0';
             }else {
-                convertData.className = 'm-0';
+                convertData.className = className ? 'm-0 ' + className : 'm-0';
             }
-            if(readonly){
+            if(readonly && ctx.mode !== 'edit'){
                 convertData.className = `${convertData.className} border-b`;
             }
             if(readonly){
@@ -27103,11 +27399,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             }
 
             let fieldTypeClassName = ' steedos-' + convertData.type + (readonly ? '-readonly' : '-edit');
-            if (convertData.className) {
-                convertData.className = convertData.className + fieldTypeClassName;
-            } else {
-                convertData.className = fieldTypeClassName;
-            }
+            convertData.className = convertData.className + fieldTypeClassName;
 
             if(field.visible_on && !ctx.inFilterForm){
                 // convertData.visibleOn = `\$${field.visible_on.substring(1, field.visible_on.length -1).replace(/formData./g, '')}`;
@@ -27190,8 +27482,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__`;
             }