@steedos-widgets/sortable 6.3.0-beta.5 → 6.3.0-beta.7

package/dist/sortable.umd.js

@@ -25871,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){
@@ -26343,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]);
@@ -26483,7 +26483,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         var optionsFilters = [["${valueFieldKey}", optionsFiltersOp, []]];
         if (defaultValue && !api.data.$term) { 
             const defaultValueOptionsQueryData = ${JSON.stringify(defaultValueOptionsQueryData)};
-            const defaultValueOptionsQuery = defaultValueOptionsQueryData?.query?.replace(/^{/,"").replace(/}$/,"");
+            const defaultValueOptionsQuery = defaultValueOptionsQueryData && defaultValueOptionsQueryData.query && defaultValueOptionsQueryData.query.replace(/^{/,"").replace(/}$/,"");
             // 字段值单独请求，没值的时候在请求中返回空
             optionsFilters = [["${valueFieldKey}", optionsFiltersOp, defaultValue]];
             if(filters.length > 0){
@@ -26585,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)}`,
@@ -26694,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.5",
+  "version": "6.3.0-beta.7",
   "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.5"
+    "@steedos-widgets/amis-lib": "6.3.0-beta.7"
   },
-  "gitHead": "008b005e5116225ad4188e769bdc5633cbdeb7d7"
+  "gitHead": "2c8f17e15b18b910c9bb48ce1ca68ffb2e171d78"
 }