From 8df6e3860f05fedb90b7584924aef6e581461880 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Wed, 8 Jan 2025 10:55:03 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/workflow/leave/index.vue        | 12 +++++-----
 .../workflow/leave/leave-description.vue      |  4 ++--
 .../src/views/workflow/leave/leave-form.vue   | 22 +++++++++++++++----
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/apps/web-antd/src/views/workflow/leave/index.vue b/apps/web-antd/src/views/workflow/leave/index.vue
index 909b9613..9ae2b08b 100644
--- a/apps/web-antd/src/views/workflow/leave/index.vue
+++ b/apps/web-antd/src/views/workflow/leave/index.vue
@@ -1,18 +1,18 @@
 <script setup lang="ts">
+import type { VbenFormProps } from '@vben/common-ui';
+
 import type { LeaveForm } from './api/model';
 
+import type { VxeGridProps } from '#/adapter/vxe-table';
+
 import { useRouter } from 'vue-router';
 
-import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
+import { Page, useVbenModal } from '@vben/common-ui';
 import { getVxePopupContainer } from '@vben/utils';
 
 import { Modal, Popconfirm, Space } from 'ant-design-vue';
 
-import {
-  useVbenVxeGrid,
-  vxeCheckboxChecked,
-  type VxeGridProps,
-} from '#/adapter/vxe-table';
+import { useVbenVxeGrid, vxeCheckboxChecked } from '#/adapter/vxe-table';
 import { cancelProcessApply } from '#/api/workflow/instance';
 import { commonDownloadExcel } from '#/utils/file/download';
 
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 49915bc8..d81ef9b8 100644
--- a/apps/web-antd/src/views/workflow/leave/leave-description.vue
+++ b/apps/web-antd/src/views/workflow/leave/leave-description.vue
@@ -28,7 +28,7 @@ function formatDate(date: string) {
 </script>
 
 <template>
-  <Descriptions :column="1" bordered size="small">
+  <Descriptions :column="1" size="middle">
     <DescriptionsItem label="请假类型">
       {{ leaveType }}
     </DescriptionsItem>
@@ -39,7 +39,7 @@ function formatDate(date: string) {
       {{ data.leaveDays }}天
     </DescriptionsItem>
     <DescriptionsItem label="请假原因">
-      {{ data.remark }}
+      {{ data.remark || '无' }}
     </DescriptionsItem>
   </Descriptions>
 </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 98371b71..883dbcf4 100644
--- a/apps/web-antd/src/views/workflow/leave/leave-form.vue
+++ b/apps/web-antd/src/views/workflow/leave/leave-form.vue
@@ -156,10 +156,17 @@ function handleComplete() {
   formApi.resetForm();
   router.push('/demo/leave');
 }
+
+/**
+ * 显示详情时 需要较小的padding
+ */
+const cardSize = computed(() => {
+  return showDescription.value ? 'small' : 'default';
+});
 </script>
 
 <template>
-  <Card ref="cardRef">
+  <Card ref="cardRef" :size="cardSize">
     <div id="leave-form">
       <!-- 使用v-if会影响生命周期 -->
       <BasicForm v-show="!showDescription" />
@@ -174,12 +181,19 @@ function handleComplete() {
 </template>
 
 <style lang="scss">
-/**
-去除 '菜单加载中' 主要是iframe内嵌使用
-*/
 html:has(#leave-form) {
+  /**
+  去除 '菜单加载中' 主要是iframe内嵌使用
+  */
   .ant-message-notice-content:has(.ant-message-loading) {
     display: none;
   }
+
+  /**
+  去除顶部进度条样式
+  */
+  #nprogress {
+    display: none;
+  }
 }
 </style>