@steedos-widgets/amis-lib 6.3.0-beta.6 → 6.3.0-beta.8

package/dist/index.esm.js

@@ -570,10 +570,23 @@ function getNameTpl(field, ctx){
     if(ctx && ctx.isLookup){
         linkTarget = "target='_blank'";
     }
+    let nameLabel = field.name;
+    //若字段类型是lookup，则按照相关表tpl的label规则显示；若是其它类型，则显示_display或字段本身的值
+    if (field.type == "lookup") {
+        if(!field.reference_to && (field.optionsFunction || field._optionsFunction || field.options)){
+            if(!field.isTableField){
+                nameLabel = `\${${field.name}__label}`;
+            }
+        } else {
+            nameLabel = `\${_display.${field.name}.label}`;
+        }
+    } else {
+        nameLabel = `\${_display.${field.name} || ${field.name}}`;
+    }
     if(ctx.isRelated && window.innerWidth >= 768){
-        return `<a href="${href}" ${linkTarget} onclick="return false;">\${${field.name} | raw}</a>`
+        return `<a href="${href}" ${linkTarget} onclick="return false;">\${${nameLabel} | raw}</a>`
     }else {
-        return `<a href="${href}" ${linkTarget}>\${${field.name} | raw}</a>`
+        return `<a href="${href}" ${linkTarget}>\${${nameLabel} | raw}</a>`
     }
 }
 
@@ -698,7 +711,7 @@ function getLocationTpl(field){
 }
 
 async function getFieldTpl (field, options){
-    if((field.is_name || field.name === options.labelFieldName) && !options.onlyDisplayLookLabel){
+    if((field.is_name || field.name === options.labelFieldName) && !options.onlyDisplayLookLabel && field.multiple !== true){
         return getNameTpl(field, options)
     }
     switch (field.type) {
@@ -2171,7 +2184,7 @@ async function getTableColumns(object, fields, options){
                 var file_id = data.versions && data.versions[0] && data.versions[0]._id;
                 window.previewFile && window.previewFile({file_name, file_id});
             `;
-            columnItem = {
+            columnItem = Object.assign({}, {
                 "type": "button",
                 "label": `<%=data.versions ? data.name : "${field.label}"%>`,
                 className,
@@ -2203,7 +2216,7 @@ async function getTableColumns(object, fields, options){
                     ]
                   }
                 }
-            };
+            }, fieldAmis);
         }else if(field.type === 'toggle'){
             columnItem = Object.assign({}, {
                 type: "switch",
@@ -3255,6 +3268,19 @@ function getReadonlyFormAdaptor(object, fields, options){
     // })
 
     var fieldNames = _$1.map(fields, function(n){return n.name});
+    var nameField = object.fields[object.NAME_FIELD_KEY];
+    let nameLabel = nameField.name;
+    if (nameField.type == "lookup") {
+        if(!nameField.reference_to && (nameField.optionsFunction || nameField._optionsFunction || nameField.options)){
+            if(!nameField.isTableField){
+                nameLabel = `record.${nameField.name}__label`;
+            }
+        } else {
+            nameLabel = `record._display.${nameField.name}.label`;
+        }
+    } else {
+        nameLabel = `record._display.${nameField.name} || record.${nameField.name}`;
+    }
     return  `
     if(payload.data.data.length === 0){
         var isEditor = !!${options && options.isEditor};
@@ -3296,8 +3322,7 @@ function getReadonlyFormAdaptor(object, fields, options){
         payload.data = data;
         payload.data.__objectName = "${object.name}";
         payload.data.record = record;
-
-        payload.data.NAME_FIELD_VALUE = record.${object.NAME_FIELD_KEY || 'name'};
+        payload.data.NAME_FIELD_VALUE = ${nameLabel} || record.name;
         payload.data._master = {
             record: record,
             objectName: "${object.name}",
@@ -11857,7 +11882,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){