From 5e440a7dc434c43eb828fa62cf9c12b0078b8565 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 一月 2025 11:36:18 +0800
Subject: [PATCH] !173 发布 5.3.0-BETA 公测版本 Merge pull request !173 from 疯狂的狮子Li/dev
---
src/components/Process/approvalRecord.vue | 224 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 194 insertions(+), 30 deletions(-)
diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index bb4ed91..5c46a58 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -2,39 +2,63 @@
<div class="container">
<el-dialog v-model="visible" draggable title="瀹℃壒璁板綍" :width="props.width" :height="props.height" :close-on-click-modal="false">
<el-tabs v-model="tabActiveName" class="demo-tabs">
- <el-tab-pane label="娴佺▼鍥�" name="bpmn">
- <BpmnView ref="bpmnViewRef"></BpmnView>
+ <el-tab-pane v-loading="loading" label="娴佺▼鍥�" name="image" style="height: 68vh">
+ <div
+ ref="imageWrapperRef"
+ class="image-wrapper"
+ @wheel="handleMouseWheel"
+ @mousedown="handleMouseDown"
+ @mousemove="handleMouseMove"
+ @mouseup="handleMouseUp"
+ @mouseleave="handleMouseLeave"
+ @dblclick="resetTransform"
+ :style="transformStyle"
+ >
+ <el-card class="box-card">
+ <el-image :src="imgUrl" class="scalable-image" />
+ </el-card>
+ </div>
</el-tab-pane>
<el-tab-pane v-loading="loading" label="瀹℃壒淇℃伅" name="info">
<div>
<el-table :data="historyList" style="width: 100%" border fit>
<el-table-column type="index" label="搴忓彿" align="center" width="60"></el-table-column>
- <el-table-column prop="name" label="浠诲姟鍚嶇О" sortable align="center"></el-table-column>
- <el-table-column prop="nickName" :show-overflow-tooltip="true" label="鍔炵悊浜�" sortable align="center">
+ <el-table-column prop="nodeName" label="浠诲姟鍚嶇О" sortable align="center"></el-table-column>
+ <el-table-column prop="approveName" :show-overflow-tooltip="true" label="鍔炵悊浜�" sortable align="center">
<template #default="scope">
- <el-tag type="success">{{ scope.row.nickName || '鏃�' }}</el-tag>
+ <template v-if="scope.row.approveName">
+ <el-tag v-for="(item, index) in scope.row.approveName.split(',')" :key="index" type="success">{{ item }}</el-tag>
+ </template>
+ <template v-else> <el-tag type="success">鏃�</el-tag></template>
</template>
</el-table-column>
- <el-table-column label="鐘舵��" sortable align="center">
+ <el-table-column prop="flowStatus" label="鐘舵��" width="80" sortable align="center">
<template #default="scope">
- <el-tag type="success">{{ scope.row.statusName }}</el-tag>
+ <dict-tag :options="wf_task_status" :value="scope.row.flowStatus"></dict-tag>
</template>
</el-table-column>
- <el-table-column prop="comment" label="瀹℃壒鎰忚" sortable align="center"></el-table-column>
- <el-table-column prop="startTime" label="寮�濮嬫椂闂�" sortable align="center"></el-table-column>
- <el-table-column prop="endTime" label="缁撴潫鏃堕棿" sortable align="center"></el-table-column>
- <el-table-column prop="runDuration" label="杩愯鏃堕暱" sortable align="center"></el-table-column>
- <el-table-column prop="attachmentList" label="闄勪欢" sortable align="center">
+ <el-table-column prop="message" label="瀹℃壒鎰忚" :show-overflow-tooltip="true" sortable align="center"></el-table-column>
+ <el-table-column prop="createTime" label="寮�濮嬫椂闂�" width="160" :show-overflow-tooltip="true" sortable align="center"></el-table-column>
+ <el-table-column prop="updateTime" label="缁撴潫鏃堕棿" width="160" :show-overflow-tooltip="true" sortable align="center"></el-table-column>
+ <el-table-column
+ prop="runDuration"
+ label="杩愯鏃跺父"
+ width="140"
+ :show-overflow-tooltip="true"
+ sortable
+ align="center"
+ ></el-table-column>
+ <el-table-column prop="attachmentList" width="120" label="闄勪欢" align="center">
<template #default="scope">
<el-popover v-if="scope.row.attachmentList && scope.row.attachmentList.length > 0" placement="right" :width="310" trigger="click">
<template #reference>
- <el-button style="margin-right: 16px">闄勪欢</el-button>
+ <el-button type="primary" style="margin-right: 16px">闄勪欢</el-button>
</template>
<el-table border :data="scope.row.attachmentList">
- <el-table-column prop="name" width="202" :show-overflow-tooltip="true" label="闄勪欢鍚嶇О"></el-table-column>
+ <el-table-column prop="originalName" width="202" :show-overflow-tooltip="true" label="闄勪欢鍚嶇О"></el-table-column>
<el-table-column prop="name" width="80" align="center" :show-overflow-tooltip="true" label="鎿嶄綔">
<template #default="tool">
- <el-button type="text" @click="handleDownload(tool.row.contentId)">涓嬭浇</el-button>
+ <el-button type="text" @click="handleDownload(tool.row.ossId)">涓嬭浇</el-button>
</template>
</el-table-column>
</el-table>
@@ -49,42 +73,160 @@
</div>
</template>
<script lang="ts" setup>
-import BpmnView from '@/components/BpmnView/index.vue';
-import processApi from '@/api/workflow/processInstance';
+import { flowImage } from '@/api/workflow/instance';
import { propTypes } from '@/utils/propTypes';
+import { listByIds } from '@/api/system/oss';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
+const { wf_task_status } = toRefs<any>(proxy?.useDict('wf_task_status'));
const props = defineProps({
- width: propTypes.string.def('70%'),
+ width: propTypes.string.def('80%'),
height: propTypes.string.def('100%')
});
const loading = ref(false);
const visible = ref(false);
const historyList = ref<Array<any>>([]);
-const tabActiveName = ref('bpmn');
-
-const bpmnViewRef = ref<BpmnView>();
+const tabActiveName = ref('image');
+const imgUrl = ref('');
//鍒濆鍖栨煡璇㈠鎵硅褰�
-const init = async (businessKey: string | number) => {
+const init = async (businessId: string | number) => {
visible.value = true;
loading.value = true;
- tabActiveName.value = 'bpmn';
+ tabActiveName.value = 'image';
historyList.value = [];
- processApi.getHistoryRecord(businessKey).then((resp) => {
- historyList.value = resp.data;
- loading.value = false;
+ flowImage(businessId).then((resp) => {
+ if (resp.data) {
+ historyList.value = resp.data.list;
+ imgUrl.value = 'data:image/gif;base64,' + resp.data.image;
+ if (historyList.value.length > 0) {
+ historyList.value.forEach((item) => {
+ if (item.ext) {
+ getIds(item.ext).then((res) => {
+ item.attachmentList = res.data;
+ });
+ } else {
+ item.attachmentList = [];
+ }
+ });
+ }
+ loading.value = false;
+ }
});
- await nextTick(() => {
- bpmnViewRef.value.init(businessKey);
- });
+};
+const getIds = async (ids: string | number) => {
+ const res = await listByIds(ids);
+ return res;
};
/** 涓嬭浇鎸夐挳鎿嶄綔 */
const handleDownload = (ossId: string) => {
proxy?.$download.oss(ossId);
};
+
+const imageWrapperRef = ref<HTMLElement | null>(null);
+const scale = ref(1); // 鍒濆缂╂斁姣斾緥
+const maxScale = 3; // 鏈�澶х缉鏀炬瘮渚�
+const minScale = 0.5; // 鏈�灏忕缉鏀炬瘮渚�
+
+let isDragging = false;
+let startX = 0;
+let startY = 0;
+let currentTranslateX = 0;
+let currentTranslateY = 0;
+
+const handleMouseWheel = (event: WheelEvent) => {
+ event.preventDefault();
+ let newScale = scale.value - event.deltaY / 1000;
+ newScale = Math.max(minScale, Math.min(newScale, maxScale));
+ if (newScale !== scale.value) {
+ scale.value = newScale;
+ resetDragPosition(); // 閲嶇疆鎷栨嫿浣嶇疆锛屼娇鍥剧墖灞呬腑
+ }
+};
+
+const handleMouseDown = (event: MouseEvent) => {
+ if (scale.value > 1) {
+ event.preventDefault(); // 闃绘榛樿琛屼负锛岄槻姝㈡嫋鎷�
+ isDragging = true;
+ startX = event.clientX;
+ startY = event.clientY;
+ }
+};
+
+const handleMouseMove = (event: MouseEvent) => {
+ if (!isDragging || !imageWrapperRef.value) return;
+
+ const deltaX = event.clientX - startX;
+ const deltaY = event.clientY - startY;
+ startX = event.clientX;
+ startY = event.clientY;
+
+ currentTranslateX += deltaX;
+ currentTranslateY += deltaY;
+
+ // 杈圭晫妫�娴嬶紝闃叉鍥剧墖琚嫋鍑哄鍣�
+ const bounds = getBounds();
+ if (currentTranslateX > bounds.maxTranslateX) {
+ currentTranslateX = bounds.maxTranslateX;
+ } else if (currentTranslateX < bounds.minTranslateX) {
+ currentTranslateX = bounds.minTranslateX;
+ }
+
+ if (currentTranslateY > bounds.maxTranslateY) {
+ currentTranslateY = bounds.maxTranslateY;
+ } else if (currentTranslateY < bounds.minTranslateY) {
+ currentTranslateY = bounds.minTranslateY;
+ }
+
+ applyTransform();
+};
+
+const handleMouseUp = () => {
+ isDragging = false;
+};
+
+const handleMouseLeave = () => {
+ isDragging = false;
+};
+
+const resetTransform = () => {
+ scale.value = 1;
+ currentTranslateX = 0;
+ currentTranslateY = 0;
+ applyTransform();
+};
+
+const resetDragPosition = () => {
+ currentTranslateX = 0;
+ currentTranslateY = 0;
+ applyTransform();
+};
+
+const applyTransform = () => {
+ if (imageWrapperRef.value) {
+ imageWrapperRef.value.style.transform = `translate(${currentTranslateX}px, ${currentTranslateY}px) scale(${scale.value})`;
+ }
+};
+
+const getBounds = () => {
+ if (!imageWrapperRef.value) return { minTranslateX: 0, maxTranslateX: 0, minTranslateY: 0, maxTranslateY: 0 };
+
+ const imgRect = imageWrapperRef.value.getBoundingClientRect();
+ const containerRect = imageWrapperRef.value.parentElement?.getBoundingClientRect() ?? imgRect;
+
+ const minTranslateX = (containerRect.width - imgRect.width * scale.value) / 2;
+ const maxTranslateX = -(containerRect.width - imgRect.width * scale.value) / 2;
+ const minTranslateY = (containerRect.height - imgRect.height * scale.value) / 2;
+ const maxTranslateY = -(containerRect.height - imgRect.height * scale.value) / 2;
+
+ return { minTranslateX, maxTranslateX, minTranslateY, maxTranslateY };
+};
+
+const transformStyle = computed(() => ({
+ transition: isDragging ? 'none' : 'transform 0.2s ease'
+}));
+
/**
* 瀵瑰鏆撮湶瀛愮粍浠舵柟娉�
*/
@@ -113,4 +255,26 @@
min-height: calc(100vh - 170px) !important;
}
}
+
+.image-wrapper {
+ width: 100%;
+ overflow: hidden;
+ position: relative;
+ margin: 0 auto;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ user-select: none; /* 绂佺敤鏂囨湰閫夋嫨 */
+ cursor: grab; /* 璁剧疆鍒濆榧犳爣鎸囬拡涓哄彲鎷栧姩 */
+}
+
+.image-wrapper:active {
+ cursor: grabbing; /* 褰撴鍦ㄦ嫋鍔ㄦ椂鏀瑰彉榧犳爣鎸囬拡 */
+}
+
+.scalable-image {
+ object-fit: contain;
+ width: 100%;
+ padding: 15px;
+}
</style>
--
Gitblit v1.9.3