From 129170bfe699cfaf7f6143ffba93c33f317fd558 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 01 十二月 2023 11:00:39 +0800
Subject: [PATCH] 2023-12-01

---
 src/tabviews/custom/components/card/cardcellList/index.jsx |   52 +++++++++++++++++++++++++++-------------------------
 1 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index c1e0fc5..2cecc45 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -199,9 +199,10 @@
     // }
     
     if (/^http.+(.txt|.doc|.docx|.pdf|.xlsx|.xls|.zip|.rar|.ppt)$/i.test(url)) {
+      let name = url.replace(/.+\//g, '').replace(/\.{1}[^.]*$/g, '')
       let d = document.createElement('a')
       d.href = url
-      d.setAttribute('download', 'download')
+      d.setAttribute('download', name)
       d.setAttribute('target', '_blank')
       document.body.appendChild(d)
       d.click()
@@ -394,6 +395,31 @@
   
         if (val !== '') {
           let orival = val
+
+          if (card.linkType === 'download') {
+            let url = ''
+  
+            if (card.link === 'static') {
+              url = card.linkurl
+            } else {
+              url = data[card.linkurl]
+            }
+  
+            if (/^http.+(.txt|.doc|.docx|.pdf|.xlsx|.xls|.zip|.rar)$/i.test(url)) {
+              if (/pdf$/i.test(url)) {
+                val = <><img src="./media/pdf.png" className="file-image" alt=""/> {val}</>
+              } else if (/(.doc|.docx)$/i.test(url)) {
+                val = <><img src="./media/word.png" className="file-image" alt=""/> {val}</>
+              } else if (/(.xlsx|.xls)$/i.test(url)) {
+                val = <><img src="./media/excel.png" className="file-image" alt=""/> {val}</>
+              } else if (/(.zip|.rar)$/i.test(url)) {
+                val = <><img src="./media/rar.png" className="file-image" alt=""/> {val}</>
+              } else {
+                val = <><img src="./media/txt.png" className="file-image" alt=""/> {val}</>
+              }
+            }
+          }
+
           if (card.format === 'encryption') {
             val = <Encrypts value={val} />
           }
@@ -444,30 +470,6 @@
             }
           }
           className = mark.signType
-        }
-
-        if (card.linkType === 'download') {
-          let url = ''
-
-          if (card.link === 'static') {
-            url = card.linkurl
-          } else {
-            url = data[card.linkurl]
-          }
-
-          if (/^http.+(.txt|.doc|.docx|.pdf|.xlsx|.xls|.zip|.rar)$/i.test(url)) {
-            if (/pdf$/i.test(url)) {
-              val = <><img src="/media/pdf.png" className="file-image" alt=""/> {val}</>
-            } else if (/(.doc|.docx)$/i.test(url)) {
-              val = <><img src="/media/word.png" className="file-image" alt=""/> {val}</>
-            } else if (/(.xlsx|.xls)$/i.test(url)) {
-              val = <><img src="/media/excel.png" className="file-image" alt=""/> {val}</>
-            } else if (/(.zip|.rar)$/i.test(url)) {
-              val = <><img src="/media/rar.png" className="file-image" alt=""/> {val}</>
-            } else {
-              val = <><img src="/media/txt.png" className="file-image" alt=""/> {val}</>
-            }
-          }
         }
   
         if (card.link || (card.anchors && card.anchors.length > 0)) {

--
Gitblit v1.8.0