@steedos-widgets/sortable 6.3.0-beta.9 → 6.3.0

package/dist/sortable.esm.js

@@ -54126,9 +54126,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.getObjectDetailPath({
         ...ctx,  formFactor: ctx.formFactor, appId: "${appId}", objectName: ctx.objectName || "${objectName}", recordId: `\${${ctx.idFieldName}}`
     });
@@ -54143,7 +54143,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}`;
@@ -54318,12 +54318,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(lodash.exports.isArray(fields)){
@@ -54409,7 +54412,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}",
@@ -54424,7 +54427,7 @@ async function getFindQuery(object, recordId, fields, 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}`
     }
 }
 
@@ -54492,6 +54495,29 @@ function getAmisStaticFieldType(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
@@ -54515,9 +54541,74 @@ const getAmisFieldType$1 = (steedosField, readonly)=>{
     return getAmisStaticFieldType(steedosField.type === 'avatar' ? 'image' : steedosField.type, readonly, {multiple: steedosField.multiple});
 };
 
-const getAmisFileReadonlySchema = (steedosField)=>{
+async function getLookupLinkOnClick(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": "${value}",
+        "data": {
+            ...recordPage.schema.data,
+            "_inDrawer": true,  // 用于判断是否在抽屉中
+            "recordLoaded": false, // 重置数据加载状态
+            "objectName": options.objectName,
+        }
+    }) : {
+        "type": "steedos-record-detail",
+        "objectApiName": options.objectName,
+        "recordId": "${value}",
+        "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,
@@ -54552,13 +54643,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/\${value}" ${lookupATagClick}>\${name}</a>`,
+                    // tpl: "<%= item.name >",
+                    // onEvent: window.innerWidth < 768 ? null : REFERENCE_VALUE_ITEM_ONCLICK
+                    onEvent: window.innerWidth < 768 ? null : await getLookupLinkOnClick(steedosField, {
+                        appId,
+                        objectName: "cfs_files_filerecord",
+                        formFactor
+                    })
+                }
+            }
         }
     }
 };
@@ -54620,8 +54732,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";
@@ -54638,6 +54750,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?";
@@ -54694,6 +54807,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";
@@ -54726,6 +54840,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,
@@ -54782,6 +54897,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,
@@ -54815,6 +54931,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 = "确定要删除吗？";
@@ -54872,6 +54989,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 = "关于";
@@ -54904,6 +55022,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,
@@ -54961,6 +55080,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,
@@ -55133,7 +55253,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;
@@ -55477,6 +55602,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(object, fields, options){
     const columns = [];
     if(!options.isLookup && !options.isInputTable){
@@ -55516,7 +55695,10 @@ async function getTableColumns(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}";
@@ -55531,20 +55713,20 @@ async function getTableColumns(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",
@@ -55575,7 +55757,7 @@ async function getTableColumns(object, fields, options){
                 toggled: field.toggled,
                 static: true,
                 className,
-                ...getAmisFileReadonlySchema(field)
+                ...await getAmisFileReadonlySchema(field)
             }, fieldAmis, {name: field.name});
         }
         else if(field.type === 'select'){
@@ -55642,51 +55824,7 @@ async function getTableColumns(object, fields, options){
                 }
 
                 if(window.innerWidth >= 768 && ((field.is_name || field.name === options.labelFieldName) || ((field.type == 'lookup' || field.type == 'master_detail') && lodash.exports.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);
                 }
 
             }
@@ -55899,17 +56037,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
@@ -56406,16 +56550,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){
@@ -56505,17 +56639,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',
@@ -57153,21 +57276,11 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
   };
 }
 
-
-/**
- * 列表视图顶部放大镜过滤条件栏amisSchema
- * @param {*} objectSchema 对象UISchema
- * @returns amisSchema
- */
-async function getObjectListHeaderFieldsFilterBar(objectSchema, listViewName, ctx) {
-  const fieldsFilterBarSchema = await getObjectFieldsFilterBarSchema(objectSchema, ctx);
-  return fieldsFilterBarSchema;
-}
-
 const getNewListviewButtonSchema = ()=>{
     return {
         "type": "button",
         "label": instance.t('frontend_listview_control_new_label'),
+        "className": "steedos-listview-new-button",
         "onEvent": {
           "click": {
             "weight": 0,
@@ -57374,6 +57487,17 @@ function fieldsExtend$5(){
   }
 }
 
+
+/**
+ * 列表视图顶部放大镜过滤条件栏amisSchema
+ * @param {*} objectSchema 对象UISchema
+ * @returns amisSchema
+ */
+async function getObjectListHeaderFieldsFilterBar(objectSchema, listViewName, ctx) {
+  const fieldsFilterBarSchema = await getObjectFieldsFilterBarSchema(objectSchema, ctx);
+  return fieldsFilterBarSchema;
+}
+
 const getCopyListviewButtonSchema = ()=>{
     return {
         "type": "button",
@@ -58339,6 +58463,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";
@@ -58349,9 +58477,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);
   `;
 
@@ -59718,7 +59845,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++) {
@@ -59729,7 +59856,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);
+                        }
                     }
                 }
             }
@@ -59890,8 +60021,8 @@ async function lookupToAmisPicker(field, readonly, ctx){
         const isAllowCreate = refObjectConfig.permissions.allowCreate;
         const isCreate = lodash.exports.isBoolean(field.create) ? field.create : true;
         // lookup字段配置过滤条件就强制不显示新建按钮
-        let isHasFilters = (field.filters || field.filtersFunction || field._filtersFunction) ? true : false;
-        if (isAllowCreate && isCreate && !isHasFilters) {
+        let hasFilters = !lodash.exports.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到最后
@@ -60135,7 +60266,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++) {
@@ -60146,7 +60277,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);
+                        }
                     }
                 }
             }
@@ -60554,8 +60689,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: 
  */
 
@@ -60592,6 +60727,7 @@ const getMarkdownFieldSchema = (field, readonly, ctx)=>{
                         "name": field.name,
                         "labelClassName": "none",
                         "language": "markdown",
+                        "options": field.amis ? field.amis.editorOptions : null
                       }
                     ]
                   },
@@ -61141,6 +61277,21 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                 type: getAmisStaticFieldType('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",
@@ -61206,13 +61357,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){