Pre Merge pull request !475 from XCSDN/N/A

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;

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}