@steedos-widgets/sortable 6.3.0-beta.6 → 6.3.0-beta.8

package/dist/assets.json

@@ -3,8 +3,8 @@
         {
             "package": "@steedos-widgets/sortable",
             "urls": [
-                "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.6/dist/sortable.umd.js",
-                "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.6/dist/sortable.umd.css"
+                "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.8/dist/sortable.umd.js",
+                "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.8/dist/sortable.umd.css"
             ],
             "library": "BuilderSortable"
         }
@@ -15,10 +15,10 @@
             "npm": {
                 "package": "@steedos-widgets/sortable"
             },
-            "url": "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.6/dist/meta.js",
+            "url": "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.8/dist/meta.js",
             "urls": {
-                "default": "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.6/dist/meta.js",
-                "design": "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.6/dist/meta.js"
+                "default": "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.8/dist/meta.js",
+                "design": "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.8/dist/meta.js"
             }
         }
     ]

package/dist/sortable.cjs.js

@@ -54145,10 +54145,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>`
     }
 }
 
@@ -54273,7 +54286,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) {
@@ -55514,7 +55527,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,
@@ -55546,7 +55559,7 @@ async function getTableColumns(object, fields, options){
                     ]
                   }
                 }
-            };
+            }, fieldAmis);
         }else if(field.type === 'toggle'){
             columnItem = Object.assign({}, {
                 type: "switch",
@@ -60182,7 +60195,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){