perf[utils]: optimize code

PanJiaChen · PanJiaChen · commit 070a3343f26c · 2019-02-19T10:07:36.000+08:00
diff --git a/src/utils/index.js b/src/utils/index.js
@@ -290,7 +290,3 @@ export function deepClone(source) {
 export function uniqueArr(arr) {
   return Array.from(new Set(arr))
 }
-
-export function isExternal(path) {
-  return /^(https?:|mailto:|tel:)/.test(path)
-}
diff --git a/src/utils/validate.js b/src/utils/validate.js
@@ -7,6 +7,10 @@ export function isvalidUsername(str) {
   return valid_map.indexOf(str.trim()) >= 0
 }
 
+export function isExternal(path) {
+  return /^(https?:|mailto:|tel:)/.test(path)
+}
+
 /* 合法uri*/
 export function validateURL(textval) {
   const urlregex = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
diff --git a/src/views/layout/components/Sidebar/Link.vue b/src/views/layout/components/Sidebar/Link.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import { isExternal } from '@/utils'
+import { isExternal } from '@/utils/validate'
 
 export default {
   props: {
diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue
@@ -39,7 +39,7 @@
 <script>
 import path from 'path'
 import { generateTitle } from '@/utils/i18n'
-import { isExternal } from '@/utils'
+import { isExternal } from '@/utils/validate'
 import Item from './Item'
 import AppLink from './Link'
 import FixiOSBug from './FixiOSBug'
@@ -94,14 +94,12 @@ export default {
       return false
     },
     resolvePath(routePath) {
-      if (this.isExternalLink(routePath)) {
+      if (isExternal(routePath)) {
         return routePath
       }
       return path.resolve(this.basePath, routePath)
     },
-    isExternalLink(routePath) {
-      return isExternal(routePath)
-    },
+
     generateTitle
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,3 @@ export function deepClone(source) {`
`290`	`290`	`export function uniqueArr(arr) {`
`291`	`291`	`return Array.from(new Set(arr))`
`292`	`292`	`}`
`293`		`-`
`294`		`-export function isExternal(path) {`
`295`		`- return /^(https?:\|mailto:\|tel:)/.test(path)`
`296`		`-}`