@steedos-widgets/amis-object 6.10.1-beta.32 → 6.10.1-beta.33

package/dist/amis-object.cjs.js

@@ -10693,7 +10693,6 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
                       "id": "u:ce9e3fcc411a"
                     }
                   ],
-                  "className": "steedos-overflow-visible-dialog",
                   "showCloseButton": true,
                   "showErrorMsg": true,
                   "showLoading": true,
@@ -11683,7 +11682,6 @@ const getSetListviewFiltersButtonSchema = ()=>{
                       }
                     }
                   ],
-                  "className": "steedos-overflow-visible-dialog",
                   "showCloseButton": true,
                   "showErrorMsg": true,
                   "showLoading": true,
@@ -13799,7 +13797,7 @@ async function getObjectRelatedListsMiniSchema(objectApiName){
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2025-05-20 19:29:36
+ * @LastEditTime: 2025-06-17 20:18:18
  * @Description:
  */
 
@@ -14155,12 +14153,13 @@ async function getListSchema(
         "filtersFunction": listview_filters,
         "sort": sort,
         "ctx": ctx,
-        "requestAdaptor": listView.requestAdaptor || ctx.requestAdaptor,  
-        "adaptor": listView.adaptor || ctx.adaptor,
+        "requestAdaptor": ctx.requestAdaptor || listView.requestAdaptor,  
+        "adaptor": ctx.adaptor || listView.adaptor,
         "headerToolbarItems": ctx.headerToolbarItems,
         "filterVisible": ctx.filterVisible,
         "rowClassNameExpr": ctx.rowClassNameExpr,
-        "crudDataFilter": ctx.crudDataFilter,
+        "crud": ctx.crud || listView.crud,
+        "crudDataFilter": ctx.crudDataFilter || listView.crudDataFilter ,
         "onCrudDataFilter": ctx.onCrudDataFilter
     };
     // console.log(`getListSchema===>`,amisSchema)
@@ -15769,7 +15768,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;
@@ -15779,7 +15780,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: []};
@@ -15799,8 +15799,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;