From a6524088fa0b5f8408bcd72ecd5af114b218f509 Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Tue, 20 Aug 2024 14:49:30 +0800 Subject: [PATCH] fix: tinymce theme --- apps/web-antd/src/api/core/upload.ts | 2 +- .../src/components/Tinymce/src/Editor.vue | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/apps/web-antd/src/api/core/upload.ts b/apps/web-antd/src/api/core/upload.ts index ee6af98e..aeb0328b 100644 --- a/apps/web-antd/src/api/core/upload.ts +++ b/apps/web-antd/src/api/core/upload.ts @@ -1,6 +1,6 @@ import { requestClient } from '#/api/request'; -export function commonUploadApi(file: Blob | File) { +export function uploadApi(file: Blob | File) { return requestClient.upload('/resource/oss/upload', file); } /** diff --git a/apps/web-antd/src/components/Tinymce/src/Editor.vue b/apps/web-antd/src/components/Tinymce/src/Editor.vue index 5f117e45..f1562083 100644 --- a/apps/web-antd/src/components/Tinymce/src/Editor.vue +++ b/apps/web-antd/src/components/Tinymce/src/Editor.vue @@ -15,12 +15,12 @@ import { watch, } from 'vue'; -import { preferences } from '@vben/preferences'; +import { preferences, usePreferences } from '@vben/preferences'; import Editor from '@tinymce/tinymce-vue'; import { isNumber } from 'lodash-es'; -import { commonUploadApi, type UploadResult } from '#/api/core/upload'; +import { uploadApi, type UploadResult } from '#/api/core/upload'; import { buildShortUUID } from '#/utils/uuid'; import { bindHandlers } from './helper'; @@ -93,16 +93,13 @@ const containerWidth = computed(() => { return width; }); +const { isDark } = usePreferences(); const skinName = computed(() => { - const theme = - preferences.theme.mode === 'auto' ? 'light' : preferences.theme.mode; - return theme === 'light' ? 'oxide' : 'oxide-dark'; + return isDark.value ? 'oxide-dark' : 'oxide'; }); const contentCss = computed(() => { - const theme = - preferences.theme.mode === 'auto' ? 'light' : preferences.theme.mode; - return theme === 'light' ? 'default' : 'dark'; + return isDark.value ? 'dark' : 'default'; }); /** @@ -183,7 +180,7 @@ const initOptions = computed((): InitOptions => { return new Promise((resolve, reject) => { const file = blobInfo.blob(); // const filename = blobInfo.filename(); - commonUploadApi(file) + uploadApi(file) .then((response) => { const { url } = response as unknown as UploadResult; console.log('tinymce上传图片:', url);