Merge pull request #260 from china-wangxu/minor-problem2

Minor problem2

Author: umodoc

src/components/menus/toolbar/base/font-family.vue

@@ -3,7 +3,11 @@
     :text="t('base.fontFamily.text')"
     menu-type="select"
     hide-text
-    :select-value="editor?.getAttributes('textStyle').fontFamily || null"
+    :select-value="
+      isTypeRunning
+        ? null
+        : editor?.getAttributes('textStyle').fontFamily || null
+    "
     :style="{ width: $toolbar.mode !== 'classic' ? '144px' : '90px' }"
     filterable
     @menu-click="setFontFamily"
@@ -44,6 +48,14 @@ const options = inject('options')
 const $toolbar = useState('toolbar', options)
 const $recent = useState('recent', options)
 
+import { getTypewriterRunState } from '@/extensions/type-writer'
+let isTypeRunning = $ref(false)
+watch(
+  () => getTypewriterRunState(),
+  (newValue: boolean) => {
+    isTypeRunning = newValue
+  },
+)
 const usedFonts = $ref<string[]>([])
 // https://www.cnblogs.com/gaidalou/p/8479452.html
 const fontDetect = (font?: string) => {

src/components/menus/toolbar/base/font-size.vue

@@ -6,7 +6,11 @@
     hide-text
     style="width: 80px"
     :select-options="fontSizes"
-    :select-value="editor?.getAttributes('textStyle').fontSize || '14px'"
+    :select-value="
+      isTypeRunning
+        ? null
+        : editor?.getAttributes('textStyle').fontSize || '14px'
+    "
     v-bind="$attrs"
     :placeholder="t('base.fontSize.text')"
     filterable
@@ -43,7 +47,14 @@ const $toolbar = useState('toolbar', options)
 const disableItem = (name: string) => {
   return options.value.toolbar?.disableMenuItems.includes(name)
 }
-
+import { getTypewriterRunState } from '@/extensions/type-writer'
+let isTypeRunning = $ref(false)
+watch(
+  () => getTypewriterRunState(),
+  (newValue: boolean) => {
+    isTypeRunning = newValue
+  },
+)
 const fontSizes = [
   { label: t('base.fontSize.default'), value: '14px', order: 4 },
   { label: t('base.fontSize.42pt'), value: '42pt', order: 20 }, // 56

src/extensions/type-writer.ts

@@ -97,23 +97,29 @@ export default Extension.create({
                 typedChars: 0,
               }
               //插入内容
-              const typeWriterInsertContent = (curContent: any) => {
-                // editor.commands.insertContent(curContent)
-                try {
-                  editor
-                    .chain()
-                    .insertContent(curContent)
-                    .focus('end', {
-                      scrollIntoView: true,
-                    })
-                    .run()
-                } catch (e) {}
+              const typeWriterInsertContent = async (curContent: any) => {
+                await new Promise<void>((resolve) => {
+                  setTimeout(() => {
+                    try {
+                      editor
+                        .chain()
+                        .insertContent(curContent)
+                        .focus('end', {
+                          scrollIntoView: true,
+                        })
+                        .run()
+                    } catch (e) {}
+                    resolve()
+                  }, 0)
+                })
               }
+              // 取非负数
+              const speed = Math.max(options?.speed ?? 1, 0)
               // 处理内容
               const processNode = async (node: any, isTopLevel = false) => {
                 if (node.type === 'paragraph') {
                   //当前为段落时 插入段落样式
-                  typeWriterInsertContent([
+                  await typeWriterInsertContent([
                     { type: 'paragraph', attrs: node.attrs },
                   ])
                   // 处理段落内容
@@ -136,9 +142,9 @@ export default Extension.create({
                     const endIndex = Math.min(i + step, text.length)
                     const currentText = text.slice(i, endIndex)
                     await new Promise<void>((resolve) => {
-                      typewriterTimer = setTimeout(() => {
+                      typewriterTimer = setTimeout(async () => {
                         // 插入当前字符
-                        typeWriterInsertContent([
+                        await typeWriterInsertContent([
                           {
                             type: 'text',
                             text: currentText,
@@ -162,17 +168,17 @@ export default Extension.create({
                         }
 
                         resolve()
-                      }, options?.speed ?? 1)
+                      }, speed)
                     })
                   }
                 } else if (node.type === 'table') {
-                  typeWriterInsertContent([node, { type: 'paragraph' }])
+                  await typeWriterInsertContent([node, { type: 'paragraph' }])
                   editor.commands.enter()
                 } else {
                   if (isTopLevel) {
-                    typeWriterInsertContent([node, { type: 'paragraph' }])
+                    await typeWriterInsertContent([node, { type: 'paragraph' }])
                   } else {
-                    typeWriterInsertContent([node])
+                    await typeWriterInsertContent([node])
                   }
                 }
               }
@@ -213,3 +219,7 @@ export default Extension.create({
     }
   },
 })
+
+export const getTypewriterRunState = () => {
+  return typewriterState.value.isRunning
+}