From c401a3092f4ee36fc1be48d0bb435aeac572cc1c Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Fri, 8 Aug 2025 10:07:16 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8=E6=98=A0?=
 =?UTF-8?q?=E5=B0=84=E6=96=B9=E5=BC=8F=E6=9B=BF=E6=8D=A2iframe=E6=9D=A5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web-antd/src/api/workflow/task/model.d.ts |  2 +-
 apps/web-antd/src/router/routes/index.ts      |  6 +-
 .../src/router/routes/workflow-iframe.ts      | 18 -----
 .../workflow/components/approval-details.vue  | 25 +++----
 .../src/views/workflow/leave/data.tsx         |  5 +-
 .../workflow/leave/leave-description.vue      | 49 ++++++++------
 .../src/views/workflow/leave/leave-form.vue   | 65 ++-----------------
 apps/web-antd/src/views/workflow/register.ts  | 21 ++++++
 8 files changed, 73 insertions(+), 118 deletions(-)
 delete mode 100644 apps/web-antd/src/router/routes/workflow-iframe.ts
 create mode 100644 apps/web-antd/src/views/workflow/register.ts

diff --git a/apps/web-antd/src/api/workflow/task/model.d.ts b/apps/web-antd/src/api/workflow/task/model.d.ts
index 5f638a8f..b79e0a22 100644
--- a/apps/web-antd/src/api/workflow/task/model.d.ts
+++ b/apps/web-antd/src/api/workflow/task/model.d.ts
@@ -21,7 +21,7 @@ export interface TaskInfo {
   permissionList?: any;
   userList?: any;
   formCustom: string;
-  formPath?: any;
+  formPath: string;
   flowCode: string;
   version: string;
   flowStatus: string;
diff --git a/apps/web-antd/src/router/routes/index.ts b/apps/web-antd/src/router/routes/index.ts
index 1a92413f..4ae6745d 100644
--- a/apps/web-antd/src/router/routes/index.ts
+++ b/apps/web-antd/src/router/routes/index.ts
@@ -3,7 +3,6 @@ import type { RouteRecordRaw } from 'vue-router';
 import { mergeRouteModules, traverseTreeValues } from '@vben/utils';
 
 import { coreRoutes, fallbackNotFoundRoute } from './core';
-import { workflowIframeRoutes } from './workflow-iframe';
 
 const dynamicRouteFiles = import.meta.glob('./modules/**/*.ts', {
   eager: true,
@@ -27,12 +26,11 @@ const externalRoutes: RouteRecordRaw[] = [];
 const routes: RouteRecordRaw[] = [
   ...coreRoutes,
   ...externalRoutes,
-  ...workflowIframeRoutes,
   fallbackNotFoundRoute,
 ];
 
-/** 基本路由(登录, 第三方登录, 注册等) + workflowIframe路由不需要拦截  */
-const basicRoutes = [...coreRoutes, ...workflowIframeRoutes];
+/** 基本路由(登录, 第三方登录, 注册等)  */
+const basicRoutes = [...coreRoutes];
 /** 基本路由列表，这些路由不需要进入权限拦截 */
 const coreRouteNames = traverseTreeValues(basicRoutes, (route) => route.name);
 
diff --git a/apps/web-antd/src/router/routes/workflow-iframe.ts b/apps/web-antd/src/router/routes/workflow-iframe.ts
deleted file mode 100644
index 137088f6..00000000
--- a/apps/web-antd/src/router/routes/workflow-iframe.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type { RouteRecordRaw } from '@vben/types';
-
-/**
- * 该文件存放workflow表单的iframe内嵌路由
- * 不需要权限认证 少走两个接口😅
- */
-export const workflowIframeRoutes: RouteRecordRaw[] = [
-  // 这里是iframe使用的 去掉外层的BasicLayout
-  {
-    name: 'WorkflowLeaveInner',
-    path: '/workflow/leaveEdit/index/iframe',
-    component: () => import('#/views/workflow/leave/leave-form.vue'),
-    meta: {
-      hideInTab: true,
-      title: '请假申请',
-    },
-  },
-];
diff --git a/apps/web-antd/src/views/workflow/components/approval-details.vue b/apps/web-antd/src/views/workflow/components/approval-details.vue
index 09adcff9..1634f236 100644
--- a/apps/web-antd/src/views/workflow/components/approval-details.vue
+++ b/apps/web-antd/src/views/workflow/components/approval-details.vue
@@ -1,16 +1,17 @@
 <!--
 审批详情
-约定${task.formPath}/frame 为内嵌表单 用于展示 需要在本地路由添加
-apps/web-antd/src/router/routes/workflow-iframe.ts
+动态渲染要显示的内容 需要再flowDescripionsMap先定义好组件
 -->
-
 <script setup lang="ts">
+import type { DescripionsMapKey } from '../register';
+
 import type { FlowInfoResponse } from '#/api/workflow/instance/model';
 import type { TaskInfo } from '#/api/workflow/task/model';
 
-import { Divider, Skeleton } from 'ant-design-vue';
+import { Divider } from 'ant-design-vue';
 
 import { ApprovalTimeline } from '.';
+import { flowDescripionsMap } from '../register';
 
 defineOptions({
   name: 'ApprovalDetails',
@@ -27,14 +28,14 @@ defineProps<{
 
 <template>
   <div>
-    <!-- 约定${task.formPath}/frame 为内嵌表单 用于展示 需要在本地路由添加 -->
-    <iframe
-      v-show="iframeLoaded"
-      :src="`${task.formPath}/iframe?readonly=true&id=${task.businessId}`"
-      :style="{ height: `${iframeHeight}px` }"
-      class="w-full"
-    ></iframe>
-    <Skeleton v-show="!iframeLoaded" :paragraph="{ rows: 6 }" active />
+    <!--
+     动态渲染要显示的内容 需要再flowDescripionsMap先定义好组件
+     business-id为业务ID 必传
+    -->
+    <component
+      :is="flowDescripionsMap[task.formPath as DescripionsMapKey]"
+      :business-id="task.businessId"
+    />
     <Divider />
     <ApprovalTimeline :list="currentFlowInfo.list" />
   </div>
diff --git a/apps/web-antd/src/views/workflow/leave/data.tsx b/apps/web-antd/src/views/workflow/leave/data.tsx
index 7eb3441b..6ebf3b59 100644
--- a/apps/web-antd/src/views/workflow/leave/data.tsx
+++ b/apps/web-antd/src/views/workflow/leave/data.tsx
@@ -96,9 +96,7 @@ export const columns: VxeGridProps['columns'] = [
   },
 ];
 
-export const modalSchema: (isEdit: boolean) => VbenFormSchema[] = (
-  isEdit: boolean,
-) => [
+export const modalSchema: () => VbenFormSchema[] = () => [
   {
     label: '主键',
     fieldName: 'id',
@@ -120,7 +118,6 @@ export const modalSchema: (isEdit: boolean) => VbenFormSchema[] = (
     defaultValue: 'leave1',
     rules: 'selectRequired',
     dependencies: {
-      show: () => isEdit,
       triggerFields: [''],
     },
   },
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 d81ef9b8..07743157 100644
--- a/apps/web-antd/src/views/workflow/leave/leave-description.vue
+++ b/apps/web-antd/src/views/workflow/leave/leave-description.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
-import type { LeaveVO } from './api/model';
+import type { LeaveVO } from '../leave/api/model';
 
-import { computed } from 'vue';
+import { computed, onMounted, shallowRef } from 'vue';
 
-import { Descriptions, DescriptionsItem } from 'ant-design-vue';
+import { Descriptions, DescriptionsItem, Skeleton } from 'ant-design-vue';
 import dayjs from 'dayjs';
 
+import { leaveInfo } from './api';
 import { leaveTypeOptions } from './data';
 
 defineOptions({
@@ -13,11 +14,17 @@ defineOptions({
   inheritAttrs: false,
 });
 
-const props = defineProps<{ data: LeaveVO }>();
+const props = defineProps<{ businessId: number | string }>();
+
+const data = shallowRef<LeaveVO>();
+onMounted(async () => {
+  const resp = await leaveInfo(props.businessId);
+  data.value = resp;
+});
 
 const leaveType = computed(() => {
   return (
-    leaveTypeOptions.find((item) => item.value === props.data.leaveType)
+    leaveTypeOptions.find((item) => item.value === data.value?.leaveType)
       ?.label ?? '未知'
   );
 });
@@ -28,18 +35,22 @@ function formatDate(date: string) {
 </script>
 
 <template>
-  <Descriptions :column="1" size="middle">
-    <DescriptionsItem label="请假类型">
-      {{ leaveType }}
-    </DescriptionsItem>
-    <DescriptionsItem label="请假时间">
-      {{ formatDate(data.startDate) }} - {{ formatDate(data.endDate) }}
-    </DescriptionsItem>
-    <DescriptionsItem label="请假时长">
-      {{ data.leaveDays }}天
-    </DescriptionsItem>
-    <DescriptionsItem label="请假原因">
-      {{ data.remark || '无' }}
-    </DescriptionsItem>
-  </Descriptions>
+  <div class="rounded-[6px] border p-2">
+    <Descriptions v-if="data" :column="1" size="middle">
+      <DescriptionsItem label="请假类型">
+        {{ leaveType }}
+      </DescriptionsItem>
+      <DescriptionsItem label="请假时间">
+        {{ formatDate(data.startDate) }} - {{ formatDate(data.endDate) }}
+      </DescriptionsItem>
+      <DescriptionsItem label="请假时长">
+        {{ data.leaveDays }}天
+      </DescriptionsItem>
+      <DescriptionsItem label="请假原因">
+        {{ data.remark || '无' }}
+      </DescriptionsItem>
+    </Descriptions>
+
+    <Skeleton active v-else />
+  </div>
 </template>
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 0e4d7751..da26a5a7 100644
--- a/apps/web-antd/src/views/workflow/leave/leave-form.vue
+++ b/apps/web-antd/src/views/workflow/leave/leave-form.vue
@@ -1,9 +1,7 @@
 <script setup lang="ts">
-import type { LeaveVO } from './api/model';
-
 import type { StartWorkFlowReqData } from '#/api/workflow/task/model';
 
-import { computed, onMounted, ref, useTemplateRef } from 'vue';
+import { onMounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
 import { useVbenModal } from '@vben/common-ui';
@@ -18,19 +16,10 @@ import { startWorkFlow } from '#/api/workflow/task';
 import { applyModal } from '../components';
 import { leaveAdd, leaveInfo, leaveUpdate } from './api';
 import { modalSchema } from './data';
-import LeaveDescription from './leave-description.vue';
 
 const route = useRoute();
-const readonly = route.query?.readonly === 'true';
 const id = route.query?.id as string;
 
-/**
- * id存在&readonly时候
- */
-const showActionBtn = computed(() => {
-  return !readonly;
-});
-
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
     // 默认占满两列
@@ -40,45 +29,20 @@ const [BasicForm, formApi] = useVbenForm({
     // 通用配置项 会影响到所有表单项
     componentProps: {
       class: 'w-full',
-      disabled: readonly,
     },
   },
-  schema: modalSchema(!readonly),
+  schema: modalSchema(),
   showDefaultActions: false,
   wrapperClass: 'grid-cols-2',
 });
 
-const leaveDescription = ref<LeaveVO>();
-const showDescription = computed(() => {
-  return readonly && leaveDescription.value;
-});
-const cardRef = useTemplateRef('cardRef');
 onMounted(async () => {
   // 只读 获取信息赋值
   if (id) {
     const resp = await leaveInfo(id);
-    leaveDescription.value = resp;
     await formApi.setValues(resp);
     const dateRange = [dayjs(resp.startDate), dayjs(resp.endDate)];
     await formApi.setFieldValue('dateRange', dateRange);
-
-    /**
-     * window.parent（最近的上一级父页面）
-     * 主要解决内嵌iframe卡顿的问题
-     */
-    if (readonly) {
-      // 渲染完毕才显示表单
-      window.parent.postMessage({ type: 'mounted' }, '*');
-      // 获取表单高度 内嵌时保持一致
-      setTimeout(() => {
-        const el = cardRef.value?.$el as HTMLDivElement;
-        // 获取高度
-        const height = el?.offsetHeight ?? 0;
-        if (height) {
-          window.parent.postMessage({ type: 'height', height }, '*');
-        }
-      });
-    }
   }
 });
 
@@ -156,22 +120,14 @@ function handleComplete() {
   formApi.resetForm();
   router.push('/demo/leave');
 }
-
-/**
- * 显示详情时 需要较小的padding
- */
-const cardSize = computed(() => {
-  return showDescription.value ? 'small' : 'default';
-});
 </script>
 
 <template>
-  <Card ref="cardRef" :size="cardSize">
+  <Card>
     <div id="leave-form">
       <!-- 使用v-if会影响生命周期 -->
-      <BasicForm v-show="!showDescription" />
-      <LeaveDescription v-if="showDescription" :data="leaveDescription!" />
-      <div v-if="showActionBtn" class="flex justify-end gap-2">
+      <BasicForm />
+      <div class="flex justify-end gap-2">
         <a-button @click="handleTempSave">暂存</a-button>
         <a-button type="primary" @click="handleStartWorkFlow">提交</a-button>
       </div>
@@ -179,14 +135,3 @@ const cardSize = computed(() => {
     </div>
   </Card>
 </template>
-
-<style lang="scss">
-html:has(#leave-form) {
-  /**
-  去除顶部进度条样式
-  */
-  #nprogress {
-    display: none;
-  }
-}
-</style>
diff --git a/apps/web-antd/src/views/workflow/register.ts b/apps/web-antd/src/views/workflow/register.ts
new file mode 100644
index 00000000..62ebfae4
--- /dev/null
+++ b/apps/web-antd/src/views/workflow/register.ts
@@ -0,0 +1,21 @@
+import { defineAsyncComponent, markRaw } from 'vue';
+
+/**
+ * 这里定义流程描述组件
+ */
+
+const LeaveDescription = defineAsyncComponent(
+  () => import('#/views/workflow/leave/leave-description.vue'),
+);
+
+/**
+ * key为流程的路径(task.formPath) value为要显示的组件
+ */
+export const flowDescripionsMap = {
+  /**
+   * 请假申请 详情
+   */
+  '/workflow/leaveEdit/index': markRaw(LeaveDescription),
+};
+
+export type DescripionsMapKey = keyof typeof flowDescripionsMap;