adtec-core-package 3.0.3 → 3.0.5

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": "格式刷",

package/src/components/editor-main/src/utils/editor-scroll.js

@@ -1,35 +1,59 @@
+/** TipTap focus 选项：不触发 ProseMirror scrollIntoView */
+export const FOCUS_WITHOUT_SCROLL = { scrollIntoView: false }
+
+function pushScrollPosition(positions, seen, el) {
+  if (!el || seen.has(el)) return
+  seen.add(el)
+  positions.push({
+    el,
+    top: el.scrollTop,
+    left: el.scrollLeft,
+  })
+}
+
 /**
- * 保存/恢复编辑器及外层滚动位置，避免 setBlockType 等命令触发 scrollIntoView 导致页面跳动。
+ * 保存/恢复编辑器及外层滚动位置，避免 toolbar focus / setBlockType 等触发 scrollIntoView 导致页面跳动。
  */
 export function captureScrollPositions(container) {
   const positions = []
+  const seen = new Set()
   const pageContainer = document.querySelector(
     `${container} .umo-zoomable-container`,
   )
-  if (pageContainer) {
-    positions.push({
-      el: pageContainer,
-      top: pageContainer.scrollTop,
-      left: pageContainer.scrollLeft,
-    })
-  }
+  pushScrollPosition(positions, seen, pageContainer)
 
-  let node = pageContainer?.parentElement ?? null
+  let node =
+    pageContainer?.parentElement ??
+    document.querySelector(container)?.parentElement ??
+    null
   while (node && node !== document.documentElement) {
     if (node.classList?.contains('el-scrollbar__wrap')) {
-      positions.push({
-        el: node,
-        top: node.scrollTop,
-        left: node.scrollLeft,
-      })
-      break
+      pushScrollPosition(positions, seen, node)
+    } else {
+      const style = getComputedStyle(node)
+      const overflow = `${style.overflow}${style.overflowY}${style.overflowX}`
+      if (/auto|scroll/.test(overflow)) {
+        pushScrollPosition(positions, seen, node)
+      }
     }
     node = node.parentElement
   }
 
+  pushScrollPosition(positions, seen, document.documentElement)
+  pushScrollPosition(positions, seen, document.body)
+
   return positions
 }
 
+export function runPreservingScroll(container, fn) {
+  const scrollPositions = captureScrollPositions(container)
+  try {
+    return fn()
+  } finally {
+    restoreScrollPositions(scrollPositions)
+  }
+}
+
 export function restoreScrollPositions(positions) {
   if (!positions.length) return
   const apply = () => {

package/src/components/vxeGrid/index.vue

@@ -7,14 +7,15 @@
 <script setup lang="ts">
 //@ts-ignore
 import { components, initVxeTableInPage } from 'adtec-core-package/src/config/VxeTableConfig'
-// 导入默认的语言
 import { defineComponent, getCurrentInstance, h } from 'vue'
+
 const { VxeGrid } = components
 defineComponent({
   components: {
     VxeGrid,
   },
 })
+
 const { renderComponent = { enableElementPlus: true, enableExcel: false, enablePdf: false } } =
   defineProps<{
     renderComponent?: {
@@ -24,12 +25,18 @@ const { renderComponent = { enableElementPlus: true, enableExcel: false, enableP
     }
   }>()
 
-initVxeTableInPage(renderComponent.enableExcel,renderComponent.enablePdf)
+initVxeTableInPage(
+  renderComponent.enableExcel,
+  renderComponent.enablePdf,
+  renderComponent.enableElementPlus ?? true,
+)
 
 const vm = getCurrentInstance()
 
-const changeRef = (exposed: any) => {
-  vm && (vm.exposed = exposed)
+const changeRef = (exposed: unknown) => {
+  if (vm) {
+    vm.exposed = exposed
+  }
 }
 </script>
 

package/src/stores/dictStore.ts

@@ -1,6 +1,9 @@
 import { defineStore } from 'pinia'
-import { ref } from 'vue'
+import { ref, type Ref } from 'vue'
+import Base64 from 'crypto-js/enc-base64'
+import Utf8 from 'crypto-js/enc-utf8'
 import type { ISysDictDataCacheVo } from '../interface/ISysDictDataCacheVo'
+
 // 定义包含map的整体类型
 export interface dictMapType {
   [key: string]: ISysDictDataCacheVo[]
@@ -14,12 +17,76 @@ export interface dictDataMapType {
   [key: string]: { [key: string]: ISysDictDataCacheVo }
 }
 
+const DICT_STORAGE_KEY = 'dictStore'
+
+export interface SharedDictState {
+  dictMap: Ref<dictMapType>
+  dictDataMap: Ref<dictDataMapType>
+  dictDefaultValueMap: Ref<dictMapType>
+}
+
+declare global {
+  interface Window {
+    __ADTEC_SHARED_DICT__?: SharedDictState
+  }
+}
+
+/** wujie 子应用走 parent，宿主/独立 dev 走自身 window —— 全应用共享同一份 ref */
+function getRootWindow(): Window {
+  if (typeof window === 'undefined') return window
+  const w = window as Window & { __POWERED_BY_WUJIE__?: boolean }
+  return w.__POWERED_BY_WUJIE__ ? window.parent : window
+}
+
+function hydrateFromSessionStorage(state: SharedDictState) {
+  const raw = sessionStorage.getItem(DICT_STORAGE_KEY)
+  if (!raw) return
+  try {
+    const parsed = JSON.parse(Base64.parse(raw).toString(Utf8)) as {
+      dictMap?: dictMapType
+      dictDataMap?: dictDataMapType
+      dictDefaultValueMap?: dictMapType
+    }
+    if (parsed.dictMap) {
+      state.dictMap.value = { ...parsed.dictMap, ...state.dictMap.value }
+    }
+    if (parsed.dictDataMap) {
+      state.dictDataMap.value = { ...parsed.dictDataMap, ...state.dictDataMap.value }
+    }
+    if (parsed.dictDefaultValueMap) {
+      state.dictDefaultValueMap.value = {
+        ...parsed.dictDefaultValueMap,
+        ...state.dictDefaultValueMap.value,
+      }
+    }
+  } catch {
+    // ignore corrupt session data
+  }
+}
+
+/** 宿主 window 单例：alive 子应用与宿主读写同一组 Vue ref（刷新时仍由 sessionStorage 恢复） */
+export function getSharedDictRefs(): SharedDictState {
+  const root = getRootWindow()
+  if (!root.__ADTEC_SHARED_DICT__) {
+    root.__ADTEC_SHARED_DICT__ = {
+      dictMap: ref<dictMapType>({}),
+      dictDataMap: ref<dictDataMapType>({}),
+      dictDefaultValueMap: ref<dictMapType>({}),
+    }
+    hydrateFromSessionStorage(root.__ADTEC_SHARED_DICT__)
+  }
+  return root.__ADTEC_SHARED_DICT__
+}
+
+/** @deprecated 已由 getSharedDictRefs 在初始化时 hydrate；保留兼容旧调用 */
+export function syncDictFromSessionStorage(target: SharedDictState) {
+  hydrateFromSessionStorage(target)
+}
+
 export const dictStore = defineStore('dictStore', () => {
-  const dictMap = ref<dictMapType>({})
-  const dictDataMap = ref<dictDataMapType>({})
-  const dictDefaultValueMap = ref<dictMapType>({})
+  const { dictMap, dictDataMap, dictDefaultValueMap } = getSharedDictRefs()
 
-  const clearDictCache = (dictType?: string[],userOrgId?: string, orgId?: string, all?: Boolean) => {
+  const clearDictCache = (dictType?: string[], userOrgId?: string, orgId?: string, all?: Boolean) => {
     if (dictType && dictType.length > 0) {
       dictType.forEach((item) => {
         if (orgId) {