From 14eb744f1c224434b273a99e4179ea13293375b8 Mon Sep 17 00:00:00 2001
From: likunming <likunming@163.com>
Date: Wed, 23 Oct 2024 14:36:00 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81Form=E8=A1=A8=E5=8D=95=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=85=8D=E7=BD=AE=E5=B1=9E=E6=80=A7colFirst=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAfirstCol=E3=80=82=202=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8DForm=E8=A1=A8=E5=8D=95=E5=85=83=E7=B4=A0=E6=94=BE?=
 =?UTF-8?q?=E5=9C=A8=E7=AC=AC=E4=B8=80=E5=88=97=E6=97=B6colSpan=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/platform/components/form/WForm.vue                | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue b/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue
index 16dee6dc..e8ae7d2f 100644
--- a/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue
@@ -164,9 +164,13 @@ const formLayoutStyleComputed = computed(() => {
 const fieldStyleComputed = (field) => {
   const style = {};
   if (field) {
-    if (field.colFirst) {
-      // col-start-1
+    if (field.firstCol) {
       style['grid-column-start'] = 1;
+      if (field.colSpan === 'full' || (typeof field.colSpan === 'number' && screenColsNumComputed.value < field.colSpan)) {
+        style['grid-column-end'] = `${screenColsNumComputed.value + 1}`;
+      } else if (typeof field.colSpan === 'number' && field.colSpan > 0) {
+        style['grid-column-end'] = `${field.colSpan + 1}`;
+      }
     } else {
       if (field.colSpan === 'full') {
         // col-span-${screenColsNumComputed.value}