@steedos-widgets/amis-lib 6.3.0-beta.5 → 6.3.0-beta.7

package/dist/index.esm.js

@@ -9079,6 +9079,10 @@ async function getFormSchemaWithDataFilter(form, options = {}){
 async function getObjectForm(objectSchema, ctx){
     const { recordId, formFactor, layout = formFactor === 'SMALL' ? 'normal' : "horizontal", labelAlign, tabId, appId, defaults, submitSuccActions = [], 
       formDataFilter, onFormDataFilter, amisData, env } = ctx;
+    //优先识别组件上的enableTabs属性，若不存在，则识别对象上定义的
+    if (typeof ctx.enableTabs !== 'boolean') {
+      ctx.enableTabs = objectSchema.enable_form_tabs;
+    }
     const fields = ___default.values(objectSchema.fields);
     const formFields = getFormFields$1(objectSchema, ctx);
     const formSchema =  defaults && defaults.formSchema || {};
@@ -11241,7 +11245,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(!_$1.find(tableFields, function(f){
@@ -11713,7 +11717,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]);
@@ -11853,7 +11857,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
         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){
@@ -11955,14 +11959,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 (_$1.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)}`,
@@ -12064,7 +12079,7 @@ async function lookupToAmis(field, readonly, ctx){
             amisSchema = _$1.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（不包括）版本