adtec-core-package 3.0.4 → 3.0.5

package/src/components/RichTextEditor/RichTextEditor.vue

@@ -335,7 +335,7 @@ function buildUmoMountOptions(content: string) {
         zh_CN: placeholder,
       },
       readOnly: !editableNow,
-      autofocus: editableNow,
+      autofocus: false,
       enableMarkdown: false,
       enableSpellcheck: false,
       autoSave: {

package/src/components/editor-main/src/components/index.vue

@@ -81,7 +81,7 @@ import {
 } from '../utils/history-record'
 import { getOpitons } from '../utils/options'
 import { getSelectionNode, getSelectionText } from '../utils/selection'
-import { syncCacheOnEditorSelectionUpdate } from '../composables/toolbarSelection.js'
+import { syncCacheOnEditorSelectionUpdate, bumpToolbarEditorState } from '../composables/toolbarSelection.js'
 import { shortId } from '../utils/short-id'
 import { getCurrentInstance } from 'vue'
 
@@ -332,6 +332,7 @@ watch(
     editor.value.on('update', ({ editor }) => {
       emits('changed', { editor })
       contentUpdated.value = true
+      bumpToolbarEditorState()
     })
     editor.value.on('selectionUpdate', ({ editor }) => {
       syncCacheOnEditorSelectionUpdate(editor)

package/src/components/editor-main/src/components/menus/button.vue

@@ -205,6 +205,7 @@
             :disabled="
               !forceEnabled && (disabled || editor?.isEditable === false)
             "
+            @mousedown.prevent="cacheToolbarSelection"
           >
             <div class="umo-button-content" @click="menuClick">
               <slot />
@@ -341,7 +342,7 @@ import { isString } from '@tool-belt/type-predicates'
 import { getShortcut } from '../../utils/shortcut'
 
 
-import { useAttrs, inject, watch, ref } from 'vue';
+import { useAttrs, inject, watch, ref, onBeforeUnmount } from 'vue';
 import { onClickOutside } from '@vueuse/core';
 const { selectVisible } = useSelect()
 
@@ -442,24 +443,50 @@ const cacheToolbarSelection = () => {
   }
 }
 
+/** 打开下拉时同一次点击可能落在首项上（幽灵 click），短暂忽略 @change */
+let suppressSelectChange = false
+let suppressSelectChangeTimer = null
+
+const clearSuppressSelectChange = () => {
+  suppressSelectChange = false
+  if (suppressSelectChangeTimer != null) {
+    clearTimeout(suppressSelectChangeTimer)
+    suppressSelectChangeTimer = null
+  }
+}
+
+const scheduleSuppressSelectChange = () => {
+  clearSuppressSelectChange()
+  suppressSelectChange = true
+  suppressSelectChangeTimer = setTimeout(clearSuppressSelectChange, 250)
+}
+
+onBeforeUnmount(clearSuppressSelectChange)
+
 const onSelectTriggerPress = () => {
   beginSelectMenuInteraction(editor?.value)
+  scheduleSuppressSelectChange()
 }
 
 const selectPopupVisibleChange = (visible) => {
   popupVisileChange(visible)
   if (visible) {
     beginSelectMenuInteraction(editor?.value)
+    scheduleSuppressSelectChange()
   } else {
     endSelectMenuInteraction()
+    clearSuppressSelectChange()
   }
 }
 
-const selectMenuClick = (...args) => {
+const selectMenuClick = (value, context, ...rest) => {
+  if (suppressSelectChange || context?.trigger === 'default') {
+    return
+  }
   if (editor?.value?.state.selection.empty) {
     restorePendingSelectMenuRange(editor.value)
   }
-  menuClick(...args)
+  menuClick(value, context, ...rest)
 }
 
 const tooltipVisible = _ref(false)

package/src/components/editor-main/src/components/menus/toolbar/base/color.vue

@@ -28,6 +28,10 @@ import { ref as _ref } from 'vue';
 
 
 import { inject } from 'vue';
+import {
+  FOCUS_WITHOUT_SCROLL,
+  runPreservingScroll,
+} from '../../../../utils/editor-scroll.js';
 const props = defineProps({
   text: {
     type: String,
@@ -46,6 +50,7 @@ const emits = defineEmits(['change'])
 
 const { popupVisible, togglePopup } = usePopup()
 const editor = inject('editor')
+const container = inject('container')
 
 let currentColor = _ref()
 const colorChange = (color) => {
@@ -57,11 +62,13 @@ const colorChange = (color) => {
     return
   }
 
-  if (color === '') {
-    editor.value?.chain().focus().unsetColor().run()
-  } else {
-    editor.value?.chain().focus().setColor(color).run()
-  }
+  runPreservingScroll(container, () => {
+    if (color === '') {
+      editor.value?.chain().focus(undefined, FOCUS_WITHOUT_SCROLL).unsetColor().run()
+    } else {
+      editor.value?.chain().focus(undefined, FOCUS_WITHOUT_SCROLL).setColor(color).run()
+    }
+  })
 }
 </script>
 

package/src/components/editor-main/src/components/menus/toolbar/base/font-family.vue

@@ -57,6 +57,10 @@
 
 <script setup>
 import { t } from '../../../../composables/i18n.js';
+import {
+  getToolbarFontFamily,
+  toolbarEditorTick,
+} from '../../../../composables/toolbarSelection.js';
 
 import { useState } from '../../../../composables/state.js';
 import { ref as _ref } from 'vue';
@@ -81,13 +85,11 @@ let autoDownloadRunning = _ref(false)
 let restoringDownloadedFonts = _ref(true)
 
 const selectedFont = computed(() => {
+  toolbarEditorTick.value
   if (!editor.value || typeWriterIsRunning.value) {
     return null
   }
-  if (!editor.value?.getAttributes('textStyle').fontFamily) {
-    return null
-  }
-  return editor.value.getAttributes('textStyle').fontFamily.replace(/"/g, '')
+  return getToolbarFontFamily(editor.value)
 })
 
 const ensureRecentState = () => {

package/src/components/editor-main/src/components/menus/toolbar/base/font-size.vue

@@ -6,11 +6,7 @@
     hide-text
     style="width: 80px"
     :select-options="fontSizes"
-    :select-value="
-      typeWriterIsRunning
-        ? null
-        : editor?.getAttributes('textStyle').fontSize || '14px'
-    "
+    :select-value="selectFontSize"
     v-bind="$attrs"
     :placeholder="t('base.fontSize.text')"
     filterable
@@ -40,10 +36,16 @@
 import { t } from '../../../../composables/i18n.js';
 import {
   applyCachedTextSelection,
+  getToolbarFontSize,
   refreshCachedTextSelection,
   restorePendingSelectMenuRange,
+  toolbarEditorTick,
 } from '../../../../composables/toolbarSelection.js';
-import { inject } from 'vue';
+import { computed, inject } from 'vue';
+import {
+  FOCUS_WITHOUT_SCROLL,
+  runPreservingScroll,
+} from '../../../../utils/editor-scroll.js';
 
 const props = defineProps({
   select: {
@@ -53,6 +55,7 @@ const props = defineProps({
 })
 
 const editor = inject('editor')
+const container = inject('container')
 const options = inject('options')
 const typeWriterIsRunning = inject('typeWriterIsRunning')
 
@@ -60,6 +63,12 @@ const disableMenu = (name) => {
   return options.value.disableExtensions.includes(name)
 }
 
+const selectFontSize = computed(() => {
+  toolbarEditorTick.value
+  if (typeWriterIsRunning.value) return null
+  return getToolbarFontSize(editor.value)
+})
+
 const fontSizes = [
   { label: t('base.fontSize.default'), value: '14px', order: 4 },
   { label: t('base.fontSize.42pt'), value: '42pt', order: 20 }, // 56
@@ -94,36 +103,44 @@ const fontSizes = [
   { label: '96', value: '96px', order: 22 },
 ]
 
-// 设置字体大小（连续改字号时保持选区）
+// 设置字体大小（连续改字号时保持选区，且不触发外层页面滚动）
 const applyFontSize = (fontSize) => {
   const ed = editor.value
   if (!ed) return
 
-  const { empty, from, to } = ed.state.selection
-  let chain = ed.chain().focus()
+  runPreservingScroll(container, () => {
+    const { empty, from, to } = ed.state.selection
+    let chain = ed.chain().focus(undefined, FOCUS_WITHOUT_SCROLL)
 
-  if (!empty && from !== to) {
-    chain = chain.setTextSelection({ from, to })
-  } else if (
-    !restorePendingSelectMenuRange(ed) &&
-    !applyCachedTextSelection(ed)
-  ) {
-    return
-  } else {
-    const sel = ed.state.selection
-    if (!sel.empty && sel.from !== sel.to) {
-      chain = ed.chain().focus().setTextSelection({ from: sel.from, to: sel.to })
-    } else {
+    if (!empty && from !== to) {
+      chain = chain.setTextSelection({ from, to })
+    } else if (
+      !restorePendingSelectMenuRange(ed) &&
+      !applyCachedTextSelection(ed)
+    ) {
       return
+    } else {
+      const sel = ed.state.selection
+      if (!sel.empty && sel.from !== sel.to) {
+        chain = ed
+          .chain()
+          .focus(undefined, FOCUS_WITHOUT_SCROLL)
+          .setTextSelection({ from: sel.from, to: sel.to })
+      } else {
+        return
+      }
     }
-  }
 
-  if (chain.setFontSize(fontSize).run()) {
-    refreshCachedTextSelection(ed)
-  }
+    if (chain.setFontSize(fontSize).run()) {
+      refreshCachedTextSelection(ed)
+    }
+  })
 }
 
 const setFontSize = (fontSize) => {
+  if (!fontSize) return
+  const current = getToolbarFontSize(editor.value)
+  if (current === fontSize) return
   applyFontSize(fontSize)
 }
 

package/src/components/editor-main/src/components/menus/toolbar/base/heading.vue

@@ -84,8 +84,8 @@ import { inject, ref, computed } from 'vue';
 import { onClickOutside } from '@vueuse/core';
 import {
   applyHeadingWithoutScroll,
-  captureScrollPositions,
-  restoreScrollPositions,
+  FOCUS_WITHOUT_SCROLL,
+  runPreservingScroll,
 } from '../../../../utils/editor-scroll.js';
 const { popupVisible } = usePopup()
 const container = inject('container')
@@ -133,16 +133,14 @@ const currentValue = computed(() => {
   return ''
 })
 
-const FOCUS_WITHOUT_SCROLL = { scrollIntoView: false }
-
 const setHeading = (value) => {
   const ed = editor.value
   if (!ed) return
 
-  const scrollPositions = captureScrollPositions(container)
-  ed.commands.focus(undefined, FOCUS_WITHOUT_SCROLL)
-  applyHeadingWithoutScroll(ed, value)
-  restoreScrollPositions(scrollPositions)
+  runPreservingScroll(container, () => {
+    ed.commands.focus(undefined, FOCUS_WITHOUT_SCROLL)
+    applyHeadingWithoutScroll(ed, value)
+  })
   popupVisible.value = false
 }
 

package/src/components/editor-main/src/composables/toolbarSelection.js

@@ -1,8 +1,17 @@
+import { ref } from 'vue'
+
 /** 工具栏 t-select 等抢焦点时缓存的非空文本选区 */
 let cachedRange = null
 /** 当前 t-select 弹层会话内快照（打开下拉时锁定，避免误恢复旧选区） */
 let pendingSelectRange = null
 
+/** ProseMirror 选区/mark 变化时递增，供 Vue computed 订阅 */
+export const toolbarEditorTick = ref(0)
+
+export function bumpToolbarEditorState() {
+  toolbarEditorTick.value += 1
+}
+
 export function cacheEditorTextSelection(editor) {
   if (!editor?.state) return
   const { from, to, empty } = editor.state.selection
@@ -17,11 +26,13 @@ export function syncCacheOnEditorSelectionUpdate(editor) {
   if (!empty && from !== to) {
     cachedRange = { from, to }
   }
+  bumpToolbarEditorState()
 }
 
 export function beginSelectMenuInteraction(editor) {
   if (!editor?.state) {
     pendingSelectRange = cachedRange ? { ...cachedRange } : null
+    bumpToolbarEditorState()
     return
   }
   const { from, to, empty } = editor.state.selection
@@ -33,10 +44,12 @@ export function beginSelectMenuInteraction(editor) {
   } else {
     pendingSelectRange = null
   }
+  bumpToolbarEditorState()
 }
 
 export function endSelectMenuInteraction() {
   pendingSelectRange = null
+  bumpToolbarEditorState()
 }
 
 function applyTextRange(editor, range) {
@@ -65,4 +78,224 @@ export function refreshCachedTextSelection(editor) {
   if (!empty && from !== to) {
     cachedRange = { from, to }
   }
+  bumpToolbarEditorState()
+}
+
+function clampRange(editor, range) {
+  if (!editor?.state || !range) return null
+  const docSize = editor.state.doc.content.size
+  const from = Math.max(0, Math.min(range.from, docSize))
+  const to = Math.max(from, Math.min(range.to, docSize))
+  if (to <= from) return null
+  return { from, to }
+}
+
+/** Word 中文字号 pt/px 对照（与 richTextHtmlUtils 一致） */
+const CHINESE_FONT_SIZE_PT_PX = [
+  { pt: 42, px: 49 },
+  { pt: 36, px: 42 },
+  { pt: 26, px: 30 },
+  { pt: 24, px: 28 },
+  { pt: 22, px: 26 },
+  { pt: 18, px: 21 },
+  { pt: 16, px: 19 },
+  { pt: 15, px: 18 },
+  { pt: 14, px: 16 },
+  { pt: 12, px: 14 },
+  { pt: 10.5, px: 12 },
+  { pt: 9, px: 11 },
+  { pt: 7.5, px: 9 },
+  { pt: 6.5, px: 8 },
+]
+
+function normalizeFontSizeValue(raw) {
+  if (!raw) return null
+  const value = String(raw).trim()
+  const pxMatch = value.match(/^(\d+(?:\.\d+)?)px$/i)
+  if (pxMatch) {
+    return `${Math.round(parseFloat(pxMatch[1]))}px`
+  }
+  const ptMatch = value.match(/^(\d+(?:\.\d+)?)pt$/i)
+  if (ptMatch) {
+    return `${parseFloat(ptMatch[1])}pt`
+  }
+  return value
+}
+
+/** 将 DOM/浏览器读到的 px 映射回 pt 选项值，供 t-select 显示中文标签 */
+function resolveFontSizeForToolbarDisplay(raw) {
+  const normalized = normalizeFontSizeValue(raw)
+  if (!normalized) return null
+  if (/pt$/i.test(normalized)) return normalized
+
+  const pxMatch = normalized.match(/^(\d+(?:\.\d+)?)px$/i)
+  if (!pxMatch) return normalized
+
+  const px = Math.round(parseFloat(pxMatch[1]))
+  // 14px 为编辑器「默认」，勿映射为 12pt（小四）
+  if (px === 14) return '14px'
+
+  const byWordPx = CHINESE_FONT_SIZE_PT_PX.find((entry) => entry.px === px)
+  if (byWordPx) return `${byWordPx.pt}pt`
+
+  // 浏览器按 CSS 换算的 px（如 36pt → 48px）
+  const cssPt = (px * 72) / 96
+  const byCssPt = CHINESE_FONT_SIZE_PT_PX.find(
+    (entry) => Math.abs(entry.pt - cssPt) < 0.6,
+  )
+  if (byCssPt) return `${byCssPt.pt}pt`
+
+  return normalized
+}
+
+function readTextStyleMarkAtPos(editor, pos, attr) {
+  const $pos = editor.state.doc.resolve(pos)
+  const activeMarks = $pos.marks()
+  const storedMarks = editor.state.storedMarks ?? []
+  const marks = activeMarks.length ? activeMarks : storedMarks
+  const textStyle = marks.find((mark) => mark.type.name === 'textStyle')
+  return textStyle?.attrs?.[attr] ?? null
+}
+
+function readFontSizeFromDom(editor, pos) {
+  if (typeof window === 'undefined') return null
+  const view = editor.view
+  if (!view?.dom) return null
+
+  try {
+    const domPos = view.domAtPos(pos)
+    let node = domPos.node
+    if (node.nodeType === Node.TEXT_NODE) {
+      node = node.parentElement
+    }
+
+    while (node && node !== view.dom) {
+      const inlineSize = node.style?.fontSize
+      const computedSize =
+        inlineSize && inlineSize !== 'inherit'
+          ? inlineSize
+          : window.getComputedStyle(node).fontSize
+      const normalized = normalizeFontSizeValue(computedSize)
+      if (normalized) {
+        return normalized
+      }
+      node = node.parentElement
+    }
+  } catch {
+    return null
+  }
+
+  return null
+}
+
+function readFontSizeAtRange(editor, range) {
+  const clamped = clampRange(editor, range)
+  if (!clamped) return null
+
+  const { from, to } = clamped
+  let fontSize = null
+
+  editor.state.doc.nodesBetween(from, to, (node, pos) => {
+    if (fontSize || !node.isText) return
+    const mark = node.marks.find(
+      (item) => item.type.name === 'textStyle' && item.attrs?.fontSize,
+    )
+    if (mark) {
+      fontSize = mark.attrs.fontSize
+    }
+  })
+
+  if (!fontSize) {
+    const readPos = Math.min(from + 1, to - 1, editor.state.doc.content.size - 1)
+    fontSize = readTextStyleMarkAtPos(editor, Math.max(from, readPos), 'fontSize')
+  }
+
+  if (!fontSize) {
+    fontSize = readFontSizeFromDom(editor, from)
+  }
+
+  return resolveFontSizeForToolbarDisplay(fontSize)
+}
+
+function readFontFamilyAtRange(editor, range) {
+  const clamped = clampRange(editor, range)
+  if (!clamped) return null
+
+  const { from, to } = clamped
+  let fontFamily = null
+
+  editor.state.doc.nodesBetween(from, to, (node) => {
+    if (fontFamily || !node.isText) return
+    const mark = node.marks.find(
+      (item) => item.type.name === 'textStyle' && item.attrs?.fontFamily,
+    )
+    if (mark) {
+      fontFamily = mark.attrs.fontFamily
+    }
+  })
+
+  if (!fontFamily) {
+    const readPos = Math.min(from + 1, to - 1, editor.state.doc.content.size - 1)
+    fontFamily = readTextStyleMarkAtPos(
+      editor,
+      Math.max(from, readPos),
+      'fontFamily',
+    )
+  }
+
+  return fontFamily ? fontFamily.replace(/"/g, '') : null
+}
+
+function getActiveTextRange(editor) {
+  if (!editor?.state) return null
+  const { from, to, empty } = editor.state.selection
+  if (!empty && from !== to) {
+    return { from, to }
+  }
+  return pendingSelectRange ?? cachedRange
+}
+
+/** t-select 抢焦点导致选区折叠时，仍从缓存选区读取字号供下拉框展示 */
+export function getToolbarFontSize(editor) {
+  if (!editor?.state) return null
+
+  const { from, to, empty } = editor.state.selection
+  if (!empty && from !== to) {
+    return (
+      readFontSizeAtRange(editor, { from, to }) ??
+      resolveFontSizeForToolbarDisplay(
+        editor.getAttributes('textStyle').fontSize,
+      ) ??
+      resolveFontSizeForToolbarDisplay(readFontSizeFromDom(editor, from))
+    )
+  }
+
+  const range = getActiveTextRange(editor)
+  return (
+    readFontSizeAtRange(editor, range) ??
+    resolveFontSizeForToolbarDisplay(
+      editor.getAttributes('textStyle').fontSize,
+    ) ??
+    (range
+      ? resolveFontSizeForToolbarDisplay(readFontSizeFromDom(editor, range.from))
+      : null)
+  )
+}
+
+/** t-select 抢焦点导致选区折叠时，仍从缓存选区读取字体供下拉框展示 */
+export function getToolbarFontFamily(editor) {
+  if (!editor?.state) return null
+
+  const { from, to, empty } = editor.state.selection
+  if (!empty && from !== to) {
+    return readFontFamilyAtRange(editor, { from, to })
+  }
+
+  const range = getActiveTextRange(editor)
+  return (
+    readFontFamilyAtRange(editor, range) ??
+    (editor.getAttributes('textStyle').fontFamily
+      ? editor.getAttributes('textStyle').fontFamily.replace(/"/g, '')
+      : null)
+  )
 }

package/src/components/editor-main/src/locales/bo.json

@@ -51,8 +51,8 @@
       "12pt": "ཆུང་བའི་བཞི་པ།",
       "10_5pt": "ཨང་ལྔ་པ།",
       "9pt": "ཆུང་བའི་ལྔ་པ།",
-      "7_5pt": "ཆུང་བའི་དྲུག་པ།",
-      "6_5pt": "སྔོན་སྒྲིག"
+      "7_5pt": "དྲུག་པའི་ཨང་།",
+      "6_5pt": "ཆུང་བའི་དྲུག་པ།"
     },
     "formatPainter": {
       "text": "རྣམ་གཞག་འབྱུག་པ།",

package/src/components/editor-main/src/locales/en-US.json

@@ -66,8 +66,8 @@
       "12pt": "Sub-fourth Level",
       "10_5pt": "Fifth Level",
       "9pt": "Sub-fifth Level",
-      "7_5pt": "Sub-sixth Level",
-      "6_5pt": "Default"
+      "7_5pt": "Sixth Level",
+      "6_5pt": "Sub-sixth Level"
     },
     "formatPainter": {
       "text": "Format Painter",

package/src/components/editor-main/src/locales/it-IT.json

@@ -51,8 +51,8 @@
       "12pt": "Sotto livello quattro",
       "10_5pt": "Quinto livello",
       "9pt": "Sotto livello cinque",
-      "7_5pt": "Sotto livello sei",
-      "6_5pt": "Predefinito"
+      "7_5pt": "Sesto livello",
+      "6_5pt": "Sotto livello sei"
     },
     "formatPainter": {
       "text": "Copia formato",

package/src/components/editor-main/src/locales/ru-RU.json

@@ -57,8 +57,8 @@
       "12pt": "Под-четвертый уровень",
       "10_5pt": "Пятый уровень",
       "9pt": "Под-пятый уровень",
-      "7_5pt": "Под-шестой уровень",
-      "6_5pt": "По умолчанию"
+      "7_5pt": "Шестой уровень",
+      "6_5pt": "Под-шестой уровень"
     },
     "formatPainter": {
       "text": "Формат по образцу",

package/src/components/editor-main/src/locales/zh-CN.json

@@ -66,8 +66,8 @@
       "12pt": "小四",
       "10_5pt": "五号",
       "9pt": "小五",
-      "7_5pt": "小六",
-      "6_5pt": "默认"
+      "7_5pt": "六号",
+      "6_5pt": "小六"
     },
     "formatPainter": {
       "text": "格式刷",