From b64a0deae5b5d33f9e20671a68936b27f0b9b00b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 21 七月 2026 18:03:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/bpm/processInstance/detail/modules/operation-button.vue | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/views/bpm/processInstance/detail/modules/operation-button.vue b/src/views/bpm/processInstance/detail/modules/operation-button.vue
index c6948a1..248bc1d 100644
--- a/src/views/bpm/processInstance/detail/modules/operation-button.vue
+++ b/src/views/bpm/processInstance/detail/modules/operation-button.vue
@@ -9,7 +9,7 @@
import { computed, nextTick, reactive, ref, watch } from 'vue';
import { useRouter } from 'vue-router';
-import { useVbenModal } from '..\..\..\..\..\packages\effects\common-ui\src';
+import { useVbenModal } from '@vben/common-ui';
import {
BpmCandidateStrategyEnum,
BpmModelFormType,
@@ -18,10 +18,12 @@
BpmTaskOperationButtonTypeEnum,
BpmTaskStatusEnum,
OPERATION_BUTTON_NAME,
-} from '..\..\..\..\..\packages\constants\src';
-import { IconifyIcon } from '..\..\..\..\..\packages\icons\src';
-import { useUserStore } from '..\..\..\..\..\packages\stores\src';
-import { isEmpty } from '..\..\..\..\..\packages\utils\src';
+} from '@vben/constants';
+import { IconifyIcon } from '@vben/icons';
+import { useUserStore } from '@vben/stores';
+import { isEmpty } from '@vben/utils';
+
+import { FilePreviewModal, useFilePreview } from '#/components/file-preview';
import FormCreate from '@form-create/ant-design-vue';
import { until, useDebounceFn } from '@vueuse/core';
@@ -789,6 +791,8 @@
const imagePreviewVisible = ref(false);
const imagePreviewUrl = ref('');
+const { openPreview: openFilePreview, previewState: filePreviewState } = useFilePreview();
+
/** 鍒ゆ柇鏂囦欢鏄惁涓哄浘鐗囩被鍨� */
function isImageUrl(url: string) {
return /\.(jpg|jpeg|png|gif|bmp|webp|svg)$/i.test(
@@ -811,7 +815,7 @@
imagePreviewUrl.value = url;
imagePreviewVisible.value = true;
} else {
- window.open(url, '_blank');
+ openFilePreview(url, file?.name);
}
}
@@ -1552,4 +1556,11 @@
:src="imagePreviewUrl"
/>
</div>
+
+ <!-- 鏂囦欢棰勮锛圥DF/Word/Excel/PPT锛� -->
+ <FilePreviewModal
+ v-model:visible="filePreviewState.visible.value"
+ :file-url="filePreviewState.fileUrl.value"
+ :file-name="filePreviewState.fileName.value"
+ />
</template>
--
Gitblit v1.9.3