adtec-core-package 3.2.0 → 3.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "private": false,
   "type": "module",
   "exports": {

package/src/assets/style/index.less

@@ -158,6 +158,20 @@ div:focus {
   .adtec-scrollbar-active();
 }
 
+/* vxe-table 使用独立滚动条手柄，禁止全局 hover 样式作用于表格内部（含固定列） */
+.vxe-table,
+.vxe-table *,
+.vxe-table *:hover {
+  .adtec-scrollbar-hidden();
+}
+
+.vxe-table:hover {
+  .vxe-table--scroll-x-handle,
+  .vxe-table--scroll-y-handle {
+    .adtec-vxe-scrollbar-active();
+  }
+}
+
 /* 附件预览：常显滚动条，避免 hover 才出现导致“没有滚动条” */
 .pdf-js-viewer,
 .docx-js-viewer,

package/src/components/upload/DocxJsViewer.vue

@@ -1,15 +1,15 @@
 <template>
   <div ref="scrollRef" class="docx-js-viewer">
-    <div v-if="loading" class="docx-loading">正在解析 Word 文档…</div>
-    <div v-else-if="loadError" class="docx-error-tip">
-      <el-empty :description="loadError" />
-    </div>
-    <div v-else class="docx-body">
+    <div class="docx-body">
       <div ref="styleHostRef" class="docx-style-host" />
       <div class="docx-scale-host" :style="scaleHostStyle">
         <div ref="bodyHostRef" class="docx-render-host" :style="renderStyle" />
       </div>
     </div>
+    <div v-if="loading" class="docx-overlay docx-loading">正在解析 Word 文档…</div>
+    <div v-else-if="loadError" class="docx-overlay docx-error-tip">
+      <el-empty :description="loadError" />
+    </div>
   </div>
 </template>
 
@@ -98,16 +98,23 @@ const collectPageSections = () => {
   emit('page-change', 1)
 }
 
+let loadToken = 0
+
 const loadDocument = async (src: Blob | ArrayBuffer) => {
+  const token = ++loadToken
   loading.value = true
-  resetViewer()
+  loadError.value = ''
   try {
     const buffer = src instanceof Blob ? await src.arrayBuffer() : src
+    if (token !== loadToken) return
+
+    await nextTick()
     const bodyHost = bodyHostRef.value
     const styleHost = styleHostRef.value
     if (!bodyHost || !styleHost) {
       throw new Error('预览容器未就绪')
     }
+    resetViewer()
     await renderAsync(buffer, bodyHost, styleHost, {
       className: 'docx',
       inWrapper: true,
@@ -119,14 +126,18 @@ const loadDocument = async (src: Blob | ArrayBuffer) => {
       renderFootnotes: true,
       renderEndnotes: true,
     })
+    if (token !== loadToken) return
     await nextTick()
     collectPageSections()
     emit('loaded')
   } catch (err) {
+    if (token !== loadToken) return
     loadError.value = 'Word 文档解析失败，请下载后查看'
     emit('error', err)
   } finally {
-    loading.value = false
+    if (token === loadToken) {
+      loading.value = false
+    }
   }
 }
 
@@ -196,7 +207,11 @@ watch(
   () => props.src,
   (src) => {
     if (src) void loadDocument(src)
-    else resetViewer()
+    else {
+      ++loadToken
+      loading.value = false
+      resetViewer()
+    }
   },
   { immediate: true },
 )
@@ -213,6 +228,7 @@ defineExpose({
 
 <style scoped lang="scss">
 .docx-js-viewer {
+  position: relative;
   flex: 1;
   width: 100%;
   min-height: 0;
@@ -220,6 +236,16 @@ defineExpose({
   background: #e5e7eb;
 }
 
+.docx-overlay {
+  position: absolute;
+  inset: 0;
+  z-index: 2;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: #e5e7eb;
+}
+
 .docx-body {
   min-height: 100%;
   padding: 12px;
@@ -238,12 +264,7 @@ defineExpose({
   background: transparent;
 }
 
-.docx-loading,
-.docx-error-tip {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  min-height: 240px;
+.docx-loading {
   color: #6b7280;
   font-size: 14px;
 }

package/src/components/upload/FileView.vue

@@ -8,6 +8,7 @@
       v-loading="showOverlayLoading"
       element-loading-text="加载中，请稍后。。。"
       class="file-view-overlay"
+      :class="{ 'is-preview-fullscreen': isFullscreen }"
     >
       <office-preview-toolbar
         v-if="!isHeaderPreview"
@@ -15,13 +16,23 @@
         :zoom="previewScale"
         :show-zoom="false"
         :show-download="!!url"
+        :show-fullscreen="true"
         :show-close="true"
+        :fullscreen="isFullscreen"
         :download-loading="loading"
         @download="download"
-        @close="model = false"
+        @toggle-fullscreen="toggleFullscreen"
+        @close="closePreview"
       />
 
-      <div class="office-preview" :class="{ 'has-rich-header': isHeaderPreview }">
+      <div
+        ref="previewContainerRef"
+        class="office-preview"
+        :class="{
+          'has-rich-header': isHeaderPreview,
+          'fullscreen-mode': isFullscreen,
+        }"
+      >
         <office-preview
           v-if="url"
           v-model:scale="previewScale"
@@ -30,19 +41,22 @@
           :file-name="title"
           :show-header="isHeaderPreview"
           :show-download="!!url"
+          :show-fullscreen="isHeaderPreview"
           :show-close="isHeaderPreview"
+          :fullscreen="isFullscreen"
           :download-loading="loading"
           @loaded="loading = false"
           @error="loading = false"
           @download="download"
-          @close="model = false"
+          @toggle-fullscreen="toggleFullscreen"
+          @close="closePreview"
         />
       </div>
     </div>
   </Teleport>
 </template>
 <script setup lang="ts">
-import { computed, ref, watch } from 'vue'
+import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { useVModel } from '@vueuse/core'
 import framework from '../../api/framework'
 import frameworkUtils from '../../utils/FrameworkUtils'
@@ -58,6 +72,8 @@ import {
 const model = defineModel()
 const loading = ref(false)
 const previewScale = ref(1)
+const previewContainerRef = ref<HTMLElement | null>(null)
+const isFullscreen = ref(false)
 
 const props = defineProps({
   title: {
@@ -89,6 +105,46 @@ const isHeaderPreview = computed(() =>
 /** 富文本预览由 OfficePreview 自带 loading，避免与 v-loading 双层转圈 */
 const showOverlayLoading = computed(() => loading.value && !isHeaderPreview.value)
 
+const getContainerEl = () => previewContainerRef.value
+
+const syncFullscreenState = () => {
+  const el = getContainerEl()
+  isFullscreen.value = !!el && document.fullscreenElement === el
+  document.body.style.overflow = isFullscreen.value ? 'hidden' : ''
+}
+
+const exitFullscreen = async () => {
+  try {
+    if (document.fullscreenElement === getContainerEl()) {
+      await document.exitFullscreen()
+    }
+  } catch {
+    // ignore
+  }
+  isFullscreen.value = false
+  document.body.style.overflow = ''
+}
+
+const toggleFullscreen = async () => {
+  const el = getContainerEl()
+  if (!el) return
+  try {
+    if (document.fullscreenElement === el) {
+      await document.exitFullscreen()
+    } else {
+      await el.requestFullscreen()
+    }
+  } catch {
+    isFullscreen.value = !isFullscreen.value
+    document.body.style.overflow = isFullscreen.value ? 'hidden' : ''
+  }
+}
+
+const closePreview = async () => {
+  await exitFullscreen()
+  model.value = false
+}
+
 watch(
   [model, url],
   ([visible, fileUrl]) => {
@@ -100,11 +156,21 @@ watch(
     } else if (!visible) {
       loading.value = false
       previewScale.value = 1
+      void exitFullscreen()
     }
   },
   { immediate: true },
 )
 
+onMounted(() => {
+  document.addEventListener('fullscreenchange', syncFullscreenState)
+})
+
+onBeforeUnmount(() => {
+  document.removeEventListener('fullscreenchange', syncFullscreenState)
+  void exitFullscreen()
+})
+
 const getFileType = () => resolveOfficeFileExt(undefined, title.value, url.value)
 
 const download = async () => {
@@ -143,6 +209,10 @@ const download = async () => {
   display: flex;
   align-items: center;
   justify-content: center;
+
+  &.is-preview-fullscreen {
+    background: transparent;
+  }
 }
 
 .file-view-toolbar {
@@ -163,5 +233,41 @@ const download = async () => {
     display: flex;
     flex-direction: column;
   }
+
+  &:fullscreen {
+    display: flex;
+    flex-direction: column;
+    width: 100% !important;
+    height: 100% !important;
+    border-radius: 0;
+    background: #f5f5f5 !important;
+  }
+
+  &.fullscreen-mode {
+    position: fixed !important;
+    inset: 0 !important;
+    z-index: 10000;
+    display: flex;
+    flex-direction: column;
+    width: 100vw !important;
+    height: 100vh !important;
+    border-radius: 0;
+    background: #f5f5f5 !important;
+  }
+
+  &:fullscreen,
+  &.fullscreen-mode {
+    :deep(.office-preview-root) {
+      flex: 1;
+      min-height: 0;
+      height: 100%;
+      background: #f5f5f5 !important;
+    }
+
+    :deep(.office-rich-wrap),
+    :deep(.pdf-js-viewer) {
+      background: #f5f5f5;
+    }
+  }
 }
 </style>

package/src/components/upload/OfficePreview.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="office-preview-root" :class="{ 'is-rich-preview': isRichPreview }">
+  <div class="office-preview-root" :class="{ 'is-rich-preview': isRichPreview, 'is-fullscreen': fullscreen }">
     <template v-if="isRichPreview">
       <office-preview-header-bar
         v-if="showHeader"
@@ -386,6 +386,19 @@ defineExpose({
     flex-direction: column;
     overflow: hidden;
   }
+
+  &.is-fullscreen {
+    height: 100%;
+    background: #f5f5f5 !important;
+
+    &.is-rich-preview {
+      .office-rich-wrap {
+        flex: 1;
+        min-height: 0;
+        background: #f5f5f5;
+      }
+    }
+  }
 }
 
 .office-rich-viewer {

package/src/components/upload/PdfJsViewer.vue

@@ -104,7 +104,7 @@ const showPlaceholder = computed(
 const placeholderText = computed(() => {
   if (isPending.value) return '等待预览区域就绪…'
   if (totalPages.value > 0) return '正在渲染页面…'
-  return '正在解析 PDF 文档…'
+  return '正在解析文档…'
 })
 
 const setPageRef = (pageNum: number, el: HTMLElement | null) => {

package/src/config/VxeTableConfig.ts

@@ -7,11 +7,9 @@ import {
 import VxeUIPluginRenderElement from '@vxe-ui/plugin-render-element'
 import '@vxe-ui/plugin-render-element/dist/style.css'
 import VxeUIPluginExportXLSX from '@vxe-ui/plugin-export-xlsx'
-import ExcelJS from 'exceljs'
 import 'vxe-pc-ui/lib/style.css'
 import '../css/vxeTableUI/all.scss'
 import VxeUIPluginExportPDF from '@vxe-ui/plugin-export-pdf'
-import { jsPDF } from 'jspdf'
 // 导入默认的语言
 import zhCN from 'vxe-table/lib/locale/lang/zh-CN'
 
@@ -29,8 +27,16 @@ export function initVxeTableInPage(
   VxeUI.component(VxeTooltip)
   // 局部注册插件
   enableElementPlus && VxeUI.use(VxeUIPluginRenderElement)
-  enableExcel && VxeUI.use(VxeUIPluginExportXLSX, { ExcelJS })
-  enablePdf && VxeUI.use(VxeUIPluginExportPDF, { jsPDF })
+  if (enableExcel) {
+    void import('exceljs').then(({ default: ExcelJS }) => {
+      VxeUI.use(VxeUIPluginExportXLSX, { ExcelJS })
+    })
+  }
+  if (enablePdf) {
+    void import('jspdf').then(({ jsPDF }) => {
+      VxeUI.use(VxeUIPluginExportPDF, { jsPDF })
+    })
+  }
 
   // 设置表格配置（可复制你在 VxeTableConfig.ts 中的配置）
   VxeUI.setConfig({

package/src/css/vxeTableUI/components/table.scss

@@ -51,11 +51,20 @@
 .vxe-table--body-wrapper,
 .vxe-table--footer-wrapper,
 .vxe-table--fixed-left-body-wrapper,
-.vxe-table--fixed-right-body-wrapper {
+.vxe-table--fixed-right-body-wrapper,
+.vxe-table--fixed-left-wrapper,
+.vxe-table--fixed-right-wrapper {
   overflow: hidden;
   outline: 0;
   scrollbar-width: none;
+  -ms-overflow-style: none;
   -webkit-overflow-scrolling: touch;
+
+  &::-webkit-scrollbar {
+    display: none;
+    width: 0;
+    height: 0;
+  }
 }
 .vxe-table--header-inner-wrapper,
 .vxe-table--body-inner-wrapper,
@@ -66,8 +75,11 @@
   scrollbar-width: none;
   -ms-overflow-style: none;
   -webkit-overflow-scrolling: touch;
+
   &::-webkit-scrollbar {
     display: none;
+    width: 0;
+    height: 0;
   }
 }
 .vxe-table--header-inner-wrapper,
@@ -80,7 +92,7 @@
   overflow-x: scroll;
 }
 
-/* vxe 表格：hover 时显示现代圆角滚动条 */
+/* vxe 表格：hover 时仅在手柄上显示现代圆角滚动条（全局 index.less 已排除表格内部） */
 .vxe-table--scroll-x-handle,
 .vxe-table--scroll-y-handle {
   @include classic.adtec-scrollbar-hidden;

package/vite/umoCjsVirtual.ts

@@ -6,6 +6,12 @@ import { transformWithEsbuild } from 'vite'
 import type { Plugin } from 'vite'
 import { getProjectRoot } from './projectRoot'
 
+const UMO_CJS_ENTRY_OVERRIDES: Record<string, string> = {
+  /** browser 字段会落到 min.js（无 ESM default）；用完整 UMD 构建再转 ESM */
+  jszip: 'dist/jszip.js',
+  exceljs: 'dist/exceljs.js',
+}
+
 const UMO_CJS_SPECS = [
   'dom-to-image-more',
   'hotkeys-js',
@@ -15,6 +21,8 @@ const UMO_CJS_SPECS = [
   'smooth-signature',
   'pure-svg-code',
   'nzh/cn',
+  'jszip',
+  'exceljs',
 ] as const
 
 const UMO_CJS_NAMED_EXPORTS: Record<string, string[]> = {
@@ -37,8 +45,15 @@ function resolvePackageMain(pkgDir: string): string | null {
     module?: string
   }
   const main = pkgJson.module || pkgJson.main || 'index.js'
-  const entry = path.join(pkgDir, main)
-  return fs.existsSync(entry) ? entry : null
+  const candidates = [
+    path.join(pkgDir, main),
+    path.join(pkgDir, `${main}.js`),
+    path.join(pkgDir, main, 'index.js'),
+  ]
+  for (const entry of candidates) {
+    if (fs.existsSync(entry) && fs.statSync(entry).isFile()) return entry
+  }
+  return null
 }
 
 function findUmoPackageDir(pkgName: string): string | null {
@@ -63,6 +78,13 @@ function findUmoPackageEntryForSpec(spec: string): string | null {
   if (!pkgDir) return null
 
   if (subParts.length === 0) {
+    const override = UMO_CJS_ENTRY_OVERRIDES[pkgName]
+    if (override) {
+      const overridePath = path.join(pkgDir, override)
+      if (fs.existsSync(overridePath) && fs.statSync(overridePath).isFile()) {
+        return overridePath
+      }
+    }
     return resolvePackageMain(pkgDir)
   }
 

package/vite/umoIntegration.js

@@ -433,6 +433,11 @@ import path4 from "node:path";
 import { createRequire as createRequire4 } from "node:module";
 import { pathToFileURL } from "node:url";
 import { transformWithEsbuild as transformWithEsbuild2 } from "vite";
+var UMO_CJS_ENTRY_OVERRIDES = {
+  /** browser 字段会落到 min.js（无 ESM default）；用完整 UMD 构建再转 ESM */
+  jszip: "dist/jszip.js",
+  exceljs: "dist/exceljs.js"
+};
 var UMO_CJS_SPECS = [
   "dom-to-image-more",
   "hotkeys-js",
@@ -441,7 +446,9 @@ var UMO_CJS_SPECS = [
   "pretty-bytes",
   "smooth-signature",
   "pure-svg-code",
-  "nzh/cn"
+  "nzh/cn",
+  "jszip",
+  "exceljs"
 ];
 var UMO_CJS_NAMED_EXPORTS = {
   "file-saver": ["saveAs"],
@@ -456,8 +463,15 @@ function resolvePackageMain(pkgDir) {
   if (!fs5.existsSync(pkgJsonPath)) return null;
   const pkgJson = JSON.parse(fs5.readFileSync(pkgJsonPath, "utf-8"));
   const main = pkgJson.module || pkgJson.main || "index.js";
-  const entry = path4.join(pkgDir, main);
-  return fs5.existsSync(entry) ? entry : null;
+  const candidates = [
+    path4.join(pkgDir, main),
+    path4.join(pkgDir, `${main}.js`),
+    path4.join(pkgDir, main, "index.js")
+  ];
+  for (const entry of candidates) {
+    if (fs5.existsSync(entry) && fs5.statSync(entry).isFile()) return entry;
+  }
+  return null;
 }
 function findUmoPackageDir(pkgName) {
   const projectRoot2 = getProjectRoot();
@@ -476,6 +490,13 @@ function findUmoPackageEntryForSpec(spec) {
   const pkgDir = findUmoPackageDir(pkgName);
   if (!pkgDir) return null;
   if (subParts.length === 0) {
+    const override = UMO_CJS_ENTRY_OVERRIDES[pkgName];
+    if (override) {
+      const overridePath = path4.join(pkgDir, override);
+      if (fs5.existsSync(overridePath) && fs5.statSync(overridePath).isFile()) {
+        return overridePath;
+      }
+    }
     return resolvePackageMain(pkgDir);
   }
   const sub = subParts.join("/");
@@ -620,12 +641,28 @@ function yjsPeerResolve() {
 }
 
 // vite/umoIntegration.ts
+function docxPreviewViteFix() {
+  return {
+    name: "core-docx-preview-vite",
+    config() {
+      return {
+        optimizeDeps: {
+          exclude: ["docx-preview", "jszip", "exceljs"]
+        }
+      };
+    }
+  };
+}
+function coreOfficePreviewVitePlugins() {
+  return [createProjectRootPlugin(), umoCjsVirtual(), docxPreviewViteFix()];
+}
 function coreUmoVitePlugins() {
   return [
     createProjectRootPlugin(),
     tiptapVueRendererFix(),
     highlightJsLibVirtual(),
     umoCjsVirtual(),
+    docxPreviewViteFix(),
     tiptapUmoResolve(),
     yjsPeerResolve()
   ];
@@ -653,6 +690,7 @@ function coreUmoManualChunk(id) {
   return void 0;
 }
 export {
+  coreOfficePreviewVitePlugins,
   coreUmoManualChunk,
   coreUmoResolveConfig,
   coreUmoVitePlugins,

package/vite/umoIntegration.ts

@@ -6,6 +6,31 @@ import { tiptapVueRendererFix } from './tiptapVueRendererFix'
 import { umoCjsVirtual } from './umoCjsVirtual'
 import { buildYjsPeerAliases, yjsPeerResolve } from './yjsPeerResolve'
 
+/**
+ * docx-preview / exceljs 等 CJS 包在 Vite 浏览器解析会落到 *.min.js（无 default 导出）。
+ * 排除预构建，让 umoCjsVirtual 在 resolve 阶段接管。
+ */
+function docxPreviewViteFix(): Plugin {
+  return {
+    name: 'core-docx-preview-vite',
+    config() {
+      return {
+        optimizeDeps: {
+          exclude: ['docx-preview', 'jszip', 'exceljs'],
+        },
+      }
+    },
+  }
+}
+
+/**
+ * 核心包 CJS 兼容（附件预览 docx-preview/jszip、表格导出 exceljs 等）在宿主 Vite 中的插件。
+ * 前端系统框架等未接入完整 Umo 插件链的宿主也应引入。
+ */
+export function coreOfficePreviewVitePlugins(): Plugin[] {
+  return [createProjectRootPlugin(), umoCjsVirtual(), docxPreviewViteFix()]
+}
+
 /**
  * Umo 富文本（editor-main 源码）在宿主 Vite 中所需的全部构建插件。
  * 必须放在 vue() 之前，且需配合 coreUmoResolveConfig()。
@@ -16,6 +41,7 @@ export function coreUmoVitePlugins(): Plugin[] {
     tiptapVueRendererFix(),
     highlightJsLibVirtual(),
     umoCjsVirtual(),
+    docxPreviewViteFix(),
     tiptapUmoResolve(),
     yjsPeerResolve(),
   ]