From ccb53f377a1da1089f69e11f26f34063cce3f515 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Fri, 8 Aug 2025 10:29:48 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=8F=91=E8=B5=B7=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=89=8D=E7=9A=84loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/workflow/components/apply-modal.vue |  5 +++
 .../workflow/leave/leave-description.vue      | 13 ++++++-
 .../src/views/workflow/leave/leave-form.vue   | 38 ++++++++++++++-----
 3 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/apps/web-antd/src/views/workflow/components/apply-modal.vue b/apps/web-antd/src/views/workflow/components/apply-modal.vue
index d0116f03..171feaf5 100644
--- a/apps/web-antd/src/views/workflow/components/apply-modal.vue
+++ b/apps/web-antd/src/views/workflow/components/apply-modal.vue
@@ -17,6 +17,10 @@ interface Emits {
    * 完成
    */
   complete: [];
+  /**
+   * 取消 此时已经变成草稿状态了
+   */
+  cancel: [];
 }
 
 const emit = defineEmits<Emits>();
@@ -31,6 +35,7 @@ const [BasicModal, modalApi] = useVbenModal({
   title: '流程发起',
   fullscreenButton: false,
   onConfirm: handleSubmit,
+  onCancel: () => emit('cancel'),
   async onOpenChange(isOpen) {
     if (!isOpen) {
       return null;
diff --git a/apps/web-antd/src/views/workflow/leave/leave-description.vue b/apps/web-antd/src/views/workflow/leave/leave-description.vue
index 07743157..c6184dfc 100644
--- a/apps/web-antd/src/views/workflow/leave/leave-description.vue
+++ b/apps/web-antd/src/views/workflow/leave/leave-description.vue
@@ -3,7 +3,12 @@ import type { LeaveVO } from '../leave/api/model';
 
 import { computed, onMounted, shallowRef } from 'vue';
 
-import { Descriptions, DescriptionsItem, Skeleton } from 'ant-design-vue';
+import {
+  Alert,
+  Descriptions,
+  DescriptionsItem,
+  Skeleton,
+} from 'ant-design-vue';
 import dayjs from 'dayjs';
 
 import { leaveInfo } from './api';
@@ -36,6 +41,12 @@ function formatDate(date: string) {
 
 <template>
   <div class="rounded-[6px] border p-2">
+    <Alert
+      class="mb-4"
+      type="success"
+      show-icon
+      message="新版已经重构为映射组件方式来显示详情 来替代原来的iframe方案 加载速度更快(该提示会在发版前去除)"
+    />
     <Descriptions v-if="data" :column="1" size="middle">
       <DescriptionsItem label="请假类型">
         {{ leaveType }}
diff --git a/apps/web-antd/src/views/workflow/leave/leave-form.vue b/apps/web-antd/src/views/workflow/leave/leave-form.vue
index da26a5a7..8a6730e6 100644
--- a/apps/web-antd/src/views/workflow/leave/leave-form.vue
+++ b/apps/web-antd/src/views/workflow/leave/leave-form.vue
@@ -1,12 +1,13 @@
 <script setup lang="ts">
 import type { StartWorkFlowReqData } from '#/api/workflow/task/model';
 
-import { onMounted } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
 import { useVbenModal } from '@vben/common-ui';
+import { useTabs } from '@vben/hooks';
 
-import { Card } from 'ant-design-vue';
+import { Card, Spin } from 'ant-design-vue';
 import dayjs from 'dayjs';
 import { cloneDeep, omit } from 'lodash-es';
 
@@ -36,13 +37,18 @@ const [BasicForm, formApi] = useVbenForm({
   wrapperClass: 'grid-cols-2',
 });
 
+const loading = ref(false);
 onMounted(async () => {
   // 只读 获取信息赋值
   if (id) {
+    loading.value = true;
+
     const resp = await leaveInfo(id);
     await formApi.setValues(resp);
     const dateRange = [dayjs(resp.startDate), dayjs(resp.endDate)];
     await formApi.setFieldValue('dateRange', dateRange);
+
+    loading.value = false;
   }
 });
 
@@ -88,6 +94,7 @@ async function handleTempSave() {
  * 保存业务 & 发起流程
  */
 async function handleStartWorkFlow() {
+  loading.value = true;
   try {
     // 保存业务
     const leaveResp = await handleSaveOrUpdate();
@@ -113,25 +120,38 @@ async function handleStartWorkFlow() {
     applyModalApi.open();
   } catch (error) {
     console.error(error);
+  } finally {
+    loading.value = false;
   }
 }
 
-function handleComplete() {
+const { closeCurrentTab } = useTabs();
+
+/**
+ * 通用提交/取消回调
+ *
+ * 提交后点击取消 这时候已经变成草稿状态了
+ * 每次点击都会生成新记录 直接跳转回列表
+ */
+async function handleCompleteOrCancel() {
   formApi.resetForm();
+  await closeCurrentTab();
   router.push('/demo/leave');
 }
 </script>
 
 <template>
-  <Card>
-    <div id="leave-form">
-      <!-- 使用v-if会影响生命周期 -->
+  <Spin :spinning="loading">
+    <Card>
       <BasicForm />
       <div class="flex justify-end gap-2">
         <a-button @click="handleTempSave">暂存</a-button>
         <a-button type="primary" @click="handleStartWorkFlow">提交</a-button>
       </div>
-      <ApplyModal @complete="handleComplete" />
-    </div>
-  </Card>
+      <ApplyModal
+        @complete="handleCompleteOrCancel"
+        @cancel="handleCompleteOrCancel"
+      />
+    </Card>
+  </Spin>
 </template>