From 3c4de9b0be06350f0d9ad97bfb5f7f773c38be38 Mon Sep 17 00:00:00 2001
From: Vben <anncwb@126.com>
Date: Wed, 17 Mar 2021 20:59:49 +0800
Subject: [PATCH] fix(input-count): make sure the reset function works close
 #381

---
 CHANGELOG.zh_CN.md                            |  4 +++
 src/components/CountDown/src/CountButton.vue  | 15 ++++++----
 .../CountDown/src/CountdownInput.vue          |  5 ++--
 src/components/CountDown/src/useCountdown.ts  |  2 +-
 src/components/Form/src/componentMap.ts       |  2 ++
 src/hooks/component/useFormItem.ts            |  1 +
 src/views/demo/form/RuleForm.vue              | 30 +++++++++++++------
 src/views/demo/table/FetchTable.vue           |  3 --
 src/views/sys/login/ForgetPasswordForm.vue    | 10 +++----
 9 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 9092b4f6..1e0c34d1 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -4,6 +4,10 @@
 
 - 重构路由多层模式,解决嵌套 keepalive 执行多次问题
 
+### 🐛 Bug Fixes
+
+- 确保 CountDownInput 组件重置清空值
+
 ## 2.1.0 (2021-03-15)
 
 ### ✨ Features
diff --git a/src/components/CountDown/src/CountButton.vue b/src/components/CountDown/src/CountButton.vue
index 59c58393..d71f2188 100644
--- a/src/components/CountDown/src/CountButton.vue
+++ b/src/components/CountDown/src/CountButton.vue
@@ -8,22 +8,21 @@
   </Button>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, PropType } from 'vue';
+  import { defineComponent, ref, PropType, watchEffect } from 'vue';
 
   import { Button } from 'ant-design-vue';
 
   import { useCountdown } from './useCountdown';
   import { isFunction } from '/@/utils/is';
   import { useI18n } from '/@/hooks/web/useI18n';
+  import { propTypes } from '/@/utils/propTypes';
 
   export default defineComponent({
     name: 'CountButton',
     components: { Button },
     props: {
-      count: {
-        type: Number,
-        default: 60,
-      },
+      value: propTypes.string,
+      count: propTypes.number.def(60),
       beforeStartFunc: {
         type: Function as PropType<() => boolean>,
         default: null,
@@ -32,8 +31,12 @@
     setup(props) {
       const loading = ref(false);
 
-      const { currentCount, isStart, start } = useCountdown(props.count);
+      const { currentCount, isStart, start, reset } = useCountdown(props.count);
       const { t } = useI18n();
+
+      watchEffect(() => {
+        props.value === undefined && reset();
+      });
       /**
        * @description: Judge whether there is an external function before execution, and decide whether to start after execution
        */
diff --git a/src/components/CountDown/src/CountdownInput.vue b/src/components/CountDown/src/CountdownInput.vue
index 5635f40d..f7022ad6 100644
--- a/src/components/CountDown/src/CountdownInput.vue
+++ b/src/components/CountDown/src/CountdownInput.vue
@@ -1,7 +1,7 @@
 <template>
-  <AInput v-bind="$attrs" :class="prefixCls" :size="size">
+  <AInput v-bind="$attrs" :class="prefixCls" :size="size" :value="state">
     <template #addonAfter>
-      <CountButton :size="size" :count="count" :beforeStartFunc="sendCodeApi" />
+      <CountButton :size="size" :count="count" :value="state" :beforeStartFunc="sendCodeApi" />
     </template>
   </AInput>
 </template>
@@ -18,6 +18,7 @@
 
   export default defineComponent({
     name: 'CountDownInput',
+    inheritAttrs: false,
     components: { [Input.name]: Input, CountButton },
     props: {
       value: propTypes.string,
diff --git a/src/components/CountDown/src/useCountdown.ts b/src/components/CountDown/src/useCountdown.ts
index f067996f..316d69a8 100644
--- a/src/components/CountDown/src/useCountdown.ts
+++ b/src/components/CountDown/src/useCountdown.ts
@@ -14,8 +14,8 @@ export function useCountdown(count: number) {
 
   function stop() {
     isStart.value = false;
-    timerId = null;
     clear();
+    timerId = null;
   }
 
   function start() {
diff --git a/src/components/Form/src/componentMap.ts b/src/components/Form/src/componentMap.ts
index 0fd45940..67be8964 100644
--- a/src/components/Form/src/componentMap.ts
+++ b/src/components/Form/src/componentMap.ts
@@ -23,6 +23,7 @@ import ApiSelect from './components/ApiSelect.vue';
 import { BasicUpload } from '/@/components/Upload';
 import { StrengthMeter } from '/@/components/StrengthMeter';
 import { IconPicker } from '/@/components/Icon';
+import { CountdownInput } from '/@/components/CountDown';
 
 const componentMap = new Map<ComponentType, Component>();
 
@@ -51,6 +52,7 @@ componentMap.set('WeekPicker', DatePicker.WeekPicker);
 componentMap.set('TimePicker', TimePicker);
 componentMap.set('StrengthMeter', StrengthMeter);
 componentMap.set('IconPicker', IconPicker);
+componentMap.set('InputCountDown', CountdownInput);
 
 componentMap.set('Upload', BasicUpload);
 
diff --git a/src/hooks/component/useFormItem.ts b/src/hooks/component/useFormItem.ts
index ed85fd71..bb58b7d6 100644
--- a/src/hooks/component/useFormItem.ts
+++ b/src/hooks/component/useFormItem.ts
@@ -31,6 +31,7 @@ export function useRuleFormItem<T extends Indexable>(
     },
     set(value) {
       if (isEqual(value, defaultState.value)) return;
+
       innerState.value = value as T[keyof T];
       emit?.(changeEvent, value);
     },
diff --git a/src/views/demo/form/RuleForm.vue b/src/views/demo/form/RuleForm.vue
index d21973c2..de60e572 100644
--- a/src/views/demo/form/RuleForm.vue
+++ b/src/views/demo/form/RuleForm.vue
@@ -5,6 +5,7 @@
       <a-button @click="resetValidate" class="mr-2"> 清空校验信息 </a-button>
       <a-button @click="getFormValues" class="mr-2"> 获取表单值 </a-button>
       <a-button @click="setFormValues" class="mr-2"> 设置表单值 </a-button>
+      <a-button @click="resetFields" class="mr-2"> 重置 </a-button>
     </div>
     <CollapseContainer title="表单校验">
       <BasicForm @register="register" @submit="handleSubmit" />
@@ -46,6 +47,15 @@
       },
       required: true,
     },
+    {
+      field: 'field44',
+      component: 'InputCountDown',
+      label: '验证码',
+      colProps: {
+        span: 8,
+      },
+      required: true,
+    },
     {
       field: 'field4',
       component: 'Select',
@@ -150,15 +160,16 @@
     components: { BasicForm, CollapseContainer, PageWrapper },
     setup() {
       const { createMessage } = useMessage();
-      const [register, { validateFields, clearValidate, getFieldsValue, setFieldsValue }] = useForm(
-        {
-          labelWidth: 120,
-          schemas,
-          actionColOptions: {
-            span: 24,
-          },
-        }
-      );
+      const [
+        register,
+        { validateFields, clearValidate, getFieldsValue, resetFields, setFieldsValue },
+      ] = useForm({
+        labelWidth: 120,
+        schemas,
+        actionColOptions: {
+          span: 24,
+        },
+      });
       async function validateForm() {
         try {
           const res = await validateFields();
@@ -191,6 +202,7 @@
         setFormValues,
         validateForm,
         resetValidate,
+        resetFields,
       };
     },
   });
diff --git a/src/views/demo/table/FetchTable.vue b/src/views/demo/table/FetchTable.vue
index 9159f78b..2fcc43d9 100644
--- a/src/views/demo/table/FetchTable.vue
+++ b/src/views/demo/table/FetchTable.vue
@@ -24,9 +24,6 @@
       });
       function handleReloadCurrent() {
         reload();
-        // reload({
-        //   searchInfo: 'xxx',
-        // });
       }
 
       function handleReload() {
diff --git a/src/views/sys/login/ForgetPasswordForm.vue b/src/views/sys/login/ForgetPasswordForm.vue
index fee5d2e2..047c6306 100644
--- a/src/views/sys/login/ForgetPasswordForm.vue
+++ b/src/views/sys/login/ForgetPasswordForm.vue
@@ -40,7 +40,7 @@
   import { CountdownInput } from '/@/components/CountDown';
 
   import { useI18n } from '/@/hooks/web/useI18n';
-  import { useLoginState, useFormRules, useFormValid, LoginStateEnum } from './useLogin';
+  import { useLoginState, useFormRules, LoginStateEnum } from './useLogin';
 
   export default defineComponent({
     name: 'ForgetPasswordForm',
@@ -66,14 +66,12 @@
         sms: '',
       });
 
-      const { validForm } = useFormValid(formRef);
-
       const getShow = computed(() => unref(getLoginState) === LoginStateEnum.RESET_PASSWORD);
 
       async function handleReset() {
-        const data = await validForm();
-        if (!data) return;
-        console.log(data);
+        const form = unref(formRef);
+        if (!form) return;
+        await form.resetFields();
       }
 
       return {