From 0d4b4f4d45c0be1babff9c378985020e2155808b Mon Sep 17 00:00:00 2001
From: gaoyunqi <gaoyunqi@gdyd.com>
Date: Mon, 4 Mar 2024 15:29:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=98=8E=E7=BB=86=E8=A1=A8=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=AE=BE=E5=AE=9A=E5=88=97=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/componentProperty/PropertyOption.vue   | 4 ++++
 src/components/Form/src/components/SubFormV2.vue          | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/Designer/src/components/componentProperty/PropertyOption.vue b/src/components/Designer/src/components/componentProperty/PropertyOption.vue
index 6d5c51b..22dbe96 100644
--- a/src/components/Designer/src/components/componentProperty/PropertyOption.vue
+++ b/src/components/Designer/src/components/componentProperty/PropertyOption.vue
@@ -263,6 +263,10 @@
                 <a-input v-model:value="data.options.width" />
             </a-form-item>
 
+            <a-form-item v-if="data.isSubFormChild" label="列宽">
+                <a-input v-model:value="data.options.colWidth" placeholder="数字，留空为浮动宽度" />
+            </a-form-item>
+
             <a-form-item v-if="hasKey('infoType')" :label="t('信息类型')">
                 <a-select v-model:value="data.options.infoType" size="mini">
                     <a-select-option :value="0">{{ t('当前用户') }}</a-select-option>
diff --git a/src/components/Form/src/components/SubFormV2.vue b/src/components/Form/src/components/SubFormV2.vue
index a86bf8c..5cf47dc 100644
--- a/src/components/Form/src/components/SubFormV2.vue
+++ b/src/components/Form/src/components/SubFormV2.vue
@@ -13,7 +13,7 @@
             <template #summary>
                 <a-table-summary-row v-if="columns.some((x) => x.componentProps?.subTotal)">
                     <a-table-summary-cell v-for="(column, idx) in columns" :key="idx">
-                        <a-typography-text v-if="column.componentProps?.subTotal" keyboard> {{ t('合计：') }} {{ sum(data.map((x) => x[column.dataIndex as string])) }} </a-typography-text>
+                        <a-typography-text v-if="column.componentProps?.subTotal" keyboard> {{ t('合计：') }} {{ sum(data.map((x) => x[column.dataIndex as string])) }}</a-typography-text>
                     </a-table-summary-cell>
                 </a-table-summary-row>
             </template>
@@ -212,6 +212,12 @@
                 width: 60
             });
         }
+        columns.value.forEach((col: any) => {
+            // 设置表格的列宽 注意操作这列是没有componentProps
+            if (col?.componentProps?.colWidth) {
+                col.width = +col.componentProps.colWidth;
+            }
+        });
         columns.value = filterColum(columns.value);
         nextTick(() => {
             //处理多表头