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

package/dist/assets.json

@@ -3,8 +3,8 @@
         {
             "package": "@steedos-widgets/sortable",
             "urls": [
-                "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.4/dist/sortable.umd.js",
-                "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.4/dist/sortable.umd.css"
+                "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.6/dist/sortable.umd.js",
+                "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.6/dist/sortable.umd.css"
             ],
             "library": "BuilderSortable"
         }
@@ -15,10 +15,10 @@
             "npm": {
                 "package": "@steedos-widgets/sortable"
             },
-            "url": "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.4/dist/meta.js",
+            "url": "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.6/dist/meta.js",
             "urls": {
-                "default": "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.4/dist/meta.js",
-                "design": "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.4/dist/meta.js"
+                "default": "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.6/dist/meta.js",
+                "design": "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.6/dist/meta.js"
             }
         }
     ]

package/dist/sortable.cjs.js

@@ -58739,7 +58739,7 @@ async function getObjectFilter(objectSchema, fields, options) {
  * @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:
  */
 
@@ -58998,10 +58998,6 @@ async function getListSchema(
             if (localListViewProps.perPage) {
                 listSchema.perPage = localListViewProps.perPage;
             }
-            if (window.innerWidth > 768) {
-                // 列表视图组件PC端高度自动计算实现满屏效果，手机端不需要满屏效果，所以不用autofillheight
-                listSchema.autoFillHeight = true;
-            }
             defaults.listSchema = lodash.exports.defaultsDeep({}, listSchema, defaults.listSchema || {});
         }
     }
@@ -59009,6 +59005,13 @@ async function getListSchema(
         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") {
@@ -59567,7 +59570,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
     });
 
     // 把自动填充规则中依赖的字段也加到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){
@@ -60039,7 +60042,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
         ];
 
         // 把自动填充规则中依赖的字段也加到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]);
@@ -60281,14 +60284,25 @@ async function getApi(object, recordId, fields, options){
 }
 
 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)}`,
@@ -60390,7 +60404,7 @@ async function lookupToAmis(field, readonly, ctx){
             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（不包括）版本