@steedos-widgets/amis-lib 6.3.0-beta.10 → 6.3.0-beta.12

package/dist/index.esm.js

@@ -555,9 +555,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}}`
     });
@@ -747,12 +747,15 @@ async function getFieldTpl (field, options){
     }
 }
 
-async function getFieldsTemplate(fields, display){
+async function getFieldsTemplate(object, fields, display){
     let expandFields = [];
     if(display != false){
         display = true;
     }
     let fieldsName = ['_id'];
+    if(!object.datasource || object.datasource === 'default' || object.datasource === 'meteor'){
+        fieldsName.push('space');
+    }
     let displayFields = [];
     let fieldsArr = [];
     if(_$1.isArray(fields)){
@@ -848,7 +851,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()}}}`
     }
 }
 
@@ -1037,7 +1040,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}",
@@ -1299,6 +1302,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?";
@@ -1387,6 +1391,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,
@@ -1476,6 +1481,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 = "确定要删除吗？";
@@ -1565,6 +1571,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,
@@ -1669,6 +1676,29 @@ i18next
     }
   });
 
+/*
+ * @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;
+    }
+}
+
 async function getQuickEditSchema(object, columnField, options){
     let field = object.fields[columnField.name];
     //判断在amis3.2以上环境下，放开批量编辑与lookup的单元格编辑
@@ -2138,6 +2168,59 @@ 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, // 重置数据加载状态
+        }
+    }) : {
+        "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": " ",
+                  "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){
@@ -2177,7 +2260,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}";
@@ -2192,20 +2278,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",
@@ -2303,51 +2389,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') && _$1.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": " ",
-                                  "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);
                 }
 
             }
@@ -2560,17 +2602,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
@@ -3279,7 +3327,7 @@ function getReadonlyFormAdaptor(object, fields, options){
             nameLabel = `record._display.${nameField.name}.label`;
         }
     } else if (nameField){
-        nameLabel = `record._display.${nameField.name} || record.${nameField.name}`;
+        nameLabel = `(record._display ? record._display.${nameField.name} : record.${nameField.name})`;
     }
     return  `
     if(payload.data.data.length === 0){
@@ -4808,34 +4856,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:
  */
 
@@ -4897,6 +4922,12 @@ const getSchema$4 = async (uiSchema, ctx) => {
                   closeOnEsc: false,
                   closeOnOutside: false,
                   showCloseButton: true,
+                  "data": {
+                    "&": "$$",
+                    "_master": "${_master}",
+                    "_master._isRelated": "${_isRelated}",
+                    "_master.relatedKey": "${relatedKey}"
+                  },
                   size: "lg",
                   "onEvent": {
                     "cancel": {
@@ -6778,6 +6809,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": [
@@ -7064,7 +7096,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
     id: `page_readonly_${name}_header`,
     name: `page`,
     body: body, 
-    className: ''
+    className: "steedos-object-record-detail-header"
   }
 
 }
@@ -11440,7 +11472,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);
+                        }
                     }
                 }
             }
@@ -11857,7 +11893,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);
+                        }
                     }
                 }
             }
@@ -12963,6 +13003,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.t('frontend_form_validation_failed_url')//"URL 格式不正确"
+                        }
+                    });
+                }
+            }
             if(readonly && field.show_as_qr){
                 convertData = {
                     type: "control",