From 17ff5c38f3086187dd79eaff78acff8f88b202c7 Mon Sep 17 00:00:00 2001
From: teeniechen <teeniechen@tencent.com>
Date: Tue, 5 Sep 2023 05:05:30 +0000
Subject: [PATCH] =?UTF-8?q?Revert=20"feat(form):=20=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=AE=B9=E5=99=A8=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E6=97=B6=E9=97=B4=E6=AE=B5=E4=BB=A5=E5=8F=8A=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=AF=8F=E6=97=A5=E5=91=A8=E6=9C=9F"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c94cde293181712e602f24903c755afa3dca41a2.
---
 packages/form/src/fields/Daterange.vue | 75 ++++++++----------------
 packages/form/src/fields/Timerange.vue | 79 --------------------------
 packages/form/src/index.ts             |  3 -
 3 files changed, 23 insertions(+), 134 deletions(-)
 delete mode 100644 packages/form/src/fields/Timerange.vue

diff --git a/packages/form/src/fields/Daterange.vue b/packages/form/src/fields/Daterange.vue
index 6bcd31da..6b950df9 100644
--- a/packages/form/src/fields/Daterange.vue
+++ b/packages/form/src/fields/Daterange.vue
@@ -1,32 +1,22 @@
 <template>
-  <div>
-    <div v-for="(item, index) in list" :key="index">
-      <TMagicDatePicker
-        v-model="list[index]"
-        type="datetimerange"
-        range-separator="-"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        :size="size"
-        :unlink-panels="true"
-        :disabled="disabled"
-        :default-time="config.defaultTime"
-        @change="changeHandler($event, index)"
-      ></TMagicDatePicker>
-      <span v-show="list.length > 1">
-        &nbsp;
-        <TMagicIcon class="m-table-delete-icon" @click="removeHandler(index)"><Delete /></TMagicIcon>
-      </span>
-    </div>
-    <TMagicButton v-if="addable" size="small" type="primary" plain @click="newHandler()">新增一行</TMagicButton>
-  </div>
+  <TMagicDatePicker
+    v-model="value"
+    type="datetimerange"
+    range-separator="-"
+    start-placeholder="开始日期"
+    end-placeholder="结束日期"
+    :size="size"
+    :unlink-panels="true"
+    :disabled="disabled"
+    :default-time="config.defaultTime"
+    @change="changeHandler"
+  ></TMagicDatePicker>
 </template>
 
 <script lang="ts" setup>
-import { computed, ref, watch } from 'vue';
-import { Delete } from '@element-plus/icons-vue';
+import { ref, watch } from 'vue';
 
-import { TMagicButton, TMagicDatePicker, TMagicIcon } from '@tmagic/design';
+import { TMagicDatePicker } from '@tmagic/design';
 import { datetimeFormatter } from '@tmagic/utils';
 
 import type { DaterangeConfig, FieldProps } from '../schema';
@@ -45,8 +35,6 @@ useAddField(props.prop);
 // eslint-disable-next-line vue/no-setup-props-destructure
 const { names } = props.config;
 const value = ref<(Date | undefined)[] | null>([]);
-const list = ref<any>([[]]);
-const addable = computed(() => Boolean(props.config.addable));
 
 if (props.model !== undefined) {
   if (names?.length) {
@@ -59,7 +47,6 @@ if (props.model !== undefined) {
         if (!start || !end) value.value = [];
         if (start !== preStart) value.value[0] = new Date(start);
         if (end !== preEnd) value.value[1] = new Date(end);
-        list.value[0] = value.value;
       },
       {
         immediate: true,
@@ -69,11 +56,7 @@ if (props.model !== undefined) {
     watch(
       () => props.model[props.name],
       (start, preStart) => {
-        if (Array.isArray(start) && start.length > 0) {
-          list.value = start;
-          return;
-        }
-        if (start !== preStart) list.value[0] = start.map((item: string) => (item ? new Date(item) : undefined));
+        if (start !== preStart) value.value = start.map((item: string) => (item ? new Date(item) : undefined));
       },
       {
         immediate: true,
@@ -95,20 +78,17 @@ const setValue = (v: Date[] | Date) => {
   });
 };
 
-const changeHandler = (v: Date[], index: number) => {
+const changeHandler = (v: Date[]) => {
   const value = v || [];
 
   if (props.name) {
-    const dateTime = value.map((item?: Date) => {
-      if (item) return datetimeFormatter(item, '');
-      return undefined;
-    });
-    if (list.value.length === 1) {
-      emit('change', dateTime);
-      return;
-    }
-    list.value[index] = dateTime;
-    emit('change', list.value);
+    emit(
+      'change',
+      value.map((item?: Date) => {
+        if (item) return datetimeFormatter(item, '');
+        return undefined;
+      }),
+    );
   } else {
     if (names?.length) {
       setValue(value);
@@ -116,13 +96,4 @@ const changeHandler = (v: Date[], index: number) => {
     emit('change', value);
   }
 };
-
-const newHandler = () => {
-  list.value.push([]);
-};
-
-const removeHandler = (index: number) => {
-  list.value.splice(index, 1);
-  emit('change', list.value);
-};
 </script>
diff --git a/packages/form/src/fields/Timerange.vue b/packages/form/src/fields/Timerange.vue
deleted file mode 100644
index c9c5cfbd..00000000
--- a/packages/form/src/fields/Timerange.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-  <div>
-    <div v-for="(item, index) in list" :key="index">
-      <TMagicTimePicker
-        v-model="list[index]"
-        is-range
-        range-separator="-"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        :size="size"
-        :unlink-panels="true"
-        :disabled="disabled"
-        :default-time="config.defaultTime"
-        @change="changeHandler($event, index)"
-      ></TMagicTimePicker>
-      <span v-show="list.length > 1">
-        &nbsp;
-        <TMagicIcon class="m-table-delete-icon" @click="removeHandler(index)"><Delete /></TMagicIcon>
-      </span>
-    </div>
-    <TMagicButton v-if="addable" size="small" type="primary" plain @click="newHandler()">新增一行</TMagicButton>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { computed, ref, watch } from 'vue';
-import { Delete } from '@element-plus/icons-vue';
-
-import { TMagicButton, TMagicIcon, TMagicTimePicker } from '@tmagic/design';
-import { datetimeFormatter } from '@tmagic/utils';
-
-import type { DaterangeConfig, FieldProps } from '../schema';
-import { useAddField } from '../utils/useAddField';
-
-defineOptions({
-  name: 'MFormTimeRange',
-});
-
-const props = defineProps<FieldProps<DaterangeConfig>>();
-
-const emit = defineEmits(['change']);
-
-useAddField(props.prop);
-
-// eslint-disable-next-line vue/no-setup-props-destructure
-const list = ref<any>([[]]);
-const addable = computed(() => Boolean(props.config.addable));
-if (props.name && props.model[props.name]) {
-  watch(
-    () => props.model[props.name],
-    (ranges) => {
-      if (Array.isArray(ranges) && ranges.length > 0) {
-        list.value = ranges;
-      }
-    },
-    {
-      immediate: true,
-    },
-  );
-}
-
-const changeHandler = (v: Date[], index: number) => {
-  const value = v || [];
-  list.value[index] = value.map((item?: Date) => {
-    if (item) return datetimeFormatter(item, '');
-    return undefined;
-  });
-  emit('change', list.value);
-};
-
-const newHandler = () => {
-  list.value.push([]);
-};
-
-const removeHandler = (index: number) => {
-  list.value.splice(index, 1);
-  emit('change', list.value);
-};
-</script>
diff --git a/packages/form/src/index.ts b/packages/form/src/index.ts
index 88f8547a..3a7813d2 100644
--- a/packages/form/src/index.ts
+++ b/packages/form/src/index.ts
@@ -45,7 +45,6 @@ import Switch from './fields/Switch.vue';
 import Text from './fields/Text.vue';
 import Textarea from './fields/Textarea.vue';
 import Time from './fields/Time.vue';
-import Timerange from './fields/Timerange.vue';
 import { setConfig } from './utils/config';
 import Form from './Form.vue';
 import FormDialog from './FormDialog.vue';
@@ -77,7 +76,6 @@ export { default as MTime } from './fields/Time.vue';
 export { default as MCheckbox } from './fields/Checkbox.vue';
 export { default as MSwitch } from './fields/Switch.vue';
 export { default as MDaterange } from './fields/Daterange.vue';
-export { default as MTimerange } from './fields/Timerange.vue';
 export { default as MColorPicker } from './fields/ColorPicker.vue';
 export { default as MCheckboxGroup } from './fields/CheckboxGroup.vue';
 export { default as MRadioGroup } from './fields/RadioGroup.vue';
@@ -120,7 +118,6 @@ export default {
     app.component('m-fields-datetime', DateTime);
     app.component('m-fields-daterange', Daterange);
     app.component('m-fields-time', Time);
-    app.component('m-fields-timerange', Timerange);
     app.component('m-fields-checkbox', Checkbox);
     app.component('m-fields-switch', Switch);
     app.component('m-fields-color-picker', ColorPicker);