From a7c180ee25647e4d6a46f77e34e39e9c34b14f02 Mon Sep 17 00:00:00 2001
From: wengjq <2410808055@qq.com>
Date: Wed, 23 Mar 2022 19:43:40 +0800
Subject: [PATCH 1/2] fix(TimeRangePicker): disabledTime does not work

---
 components/vc-picker/panels/TimePanel/TimeBody.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/vc-picker/panels/TimePanel/TimeBody.tsx b/components/vc-picker/panels/TimePanel/TimeBody.tsx
index 8647bc61c6..9ee29374aa 100644
--- a/components/vc-picker/panels/TimePanel/TimeBody.tsx
+++ b/components/vc-picker/panels/TimePanel/TimeBody.tsx
@@ -101,13 +101,13 @@ const TimeBody = defineComponent({
           disabledConfig.disabledMinutes,
           disabledConfig.disabledSeconds,
         ];
+      } else {
+        [mergedDisabledHours.value, mergedDisabledMinutes.value, mergedDisabledSeconds.value] = [
+          props.disabledHours,
+          props.disabledMinutes,
+          props.disabledSeconds,
+        ];
       }
-
-      [mergedDisabledHours.value, mergedDisabledMinutes.value, mergedDisabledSeconds.value] = [
-        props.disabledHours,
-        props.disabledMinutes,
-        props.disabledSeconds,
-      ];
     });
     const setTime = (
       isNewPM: boolean | undefined,

From 56dad6961428ce4e5e3f86e1a498c2555c2103f7 Mon Sep 17 00:00:00 2001
From: wengjq <2410808055@qq.com>
Date: Sat, 26 Mar 2022 19:22:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(Form):=20the=20scrollToField=20not=20wo?=
 =?UTF-8?q?rk=EF=BC=8Cclose=20#5404?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/form/Form.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/components/form/Form.tsx b/components/form/Form.tsx
index 5ce8f02925..e84a7479fc 100755
--- a/components/form/Form.tsx
+++ b/components/form/Form.tsx
@@ -173,12 +173,18 @@ const Form = defineComponent({
     const getFieldsByNameList = (nameList: NamePath) => {
       const provideNameList = !!nameList;
       const namePathList = provideNameList ? toArray(nameList).map(getNamePath) : [];
+      const isFieldValue = Object.values(fields).some(field =>
+        isEqualName(nameList, field.fieldName.value),
+      );
+
       if (!provideNameList) {
         return Object.values(fields);
       } else {
         return Object.values(fields).filter(
           field =>
-            namePathList.findIndex(namePath => isEqualName(namePath, field.fieldName.value)) > -1,
+            (isFieldValue ? [nameList] : namePathList).findIndex(namePath =>
+              isEqualName(namePath, field.fieldName.value),
+            ) > -1,
         );
       }
     };