@steedos-widgets/amis-lib 6.3.13-beta.1 → 6.3.13-beta.10

package/dist/index.esm.js

@@ -2536,6 +2536,7 @@ async function getTableColumns(object, fields, options){
                         type: "lookup",
                         reference_to: field.reference_to,
                         name: field.name,
+                        is_name: field.is_name,
                         label: null,
                         multiple: field.multiple,
                         amis: Object.assign({}, fieldAmis, { label: null })
@@ -3304,6 +3305,16 @@ async function getTableApi(mainObject, fields, options){
         return api;
     `;
     api.adaptor = `
+
+    if(payload.errors && payload.errors.length > 0){
+        return {
+            status: 500,
+            msg: payload.errors[0].message,
+            data: {}
+        }
+    }
+
+
     let fields = ${JSON.stringify(_$1.map(fields, 'name'))};
     // 这里把行数据中所有为空的字段值配置为空字符串，是因为amis有bug：crud的columns中的列如果type为static-前缀的话，行数据中该字段为空的话会显示为父作用域中同名变量值，见：https://github.com/baidu/amis/issues/9556
     (payload.data.rows || []).forEach((itemRow) => {
@@ -3549,7 +3560,7 @@ function getReadonlyFormAdaptor(object, fields, options){
         nameLabel = `(record._display && record._display.${nameField.name}) || record.${nameField.name}`;
     }
     return  `
-    if(payload.data.data.length === 0){
+    if(!payload.data.data || payload.data.data.length === 0){
         var isEditor = !!${options && options.isEditor};
         if(isEditor){
             var fieldNames = ${JSON.stringify(fieldNames)};
@@ -3595,6 +3606,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){
@@ -5092,6 +5108,7 @@ const getSchema$4 = async (uiSchema, ctx) => {
       : page.schema;
   }
   
+  // console.log('formSchema====>', formSchema);
 
   return {
     type: "service",
@@ -5116,7 +5133,7 @@ const getSchema$4 = async (uiSchema, ctx) => {
                   showCloseButton: true,
                   "data": {
                     "&": "$$",
-                    "_master": "${_master}",
+                    "_master": "${mainRecord}",
                     "_master._isRelated": "${_isRelated}",
                     "_master.relatedKey": "${relatedKey}"
                   },
@@ -10570,7 +10587,7 @@ async function getObjectRelatedListsMiniSchema(objectApiName){
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-04-26 16:46:44
+ * @LastEditTime: 2025-05-20 16:56:55
  * @Description:
  */
 
@@ -10869,7 +10886,7 @@ async function getListSchema(
     }
 
     if (window.innerWidth > 768) {
-        // 列表视图组件PC端高度自动计算实现满屏效果，手机端不需要满屏效果，所以不用autofillheight，且允许重写微页面中重新组件autoFillHeight属性
+        // 列表视图组件PC端高度自动计算实现满屏效果，手机端不需要满屏效果，所以不用autofillheight，且允许微页面中重写组件autoFillHeight属性
         defaults.listSchema = defaultsDeep$1({}, defaults.listSchema || {}, {
             autoFillHeight: true
         });
@@ -12506,7 +12523,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;
@@ -12516,7 +12535,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: []};
@@ -12536,8 +12554,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;