@steedos-widgets/sortable 6.3.0-beta.10 → 6.3.0-beta.11

package/dist/sortable.umd.js

@@ -20628,7 +20628,7 @@
         if(display != false){
             display = true;
         }
-        let fieldsName = ['_id'];
+        let fieldsName = ['_id', 'space'];
         let displayFields = [];
         let fieldsArr = [];
         if(lodash.exports.isArray(fields)){
@@ -20943,6 +20943,7 @@
     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?";
@@ -21031,6 +21032,7 @@
     	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,
@@ -21120,6 +21122,7 @@
     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 = "确定要删除吗？";
@@ -21209,6 +21212,7 @@
     	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,
@@ -21313,6 +21317,29 @@
         }
       });
 
+    /*
+     * @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的单元格编辑
@@ -21947,20 +21974,26 @@
                     }
 
                     if(window.innerWidth >= 768 && ((field.is_name || field.name === options.labelFieldName) || ((field.type == 'lookup' || field.type == 'master_detail') && lodash.exports.isString(field.reference_to) && field.multiple != true)) && options.isRelated){
-                        
-                        const drawerRecordDetailSchema = {
+                        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, // 重置数据加载状态
+                                "_inDrawer": true,  // 用于判断是否在抽屉中
+                                "recordLoaded": false, // 重置数据加载状态
                             }
                         };
 
-
                         if(!(field.is_name || field.name === options.labelFieldName)){
                             drawerRecordDetailSchema.objectApiName = field.reference_to;
                             drawerRecordDetailSchema.recordId = `\${_display.${field.name}.value}`;
@@ -26038,7 +26071,11 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     // 如果当前元素不是数组，则处理该元素
                     // 下面正则用于匹配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);
+                        }
                     }
                 }
             }
@@ -26446,6 +26483,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         var fieldFilters = ${JSON.stringify(field.filters)};
         var currentAmis = amisRequire('amis');
         //递归fieldFilters数组，检查每一个元素，判断若是公式，就仅把它解析
+        debugger;
         function traverseNestedArray(arr) {
             for (let i = 0; i < arr.length; i++) {
                 if (Array.isArray(arr[i])) {
@@ -26455,7 +26493,11 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     // 如果当前元素不是数组，则处理该元素
                     // 下面正则用于匹配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);
+                        }
                     }
                 }
             }
@@ -27450,6 +27492,21 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     type: getAmisStaticFieldType('url', readonly, field),
                     static: readonly ? true : false
                 };
+                if(!readonly){
+                    // amis input-url控件不支持相对路径，这里支持下
+                    // 如果要使用amis原生input-url控件的默认的isUrl验证效果或自定义字段validations效果，配置字段的amis.validations属性即可，配置为null或空字符串则使用amis默认的isUrl效果
+                    let fieldAmisValidations = field.amis?.validations;
+                    if(typeof fieldAmisValidations === "undefined"){
+                        Object.assign(convertData, {
+                            "validations": {
+                              "matchRegexp": "^((http:\\/\\/|https:\\/\\/|ftp:\\/\\/|sftp:\\/\\/)+([^\\s\\/\\.]+(\\.[^\\s\\/\\.]+)+))*(\\/[^\\s\\.\\/]+)*$"
+                            },
+                            "validationErrors": {
+                              "matchRegexp": instance.t('frontend_form_validation_failed_url')//"URL 格式不正确"
+                            }
+                        });
+                    }
+                }
                 if(readonly && field.show_as_qr){
                     convertData = {
                         type: "control",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "6.3.0-beta.10",
+  "version": "6.3.0-beta.11",
   "main": "dist/sortable.cjs.js",
   "module": "dist/sortable.esm.js",
   "unpkg": "dist/sortable.umd.js",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@dnd-kit/core": "^6.0.5",
     "@dnd-kit/sortable": "^7.0.1",
-    "@steedos-widgets/amis-lib": "6.3.0-beta.10"
+    "@steedos-widgets/amis-lib": "6.3.0-beta.11"
   },
-  "gitHead": "9bde0fd0766dc725e40940998b53e4f8fbeaea05"
+  "gitHead": "0c2502e4d2a3f8c8c180613fed6b5618be19abfa"
 }