vome-core 0.0.47 → 0.0.49

package/dist/admin/crud/components/vm-preview-viewer.vue

@@ -70,20 +70,12 @@
         </div>
         <div class="vm-file-preview-viewer__actions">
           <button
-            v-if="useDownloadAction"
-            type="button"
-            class="vm-file-preview-viewer__link"
-            @click="downloadFile"
-          >
-            下载
-          </button>
-          <button
-            v-else
             type="button"
             class="vm-file-preview-viewer__link"
+            :disabled="opening"
             @click="openInNewWindow"
           >
-            新窗口打开
+            {{ opening ? '打开中…' : '新窗口打开' }}
           </button>
           <button type="button" class="vm-file-preview-viewer__close" title="关闭" @click="closeViewer">
             <i class="ri-close-line" />
@@ -169,9 +161,14 @@
         <div v-else-if="kind === 'office'" class="vm-file-preview-viewer__fallback">
           <i class="ri-file-3-line" aria-hidden="true" />
           <p>Word / PPT 等 Office 文档暂不支持浏览器内预览。</p>
-          <p>请点击上方「下载」后使用本地 Office / WPS 查看。</p>
-          <button type="button" class="vm-file-preview-viewer__dl-btn" @click="downloadFile">
-            下载文件
+          <p>请点击下方按钮下载后使用本地 Office / WPS 查看。</p>
+          <button
+            type="button"
+            class="vm-file-preview-viewer__dl-btn"
+            :disabled="downloading"
+            @click="downloadFile"
+          >
+            {{ downloading ? '下载中…' : '下载文件' }}
           </button>
         </div>
 
@@ -179,8 +176,13 @@
           <i class="ri-file-3-line" aria-hidden="true" />
           <p>该文件类型暂不支持在线预览。</p>
           <p>请点击下方按钮下载查看（如 .vome 插件包）。</p>
-          <button type="button" class="vm-file-preview-viewer__dl-btn" @click="downloadFile">
-            下载文件
+          <button
+            type="button"
+            class="vm-file-preview-viewer__dl-btn"
+            :disabled="downloading"
+            @click="downloadFile"
+          >
+            {{ downloading ? '下载中…' : '下载文件' }}
           </button>
         </div>
       </div>
@@ -238,6 +240,8 @@ const props = withDefaults(
     radius?: number | string
     preview?: boolean
     fit?: 'cover' | 'contain'
+    /** 私有文件：点「下载」时先解析可访问短链 */
+    resolveDownloadUrl?: (url: string) => Promise<string | undefined>
   }>(),
   {
     embedded: false,
@@ -255,6 +259,8 @@ const emit = defineEmits<{ 'update:open': [v: boolean] }>()
 
 const internalOpen = ref(false)
 const loading = ref(false)
+const downloading = ref(false)
+const opening = ref(false)
 const error = ref('')
 const textContent = ref('')
 const excelHtml = ref('')
@@ -331,27 +337,48 @@ const displayName = computed(() =>
   fileDisplayName(props.fileName || src.value, '未命名文件'),
 )
 
-/** 无法内嵌预览的类型：只提供下载，避免「新窗口打开」崩掉（如 .vome） */
-const useDownloadAction = computed(
-  () => kind.value === 'unsupported' || kind.value === 'office',
-)
+/** 无法内嵌预览的类型在正文区提供「下载文件」；顶栏统一「新窗口打开」 */
+
+async function downloadFile() {
+  if (downloading.value) return
+  const raw = src.value
+  if (!raw) return
+  downloading.value = true
+  try {
+    let url = raw
+    if (props.resolveDownloadUrl) {
+      const signed = await props.resolveDownloadUrl(raw)
+      if (!signed) return
+      url = signed
+    }
+    const a = document.createElement('a')
+    a.href = url
+    a.download = displayName.value || 'download'
+    a.rel = 'noopener'
+    document.body.appendChild(a)
+    a.click()
+    a.remove()
+  } finally {
+    downloading.value = false
+  }
+}
 
-function downloadFile() {
-  const url = src.value
-  if (!url) return
-  const a = document.createElement('a')
-  a.href = url
-  a.download = displayName.value || 'download'
-  a.rel = 'noopener'
-  document.body.appendChild(a)
-  a.click()
-  a.remove()
-}
-
-function openInNewWindow() {
-  const url = src.value
-  if (!url) return
-  window.open(url, '_blank', 'noopener,noreferrer')
+async function openInNewWindow() {
+  if (opening.value) return
+  const raw = src.value
+  if (!raw) return
+  opening.value = true
+  try {
+    let url = raw
+    if (props.resolveDownloadUrl) {
+      const signed = await props.resolveDownloadUrl(raw)
+      if (!signed) return
+      url = signed
+    }
+    window.open(url, '_blank', 'noopener,noreferrer')
+  } finally {
+    opening.value = false
+  }
 }
 
 const viewerOpen = computed({

package/dist/admin/crud/components/vm-upload-item.vue

@@ -58,32 +58,24 @@
 
     <div v-if="previewSrc" class="vm-upload-item__actions">
       <button
-        v-if="canInlinePreview"
         type="button"
         title="预览"
         @click.stop="previewOpen = true"
       >
         <i class="ri-zoom-in-line" />
       </button>
-      <button
-        v-else
-        type="button"
-        title="下载"
-        @click.stop="downloadFile"
-      >
-        <i class="ri-download-2-line" />
-      </button>
       <button v-if="!disabled" type="button" title="删除" @click.stop="emit('remove')">
         <i class="ri-delete-bin-line" />
       </button>
     </div>
 
     <vm-preview-viewer
-      v-if="canInlinePreview"
+      v-if="previewSrc"
       embedded
       v-model:open="previewOpen"
       :src="previewSrc"
       :file-name="item.name || item.url"
+      :resolve-download-url="resolveDownloadUrl"
     />
   </div>
 </template>
@@ -91,7 +83,6 @@
 <script setup lang="ts">
 import { ref, computed, watch } from 'vue'
 import { useVideoFrame } from '../../lib/video-frame'
-import { getMediaPreviewKind } from '../../lib/file-preview'
 import { extname, getUploadRule } from '../../lib/upload'
 import VmPreviewViewer from './vm-preview-viewer.vue'
 import type { UploadItem } from '../../../../typings/admin/comm/upload'
@@ -103,6 +94,8 @@ const props = withDefaults(
     item: UploadItem
     disabled?: boolean
     showTag?: boolean
+    /** 私有文件：预览内点「下载」时先解析可访问短链 */
+    resolveDownloadUrl?: (url: string) => Promise<string | undefined>
   }>(),
   {
     disabled: false,
@@ -117,38 +110,6 @@ const imgBroken = ref(false)
 
 const previewSrc = computed(() => props.item.preload || props.item.url || '')
 
-const INLINE_KINDS = new Set([
-  'image',
-  'video',
-  'audio',
-  'pdf',
-  'excel',
-  'text',
-])
-
-/** 可内嵌预览才开浮层；.vome 等直接下载，避免新窗口崩溃 */
-const canInlinePreview = computed(() => {
-  const name = props.item.name || props.item.url || ''
-  const kind = getMediaPreviewKind(name)
-  return INLINE_KINDS.has(kind)
-})
-
-function downloadFile() {
-  const url = previewSrc.value
-  if (!url) return
-  const base =
-    props.item.name ||
-    String(url).split('?')[0]?.split('/').pop() ||
-    'download'
-  const a = document.createElement('a')
-  a.href = url
-  a.download = base
-  a.rel = 'noopener'
-  document.body.appendChild(a)
-  a.click()
-  a.remove()
-}
-
 /** 仅上传中显示；失败后隐藏，避免挡住预览/删除 */
 const showProgress = computed(() => {
   if (props.item.error) return false

package/dist/admin/crud/components/vm-upload.vue

@@ -38,6 +38,7 @@
           :item="item"
           :disabled="disabled"
           :show-tag="showTag"
+          :resolve-download-url="resolveDownloadUrl"
           @remove="remove(index)"
         />
       </div>
@@ -96,6 +97,8 @@ const props = withDefaults(
     drag?: boolean
     prefixPath?: string
     beforeUpload?: (file: File) => boolean | Promise<boolean>
+    /** 私有文件：预览内点「下载」时先解析可访问短链 */
+    resolveDownloadUrl?: (url: string) => Promise<string | undefined>
   }>(),
   {
     modelValue: '',

package/dist/index.js

@@ -27856,7 +27856,7 @@ init_excel();
 // package.json
 var package_default = {
   name: "vome-core",
-  version: "0.0.47",
+  version: "0.0.49",
   description: "Vome framework \u2014 shared + Bun/Elysia server + Vue admin",
   license: "MIT",
   type: "module",

package/dist/server/index.js

@@ -31168,7 +31168,7 @@ init_excel();
 // package.json
 var package_default = {
   name: "vome-core",
-  version: "0.0.47",
+  version: "0.0.49",
   description: "Vome framework \u2014 shared + Bun/Elysia server + Vue admin",
   license: "MIT",
   type: "module",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vome-core",
-  "version": "0.0.47",
+  "version": "0.0.49",
   "description": "Vome framework — shared + Bun/Elysia server + Vue admin",
   "license": "MIT",
   "type": "module",