adtec-core-package 3.3.1 → 3.3.2

package/package.json

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

package/src/components/autoToolTip/ElAutoToolTip.vue

@@ -8,6 +8,7 @@
     :content="props.tooltipContent ? props.tooltipContent : props.content"
     placement="top"
     :disabled="isShow"
+    :popper-options="{ strategy: 'fixed' }"
   >
     <template #content>
       <!-- 此处的默认值先看tooltipContent有没有，没有就给默认content -->

package/src/components/upload/OfficePreview.vue

@@ -4,18 +4,19 @@
       <office-preview-header-bar
         v-if="showHeader"
         :title="headerTitle"
+        :title-only="previewLoadFailed"
         :zoom="scale"
         :current-page="previewCurrentPage"
         :total-pages="previewTotalPages"
         :search-query="searchQuery"
         :search-index="searchMatchIndex"
         :search-total="searchMatchTotal"
-        :show-search="showSearch"
-        :show-page-nav="showPageNav && officeType !== 'excel'"
-        :show-zoom="showZoom"
-        :show-download="showDownload"
-        :show-refresh="showRefresh"
-        :show-fullscreen="showFullscreen"
+        :show-search="showHeaderSearch"
+        :show-page-nav="showHeaderPageNav"
+        :show-zoom="showHeaderZoom"
+        :show-download="showHeaderDownload"
+        :show-refresh="showHeaderRefresh"
+        :show-fullscreen="showHeaderFullscreen"
         :show-close="showClose"
         :fullscreen="fullscreen"
         :download-loading="downloadLoading"
@@ -79,6 +80,9 @@
             <p v-if="headerTitle" class="loading-sub">{{ headerTitle }}</p>
           </div>
         </div>
+        <div v-else-if="previewLoadFailed" class="office-rich-lost">
+          <el-empty :description="lostDescription" />
+        </div>
         <div v-else-if="isPreviewLoading && !fileSrc" class="office-rich-loading">
           <div class="loading-card">
             <span class="loading-spinner" />
@@ -137,6 +141,10 @@ const props = withDefaults(
     fullscreen?: boolean
     downloadLoading?: boolean
     refreshLoading?: boolean
+    /** 库里有附件记录但物理文件无法加载时的提示 */
+    lostDescription?: string
+    /** 父组件已判定附件丢失（如无下载地址）时直接展示丢失态 */
+    attachmentLost?: boolean
   }>(),
   {
     showHeader: true,
@@ -150,6 +158,8 @@ const props = withDefaults(
     fullscreen: false,
     downloadLoading: false,
     refreshLoading: false,
+    lostDescription: '附件已丢失',
+    attachmentLost: false,
   },
 )
 
@@ -176,6 +186,7 @@ const searchQuery = ref('')
 const searchMatchIndex = ref(-1)
 const searchMatchTotal = ref(0)
 const isPreviewLoading = ref(false)
+const previewLoadFailed = ref(false)
 const loadingPhase = ref<'fetch' | 'open'>('fetch')
 
 type RichViewer = {
@@ -201,11 +212,21 @@ const isLegacyDoc = computed(() =>
 
 const isRichPreview = computed(
   () =>
+    props.attachmentLost ||
     officeType.value === 'pdf' ||
     officeType.value === 'excel' ||
     officeType.value === 'docx',
 )
 
+const showHeaderSearch = computed(() => props.showSearch && !previewLoadFailed.value)
+const showHeaderPageNav = computed(
+  () => props.showPageNav && !previewLoadFailed.value && officeType.value !== 'excel',
+)
+const showHeaderZoom = computed(() => props.showZoom && !previewLoadFailed.value)
+const showHeaderDownload = computed(() => props.showDownload && !previewLoadFailed.value)
+const showHeaderRefresh = computed(() => props.showRefresh && !previewLoadFailed.value)
+const showHeaderFullscreen = computed(() => props.showFullscreen && !previewLoadFailed.value)
+
 const isUnsupportedType = computed(
   () => !!officeType.value && !isSupportedPreviewType(officeType.value),
 )
@@ -235,13 +256,25 @@ const resetPreview = () => {
   searchMatchIndex.value = -1
   searchMatchTotal.value = 0
   isPreviewLoading.value = false
+  previewLoadFailed.value = false
   loadingPhase.value = 'fetch'
   pdfViewerRef.value?.clearSearch()
   excelViewerRef.value?.clearSearch()
   docxViewerRef.value?.clearSearch()
 }
 
+const markPreviewLost = (err?: unknown) => {
+  isPreviewLoading.value = false
+  previewLoadFailed.value = true
+  fileSrc.value = undefined
+  emit('error', err)
+}
+
 const loadPreview = async () => {
+  if (props.attachmentLost) {
+    markPreviewLost()
+    return
+  }
   if (!props.url || !officeType.value) {
     return
   }
@@ -262,6 +295,10 @@ const loadPreview = async () => {
       }
       loadingPhase.value = 'open'
       const pdfBlob = await documentApi.previewWordAsPdf(props.fileId)
+      if (!pdfBlob || pdfBlob.size === 0) {
+        markPreviewLost()
+        return
+      }
       previewAsPdf.value = true
       fileSrc.value = pdfBlob
       return
@@ -273,16 +310,22 @@ const loadPreview = async () => {
     })
     if (officeType.value === 'txt') {
       txtContent.value = await res.data.text()
+      if (!txtContent.value.trim()) {
+        markPreviewLost()
+        return
+      }
       isPreviewLoading.value = false
       emit('loaded')
     } else {
       loadingPhase.value = 'open'
+      if (!res.data || res.data.size === 0) {
+        markPreviewLost()
+        return
+      }
       fileSrc.value = res.data
     }
   } catch (err) {
-    isPreviewLoading.value = false
-    frameworkUtils.messageError(err)
-    emit('error', err)
+    markPreviewLost(err)
   }
 }
 
@@ -294,8 +337,7 @@ const handleRendered = async () => {
 }
 
 const handleError = (err?: unknown) => {
-  isPreviewLoading.value = false
-  emit('error', err)
+  markPreviewLost(err)
 }
 
 const zoomIn = () => {
@@ -357,9 +399,13 @@ const goNextSearchMatch = async () => {
 }
 
 watch(
-  () => [props.url, props.fileName, props.fileType] as const,
-  ([fileUrl]) => {
+  () => [props.url, props.fileName, props.fileType, props.attachmentLost] as const,
+  ([fileUrl, , , attachmentLost]) => {
     resetPreview()
+    if (attachmentLost) {
+      markPreviewLost()
+      return
+    }
     if (fileUrl) {
       loadPreview()
     }
@@ -395,6 +441,9 @@ defineExpose({
     display: flex;
     flex-direction: column;
     overflow: hidden;
+    padding-bottom: 8px;
+    box-sizing: border-box;
+    background: #fff;
   }
 
   &.is-fullscreen {
@@ -402,6 +451,9 @@ defineExpose({
     background: #f5f5f5 !important;
 
     &.is-rich-preview {
+      padding-bottom: 0;
+      background: #f5f5f5 !important;
+
       .office-rich-wrap {
         flex: 1;
         min-height: 0;
@@ -434,6 +486,16 @@ defineExpose({
   flex-direction: column;
 }
 
+.office-rich-lost {
+  position: absolute;
+  inset: 0;
+  z-index: 3;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: #fff;
+}
+
 .office-rich-loading {
   position: absolute;
   inset: 0;

package/src/components/upload/OfficePreviewHeaderBar.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="office-preview-header">
+  <div class="office-preview-header" :class="{ 'is-title-only': titleOnly }">
     <div v-if="title" class="header-title" :title="title">{{ title }}</div>
 
     <div v-if="showSearch" class="header-search">
@@ -138,6 +138,7 @@ import { MAX_PDF_ZOOM, MIN_OFFICE_ZOOM } from '../../utils/officePreviewUtil.ts'
 const props = withDefaults(
   defineProps<{
     title?: string
+    titleOnly?: boolean
     zoom?: number
     currentPage?: number
     totalPages?: number
@@ -159,6 +160,7 @@ const props = withDefaults(
   }>(),
   {
     title: '',
+    titleOnly: false,
     zoom: 1,
     currentPage: 1,
     totalPages: 0,
@@ -234,6 +236,11 @@ const emitSearch = () => {
   flex-shrink: 0;
 }
 
+.is-title-only .header-title {
+  max-width: none;
+  flex: 1;
+}
+
 .header-search {
   display: flex;
   align-items: center;

package/src/config/ElementPlusConfig.ts

@@ -21,7 +21,10 @@ import elementPlus, {
   ElCascader,
   ElTable,
   ElTooltip,
+  ElPopover,
+  ElDropdown,
 } from 'element-plus'
+import { patchWujiePopperCoordinates } from '../utils/patchWujiePopperCoordinates'
 
 /**
  * vxe 单元格编辑时，Element 下拉/日期面板默认 teleport 到 body。
@@ -85,7 +88,7 @@ ElSelect.props.fitInputWidth = {
 const isWujieSubApp =
   typeof window !== 'undefined' && !!(window as Window & { __POWERED_BY_WUJIE__?: boolean }).__POWERED_BY_WUJIE__
 /**
- * 无界 iframe 内 Popper 坐标修正。
+ * 无界 iframe 内 Popper 坐标修正（与下拉框数据页同类问题）。
  * ElSelect / ElDatePicker 等须保持 teleported 默认 true（vxe 单元格挂 body + popperClass 防 clearEdit），
  * 仅通过 strategy/modifiers 修正偏移，避免各子应用逐页 v-bind。
  */
@@ -99,10 +102,15 @@ const wujiePopperOptions = {
   ],
 }
 if (isWujieSubApp) {
-  ElSelect.props.popperOptions = { type: Object, default: () => wujiePopperOptions }
-  ElDatePicker.props.popperOptions = { type: Object, default: () => wujiePopperOptions }
-  ElTreeSelect.props.popperOptions = { type: Object, default: () => wujiePopperOptions }
-  ElCascader.props.popperOptions = { type: Object, default: () => wujiePopperOptions }
+  patchWujiePopperCoordinates()
+  const wujiePopperProps = { type: Object, default: () => wujiePopperOptions }
+  ElSelect.props.popperOptions = wujiePopperProps
+  ElDatePicker.props.popperOptions = wujiePopperProps
+  ElTreeSelect.props.popperOptions = wujiePopperProps
+  ElCascader.props.popperOptions = wujiePopperProps
+  ElTooltip.props.popperOptions = wujiePopperProps
+  ElPopover.props.popperOptions = wujiePopperProps
+  ElDropdown.props.popperOptions = wujiePopperProps
 }
 ElSelect.props.popperClass = {
   type: String,

package/src/config/VxeTableConfig.ts

@@ -17,6 +17,7 @@ import { VxeUIPluginExportPDF } from '@vxe-ui/plugin-export-pdf'
 import { jsPDF } from 'jspdf'
 // 导入默认的语言（使用 es 构建，避免 lib CJS 在 Vite 下无 default 导出）
 import zhCN from 'vxe-table/es/locale/lang/zh-CN'
+import { patchWujiePopperCoordinates } from '../utils/patchWujiePopperCoordinates'
 
 /**
  * 导出插件（Excel/PDF）全局注册一次。
@@ -32,7 +33,9 @@ function registerVxeExportPlugins() {
   VxeUI.use(VxeUIPluginExportXLSX, { ExcelJS })
   VxeUI.use(VxeUIPluginExportPDF, { jsPDF })
 }
-// 模块加载即注册，确保任何 grid 创建前 xlsx/pdf 类型已可用
+import { patchWujiePopperCoordinates } from '../utils/patchWujiePopperCoordinates'
+
+// 模块加载即注册导出插件；无界坐标补丁亦在 patch 模块内执行
 registerVxeExportPlugins()
 
 /**
@@ -43,6 +46,7 @@ export function initVxeTableInPage(
   enablePdf: boolean = false,
   enableElementPlus: boolean = true,
 ) {
+  patchWujiePopperCoordinates(true)
   // 设置语言
   VxeUI.setI18n('zh-CN', zhCN)
   VxeUI.setLanguage('zh-CN')

package/src/utils/patchWujiePopperCoordinates.ts

@@ -0,0 +1,91 @@
+/**
+ * 无界 DocElementRectPlugin 将子应用 document.documentElement 的
+ * scrollTop/scrollLeft/clientWidth/clientHeight 代理到主应用窗口。
+ *
+ * vxe-table overflow tooltip 用 getAbsolutePos：top = document.scrollTop + cell.getBoundingClientRect().top
+ * 混用主应用 scroll 与 iframe 内坐标 → 浮层整体下移（常见 1～3 行高度）。
+ *
+ * Element Plus Popper → ElementPlusConfig 使用 strategy:fixed。
+ * vxe tooltip → 本补丁：document 级滚动归零 + tooltip 改为 position:fixed。
+ */
+const STYLE_ID = 'adtec-wujie-popper-fix-style'
+const HTML_CLASS = 'adtec-wujie-subapp'
+
+let patched = false
+
+const IFRAME_DOC_PROPS = [
+  'scrollTop',
+  'scrollLeft',
+  'clientHeight',
+  'clientWidth',
+] as const
+
+function isWujieSubApp() {
+  return (
+    typeof window !== 'undefined' &&
+    !!(window as Window & { __POWERED_BY_WUJIE__?: boolean }).__POWERED_BY_WUJIE__
+  )
+}
+
+function injectWujiePopperStyles() {
+  if (typeof document === 'undefined' || document.getElementById(STYLE_ID)) {
+    return
+  }
+  const style = document.createElement('style')
+  style.id = STYLE_ID
+  style.textContent = `
+html.${HTML_CLASS} .vxe-tooltip--wrapper,
+html.${HTML_CLASS} .vxe-table--tooltip-wrapper {
+  position: fixed !important;
+  z-index: 9999;
+}
+`
+  document.head.appendChild(style)
+}
+
+function restoreIframeDocumentMetrics(docEl: HTMLElement, body: HTMLElement) {
+  IFRAME_DOC_PROPS.forEach((key) => {
+    Object.defineProperty(docEl, key, {
+      configurable: true,
+      enumerable: true,
+      get() {
+        if (key === 'clientWidth') {
+          return window.innerWidth
+        }
+        if (key === 'clientHeight') {
+          return window.innerHeight
+        }
+        // 子应用页面滚动在表格/容器内，document 级滚动恒为 0
+        return 0
+      },
+      set(val: number) {
+        try {
+          ;(body as HTMLElement & Record<string, number>)[key] = val
+        } catch {
+          // ignore
+        }
+      },
+    })
+  })
+}
+
+/** 无界子应用内统一修正 Popper / vxe tooltip 坐标系 */
+export function patchWujiePopperCoordinates(force = false) {
+  if (typeof window === 'undefined') {
+    return
+  }
+  if (!isWujieSubApp()) {
+    return
+  }
+  if (patched && !force) {
+    return
+  }
+
+  document.documentElement.classList.add(HTML_CLASS)
+  injectWujiePopperStyles()
+  restoreIframeDocumentMetrics(document.documentElement, document.body)
+  patched = true
+}
+
+// 核心包被 import 时即尝试打补丁（覆盖未调用 initVxeTableInPage 的 vxe-grid 页面）
+patchWujiePopperCoordinates()