perf[utils]: optimize code

This commit is contained in:
Pan 2019-02-19 10:07:18 +08:00
parent 002a525352
commit 163a41fe8f
4 changed files with 8 additions and 10 deletions

View File

@ -290,7 +290,3 @@ export function deepClone(source) {
export function uniqueArr(arr) { export function uniqueArr(arr) {
return Array.from(new Set(arr)) return Array.from(new Set(arr))
} }
export function isExternal(path) {
return /^(https?:|mailto:|tel:)/.test(path)
}

View File

@ -7,6 +7,10 @@ export function isvalidUsername(str) {
return valid_map.indexOf(str.trim()) >= 0 return valid_map.indexOf(str.trim()) >= 0
} }
export function isExternal(path) {
return /^(https?:|mailto:|tel:)/.test(path)
}
/* 合法uri*/ /* 合法uri*/
export function validateURL(textval) { 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.,?'\\+&%$#=~_-]+))*$/ 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.,?'\\+&%$#=~_-]+))*$/

View File

@ -7,7 +7,7 @@
</template> </template>
<script> <script>
import { isExternal } from '@/utils' import { isExternal } from '@/utils/validate'
export default { export default {
props: { props: {

View File

@ -39,7 +39,7 @@
<script> <script>
import path from 'path' import path from 'path'
import { generateTitle } from '@/utils/i18n' import { generateTitle } from '@/utils/i18n'
import { isExternal } from '@/utils' import { isExternal } from '@/utils/validate'
import Item from './Item' import Item from './Item'
import AppLink from './Link' import AppLink from './Link'
import FixiOSBug from './FixiOSBug' import FixiOSBug from './FixiOSBug'
@ -94,14 +94,12 @@ export default {
return false return false
}, },
resolvePath(routePath) { resolvePath(routePath) {
if (this.isExternalLink(routePath)) { if (isExternal(routePath)) {
return routePath return routePath
} }
return path.resolve(this.basePath, routePath) return path.resolve(this.basePath, routePath)
}, },
isExternalLink(routePath) {
return isExternal(routePath)
},
generateTitle generateTitle
} }
} }