feat(date-picker): disable confirm button if end date is not selected, …

…closes #3226
tusen-ai · Jul 4, 2022 · 6aa5ab1 · 6aa5ab1
1 parent da00a3c
commit 6aa5ab1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -29,6 +29,7 @@
 - `n-popover` adds `footer-style` prop.
 - `n-popover` adds `footer` slot, closes [#3188](https://github.com/TuSimple/naive-ui/issues/3188).
 - `n-dropdown` adds `menu-props` prop.
+- `n-date-picker` would disable confirm button if end date is not selected, closes [#3226](https://github.com/TuSimple/naive-ui/issues/3226).
 
 ## 2.30.8
 

diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -29,6 +29,7 @@
 - `n-popover` 新增 `footer-style` 属性，用于设置底部内容的样式
 - `n-popover` 新增 `footer` 插槽，用于设置底部内容, 关闭 [#3188](https://github.com/TuSimple/naive-ui/issues/3188)
 - `n-dropdown` 新增 `menu-props` 属性
+- `n-date-picker` 在选择结束日期过程中禁止点击确认按钮，关闭 [#3226](https://github.com/TuSimple/naive-ui/issues/3226)
 
 ## 2.30.8
 

diff --git a/src/date-picker/src/panel/daterange.tsx b/src/date-picker/src/panel/daterange.tsx
@@ -262,7 +262,7 @@ export default defineComponent({
                   themeOverrides={mergedTheme.peerOverrides.Button}
                   size="tiny"
                   type="primary"
-                  disabled={this.isRangeInvalid}
+                  disabled={this.isRangeInvalid || this.isSelecting}
                   onClick={this.handleConfirmClick}
                 >
                   {{ default: () => this.locale.confirm }}

diff --git a/src/date-picker/src/panel/datetimerange.tsx b/src/date-picker/src/panel/datetimerange.tsx
@@ -350,7 +350,7 @@ export default defineComponent({
                   themeOverrides={mergedTheme.peerOverrides.Button}
                   size="tiny"
                   type="primary"
-                  disabled={this.isRangeInvalid}
+                  disabled={this.isRangeInvalid || this.isSelecting}
                   onClick={this.handleConfirmClick}
                 >
                   {{ default: () => this.locale.confirm }}