vome-core 0.0.48 → 0.0.49

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

@@ -70,21 +70,12 @@
         </div>
         <div class="vm-file-preview-viewer__actions">
           <button
-            v-if="useDownloadAction"
-            type="button"
-            class="vm-file-preview-viewer__link"
-            :disabled="downloading"
-            @click="downloadFile"
-          >
-            {{ downloading ? '下载中…' : '下载' }}
-          </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" />
@@ -170,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>
 
@@ -180,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>
@@ -259,6 +260,7 @@ 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('')
@@ -335,10 +337,7 @@ 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
@@ -364,10 +363,22 @@ async function downloadFile() {
   }
 }
 
-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/index.js

@@ -27856,7 +27856,7 @@ init_excel();
 // package.json
 var package_default = {
   name: "vome-core",
-  version: "0.0.48",
+  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.48",
+  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.48",
+  "version": "0.0.49",
   "description": "Vome framework — shared + Bun/Elysia server + Vue admin",
   "license": "MIT",
   "type": "module",