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

package/dist/index.cjs.js

@@ -582,9 +582,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}}`
     });
@@ -599,7 +599,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}`;
@@ -774,12 +774,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(___namespace.isArray(fields)){
@@ -875,7 +878,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()}}}`
     }
 }
 
@@ -1064,7 +1067,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}",
@@ -1112,7 +1115,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}`
     }
 }
 
@@ -1180,6 +1183,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
@@ -1203,9 +1229,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": `\${${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,
@@ -1240,13 +1331,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(steedosField, {
+                        appId,
+                        objectName: "cfs_files_filerecord",
+                        formFactor
+                    })
+                }
+            }
         }
     }
 };
@@ -1308,8 +1420,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";
@@ -1326,6 +1438,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?";
@@ -1382,6 +1495,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";
@@ -1414,6 +1528,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,
@@ -1470,6 +1585,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,
@@ -1503,6 +1619,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 = "确定要删除吗？";
@@ -1560,6 +1677,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 = "关于";
@@ -1592,6 +1710,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,
@@ -1649,6 +1768,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,
@@ -1821,7 +1941,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;
@@ -2165,6 +2290,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){
@@ -2180,7 +2359,7 @@ async function getTableColumns(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 ";
@@ -2204,7 +2383,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}";
@@ -2219,20 +2401,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",
@@ -2263,7 +2445,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'){
@@ -2330,51 +2512,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') && ___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);
                 }
 
             }
@@ -2587,17 +2725,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
@@ -3296,8 +3440,8 @@ function getReadonlyFormAdaptor(object, fields, options){
 
     var fieldNames = ___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`;
@@ -3305,8 +3449,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){
@@ -4689,16 +4833,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){
@@ -4788,17 +4922,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',
@@ -4834,34 +4957,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:
  */
 
@@ -4891,16 +4991,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",
@@ -4923,18 +5013,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: i18next__default["default"].t('frontend_form_cancel')
+                    },
+                    {
+                        type: 'button',
+                        actionType: 'confirm',
+                        label: i18next__default["default"].t('frontend_form_save'),
+                        primary: true
+                    },
+                  ]
                 },
               },
             ],
@@ -5714,6 +5812,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'){
@@ -5737,46 +5929,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": i18next__default["default"].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 = {
@@ -5797,54 +5950,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": i18next__default["default"].t('frontend_operation'),
-                      "id": "object_actions_drawer_" + objectSchema.name,
-                      "body": [
-                        {
-                          "type": "button-group",
-                          "id": "u:fd837823be5b",
-                          "vertical": true,
-                          "tiled": true,
-                          "buttons": [
-                            ...___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 = ___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 ___namespace.map(buttons, (button) => {
             return {
@@ -5861,55 +5976,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": i18next__default["default"].t('frontend_operation'),
-                      "id": "object_actions_drawer_" + objectSchema.name,
-                      "body": [
-                        {
-                          "type": "button-group",
-                          "vertical": true,
-                          "tiled": true,
-                          "buttons": [
-                            ...___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 = ___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 ___namespace.map(buttons, (button) => {
-            return {
+            return {                                                                                                                                                                                                                                                                                                                                                                    
                 type: 'steedos-object-button',
                 name: button.name,
                 objectName: button.objectName,
@@ -6544,6 +6623,217 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
   };
 }
 
+const getNewListviewButtonSchema = ()=>{
+    return {
+        "type": "button",
+        "label": i18next__default["default"].t('frontend_listview_control_new_label'),
+        "className": "steedos-listview-new-button",
+        "onEvent": {
+          "click": {
+            "weight": 0,
+            "actions": [
+              {
+                "dialog": {
+                  "type": "dialog",
+                  "title": i18next__default["default"].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": i18next__default["default"].t('frontend_listview_control_new_message_success'),
+                        "failed": i18next__default["default"].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
@@ -6553,6 +6843,99 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
   const { icon, label } = objectSchema;
   const disabled_list_views = objectSchema.permissions.disabled_list_views;
   const listViewButtonOptions = [];
+  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) => {
@@ -6563,6 +6946,379 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
       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}`
       });
@@ -6596,6 +7352,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": [
@@ -6626,14 +7384,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": "",
@@ -6789,6 +7557,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": [
@@ -7075,7 +7844,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
     id: `page_readonly_${name}_header`,
     name: `page`,
     body: body, 
-    className: ''
+    className: "steedos-object-record-detail-header"
   }
 
 }
@@ -7160,216 +7929,6 @@ async function getObjectRecordDetailRelatedListHeader(relatedObjectSchema, relat
 async function getObjectRelatedListHeader(objectSchema, recordId, relatedObjectName) {
 }
 
-const getNewListviewButtonSchema = ()=>{
-    return {
-        "type": "button",
-        "label": i18next__default["default"].t('frontend_listview_control_new_label'),
-        "onEvent": {
-          "click": {
-            "weight": 0,
-            "actions": [
-              {
-                "dialog": {
-                  "type": "dialog",
-                  "title": i18next__default["default"].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": i18next__default["default"].t('frontend_listview_control_new_message_success'),
-                        "failed": i18next__default["default"].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
-      }
-    }
-  }
-}
-
 const getCopyListviewButtonSchema = ()=>{
     return {
         "type": "button",
@@ -8335,6 +8894,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";
@@ -8345,9 +8908,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);
   `;
 
@@ -9012,6 +9574,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 = ___default["default"].compact(body.columns);
 
     if (defaults) {
       const headerSchema = defaults.headerSchema;
@@ -10194,6 +10758,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]) {
@@ -10328,7 +10894,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
@@ -11435,7 +12001,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++) {
@@ -11446,7 +12012,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);
+                        }
                     }
                 }
             }
@@ -11607,8 +12177,8 @@ async function lookupToAmisPicker(field, readonly, ctx){
         const isAllowCreate = refObjectConfig.permissions.allowCreate;
         const isCreate = ___namespace.isBoolean(field.create) ? field.create : true;
         // lookup字段配置过滤条件就强制不显示新建按钮
-        let isHasFilters = (field.filters || field.filtersFunction || field._filtersFunction) ? true : false;
-        if (isAllowCreate && isCreate && !isHasFilters) {
+        let hasFilters = !___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到最后
@@ -11852,7 +12422,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++) {
@@ -11863,7 +12433,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);
+                        }
                     }
                 }
             }
@@ -12275,8 +12849,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: 
  */
 
@@ -12313,6 +12887,7 @@ const getMarkdownFieldSchema = (field, readonly, ctx)=>{
                         "name": field.name,
                         "labelClassName": "none",
                         "language": "markdown",
+                        "options": field.amis ? field.amis.editorOptions : null
                       }
                     ]
                   },
@@ -12969,6 +13544,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": i18next__default["default"].t('frontend_form_validation_failed_url')//"URL 格式不正确"
+                        }
+                    });
+                }
+            }
             if(readonly && field.show_as_qr){
                 convertData = {
                     type: "control",
@@ -13034,13 +13624,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){
@@ -13156,6 +13746,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
@@ -13210,6 +13802,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{
@@ -13429,13 +14025,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",
@@ -13588,24 +14188,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
  */
 
 /**
@@ -13824,7 +14424,8 @@ function getInputTableCell(field, showAsInlineEditMode) {
         return {
             "type": "steedos-field",
             "config": Object.assign({}, field, {
-                label: false
+                label: false,
+                description: null
             }),
             // quickEdit: {
             //     "type": "steedos-field",
@@ -13841,7 +14442,8 @@ function getInputTableCell(field, showAsInlineEditMode) {
         return {
             "type": "steedos-field",
             "config": Object.assign({}, field, {
-                label: false
+                label: false,
+                description: null
             }),
             inInputTable: true,
             "static": true,
@@ -14675,6 +15277,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节点）的数据域数据
@@ -14799,6 +15402,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节点）的数据域数据
@@ -15085,7 +15689,8 @@ const getAmisInputTableSchema = async (props) => {
             }
             return value;
         },
-        "required": props.required
+        "required": props.required,
+        "description": props.description
     };
     if (buttonsForColumnOperations.length) {
         inputTableSchema.columns.unshift({
@@ -17958,4 +18563,5 @@ exports.setSteedosAuth = setSteedosAuth;
 exports.setUISchemaFunction = setUISchemaFunction;
 exports.setVariable = setVariable;
 exports.standardButtonsTodo = standardButtonsTodo;
+exports.uuidv4 = uuidv4;
 //# sourceMappingURL=index.cjs.js.map