-
diff --git a/src/components/custom/IconClose/index.vue b/src/components/custom/IconClose/index.vue
index dd58a2de..0e24cf1c 100644
--- a/src/components/custom/IconClose/index.vue
+++ b/src/components/custom/IconClose/index.vue
@@ -15,19 +15,19 @@
diff --git a/src/utils/auth/index.ts b/src/utils/auth/index.ts
index 60bc1e91..e5abc856 100644
--- a/src/utils/auth/index.ts
+++ b/src/utils/auth/index.ts
@@ -1 +1 @@
-export { getToken, setToken, removeToken, getUserInfo, resetAuthStorage } from './user';
+export * from './user';
diff --git a/src/utils/common/color.ts b/src/utils/common/color.ts
index 7db6cff2..a4968d15 100644
--- a/src/utils/common/color.ts
+++ b/src/utils/common/color.ts
@@ -26,3 +26,13 @@ export function darkenColor(color: string, deep: number = 0.5) {
export function addColorAlpha(color: string, alpha: number) {
return chroma(color).alpha(alpha).hex();
}
+
+/**
+ * 颜色混合
+ * @param firstColor - 第一个颜色
+ * @param secondColor - 第二个颜色
+ * @param ratio - 第二个颜色占比
+ */
+export function mixColor(firstColor: string, secondColor: string, ratio: number) {
+ return chroma.mix(firstColor, secondColor, ratio).hex();
+}
diff --git a/src/utils/common/index.ts b/src/utils/common/index.ts
index fd61f2d5..495ad77b 100644
--- a/src/utils/common/index.ts
+++ b/src/utils/common/index.ts
@@ -1,17 +1,5 @@
-export {
- isNumber,
- isString,
- isBoolean,
- isNull,
- isUndefined,
- isObject,
- isArray,
- isDate,
- isRegExp,
- isSet,
- isMap
-} from './typeof';
+export * from './typeof';
-export { brightenColor, darkenColor, addColorAlpha } from './color';
+export * from './color';
-export { dynamicIconRender } from './icon';
+export * from './icon';
diff --git a/src/utils/router/cache.ts b/src/utils/router/cache.ts
index 359a49e9..462b064c 100644
--- a/src/utils/router/cache.ts
+++ b/src/utils/router/cache.ts
@@ -25,7 +25,7 @@ function hasChildren(route: RouteRecordRaw) {
}
/** 获取被缓存的路由 */
-export default function getCacheRoutes(routes: RouteRecordRaw[]) {
+export function getCacheRoutes(routes: RouteRecordRaw[]) {
const cacheNames: string[] = [];
routes.forEach(route => {
const isCache = isKeepAlive(route);
diff --git a/src/utils/router/index.ts b/src/utils/router/index.ts
index 2891391d..b633603a 100644
--- a/src/utils/router/index.ts
+++ b/src/utils/router/index.ts
@@ -1,3 +1,3 @@
-export { ROUTE_NAME_MAP, setRouterCacheName, getLoginRedirectUrl, setSingleRoute } from './helpers';
-export { default as getCacheRoutes } from './cache';
-export { default as transformRouteToMenu } from './menus';
+export * from './helpers';
+export * from './cache';
+export * from './menus';
diff --git a/src/utils/router/menus.ts b/src/utils/router/menus.ts
index 6f134b1e..1371b24c 100644
--- a/src/utils/router/menus.ts
+++ b/src/utils/router/menus.ts
@@ -19,7 +19,7 @@ function addPartialProps(menuItem: GlobalMenuOption, icon?: Component, children?
return item;
}
-export default function transformRouteToMenu(routes: CustomRoute[]) {
+export function transformRouteToMenu(routes: CustomRoute[]) {
const globalMenu: GlobalMenuOption[] = [];
routes.forEach(route => {
const { name, path, meta } = route;
diff --git a/src/views/dashboard/analysis/components/DataCard/components/GradientBg.vue b/src/views/dashboard/analysis/components/DataCard/components/GradientBg.vue
index f3bc0dd4..82972956 100644
--- a/src/views/dashboard/analysis/components/DataCard/components/GradientBg.vue
+++ b/src/views/dashboard/analysis/components/DataCard/components/GradientBg.vue
@@ -9,9 +9,9 @@ import { computed } from 'vue';
interface Props {
/** 渐变开始的颜色 */
- startColor: string;
+ startColor?: string;
/** 渐变结束的颜色 */
- endColor: string;
+ endColor?: string;
}
const props = withDefaults(defineProps
(), {
diff --git a/src/views/system/login/index.vue b/src/views/system/login/index.vue
index 98c2da3d..e7697dd6 100644
--- a/src/views/system/login/index.vue
+++ b/src/views/system/login/index.vue
@@ -22,27 +22,29 @@