From a90777f11a4e709c750e67d89762ef0239efe901 Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Thu, 9 Jun 2022 20:15:22 +0800
Subject: [PATCH] =?UTF-8?q?fix(form):=20daterange=20=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8D=E4=BC=9A=E6=B6=88=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/form/src/containers/Container.vue | 15 +++++++++++++--
 packages/form/src/fields/Daterange.vue     |  8 ++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/packages/form/src/containers/Container.vue b/packages/form/src/containers/Container.vue
index 9b2a99f3..cd06308b 100644
--- a/packages/form/src/containers/Container.vue
+++ b/packages/form/src/containers/Container.vue
@@ -32,7 +32,7 @@
     <template v-else-if="type && display">
       <el-form-item
         :style="config.tip ? 'flex: 1' : ''"
-        :class="{ hidden: itemLabelWidth === 0 || !config.text }"
+        :class="{ hidden: `${itemLabelWidth}` === '0' || !config.text }"
         :prop="itemProp"
         :label-width="itemLabelWidth"
         :rules="rule"
@@ -154,7 +154,18 @@ export default defineComponent({
 
     const items = computed(() => (props.config as ContainerCommonConfig).items);
 
-    const itemProp = computed(() => (name.value ? `${props.prop}${props.prop ? '.' : ''}${name.value}` : props.prop));
+    const itemProp = computed(() => {
+      let n: string | number = '';
+      const { names } = props.config as any;
+      if (names?.[0]) {
+        [n] = names;
+      } else if (name.value) {
+        n = name.value;
+      } else {
+        return props.prop;
+      }
+      return `${props.prop}${props.prop ? '.' : ''}${n}`;
+    });
 
     const tagName = computed(() => {
       const component = resolveComponent(`m-${items.value ? 'form' : 'fields'}-${type.value}`);
diff --git a/packages/form/src/fields/Daterange.vue b/packages/form/src/fields/Daterange.vue
index cdaa5321..5836b5d3 100644
--- a/packages/form/src/fields/Daterange.vue
+++ b/packages/form/src/fields/Daterange.vue
@@ -60,6 +60,14 @@ export default defineComponent({
         });
       } else if (props.model && props.name && v instanceof Date) {
         props.model[props.name] = datetimeFormatter(v.toString(), '');
+      } else if (names?.length) {
+        names.forEach((item) => {
+          if (props.model) {
+            props.model[item] = undefined;
+          }
+        });
+      } else if (props.name) {
+        props.model[props.name] = undefined;
       }
     };