@steedos-widgets/amis-object 6.3.0-beta.9 → 6.3.1

package/dist/amis-object.cjs.js

@@ -3736,9 +3736,9 @@ function getSelectMap(selectOptions){
 }
 
 function getNameTplUrl(field, ctx){
-    if(ctx.objectName === 'cms_files'){
-        return "${(versions[0] && versions[0].url) ? versions[0].url+'?download=true' : context.rootUrl+'/api/files/files/'+versions[0]+'?download=true'}"
-    }
+    // if(ctx.objectName === 'cms_files'){
+    //     return "${(versions[0] && versions[0].url) ? versions[0].url+'?download=true' : context.rootUrl+'/api/files/files/'+versions[0]+'?download=true'}"
+    // }
     const href = Router$1.getObjectDetailPath({
         ...ctx,  formFactor: ctx.formFactor, appId: "${appId}", objectName: ctx.objectName || "${objectName}", recordId: `\${${ctx.idFieldName}}`
     });
@@ -3753,7 +3753,7 @@ function getNameTpl(field, ctx){
     }
     let nameLabel = field.name;
     //若字段类型是lookup，则按照相关表tpl的label规则显示；若是其它类型，则显示_display或字段本身的值
-    if (field.type == "lookup") {
+    if (field.type == "lookup" || field.type == "master_detail") {
         if(!field.reference_to && (field.optionsFunction || field._optionsFunction || field.options)){
             if(!field.isTableField){
                 nameLabel = `\${${field.name}__label}`;
@@ -3928,12 +3928,15 @@ async function getFieldTpl (field, options){
     }
 }
 
-async function getFieldsTemplate(fields, display){
+async function getFieldsTemplate(object, fields, display){
     let expandFields = [];
     if(display != false){
         display = true;
     }
     let fieldsName = ['_id'];
+    if(!object.datasource || object.datasource === 'default' || object.datasource === 'meteor'){
+        fieldsName.push('space');
+    }
     let displayFields = [];
     let fieldsArr = [];
     if(_$1__namespace.isArray(fields)){
@@ -4029,7 +4032,7 @@ async function getFindOneQuery$1(object, recordId, fields, options){
         }
     }
     return {
-        query: `{${alias}:${object.name}${queryOptions}{${await getFieldsTemplate(fields)}, ${getRecordPermissionsTemplate()}}}`
+        query: `{${alias}:${object.name}${queryOptions}{${await getFieldsTemplate(object, fields)}, ${getRecordPermissionsTemplate()}}}`
     }
 }
 
@@ -4218,7 +4221,7 @@ async function getFindQuery(object, recordId, fields, options){
     //     return item.replace(/^{/,"").replace(/}$/,"");
     // }).join(",")) : "";
 
-    const fieldsTemplate = `${await getFieldsTemplate(fields, options.expand)}${treeFields}${cfsFields}`;
+    const fieldsTemplate = `${await getFieldsTemplate(object, fields, options.expand)}${treeFields}${cfsFields}`;
 
     return {
         orderBy: "${orderBy}",
@@ -4266,7 +4269,7 @@ function getRecordPermissionsQuery(object, recordId, options){
 function getApi$2 (isMobile){
     if(isMobile);else {
         // return __meteor_runtime_config__.ROOT_URL_PATH_PREFIX + "/graphql"
-        return `\${context.rootUrl}/graphql?reload=\${additionalFilters}`
+        return `\${context.rootUrl}/graphql?reload=\${additionalFilters|join}`
     }
 }
 
@@ -4334,6 +4337,29 @@ function getAmisStaticFieldType$1(type, readonly, options){
     }
 }
 
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-07-13 15:18:03
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-04-11 10:34:26
+ * @Description: 
+ */
+
+async function getPage({type, pageId = '', appId, objectName = '', recordId = '', formFactor = 'LARGE'}){
+    const api = `/api/pageSchema/${type}?app=${appId}&objectApiName=${objectName}&recordId=${recordId}&pageId=${pageId}&formFactor=${formFactor}`;
+    const page = await fetchAPI(api);
+    if (page && page.schema) {
+        page.schema = JSON.parse(page.schema);
+        if(page.schema.data){
+            delete page.schema.data.recordId;
+            delete page.schema.data.objectName;
+            delete page.schema.data.context;
+            delete page.schema.data.global;
+        }
+        return page;
+    }
+}
+
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-10-28 14:15:09
@@ -4357,9 +4383,74 @@ const getAmisFieldType$1 = (steedosField, readonly)=>{
     return getAmisStaticFieldType$1(steedosField.type === 'avatar' ? 'image' : steedosField.type, readonly, {multiple: steedosField.multiple});
 };
 
-const getAmisFileReadonlySchema = (steedosField)=>{
+async function getLookupLinkOnClick$1(field, options) {
+    const recordPage = await getPage({ type: 'record', appId: options.appId, objectName: options.objectName, formFactor: options.formFactor });
+
+    const drawerRecordDetailSchema = recordPage ? Object.assign({}, recordPage.schema, {
+        "recordId": `\${${field.name}}`,
+        "data": {
+            ...recordPage.schema.data,
+            "_inDrawer": true,  // 用于判断是否在抽屉中
+            "recordLoaded": false, // 重置数据加载状态
+            "objectName": options.objectName,
+        }
+    }) : {
+        "type": "steedos-record-detail",
+        "objectApiName": options.objectName,
+        "recordId": `\${${field.name}}`,
+        "showBackButton": false,
+        "showButtons": true,
+        "data": {
+            "_inDrawer": true,  // 用于判断是否在抽屉中
+            "recordLoaded": false, // 重置数据加载状态
+        }
+    };
+    return {
+        "click": {
+            "actions": [
+                // {
+                //     "type": "custom",
+                //     "script": `
+                //         let fileRecordId = url.match(${regFileRecordId})[2]; 
+                //         console.log('fileRecordId:',fileRecordId);
+                //         event.data.recordId = fileRecordId;
+                //     `,
+                // },
+                {
+                    "actionType": "drawer",
+                    "drawer": {
+                        "type": "drawer",
+                        "title": " ",
+                        "headerClassName": "hidden",
+                        "size": "lg",
+                        "bodyClassName": "p-0 m-0 bg-gray-100",
+                        "closeOnEsc": true,
+                        "closeOnOutside": true,
+                        "resizable": true,
+                        "actions": [],
+                        "body": [
+                            drawerRecordDetailSchema
+                        ],
+                        "className": "steedos-record-detail-drawer app-popover"
+                    },
+                    "preventDefault": true
+                }
+            ]
+        }
+    }
+}
+
+const  getAmisFileReadonlySchema = async (steedosField,ctx = {})=>{
     const type = steedosField.type;
+    const { appId, formFactor } = ctx.amisData || {};
     const amisFieldType = getAmisFieldType$1(steedosField, true);
+    
+    let lookupATagClick = 'onclick="return false;"';
+
+    if(window.innerWidth < 768){
+        lookupATagClick = "";
+    }
+
     if(_.includes(['avatar','image'], type)){
         return {
             type: amisFieldType,
@@ -4394,13 +4485,34 @@ const getAmisFileReadonlySchema = (steedosField)=>{
                 }
             }
         } : {
-            type: amisFieldType,
-            tpl: `
-                <% let fileData = data._display.${steedosField.name}; if (fileData) { %>
-                    <% if(!Array.isArray(fileData)){ fileData = [fileData]}  %>
-                    <% fileData.forEach(function(item) { %> 
-                        <a href='<%= item.url %>' target='_self' class='block'><%= item.name %></a> 
-                <% });} %>`
+            // type: amisFieldType,
+            // tpl: `
+            //     <% let fileData = data._display.${steedosField.name}; if (fileData) { %>
+            //         <% if(!Array.isArray(fileData)){ fileData = [fileData]}  %>
+            //         <% fileData.forEach(function(item) { %> 
+            //             <a href='<%= item.url %>' target='_self' class='block'><%= item.name %></a> 
+            //     <% });} %>`
+            "type": "control",
+            "body": {
+                type: 'each',
+                placeholder: "",
+                // className: `steedos-field-lookup-each flex flex-wrap gap-2`,
+                source: `\${_display.${steedosField.name}|asArray}`,
+                items: {
+                    type: 'static',
+                    labelClassName: "hidden",
+                    label: false,
+                    className: 'm-0',
+                    tpl: `<a href="/app/-/cfs_files_filerecord/view/\${${steedosField.name}}" ${lookupATagClick}>\${name}</a>`,
+                    // tpl: "<%= item.name >",
+                    // onEvent: window.innerWidth < 768 ? null : REFERENCE_VALUE_ITEM_ONCLICK
+                    onEvent: window.innerWidth < 768 ? null : await getLookupLinkOnClick$1(steedosField, {
+                        appId,
+                        objectName: "cfs_files_filerecord",
+                        formFactor
+                    })
+                }
+            }
         }
     }
 };
@@ -4462,8 +4574,8 @@ const getAmisFileEditSchema = (steedosField)=>{
     return convertData;
 };
 
-const getAmisFileSchema = (steedosField, readonly)=>{
-    return readonly ? getAmisFileReadonlySchema(steedosField) : getAmisFileEditSchema(steedosField);
+const getAmisFileSchema = async (steedosField, readonly, ctx)=>{
+    return readonly ? await getAmisFileReadonlySchema(steedosField,ctx) : getAmisFileEditSchema(steedosField);
 };
 
 var frontend_field_group_generalization$1 = "General";
@@ -4480,6 +4592,7 @@ var frontend_form_confirm$1 = "Confirm";
 var frontend_form_delete$1 = "Delete";
 var frontend_form_view$1 = "view";
 var frontend_form_details$1 = "details";
+var frontend_form_validation_failed_url$1 = "The URL format is incorrect";
 var frontend_delete_confirm_text$1 = "Are you sure you want to delete this item?";
 var frontend_delete_many_selected_required$1 = "Please select the item to be deleted";
 var frontend_delete_many_confirm_text$1 = "Are you sure you want to delete?";
@@ -4536,6 +4649,7 @@ var frontend_setup$1 = "Setup";
 var frontend_notifications$1 = "Notifications";
 var frontend_notifications_allread$1 = "Mark all as read";
 var frontend_notifications_allread_message$1 = "All marked as read";
+var frontend_notifications_close_dialog$1 = "Close";
 var frontend_profile$1 = "Profile";
 var switch_space$1 = "Switch Space";
 var frontend_about$1 = "About";
@@ -4568,6 +4682,7 @@ var en_us = {
 	frontend_form_delete: frontend_form_delete$1,
 	frontend_form_view: frontend_form_view$1,
 	frontend_form_details: frontend_form_details$1,
+	frontend_form_validation_failed_url: frontend_form_validation_failed_url$1,
 	frontend_delete_confirm_text: frontend_delete_confirm_text$1,
 	frontend_delete_many_selected_required: frontend_delete_many_selected_required$1,
 	frontend_delete_many_confirm_text: frontend_delete_many_confirm_text$1,
@@ -4624,6 +4739,7 @@ var en_us = {
 	frontend_notifications: frontend_notifications$1,
 	frontend_notifications_allread: frontend_notifications_allread$1,
 	frontend_notifications_allread_message: frontend_notifications_allread_message$1,
+	frontend_notifications_close_dialog: frontend_notifications_close_dialog$1,
 	frontend_profile: frontend_profile$1,
 	switch_space: switch_space$1,
 	frontend_about: frontend_about$1,
@@ -4657,6 +4773,7 @@ var frontend_form_confirm = "确认";
 var frontend_form_delete = "删除";
 var frontend_form_view = "查看";
 var frontend_form_details = "详情";
+var frontend_form_validation_failed_url = "URL 格式不正确";
 var frontend_delete_confirm_text = "确定要删除此项目?";
 var frontend_delete_many_selected_required = "请选择要删除的项";
 var frontend_delete_many_confirm_text = "确定要删除吗？";
@@ -4714,6 +4831,7 @@ var frontend_setup = "设置";
 var frontend_notifications = "通知";
 var frontend_notifications_allread = "全部标记为已读";
 var frontend_notifications_allread_message = "已全部标记为已读";
+var frontend_notifications_close_dialog = "关闭";
 var frontend_profile = "个人资料";
 var switch_space = "切换工作区";
 var frontend_about = "关于";
@@ -4746,6 +4864,7 @@ var zh_cn = {
 	frontend_form_delete: frontend_form_delete,
 	frontend_form_view: frontend_form_view,
 	frontend_form_details: frontend_form_details,
+	frontend_form_validation_failed_url: frontend_form_validation_failed_url,
 	frontend_delete_confirm_text: frontend_delete_confirm_text,
 	frontend_delete_many_selected_required: frontend_delete_many_selected_required,
 	frontend_delete_many_confirm_text: frontend_delete_many_confirm_text,
@@ -4803,6 +4922,7 @@ var zh_cn = {
 	frontend_notifications: frontend_notifications,
 	frontend_notifications_allread: frontend_notifications_allread,
 	frontend_notifications_allread_message: frontend_notifications_allread_message,
+	frontend_notifications_close_dialog: frontend_notifications_close_dialog,
 	frontend_profile: frontend_profile,
 	switch_space: switch_space,
 	frontend_about: frontend_about,
@@ -4975,7 +5095,12 @@ async function getQuickEditSchema(object, columnField, options){
                     break;
                 case "percent":
                     TempDisplayField = `
-                            _display["${field.name}"] = event.data.value.toFixed(${field.scale}) + '%';
+                            if(event.data.value){
+                                _display["${field.name}"] = event.data.value.toFixed(${field.scale}) + '%';
+                            } else {
+                                _display["${field.name}"] = event.data.value;
+                            }
+                            
                         `;
                     quickEditSchema.body[0].onEvent["change"] = quickEditOnEvent(TempDisplayField);
                     break;
@@ -5319,6 +5444,60 @@ function getFieldWidth(width){
     }
 }
 
+async function getColumnItemOnClick(field, options){
+    const recordPage = await getPage({ type: 'record', appId: options.appId, objectName: options.objectName, formFactor: options.formFactor });
+    const drawerRecordDetailSchema = recordPage ? Object.assign({}, recordPage.schema, {
+        "recordId": `\${${options.idFieldName}}`,
+        "data": {
+            ...recordPage.schema.data,
+            "_inDrawer": true,  // 用于判断是否在抽屉中
+            "recordLoaded": false, // 重置数据加载状态
+            "recordId": `\${${options.idFieldName}}`//审批微页面依赖了作用域中的recordId
+        }
+    }) : {
+        "type": "steedos-record-detail",
+        "objectApiName": "${objectName}",
+        "recordId": `\${${options.idFieldName}}`,
+        "showBackButton": false,
+        "showButtons": true,
+        "data": {
+            "_inDrawer": true,  // 用于判断是否在抽屉中
+            "recordLoaded": false, // 重置数据加载状态
+        }
+    };
+
+    if(!(field.is_name || field.name === options.labelFieldName)){
+        drawerRecordDetailSchema.objectApiName = field.reference_to;
+        drawerRecordDetailSchema.recordId = `\${_display.${field.name}.value}`;
+    }
+    return {
+        "click": {
+          "actions": [
+            {
+                "actionType": "drawer",
+                "drawer": {
+                  "type": "drawer",
+                  "title": "&nbsp;",
+                  "headerClassName": "hidden",
+                  "size": "lg",
+                  "bodyClassName": "p-0 m-0 bg-gray-100",
+                  "closeOnEsc": true,
+                  "closeOnOutside": true,
+                  "resizable": true,
+                  "actions": [],
+                  "body": [
+                    drawerRecordDetailSchema
+                  ],
+                  "className": "steedos-record-detail-drawer app-popover",
+                  "id": "u:fc5f055afa8c"
+                },
+                "preventDefault": true
+            }
+          ]
+        }
+    };
+}
+
 async function getTableColumns$1(object, fields, options){
     const columns = [];
     if(!options.isLookup && !options.isInputTable){
@@ -5334,7 +5513,7 @@ async function getTableColumns$1(object, fields, options){
         }
         //增加quickEdit属性，实现快速编辑
         const quickEditSchema = allowEdit ? await getQuickEditSchema(object, field, options) : allowEdit;
-        let className = "";
+        let className = `steedos-table-${field.type}-field`;
         const bowserType = getBowserType();
         if(bowserType === "Safari"){
             className += " whitespace-nowrap ";
@@ -5358,7 +5537,10 @@ async function getTableColumns$1(object, fields, options){
         delete fieldAmis?.className;
 
         let columnItem;
-        if((field.is_name || field.name === options.labelFieldName) && options.objectName === 'cms_files'){
+
+        // PC客户端点击名称字段直接预览
+        let isNode = !!(window && window.nw && window.nw.require);
+        if((field.is_name || field.name === options.labelFieldName) && options.objectName === 'cms_files' && isNode){
             const previewFileScript = `
                 var data = event.data;
                 var file_name = data.versions ? data.name : "${field.label}";
@@ -5373,20 +5555,20 @@ async function getTableColumns$1(object, fields, options){
                 "onEvent": {
                   "click": {
                     "actions": [
-                        {
-                            "args": {
-                                "api": {
-                                    "url": "${(versions[0] && versions[0].url) ? versions[0].url+'?download=true' : context.rootUrl+'/api/files/files/'+versions[0]+'?download=true'}",
-                                    "method": "get",
-                                    "headers": {
-                                        "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                                    }
-                                }
-                            },
-                            "actionType": "download",
-                            // "expression": "!!!window?.nw?.require"//浏览器上直接下载
-                            "expression": "!!!(window && window.nw && window.nw.require)"//浏览器上直接下载
-                        },
+                        // {
+                        //     "args": {
+                        //         "api": {
+                        //             "url": "${(versions[0] && versions[0].url) ? versions[0].url+'?download=true' : context.rootUrl+'/api/files/files/'+versions[0]+'?download=true'}",
+                        //             "method": "get",
+                        //             "headers": {
+                        //                 "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                        //             }
+                        //         }
+                        //     },
+                        //     "actionType": "download",
+                        //     // "expression": "!!!window?.nw?.require"//浏览器上直接下载
+                        //     "expression": "!!!(window && window.nw && window.nw.require)"//浏览器上直接下载
+                        // },
                         {
                             "args": {},
                             "actionType": "custom",
@@ -5417,7 +5599,7 @@ async function getTableColumns$1(object, fields, options){
                 toggled: field.toggled,
                 static: true,
                 className,
-                ...getAmisFileReadonlySchema(field)
+                ...await getAmisFileReadonlySchema(field)
             }, fieldAmis, {name: field.name});
         }
         else if(field.type === 'select'){
@@ -5484,51 +5666,7 @@ async function getTableColumns$1(object, fields, options){
                 }
 
                 if(window.innerWidth >= 768 && ((field.is_name || field.name === options.labelFieldName) || ((field.type == 'lookup' || field.type == 'master_detail') && _$1__namespace.isString(field.reference_to) && field.multiple != true)) && options.isRelated){
-                    
-                    const drawerRecordDetailSchema = {
-                        "type": "steedos-record-detail",
-                        "objectApiName": "${objectName}",
-                        "recordId": `\${${options.idFieldName}}`,
-                        "showBackButton": false,
-                        "showButtons": true,
-                        "data": {
-                          "_inDrawer": true,  // 用于判断是否在抽屉中
-                          "recordLoaded": false, // 重置数据加载状态
-                        }
-                    };
-
-
-                    if(!(field.is_name || field.name === options.labelFieldName)){
-                        drawerRecordDetailSchema.objectApiName = field.reference_to;
-                        drawerRecordDetailSchema.recordId = `\${_display.${field.name}.value}`;
-                    }
-                    
-                    columnItem.onEvent = {
-                        "click": {
-                          "actions": [
-                            {
-                                "actionType": "drawer",
-                                "drawer": {
-                                  "type": "drawer",
-                                  "title": "&nbsp;",
-                                  "headerClassName": "hidden",
-                                  "size": "lg",
-                                  "bodyClassName": "p-0 m-0 bg-gray-100",
-                                  "closeOnEsc": true,
-                                  "closeOnOutside": true,
-                                  "resizable": true,
-                                  "actions": [],
-                                  "body": [
-                                    drawerRecordDetailSchema
-                                  ],
-                                  "className": "steedos-record-detail-drawer app-popover",
-                                  "id": "u:fc5f055afa8c"
-                                },
-                                "preventDefault": true
-                            }
-                          ]
-                        }
-                    };
+                    columnItem.onEvent = await getColumnItemOnClick(field, options);
                 }
 
             }
@@ -5741,17 +5879,23 @@ async function getMobileTableColumns(fields, options){
                 onEvent: {
                     "click": {
                         "actions": [
+                            // {
+                            //     "args": {
+                            //         "api": {
+                            //             "url": url,
+                            //             "method": "get",
+                            //             "headers": {
+                            //                 "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                            //             }
+                            //         }
+                            //     },
+                            //     "actionType": "download"
+                            // }
                             {
+                                "actionType": "link",
                                 "args": {
-                                    "api": {
-                                        "url": url,
-                                        "method": "get",
-                                        "headers": {
-                                            "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                                        }
-                                    }
-                                },
-                                "actionType": "download"
+                                    "link": url
+                                }
                             }
                         ],
                         "weight": 0
@@ -6450,8 +6594,8 @@ function getReadonlyFormAdaptor(object, fields, options){
 
     var fieldNames = _$1__namespace.map(fields, function(n){return n.name});
     var nameField = object.fields[object.NAME_FIELD_KEY];
-    let nameLabel = nameField.name;
-    if (nameField.type == "lookup") {
+    let nameLabel = nameField && nameField.name;
+    if (nameField && (nameField.type == "lookup" || nameField.type == "master_detail")) {
         if(!nameField.reference_to && (nameField.optionsFunction || nameField._optionsFunction || nameField.options)){
             if(!nameField.isTableField){
                 nameLabel = `record.${nameField.name}__label`;
@@ -6459,8 +6603,8 @@ function getReadonlyFormAdaptor(object, fields, options){
         } else {
             nameLabel = `record._display.${nameField.name}.label`;
         }
-    } else {
-        nameLabel = `record._display.${nameField.name} || record.${nameField.name}`;
+    } else if (nameField){
+        nameLabel = `(record._display ? record._display.${nameField.name} : record.${nameField.name})`;
     }
     return  `
     if(payload.data.data.length === 0){
@@ -7843,16 +7987,6 @@ const getSchema$5 = async (uiSchema, ctx) => {
             data: formSchema
         };
     `;
-    const onDialogCancelScript = `
-        // 这里加setTimeout是因为amis的Bug，它会先触发cancel事件执行此脚本关闭父窗口然后再关闭子窗口
-        // 正确的顺序应该是先关闭子窗口再关闭父窗口，顺序错了会造成第二次点击新建按钮的时候异常
-        setTimeout(function(){
-            doAction({
-                "actionType": "cancel",
-                "componentId": "object_actions_drawer_${uiSchema.name}"
-            });
-        }, 200);
-    `;
     const getSelectedRowsScript = `
         const isLookup = event.data.isLookup;
         if(isLookup){
@@ -7942,17 +8076,6 @@ const getSchema$5 = async (uiSchema, ctx) => {
                                     "closeOnEsc": false,
                                     "closeOnOutside": false,
                                     "size": "lg",
-                                    "onEvent": {
-                                        "cancel": {
-                                            "actions": [
-                                                {
-                                                    "actionType": "custom",
-                                                    "script": onDialogCancelScript,
-                                                    "expression": "${window:innerWidth < 768}",
-                                                }
-                                            ]
-                                        }
-                                    },
                                     "actions": [
                                         {
                                             type: 'button',
@@ -7988,34 +8111,11 @@ const getSchema$5 = async (uiSchema, ctx) => {
     }
 };
 
-/*
- * @Author: baozhoutao@steedos.com
- * @Date: 2022-07-13 15:18:03
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-04-11 10:34:26
- * @Description: 
- */
-
-async function getPage({type, pageId = '', appId, objectName = '', recordId = '', formFactor = 'LARGE'}){
-    const api = `/api/pageSchema/${type}?app=${appId}&objectApiName=${objectName}&recordId=${recordId}&pageId=${pageId}&formFactor=${formFactor}`;
-    const page = await fetchAPI(api);
-    if (page && page.schema) {
-        page.schema = JSON.parse(page.schema);
-        if(page.schema.data){
-            delete page.schema.data.recordId;
-            delete page.schema.data.objectName;
-            delete page.schema.data.context;
-            delete page.schema.data.global;
-        }
-        return page;
-    }
-}
-
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:49:58
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-06-28 23:22:31
+ * @LastEditors: yinlianghui@hotoa.com yinlianghui@hotoa.com
+ * @LastEditTime: 2024-05-19 10:01:07
  * @Description:
  */
 
@@ -8045,16 +8145,6 @@ const getSchema$4 = async (uiSchema, ctx) => {
       : page.schema;
   }
   
-  const onDialogCancelScript = `
-    // 这里加setTimeout是因为amis的Bug，它会先触发cancel事件执行此脚本关闭父窗口然后再关闭子窗口
-    // 正确的顺序应该是先关闭子窗口再关闭父窗口，顺序错了会造成第二次点击编辑按钮的时候异常
-    setTimeout(function(){
-      doAction({
-        "actionType": "cancel",
-        "componentId": "object_actions_drawer_${uiSchema.name}"
-      });
-    }, 200);
-  `;
 
   return {
     type: "service",
@@ -8077,18 +8167,26 @@ const getSchema$4 = async (uiSchema, ctx) => {
                   closeOnEsc: false,
                   closeOnOutside: false,
                   showCloseButton: true,
-                  size: "lg",
-                  "onEvent": {
-                    "cancel": {
-                      "actions": [
-                        {
-                          "actionType": "custom",
-                          "script": onDialogCancelScript,
-                          "expression": "${window:innerWidth < 768}",
-                        }
-                      ]
-                    }
+                  "data": {
+                    "&": "$$",
+                    "_master": "${_master}",
+                    "_master._isRelated": "${_isRelated}",
+                    "_master.relatedKey": "${relatedKey}"
                   },
+                  size: "lg",
+                  "actions": [
+                    {
+                        type: 'button',
+                        actionType: 'cancel',
+                        label: instance.t('frontend_form_cancel')
+                    },
+                    {
+                        type: 'button',
+                        actionType: 'confirm',
+                        label: instance.t('frontend_form_save'),
+                        primary: true
+                    },
+                  ]
                 },
               },
             ],
@@ -8868,6 +8966,100 @@ const getObjectDetailHeaderButtons = (objectSchema, recordId)=>{
     };
 };
 
+const getDropdown = (dropdownButtons)=>{
+    const dropdown = {
+        "type": "dropdown-button",
+        "icon": "fa fa-angle-down",
+        "size": "sm",
+        "hideCaret": true,
+        "className": "mr-0 steedos-mobile-header-drop-down",
+        "closeOnClick": true,
+        "menuClassName": "buttons-drawer fixed bg-none border-0 shadow-none",
+        "align": "right",
+        "body": [
+            {
+                "type": "action",
+                "style": {
+                    "z-index": 1,
+                    "background": "var(--Drawer-overlay-bg)",
+                    "height": "100%",
+                    "width": "100%",
+                    "padding": "0",
+                    "margin": "0",
+                    "border-radius": "0"
+                }
+            },
+            {
+                "type": "wrapper",
+                "style": {
+                    "position": "fixed",
+                    "bottom": 0,
+                    "z-index": 2,
+                    "width": "100vw",
+                    "left": "0",
+                    "padding": "0",
+                    "background": "white",
+                    "box-shadow": "0 -10px 10px -10px rgba(0, 0, 0, 0.2)"
+                },
+                "body": [
+                    {
+                        "type": "flex",
+                        "justify": "space-between",
+                        "items": [
+                            {
+                                "type": "tpl",
+                                "tpl": "操作",
+                                "style": {
+                                    "padding": "4px 12px",
+                                    "align-items": "center",
+                                    "display": "flex"
+                                }
+                            },
+                            {
+                                "type": "action",
+                                "label": "",
+                                "icon": "fa fa-times",
+                                "level": "link",
+                                "style": {
+                                    "color": "black"
+                                },
+                            }
+                        ],
+                        "style": {
+                            "padding-top": "0.5rem",
+                            "padding-bottom": "0.5rem",
+                            "border-bottom": "var(--Drawer-content-borderWidth) solid var(--Drawer-header-borderColor)"
+                        }
+                    },
+                    {
+                        "type": "wrapper",
+                        "body": [
+                            {
+                                "type": "button-group",
+                                "id": "u:fd837823be5b",
+                                "vertical": true,
+                                "tiled": true,
+                                "buttons": dropdownButtons,
+                                "className": "w-full overflow-auto",
+                                "btnClassName": "w-full",
+                                "size": "lg"
+                            }
+                        ],
+                        "style": {
+                            "padding": "0",
+                            "overflow": "auto",
+                            "max-height": "70vh"
+                        }
+                    }
+
+                ]
+            }
+        ]
+    };
+
+    return dropdown;
+};
+
 const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
     const { buttons, moreButtons, moreButtonsVisibleOn } = getObjectDetailHeaderButtons(objectSchema, recordId);
     if(ctx.formFactor === 'SMALL'){
@@ -8891,46 +9083,7 @@ const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
             }
         });
 
-        return [
-            {
-                "type": "button",
-                "icon": "fa fa-angle-down",
-                "visibleOn": phoneMoreButtonsVisibleOn,
-                "onEvent": {
-                  "click": {
-                    "actions": [
-                      {
-                        "actionType": "drawer",
-                        "drawer": {
-                          "type": "drawer",
-                          "title": instance.t('frontend_operation'),
-                          "id": "object_actions_drawer_" + objectSchema.name,
-                          "body": [
-                            {
-                              "type": "button-group",
-                              "id": "u:fd837823be5b",
-                              "vertical": true,
-                              "tiled": true,
-                              "buttons": dropdownButtons,
-                              "btnLevel": "enhance",
-                              "className": "w-full",
-                              "btnClassName": "w-full",
-                              "size": "lg"
-                            }
-                          ],
-                          "position": "bottom",
-                          "closeOnOutside": true,
-                          "resizable": false,
-                          "className": "buttons-drawer",
-                          "bodyClassName": "m-none p-none",
-                          "actions": []
-                        }
-                      }
-                    ]
-                  }
-                }
-              }
-        ]
+        return [getDropdown(dropdownButtons)];
     }else {
         if(moreButtons.length > 0){
             const dropdownButtonsSchema = {
@@ -8951,54 +9104,16 @@ const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
 const getObjectListViewButtonsSchemas = (objectSchema, ctx)=>{
     const buttons = getListViewButtons(objectSchema, ctx);
     if(ctx.formFactor === 'SMALL'){
-        return {
-            "type": "button",
-            "icon": "fa fa-angle-down",
-            "className": "mr-0",
-            "onEvent": {
-              "click": {
-                "actions": [
-                  {
-                    "actionType": "drawer",
-                    "drawer": {
-                      "type": "drawer",
-                      "title": instance.t('frontend_operation'),
-                      "id": "object_actions_drawer_" + objectSchema.name,
-                      "body": [
-                        {
-                          "type": "button-group",
-                          "id": "u:fd837823be5b",
-                          "vertical": true,
-                          "tiled": true,
-                          "buttons": [
-                            ..._$1__namespace.map(buttons, (button)=>{
-                                return {
-                                    type: 'steedos-object-button',
-                                    name: button.name,
-                                    objectName: button.objectName,
-                                    visibleOn: getButtonVisibleOn(button),
-                                    className: `button_${button.name} w-full`
-                                }
-                            })
-                          ],
-                          "btnLevel": "enhance",
-                          "className": "w-full",
-                          "btnClassName": "w-full",
-                          "size": "lg"
-                        }
-                      ],
-                      "position": "bottom",
-                      "closeOnOutside": true,
-                      "resizable": false,
-                      "className": "buttons-drawer",
-                      "bodyClassName": "m-none p-none",
-                      "actions": []
-                    }
-                  }
-                ]
-              }
+        const dropdownButtons = _$1__namespace.map(buttons, (button)=>{
+            return {
+                type: 'steedos-object-button',
+                name: button.name,
+                objectName: button.objectName,
+                visibleOn: getButtonVisibleOn(button),
+                className: `button_${button.name} w-full`
             }
-          }
+        });
+        return getDropdown(dropdownButtons);
     }else {
         return _$1__namespace.map(buttons, (button) => {
             return {
@@ -9015,55 +9130,19 @@ const getObjectListViewButtonsSchemas = (objectSchema, ctx)=>{
 const getObjectRecordDetailRelatedListButtonsSchemas = (objectSchema, ctx)=>{
     const buttons = getObjectRelatedListButtons(objectSchema, ctx);
     if(ctx.formFactor === 'SMALL'){
-        return {
-            "type": "button",
-            "icon": "fa fa-angle-down",
-            "onEvent": {
-              "click": {
-                "actions": [
-                  {
-                    "actionType": "drawer",
-                    "drawer": {
-                      "type": "drawer",
-                      "title": instance.t('frontend_operation'),
-                      "id": "object_actions_drawer_" + objectSchema.name,
-                      "body": [
-                        {
-                          "type": "button-group",
-                          "vertical": true,
-                          "tiled": true,
-                          "buttons": [
-                            ..._$1__namespace.map(buttons, (button)=>{
-                                return {
-                                    type: 'steedos-object-button',
-                                    name: button.name,
-                                    objectName: button.objectName,
-                                    visibleOn: getButtonVisibleOn(button),
-                                    className: `button_${button.name} w-full`
-                                }
-                            })
-                          ],
-                          "btnLevel": "enhance",
-                          "className": "w-full",
-                          "btnClassName": "w-full",
-                          "size": "lg"
-                        }
-                      ],
-                      "position": "bottom",
-                      "closeOnOutside": true,
-                      "resizable": false,
-                      "className": "buttons-drawer",
-                      "bodyClassName": "m-none p-none",
-                      "actions": []
-                    }
-                  }
-                ]
-              }
+        const dropdownButtons = _$1__namespace.map(buttons, (button)=>{
+            return {
+                type: 'steedos-object-button',
+                name: button.name,
+                objectName: button.objectName,
+                visibleOn: getButtonVisibleOn(button),
+                className: `button_${button.name} w-full`
             }
-          }
+        });
+        return [getDropdown(dropdownButtons)];
     }else {
         return _$1__namespace.map(buttons, (button) => {
-            return {
+            return {                                                                                                                                                                                                                                                                                                                                                                    
                 type: 'steedos-object-button',
                 name: button.name,
                 objectName: button.objectName,
@@ -9698,6 +9777,217 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
   };
 }
 
+const getNewListviewButtonSchema = ()=>{
+    return {
+        "type": "button",
+        "label": instance.t('frontend_listview_control_new_label'),
+        "className": "steedos-listview-new-button",
+        "onEvent": {
+          "click": {
+            "weight": 0,
+            "actions": [
+              {
+                "dialog": {
+                  "type": "dialog",
+                  "title": instance.t('frontend_listview_control_new_title'),
+                  "data": {
+                    //"&":"$$",2.7、2.9、3.0在此处失效
+                    "all": "${uiSchema.list_views.all}",
+                    "list_view": "${uiSchema.list_views[listName]}",
+                    "appId": "${appId}",
+                    "global": "${global}",
+                    "targetObjectName": "${objectName}",
+                    "context": "${context}"
+                  },
+                  "body": [
+                    {
+                      "type": "steedos-object-form",
+                      "label": "对象表单",
+                      "objectApiName": "object_listviews",
+                      "recordId": "",
+                      "mode": "edit",
+                      "layout": "normal",
+                      "defaultData": {
+                        "&": "${list_view}",
+                        "name":"",
+                        "label":"",
+                        "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$5(),
+                      "fields": fields$1(),
+                      "onEvent": {
+                        "submitSucc": {
+                          "weight": 0,
+                          "actions": [
+                            {
+                              "args": {
+                                // 直接使用recordId不能拿到数据，只能通过result里面拿数据
+                                "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/listview_${result.data.recordId|lowerCase}",
+                                "blank": false
+                              },
+                              "actionType": "url",
+                            }
+                          ]
+                        }
+                      },
+                      "messages": {
+                        "success": instance.t('frontend_listview_control_new_message_success'),
+                        "failed": instance.t('frontend_listview_control_new_message_failed')
+                      },
+                    }
+                  ],
+                  "showCloseButton": true,
+                  "showErrorMsg": true,
+                  "showLoading": true,
+                  "closeOnEsc": false,
+                  "dataMapSwitch": false,
+                  "size": "lg"
+                },
+                "actionType": "dialog"
+              }
+            ]
+          }
+        }
+    }
+};
+
+function fields$1(){
+  return [
+    "label",
+    "name",
+    "object_name",
+    "filter_scope",
+    "show_count",
+    "columns",
+    "sort",
+    "filters",
+    "mobile_columns",
+    "searchable_fields",
+    "is_system",
+    "shared",
+    "shared_to",
+    "shared_to_organizations"
+  ]
+}
+
+function fieldsExtend$5(){
+  return {
+    "group": "",
+    "label": {
+      "group": "",
+      "is_wide": true
+    },
+    "name": {
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "object_name": {
+      "group": "",
+      "amis": {
+        "hidden": true
+      }
+    },
+    "filter_scope": {
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "columns": {
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "mobile_columns":{
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "searchable_fields":{
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "filter_fields": {
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "scrolling_mode": {
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "sort": {
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "show_count": {
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "type": {
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "shared": {
+      "group": "",
+      "amis": {
+        "visibleOn": "${false}"
+      }
+    },
+    "shared_to": {
+      "group": "",
+      "amis":{
+        "type": "radios",
+        "inline": false
+      }
+    },
+    "shared_to_organizations": {
+      "group": ""
+    },
+    "filters": {
+      "group": "",
+      "amis": {
+        "hidden": true
+      }
+    }
+  }
+}
+
 /**
  * 列表视图顶部第一行amisSchema
  * @param {*} objectSchema 对象UISchema
@@ -9707,16 +9997,482 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
   const { icon, label } = objectSchema;
   const disabled_list_views = objectSchema.permissions.disabled_list_views;
   const listViewButtonOptions = [];
-  _$1.each(
-    objectSchema.list_views,
-    (listView, name) => {
-      if(name === "lookup" || (disabled_list_views && disabled_list_views.indexOf(listView._id)>-1)){
-        // 内置lookup为弹出选择专用视图，根据用户权限被禁用的视图，不显示在列表切换区域
+  const initApiAdaptor = `
+    var data;
+    if (recordId) {
+      data = payload.data || { _filters_type_controller: 'conditions' };
+      //数据格式转换
+      if (data) {
+        data.sort = lodash.map(data.sort, (item) => {
+          return item.field_name + ":" + item.order;
+        });
+        data.searchable_fields = lodash.map(data.searchable_fields, 'field');
+    
+        if (data.filters && lodash.isString(data.filters)) {
+          try {
+            data.filters = JSON.parse(data.filters);
+          } catch (e) { }
+        }
+    
+        if (data.filters && lodash.isString(data.filters)) {
+          data._filters_type_controller = 'function';
+        } else {
+          data._filters_type_controller = 'conditions'
+        }
+    
+        if (data._filters_type_controller === 'conditions') {
+          data._filters_conditions = window.amisConvert.filtersToConditions(data.filters || []);
+        } else {
+          data._filters_function = data.filters;
+        }
+      }
+    } else {
+    const uiSchema = api.body.uiSchema;
+    const contextDefaultData = context && context.data && context.data.defaultData; const defaultData = api.body.defaultData || contextDefaultData;
+      let defaultValues = {};
+    _.each(uiSchema && uiSchema.fields, function (field) {
+        var value = SteedosUI.getFieldDefaultValue(field, api.body.global);
+        if (!_.isNil(value)) {
+          defaultValues[field.name] = value;
+        }
+      });
+    if (defaultData && _.isObject(defaultData) && !_.isArray(defaultData)) {
+        data = Object.assign({}, defaultValues, defaultData); 
+      }else{data = Object.assign({}, defaultValues) } 
+    }
+    for (key in data) {
+      if (data[key] === null) {
+        delete data[key];
+      }
+    }
+    payload.data = data;
+    delete payload.extensions; if (data.is_enable != false) { data.is_enable = true; };
+    return payload;
+  `;
+  const apiRequestAdaptor = `
+    delete formData.created;
+    delete formData.created_by;
+    delete formData.modified;
+    delete formData.modified_by;
+    delete formData._display;
+    
+    //数据格式转换
+    formData.sort = lodash.map(formData.sort, (item) => {
+      const arr = item.split(':');
+      return { field_name: arr[0], order: arr[1] };
+    });
+    
+    formData.searchable_fields = lodash.map(formData.searchable_fields, (item) => {
+      return { field: item };
+    });
+    
+    if (!formData._filters_type_controller) {
+      formData._filters_type_controller = 'conditions';
+    }
+    
+    if (formData._filters_type_controller === 'conditions' && formData._filters_conditions) {
+      formData.filters = window.amisConvert.conditionsToFilters(formData._filters_conditions);
+      // formData.filters = JSON.stringify(window.amisConvert.conditionsToFilters(formData._filters_conditions), null, 4);
+    } else {
+      formData.filters = formData._filters_function || null;
+    }
+    
+    delete formData._filters_type_controller;
+    delete formData._filters_conditions;
+    delete formData._filters_function;
+    
+    query = \`mutation{record: object_listviews__insert(doc: {__saveData}){_id}}\`;
+    if (formData.recordId) {
+      query = \`mutation{record: object_listviews__update(id: "\` + formData._id + \`", doc: {__saveData}){_id}}\`;
+    };
+    __saveData = JSON.stringify(JSON.stringify(formData));
+    
+    api.data = { query: query.replace('{__saveData}', __saveData) };
+    return api;
+  `;
+  _$1.each(
+    objectSchema.list_views,
+    (listView, name) => {
+      if(name === "lookup" || (disabled_list_views && disabled_list_views.indexOf(listView._id)>-1)){
+        // 内置lookup为弹出选择专用视图，根据用户权限被禁用的视图，不显示在列表切换区域
         return;
       }
       listViewButtonOptions.push({
         type: "button",
         label: listView.label,
+        body: [
+          {
+            "type": "flex",
+            "alignItems": "center",
+            "justify": "space-between",
+            "items": [
+              {
+                "type": "tpl",
+                "tpl": listView.label 
+              },
+              {
+                "type": "button",
+                "className": "steedos-listview-edit-button ml-3",
+                "icon": "fa fa-edit",
+                "actionType": "dialog",
+                "hiddenOn": `!((global.user.is_space_admin || global.userId == '${listView.owner || ""}') && !!'${listView.owner || ""}')`,
+                "dialog": {
+                  "type": "dialog",
+                  "title": "编辑 列表视图",
+                  "data": {
+                    "object_name": "${objectName}",
+                    "recordId": listView._id,
+                    "listName": "${listName}",
+                    "appId": "${appId}",
+                    "context": "${context}",
+                    "global": "${global}",
+                    "_id": listView._id
+                  },
+                  "body": [
+                    {
+                      "type": "steedos-object-form",
+                      "label": "对象表单",
+                      "objectApiName": "object_listviews",
+                      "recordId": "${recordId}",
+                      "className": "sm:rounded sm:border-gray-300 bg-white",
+                      "layout": "horizontal",
+                      "form": {
+                        "id": "form_object_listviews"
+                      },
+                      "mode": "edit",
+                      "enableTabs": true,
+                      "fields": [
+                        "label",
+                        "sort_no",
+                        "crud_mode",
+                        "shared",
+                        "shared_to",
+                        'shared_to_organizations',
+                        "columns",
+                        "columns.$",
+                        "columns.$.field",
+                        "columns.$.width",
+                        "columns.$.wrap",
+                        "mobile_columns",
+                        "mobile_columns.$",
+                        "mobile_columns.$.field",
+                        "sort",
+                        "sort.$",
+                        "sort.$.field_name",
+                        "sort.$.order",
+                        "filters",
+                        "searchable_fields",
+                        "searchable_fields.$",
+                        "searchable_fields.$.field",
+                      ],
+                      "tabsMode": "line",
+                      "fieldsExtend": {
+                        "columns": {
+                          "amis": {
+                            "showIndex": true,
+                            "footerToolbar": [
+                              {
+                                "type": "button",
+                                "label": "${'object_listviews.listview_form.field_set' | t}",
+                                "actionType": "dialog",
+                                "dialog": {
+                                  "type": "dialog",
+                                  "title": "${'object_listviews.listview_form.displayed_columns' | t}",
+                                  "size": "md",
+                                  "body": [
+                                    {
+                                      "type": "transfer",
+                                      "options": [
+                                      ],
+                                      "multiple": true,
+                                      "id": "u:92c0b3cccca0",
+                                      "required": true,
+                                      "placeholder": "-",
+                                      "className": "col-span-2 m-0",
+                                      "checkAll": false,
+                                      "searchable": true,
+                                      "sortable": true,
+                                      "itemHeight": 40,
+                                      "source": {
+                                        "method": "get",
+                                        "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${object_name}/fields/options",
+                                        "headers": {
+                                          "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                        },
+                                        "requestAdaptor": "",
+                                        "adaptor": ""
+                                      },
+                                      "joinValues": false,
+                                      "extractValue": true,
+                                      "name": "columns_quick_select",
+                                      "value": "${columns|pick:field|split}"
+                                    }
+                                  ],
+                                  "onEvent": {
+                                    "confirm": {
+                                      "actions": [
+                                        {
+                                          "actionType": "custom",
+                                          "script": "const columns = [];\nconst columns_quick_select = _.cloneDeep(event.data.columns_quick_select);\n_.forEach(columns_quick_select, function (field) {\n  const column_field = _.find(event.data.columns, { field });\n  if (column_field) {\n    columns.push(column_field)\n  } else {\n    columns.push({\n      field\n    })\n  }\n});\ndoAction({\n  \"componentId\": \"form_object_listviews\",\n  \"actionType\": \"setValue\",\n  \"args\": {\n    \"value\": {\n      columns\n    }\n  }\n});"
+                                        }
+                                      ]
+                                    }
+                                  }
+                                }
+                              }
+                            ],
+                            "addable": false,
+                            "draggable": false,
+                            "columns": [
+                              {
+                                "name": "field",
+                                "inlineEditMode": false
+                              },
+                              {
+                                "name": "width",
+                                "width": 100
+                              },
+                              {
+                                "name": "wrap",
+                                "width": 50
+                              }
+                            ],
+                            "enableDialog": false
+                          }
+                        },
+                        "sort": {
+                          "label": "",
+                          "amis": {
+                            "type": "tabs-transfer",
+                            "options": [
+                            ],
+                            "id": "u:32f3e4e73115",
+                            "strictMode": true,
+                            "itemHeight": 40,
+                            "source": {
+                              "method": "get",
+                              "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${object_name}/sortFields/options",
+                              "headers": {
+                                "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                              },
+                              "data": null,
+                              "requestAdaptor": "",
+                              "adaptor": "",
+                              "sendOn": "!!this.object_name"
+                            },
+                            "visibleOn": "!!this.object_name",
+                            "sortable": true,
+                            "className": "col-span-2 m-0",
+                            "searchable": true,
+                            "checkAll": false,
+                            "clearValueOnHidden": false,
+                            "joinValues": false,
+                            "extractValue": true,
+                            "en-US": {
+                              "label": "Default Sort Order"
+                            },
+                            "multiple": true
+                          }
+                        },
+                        "filters": {
+                          "label": "",
+                          "amis": {
+                            "type": "group",
+                            "body": [
+                              {
+                                "type": "radios",
+                                "label": "${'object_listviews.listview_form.filter_configuration_method' | t}",
+                                "name": "_filters_type_controller",
+                                "options": [
+                                  {
+                                    "label": "${'object_listviews.listview_form.conditions_combination' | t}",
+                                    "value": "conditions"
+                                  },
+                                  {
+                                    "label": "${'object_listviews.listview_form.javascript' | t}",
+                                    "value": "function"
+                                  }
+                                ],
+                                "id": "u:318671bc196c",
+                                "joinValues": true,
+                                "className": "col-span-2 m-0",
+                                "language": "javascript",
+                                "visibleOn": "false",
+                                "en-US": {
+                                  "label": "Controller"
+                                }
+                              },
+                              {
+                                "type": "condition-builder",
+                                "label": "",
+                                "labelClassName": "none",
+                                "name": "_filters_conditions",
+                                "description": "",
+                                "id": "u:a9f2232e30d7",
+                                "source": {
+                                  "method": "get",
+                                  "url": "${context.rootUrl}/service/api/amis-metadata-listviews/getFilterFields?objectName=${object_name}",
+                                  "dataType": "json",
+                                  "headers": {
+                                    "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                  }
+                                },
+                                "disabled": false,
+                                "className": "col-span-2 m-0",
+                                "visibleOn": "!!this.object_name",
+                                "en-US": {
+                                  "label": "Filters Conditions"
+                                }
+                              },
+                              {
+                                "type": "editor",
+                                "label": "${'object_listviews.listview_form.javascript' | t}",
+                                "name": "_filters_function",
+                                "id": "u:84714ec9abba",
+                                "visibleOn": "!!this.object_name && !!this._filters_type_controller && _filters_type_controller== 'function'",
+                                "className": "col-span-2 m-0",
+                                "labelClassName": "hidden"
+                              }
+                            ]
+                          }
+                        },
+                        "mobile_columns": {
+                          "amis": {
+                            "showIndex": true,
+                            "footerToolbar": [
+                              {
+                                "type": "button",
+                                "label": "${'object_listviews.listview_form.field_set' | t}",
+                                "actionType": "dialog",
+                                "dialog": {
+                                  "type": "dialog",
+                                  "title": "${'object_listviews.listview_form.displayed_columns' | t}",
+                                  "size": "md",
+                                  "body": [
+                                    {
+                                      "type": "transfer",
+                                      "options": [
+                                      ],
+                                      "multiple": true,
+                                      "id": "u:92c0b3cccca0",
+                                      "required": true,
+                                      "placeholder": "-",
+                                      "className": "col-span-2 m-0",
+                                      "itemHeight": 40,
+                                      "checkAll": false,
+                                      "searchable": true,
+                                      "sortable": true,
+                                      "source": {
+                                        "method": "get",
+                                        "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${object_name}/fields/options",
+                                        "headers": {
+                                          "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                        },
+                                        "requestAdaptor": "",
+                                        "adaptor": ""
+                                      },
+                                      "joinValues": false,
+                                      "extractValue": true,
+                                      "name": "columns_quick_select",
+                                      "value": "${mobile_columns|pick:field|split}"
+                                    }
+                                  ],
+                                  "onEvent": {
+                                    "confirm": {
+                                      "actions": [
+                                        {
+                                          "actionType": "custom",
+                                          "script": "const mobile_columns = [];\nconst columns_quick_select = _.cloneDeep(event.data.columns_quick_select);\n_.forEach(columns_quick_select, function (field) {\n  const column_field = _.find(event.data.mobile_columns, { field });\n  if (column_field) {\n    mobile_columns.push(column_field)\n  } else {\n    mobile_columns.push({\n      field\n    })\n  }\n});\ndoAction({\n  \"componentId\": \"form_object_listviews\",\n  \"actionType\": \"setValue\",\n  \"args\": {\n    \"value\": {\n      mobile_columns\n    }\n  }\n});"
+                                        }
+                                      ]
+                                    }
+                                  }
+                                }
+                              }
+                            ],
+                            "columns": [
+                              {
+                                "name": "field",
+                                "inlineEditMode": false
+                              }
+                            ],
+                            "addable": false,
+                            "draggable": false,
+                            "enableDialog": false
+                          }
+                        },
+                        "searchable_fields": {
+                          "label": "",
+                          "amis": {
+                            "type": "transfer",
+                            "options": [
+                            ],
+                            "selectMode": "list",
+                            "searchable": true,
+                            "searchApi": "",
+                            "sortable": true,
+                            "mode": "normal",
+                            "searchResultMode": "list",
+                            "joinValues": false,
+                            "extractValue": true,
+                            "itemHeight": 40,
+                            "source": {
+                              "method": "get",
+                              "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${object_name}/fields/options",
+                              "headers": {
+                                "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                              },
+                              "data": null,
+                              "requestAdaptor": "",
+                              "adaptor": "",
+                              "sendOn": "!!this.object_name"
+                            },
+                            "visibleOn": "!!this.object_name",
+                            "className": "col-span-2 m-0",
+                            "multiple": true,
+                            "id": "u:adb91066539e"
+                          }
+                        },
+                        "shared_to": {
+                          "amis":{
+                            "type": "radios",
+                            "inline": false
+                          },
+                          "group": "",
+                          "is_wide": true
+                        }
+                      },
+                      initApiAdaptor,
+                      apiRequestAdaptor,
+                      "onEvent": {
+                        "submitSucc": {
+                          "weight": 0,
+                          "actions": [
+                            {
+                              "args": {
+                                "url": "${context.rootUrl}/app/${appId}/${object_name}/grid/${name}",
+                                "blank": false
+                              },
+                              "actionType": "url",
+                            },
+                          ]
+                        }
+                      },
+                      "id": "u:ce9e3fcc411a"
+                    }
+                  ],
+                  "className": "steedos-overflow-visible-dialog",
+                  "showCloseButton": true,
+                  "showErrorMsg": true,
+                  "showLoading": true,
+                  "closeOnEsc": false,
+                  "dataMapSwitch": false,
+                  "size": "lg"
+                }
+              }
+            ]
+          }
+        ],
         actionType: "link",
         link: `/app/\${appId}/${objectSchema.name}/grid/${name}`
       });
@@ -9750,6 +10506,8 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
       "visibleOn": "${display == 'split'?true:false}"
     });
   }
+  const listviewNewButton = getNewListviewButtonSchema();
+  listviewNewButton.visibleOn = "global.user.is_space_admin";
   return {
     "type": "grid",
     "columns": [
@@ -9780,14 +10538,24 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
                   },
                   {
                     "type": "dropdown-button",
-                    "className": "", 
+                    "className": "steedos-listview-change-button", 
                     "label": "\${listName ? uiSchema.list_views[listName].label : uiSchema.list_views[defaultListName].label}",
                     "rightIcon": "fa fa-caret-down",
                     "size": "sm",
                     "hideCaret": true,
                     "closeOnClick": true,
                     "btnClassName": "!bg-transparent !border-none !hover:border-none text-lg h-5 font-bold p-0 text-black leading-none",
-                    "buttons": listViewButtonOptions
+                    "buttons": [
+                      ...listViewButtonOptions,
+                      {
+                        "children": [
+                          {
+                            "type": "divider"
+                          }
+                        ]
+                      },
+                      listviewNewButton
+                    ]
                   }
                 ],
                 "md": "",
@@ -9943,6 +10711,7 @@ function getObjectListHeader$1(objectSchema, listViewName, ctx) {
 function getBackButtonSchema(){
   return {
     "type": "service",
+    "className": "steedos-object-record-detail-header-back-button",
     "onEvent": {
         "@history_paths.changed": {
             "actions": [
@@ -10229,7 +10998,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
     id: `page_readonly_${name}_header`,
     name: `page`,
     body: body, 
-    className: ''
+    className: "steedos-object-record-detail-header"
   }
 
 }
@@ -10314,10 +11083,10 @@ async function getObjectRecordDetailRelatedListHeader(relatedObjectSchema, relat
 async function getObjectRelatedListHeader(objectSchema, recordId, relatedObjectName) {
 }
 
-const getNewListviewButtonSchema = ()=>{
+const getCopyListviewButtonSchema = ()=>{
     return {
         "type": "button",
-        "label": instance.t('frontend_listview_control_new_label'),
+        "label": instance.t('frontend_listview_control_clone_label'),
         "onEvent": {
           "click": {
             "weight": 0,
@@ -10325,14 +11094,14 @@ const getNewListviewButtonSchema = ()=>{
               {
                 "dialog": {
                   "type": "dialog",
-                  "title": instance.t('frontend_listview_control_new_title'),
+                  "title": instance.t('frontend_listview_control_clone_title'),
                   "data": {
                     //"&":"$$",2.7、2.9、3.0在此处失效
-                    "all": "${uiSchema.list_views.all}",
+                    "listName": "${listName}",
+                    "targetObjectName": "${objectName}",
                     "list_view": "${uiSchema.list_views[listName]}",
                     "appId": "${appId}",
                     "global": "${global}",
-                    "targetObjectName": "${objectName}",
                     "context": "${context}"
                   },
                   "body": [
@@ -10346,8 +11115,7 @@ const getNewListviewButtonSchema = ()=>{
                       "defaultData": {
                         "&": "${list_view}",
                         "name":"",
-                        "label":"",
-                        "filters":"",
+                        "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":"",
@@ -10359,15 +11127,14 @@ const getNewListviewButtonSchema = ()=>{
                         "company_ids": null,
                         "is_system": false
                       },
-                      "fieldsExtend": fieldsExtend$5(),
-                      "fields": fields$1(),
+                      "fieldsExtend": fieldsExtend$4(),
+                      "fields": fields(),
                       "onEvent": {
                         "submitSucc": {
                           "weight": 0,
                           "actions": [
                             {
                               "args": {
-                                // 直接使用recordId不能拿到数据，只能通过result里面拿数据
                                 "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/listview_${result.data.recordId|lowerCase}",
                                 "blank": false
                               },
@@ -10375,11 +11142,7 @@ const getNewListviewButtonSchema = ()=>{
                             }
                           ]
                         }
-                      },
-                      "messages": {
-                        "success": instance.t('frontend_listview_control_new_message_success'),
-                        "failed": instance.t('frontend_listview_control_new_message_failed')
-                      },
+                      }
                     }
                   ],
                   "showCloseButton": true,
@@ -10397,18 +11160,20 @@ const getNewListviewButtonSchema = ()=>{
     }
 };
 
-function fields$1(){
+function fields(){
   return [
     "label",
     "name",
     "object_name",
     "filter_scope",
     "show_count",
-    "columns",
-    "sort",
+    "columns.$.field",
+    "columns.$.width",
+    "sort.$.field_name",
+    "sort.$.order",
     "filters",
-    "mobile_columns",
-    "searchable_fields",
+    "mobile_columns.$.field",
+    "searchable_fields.$.field",
     "is_system",
     "shared",
     "shared_to",
@@ -10416,213 +11181,7 @@ function fields$1(){
   ]
 }
 
-function fieldsExtend$5(){
-  return {
-    "group": "",
-    "label": {
-      "group": "",
-      "is_wide": true
-    },
-    "name": {
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "object_name": {
-      "group": "",
-      "amis": {
-        "hidden": true
-      }
-    },
-    "filter_scope": {
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "columns": {
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "mobile_columns":{
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "searchable_fields":{
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "filter_fields": {
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "scrolling_mode": {
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "sort": {
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "show_count": {
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "type": {
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "shared": {
-      "group": "",
-      "amis": {
-        "visibleOn": "${false}"
-      }
-    },
-    "shared_to": {
-      "group": "",
-      "amis":{
-        "type": "radios",
-        "inline": false
-      }
-    },
-    "shared_to_organizations": {
-      "group": ""
-    },
-    "filters": {
-      "group": "",
-      "amis": {
-        "hidden": true
-      }
-    }
-  }
-}
-
-const getCopyListviewButtonSchema = ()=>{
-    return {
-        "type": "button",
-        "label": instance.t('frontend_listview_control_clone_label'),
-        "onEvent": {
-          "click": {
-            "weight": 0,
-            "actions": [
-              {
-                "dialog": {
-                  "type": "dialog",
-                  "title": instance.t('frontend_listview_control_clone_title'),
-                  "data": {
-                    //"&":"$$",2.7、2.9、3.0在此处失效
-                    "listName": "${listName}",
-                    "targetObjectName": "${objectName}",
-                    "list_view": "${uiSchema.list_views[listName]}",
-                    "appId": "${appId}",
-                    "global": "${global}",
-                    "context": "${context}"
-                  },
-                  "body": [
-                    {
-                      "type": "steedos-object-form",
-                      "label": "对象表单",
-                      "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$4(),
-                      "fields": fields(),
-                      "onEvent": {
-                        "submitSucc": {
-                          "weight": 0,
-                          "actions": [
-                            {
-                              "args": {
-                                "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/listview_${result.data.recordId|lowerCase}",
-                                "blank": false
-                              },
-                              "actionType": "url",
-                            }
-                          ]
-                        }
-                      }
-                    }
-                  ],
-                  "showCloseButton": true,
-                  "showErrorMsg": true,
-                  "showLoading": true,
-                  "closeOnEsc": false,
-                  "dataMapSwitch": false,
-                  "size": "lg"
-                },
-                "actionType": "dialog"
-              }
-            ]
-          }
-        }
-    }
-};
-
-function fields(){
-  return [
-    "label",
-    "name",
-    "object_name",
-    "filter_scope",
-    "show_count",
-    "columns.$.field",
-    "columns.$.width",
-    "sort.$.field_name",
-    "sort.$.order",
-    "filters",
-    "mobile_columns.$.field",
-    "searchable_fields.$.field",
-    "is_system",
-    "shared",
-    "shared_to",
-    "shared_to_organizations"
-  ]
-}
-
-function fieldsExtend$4(){
+function fieldsExtend$4(){
   return {
     "label": {
       "group": "",
@@ -11489,6 +12048,10 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
     // const scope = event.context.scoped;
     // 如果点击过顶部搜索栏表单的取消按钮，会把此处event.data.__super.__super.__super中的搜索表单项的所有字段设置为null
     // 点击取消按钮后继续在表单项中输入过滤条件且最后没有点击回车按键或点击表单项搜索按钮的话，在快速搜索中点击回车按钮提交搜索会所顶部搜索表单中的字段值清空
+    let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
+    if(!filterForm){
+      return;
+    }
     let isLookup = event.data.isLookup;
     let __lookupField = event.data.__lookupField;
     let __changedFilterFormValuesKey = "__changedFilterFormValues";
@@ -11499,9 +12062,8 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
       }
       __changedFilterFormValuesKey += lookupTag;
     }
-    let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
     setTimeout(function(){
-      filterForm.setValues(event.data[__changedFilterFormValuesKey]);
+      filterForm && filterForm.setValues(event.data[__changedFilterFormValuesKey]);
     }, 500);
   `;
 
@@ -12166,6 +12728,8 @@ async function getObjectCRUD(objectSchema, fields, options){
       //将_display放入crud的columns的倒数第二列中（最后一列会影响固定列），可以通过setvalue修改行内数据域的_display，而不影响上层items的_display,用于批量编辑
       body.columns.splice(body.columns.length -1 , 0, {name: '_display',type: 'static', width: 1, placeholder: "",id: objectSchema.name + "_display_${_index}", tpl: "${''}"});
     }
+    // 去除数组中的异常值，如null，undefined等
+    body.columns = _$1__default["default"].compact(body.columns);
 
     if (defaults) {
       const headerSchema = defaults.headerSchema;
@@ -13348,6 +13912,8 @@ async function convertColumnsToTableFields(columns, uiSchema, ctx = {}) {
                             wrap: column.wrap // wrap = true 是没效果的
                         }
                     );
+                } else if (filedInfo && filedInfo.type === 'object') {
+                    columnField = uiSchema.fields[column.field];
                 }
             } else {
                 if (uiSchema.fields[column.field]) {
@@ -13482,7 +14048,7 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
     };
     const content = {
         "type": "tabs",
-        "className": "steedos-record-tabs bg-white p-4 m-2 border rounded",
+        "className": "steedos-record-tabs bg-white p-4 sm:m-2 sm:border sm:rounded",
         "contentClassName": "bg-none",
         "tabs": [
             detailed
@@ -14589,7 +15155,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
         }
 
         var fieldFilters = ${JSON.stringify(field.filters)};
-        var currentAmis = amisRequire('amis');
+        var currentAmis = (window.amisRequire && window.amisRequire('amis')) || Amis;
         //递归fieldFilters数组，检查每一个元素，判断若是公式，就仅把它解析
         function traverseNestedArray(arr) {
             for (let i = 0; i < arr.length; i++) {
@@ -14600,7 +15166,11 @@ async function lookupToAmisPicker(field, readonly, ctx){
                     // 如果当前元素不是数组，则处理该元素
                     // 下面正则用于匹配amis公式\${}
                     if(/\\\$\\\{([^}]*)\\\}/.test(arr[i])) {
-                        arr[i] = currentAmis.evaluate(arr[i], api.data.$self);
+                        try{
+                            arr[i] = currentAmis.evaluate(arr[i], api.context);
+                        }catch(ex){
+                            console.error("运行lookup过滤公式时出现错误:",ex);
+                        }
                     }
                 }
             }
@@ -14761,8 +15331,8 @@ async function lookupToAmisPicker(field, readonly, ctx){
         const isAllowCreate = refObjectConfig.permissions.allowCreate;
         const isCreate = _$1__namespace.isBoolean(field.create) ? field.create : true;
         // lookup字段配置过滤条件就强制不显示新建按钮
-        let isHasFilters = (field.filters || field.filtersFunction || field._filtersFunction) ? true : false;
-        if (isAllowCreate && isCreate && !isHasFilters) {
+        let hasFilters = !_$1__namespace.isEmpty(field.filters) || !!field.filtersFunction || !!field._filtersFunction;
+        if (isAllowCreate && isCreate && !hasFilters) {
             const new_button = await getSchema$5(refObjectConfig, { appId: ctx.appId, objectName: refObjectConfig.name, formFactor: ctx.formFactor });
             new_button.align = "right";
             // 保持快速搜索放在最左侧，新建按钮往里插，而不是push到最后
@@ -15006,7 +15576,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
         // }
 
         var fieldFilters = ${JSON.stringify(field.filters)};
-        var currentAmis = amisRequire('amis');
+        var currentAmis = (window.amisRequire && window.amisRequire('amis')) || Amis;
         //递归fieldFilters数组，检查每一个元素，判断若是公式，就仅把它解析
         function traverseNestedArray(arr) {
             for (let i = 0; i < arr.length; i++) {
@@ -15017,7 +15587,11 @@ async function lookupToAmisSelect(field, readonly, ctx){
                     // 如果当前元素不是数组，则处理该元素
                     // 下面正则用于匹配amis公式\${}
                     if(/\\\$\\\{([^}]*)\\\}/.test(arr[i])) {
-                        arr[i] = currentAmis.evaluate(arr[i], api.data.$self);
+                        try{
+                            arr[i] = currentAmis.evaluate(arr[i], api.context);
+                        }catch(ex){
+                            console.error("运行lookup过滤公式时出现错误:",ex);
+                        }
                     }
                 }
             }
@@ -15429,8 +16003,8 @@ if(typeof window != 'undefined'){
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-01-13 17:27:54
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-04-11 14:14:43
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2024-06-07 13:39:34
  * @Description: 
  */
 
@@ -15467,6 +16041,7 @@ const getMarkdownFieldSchema = (field, readonly, ctx)=>{
                         "name": field.name,
                         "labelClassName": "none",
                         "language": "markdown",
+                        "options": field.amis ? field.amis.editorOptions : null
                       }
                     ]
                   },
@@ -16123,6 +16698,21 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                 type: getAmisStaticFieldType$1('url', readonly, field),
                 static: readonly ? true : false
             };
+            if(!readonly){
+                // amis input-url控件不支持相对路径，这里支持下
+                // 如果要使用amis原生input-url控件的默认的isUrl验证效果或自定义字段validations效果，配置字段的amis.validations属性即可，配置为null或空字符串则使用amis默认的isUrl效果
+                let fieldAmisValidations = field.amis?.validations;
+                if(typeof fieldAmisValidations === "undefined"){
+                    Object.assign(convertData, {
+                        "validations": {
+                          "matchRegexp": "^((http:\\/\\/|https:\\/\\/|ftp:\\/\\/|sftp:\\/\\/)+([^\\s\\/\\.]+(\\.[^\\s\\/\\.]+)+))*(\\/[^\\s\\.\\/]+)*$"
+                        },
+                        "validationErrors": {
+                          "matchRegexp": instance.t('frontend_form_validation_failed_url')//"URL 格式不正确"
+                        }
+                    });
+                }
+            }
             if(readonly && field.show_as_qr){
                 convertData = {
                     type: "control",
@@ -16188,13 +16778,13 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             };
             break;
         case 'avatar':
-            convertData = getAmisFileSchema(field, readonly);
+            convertData = await getAmisFileSchema(field, readonly, ctx);
             break;
         case 'image':
-            convertData = getAmisFileSchema(field, readonly);
+            convertData = await getAmisFileSchema(field, readonly, ctx);
             break;
         case 'file':
-            convertData = getAmisFileSchema(field, readonly);
+            convertData = await getAmisFileSchema(field, readonly, ctx);
             break;
         case 'formula':
             if(readonly){
@@ -16310,6 +16900,8 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     if(gridSub){
                         delete gridSub.name;
                         delete gridSub.label;
+                        //去除重复样式
+                        gridSub.className = gridSub.className.replace('border-b', '');
                         convertData.items.push(
                             Object.assign({}, gridSub, {label: subField.label}, subField.amis, {
                                 name: subFieldName
@@ -16364,6 +16956,10 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
         }
         // if(ctx.mode === 'edit'){
         let convertDataResult = Object.assign({}, baseData, convertData, { labelClassName: 'text-left', clearValueOnHidden: true, fieldName: field.name}, field.amis, {name: baseData.name});
+        // 只读时file字段的外层control层若存在name，内部each组件存在问题
+        if(readonly && field.type == "file") {
+            convertDataResult.name = "";
+        }
         // console.log("convertDataResult:", convertDataResult);
         return convertDataResult;
         // }else{
@@ -16583,13 +17179,17 @@ const getSection = async (formFields, permissionFields, fieldSchemaArray, sectio
       // console.log(`perField.type object ===> field`, field)
     }
     if (field.name.indexOf(".") < 0) {
+      let _field = _.cloneDeep(field);
+      if(field.type === "select" && field.data_type && field.data_type != "text"){
+        _field.type = field.data_type;
+      }
       if(field.type === "steedos-field"){
         // 如果是steedos-field则不需要通过convertSFieldToAmisField函数转换，因为steedos-field组件会转换
-        fieldSetBody.push(field);
+        fieldSetBody.push(_field);
       }
       else {
         ctx.__formFields = formFields;
-        const amisField = await convertSFieldToAmisField(field, field.readonly, ctx);
+        const amisField = await convertSFieldToAmisField(_field, _field.readonly, ctx);
         // 如果steedos-field稳定了，可以放开下面的代码直接用组件统一渲染字段
         // const amisField = {
         //   "type": "steedos-field",
@@ -16742,24 +17342,24 @@ async function getFormBody(permissionFields, formFields, ctx){
 /*
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2024-01-18 15:12:41
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-01-18 15:12:49
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2024-05-20 13:46:41
  */
 /**
  * 生成符合标准uuid格式的36位满足唯一性的随机串
  * @returns uuid
  */
 function uuidv4() {
-    return "10000000-1000-4000-8000-100000000000".replace(/[018]/g, c =>
-        (c ^ window.crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
-    );
+    return "10000000-1000-4000-8000-100000000000".replace(/[018]/g, function (c) {
+        return (c ^ window.crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16);
+    });
 }
 
 /*
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-03-02 16:07:17
+ * @LastEditTime: 2024-06-14 06:31:33
  */
 
 /**
@@ -16978,7 +17578,8 @@ function getInputTableCell(field, showAsInlineEditMode) {
         return {
             "type": "steedos-field",
             "config": Object.assign({}, field, {
-                label: false
+                label: false,
+                description: null
             }),
             // quickEdit: {
             //     "type": "steedos-field",
@@ -16995,7 +17596,8 @@ function getInputTableCell(field, showAsInlineEditMode) {
         return {
             "type": "steedos-field",
             "config": Object.assign({}, field, {
-                label: false
+                label: false,
+                description: null
             }),
             inInputTable: true,
             "static": true,
@@ -17829,6 +18431,7 @@ async function getButtonActions(props, mode) {
                     "__parentForm": mode == "new" ? "$$" : parentFormData,
                     "_master": "${_master}",
                     "global": "${global}",
+                    "context": "${context}",
                     "uiSchema": "${uiSchema}",
                     "index": "${index}",//amis组件自带行索引,在节点嵌套情况下，当前节点如果是children属性下的子节点时，这里的index是当前节点在children中的索引，而不是外层父节点的index
                     "parent": "${__super.parent}",//amis组件自带父节点数据域数据，即节点嵌套情况下，当前节点为某个节点（比如A节点）的children属性下的子节点时，当前节点的父节点（即A节点）的数据域数据
@@ -17953,6 +18556,7 @@ async function getButtonActions(props, mode) {
                         "__parentForm": parentFormData,
                         "_master": "${_master}",
                         "global": "${global}",
+                        "context": "${context}",
                         "uiSchema": "${uiSchema}",
                         "index": "${index}",
                         "parent": "${__super.parent}",//amis组件自带父节点数据域数据，即节点嵌套情况下，当前节点为某个节点（比如A节点）的children属性下的子节点时，当前节点的父节点（即A节点）的数据域数据
@@ -18239,7 +18843,8 @@ const getAmisInputTableSchema = async (props) => {
             }
             return value;
         },
-        "required": props.required
+        "required": props.required,
+        "description": props.description
     };
     if (buttonsForColumnOperations.length) {
         inputTableSchema.columns.unshift({
@@ -21110,6 +21715,7 @@ var index_esm$1 = /*#__PURE__*/Object.freeze({
     setUISchemaFunction: setUISchemaFunction,
     setVariable: setVariable,
     standardButtonsTodo: standardButtonsTodo,
+    uuidv4: uuidv4,
     i18next: instance
 });
 
@@ -21387,7 +21993,12 @@ var SteedosDropdownButton = function (props) {
             }
         }
     };
-    return (React__default["default"].createElement(antd.Dropdown, { menu: { items: menu }, trigger: trigger, onOpenChange: onOpenChange, placement: placement, overlayClassName: overlayClassName, arrow: arrow },
+    return (React__default["default"].createElement(antd.Dropdown, { menu: { items: menu }, trigger: trigger, onOpenChange: onOpenChange, placement: placement, overlayClassName: overlayClassName, arrow: arrow, getPopupContainer: function (button) {
+            // 未配置getPopupContainer属性时，默认container为body，这里判断到dropdown button是在drawer中时，统一把container配置为drawer本身
+            // 这样就可以解决drawer内点击dropdown button组件下拉菜单中的按钮时不应该自动关闭drawer的问题
+            var drawerBody = window.$(button).closest(".amis-dialog-widget .antd-Drawer-body")[0];
+            return drawerBody || document.querySelector("body");
+        } },
         React__default["default"].createElement("button", { className: "slds-button slds-button_icon slds-button_icon-border-filled slds-button_icon-x-small ".concat(className ? className : '') },
             React__default["default"].createElement("svg", { className: "w-4 h-4 fill-gray-500" },
                 React__default["default"].createElement("use", { xlinkHref: "/assets/icons/utility-sprite/svg/symbols.svg#down" })))));
@@ -21966,7 +22577,7 @@ var AmisRecordDetailHeader = function (props) { return __awaiter(void 0, void 0,
     return __generator(this, function (_d) {
         switch (_d.label) {
             case 0:
-                _a = props.className, className = _a === void 0 ? 'sm:sticky top-0 z-10 p-0 bg-gray-50' : _a, schemaFilter = props.schemaFilter, showButtons = props.showButtons, showBackButton = props.showBackButton;
+                _a = props.className, className = _a === void 0 ? 'sm:sticky top-0 sm:z-10 p-0 bg-gray-50' : _a, schemaFilter = props.schemaFilter, showButtons = props.showButtons, showBackButton = props.showBackButton;
                 return [4 /*yield*/, getUISchema(props.objectApiName || "space_users", false)];
             case 1:
                 _d.sent();
@@ -21976,7 +22587,7 @@ var AmisRecordDetailHeader = function (props) { return __awaiter(void 0, void 0,
                 return [4 /*yield*/, getRecordDetailHeaderSchema(objectApiName, recordId, { showRecordTitle: showRecordTitle, formFactor: props.data.formFactor, showButtons: showButtons, showBackButton: showBackButton, display: props.data.display, _inDrawer: props.data._inDrawer })];
             case 2:
                 schema = (_d.sent()).amisSchema;
-                schema.className = className;
+                schema.className += " " + className;
                 config = Object.assign({}, schema, { onEvent: onEvent });
                 if (!(schemaFilter && typeof schemaFilter === 'string')) return [3 /*break*/, 6];
                 schemaFilterFun = new Function('config', 'props', schemaFilter);
@@ -22268,12 +22879,12 @@ var AmisProvider = function (props) { return __awaiter(void 0, void 0, void 0, f
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-09-01 14:44:57
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-03-30 10:06:03
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2024-05-14 15:12:49
  * @Description:
  */
 var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var app, data, className, _a, showAppName, _b, appNameClassName, _c, customElements, _d, showAppIcon, formFactor, isMobile, on_click_script, mobile_blank_script, dialogSchema, badgeText;
+    var app, data, className, _a, showAppName, _b, appNameClassName, _c, customElements, _d, showAppIcon, formFactor, isMobile, on_click_script, mobile_blank_script, convertAppVisibleOnScript, pcInitApiAdaptorScript, mobileInitApiAdaptorScript, dialogSchema, badgeText, overlaySchema;
     return __generator(this, function (_e) {
         app = props.app, data = props.data, className = props.className, _a = props.showAppName, showAppName = _a === void 0 ? true : _a, _b = props.appNameClassName, appNameClassName = _b === void 0 ? '' : _b, _c = props.customElements, customElements = _c === void 0 ? [] : _c, _d = props.showAppIcon, showAppIcon = _d === void 0 ? true : _d;
         if (!app) {
@@ -22283,117 +22894,15 @@ var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0
         isMobile = formFactor === "SMALL" ? true : false;
         on_click_script = "\n    var evalFunString = \"(function(){\" + event.data.on_click + \"})()\";\n    try{\n      eval(evalFunString);\n    }\n    catch(e){\n      console.error(\"catch some error when eval the on_click script for app link:\");\n      console.error(e.message + \"\\r\\n\" + e.stack);\n    }\n  ";
         mobile_blank_script = "\n    if(event.data.path[0] == \"/\"){\n      Steedos.openWindow(event.data.context.rootUrl + event.data.path)\n    }else{\n      Steedos.openWindow(event.data.path)\n    }\n  ";
+        convertAppVisibleOnScript = "\n    var currentAmis = amisRequire('amis');\n    app_items.forEach((item) => {\n      let visible_on = item.visible_on && item.visible_on.trim();\n      if(visible_on){\n        // amis visibleOn\u5C5E\u6027\u4E2D\u7684\u8868\u8FBE\u5F0F\u6765\u81EA\u4F5C\u7528\u57DF\u4E2D\u53D8\u91CF\u65F6,amis\u4E0D\u8BA4,\u6240\u4EE5\u8FD9\u91CC\u628A\u516C\u5F0F\u8868\u8FBE\u5F0F\u63D0\u524D\u8FD0\u884C\u4E0B\n        try{\n          visible_on = currentAmis.evaluate(visible_on, BuilderAmisObject.AmisLib.createObject(context, item));\n          item.visible_on = visible_on;\n        }\n        catch(ex){\n          console.error(\"\u8FD0\u884C\u5E94\u7528\u201C\" + item.name + \"\u201D\u7684\u663E\u793A\u516C\u5F0F\u8868\u8FBE\u5F0F\u65F6\u51FA\u73B0\u9519\u8BEF:\",ex);\n          item.visible_on = false;\n        }\n      }\n      else{\n        item.visible_on = true;\n      }\n    });\n  ";
+        pcInitApiAdaptorScript = "\n    let app_items = payload;\n    let object_items = [];\n    let objects = [];\n    app_items.forEach((item) => {\n      item.children.forEach((i) => {\n        if (objects.indexOf(i.id) < 0) {\n          objects.push(i.id);\n          if(i.type != 'url' && i.type != 'page'){object_items.push(i);}\n        }\n      })\n    })\n    ".concat(convertAppVisibleOnScript, "\n    payload = {\n      app_items,\n      object_items\n    }\n    return payload;\n  ");
+        mobileInitApiAdaptorScript = "\n    let app_items = payload;\n    ".concat(convertAppVisibleOnScript, "\n    payload = {\n      app_items\n    }\n    return payload;\n  ");
         dialogSchema = {};
         badgeText = "${IF(${id} == 'approve_workflow',${ss:keyvalues.badge.value|pick:'workflow'},${ss:keyvalues.badge.value|pick:${id}}) | toInt}";
-        if (isMobile) {
+        if (!isMobile) {
             dialogSchema = {
                 "type": "service",
-                "className": "steedos-apps-service",
-                "affixFooter": false,
-                "body": [
-                    {
-                        "type": "each",
-                        "name": "app_items",
-                        "items": {
-                            "type": "button",
-                            "level": "link",
-                            "body": [
-                                {
-                                    "type": "tpl",
-                                    "tpl": "<div class='flex flex-col justify-center'><div class='text-center'><svg class='w-12 h-12 slds-icon slds-icon_container slds-icon-standard-${REPLACE(icon, '_', '-' )}' aria-hidden='true'><use xlink:href='/assets/icons/standard-sprite/svg/symbols.svg#${icon}'></use></svg></div><div class='text-center text-lg'>${name}</div></div>",
-                                    "badge": {
-                                        "mode": "text",
-                                        "text": badgeText,
-                                        "visibleOn": badgeText,
-                                        "overflowCount": 99,
-                                        "style": {
-                                            "right": "50%",
-                                            "margin-right": "-23px",
-                                            "height": "20px",
-                                            "border-radius": "10px",
-                                            "font-size": "16px",
-                                            "line-height": "18px"
-                                        }
-                                    }
-                                }
-                            ],
-                            "onEvent": {
-                                "click": {
-                                    "actions": [
-                                        {
-                                            "actionType": "closeDialog"
-                                        },
-                                        {
-                                            "actionType": "link",
-                                            "args": {
-                                                "link": "${path}"
-                                            },
-                                            "expression": "${AND(!blank , !on_click)}"
-                                        },
-                                        {
-                                            "actionType": "custom",
-                                            "script": mobile_blank_script,
-                                            "expression": "${AND(blank , !on_click)}"
-                                        },
-                                        {
-                                            "actionType": "custom",
-                                            "script": on_click_script,
-                                            "expression": "${on_click}"
-                                        }
-                                    ]
-                                }
-                            },
-                            "className": "block w-1/3 py-4",
-                            "style": {
-                                "display": "inline-flex",
-                                "justify-content": "center"
-                            }
-                        },
-                        "className": "flex flex-wrap",
-                        "id": "u:a98e9f6fb4db"
-                    }
-                ],
-                "clearValueOnHidden": false,
-                "visible": true,
-                "messages": {},
-                "api": {
-                    "method": "get",
-                    "url": "${context.rootUrl}/service/api/apps/menus?mobile=true",
-                    "headers": {
-                        "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                    },
-                    "adaptor": "\nlet app_items = payload;\npayload = {\n  app_items\n}\nreturn payload;",
-                    "messages": {}
-                },
-                "onEvent": {
-                    "@data.changed.steedos_keyvalues": {
-                        "actions": [
-                            {
-                                "actionType": "reload"
-                            }
-                        ]
-                    },
-                    "fetchInited": {
-                        "actions": [
-                            {
-                                "actionType": "broadcast",
-                                "args": {
-                                    "eventName": "@appsLoaded"
-                                },
-                                "data": {
-                                    "apps": "${event.data.app_items}"
-                                }
-                            }
-                        ]
-                    }
-                },
-                "id": "u:2c8bd22d4ea8"
-            };
-        }
-        else {
-            dialogSchema = {
-                "type": "service",
-                "id": "u:0f6224a0836f",
+                "id": "u:0f6224a0836f",
                 "affixFooter": false,
                 "body": [
                     {
@@ -22411,63 +22920,64 @@ var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0
                                     {
                                         "type": "each",
                                         "name": "app_items",
-                                        "items": {
-                                            "type": "button",
-                                            "level": "link",
-                                            "body": [{
-                                                    "type": "tpl",
-                                                    "tpl": "<div class='slds-app-launcher__tile slds-text-link_reset'><div class='slds-app-launcher__tile-figure'><svg class='w-12 h-12 slds-icon slds-icon_container slds-icon-standard-${REPLACE(icon, '_', '-')}' aria-hidden='true'><use xlink:href='/assets/icons/standard-sprite/svg/symbols.svg#${icon}'></use></svg><span class='slds-assistive-text'>${name}</span></div><div class='slds-app-launcher__tile-body'><span class='slds-link text-blue-600 text-lg'><span title='${name}'>${name}</span></span><div style='display: -webkit-box; -webkit-line-clamp: 1;-webkit-box-orient: vertical;overflow: hidden;'><span title='${description}'>${description}</span></div></div></div>",
-                                                    "badge": {
-                                                        "mode": "text",
-                                                        "text": badgeText,
-                                                        "visibleOn": badgeText,
-                                                        "className": "w-full",
-                                                        "overflowCount": 99,
-                                                        "style": {
-                                                            "top": "20px",
-                                                            "left": "37px",
-                                                            "height": "20px",
-                                                            "border-radius": "10px",
-                                                            "line-height": "18px",
-                                                            "margin-left": "${" + badgeText + ">9?(" + badgeText + ">99?'-21px':'-11px'):'0'}",
-                                                            "right": "auto",
-                                                            "font-size": "16px"
+                                        "items": [{
+                                                "type": "button",
+                                                "level": "link",
+                                                "body": [{
+                                                        "type": "tpl",
+                                                        "tpl": "<div class='slds-app-launcher__tile slds-text-link_reset'><div class='slds-app-launcher__tile-figure'><svg class='w-12 h-12 slds-icon slds-icon_container slds-icon-standard-${REPLACE(icon, '_', '-')}' aria-hidden='true'><use xlink:href='/assets/icons/standard-sprite/svg/symbols.svg#${icon}'></use></svg><span class='slds-assistive-text'>${name}</span></div><div class='slds-app-launcher__tile-body'><span class='slds-link text-blue-600 text-lg'><span title='${name}'>${name}</span></span><div style='display: -webkit-box; -webkit-line-clamp: 1;-webkit-box-orient: vertical;overflow: hidden;'><span title='${description}'>${description}</span></div></div></div>",
+                                                        "badge": {
+                                                            "mode": "text",
+                                                            "text": badgeText,
+                                                            "visibleOn": badgeText,
+                                                            "className": "w-full",
+                                                            "overflowCount": 99,
+                                                            "style": {
+                                                                "top": "20px",
+                                                                "left": "37px",
+                                                                "height": "20px",
+                                                                "border-radius": "10px",
+                                                                "line-height": "18px",
+                                                                "margin-left": "${" + badgeText + ">9?(" + badgeText + ">99?'-21px':'-11px'):'0'}",
+                                                                "right": "auto",
+                                                                "font-size": "16px"
+                                                            }
                                                         }
-                                                    }
-                                                }],
-                                            "onEvent": {
-                                                "click": {
-                                                    "actions": [
-                                                        {
-                                                            "actionType": "closeDialog"
-                                                        },
-                                                        {
-                                                            "actionType": "link",
-                                                            "args": {
-                                                                "link": "${path}"
+                                                    }],
+                                                "onEvent": {
+                                                    "click": {
+                                                        "actions": [
+                                                            {
+                                                                "actionType": "closeDialog"
                                                             },
-                                                            "expression": "${AND(!blank , !on_click)}"
-                                                        },
-                                                        {
-                                                            "actionType": "url",
-                                                            "args": {
-                                                                "url": "${path}",
-                                                                "blank": true
+                                                            {
+                                                                "actionType": "link",
+                                                                "args": {
+                                                                    "link": "${path}"
+                                                                },
+                                                                "expression": "${AND(!blank , !on_click)}"
                                                             },
-                                                            "expression": "${AND(blank , !on_click)}"
-                                                        },
-                                                        {
-                                                            "actionType": "custom",
-                                                            "script": on_click_script,
-                                                            "expression": "${!!on_click}"
-                                                        }
-                                                    ]
-                                                }
-                                            },
-                                            "inline": true,
-                                            "style": {},
-                                            "className": "slds-p-horizontal_small slds-size_1-of-1 slds-medium-size_1-of-3"
-                                        },
+                                                            {
+                                                                "actionType": "url",
+                                                                "args": {
+                                                                    "url": "${path}",
+                                                                    "blank": true
+                                                                },
+                                                                "expression": "${AND(blank , !on_click)}"
+                                                            },
+                                                            {
+                                                                "actionType": "custom",
+                                                                "script": on_click_script,
+                                                                "expression": "${!!on_click}"
+                                                            }
+                                                        ]
+                                                    }
+                                                },
+                                                "inline": true,
+                                                "style": {},
+                                                "visibleOn": "${visible_on}",
+                                                "className": "slds-p-horizontal_small slds-size_1-of-1 slds-medium-size_1-of-3"
+                                            }],
                                         "className": "slds-grid slds-wrap slds-grid_pull-padded"
                                     }
                                 ]
@@ -22552,20 +23062,149 @@ var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0
                 },
                 "api": {
                     "method": "get",
+                    "cache": "10000",
                     "url": "${context.rootUrl}/service/api/apps/menus?mobile=" + isMobile,
                     "data": null,
                     "headers": {
                         "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                     },
-                    "adaptor": "\nlet app_items = payload;\nlet object_items = [];\nlet objects = [];\napp_items.forEach((item) => {\n  item.children.forEach((i) => {\n    if (objects.indexOf(i.id) < 0) {\n      objects.push(i.id);\n      if(i.type != 'url' && i.type != 'page'){object_items.push(i);}\n    }\n  })\n})\npayload = {\n  app_items,\n  object_items\n}\nreturn payload;"
+                    "adaptor": pcInitApiAdaptorScript
                 }
             };
         }
+        overlaySchema = {
+            "type": "service",
+            "className": isMobile ? "steedos-apps-service" : "steedos-apps-service w-96",
+            "affixFooter": false,
+            "body": [
+                {
+                    "type": "each",
+                    "source": isMobile ? "${app_items}" : "${ARRAYFILTER(app_items, (item,index) => index<=8)}",
+                    "items": {
+                        "type": "button",
+                        "level": "link",
+                        "body": [
+                            {
+                                "type": "tpl",
+                                "tpl": "<div class='flex flex-col justify-center'><div class='text-center'><svg class='w-12 h-12 slds-icon slds-icon_container slds-icon-standard-${REPLACE(icon, '_', '-' )}' aria-hidden='true'><use xlink:href='/assets/icons/standard-sprite/svg/symbols.svg#${icon}'></use></svg></div><div class='text-center text-lg'>${name}</div></div>",
+                                "badge": {
+                                    "mode": "text",
+                                    "text": badgeText,
+                                    "visibleOn": badgeText,
+                                    "overflowCount": 99,
+                                    "style": {
+                                        "right": "50%",
+                                        "margin-right": "-23px",
+                                        "height": "20px",
+                                        "border-radius": "10px",
+                                        "font-size": "16px",
+                                        "line-height": "18px"
+                                    }
+                                }
+                            }
+                        ],
+                        "onEvent": {
+                            "click": {
+                                "actions": [
+                                    {
+                                        "actionType": "closeDialog"
+                                    },
+                                    {
+                                        "actionType": "link",
+                                        "args": {
+                                            "link": "${path}"
+                                        },
+                                        "expression": "${AND(!blank , !on_click)}"
+                                    },
+                                    {
+                                        "actionType": "custom",
+                                        "script": mobile_blank_script,
+                                        "expression": "${AND(blank , !on_click)}"
+                                    },
+                                    {
+                                        "actionType": "custom",
+                                        "script": on_click_script,
+                                        "expression": "${on_click}"
+                                    }
+                                ]
+                            }
+                        },
+                        "visibleOn": "${visible_on}",
+                        "className": "block w-1/3 py-4",
+                        "style": {
+                            "display": "inline-flex",
+                            "justify-content": "center"
+                        }
+                    },
+                    "className": "flex flex-wrap",
+                    "id": "u:a98e9f6fb4db"
+                },
+                isMobile ? null : {
+                    "type": "divider",
+                    "className": "m-0"
+                },
+                isMobile ? null : {
+                    "type": "button",
+                    "level": "link",
+                    "label": "更多",
+                    "className": "w-full h-10",
+                    "actionType": "dialog",
+                    "dialog": {
+                        "size": "xl",
+                        "title": {
+                            "type": "tpl",
+                            "tpl": instance.t('frontend_application_launcher'),
+                            "className": "block text-xl text-center"
+                        },
+                        "actions": [],
+                        "body": [
+                            dialogSchema
+                        ]
+                    }
+                }
+            ],
+            "clearValueOnHidden": false,
+            "visible": true,
+            "messages": {},
+            "api": {
+                "method": "get",
+                "cache": "10000",
+                "url": "${context.rootUrl}/service/api/apps/menus?mobile=true",
+                "headers": {
+                    "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                },
+                "adaptor": mobileInitApiAdaptorScript,
+                "messages": {}
+            },
+            "onEvent": {
+                "@data.changed.steedos_keyvalues": {
+                    "actions": [
+                        {
+                            "actionType": "reload"
+                        }
+                    ]
+                },
+                "fetchInited": {
+                    "actions": [
+                        {
+                            "actionType": "broadcast",
+                            "args": {
+                                "eventName": "@appsLoaded"
+                            },
+                            "data": {
+                                "apps": "${event.data.app_items}"
+                            }
+                        }
+                    ]
+                }
+            },
+            "id": "u:2c8bd22d4ea8"
+        };
         return [2 /*return*/, {
                 "type": "service",
                 className: className,
                 "body": [
-                    {
+                    isMobile ? {
                         "type": "button",
                         "actionType": "dialog",
                         "className": "flex items-center",
@@ -22600,10 +23239,43 @@ var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0
                             },
                             "actions": [],
                             "body": [
-                                dialogSchema
+                                overlaySchema
                             ]
                         },
                         "id": "u:b5dc095e1c11"
+                    } : {
+                        "type": "steedos-dropdown",
+                        "placement": "bottomRight",
+                        "trigger": [
+                            "click"
+                        ],
+                        "body": __spreadArray([
+                            {
+                                "type": "tpl",
+                                "className": "flex items-center",
+                                "tpl": "<div aria-haspopup='true' title='".concat(instance.t('frontend_open_app_launcher'), "' class='slds-icon-waffle_container slds-context-bar__button' type='button'><span class='slds-icon-waffle'><span class='slds-r1'></span><span class='slds-r2'></span><span class='slds-r3'></span><span class='slds-r4'></span><span class='slds-r5'></span><span class='slds-r6'></span><span class='slds-r7'></span><span class='slds-r8'></span><span class='slds-r9'></span></span></div>"),
+                                "badge": {
+                                    "visibleOn": "${ss:keyvalues.badge.value.workflow | toInt}",
+                                    "offset": [3, -3],
+                                    "style": {
+                                        "width": "8px",
+                                        "height": "8px"
+                                    }
+                                },
+                                "hiddenOn": "".concat(!showAppIcon)
+                            },
+                            {
+                                type: 'tpl',
+                                className: "text-xl ml-4 mr-4 text-black nowrap ".concat(appNameClassName, " "),
+                                tpl: '${app.name}',
+                                hiddenOn: "".concat(!!app || !!!showAppName)
+                            }
+                        ], __read(customElements), false),
+                        "overlay": [
+                            overlaySchema
+                        ],
+                        "className": "flex items-center",
+                        "open": false
                     }
                 ],
                 "id": "u:06ee48db134a",
@@ -22718,21 +23390,261 @@ var AmisGlobalFooter = function (props) { return __awaiter(void 0, void 0, void
                     "headers": {
                         "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                     }
-                }
-            };
-        }
-        console.log("payload===>", schema);
-        return [2 /*return*/, schema];
-    });
-}); };
-
-/*
-* @Author: baozhoutao@steedos.com
-* @Date: 2022-09-01 14:44:57
-* @LastEditors: baozhoutao@steedos.com
-* @LastEditTime: 2024-03-19 15:55:42
-* @Description:
-*/
+                }
+            };
+        }
+        console.log("payload===>", schema);
+        return [2 /*return*/, schema];
+    });
+}); };
+
+/*
+* @Author: baozhoutao@steedos.com
+* @Date: 2022-09-01 14:44:57
+* @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+* @LastEditTime: 2024-05-29 11:45:57
+* @Description:
+*/
+var beforeMarkReadAllScript = "\n  var hasUnRead = !!db.notifications.find({'$or':[{'is_read': null},{'is_read': false}]}).count();\n  // \u6CA1\u6709\u8BA2\u9605\u5230\u672A\u8BFB\u901A\u77E5\u65F6\u9700\u8981\u989D\u5916\u5355\u72EC\u89E6\u53D1\u91CD\u65B0\u8BF7\u6C42\u901A\u77E5\u5217\u8868\u53CA\u672A\u8BFB\u6570\u91CF\n  // \u5982\u679C\u6709\u8BA2\u9605\u5230\u7684\u8BDD\uFF0C\u56E0\u4E3A\u76D1\u542C\u8BA2\u9605\u5230\u7684\u901A\u77E5\u8BB0\u5F55\u53D8\u5316\uFF0C\u6709\u53D8\u5316\u4F1A\u89E6\u53D1@data.changed.notifications\u4E8B\u4EF6\uFF0C\u4ECE\u800C\u4F1A\u81EA\u52A8\u89E6\u53D1\u91CD\u65B0\u8BF7\u6C42\u901A\u77E5\u5217\u8868\u53CA\u672A\u8BFB\u6570\u91CF\n  event.data.needToReload = !hasUnRead;\n";
+var getNotificationBadgeButton = function () {
+    var isMobile = window.innerWidth < 768;
+    var listContent = {
+        "type": "page",
+        "body": [
+            {
+                "type": "service",
+                "className": "service-global-header-notifications-list",
+                "body": [
+                    {
+                        "type": "panel",
+                        "title": instance.t('frontend_notifications'),
+                        "className": "steedos-header-toolbar-notifications-panel " + (isMobile ? "" : "min-w-[300px] max-w-md"),
+                        "body": [
+                            {
+                                "type": "each",
+                                "className": "overflow-auto max-h-96 steedos-header-toolbar-notifications-list",
+                                "name": "notifications",
+                                "items": {
+                                    "type": "tpl",
+                                    "tpl": "<div class='flex items-center p-4 hover:bg-sky-50'>\n                                  <img src='<%=data.context.rootUrl + \"/avatar/\" + data.from%>' alt='' class='h-10 w-10 flex-none rounded-full'>\n                                  <div class='ml-4 flex-auto'>\n                                    <div class='font-medium'>\n                                      <span class='text-primary'><%=data.name%></span>\n                                    </div>\n                                    <div class='mt-1 text-gray-700'>\n                                      <%=data.body%>\n                                    </div>\n                                    <div class='mt-1 text-gray-700'>\n                                      <%=moment(data.created).locale(data.global.user.language).fromNow()%>\n                                      <abbr class='slds-text-link slds-m-horizontal_xxx-small <%=data.is_read ? 'hidden' : ''%>' title='unread'>\u25CF</abbr>\n                                    </div>\n                                  </div>\n                                </div>",
+                                    "id": "u:07ece657c7b7",
+                                    "onEvent": {
+                                        "click": {
+                                            "weight": 0,
+                                            "actions": [
+                                                {
+                                                    "args": {
+                                                        "options": {},
+                                                        "api": {
+                                                            "url": "${context.rootUrl}/api/v4/notifications/${_id}/read?rootUrl=&appId=${appId}&async=true",
+                                                            "method": "get",
+                                                            "messages": {},
+                                                            "headers": {
+                                                                "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                                            },
+                                                            "adaptor": "payload = {\n  status: 0,\n  msg: '',\n  data: {\n    redirect: payload.redirect || payload \n  }} \nreturn payload;"
+                                                            // "adaptor": notificationReadAdaptor
+                                                        }
+                                                    },
+                                                    "actionType": "ajax"
+                                                },
+                                                // {
+                                                //   "actionType": "custom",
+                                                //   "script": "if(Meteor.isCordova){window.open(Meteor.absoluteUrl(event.data.responseResult.responseData.redirect), '_blank')}else{window.open(event.data.responseResult.responseData.redirect, '_blank')}",
+                                                //   "expression": "${!!event.data.responseResult.responseData.redirect}",
+                                                // },
+                                                {
+                                                    // PC端保持原样，新窗口打开
+                                                    "actionType": "custom",
+                                                    "script": "window.open(event.data.responseResult.responseData.redirect, '_blank')",
+                                                    "expression": "${!!event.data.responseResult.responseData.redirect && window:innerWidth > 768}"
+                                                },
+                                                {
+                                                    // 手机端改为直接跳路由，因为新窗口打开顶部会显示url地址栏
+                                                    "actionType": "link",
+                                                    "args": {
+                                                        "link": "${redirect}"
+                                                    },
+                                                    "expression": "${!!event.data.responseResult.responseData.redirect && window:innerWidth <= 768}"
+                                                },
+                                                {
+                                                    "actionType": "cancel",
+                                                    "componentId": "steedos_header_toolbar_notifications_dialog",
+                                                    "expression": "${!!event.data.responseResult.responseData.redirect && window:innerWidth <= 768}"
+                                                }
+                                            ]
+                                        }
+                                    }
+                                },
+                                "id": "u:18da41dab9ca"
+                            },
+                        ],
+                        actions: [
+                            {
+                                "type": "button",
+                                "label": instance.t('frontend_notifications_close_dialog'),
+                                "visibleOn": "${window:innerWidth <= 768}",
+                                "close": true
+                            },
+                            {
+                                "type": "button",
+                                "label": instance.t('frontend_notifications_allread'),
+                                "id": "u:5530f3779e3a",
+                                "onEvent": {
+                                    "click": {
+                                        "actions": [
+                                            {
+                                                "actionType": "custom",
+                                                "script": beforeMarkReadAllScript
+                                            },
+                                            {
+                                                "componentId": "",
+                                                "args": {
+                                                    "api": {
+                                                        "url": "${context.rootUrl}/api/v4/notifications/all/markReadAll",
+                                                        "method": "post",
+                                                        "headers": {
+                                                            "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                                        }
+                                                    },
+                                                    "messages": {
+                                                        "success": instance.t('frontend_notifications_allread_message')
+                                                    }
+                                                },
+                                                "actionType": "ajax"
+                                            },
+                                            {
+                                                "componentId": "service_global_header_notifications_unread_count",
+                                                "actionType": "reload",
+                                                "expression": "${needToReload}"
+                                            },
+                                            {
+                                                "componentId": "service_global_header_notifications_list",
+                                                "actionType": "reload",
+                                                "expression": "${needToReload}"
+                                            }
+                                        ],
+                                        "weight": 0
+                                    }
+                                }
+                            }
+                        ]
+                    },
+                ],
+                "id": "service_global_header_notifications_list",
+                "onEvent": {
+                    "@data.changed.notifications": {
+                        "actions": [
+                            {
+                                "actionType": "reload"
+                            }
+                        ]
+                    }
+                },
+                "messages": {},
+                "api": {
+                    "method": "post",
+                    "url": "${context.rootUrl}/graphql",
+                    "data": {
+                        "&": "$$",
+                        "context": "${context}",
+                        "userId": "${context.userId}"
+                    },
+                    "dataType": "json",
+                    "requestAdaptor": "const { userId } = api.data;\napi.data = {\n    query: `{\n        notifications(filters: [\"owner\",\"=\",\"${userId}\"], sort: \"created desc,name\", top : 10){\n          _id,name,body,related_to,related_name,url,owner,is_read,from,created\n        }  }`\n}",
+                    "headers": {
+                        "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                    },
+                    "adaptor": "return payload.data"
+                },
+            }
+        ],
+        "onEvent": {
+            "init": {
+                "actions": [
+                    {
+                        "actionType": "custom",
+                        "script": "window.$('.service-global-header-notifications-list').closest('.amis-dialog-widget').addClass('steedos-header-toolbar-notifications-dialog');"
+                    }
+                ]
+            }
+        },
+        "bodyClassName": "p-0"
+    };
+    var badgeButtonContent = {
+        "type": "service",
+        "body": [
+            {
+                "type": "steedos-badge",
+                "body": [
+                    {
+                        "type": "steedos-icon",
+                        "category": "utility",
+                        "name": "notification",
+                        "colorVariant": "default",
+                        "className": "slds-button_icon slds-global-header__icon"
+                    }
+                ],
+                "count": "${unReadCount}"
+            },
+        ],
+        "id": "service_global_header_notifications_unread_count",
+        "messages": {},
+        "api": {
+            "method": "post",
+            "url": "${context.rootUrl}/graphql",
+            "data": {
+                "&": "$$",
+                "context": "${context}",
+                "userId": "${context.userId}"
+            },
+            "dataType": "json",
+            "requestAdaptor": "const { userId } = api.data;\napi.data = {\n    query: `{\n unReadCount: notifications__count(filters: [[\"owner\",\"=\",\"${userId}\"], [\"is_read\", \"!=\", true]])\n    }`\n}",
+            "headers": {
+                "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+            },
+            "adaptor": "return payload.data"
+        },
+        "onEvent": {
+            "@data.changed.notifications": {
+                "actions": [
+                    {
+                        "actionType": "reload"
+                    }
+                ]
+            }
+        },
+        // "interval": 30000,
+        "silentPolling": true
+    };
+    return isMobile ? {
+        "type": "button",
+        "body": badgeButtonContent,
+        "actionType": "dialog",
+        "dialog": {
+            "title": "",
+            "id": "steedos_header_toolbar_notifications_dialog",
+            "body": listContent,
+            "actions": [],
+            "showCloseButton": false,
+            "closeOnOutside": true
+        }
+    } : {
+        "type": "steedos-dropdown",
+        "placement": "bottomRight",
+        "trigger": [
+            "click"
+        ],
+        "body": [
+            badgeButtonContent
+        ],
+        "overlay": [
+            listContent
+        ],
+        "className": "antd-Action steedos-header-toolbar-notifications",
+        "open": false
+    };
+};
 var AmisGlobalHeaderToolbar = function (props) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, className, data, _b, logoutScript, _c, customButtons, avatarSrc;
     var _d, _e;
@@ -22758,7 +23670,7 @@ var AmisGlobalHeaderToolbar = function (props) { return __awaiter(void 0, void 0
                                     {
                                         "componentId": "",
                                         "args": {
-                                            "url": "https://www.steedos.com/docs"
+                                            "url": "https://docs.steedos.com/zh-CN"
                                         },
                                         "actionType": "url"
                                     }
@@ -22884,172 +23796,7 @@ var AmisGlobalHeaderToolbar = function (props) { return __awaiter(void 0, void 0
                             }
                         ]
                     },
-                    {
-                        "type": "steedos-dropdown",
-                        "placement": "bottomRight",
-                        "trigger": [
-                            "click"
-                        ],
-                        "body": [
-                            {
-                                "type": "service",
-                                "body": [
-                                    {
-                                        "type": "steedos-badge",
-                                        "body": [
-                                            {
-                                                "type": "steedos-icon",
-                                                "category": "utility",
-                                                "name": "notification",
-                                                "colorVariant": "default",
-                                                "className": "slds-button_icon slds-global-header__icon"
-                                            }
-                                        ],
-                                        "count": "${unReadCount}"
-                                    },
-                                ],
-                                "id": "u:aba521eed5b7",
-                                "messages": {},
-                                "api": {
-                                    "method": "post",
-                                    "url": "${context.rootUrl}/graphql",
-                                    "data": {
-                                        "&": "$$",
-                                        "context": "${context}",
-                                        "userId": "${context.userId}"
-                                    },
-                                    "dataType": "json",
-                                    "requestAdaptor": "const { userId } = api.data;\napi.data = {\n    query: `{\n unReadCount: notifications__count(filters: [[\"owner\",\"=\",\"${userId}\"], [\"is_read\", \"!=\", true]])\n    }`\n}",
-                                    "headers": {
-                                        "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                                    },
-                                    "adaptor": "return payload.data"
-                                },
-                                "onEvent": {
-                                    "@data.changed.notifications": {
-                                        "actions": [
-                                            {
-                                                "actionType": "reload"
-                                            }
-                                        ]
-                                    }
-                                },
-                                // "interval": 30000,
-                                "silentPolling": true
-                            }
-                        ],
-                        "overlay": [
-                            {
-                                "type": "service",
-                                "body": [
-                                    {
-                                        "type": "panel",
-                                        "title": instance.t('frontend_notifications'),
-                                        "className": "min-w-[300px] max-w-md",
-                                        "body": [
-                                            {
-                                                "type": "each",
-                                                className: "overflow-auto max-h-96",
-                                                "name": "notifications",
-                                                "items": {
-                                                    "type": "tpl",
-                                                    "tpl": "<div class='flex items-center p-4 hover:bg-sky-50'>\n                                      <img src='<%=data.context.rootUrl + \"/avatar/\" + data.from%>' alt='' class='h-10 w-10 flex-none rounded-full'>\n                                      <div class='ml-4 flex-auto'>\n                                        <div class='font-medium'>\n                                          <span class='text-primary'><%=data.name%></span>\n                                        </div>\n                                        <div class='mt-1 text-gray-700'>\n                                          <%=data.body%>\n                                        </div>\n                                        <div class='mt-1 text-gray-700'>\n                                          <%=moment(data.created).locale(data.global.user.language).fromNow()%>\n                                          <abbr class='slds-text-link slds-m-horizontal_xxx-small <%=data.is_read ? 'hidden' : ''%>' title='unread'>\u25CF</abbr>\n                                        </div>\n                                      </div>\n                                    </div>",
-                                                    "id": "u:07ece657c7b7",
-                                                    "onEvent": {
-                                                        "click": {
-                                                            "weight": 0,
-                                                            "actions": [
-                                                                {
-                                                                    "args": {
-                                                                        "options": {},
-                                                                        "api": {
-                                                                            "url": "${context.rootUrl}/api/v4/notifications/${_id}/read?rootUrl=&appId=${appId}&async=true",
-                                                                            "method": "get",
-                                                                            "messages": {},
-                                                                            "headers": {
-                                                                                "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                                                                            },
-                                                                            "adaptor": "payload = {\n  status: 0,\n  msg: '',\n  data: {\n    redirect: payload.redirect || payload \n  }} \nreturn payload;"
-                                                                        }
-                                                                    },
-                                                                    "actionType": "ajax"
-                                                                },
-                                                                {
-                                                                    "actionType": "custom",
-                                                                    "script": "if(Meteor.isCordova){window.open(Meteor.absoluteUrl(event.data.responseResult.responseData.redirect), '_blank')}else{window.open(event.data.responseResult.responseData.redirect, '_blank')}",
-                                                                    "expression": "${!!event.data.responseResult.responseData.redirect}",
-                                                                }
-                                                            ]
-                                                        }
-                                                    }
-                                                },
-                                                "id": "u:18da41dab9ca"
-                                            },
-                                        ],
-                                        actions: [
-                                            {
-                                                "type": "button",
-                                                "label": instance.t('frontend_notifications_allread'),
-                                                "id": "u:5530f3779e3a",
-                                                "onEvent": {
-                                                    "click": {
-                                                        "actions": [
-                                                            {
-                                                                "componentId": "",
-                                                                "args": {
-                                                                    "api": {
-                                                                        "url": "${context.rootUrl}/api/v4/notifications/all/markReadAll",
-                                                                        "method": "post",
-                                                                        "headers": {
-                                                                            "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                                                                        }
-                                                                    },
-                                                                    "messages": {
-                                                                        "success": instance.t('frontend_notifications_allread_message')
-                                                                    }
-                                                                },
-                                                                "actionType": "ajax"
-                                                            }
-                                                        ],
-                                                        "weight": 0
-                                                    }
-                                                }
-                                            }
-                                        ]
-                                    },
-                                ],
-                                "id": "u:aba521eed5b7",
-                                "onEvent": {
-                                    "@data.changed.notifications": {
-                                        "actions": [
-                                            {
-                                                "actionType": "reload"
-                                            }
-                                        ]
-                                    }
-                                },
-                                "messages": {},
-                                "api": {
-                                    "method": "post",
-                                    "url": "${context.rootUrl}/graphql",
-                                    "data": {
-                                        "&": "$$",
-                                        "context": "${context}",
-                                        "userId": "${context.userId}"
-                                    },
-                                    "dataType": "json",
-                                    "requestAdaptor": "const { userId } = api.data;\napi.data = {\n    query: `{\n        notifications(filters: [\"owner\",\"=\",\"${userId}\"], sort: \"created desc,name\", top : 10){\n          _id,name,body,related_to,related_name,url,owner,is_read,from,created\n        }  }`\n}",
-                                    "headers": {
-                                        "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                                    },
-                                    "adaptor": "return payload.data"
-                                },
-                            }
-                        ],
-                        "id": "u:857e8161c96b",
-                        "className": "antd-Action steedos-header-toolbar-notifications",
-                        "open": false
-                    },
+                    getNotificationBadgeButton(),
                     {
                         "type": "steedos-dropdown",
                         "placement": "bottomRight",
@@ -23224,7 +23971,7 @@ var AmisGlobalHeader = function (props) { return __awaiter(void 0, void 0, void
             body: [
                 {
                     "type": "wrapper",
-                    "className": "bg-white sticky p-0 top-0 z-40 w-full flex-none backdrop-blur transition-colors duration-500 lg:z-50  border-b-[3px] border-sky-500 border-solid steedos-header-container sm:shadow",
+                    "className": "bg-white sticky p-0 top-0 z-40 w-full flex-none backdrop-blur transition-colors duration-500 lg:z-[1000]  border-b-[3px] border-sky-500 border-solid steedos-header-container sm:shadow",
                     body: [
                         {
                             "type": "wrapper",
@@ -23460,51 +24207,67 @@ function getAmisStaticFieldType(type, data_type, options) {
     }
     return type;
 }
-var REFERENCE_VALUE_ITEM_ONCLICK = {
-    "click": {
-        "actions": [
-            {
-                "actionType": "drawer",
-                "drawer": {
-                    "type": "drawer",
-                    "title": "&nbsp;",
-                    "headerClassName": "hidden",
-                    "size": "lg",
-                    "bodyClassName": "p-0 m-0 bg-gray-100",
-                    "closeOnEsc": true,
-                    "closeOnOutside": true,
-                    "resizable": true,
-                    "actions": [],
-                    "body": [
-                        {
-                            "type": "steedos-record-detail",
-                            "objectApiName": "${objectName}",
-                            "recordId": "${value}",
-                            "showBackButton": false,
-                            "showButtons": true,
-                            "data": {
-                                "_inDrawer": true,
-                                "recordLoaded": false, // 重置数据加载状态
-                            }
+function getLookupLinkOnClick(field, options) {
+    return __awaiter(this, void 0, void 0, function () {
+        var recordPage, drawerRecordDetailSchema;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, getPage({ type: 'record', appId: options.appId, objectName: options.objectName, formFactor: options.formFactor })];
+                case 1:
+                    recordPage = _a.sent();
+                    drawerRecordDetailSchema = recordPage ? Object.assign({}, recordPage.schema, {
+                        "recordId": "${value}",
+                        "data": __assign$2(__assign$2({}, recordPage.schema.data), { "_inDrawer": true, "recordLoaded": false })
+                    }) : {
+                        "type": "steedos-record-detail",
+                        "objectApiName": "${objectName}",
+                        "recordId": "${value}",
+                        "showBackButton": false,
+                        "showButtons": true,
+                        "data": {
+                            "_inDrawer": true,
+                            "recordLoaded": false, // 重置数据加载状态
                         }
-                    ],
-                    "className": "steedos-record-detail-drawer app-popover",
-                    "id": "u:fc5f055afa8c"
-                },
-                "preventDefault": true
+                    };
+                    return [2 /*return*/, {
+                            "click": {
+                                "actions": [
+                                    {
+                                        "actionType": "drawer",
+                                        "drawer": {
+                                            "type": "drawer",
+                                            "title": "&nbsp;",
+                                            "headerClassName": "hidden",
+                                            "size": "lg",
+                                            "bodyClassName": "p-0 m-0 bg-gray-100",
+                                            "closeOnEsc": true,
+                                            "closeOnOutside": true,
+                                            "resizable": true,
+                                            "actions": [],
+                                            "body": [
+                                                drawerRecordDetailSchema
+                                            ],
+                                            "className": "steedos-record-detail-drawer app-popover"
+                                        },
+                                        "preventDefault": true
+                                    }
+                                ]
+                            }
+                        }];
             }
-        ]
-    }
-};
+        });
+    });
+}
 var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var steedosField, field, _a, readonly, _b, ctx, config, fStatic, env, inInputTable, className, lookupATagClick, defaultSource, source, fieldBaseProps, referenceTo_1, fieldValue, fieldRefObject, res, valueOptions_1, fieldValue, values, disPlayValue_1, schema, fieldSchema, fieldValue, hasImageOrFile_1, fieldHtml_1, schema, map, tableFields, _c, _d, subField, subFieldName, fieldAmis, schema, error_1;
-    var _e, e_1, _f;
-    var _g, _h, _j, _k, _l, _m;
-    return __generator(this, function (_o) {
-        switch (_o.label) {
+    var steedosField, field, _a, readonly, _b, ctx, config, fStatic, env, inInputTable, className, _c, appId, formFactor, lookupATagClick, defaultSource, source, fieldBaseProps, referenceTo_1, fieldValue, fieldRefObject, _d, _e, _f, _g, res, valueOptions_1, fieldValue, values, disPlayValue_1, _h, _j, _k, _l, schema, fieldSchema, fieldValue, hasImageOrFile_1, fieldHtml_1, schema, map, tableFields, _m, _o, subField, subFieldName, fieldAmis, schema, error_1;
+    var _p, _q, _r, _s, _t, _u, _v, _w, _x, e_1, _y;
+    var _z, _0, _1, _2, _3, _4;
+    return __generator(this, function (_5) {
+        switch (_5.label) {
             case 0:
                 steedosField = null;
                 field = props.field, _a = props.readonly, readonly = _a === void 0 ? false : _a, _b = props.ctx, ctx = _b === void 0 ? {} : _b, config = props.config, props.$schema, fStatic = props.static, env = props.env, inInputTable = props.inInputTable, className = props.className;
+                _c = props.data || {}, appId = _c.appId, formFactor = _c.formFactor;
                 // console.log(`AmisSteedosField`, props)
                 // if($schema.config && isString($schema.config)){
                 //     $schema.config = JSON.parse($schema.config)
@@ -23532,10 +24295,10 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     // 字段配置为只读，强制走fStatic模式，加上_display判断是为了不影响历史代码，比如直接在ObjectForm中调用steedos-field组件
                     fStatic = true;
                 }
-                _o.label = 1;
+                _5.label = 1;
             case 1:
-                _o.trys.push([1, 24, , 25]);
-                if (!(fStatic && (steedosField.type === 'lookup' || steedosField.type === 'master_detail'))) return [3 /*break*/, 7];
+                _5.trys.push([1, 31, , 32]);
+                if (!(fStatic && (steedosField.type === 'lookup' || steedosField.type === 'master_detail'))) return [3 /*break*/, 14];
                 lookupATagClick = 'onclick="return false;"';
                 if (window.innerWidth < 768) {
                     lookupATagClick = "";
@@ -23560,23 +24323,23 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         defaultSource.adaptor = "\n                        var options = ".concat(JSON.stringify(steedosField.options), "\n                        if(api.body.$term){\n                            options = _.filter(options, function(o) {\n                                var label = o.label;\n                                return label.toLowerCase().indexOf(api.body.$term.toLowerCase()) > -1;\n                            });\n                        }\n                        if(!payload.data){\n                            payload.data = {};\n                        }\n                        payload.data.options = options;\n                        return payload;\n                    ");
                     }
                 }
-                source = ((_g = steedosField.amis) === null || _g === void 0 ? void 0 : _g.source) || ((_h = steedosField.amis) === null || _h === void 0 ? void 0 : _h.autoComplete) || defaultSource;
+                source = ((_z = steedosField.amis) === null || _z === void 0 ? void 0 : _z.source) || ((_0 = steedosField.amis) === null || _0 === void 0 ? void 0 : _0.autoComplete) || defaultSource;
                 fieldBaseProps = {
                     multiple: steedosField.multiple,
                     name: steedosField.name,
                     label: steedosField.label,
                     static: true,
                     required: steedosField.required,
-                    className: "".concat(className || '', " ").concat(((_j = steedosField.amis) === null || _j === void 0 ? void 0 : _j.className) || '')
+                    className: "".concat(className || '', " ").concat(((_1 = steedosField.amis) === null || _1 === void 0 ? void 0 : _1.className) || '')
                 };
                 if (!inInputTable) return [3 /*break*/, 2];
                 fieldBaseProps = Object.assign({}, fieldBaseProps, { type: 'select', source: source });
-                return [3 /*break*/, 6];
+                return [3 /*break*/, 13];
             case 2:
                 referenceTo_1 = steedosField.reference_to;
-                if (!referenceTo_1) return [3 /*break*/, 6];
+                if (!referenceTo_1) return [3 /*break*/, 13];
                 if (_$1.isArray(referenceTo_1)) {
-                    fieldValue = (_k = props.data) === null || _k === void 0 ? void 0 : _k[steedosField.name];
+                    fieldValue = (_2 = props.data) === null || _2 === void 0 ? void 0 : _2[steedosField.name];
                     if (fieldValue && fieldValue.o) {
                         referenceTo_1 = fieldValue.o;
                     }
@@ -23590,157 +24353,195 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                 }
                 return [4 /*yield*/, getUISchema(referenceTo_1)];
             case 3:
-                fieldRefObject = _o.sent();
-                if (!(props.data._display && _$1.has(props.data._display, steedosField.name))) return [3 /*break*/, 4];
-                fieldBaseProps = Object.assign({}, fieldBaseProps, {
+                fieldRefObject = _5.sent();
+                if (!(props.data._display && _$1.has(props.data._display, steedosField.name))) return [3 /*break*/, 7];
+                _e = (_d = Object).assign;
+                _f = [{}, fieldBaseProps];
+                _p = {
                     type: 'control',
-                    name: null,
-                    body: [{
-                            type: 'wrapper',
-                            className: "steedos-field-lookup-wrapper p-0",
-                            "wrapWithPanel": false,
-                            "actions": [],
-                            visibleOn: "${_display.".concat(steedosField.name, "}"),
-                            body: [
-                                {
-                                    type: 'each',
-                                    placeholder: "",
-                                    className: "steedos-field-lookup-each flex flex-wrap gap-2",
-                                    source: "${_display.".concat(steedosField.name, "|asArray}"),
-                                    items: {
-                                        type: 'static',
-                                        labelClassName: "hidden",
-                                        label: false,
-                                        className: 'm-0',
-                                        tpl: "<a href=\"/app/-/${objectName}/view/${value}\" target=\"_blank\" ".concat(lookupATagClick, ">${label}</a>"),
-                                        popOver: fieldRefObject.compactLayouts && window.innerWidth >= 768 ? {
-                                            "trigger": "hover",
-                                            "className": "steedos-record-detail-popover",
-                                            "position": "left-bottom",
-                                            "showIcon": false,
-                                            "title": false,
-                                            "offset": {
-                                                "top": 0,
-                                                "left": 20
-                                            },
-                                            "body": [
-                                                {
-                                                    "type": "steedos-record-mini",
-                                                    "objectApiName": "${objectName}",
-                                                    "recordId": "${value}",
-                                                    "showButtons": false,
-                                                    "showBackButton": false,
-                                                    "data": {
-                                                        "objectName": "${objectName}",
-                                                        "recordId": "${value}",
-                                                    }
-                                                }
-                                            ]
-                                        } : null,
-                                        onEvent: window.innerWidth < 768 ? null : REFERENCE_VALUE_ITEM_ONCLICK
-                                    }
-                                }
-                            ]
+                    name: null
+                };
+                _q = {
+                    type: 'wrapper',
+                    className: "steedos-field-lookup-wrapper p-0",
+                    "wrapWithPanel": false,
+                    "actions": [],
+                    visibleOn: "${_display.".concat(steedosField.name, "}")
+                };
+                _r = {
+                    type: 'each',
+                    placeholder: "",
+                    className: "steedos-field-lookup-each flex flex-wrap gap-2",
+                    source: "${_display.".concat(steedosField.name, "|asArray}")
+                };
+                _s = {
+                    type: 'static',
+                    labelClassName: "hidden",
+                    label: false,
+                    className: 'm-0',
+                    tpl: "<a href=\"/app/-/${objectName}/view/${value}\" target=\"_blank\" ".concat(lookupATagClick, ">${label}</a>"),
+                    popOver: fieldRefObject.compactLayouts && window.innerWidth >= 768 ? {
+                        "trigger": "hover",
+                        "className": "steedos-record-detail-popover",
+                        "position": "left-bottom",
+                        "showIcon": false,
+                        "title": false,
+                        "offset": {
+                            "top": 0,
+                            "left": 20
                         },
-                        {
+                        "body": [
+                            {
+                                "type": "steedos-record-mini",
+                                "objectApiName": "${objectName}",
+                                "recordId": "${value}",
+                                "showButtons": false,
+                                "showBackButton": false,
+                                "data": {
+                                    "objectName": "${objectName}",
+                                    "recordId": "${value}",
+                                }
+                            }
+                        ]
+                    } : null
+                };
+                if (!(window.innerWidth < 768)) return [3 /*break*/, 4];
+                _g = null;
+                return [3 /*break*/, 6];
+            case 4: return [4 /*yield*/, getLookupLinkOnClick(steedosField, {
+                    appId: appId,
+                    objectName: referenceTo_1,
+                    formFactor: formFactor
+                })];
+            case 5:
+                _g = _5.sent();
+                _5.label = 6;
+            case 6:
+                fieldBaseProps = _e.apply(_d, _f.concat([(_p.body = [(_q.body = [
+                            (_r.items = (
+                            // onEvent: window.innerWidth < 768 ? null : REFERENCE_VALUE_ITEM_ONCLICK
+                            _s.onEvent = _g,
+                                _s),
+                                _r)
+                        ],
+                            _q), {
                             type: 'static',
                             tpl: '-',
-                            className: "".concat(fieldBaseProps.className || '', " text-muted"),
+                            className: "".concat(fieldBaseProps.className || '', " text-muted !border-b-0"),
                             hiddenOn: "${_display.".concat(steedosField.name, "}"),
-                        }]
-                });
-                return [3 /*break*/, 6];
-            case 4: return [4 /*yield*/, env.fetcher(source, props.data)];
-            case 5:
-                res = _o.sent();
-                valueOptions_1 = ((_l = res === null || res === void 0 ? void 0 : res.data) === null || _l === void 0 ? void 0 : _l.options) || [];
-                fieldValue = (_m = props.data) === null || _m === void 0 ? void 0 : _m[steedosField.name];
+                        }],
+                        _p)]));
+                return [3 /*break*/, 13];
+            case 7: return [4 /*yield*/, env.fetcher(source, props.data)];
+            case 8:
+                res = _5.sent();
+                valueOptions_1 = ((_3 = res === null || res === void 0 ? void 0 : res.data) === null || _3 === void 0 ? void 0 : _3.options) || [];
+                fieldValue = (_4 = props.data) === null || _4 === void 0 ? void 0 : _4[steedosField.name];
                 values = fieldValue;
                 if (_$1.isString(values)) {
                     values = [values];
                 }
-                if (values && values.length > 0) {
-                    disPlayValue_1 = [];
-                    _$1.each(values, function (value) {
-                        var option = valueOptions_1.find(function (item) { return item.value === value; });
-                        if (option) {
-                            disPlayValue_1.push({
-                                objectName: referenceTo_1,
-                                value: option._id || option.value,
-                                label: option.label
-                            });
-                        }
-                    });
-                    fieldBaseProps = Object.assign({}, fieldBaseProps, { type: 'control', name: null, body: {
-                            type: 'form',
-                            className: "steedos-field-lookup-wrapper p-0",
-                            "wrapWithPanel": false,
-                            "actions": [],
-                            data: (_e = {},
-                                _e[steedosField.name] = disPlayValue_1,
-                                _e),
-                            body: [
-                                {
-                                    type: 'each',
-                                    placeholder: "",
-                                    className: "steedos-field-lookup-each flex flex-wrap gap-2",
-                                    source: "${".concat(steedosField.name, "}"),
-                                    items: {
-                                        type: 'static',
-                                        className: 'm-0',
-                                        tpl: "<a href=\"/app/-/${objectName}/view/${value}\" target=\"_blank\" ".concat(lookupATagClick, ">${label}</a>"),
-                                        popOver: fieldRefObject.compactLayouts && window.innerWidth >= 768 ? {
-                                            "trigger": "hover",
-                                            "className": "steedos-record-detail-popover",
-                                            "position": "left-bottom",
-                                            "showIcon": false,
-                                            "title": false,
-                                            "offset": {
-                                                "top": 0,
-                                                "left": 20
-                                            },
-                                            "body": [
-                                                {
-                                                    "type": "steedos-record-mini",
-                                                    "objectApiName": "${objectName}",
-                                                    "recordId": "${value}",
-                                                    "showButtons": false,
-                                                    "showBackButton": false,
-                                                    "data": {
-                                                        "objectName": "${objectName}",
-                                                        "recordId": "${value}",
-                                                    }
-                                                }
-                                            ]
-                                        } : null,
-                                        onEvent: window.innerWidth < 768 ? null : REFERENCE_VALUE_ITEM_ONCLICK
-                                    }
+                if (!(values && values.length > 0)) return [3 /*break*/, 12];
+                disPlayValue_1 = [];
+                _$1.each(values, function (value) {
+                    var option = valueOptions_1.find(function (item) { return item.value === value; });
+                    if (option) {
+                        disPlayValue_1.push({
+                            objectName: referenceTo_1,
+                            value: option._id || option.value,
+                            label: option.label
+                        });
+                    }
+                });
+                _j = (_h = Object).assign;
+                _k = [{}, fieldBaseProps];
+                _t = { type: 'control', name: null };
+                _u = {
+                    type: 'form',
+                    className: "steedos-field-lookup-wrapper p-0",
+                    "wrapWithPanel": false,
+                    "actions": [],
+                    data: (_v = {},
+                        _v[steedosField.name] = disPlayValue_1,
+                        _v)
+                };
+                _w = {
+                    type: 'each',
+                    placeholder: "",
+                    className: "steedos-field-lookup-each flex flex-wrap gap-2",
+                    source: "${".concat(steedosField.name, "}")
+                };
+                _x = {
+                    type: 'static',
+                    className: 'm-0',
+                    tpl: "<a href=\"/app/-/${objectName}/view/${value}\" target=\"_blank\" ".concat(lookupATagClick, ">${label}</a>"),
+                    popOver: fieldRefObject.compactLayouts && window.innerWidth >= 768 ? {
+                        "trigger": "hover",
+                        "className": "steedos-record-detail-popover",
+                        "position": "left-bottom",
+                        "showIcon": false,
+                        "title": false,
+                        "offset": {
+                            "top": 0,
+                            "left": 20
+                        },
+                        "body": [
+                            {
+                                "type": "steedos-record-mini",
+                                "objectApiName": "${objectName}",
+                                "recordId": "${value}",
+                                "showButtons": false,
+                                "showBackButton": false,
+                                "data": {
+                                    "objectName": "${objectName}",
+                                    "recordId": "${value}",
                                 }
-                            ]
-                        } });
-                }
-                else {
-                    fieldBaseProps = Object.assign({}, fieldBaseProps, { type: 'static', tpl: '-', className: "".concat(fieldBaseProps.className || '', " text-muted") });
-                }
-                _o.label = 6;
-            case 6:
+                            }
+                        ]
+                    } : null
+                };
+                if (!(window.innerWidth < 768)) return [3 /*break*/, 9];
+                _l = null;
+                return [3 /*break*/, 11];
+            case 9: return [4 /*yield*/, getLookupLinkOnClick(steedosField, {
+                    appId: appId,
+                    objectName: referenceTo_1,
+                    formFactor: formFactor
+                })];
+            case 10:
+                _l = _5.sent();
+                _5.label = 11;
+            case 11:
+                fieldBaseProps = _j.apply(_h, _k.concat([(_t.body = (_u.body = [
+                        (_w.items = (
+                        // onEvent: window.innerWidth < 768 ? null : REFERENCE_VALUE_ITEM_ONCLICK
+                        _x.onEvent = _l,
+                            _x),
+                            _w)
+                    ],
+                        _u), _t)]));
+                return [3 /*break*/, 13];
+            case 12:
+                fieldBaseProps = Object.assign({}, fieldBaseProps, { type: 'static', tpl: '-', className: "".concat(fieldBaseProps.className || '', " text-muted") });
+                _5.label = 13;
+            case 13:
                 schema = Object.assign({}, fieldBaseProps, _$1.pick(steedosField.amis || {}, ['className', 'inline', 'label', 'labelAlign', 'name', 'labelRemark', 'description', 'placeholder', 'staticClassName', 'staticLabelClassName', 'staticInputClassName', 'staticSchema']));
                 schema.placeholder = "";
                 // console.log(`steedos field [lookup] schema:`, schema)
                 return [2 /*return*/, schema];
-            case 7:
-                if (!fStatic) return [3 /*break*/, 21];
-                if (!props.data.hasOwnProperty("_display")) return [3 /*break*/, 9];
-                return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
-            case 8:
-                fieldSchema = _o.sent();
+            case 14:
+                if (!fStatic) return [3 /*break*/, 28];
+                if (!props.data.hasOwnProperty("_display")) return [3 /*break*/, 16];
+                return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, true, ctx)];
+            case 15:
+                fieldSchema = _5.sent();
                 if (steedosField.type === 'file' && fieldSchema.disabled) {
                     fieldValue = fieldSchema.value;
                     if (fieldValue && fieldValue.length) {
                         hasImageOrFile_1 = false;
                         _$1.forEach(fieldValue, function (item) {
                             var fileName = item.name;
-                            if ([".pdf", ".jpg", ".jpeg", ".png", ".gif"].indexOf(fileName.slice(-4)) > -1) {
+                            if ([".pdf", ".jpg", ".jpeg", ".png", ".gif"].indexOf(fileName.toLowerCase().slice(-4)) > -1) {
                                 hasImageOrFile_1 = true;
                             }
                         });
@@ -23752,7 +24553,7 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                             var fileName = item.name;
                             var fileUrl = item.url;
                             var filePreviewHtml = '';
-                            if ([".pdf", ".jpg", ".jpeg", ".png", ".gif"].indexOf(fileName.slice(-4)) > -1) {
+                            if ([".pdf", ".jpg", ".jpeg", ".png", ".gif"].indexOf(fileName.toLowerCase().slice(-4)) > -1) {
                                 var indexOfQuestionMark = fileUrl.indexOf('?');
                                 if (indexOfQuestionMark > -1) {
                                     var filePreviewUrl = fileUrl.substring(0, indexOfQuestionMark);
@@ -23769,60 +24570,60 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     }
                 }
                 return [2 /*return*/, fieldSchema];
-            case 9:
+            case 16:
                 schema = Object.assign({}, steedosField, {
                     type: getAmisStaticFieldType(steedosField.type, steedosField.data_type, steedosField),
                     static: true,
                     label: steedosField.label
                 });
-                if (!(steedosField.type === "time" || steedosField.type === "input-time-range")) return [3 /*break*/, 10];
+                if (!(steedosField.type === "time" || steedosField.type === "input-time-range")) return [3 /*break*/, 17];
                 Object.assign(schema, {
                     inputFormat: 'HH:mm',
                     timeFormat: 'HH:mm',
                     format: '1970-01-01THH:mm:00.000[Z]',
                 });
-                return [3 /*break*/, 20];
-            case 10:
-                if (!(steedosField.type === "percent")) return [3 /*break*/, 11];
+                return [3 /*break*/, 27];
+            case 17:
+                if (!(steedosField.type === "percent")) return [3 /*break*/, 18];
                 Object.assign(schema, {
                     "percent": steedosField.scale ? steedosField.scale : true
                 });
-                return [3 /*break*/, 20];
-            case 11:
-                if (!(steedosField.type === "password")) return [3 /*break*/, 12];
+                return [3 /*break*/, 27];
+            case 18:
+                if (!(steedosField.type === "password")) return [3 /*break*/, 19];
                 Object.assign(schema, {
                     "tpl": "******"
                 });
-                return [3 /*break*/, 20];
-            case 12:
-                if (!(steedosField.type === "select")) return [3 /*break*/, 13];
+                return [3 /*break*/, 27];
+            case 19:
+                if (!(steedosField.type === "select")) return [3 /*break*/, 20];
                 map = getSelectMap(steedosField.options);
                 Object.assign(schema, {
                     "placeholder": "",
                     "map": map
                 });
-                return [3 /*break*/, 20];
-            case 13:
-                if (!(steedosField.type === "color")) return [3 /*break*/, 14];
+                return [3 /*break*/, 27];
+            case 20:
+                if (!(steedosField.type === "color")) return [3 /*break*/, 21];
                 Object.assign(schema, {
                     "defaultColor": null
                 });
-                return [3 /*break*/, 20];
-            case 14:
-                if (!(steedosField.type === "number" || steedosField.type === 'currency')) return [3 /*break*/, 15];
+                return [3 /*break*/, 27];
+            case 21:
+                if (!(steedosField.type === "number" || steedosField.type === 'currency')) return [3 /*break*/, 22];
                 // amis input-number和number组件中的precision表示小数位数，并不是魔方平台的精度概念，要转换下，否则小数点后会显示很多的0
                 Object.assign(schema, {
                     "precision": steedosField.scale || 0,
                     "kilobitSeparator": steedosField.enable_thousands //识别enable_thousands，控制千分位分隔符
                 });
-                return [3 /*break*/, 20];
-            case 15:
-                if (!(steedosField.type === "table")) return [3 /*break*/, 16];
+                return [3 /*break*/, 27];
+            case 22:
+                if (!(steedosField.type === "table")) return [3 /*break*/, 23];
                 if (steedosField.subFields) {
                     tableFields = [];
                     try {
-                        for (_c = __values(steedosField.subFields), _d = _c.next(); !_d.done; _d = _c.next()) {
-                            subField = _d.value;
+                        for (_m = __values(steedosField.subFields), _o = _m.next(); !_o.done; _o = _m.next()) {
+                            subField = _o.value;
                             if (!subField.name.endsWith(".$")) {
                                 subFieldName = subField.name.replace("".concat(steedosField._prefix || '').concat(steedosField.name, ".$."), '').replace("".concat(steedosField.name, "."), '');
                                 // const gridSub = await convertSFieldToAmisField(Object.assign({}, subField, {name: subFieldName, isTableField: true}), readonly, ctx);
@@ -23833,7 +24634,7 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     catch (e_1_1) { e_1 = { error: e_1_1 }; }
                     finally {
                         try {
-                            if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
+                            if (_o && !_o.done && (_y = _m.return)) _y.call(_m);
                         }
                         finally { if (e_1) throw e_1.error; }
                     }
@@ -23849,9 +24650,9 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         }
                     });
                 }
-                return [3 /*break*/, 20];
-            case 16:
-                if (!(steedosField.type === "image")) return [3 /*break*/, 17];
+                return [3 /*break*/, 27];
+            case 23:
+                if (!(steedosField.type === "image")) return [3 /*break*/, 24];
                 Object.assign(schema, {
                     enlargeAble: true,
                     showToolbar: true,
@@ -23882,15 +24683,15 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         return value;
                     }
                 });
-                return [3 /*break*/, 20];
-            case 17:
-                if (!(steedosField.type === "file")) return [3 /*break*/, 19];
-                return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
-            case 18: 
+                return [3 /*break*/, 27];
+            case 24:
+                if (!(steedosField.type === "file")) return [3 /*break*/, 26];
+                return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, true, ctx)];
+            case 25: 
             // 附件static模式先保持原来的逻辑，依赖_display，审批王中相关功能在creator中
             // convertSFieldToAmisField中会合并steedosField.amis，所以也不需要再次合并steedosField.amis，直接return就好
-            return [2 /*return*/, _o.sent()];
-            case 19:
+            return [2 /*return*/, _5.sent()];
+            case 26:
                 if (steedosField.type === 'formula' || steedosField.type === 'summary') {
                     if (steedosField.data_type === 'number' || steedosField.data_type === 'currency') {
                         Object.assign(schema, {
@@ -23951,11 +24752,11 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         disabled: true
                     });
                 }
-                _o.label = 20;
-            case 20:
+                _5.label = 27;
+            case 27:
                 Object.assign(schema, steedosField.amis || {});
                 return [2 /*return*/, schema];
-            case 21:
+            case 28:
                 if (!ctx.className) {
                     ctx.className = className;
                 }
@@ -24016,16 +24817,16 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     }
                 }
                 return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
-            case 22:
-                schema = _o.sent();
+            case 29:
+                schema = _5.sent();
                 // console.log(`AmisSteedosField return schema`, schema)
                 return [2 /*return*/, schema];
-            case 23: return [3 /*break*/, 25];
-            case 24:
-                error_1 = _o.sent();
+            case 30: return [3 /*break*/, 32];
+            case 31:
+                error_1 = _5.sent();
                 console.log("error", error_1);
-                return [3 /*break*/, 25];
-            case 25: return [2 /*return*/, null];
+                return [3 /*break*/, 32];
+            case 32: return [2 /*return*/, null];
         }
     });
 }); };
@@ -24268,7 +25069,7 @@ var AmisInputTable = function (props) { return __awaiter(void 0, void 0, void 0,
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                props.$schema, props.fields, props.name, props.id, props.data, props.columns, props.amis, props.className, props.tableClassName, props.headerToolbar, props.footerToolbar, props.inlineEditMode, props.strictMode, props.dialog, props.primaryKey, props.showOperation, props.fieldPrefix, props.autoGeneratePrimaryKeyValue, props.mode, props.disabledOn, props.disabled, props.visibleOn, props.visible, props.hiddenOn, props.hidden, props.enableDialog, props.enableTree;
+                props.$schema, props.fields, props.name, props.id, props.data, props.columns, props.amis, props.className, props.tableClassName, props.headerToolbar, props.footerToolbar, props.inlineEditMode, props.strictMode, props.dialog, props.primaryKey, props.showOperation, props.fieldPrefix, props.autoGeneratePrimaryKeyValue, props.mode, props.disabledOn, props.disabled, props.visibleOn, props.visible, props.hiddenOn, props.hidden, props.enableDialog, props.enableTree, props.description;
                 extendProps = {};
                 if (props.disabledOn || props.disabled) {
                     extendProps["addable"] = false;
@@ -24529,7 +25330,7 @@ var PageObject = function (props) { return __awaiter(void 0, void 0, void 0, fun
     });
 }); };
 
-var __assign=function(){return (__assign=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++)for(var a in t=arguments[r])Object.prototype.hasOwnProperty.call(t,a)&&(e[a]=t[a]);return e}).apply(this,arguments)},StandardObjects={Base:{Actions:{standard_query:{visible:function(e,t,r){return !1}},standard_new:{visible:function(e,t,r){return "cms_files"!==e&&"instances"!==e&&(r?r.allowCreate:void 0)}},standard_edit:{visible:function(e,t,r){if(r)return r.allowEdit}},standard_delete:{visible:function(e,t,r){if(r)return r.allowDelete}},standard_import_data:{visible:function(e,t,r){var n=this.object;if(r)return r.allowCreate&&n.hasImportTemplates}},standard_approve:{visible:function(e,t,r){return !1}},standard_view_instance:{visible:function(e,t,r){return !1}},standard_submit_for_approval:{visible:function(e,t,r){return window.Steedos.ProcessManager.allowSubmit.apply(this,[e,t])},todo:function(e,t){return window.Steedos.ProcessManager.submit.apply(this,[e,t])}},standard_follow:{visible:function(e,t,r){return !1}},standard_delete_many:{visible:function(e,t,r){return !RegExp("\\w+/view/\\w+").test(location.pathname)&&(r?r.allowDelete:void 0)}},standard_export_excel:{visible:function(e,t,r){return !1}}}}},authRequest=function(e,t){var o=null;e=Steedos.absoluteUrl(e);try{var r=[{name:"Content-Type",value:"application/json"},{name:"Authorization",value:Steedos.getAuthorization()}],n={type:"get",url:e,dataType:"json",contentType:"application/json",beforeSend:function(t){if(r&&r.length)return r.forEach(function(e){return t.setRequestHeader(e.name,e.value)})},success:function(e){o=e;},error:function(e,t,r){var n,a;e.responseJSON&&e.responseJSON.error?(n=e.responseJSON.error,a=void(o={error:n}),a=n.reason||n.message||n,console.error(a)):console.error(e.responseJSON);}};return $.ajax(Object.assign({},n,t)),o}catch(e){console.error(e);}};function _extends(){return (_extends=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r,n=arguments[t];for(r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r]);}return e}).apply(this,arguments)}const newFunctionComponent=a=>e=>{const[t,r]=React.useState(!0);var n=()=>{r(!1);};return _$1.has(e,"ref")||(window.SteedosUI.refs[e.name]={show:()=>{r(!0);},close:n}),React__default["default"].createElement(a,_extends({visible:t,onCancel:n,onClose:n},{width:"70%",style:{width:"70%",maxWidth:"950px",minWidth:"480px"}},e))},newComponentRender=(r,n)=>(e,t)=>{e.name||(e.name=r+"-"+(e.name||"default")),(t=t||document.getElementById(`steedos-${r}-root-`+e.name))||((t=document.createElement("div")).setAttribute("id",`steedos-${r}-root-`+e.name),document.body.appendChild(t));e=React__default["default"].createElement(newFunctionComponent(n),e);ReactDOM.createRoot(t).render(e);},Modal=_$1.assign(newComponentRender("modal",antd.Modal),{info:antd.Modal.info,success:antd.Modal.success,error:antd.Modal.error,warning:antd.Modal.warning,confirm:antd.Modal.confirm}),Drawer=newComponentRender("drawer",antd.Drawer),getGraphqlFieldsQuery=e=>{const t=["_id"];return e.push("record_permissions"),_$1.each(e,e=>{-1<e.indexOf(".")&&(e=e.split(".")[0]),t.push(""+e);}),""+t.join(" ")},getFindOneQuery=(e,t,r)=>{e=e.replace(/\./g,"_");r=getGraphqlFieldsQuery(r);let n="";t=[`id: "${t}"`];return `{record:${e}__findOne${n=0<t.length?`(${t.join(",")})`:n}{${r}}}`},SObject={getRecord:async(e,t,r)=>{return (await fetchAPI("/graphql",{method:"post",body:JSON.stringify({query:getFindOneQuery(e,t,r)})})).data.record},getUISchema:async(e,t)=>getUISchema(e,t)},canSaveFilter=e=>!(!e._id||e.owner!==getSteedosAuth()?.userId),ListView={showFilter:(e,{listView:t,data:r})=>{canSaveFilter(t);r.filters&&(r.filters=filtersToConditions(r.filters));},getVisibleFilter:(e,t)=>{return t||(canSaveFilter(e)?e.filters:void 0)},getQueryFilter:(e,t)=>{return canSaveFilter(e)?ListView.getVisibleFilter(e,t):_$1.isEmpty(t)?e.filters:[e.filters,"and",t]},getFirstListView:async e=>{e=await window.getUISchema(e);return _.first(_.sortBy(_.values(e.list_views),"sort_no"))}},Router={getAppPath({appId:e}){return "/app/"+e},getPagePath(){},getObjectListViewPath({appId:e,objectName:t,listViewName:r}){return `/app/${e}/${t}/grid/`+r},getObjectDetailPath({appId:e,objectName:t,recordId:r}){return `/app/${e}/${t}/view/`+r},getObjectRelatedViewPath({appId:e,masterObjectName:t,masterRecordId:r,objectName:n,foreignKey:a}){return `/app/${e}/${t}/${r}/${n}/grid?related_field_name=`+a}};var withModalWrap=function(t,e){return function(e){return React.createElement(t,e)}},render=function(e,t,r,n){e=withModalWrap(e),e=React.createElement(e,__assign({},t));return ReactDOM__default["default"].render(e,r)};const safeRunFunction=(t,r,n,a)=>{try{var o=window.Creator;if(!!(!o||!o.getObjectUrl)&&/\bSteedos\b|\bCreator\b|\bMeteor\b|\bSession\b/.test(t))return console.info("调用了Creator|Steedos|Meteor|Session变量的脚本不执行，直接按空值处理。"),"";let e=[];return _$1.isNil(r)||(e=_$1.isArray(r)?r:[r]),t.bind(a||{})(...e)}catch(e){return console.log(e),n}};function safeEval(js){try{return eval(js)}catch(e){console.error(e,js);}}const isExpression=function(e){var t,r;return "string"==typeof e&&(t=/^{{(function.+)}}$/,r=/^{{(.+=>.+)}}$/,!("string"!=typeof e||!e.match(/^{{(.+)}}$/)||e.match(t)||e.match(r)))},getMoment=()=>window.amisRequire?window.amisRequire("moment"):window.moment||void 0,getGlobalNowData=()=>{var e=new Date,t=getMoment();let r=t().utc(),n=(r.set("hours",0),r.set("minutes",0),r.set("seconds",0),r.set("milliseconds",0),r=r.toDate(),t());return n.set("year",1970),n.set("month",0),n.set("date",1),n.set("hours",n.hours()+n.utcOffset()/60),n.set("seconds",0),n.set("milliseconds",0),n=n.toDate(),{now:e,today:r,timeNow:n}},parseSingleExpression=function(t,e,r,n){var a,o;if(n&&Object.assign(n,getGlobalNowData()),o=function(e,t){return "#"!==t&&t?"string"==typeof t?_.get(e,t):void console.error("path has to be a string"):e||{}}(e=void 0===e?{}:e,function(e){return "string"!=typeof e||1===(e=e.split(".")).length?"#":(e.pop(),e.join("."))}(r))||{},"string"!=typeof t)return t;a="__G_L_O_B_A_L__",e="\n    return "+t.substring(2,t.length-2).replace(/\bformData\b/g,JSON.stringify(e).replace(/\bglobal\b/g,a)).replace(/\bglobal\b/g,JSON.stringify(n)).replace(new RegExp("\\b"+a+"\\b","g"),"global").replace(/rootValue/g,JSON.stringify(o));try{return Function(e)()}catch(e){return console.log(e,t,r),t}};var Expression=Object.freeze({__proto__:null,isExpression:isExpression,getGlobalNowData:getGlobalNowData,parseSingleExpression:parseSingleExpression});const getCompatibleDefaultValueExpression=(express,multiple)=>{const reg=/^\{\w+(\.*\w+)*\}$/,reg2=/^{{[\s\S]*}}$/;let result=express;if(reg.test(express)&&(result=-1<express.indexOf("userId")||-1<express.indexOf("spaceId")||-1<express.indexOf("user.")||-1<express.indexOf("now")||-1<express.indexOf("today")||-1<express.indexOf("timeNow")?`{${express}}`.replace("{{","{{global."):`{${express}}`.replace("{{","{{formData."),multiple&&(result=result.replace(/\{\{(.+)\}\}/,"{{[$1]}}"))),reg2.test(express)&&(-1<express.indexOf("function")||-1<express.indexOf("=>"))){let regex=/\{\{([\s\S]*)\}\}/,matches=regex.exec(express);if(matches&&1<matches.length){let functionCode=matches[1];result=eval("("+functionCode+")")();}}return result},getFieldDefaultValue=(e,t)=>{if(!e)return null;let r=e.defaultValue;e._defaultValue&&(r=safeEval(`(${e._defaultValue})`)),_$1.isFunction(r)&&(r=safeRunFunction(r,[],null,{name:e.name})),_$1.isString(r)&&(r=getCompatibleDefaultValueExpression(r,e.multiple));var n=isExpression(r);switch(n&&("date"===e.type?r=r.replace(/\bglobal.now\b/g,"global.today"):"time"===e.type&&(r=r.replace(/\bglobal.now\b/g,"global.timeNow")),r=parseSingleExpression(r,{},"#",t)),e.type){case"select":var a=e.data_type||"text";!r||n||e.multiple||("text"!==a||_$1.isString(r)?"number"===a&&_$1.isString(r)?r=Number(r):"boolean"===a&&_$1.isString(r)&&(r="true"===r.toLowerCase()||"1"===r):r=String(r));break;case"number":_$1.isString(r)&&(r=Number(r));break;case"boolean":_$1.isString(r)?r="true"===r.toLowerCase()||"1"===r:_$1.isBoolean(r)||(r=!1);break;case"time":if(_$1.isDate(r))return moment(r).format("1970-01-01THH:mm:00.000[Z]");case"date":if(_$1.isDate(r))return moment(r).format("YYYY-MM-DDT00:00:00.000[Z]");case"datetime":if(_$1.isDate(r))return moment(r).format("YYYY-MM-DDTHH:mm:00.000Z")}return r};function getTreeOptions(t,e){const a=e?.valueField||"value";e?.labelField;const r=e?.unfoldedNum||1,n=[],o=(e,t,r,n)=>{return e.children&&"object"==typeof e.children[0]?e.children:r?(e=_.filter(t,e=>_.includes(r,e[a])),_.each(e,e=>{1<=n?(e.unfolded=!0,e.children&&(e.children=o(e,t,e.children,n-1))):e.children&&(e.children=o(e,t,e.children,n));}),e):void 0};for(var s=t,i=0;i<s.length;i++)if(s[i].noParent=0,s[i].unfolded=!1,s[i].parent){let e=1;for(var l=0;l<s.length;l++)s[i].parent==s[l][a]&&(e=0);1==e&&(s[i].noParent=1);}else s[i].noParent=1;return _.each(t,e=>{1==e.noParent&&(1<=r?(e.unfolded=!0,n.push(Object.assign({},e,{children:o(e,t,e.children,r-1)}))):n.push(Object.assign({},e,{children:o(e,t,e.children,r)})));}),n}function getClosestAmisComponentByType(t,r,n){let a=(n=n||{}).name;var e=n.direction||"up";let o=t.getComponents().find(function(e){return e.props.type===r&&(!a||e.props.name===a)});if(o)return o;if("down"===e){if(t.children&&t.children.length){for(let e=0;e<t.children.length&&!(o=getClosestAmisComponentByType(t.children[e],r,n));e++);return o}}else if("up"===e&&t.parent)return getClosestAmisComponentByType(t.parent,r,n)}function isFilterFormValuesEmpty(e){let t=!0;var e=_.pickBy(e,function(e,t){return /^__searchable__/g.test(t)});return _.isEmpty(e)||(e=_.omitBy(e,function(e){return _.isNil(e)||_.isObject(e)&&_.isEmpty(e)||_.isArray(e)&&_.isEmpty(e.filter(function(e){return !_.isNil(e)}))||_.isString(e)&&0===e.length}),_.isEmpty(e)||(t=!1)),t}const SteedosUI$1=Object.assign({},{render:render,Router:Router,ListView:ListView,Object:SObject,Modal:Modal,Drawer:Drawer,refs:{},getRef(e){return SteedosUI$1.refs[e]},router:{go:(e,t)=>{var r=window.FlowRouter;if(t)return r?r.go(t):window.open(t);r?r.reload():console.warn("暂不支持自动跳转",e);},reload:()=>{console.log("reload");}},message:antd.message,notification:antd.notification,components:{Button:antd.Button,Space:antd.Space},getRefId:({type:e,appId:t,name:r})=>{switch(e){case"listview":return `amis-${t}-${r}-listview`;case"form":return `amis-${t}-${r}-form`;case"detail":return `amis-${t}-${r}-detail`;default:return `amis-${t}-${r}-`+e}},reloadRecord:()=>{if(window.FlowRouter)return window.FlowRouter.reload()},getFieldDefaultValue:getFieldDefaultValue,getTreeOptions:getTreeOptions,getClosestAmisComponentByType:getClosestAmisComponentByType,isFilterFormValuesEmpty:isFilterFormValuesEmpty,getSearchFilter:e=>{var a=[];return _.each(e,(e,t)=>{var r,n;_.isEmpty(e)&&!_.isBoolean(e)||(_.startsWith(t,"__searchable__between__")?a.push([""+t.replace("__searchable__between__",""),"between",e]):_.startsWith(t,"__searchable__")&&(_.isString(e)?a.push([""+t.replace("__searchable__",""),"contains",e]):_.isObject(e)&&e.o?(n=[[(r=""+t.replace("__searchable__",""))+"/o","=",e.o]],e.ids.length&&n.push([r+"/ids","=",e.ids]),a.push(n)):a.push([""+t.replace("__searchable__",""),"=",e])));}),a},getKeywordsSearchFilter:(e,t)=>{const a=[];var o;return e&&t&&(o=e.split(/\s+/),o=_$1.compact(o),t.forEach(function(r,e){let n=[];1==o.length?n=[r,"contains",o[0]]:o.forEach(function(e,t){n.push([r,"contains",e]),t<o.length-1&&n.push("or");}),n.length&&(a.push(n),e<t.length-1&&a.push("or"));})),a},getFormulaVariables:(e,t=!0)=>{const r=[];return _$1.isEmpty(e)||(r.push({label:"表单字段",children:[]}),lodash.forEach(e,function(e){r[0].children.push({label:e.label,value:e.value});})),t&&r.push({label:"全局变量",children:[{label:"用户ID",value:"global['userId']"},{label:"工作区ID",value:"global['spaceId']"},{label:"只读/编辑模式",value:"global['mode']"},{label:"用户",children:[{label:"姓名",value:"global['user']['name']"},{label:"邮件",value:"global['user']['email']"},{label:"语言",value:"global['user']['language']"},{label:"简档",value:"global['user']['profile']"},{label:"权限集",value:"global['user']['roles']"},{label:"主部门ID",value:"global['user']['organization']['_id']"},{label:"部门(多选)",value:"global['user']['organizations']"},{label:"部门(含上级)",value:"global['user']['organizations_parents']"},{label:"主分部ID",value:"global['user']['company_id']"},{label:"分部(多选)",value:"global['user']['company_ids']"},{label:"人员ID",value:"global['user']['spaceUserId']"},{label:"是否是工作区管理员",value:"global['user']['is_space_admin']"}]}]}),r}});var getBuilderContext=function(){return "undefined"==typeof window?{}:Builder.settings.context||Builder.settings},Steedos$1=__assign({getRootUrl:function(e){var t=getBuilderContext();return t.rootUrl||("undefined"!=typeof window?window.localStorage.getItem("steedos:rootUrl"):"")||e},absoluteUrl:function(e){return void 0===e&&(e=""),"".concat(Steedos$1.getRootUrl()).concat(e)},getTenantId:function(){try{var e=getBuilderContext().tenantId;return (e=window.location.search&&!e?new URLSearchParams(window.location.search).get("X-Space-Id"):e)?e:null}catch(e){console.error(e);}},getAuthorization:function(){try{var e=getBuilderContext(),t=e.tenantId,r=e.authToken;return t&&r?"Bearer ".concat(t,",").concat(r):null}catch(e){console.error(e);}},authRequest:authRequest,StandardObjects:StandardObjects},Expression);"undefined"==typeof window||window.Steedos||(window.Steedos=Steedos$1),"undefined"==typeof window||window.SteedosUI||(window.SteedosUI=SteedosUI$1);
+var __assign=function(){return (__assign=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++)for(var o in t=arguments[r])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)},StandardObjects={Base:{Actions:{standard_query:{visible:function(e,t,r){return !1}},standard_new:{visible:function(e,t,r){return "cms_files"!==e&&"instances"!==e&&(r?r.allowCreate:void 0)}},standard_edit:{visible:function(e,t,r){if(r)return r.allowEdit}},standard_delete:{visible:function(e,t,r){if(r)return r.allowDelete}},standard_import_data:{visible:function(e,t,r){var n=this.object;if(r)return r.allowCreate&&n.hasImportTemplates}},standard_approve:{visible:function(e,t,r){return !1}},standard_view_instance:{visible:function(e,t,r){return !1}},standard_submit_for_approval:{visible:function(e,t,r){return window.Steedos.ProcessManager.allowSubmit.apply(this,[e,t])},todo:function(e,t){return window.Steedos.ProcessManager.submit.apply(this,[e,t])}},standard_follow:{visible:function(e,t,r){return !1}},standard_delete_many:{visible:function(e,t,r){return !RegExp("\\w+/view/\\w+").test(location.pathname)&&(r?r.allowDelete:void 0)}},standard_export_excel:{visible:function(e,t,r){return !1}}}}},authRequest=function(e,t){var a=null;e=Steedos.absoluteUrl(e);try{var r=[{name:"Content-Type",value:"application/json"},{name:"Authorization",value:Steedos.getAuthorization()}],n={type:"get",url:e,dataType:"json",contentType:"application/json",beforeSend:function(t){if(r&&r.length)return r.forEach(function(e){return t.setRequestHeader(e.name,e.value)})},success:function(e){a=e;},error:function(e,t,r){var n,o;e.responseJSON&&e.responseJSON.error?(n=e.responseJSON.error,o=void(a={error:n}),o=n.reason||n.message||n,console.error(o)):console.error(e.responseJSON);}};return $.ajax(Object.assign({},n,t)),a}catch(e){console.error(e);}};function _extends(){return (_extends=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r,n=arguments[t];for(r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r]);}return e}).apply(this,arguments)}const newFunctionComponent=o=>e=>{const[t,r]=React.useState(!0);var n=()=>{r(!1);};return _$1.has(e,"ref")||(window.SteedosUI.refs[e.name]={show:()=>{r(!0);},close:n}),React__default["default"].createElement(o,_extends({visible:t,onCancel:n,onClose:n},{width:"70%",style:{width:"70%",maxWidth:"950px",minWidth:"480px"}},e))},newComponentRender=(r,n)=>(e,t)=>{e.name||(e.name=r+"-"+(e.name||"default")),(t=t||document.getElementById(`steedos-${r}-root-`+e.name))||((t=document.createElement("div")).setAttribute("id",`steedos-${r}-root-`+e.name),document.body.appendChild(t));e=React__default["default"].createElement(newFunctionComponent(n),e);ReactDOM.createRoot(t).render(e);},Modal=_$1.assign(newComponentRender("modal",antd.Modal),{info:antd.Modal.info,success:antd.Modal.success,error:antd.Modal.error,warning:antd.Modal.warning,confirm:antd.Modal.confirm}),Drawer=newComponentRender("drawer",antd.Drawer),getGraphqlFieldsQuery=e=>{const t=["_id"];return e.push("record_permissions"),_$1.each(e,e=>{-1<e.indexOf(".")&&(e=e.split(".")[0]),t.push(""+e);}),""+t.join(" ")},getFindOneQuery=(e,t,r)=>{e=e.replace(/\./g,"_");r=getGraphqlFieldsQuery(r);let n="";t=[`id: "${t}"`];return `{record:${e}__findOne${n=0<t.length?`(${t.join(",")})`:n}{${r}}}`},SObject={getRecord:async(e,t,r)=>{return (await fetchAPI("/graphql",{method:"post",body:JSON.stringify({query:getFindOneQuery(e,t,r)})})).data.record},getUISchema:async(e,t)=>getUISchema(e,t)},canSaveFilter=e=>!(!e._id||e.owner!==getSteedosAuth()?.userId),ListView={showFilter:(e,{listView:t,data:r})=>{canSaveFilter(t);r.filters&&(r.filters=filtersToConditions(r.filters));},getVisibleFilter:(e,t)=>{return t||(canSaveFilter(e)?e.filters:void 0)},getQueryFilter:(e,t)=>{return canSaveFilter(e)?ListView.getVisibleFilter(e,t):_$1.isEmpty(t)?e.filters:[e.filters,"and",t]},getFirstListView:async e=>{e=await window.getUISchema(e);return _.first(_.sortBy(_.values(e.list_views),"sort_no"))}},Router={getAppPath({appId:e}){return "/app/"+e},getPagePath(){},getObjectListViewPath({appId:e,objectName:t,listViewName:r}){return `/app/${e}/${t}/grid/`+r},getObjectDetailPath({appId:e,objectName:t,recordId:r}){return `/app/${e}/${t}/view/`+r},getObjectRelatedViewPath({appId:e,masterObjectName:t,masterRecordId:r,objectName:n,foreignKey:o}){return `/app/${e}/${t}/${r}/${n}/grid?related_field_name=`+o}};var withModalWrap=function(t,e){return function(e){return React.createElement(t,e)}},render=function(e,t,r,n){e=withModalWrap(e),e=React.createElement(e,__assign({},t));return ReactDOM__default["default"].render(e,r)};const safeRunFunction=(t,r,n,o)=>{try{var a=window.Creator;if(!!(!a||!a.getObjectUrl)&&/\bSteedos\b|\bCreator\b|\bMeteor\b|\bSession\b/.test(t))return console.info("调用了Creator|Steedos|Meteor|Session变量的脚本不执行，直接按空值处理。"),"";let e=[];return _$1.isNil(r)||(e=_$1.isArray(r)?r:[r]),t.bind(o||{})(...e)}catch(e){return console.log(e),n}};function safeEval(js){try{return eval(js)}catch(e){console.error(e,js);}}const isExpression=function(e){var t,r;return "string"==typeof e&&(t=/^{{(function.+)}}$/,r=/^{{(.+=>.+)}}$/,!("string"!=typeof e||!e.match(/^{{(.+)}}$/)||e.match(t)||e.match(r)))},getMoment=()=>window.amisRequire?window.amisRequire("moment"):window.moment||void 0,getGlobalNowData=()=>{var e=new Date,t=getMoment();let r=t().utc(),n=(r.set("hours",0),r.set("minutes",0),r.set("seconds",0),r.set("milliseconds",0),r=r.toDate(),t());return n.set("year",1970),n.set("month",0),n.set("date",1),n.set("hours",n.hours()+n.utcOffset()/60),n.set("seconds",0),n.set("milliseconds",0),n=n.toDate(),{now:e,today:r,timeNow:n}},parseSingleExpression=function(t,e,r,n){var o,a;if(n&&Object.assign(n,getGlobalNowData()),a=function(e,t){return "#"!==t&&t?"string"==typeof t?_.get(e,t):void console.error("path has to be a string"):e||{}}(e=void 0===e?{}:e,function(e){return "string"!=typeof e||1===(e=e.split(".")).length?"#":(e.pop(),e.join("."))}(r))||{},"string"!=typeof t)return t;o="__G_L_O_B_A_L__",e="\n    return "+t.substring(2,t.length-2).replace(/\bformData\b/g,JSON.stringify(e).replace(/\bglobal\b/g,o)).replace(/\bglobal\b/g,JSON.stringify(n)).replace(new RegExp("\\b"+o+"\\b","g"),"global").replace(/rootValue/g,JSON.stringify(a));try{return Function(e)()}catch(e){return console.log(e,t,r),t}};var Expression=Object.freeze({__proto__:null,isExpression:isExpression,getGlobalNowData:getGlobalNowData,parseSingleExpression:parseSingleExpression});const getCompatibleDefaultValueExpression=(express,multiple)=>{const reg=/^\{\w+(\.*\w+)*\}$/,reg2=/^{{[\s\S]*}}$/;let result=express;if(reg.test(express)&&(result=-1<express.indexOf("userId")||-1<express.indexOf("spaceId")||-1<express.indexOf("user.")||-1<express.indexOf("now")||-1<express.indexOf("today")||-1<express.indexOf("timeNow")?`{${express}}`.replace("{{","{{global."):`{${express}}`.replace("{{","{{formData."),multiple&&(result=result.replace(/\{\{(.+)\}\}/,"{{[$1]}}"))),reg2.test(express)&&(-1<express.indexOf("function")||-1<express.indexOf("=>"))){let regex=/\{\{([\s\S]*)\}\}/,matches=regex.exec(express);if(matches&&1<matches.length){let functionCode=matches[1];result=eval("("+functionCode+")")();}}return result},getFieldDefaultValue=(e,t)=>{if(!e)return null;let r=e.defaultValue;e._defaultValue&&(r=safeEval(`(${e._defaultValue})`)),_$1.isFunction(r)&&(r=safeRunFunction(r,[],null,{name:e.name})),_$1.isString(r)&&(r=getCompatibleDefaultValueExpression(r,e.multiple));var n=isExpression(r);switch(n&&("date"===e.type?r=r.replace(/\bglobal.now\b/g,"global.today"):"time"===e.type&&(r=r.replace(/\bglobal.now\b/g,"global.timeNow")),r=parseSingleExpression(r,{},"#",t)),e.type){case"select":var o=e.data_type||"text";!r||n||e.multiple||("text"!==o||_$1.isString(r)?"number"===o&&_$1.isString(r)?r=Number(r):"boolean"===o&&_$1.isString(r)&&(r="true"===r.toLowerCase()||"1"===r):r=String(r));break;case"number":_$1.isString(r)&&(r=Number(r));break;case"boolean":_$1.isString(r)?r="true"===r.toLowerCase()||"1"===r:_$1.isBoolean(r)||(r=!1);break;case"time":if(_$1.isDate(r))return moment(r).format("1970-01-01THH:mm:00.000[Z]");case"date":if(_$1.isDate(r))return moment(r).format("YYYY-MM-DDT00:00:00.000[Z]");case"datetime":if(_$1.isDate(r))return moment(r).format("YYYY-MM-DDTHH:mm:00.000Z")}return r};function getTreeOptions(t,e){const o=e?.valueField||"value";e?.labelField;const r=e?.unfoldedNum||1,n=[],a=(e,t,r,n)=>{return e.children&&"object"==typeof e.children[0]?e.children:r?(e=_.filter(t,e=>_.includes(r,e[o])),_.each(e,e=>{1<=n?(e.unfolded=!0,e.children&&(e.children=a(e,t,e.children,n-1))):e.children&&(e.children=a(e,t,e.children,n));}),e):void 0};for(var s=t,i=0;i<s.length;i++)if(s[i].noParent=0,s[i].unfolded=!1,s[i].parent){let e=1;for(var l=0;l<s.length;l++)s[i].parent==s[l][o]&&(e=0);1==e&&(s[i].noParent=1);}else s[i].noParent=1;return _.each(t,e=>{1==e.noParent&&(1<=r?(e.unfolded=!0,n.push(Object.assign({},e,{children:a(e,t,e.children,r-1)}))):n.push(Object.assign({},e,{children:a(e,t,e.children,r)})));}),n}function getClosestAmisComponentByType(t,r,n){let o=(n=n||{}).name;var e=n.direction||"up";let a=t.getComponents().find(function(e){return e.props.type===r&&(!o||e.props.name===o)});if(a)return a;if("down"===e){if(t.children&&t.children.length){for(let e=0;e<t.children.length&&!(a=getClosestAmisComponentByType(t.children[e],r,n));e++);return a}}else if("up"===e&&t.parent)return getClosestAmisComponentByType(t.parent,r,n)}function isFilterFormValuesEmpty(e){let t=!0;var e=_.pickBy(e,function(e,t){return /^__searchable__/g.test(t)});return _.isEmpty(e)||(e=_.omitBy(e,function(e){return _.isNil(e)||_.isObject(e)&&_.isEmpty(e)||_.isArray(e)&&_.isEmpty(e.filter(function(e){return !_.isNil(e)}))||_.isString(e)&&0===e.length}),_.isEmpty(e)||(t=!1)),t}const SteedosUI$1=Object.assign({},{render:render,Router:Router,ListView:ListView,Object:SObject,Modal:Modal,Drawer:Drawer,refs:{},getRef(e){return SteedosUI$1.refs[e]},router:{go:(e,t)=>{var r=window.FlowRouter;if(t)return r?r.go(t):window.open(t);r?r.reload():console.warn("暂不支持自动跳转",e);},reload:()=>{console.log("reload");}},message:antd.message,notification:antd.notification,components:{Button:antd.Button,Space:antd.Space},getRefId:({type:e,appId:t,name:r})=>{switch(e){case"listview":return `amis-${t}-${r}-listview`;case"form":return `amis-${t}-${r}-form`;case"detail":return `amis-${t}-${r}-detail`;default:return `amis-${t}-${r}-`+e}},reloadRecord:()=>{if(window.FlowRouter)return window.FlowRouter.reload()},getFieldDefaultValue:getFieldDefaultValue,getTreeOptions:getTreeOptions,getClosestAmisComponentByType:getClosestAmisComponentByType,isFilterFormValuesEmpty:isFilterFormValuesEmpty,getSearchFilter:e=>{var o=[];return _.each(e,(e,t)=>{var r,n;_.isEmpty(e)&&!_.isBoolean(e)||(_.startsWith(t,"__searchable__between__")?o.push([""+t.replace("__searchable__between__",""),"between",e]):_.startsWith(t,"__searchable__")&&(_.isString(e)?o.push([""+t.replace("__searchable__",""),"contains",e]):_.isObject(e)&&e.o?(n=[[(r=""+t.replace("__searchable__",""))+"/o","=",e.o]],e.ids.length&&n.push([r+"/ids","=",e.ids]),o.push(n)):o.push([""+t.replace("__searchable__",""),"=",e])));}),o},getKeywordsSearchFilter:(e,t)=>{const o=[];var a;return e&&t&&(a=e.split(/\s+/),a=_$1.compact(a),t.forEach(function(r,e){let n=[];1==a.length?n=[r,"contains",a[0]]:a.forEach(function(e,t){n.push([r,"contains",e]),t<a.length-1&&n.push("or");}),n.length&&(o.push(n),e<t.length-1&&o.push("or"));})),o},getFormulaVariables:(e,t=!0)=>{const r=[];return _$1.isEmpty(e)||(r.push({label:"表单字段",children:[]}),lodash.forEach(e,function(e){r[0].children.push({label:e.label,value:e.value});})),t&&r.push({label:"全局变量",children:[{label:"用户ID",value:"global['userId']"},{label:"工作区ID",value:"global['spaceId']"},{label:"用户",children:[{label:"姓名",value:"global['user']['name']"},{label:"邮件",value:"global['user']['email']"},{label:"语言",value:"global['user']['language']"},{label:"简档",value:"global['user']['profile']"},{label:"权限集",value:"global['user']['roles']"},{label:"主部门ID",value:"global['user']['organization']['_id']"},{label:"部门(含上级)",value:"global['user']['organizations_parents']"},{label:"主分部ID",value:"global['user']['company_id']"},{label:"分部(多选)",value:"global['user']['company_ids']"},{label:"人员ID",value:"global['user']['spaceUserId']"},{label:"是否是工作区管理员",value:"global['user']['is_space_admin']"}]}]}),r}});var getBuilderContext=function(){return "undefined"==typeof window?{}:Builder.settings.context||Builder.settings},Steedos$1=__assign({getRootUrl:function(e){var t=getBuilderContext();return t.rootUrl||("undefined"!=typeof window?window.localStorage.getItem("steedos:rootUrl"):"")||e},absoluteUrl:function(e){return void 0===e&&(e=""),"".concat(Steedos$1.getRootUrl()).concat(e)},getTenantId:function(){try{var e=getBuilderContext().tenantId;return (e=window.location.search&&!e?new URLSearchParams(window.location.search).get("X-Space-Id"):e)?e:null}catch(e){console.error(e);}},getAuthorization:function(){try{var e=getBuilderContext(),t=e.tenantId,r=e.authToken;return t&&r?"Bearer ".concat(t,",").concat(r):null}catch(e){console.error(e);}},authRequest:authRequest,StandardObjects:StandardObjects},Expression);"undefined"==typeof window||window.Steedos||(window.Steedos=Steedos$1),"undefined"==typeof window||window.SteedosUI||(window.SteedosUI=SteedosUI$1);
 
 var index_esm = /*#__PURE__*/Object.freeze({
     __proto__: null,