web-component-gallery 2.3.6 → 2.3.8

package/utils/Tree.js

@@ -96,7 +96,7 @@ export function joinTreeMessage(
       node[replaceField] = fields
         .filter(field => node[field])
         .map(field => node[field])
-        .join(' ');
+        .join(' ')
 
       if (Array.isArray(node[childNode])) {
         node[childNode].forEach(processNode)
@@ -151,9 +151,7 @@ export function getAllParents(tree, nodeId, { children = 'children', key = 'id'
       metaInfo.set(node, { parentId })
       nodeMap.set(node[key], { node, metaInfo })
       
-      if (node[children] && Array.isArray(node[children])) {
-        buildMap(node[children], node[key])
-      }
+      if (node[children]?.length) buildMap(node[children], node[key])
     })
   }
   buildMap(tree)
@@ -162,14 +160,17 @@ export function getAllParents(tree, nodeId, { children = 'children', key = 'id'
   const path = []
   let current = nodeMap.get(nodeId)
   while (current) {
-    returnObjects
-      ? path.unshift(current.node) // 直接返回原对象
-      : path.unshift(current.node[key])
-      
-    const parentId = current.metaInfo.get(current.node)?.parentId
-    current = parentId ? nodeMap.get(parentId) : null
+    if (returnObjects) {
+      // 直接返回原对象
+      path.unshift(current.node)
+    } else {
+      path.unshift(current.node[key])
+    }
+    current = current.metaInfo.get(current.node).parentId 
+      ? nodeMap.get(current.metaInfo.get(current.node).parentId) 
+      : null
   }
   
   // 对象集合则返回父级
-  return returnObjects ? path.slice(0, -1) : path.slice(0, -1)
-}
+  return returnObjects ? path[0] : path
+}

package/utils/Utils.js

@@ -17,35 +17,65 @@ export function chunkArray(arr, size) {
   return result
 }
 
+
 /**
  * 下载文件
- * @param {Blob} response - 文档流
+ * @param {Blob|Object} response - 文档流或包含data和headers的对象
  * @param {string} name - 文件名称
  * @param {string} type - 文件类型
  * @returns {void}
  */
-export function downLoadFn( response, name, type = "application/vnd.ms-excel" ) {  
-
+export function downLoadFn(response, name, type = "application/vnd.ms-excel") {  
+    // 兼容新写法：从response对象中解析data和headers
+    let fileData = response
+    let fileName = name
+    let fileType = type
+    
+    // 如果response是对象且包含data属性，则使用新写法
+    if (response && typeof response === 'object' && response.data) {
+        fileData = response.data
+        
+        // 从headers中解析文件名和类型
+        if (response.headers) {
+            const headers = response.headers
+            
+            // 解析文件类型
+            if (headers['content-type']) {
+                fileType = headers['content-type']
+            }
+            
+            // 解析文件名
+            if (headers['content-disposition']) {
+                const contentDisposition = headers['content-disposition']
+                const match = contentDisposition.match(/filename=([^;]+)/)
+                if (match && match[1]) {
+                    fileName = decodeURIComponent(match[1].replace(/['"]/g, ''))
+                }
+            }
+        }
+    }
+    
     let reader = new FileReader()
 
-    reader.readAsText( response, "utf-8" )  
+    reader.readAsText(fileData, "utf-8")
 
     reader.onload = function () {
         try {
-            message.error( JSON.parse( reader.result ).msg ) 
+            message.error(JSON.parse(reader.result).msg)
         } catch (err) {
-            message.success( "下载中..." ) 
-            let blob = new Blob( [ response ], { type } )
-            let url = window.URL.createObjectURL( blob )
-            const link = document.createElement( "a" )
+            message.success("下载中...")
+            let blob = new Blob([fileData], { type: fileType })
+            let url = window.URL.createObjectURL(blob)
+            const link = document.createElement("a")
             link.href = url
-            link.download = name
+            link.download = fileName
             link.click()
-            window.URL.revokeObjectURL( url )
+            window.URL.revokeObjectURL(url)
         }
     }
 }
 
+
 /**
  * 获取图片宽高 (如超出限制高度，则根据高度比计算出对应的宽度比)
  * @param {string} url - 图片地址