@steedos-widgets/amis-lib 6.3.13-beta.7 → 6.3.13-beta.9

package/dist/index.esm.js

@@ -3596,6 +3596,11 @@ function getReadonlyFormAdaptor(object, fields, options){
             objectName: "${object.name}",
             recordId: record._id
         }
+        if(window.location.pathname.endsWith("/"+record._id)){
+            payload.data.mainRecord= {
+                record
+            };
+        }
         window.postMessage(Object.assign({type: "record.loaded"}, {record: record}), "*")
     }
     if(payload.errors){
@@ -5093,6 +5098,7 @@ const getSchema$4 = async (uiSchema, ctx) => {
       : page.schema;
   }
   
+  // console.log('formSchema====>', formSchema);
 
   return {
     type: "service",
@@ -5117,7 +5123,7 @@ const getSchema$4 = async (uiSchema, ctx) => {
                   showCloseButton: true,
                   "data": {
                     "&": "$$",
-                    "_master": "${_master}",
+                    "_master": "${mainRecord}",
                     "_master._isRelated": "${_isRelated}",
                     "_master.relatedKey": "${relatedKey}"
                   },
@@ -12507,7 +12513,9 @@ async function lookupToAmisPicker(field, readonly, ctx){
                 {
                     "actionType": "custom",
                     "script": `
-                    const masterRecord = event.data._master && event.data._master.record;
+                    // lookup字段弹出列表，点击新建按钮，新建记录成功后，触发@data.changed.xxx，
+                    // 此时context.props.data值是lookup字段所在表单数据，经测试多层lookup弹出列表新建记录成功后context.props.data始终取的是最近一层的lookup字段所在表单数据，符合预期
+                    const masterRecord = context.props.data;//event.data._master && event.data._master.record;
                     const fieldConfig = ${JSON.stringify(field)};
                     let reference_to = fieldConfig.reference_to;
                     let saveValue;
@@ -12517,7 +12525,6 @@ async function lookupToAmisPicker(field, readonly, ctx){
                     }
                     const saveField = fieldConfig.reference_to_field || '_id';
                     const saveFieldValue = newRecord[saveField];
-
                     if( fieldConfig._reference_to && (_.isArray(fieldConfig._reference_to) || _.isFunction(fieldConfig._reference_to) || fieldConfig._reference_to.startsWith('function') ) ){
                         
                         const fieldValue = masterRecord ? masterRecord[fieldConfig.name] : {o: reference_to, ids: []};
@@ -12537,8 +12544,10 @@ async function lookupToAmisPicker(field, readonly, ctx){
 
                     }else{
                         if(fieldConfig.multiple){
-                            // TODO: 连续新建多个记录时，因为获取的主记录不是实时的，所以只会勾选最后一个新建的记录。
-                            const fieldValue = (masterRecord && masterRecord[fieldConfig.name]) || [];
+                            // const fieldValue = (masterRecord && masterRecord[fieldConfig.name]) || [];
+                            // 连续新建多个记录时，因为masterRecord获取的主记录不是实时的，所以只会勾选最后一个新建的记录
+                            // 而下面context.context.component指向的是lookup picker组件，可以直接取到用户实时勾选的记录。
+                            const fieldValue = context.context.component.props.store.toJSON().selectedItems
                             saveValue = fieldValue.concat(saveFieldValue);
                         }else{
                             saveValue = saveFieldValue;