@steedos-widgets/sortable 6.3.0-beta.7 → 6.3.0-beta.9

package/dist/sortable.umd.js

@@ -20446,10 +20446,23 @@
         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>`
         }
     }
 
@@ -20574,7 +20587,7 @@
     }
 
     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) {
@@ -21815,7 +21828,7 @@
                 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,
@@ -21847,7 +21860,7 @@
                         ]
                       }
                     }
-                };
+                }, fieldAmis);
             }else if(field.type === 'toggle'){
                 columnItem = Object.assign({}, {
                     type: "switch",
@@ -21963,7 +21976,7 @@
                                       "title": "&nbsp;",
                                       "headerClassName": "hidden",
                                       "size": "lg",
-                                      "bodyClassName": "p-0 m-0",
+                                      "bodyClassName": "p-0 m-0 bg-gray-100",
                                       "closeOnEsc": true,
                                       "closeOnOutside": true,
                                       "resizable": true,
@@ -26021,7 +26034,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     // 如果当前元素不是数组，则处理该元素
                     // 下面正则用于匹配amis公式\${}
                     if(/\\\$\\\{([^}]*)\\\}/.test(arr[i])) {
-                        arr[i] = currentAmis.evaluate(arr[i], api.data.$);
+                        arr[i] = currentAmis.evaluate(arr[i], api.data.$self);
                     }
                 }
             }
@@ -26438,7 +26451,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     // 如果当前元素不是数组，则处理该元素
                     // 下面正则用于匹配amis公式\${}
                     if(/\\\$\\\{([^}]*)\\\}/.test(arr[i])) {
-                        arr[i] = currentAmis.evaluate(arr[i], api.data.$);
+                        arr[i] = currentAmis.evaluate(arr[i], api.data.$self);
                     }
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "6.3.0-beta.7",
+  "version": "6.3.0-beta.9",
   "main": "dist/sortable.cjs.js",
   "module": "dist/sortable.esm.js",
   "unpkg": "dist/sortable.umd.js",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@dnd-kit/core": "^6.0.5",
     "@dnd-kit/sortable": "^7.0.1",
-    "@steedos-widgets/amis-lib": "6.3.0-beta.7"
+    "@steedos-widgets/amis-lib": "6.3.0-beta.9"
   },
-  "gitHead": "2c8f17e15b18b910c9bb48ce1ca68ffb2e171d78"
+  "gitHead": "a16baa0416814ead6d7627e57b515ed62062dfdf"
 }