From 429f63cfb7d840c08221dc1478730d46b30f1320 Mon Sep 17 00:00:00 2001
From: XCSDN <gitee@xcsdn.net>
Date: Sun, 17 Apr 2022 13:38:32 +0000
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E4=BA=8EImagePreview=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AA=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BA=E5=A4=96=E9=83=A8=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E7=9A=84utill=E6=96=B9=E6=B3=95=EF=BC=8C=E7=AE=80?=
 =?UTF-8?q?=E5=8D=95=E7=B2=97=E6=9A=B4=EF=BC=8C=E5=B9=B2=E5=87=80=E5=8F=88?=
 =?UTF-8?q?=E5=8D=AB=E7=94=9F=E5=95=8A=E5=85=84=E5=BC=9F=E4=BB=AC=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=A6=E5=A4=96=E5=8A=A0=E4=BA=86=E4=B8=80=E4=B8=AA=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E5=A6=82=E6=9E=9C=E5=9C=B0=E5=9D=80=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E5=88=99=E4=BD=BF=E7=94=A8=E8=8B=A5=E4=BE=9Dlogo=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/components/ImagePreview/index.vue | 15 ++++++++++++---
 ruoyi-ui/src/utils/validate.js                 | 11 +++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/components/ImagePreview/index.vue b/ruoyi-ui/src/components/ImagePreview/index.vue
index 743d8d51d..557c02288 100644
--- a/ruoyi-ui/src/components/ImagePreview/index.vue
+++ b/ruoyi-ui/src/components/ImagePreview/index.vue
@@ -12,7 +12,8 @@
 </template>
 
 <script>
-import { isExternal } from "@/utils/validate";
+import { isExternalNew } from "@/utils/validate";
+import logoImg from '@/assets/logo/logo.png'
 
 export default {
   name: "ImagePreview",
@@ -33,18 +34,26 @@ export default {
   computed: {
     realSrc() {
       let real_src = this.src.split(",")[0];
-      if (isExternal(real_src)) {
+      if (isExternalNew(real_src)) {
         return real_src;
       }
+      //判断如果地址为空则使用若依logo进行显示
+      if(real_src===""){
+        return logoImg;
+      }
       return process.env.VUE_APP_BASE_API + real_src;
     },
     realSrcList() {
       let real_src_list = this.src.split(",");
       let srcList = [];
       real_src_list.forEach(item => {
-        if (isExternal(item)) {
+        if (isExternalNew(item)) {
           return srcList.push(item);
         }
+        //判断如果地址为空则使用若依logo进行显示
+        if(item===""){
+          return srcList.push(logoImg);
+        }
         return srcList.push(process.env.VUE_APP_BASE_API + item);
       });
       return srcList;
diff --git a/ruoyi-ui/src/utils/validate.js b/ruoyi-ui/src/utils/validate.js
index 9c00400ee..2d18589b5 100644
--- a/ruoyi-ui/src/utils/validate.js
+++ b/ruoyi-ui/src/utils/validate.js
@@ -1,4 +1,5 @@
 /**
+ * 判断是否为外部链接
  * @param {string} path
  * @returns {Boolean}
  */
@@ -6,6 +7,16 @@ export function isExternal(path) {
   return /^(https?:|mailto:|tel:)/.test(path)
 }
 
+/**
+ * 判断是否为外部链接
+ * 例如：http://xxxx https://xxxx chrome:// tcp:// ....等都会返回true
+ * @param {string} path
+ * @returns {Boolean}
+ */
+export function isExternalNew(path) {
+  return path.indexOf("://") !== -1
+}
+
 /**
  * @param {string} str
  * @returns {Boolean}