adtec-core-package 3.0.4 → 3.0.5

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) {