From beaa5d32e4c8589c00a0a66b41e131c89b45a0fd Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Sun, 8 Oct 2023 18:48:15 +0800 Subject: [PATCH] chore: compose workflow api --- src/store/modules/permission.ts | 2 -- src/utils/is.ts | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts index 06af8b1..314700c 100644 --- a/src/store/modules/permission.ts +++ b/src/store/modules/permission.ts @@ -19,8 +19,6 @@ import { useMessage } from '/@/hooks/web/useMessage'; import { PageEnum } from '/@/enums/pageEnum'; import { routeModuleList } from '/@/router/routes'; import { unionWith } from 'lodash-es'; -import {isUrl} from '/@/utils/is'; -import {openWindow} from '/@/utils'; interface PermissionState { // 路由是否动态添加 diff --git a/src/utils/is.ts b/src/utils/is.ts index e41647f..3c6ee40 100644 --- a/src/utils/is.ts +++ b/src/utils/is.ts @@ -60,7 +60,7 @@ export function isNumber(val: unknown): val is number { } export function isPromise(val: unknown): val is Promise { - return is(val, 'Promise') && isObject(val) && isFunction(val.then) && isFunction(val.catch); + return is(val, 'Promise') && isFunction(((val || {})).then) && isFunction(((val || {})).catch); } export function isString(val: unknown): val is string {