From 9a352d7cb44491880e3b2f31385bb12c0a62fc1b Mon Sep 17 00:00:00 2001
From: likunming <likunming@163.com>
Date: Tue, 30 Jan 2024 14:37:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=9A=90=E8=97=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/platform/components/form/WForm.vue    | 38 ++++++++++++-------
 .../components/form/elements/WCheckbox.vue    |  4 +-
 .../components/form/elements/WDate.vue        |  3 +-
 .../components/form/elements/WNumber.vue      |  3 +-
 .../components/form/elements/WPassword.vue    |  3 +-
 .../components/form/elements/WSelect.vue      |  3 +-
 .../components/form/elements/WText.vue        |  3 +-
 .../components/form/elements/WTextBtn.vue     |  3 +-
 .../components/form/elements/WTextarea.vue    |  3 +-
 9 files changed, 34 insertions(+), 29 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 63739d9b..763f95d1 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
@@ -3,7 +3,13 @@
     <q-form ref="formRef" :autofocus="false" :greedy="true" v-bind="attrs">
       <div class="grid" :class="formLayoutComputed">
         <template v-for="(field, index) in fields_ as any" :key="String(index)">
-          <div
+          <component
+            :is="fiedType[field.type] || field.type"
+            v-if="field.name"
+            v-model="formData[field.name]"
+            v-bind="field"
+            :form-data="formData"
+            :form="instance"
             :class="
               (field.colsFirst ? 'col-start-1 ' : ' ') +
               (field.colspan === 'full'
@@ -12,18 +18,24 @@
                   ? ' col-span-' + field.colspan
                   : ' col-span-1')
             "
-          >
-            <component
-              :is="fiedType[field.type] || field.type"
-              v-if="field.name"
-              v-model="formData[field.name]"
-              v-bind="field"
-              :form-data="formData"
-              :form="instance"
-              @update:model-value="updateModelValue(field.name, formData[field.name])"
-            ></component>
-            <component :is="fiedType[field.type] || field.type" v-else :form-ref="formRef" v-bind="field" :form-data="formData" :form="instance"></component>
-          </div>
+            @update:model-value="updateModelValue(field.name, formData[field.name])"
+          ></component>
+          <component
+            :is="fiedType[field.type] || field.type"
+            v-else
+            :form-ref="formRef"
+            v-bind="field"
+            :form-data="formData"
+            :form="instance"
+            :class="
+              (field.colsFirst ? 'col-start-1 ' : ' ') +
+              (field.colspan === 'full'
+                ? ' col-span-' + screenColsNumComputed
+                : field.colspan && screenColsNumComputed >= field.colspan
+                  ? ' col-span-' + field.colspan
+                  : ' col-span-1')
+            "
+          ></component>
         </template>
       </div>
       <slot></slot>
diff --git a/io.sc.platform.core.frontend/src/platform/components/form/elements/WCheckbox.vue b/io.sc.platform.core.frontend/src/platform/components/form/elements/WCheckbox.vue
index 95d055e3..3693a9c4 100644
--- a/io.sc.platform.core.frontend/src/platform/components/form/elements/WCheckbox.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/form/elements/WCheckbox.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <q-checkbox v-show="showIfComputed" v-bind="attrs" :rules="rulesComputed" :disable="disableIfComputed"></q-checkbox>
+  <div v-show="showIfComputed">
+    <q-checkbox v-bind="attrs" :rules="rulesComputed" :disable="disableIfComputed"></q-checkbox>
   </div>
 </template>
 
diff --git a/io.sc.platform.core.frontend/src/platform/components/form/elements/WDate.vue b/io.sc.platform.core.frontend/src/platform/components/form/elements/WDate.vue
index 66a74608..0108ace0 100644
--- a/io.sc.platform.core.frontend/src/platform/components/form/elements/WDate.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/form/elements/WDate.vue
@@ -1,7 +1,6 @@
 <template>
-  <div>
+  <div v-show="showIfComputed">
     <q-input
-      v-show="showIfComputed"
       ref="dateRef"
       :hide-bottom-space="true"
       :hide-hint="true"
diff --git a/io.sc.platform.core.frontend/src/platform/components/form/elements/WNumber.vue b/io.sc.platform.core.frontend/src/platform/components/form/elements/WNumber.vue
index e229a541..ecde9f3c 100644
--- a/io.sc.platform.core.frontend/src/platform/components/form/elements/WNumber.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/form/elements/WNumber.vue
@@ -1,7 +1,6 @@
 <template>
-  <div>
+  <div v-show="showIfComputed">
     <q-input
-      v-show="showIfComputed"
       ref="numberRef"
       :hide-bottom-space="true"
       :hide-hint="true"
diff --git a/io.sc.platform.core.frontend/src/platform/components/form/elements/WPassword.vue b/io.sc.platform.core.frontend/src/platform/components/form/elements/WPassword.vue
index 918a6c82..28e54357 100644
--- a/io.sc.platform.core.frontend/src/platform/components/form/elements/WPassword.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/form/elements/WPassword.vue
@@ -1,7 +1,6 @@
 <template>
-  <div>
+  <div v-show="showIfComputed">
     <q-input
-      v-show="showIfComputed"
       ref="pwdRef"
       :hide-bottom-space="true"
       :hide-hint="true"
diff --git a/io.sc.platform.core.frontend/src/platform/components/form/elements/WSelect.vue b/io.sc.platform.core.frontend/src/platform/components/form/elements/WSelect.vue
index 37ad8928..53a70c78 100644
--- a/io.sc.platform.core.frontend/src/platform/components/form/elements/WSelect.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/form/elements/WSelect.vue
@@ -1,7 +1,6 @@
 <template>
-  <div>
+  <div v-show="showIfComputed">
     <q-select
-      v-show="showIfComputed"
       ref="selectRef"
       emit-value
       map-options
diff --git a/io.sc.platform.core.frontend/src/platform/components/form/elements/WText.vue b/io.sc.platform.core.frontend/src/platform/components/form/elements/WText.vue
index 129f6e65..007c1d69 100644
--- a/io.sc.platform.core.frontend/src/platform/components/form/elements/WText.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/form/elements/WText.vue
@@ -1,7 +1,6 @@
 <template>
-  <div>
+  <div v-show="showIfComputed">
     <q-input
-      v-show="showIfComputed"
       ref="textRef"
       :hide-bottom-space="true"
       :hide-hint="true"
diff --git a/io.sc.platform.core.frontend/src/platform/components/form/elements/WTextBtn.vue b/io.sc.platform.core.frontend/src/platform/components/form/elements/WTextBtn.vue
index 84be3082..eee669be 100644
--- a/io.sc.platform.core.frontend/src/platform/components/form/elements/WTextBtn.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/form/elements/WTextBtn.vue
@@ -1,7 +1,6 @@
 <template>
-  <div>
+  <div v-show="showIfComputed">
     <q-input
-      v-show="showIfComputed"
       ref="textBtnRef"
       :hide-bottom-space="true"
       :hide-hint="true"
diff --git a/io.sc.platform.core.frontend/src/platform/components/form/elements/WTextarea.vue b/io.sc.platform.core.frontend/src/platform/components/form/elements/WTextarea.vue
index 9e8ab3a2..7a13e0f0 100644
--- a/io.sc.platform.core.frontend/src/platform/components/form/elements/WTextarea.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/form/elements/WTextarea.vue
@@ -1,7 +1,6 @@
 <template>
-  <div>
+  <div v-show="showIfComputed">
     <q-input
-      v-show="showIfComputed"
       ref="textareaRef"
       :hide-bottom-space="true"
       :hide-hint="true"