From ccfa4b5f156603ec932e7291e6116579a7db7e19 Mon Sep 17 00:00:00 2001
From: chenghuan <chenghuanv587@qq.com>
Date: Wed, 7 Jan 2026 14:41:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(card-list):=20=E6=B7=BB=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=88=97=E6=95=B0=E9=85=8D=E7=BD=AE=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=A4=9A=E5=88=97=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 fieldColumns 配置项控制卡片内字段排列列数
- 支持通过 colSpan 设置字段跨列显示
- 优化卡片内容布局样式和字段显示效果
- 调整对账模块相关页面布局
---
 apps/finance/.env.production                  |  2 +-
 .../components/SelectDropdownRender/index.vue | 13 +++--
 apps/finance/src/components/card-list/api.ts  |  1 +
 .../src/components/card-list/card-list.vue    | 49 ++++++++++++++++---
 .../finance/src/components/card-list/types.ts |  4 ++
 .../src/router/routes/modules/system.ts       |  8 +--
 .../reconciliate/components/Selected.vue      | 10 ++--
 .../posting/reconciliate/modules/Manual.vue   |  5 +-
 apps/finance/src/views/test.vue               | 14 ++++++
 9 files changed, 84 insertions(+), 22 deletions(-)
 create mode 100644 apps/finance/src/views/test.vue

diff --git a/apps/finance/.env.production b/apps/finance/.env.production
index cfc9cb1..2b2b874 100644
--- a/apps/finance/.env.production
+++ b/apps/finance/.env.production
@@ -1,7 +1,7 @@
 VITE_BASE=/
 
 # 接口地址
-VITE_GLOB_API_URL=http://192.168.110.100:9000/finance
+VITE_GLOB_API_URL=http://59.110.212.44:9000/finance
 
 # 是否开启压缩，可以设置为 none, brotli, gzip
 VITE_COMPRESS=none
diff --git a/apps/finance/src/components/SelectDropdownRender/index.vue b/apps/finance/src/components/SelectDropdownRender/index.vue
index 5e17264..c0586a9 100644
--- a/apps/finance/src/components/SelectDropdownRender/index.vue
+++ b/apps/finance/src/components/SelectDropdownRender/index.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { defineComponent, ref, watch } from 'vue';
 
-import { Button, Divider, Input, Select, Space } from 'ant-design-vue';
+import { Button, Divider, Input, Select } from 'ant-design-vue';
 
 export interface RemoteOption {
   label: string;
@@ -70,15 +70,20 @@ const addItem = (e: Event) => {
     <template #dropdownRender="{ menuNode: menu }">
       <VNodes :vnodes="menu" />
       <Divider style="margin: 4px 0" />
-      <Space style="padding: 4px 8px">
-        <Input ref="inputRef" v-model:value="inputValue" placeholder="在此手动输入" />
+      <div style="padding: 4px 8px; display: flex">
+        <Input
+          ref="inputRef"
+          v-model:value="inputValue"
+          placeholder="在此手动输入"
+          style="flex: 1"
+        />
         <Button type="text" @click="addItem">
           <template #icon>
             <!-- <PlusOutlined /> -->
           </template>
           新增
         </Button>
-      </Space>
+      </div>
     </template>
   </Select>
 </template>
diff --git a/apps/finance/src/components/card-list/api.ts b/apps/finance/src/components/card-list/api.ts
index f96514f..f3603d4 100644
--- a/apps/finance/src/components/card-list/api.ts
+++ b/apps/finance/src/components/card-list/api.ts
@@ -13,6 +13,7 @@ function getDefaultState(): CardListProps {
       data: [],
       showTitle: true,
       gridColumns: 3,
+      fieldColumns: 1,
       pagerConfig: {
         enabled: true,
         current: 1,
diff --git a/apps/finance/src/components/card-list/card-list.vue b/apps/finance/src/components/card-list/card-list.vue
index 43d551b..862946a 100644
--- a/apps/finance/src/components/card-list/card-list.vue
+++ b/apps/finance/src/components/card-list/card-list.vue
@@ -73,6 +73,40 @@ const cardStyle = (item: any) => {
   return style;
 };
 
+// 卡片内容样式
+const cardContentStyle = computed(() => {
+  const fieldColumns = gridOptions.value?.fieldColumns || 1;
+
+  if (fieldColumns > 1) {
+    return {
+      display: 'grid',
+      gridTemplateColumns: `repeat(${fieldColumns}, 1fr)`,
+      columnGap: '10px', // 控制列间距
+      rowGap: '8px', // 控制行间距，设置更小的值
+    };
+  }
+
+  return {};
+});
+
+// 卡片字段样式
+const cardFieldStyle = (column: any) => {
+  const fieldColumns = gridOptions.value?.fieldColumns || 1;
+  const colSpan = column?.colSpan || 1;
+
+  if (fieldColumns > 1) {
+    return {
+      marginBottom: '0px',
+      paddingBottom: '0px',
+      height: 'auto',
+      lineHeight: 'normal',
+      gridColumn: `span ${colSpan}`,
+    };
+  }
+
+  return {};
+};
+
 // const errorCardStyle = (item: any) => {
 //   const errorData = gridOptions.value?.errorData || [];
 //   return errorData.some((errorItem) => errorItem.id === item.id)
@@ -234,11 +268,12 @@ onUnmounted(() => {
             <slot name="card-extra" :row="item" :index="index"></slot>
           </template>
 
-          <div class="card-content">
+          <div class="card-content" :style="cardContentStyle">
             <div
               v-for="column in gridOptions?.columns"
               :key="column?.field || ''"
               class="card-field"
+              :style="cardFieldStyle(column)"
               v-show="
                 !column?.show ||
                 (typeof column.show === 'function' ? column.show(item) : column.show)
@@ -290,27 +325,26 @@ onUnmounted(() => {
 <style lang="scss" scoped>
 .card-content {
   .card-field {
-    margin-bottom: 8px;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-
     .field-item {
       display: flex;
       align-items: center;
+      flex-wrap: nowrap;
 
       .field-title {
         flex-shrink: 0;
         margin-right: 8px;
         font-weight: 500;
         color: rgba(0, 0, 0, 0.85);
+        white-space: nowrap;
       }
 
       .field-value {
         flex: 1;
+        min-width: 0;
         word-break: break-all;
         color: rgba(0, 0, 0, 0.65);
+        overflow: hidden;
+        text-overflow: ellipsis;
 
         &.field-edit {
           display: flex;
@@ -349,7 +383,6 @@ onUnmounted(() => {
   }
 
   .card-content {
-    flex: 1;
     overflow-y: auto;
     min-width: 0; // 防止内容撑开
   }
diff --git a/apps/finance/src/components/card-list/types.ts b/apps/finance/src/components/card-list/types.ts
index 2ce5381..31137cf 100644
--- a/apps/finance/src/components/card-list/types.ts
+++ b/apps/finance/src/components/card-list/types.ts
@@ -17,6 +17,8 @@ export interface CardListColumn<T = any> {
   show?: ((row: T) => boolean) | boolean;
   /** 编辑渲染组件 */
   editRender?: { name: string; props?: Record<string, any> };
+  /** 字段占列数 */
+  colSpan?: number;
 }
 
 export interface CardListPagination {
@@ -49,6 +51,8 @@ export interface CardListOptions<T = any> {
   cardClass?: string;
   /** 网格列数 */
   gridColumns?: number;
+  /** 字段列数，控制卡片内字段排列的列数 */
+  fieldColumns?: number;
   /** 网格高度 */
   gridHeight?: string;
   /** 分页配置 */
diff --git a/apps/finance/src/router/routes/modules/system.ts b/apps/finance/src/router/routes/modules/system.ts
index 801fcf3..ce83239 100644
--- a/apps/finance/src/router/routes/modules/system.ts
+++ b/apps/finance/src/router/routes/modules/system.ts
@@ -21,11 +21,11 @@ const routes: RouteRecordRaw[] = [
       },
       // {
       //   meta: {
-      //     title: '用户管理2',
+      //     title: '测试',
       //   },
-      //   name: 'Users2',
-      //   path: '/system/users2',
-      //   component: () => import('#/components/CardListDemo.vue'),
+      //   name: 'Test',
+      //   path: '/system/test',
+      //   component: () => import('#/views/test.vue'),
       // },
     ],
   },
diff --git a/apps/finance/src/views/posting/reconciliate/components/Selected.vue b/apps/finance/src/views/posting/reconciliate/components/Selected.vue
index 3e11b44..af510e5 100644
--- a/apps/finance/src/views/posting/reconciliate/components/Selected.vue
+++ b/apps/finance/src/views/posting/reconciliate/components/Selected.vue
@@ -87,6 +87,7 @@ const gridOptions = computed(() => ({
       },
       field: 'tel',
       title: '用户手机号',
+      colSpan: 2,
     },
     { editRender: { name: 'Input' }, field: 'orderMoney', title: '订单金额' },
     { editRender: { name: 'Input' }, field: 'realMoney', title: '实际金额' },
@@ -107,6 +108,8 @@ const gridOptions = computed(() => ({
         name: 'Select',
         props: {
           options: [
+            { label: '1个月', value: '1' },
+            { label: '3个月', value: '3' },
             { label: '半年', value: '6' },
             { label: '一年', value: '12' },
             { label: '两年', value: '24' },
@@ -123,9 +126,10 @@ const gridOptions = computed(() => ({
   ],
   showTitle: true,
   titleField: 'productName',
-  gridColumns: 4,
-  gridHeight: '355px',
-  cardHeight: '345px',
+  gridColumns: 3,
+  fieldColumns: 2,
+  gridHeight: '220px',
+  cardHeight: '210px',
 }));
 
 const [Grid, gridApi] = useCardList<CreateOrderType>({
diff --git a/apps/finance/src/views/posting/reconciliate/modules/Manual.vue b/apps/finance/src/views/posting/reconciliate/modules/Manual.vue
index a1b487f..29a0e6c 100644
--- a/apps/finance/src/views/posting/reconciliate/modules/Manual.vue
+++ b/apps/finance/src/views/posting/reconciliate/modules/Manual.vue
@@ -266,7 +266,7 @@ function onCompleteCheckCreated() {
           </div>
         </div>
       </Card>
-      <div class="flex flex-1 flex-col gap-2">
+      <div class="flex w-3/4 flex-1 flex-col gap-2">
         <Card
           :tab-list="tabList"
           :active-tab-key="activeTabKey"
@@ -293,7 +293,7 @@ function onCompleteCheckCreated() {
         <Card
           v-if="activeTabKey !== '0'"
           :title="`已选列表(${selectedData.length})`"
-          class="h-[405px] w-full"
+          class="h-[270px] w-full"
           size="small"
         >
           <template #extra>
@@ -322,6 +322,7 @@ function onCompleteCheckCreated() {
   padding: 5px !important;
 }
 .order-card {
+  width: 100%;
   :deep(.ant-card-body) {
     padding: 1px !important;
     height: calc(100% - 46px); // 减去标签页头部高度
diff --git a/apps/finance/src/views/test.vue b/apps/finance/src/views/test.vue
new file mode 100644
index 0000000..b41f2a7
--- /dev/null
+++ b/apps/finance/src/views/test.vue
@@ -0,0 +1,14 @@
+<script lang="ts" setup>
+import { ref } from 'vue';
+
+import { TabPane, Tabs } from 'ant-design-vue';
+
+const activeKey = ref(1);
+</script>
+<template>
+  <div>
+    <Tabs v-model:active-key="activeKey" :style="{ height: '200px' }">
+      <TabPane v-for="i in 30" :key="i" :tab="`Tab-${i}`">Content of tab {{ i }}</TabPane>
+    </Tabs>
+  </div>
+</template>