Merge branch 'main' into fix-downloader

This commit is contained in:
Jin Mao 2025-10-26 15:28:34 +08:00 committed by GitHub
commit 0cd9f4615c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 12 deletions

View File

@ -1,4 +1,4 @@
import type { Preferences } from "./types";
import type { Preferences } from './types';
const defaultPreferences: Preferences = {
app: {
@ -32,7 +32,6 @@ const defaultPreferences: Preferences = {
watermark: false,
watermarkContent: '',
zIndex: 200,
},
breadcrumb: {
enable: true,

View File

@ -1,23 +1,24 @@
import type { EChartsOption } from "echarts";
import type { EChartsOption } from 'echarts';
import type { Ref } from "vue";
import { computed, nextTick, watch } from "vue";
import type { Ref } from 'vue';
import type { Nullable } from "@vben/types";
import type { Nullable } from '@vben/types';
import type EchartsUI from "./echarts-ui.vue";
import type EchartsUI from './echarts-ui.vue';
import { usePreferences } from "@vben/preferences";
import { computed, nextTick, watch } from 'vue';
import { usePreferences } from '@vben/preferences';
import {
tryOnUnmounted,
useDebounceFn,
useResizeObserver,
useTimeoutFn,
useWindowSize
} from "@vueuse/core";
useWindowSize,
} from '@vueuse/core';
import echarts from "./echarts";
import echarts from './echarts';
type EchartsUIType = typeof EchartsUI | undefined;
@ -68,7 +69,7 @@ function useEcharts(chartRef: Ref<EchartsUIType>) {
const renderEcharts = (
options: EChartsOption,
clear = true
clear = true,
): Promise<Nullable<echarts.ECharts>> => {
cacheOptions = options;
const currentOptions = {