Merge pull request #1036 from kerwin612/develop

Fix the disabled of date-picker is invalid
Tencent · Jun 22, 2022 · e04ba22 · e04ba22
2 parents 83c1109 + 00ebb31
commit e04ba22
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/date-picker/hooks/useRange.tsx b/src/date-picker/hooks/useRange.tsx
@@ -35,6 +35,7 @@ export default function useRange(props: TdDateRangePickerProps) {
   const rangeInputProps = computed(() => ({
     ...props.rangeInputProps,
     ref: inputRef,
+    disabled: props.disabled,
     clearable: props.clearable,
     prefixIcon: props.prefixIcon,
     readonly: !props.allowInput,
@@ -101,6 +102,7 @@ export default function useRange(props: TdDateRangePickerProps) {
   const popupProps = computed(() => ({
     expandAnimation: true,
     ...props.popupProps,
+    disabled: props.disabled,
     overlayStyle: props.popupProps?.overlayStyle ?? { width: 'auto' },
     overlayClassName: [props.popupProps?.overlayClassName, `${COMPONENT_NAME.value}__panel-container`],
     onVisibleChange: (visible: boolean, context: any) => {

diff --git a/src/date-picker/hooks/useSingle.tsx b/src/date-picker/hooks/useSingle.tsx
@@ -89,6 +89,7 @@ export default function useSingle(props: TdDatePickerProps) {
   const popupProps = computed(() => ({
     expandAnimation: true,
     ...props.popupProps,
+    disabled: props.disabled,
     overlayStyle: props.popupProps?.overlayStyle ?? { width: 'auto' },
     overlayClassName: [props.popupProps?.overlayClassName, `${COMPONENT_NAME.value}__panel-container`],
     onVisibleChange: (visible: boolean) => {