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

package/dist/sortable.umd.js

@@ -20446,10 +20446,23 @@
         if(ctx && ctx.isLookup){
             linkTarget = "target='_blank'";
         }
+        let nameLabel = field.name;
+        //若字段类型是lookup，则按照相关表tpl的label规则显示；若是其它类型，则显示_display或字段本身的值
+        if (field.type == "lookup") {
+            if(!field.reference_to && (field.optionsFunction || field._optionsFunction || field.options)){
+                if(!field.isTableField){
+                    nameLabel = `\${${field.name}__label}`;
+                }
+            } else {
+                nameLabel = `\${_display.${field.name}.label}`;
+            }
+        } else {
+            nameLabel = `\${_display.${field.name} || ${field.name}}`;
+        }
         if(ctx.isRelated && window.innerWidth >= 768){
-            return `<a href="${href}" ${linkTarget} onclick="return false;">\${${field.name} | raw}</a>`
+            return `<a href="${href}" ${linkTarget} onclick="return false;">\${${nameLabel} | raw}</a>`
         }else {
-            return `<a href="${href}" ${linkTarget}>\${${field.name} | raw}</a>`
+            return `<a href="${href}" ${linkTarget}>\${${nameLabel} | raw}</a>`
         }
     }
 
@@ -20574,7 +20587,7 @@
     }
 
     async function getFieldTpl (field, options){
-        if((field.is_name || field.name === options.labelFieldName) && !options.onlyDisplayLookLabel){
+        if((field.is_name || field.name === options.labelFieldName) && !options.onlyDisplayLookLabel && field.multiple !== true){
             return getNameTpl(field, options)
         }
         switch (field.type) {
@@ -20615,7 +20628,7 @@
         if(display != false){
             display = true;
         }
-        let fieldsName = ['_id'];
+        let fieldsName = ['_id', 'space'];
         let displayFields = [];
         let fieldsArr = [];
         if(lodash.exports.isArray(fields)){
@@ -21304,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的单元格编辑
@@ -21938,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}`;
@@ -21967,7 +22009,7 @@
                                       "title": "&nbsp;",
                                       "headerClassName": "hidden",
                                       "size": "lg",
-                                      "bodyClassName": "p-0 m-0",
+                                      "bodyClassName": "p-0 m-0 bg-gray-100",
                                       "closeOnEsc": true,
                                       "closeOnOutside": true,
                                       "resizable": true,
@@ -22829,7 +22871,8 @@
                                                 type: 'button',
                                                 actionType: 'confirm',
                                                 label: instance.t('frontend_form_save'),
-                                                primary: true
+                                                primary: true,
+                                                close: `object_actions_drawer_${uiSchema.name}`
                                             },
                                         ]
                                     }
@@ -25047,7 +25090,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-07-05 15:55:39
      * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-     * @LastEditTime: 2024-02-23 16:37:06
+     * @LastEditTime: 2024-04-26 16:46:44
      * @Description:
      */
 
@@ -25280,37 +25323,44 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
          * 本次存储代码段
          */
         try {
-          const listViewPropsStoreKey = location.pathname + "/crud";
-          let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
-          /**
-           * localListViewProps规范来自crud请求api中api.data.$self参数值的。
-           * 比如：{"perPage":20,"page":1,"__searchable__name":"7","__searchable__between__n1__c":[null,null],"filter":[["name","contains","a"]]}
-           * __searchable__...:顶部放大镜搜索条件
-           * filter:右侧过滤器
-           * perPage:每页条数
-           * page:当前页码
-           * orderBy:排序字段
-           * orderDir:排序方向
-           */
-          if (localListViewProps) {
-            localListViewProps = JSON.parse(localListViewProps);
-            // localListViewProps.perPage = 3;
-            let listSchema = {};
-            if(localListViewProps.orderBy){
-                listSchema.orderBy = localListViewProps.orderBy;
-            }
-            if(localListViewProps.orderDir){
-                listSchema.orderDir = localListViewProps.orderDir;
-            }
+            const listViewPropsStoreKey = location.pathname + "/crud";
+            let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
+            /**
+             * localListViewProps规范来自crud请求api中api.data.$self参数值的。
+             * 比如：{"perPage":20,"page":1,"__searchable__name":"7","__searchable__between__n1__c":[null,null],"filter":[["name","contains","a"]]}
+             * __searchable__...:顶部放大镜搜索条件
+             * filter:右侧过滤器
+             * perPage:每页条数
+             * page:当前页码
+             * orderBy:排序字段
+             * orderDir:排序方向
+             */
+            if (localListViewProps) {
+                localListViewProps = JSON.parse(localListViewProps);
+                // localListViewProps.perPage = 3;
+                let listSchema = {};
+                if (localListViewProps.orderBy) {
+                    listSchema.orderBy = localListViewProps.orderBy;
+                }
+                if (localListViewProps.orderDir) {
+                    listSchema.orderDir = localListViewProps.orderDir;
+                }
 
-            if(localListViewProps.perPage){
-                listSchema.perPage = localListViewProps.perPage;
+                if (localListViewProps.perPage) {
+                    listSchema.perPage = localListViewProps.perPage;
+                }
+                defaults.listSchema = lodash.exports.defaultsDeep({}, listSchema, defaults.listSchema || {});
             }
-            defaults.listSchema = lodash.exports.defaultsDeep({}, listSchema, defaults.listSchema || {});
-          }
         }
         catch (ex) {
-          console.error("本地存储中crud参数解析异常：", ex);
+            console.error("本地存储中crud参数解析异常：", ex);
+        }
+
+        if (window.innerWidth > 768) {
+            // 列表视图组件PC端高度自动计算实现满屏效果，手机端不需要满屏效果，所以不用autofillheight，且允许重写微页面中重新组件autoFillHeight属性
+            defaults.listSchema = lodash.exports.defaultsDeep({}, defaults.listSchema || {}, {
+                autoFillHeight: true
+            });
         }
 
         ctx.defaults = defaults;
@@ -25871,7 +25921,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         });
 
         // 把自动填充规则中依赖的字段也加到api请求中
-        let autoFillMapping = !field.multiple && field.auto_fill_mapping;
+        let autoFillMapping = field.auto_fill_mapping;
         if (autoFillMapping && autoFillMapping.length) {
             autoFillMapping.forEach(function (item) {
                 if(!lodash.exports.find(tableFields, function(f){
@@ -26021,7 +26071,11 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     // 如果当前元素不是数组，则处理该元素
                     // 下面正则用于匹配amis公式\${}
                     if(/\\\$\\\{([^}]*)\\\}/.test(arr[i])) {
-                        arr[i] = currentAmis.evaluate(arr[i], api.data.$);
+                        try{
+                            arr[i] = currentAmis.evaluate(arr[i], api.context);
+                        }catch(ex){
+                            console.error("运行lookup过滤公式时出现错误:",ex);
+                        }
                     }
                 }
             }
@@ -26343,7 +26397,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             ];
 
             // 把自动填充规则中依赖的字段也加到api请求中
-            let autoFillMapping = !field.multiple && field.auto_fill_mapping;
+            let autoFillMapping = field.auto_fill_mapping;
             if (autoFillMapping && autoFillMapping.length) {
                 autoFillMapping.forEach(function (item) {
                     queryFields.push(refObjectConfig.fields[item.from]);
@@ -26429,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])) {
@@ -26438,7 +26493,11 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     // 如果当前元素不是数组，则处理该元素
                     // 下面正则用于匹配amis公式\${}
                     if(/\\\$\\\{([^}]*)\\\}/.test(arr[i])) {
-                        arr[i] = currentAmis.evaluate(arr[i], api.data.$);
+                        try{
+                            arr[i] = currentAmis.evaluate(arr[i], api.context);
+                        }catch(ex){
+                            console.error("运行lookup过滤公式时出现错误:",ex);
+                        }
                     }
                 }
             }
@@ -26585,14 +26644,25 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     }
 
     async function getAutoFill(field, refObject) {
-        let autoFillMapping = !field.multiple && field.auto_fill_mapping;
+        let autoFillMapping = field.auto_fill_mapping;
         if (autoFillMapping && autoFillMapping.length) {
             let fillMapping = {};
+            if (field.multiple) {
+                autoFillMapping.forEach(function (item) {
+                    //from的字段类型为lookup、master_detail、select时，需要保留数组格式；其他类型需要转变为字符串格式
+                    if (lodash.exports.includes(["lookup","master_detail","select"], refObject.fields[item.from].type)) {
+                        fillMapping[item.to] = `\${items | pick:${item.from}}`;
+                    } else {
+                        fillMapping[item.to] = `\${items | pick:${item.from} | join}`;
+                    }
+                });
+            }else {
+                autoFillMapping.forEach(function (item) {
+                    fillMapping[item.to] = `\${${item.from}}`;
+                });
+            }
             // let fieldsForApi = [];
-            autoFillMapping.forEach(function (item) {
-                fillMapping[item.to] = `\${${item.from}}`;
-                // fieldsForApi.push(item.from);
-            });
+            // fieldsForApi.push(item.from);
             // let api = {
             //     // "url": "/amis/api/mock2/form/autoUpdate?browser=${browser}&version=${version}",
             //     "url": `/api/v1/${refObject.name}/\${${field.name}}?fields=${JSON.stringify(fieldsForApi)}`,
@@ -26694,7 +26764,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 amisSchema = lodash.exports.defaultsDeep({}, pageAmisSchema, amisSchema);
             }
         }
-        const autoFill = await getAutoFill(field);
+        const autoFill = await getAutoFill(field, refObject);
         if(autoFill){
             amisSchema.autoFill = autoFill;
             // 这里不配置initAutoFill值，按amis规则initAutoFill默认值为fillIfNotSet处理--需要amis sdk 版本 > 3.6.3-patch.6（不包括）版本

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "3.6.15",
+  "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": "3.6.15"
+    "@steedos-widgets/amis-lib": "6.3.0-beta.11"
   },
-  "gitHead": "81c5cd906a7674f4ce9130f21e5ec0a090778554"
+  "gitHead": "0c2502e4d2a3f8c8c180613fed6b5618be19abfa"
 }