fix(代码更新): 更新代码

vue/src/utils/permission.js

@@ -15,10 +15,8 @@ export function checkPermi(value) {
       return all_permission === permission || permissionDatas.includes(permission)
     })
 
-    if (!hasPermission) {
-      return false
-    }
-    return true
+    return hasPermission;
+
   } else {
     console.error(`need roles! Like checkPermi="['system:user:add','system:user:edit']"`)
     return false
@@ -40,10 +38,8 @@ export function checkRole(value) {
       return super_admin === role || permissionRoles.includes(role)
     })
 
-    if (!hasRole) {
-      return false
-    }
-    return true
+    return hasRole;
+
   } else {
     console.error(`need roles! Like checkRole="['admin','editor']"`)
     return false

vue/src/utils/validate.js

@@ -1,4 +1,38 @@
 /**
+ * 路径匹配器
+ * @param {string} pattern
+ * @param {string} path
+ * @returns {Boolean}
+ */
+export function isPathMatch(pattern, path) {
+  const regexPattern = pattern.replace(/\//g, '\\/').replace(/\*\*/g, '.*').replace(/\*/g, '[^\\/]*')
+  const regex = new RegExp(`^${regexPattern}$`)
+  return regex.test(path)
+}
+
+/**
+ * 判断value字符串是否为空 
+ * @param {string} value
+ * @returns {Boolean}
+ */
+export function isEmpty(value) {
+  if (value == null || value == "" || value == undefined || value == "undefined") {
+    return true
+  }
+  return false
+}
+
+/**
+ * 判断url是否是http或https 
+ * @param {string} url
+ * @returns {Boolean}
+ */
+export function isHttp(url) {
+  return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
+}
+
+/**
+ * 判断path是否为外链
  * @param {string} path
  * @returns {Boolean}
  */
@@ -65,10 +99,7 @@ export function validEmail(email) {
  * @returns {Boolean}
  */
 export function isString(str) {
-  if (typeof str === 'string' || str instanceof String) {
-    return true
-  }
-  return false
+  return typeof str === 'string' || str instanceof String
 }
 
 /**
@@ -81,34 +112,3 @@ export function isArray(arg) {
   }
   return Array.isArray(arg)
 }
-//<2F><>ֵ<EFBFBD><D6B5>ΧУ<CEA7><D0A3>
-export function checkNumber(rule, value, callback) {
-  if (!value) {
-    return callback(new Error('<27><><EFBFBD>벻<EFBFBD><EBB2BB><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>'));
-  }
-  setTimeout(() => {
-    if (!Number(value)) {
-    } else {
-      if (value < 1 || value > 64) {
-        callback(new Error('<27><>ֵ<EFBFBD><D6B5>ΧΪ1-64'));
-      } else {
-        callback();
-      }
-    }
-  }, 100);
-}
-export function checkNumberAddr(rule, value, callback) {
-  if (!value) {
-    return callback(new Error('<27><><EFBFBD>벻<EFBFBD><EBB2BB><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>'));
-  }
-  setTimeout(() => {
-    if (!Number(value)) {
-    } else {
-      if (value < 1 || value > 65536) {
-        callback(new Error('<27><>ֵ<EFBFBD><D6B5>ΧΪ1-65536'));
-      } else {
-        callback();
-      }
-    }
-  }, 100);
-}