diff --git a/open-isle-cli/src/components/CommentEditor.vue b/open-isle-cli/src/components/CommentEditor.vue
index bd32119f5..d4f602919 100644
--- a/open-isle-cli/src/components/CommentEditor.vue
+++ b/open-isle-cli/src/components/CommentEditor.vue
@@ -17,6 +17,7 @@
 <script>
 import { ref, onMounted, computed, watch } from 'vue'
 import Vditor from 'vditor'
+import { themeState } from '../utils/theme'
 import 'vditor/dist/index.css'
 
 export default {
@@ -39,6 +40,15 @@ export default {
   setup(props, { emit }) {
     const vditorInstance = ref(null)
     const text = ref('')
+    const getEditorTheme = () =>
+      document.documentElement.dataset.theme === 'dark' ? 'dark' : 'classic'
+    const getPreviewTheme = () =>
+      document.documentElement.dataset.theme === 'dark' ? 'dark' : 'light'
+    const applyTheme = () => {
+      if (vditorInstance.value) {
+        vditorInstance.value.setTheme(getEditorTheme(), getPreviewTheme())
+      }
+    }
 
     const isDisabled = computed(() => props.loading || props.disabled || !text.value.trim())
 
@@ -54,9 +64,11 @@ export default {
       vditorInstance.value = new Vditor(props.editorId, {
         placeholder: '说点什么...',
         height: 120,
+        theme: getEditorTheme(),
         preview: {
           actions: [],
-          markdown: { toc: false }
+          markdown: { toc: false },
+          theme: { current: getPreviewTheme() }
         },
         toolbar: [
           'emoji',
@@ -81,6 +93,7 @@ export default {
           text.value = value
         }
       })
+      applyTheme()
     })
 
     watch(
@@ -107,6 +120,13 @@ export default {
       }
     )
 
+    watch(
+      () => themeState.mode,
+      () => {
+        applyTheme()
+      }
+    )
+
     return { submit, isDisabled }
   }
 }
diff --git a/open-isle-cli/src/components/PostEditor.vue b/open-isle-cli/src/components/PostEditor.vue
index 25ad8432b..fe205a4bb 100644
--- a/open-isle-cli/src/components/PostEditor.vue
+++ b/open-isle-cli/src/components/PostEditor.vue
@@ -9,6 +9,7 @@
 
 <script>
 import { ref, onMounted, watch } from 'vue'
+import { themeState } from '../utils/theme'
 import Vditor from 'vditor'
 import 'vditor/dist/index.css'
 import { API_BASE_URL } from '../main'
@@ -40,6 +41,15 @@ export default {
   },
   setup(props, { emit }) {
     const vditorInstance = ref(null)
+    const getEditorTheme = () =>
+      document.documentElement.dataset.theme === 'dark' ? 'dark' : 'classic'
+    const getPreviewTheme = () =>
+      document.documentElement.dataset.theme === 'dark' ? 'dark' : 'light'
+    const applyTheme = () => {
+      if (vditorInstance.value) {
+        vditorInstance.value.setTheme(getEditorTheme(), getPreviewTheme())
+      }
+    }
 
     watch(
       () => props.loading,
@@ -73,10 +83,21 @@ export default {
       }
     )
 
+    watch(
+      () => themeState.mode,
+      () => {
+        applyTheme()
+      }
+    )
+
     onMounted(() => {
       vditorInstance.value = new Vditor(props.editorId, {
         placeholder: '请输入正文...',
         height: 450,
+        theme: getEditorTheme(),
+        preview: {
+          theme: { current: getPreviewTheme() },
+        },
         toolbar: [
           'emoji',
           'bold',
@@ -131,8 +152,10 @@ export default {
           if (props.loading || props.disabled) {
             vditorInstance.value.disabled()
           }
+          applyTheme()
         }
       })
+      applyTheme()
     })
 
     return {}