@steedos-widgets/sortable 6.3.0-beta.4 → 6.3.0-beta.6

package/dist/sortable.umd.js

@@ -25040,7 +25040,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-07-05 15:55:39
      * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-     * @LastEditTime: 2024-04-25 19:01:52
+     * @LastEditTime: 2024-04-26 16:46:44
      * @Description:
      */
 
@@ -25299,10 +25299,6 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 if (localListViewProps.perPage) {
                     listSchema.perPage = localListViewProps.perPage;
                 }
-                if (window.innerWidth > 768) {
-                    // 列表视图组件PC端高度自动计算实现满屏效果，手机端不需要满屏效果，所以不用autofillheight
-                    listSchema.autoFillHeight = true;
-                }
                 defaults.listSchema = lodash.exports.defaultsDeep({}, listSchema, defaults.listSchema || {});
             }
         }
@@ -25310,6 +25306,13 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             console.error("本地存储中crud参数解析异常：", ex);
         }
 
+        if (window.innerWidth > 768) {
+            // 列表视图组件PC端高度自动计算实现满屏效果，手机端不需要满屏效果，所以不用autofillheight，且允许重写微页面中重新组件autoFillHeight属性
+            defaults.listSchema = lodash.exports.defaultsDeep({}, defaults.listSchema || {}, {
+                autoFillHeight: true
+            });
+        }
+
         ctx.defaults = defaults;
 
         if (listViewName == "recent") {
@@ -25868,7 +25871,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){
@@ -26340,7 +26343,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]);
@@ -26582,14 +26585,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)}`,
@@ -26691,7 +26705,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": "6.3.0-beta.4",
+  "version": "6.3.0-beta.6",
   "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.4"
+    "@steedos-widgets/amis-lib": "6.3.0-beta.6"
   },
-  "gitHead": "afb5860e5aa4887b725bcc085cf7a22016797c55"
+  "gitHead": "ae7344bda0a26ca52e7bd4dac6d8bd5280ec4bdb"
 }