adtec-core-package 3.0.3 → 3.0.5

package/src/components/RichTextEditor/RichTextEditor.vue

@@ -1,6 +1,9 @@
 <!-- RichTextEditor：基于预编译 Umo Editor（prebuilt/umo-editor），对外 API 与原 AiEditor 封装保持一致 -->
 <template>
-  <div ref="rootRef" class="umo-rich-text-editor-root">
+  <div
+    ref="rootRef"
+    class="umo-rich-text-editor-root"
+    :class="{ 'umo-rich-text-editor-root--readonly': !editable }">
     <UmoEditor
       v-if="umoMountOptions"
       :key="umoRuntimeKey"
@@ -36,9 +39,44 @@ export type RichTextEditorConfig = {
 }
 
 /** 始终保留 BlockImage NodeView；只读由 document.readOnly + node-view 静态分支控制 */
-const DISABLED_EXTENSIONS = ['mermaid', 'diagrams'] as const
-
-const OFFICIAL_TOOLBAR_MENUS = ['base', 'insert', 'table', 'tools', 'page', 'view', 'export'] as const
+const DISABLED_EXTENSIONS = [
+  'locale', // 视图 Tab：隐藏语言设置下拉（locale 固定 zh-CN；状态栏指示器另用 CSS 隐藏）
+  'theme', // 视图 Tab：隐藏主题设置（light/dark，theme 固定 light）
+  'mermaid',
+  'diagrams',
+  // Block 菜单（+ 插入新内容）：仅保留表格与图片
+  'qrcode',
+  'barcode',
+  'signature',
+  'math',
+  'echarts',
+  'print', // 开始 Tab：隐藏打印
+  // 插入 Tab：仅保留图片
+  'link',
+  'video',
+  'audio',
+  'file',
+  'text-box',
+  'details',
+  'code-block',
+  'symbol',
+  'chinese-date',
+  'emoji',
+  'tag',
+  'columns',
+  'callout',
+  'mention',
+  'option-box',
+  'hard-break',
+  'hr',
+  'bookmark',
+  'footnote',
+  'toc',
+  'template',
+  'web-page',
+] as const
+
+const OFFICIAL_TOOLBAR_MENUS = ['base', 'insert', 'table', 'page', 'view'] as const
 
 const emit = defineEmits<{
   onBlur: [payload: { html: string; text: string }]
@@ -211,7 +249,7 @@ function seedUmoLayoutStorage() {
     localStorage.setItem(`umo-editor:${umoRuntimeKey.value}:layout`, JSON.stringify('web'))
     localStorage.setItem(
       `umo-editor:${umoRuntimeKey.value}:toolbar`,
-      JSON.stringify({ mode: 'ribbon', show: showToolbar }),
+      JSON.stringify({ mode: 'classic', show: showToolbar }),
     )
   } catch {
     // ignore quota / private mode
@@ -280,11 +318,12 @@ function buildUmoMountOptions(content: string) {
     fullscreenZIndex: 2500,
     toolbar: {
       showSaveLabel: false,
-      defaultMode: 'ribbon',
+      defaultMode: 'classic',
+      // Umo schema 要求 menus 至少含 base；只读时 readOnly=true 会隐藏工具栏 UI
       menus:
         props.showToolbar && editableNow
           ? [...OFFICIAL_TOOLBAR_MENUS]
-          : [],
+          : (['base'] as unknown as string[]),
     },
     page: {
       layouts: ['page', 'web'],
@@ -296,7 +335,7 @@ function buildUmoMountOptions(content: string) {
         zh_CN: placeholder,
       },
       readOnly: !editableNow,
-      autofocus: editableNow,
+      autofocus: false,
       enableMarkdown: false,
       enableSpellcheck: false,
       autoSave: {
@@ -367,7 +406,7 @@ async function applyEditableState() {
   editor.setReadOnly?.(!canEdit)
   ensureTipTapEditable(canEdit)
   editor.setToolbar?.({
-    mode: 'ribbon',
+    mode: 'classic',
     show: props.showToolbar && canEdit,
   })
   const tipTap = editor.getEditor?.()?.value
@@ -647,4 +686,18 @@ onUnmounted(() => {
   cursor: text;
   min-height: 120px;
 }
+
+.umo-rich-text-editor-root--readonly {
+  :deep(.umo-loading),
+  :deep(.umo-loading--visible),
+  :deep(.umo-loading__overlay),
+  :deep(.umo-loading--center),
+  :deep(.umo-icon-loading) {
+    display: none !important;
+  }
+
+  :deep(.umo-editor-content .ProseMirror) {
+    cursor: default;
+  }
+}
 </style>

package/src/components/RichTextEditor/installUmoEditorApp.ts

@@ -5,6 +5,26 @@ import { umoGlobalComponents } from '../../../prebuilt/umo-editor/umo-editor.js'
 const registeredApps = new WeakSet<App>()
 const tdesignApps = new WeakSet<App>()
 
+/** 嵌入 Umo 的全局样式覆盖（须注入 document.head，全屏 Teleport 到 body 时组件 scoped :deep 无法命中） */
+function injectUmoEmbedStyles() {
+  if (typeof document === 'undefined') return
+  if (document.getElementById('umo-embed-overrides')) return
+
+  const style = document.createElement('style')
+  style.id = 'umo-embed-overrides'
+  style.textContent = `
+    svg.umo-icon:not(.t-icon) {
+      fill: none;
+    }
+    .umo-status-bar-button.umo-lang-button {
+      display: none !important;
+    }
+  `
+  document.head.appendChild(style)
+}
+
+injectUmoEmbedStyles()
+
 /** 预编译 Umo 内部用 resolveComponent，须在宿主 Vue App 上注册 umoGlobalComponents */
 export function installUmoEditorApp(app?: App | null) {
   if (!app) return false

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
 }