fix: utils

pull/40/MERGE
xingyu 2023-11-07 09:18:55 +08:00
parent e7487a4759
commit 78ebcb15d5
2 changed files with 7 additions and 5 deletions

View File

@ -1,6 +1,5 @@
import type { RouteLocationNormalized, RouteRecordNormalized } from 'vue-router'
import type { App, Component } from 'vue'
import { intersectionWith, isEqual, mergeWith, unionWith } from 'lodash-es'
import { unref } from 'vue'
import { isArray, isObject } from '@/utils/is'
@ -80,7 +79,10 @@ export function deepMerge<T extends object | null | undefined, U extends object
})
}
export function openWindow(url: string, opt?: { target?: TargetContext | string; noopener?: boolean; noreferrer?: boolean }) {
export function openWindow(
url: string,
opt?: { target?: TargetContext | string; noopener?: boolean; noreferrer?: boolean },
) {
const { target = '__blank', noopener = true, noreferrer = true } = opt || {}
const feature: string[] = []
@ -134,7 +136,7 @@ export type WithInstall<T> = T & {
export type CustomComponent = Component & { displayName?: string }
export function withInstall<T extends CustomComponent>(component: T, alias?: string) {
;(component as Record<string, unknown>).install = (app: App) => {
(component as Record<string, unknown>).install = (app: App) => {
const compName = component.name || component.displayName
if (!compName)
return

View File

@ -66,7 +66,7 @@ export function isString(val: unknown): val is string {
return is(val, 'String')
}
export function isFunction(val: unknown): val is Fn {
export function isFunction(val: unknown): val is Function {
return typeof val === 'function'
}
@ -99,6 +99,6 @@ export const isServer = typeof window === 'undefined'
export const isClient = !isServer
export function isUrl(path: string): boolean {
const reg = /^http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/
const reg = /^http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- ./?%&=]*)?/
return reg.test(path)
}