naive-ui 2.37.0 → 2.37.2

package/es/tree-select/src/TreeSelect.d.ts

@@ -1192,7 +1192,7 @@ declare const _default: import("vue").DefineComponent<{
     } | null>;
     treeInstRef: import("vue").Ref<{
         handleKeydown: (e: KeyboardEvent) => {
-            enterBehavoir: TreeOverrideNodeClickBehaviorReturn | null;
+            enterBehavior: TreeOverrideNodeClickBehaviorReturn | null;
         };
     } | null>;
     mergedClsPrefix: import("vue").Ref<string>;

package/es/tree-select/src/TreeSelect.mjs

@@ -504,17 +504,17 @@ export default defineComponent({
         return treeInst.handleKeydown(e);
       }
       return {
-        enterBehavoir: null
+        enterBehavior: null
       };
     }
     function handleKeydown(e) {
       if (e.key === 'Enter') {
         if (mergedShowRef.value) {
           const {
-            enterBehavoir
+            enterBehavior
           } = treeHandleKeydown(e);
           if (!props.multiple) {
-            switch (enterBehavoir) {
+            switch (enterBehavior) {
               case 'default':
               case 'toggleSelect':
                 closeMenu();

package/es/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "2.37.0";
+declare const _default: "2.37.2";
 export default _default;

package/es/version.mjs

@@ -1 +1 @@
-export default '2.37.0';
+export default '2.37.2';

package/lib/_internal/clear/src/Clear.js

@@ -24,9 +24,7 @@ exports.default = (0, vue_1.defineComponent)({
         (0, _mixins_1.useStyle)('-base-clear', index_cssr_1.default, (0, vue_1.toRef)(props, 'clsPrefix'));
         return {
             handleMouseDown(e) {
-                var _a;
                 e.preventDefault();
-                (_a = props.onClear) === null || _a === void 0 ? void 0 : _a.call(props, e);
             }
         };
     },

package/lib/auto-complete/src/AutoComplete.d.ts

@@ -41,6 +41,7 @@ export declare const autoCompleteProps: {
     readonly blurAfterSelect: BooleanConstructor;
     readonly clearAfterSelect: BooleanConstructor;
     readonly getShow: PropType<(inputValue: string) => boolean>;
+    readonly showEmpty: BooleanConstructor;
     readonly inputProps: PropType<InputHTMLAttributes>;
     readonly renderOption: PropType<RenderOption>;
     readonly renderLabel: PropType<RenderLabel>;
@@ -448,6 +449,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly blurAfterSelect: BooleanConstructor;
     readonly clearAfterSelect: BooleanConstructor;
     readonly getShow: PropType<(inputValue: string) => boolean>;
+    readonly showEmpty: BooleanConstructor;
     readonly inputProps: PropType<InputHTMLAttributes>;
     readonly renderOption: PropType<RenderOption>;
     readonly renderLabel: PropType<RenderLabel>;
@@ -1157,6 +1159,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly blurAfterSelect: BooleanConstructor;
     readonly clearAfterSelect: BooleanConstructor;
     readonly getShow: PropType<(inputValue: string) => boolean>;
+    readonly showEmpty: BooleanConstructor;
     readonly inputProps: PropType<InputHTMLAttributes>;
     readonly renderOption: PropType<RenderOption>;
     readonly renderLabel: PropType<RenderLabel>;
@@ -1538,5 +1541,6 @@ declare const _default: import("vue").DefineComponent<{
     readonly defaultValue: string | null;
     readonly blurAfterSelect: boolean;
     readonly clearAfterSelect: boolean;
+    readonly showEmpty: boolean;
 }, {}>;
 export default _default;

package/lib/auto-complete/src/AutoComplete.js

@@ -36,7 +36,7 @@ exports.autoCompleteProps = Object.assign(Object.assign({}, _mixins_1.useTheme.p
     }, placeholder: String, placement: {
         type: String,
         default: 'bottom-start'
-    }, value: String, blurAfterSelect: Boolean, clearAfterSelect: Boolean, getShow: Function, inputProps: Object, renderOption: Function, renderLabel: Function, size: String, options: {
+    }, value: String, blurAfterSelect: Boolean, clearAfterSelect: Boolean, getShow: Function, showEmpty: Boolean, inputProps: Object, renderOption: Function, renderLabel: Function, size: String, options: {
         type: Array,
         default: () => []
     }, zIndex: Number, status: String, 'onUpdate:value': [Function, Array], onUpdateValue: [Function, Array], onSelect: [Function, Array], onBlur: [Function, Array], onFocus: [Function, Array], 
@@ -77,7 +77,7 @@ exports.default = (0, vue_1.defineComponent)({
         const activeRef = (0, vue_1.computed)(() => {
             return (mergedShowOptionsRef.value &&
                 canBeActivatedRef.value &&
-                !!selectOptionsRef.value.length);
+                (props.showEmpty ? true : !!selectOptionsRef.value.length));
         });
         const treeMateRef = (0, vue_1.computed)(() => (0, treemate_1.createTreeMate)(selectOptionsRef.value, (0, utils_1.createTmOptions)('value', 'children')));
         function doUpdateValue(value) {
@@ -282,7 +282,7 @@ exports.default = (0, vue_1.defineComponent)({
                                     ], style: [
                                         menuProps === null || menuProps === void 0 ? void 0 : menuProps.style,
                                         this.cssVars
-                                    ], treeMate: this.treeMate, multiple: false, renderLabel: this.renderLabel, renderOption: this.renderOption, size: "medium", onToggle: this.handleToggle })), [
+                                    ], treeMate: this.treeMate, multiple: false, renderLabel: this.renderLabel, renderOption: this.renderOption, size: "medium", onToggle: this.handleToggle }), { empty: () => { var _a, _b; return (_b = (_a = this.$slots).empty) === null || _b === void 0 ? void 0 : _b.call(_a); } }), [
                                     [
                                         vdirs_1.clickoutside,
                                         this.handleClickOutsideMenu,

package/lib/collapse/src/Collapse.d.ts

@@ -19,6 +19,10 @@ export declare const collapseProps: {
         readonly type: PropType<"show" | "if">;
         readonly default: "if";
     };
+    readonly triggerAreas: {
+        readonly type: PropType<("extra" | "main" | "arrow")[]>;
+        readonly default: () => string[];
+    };
     readonly onItemHeaderClick: PropType<MaybeArray<OnItemHeaderClick>>;
     readonly 'onUpdate:expandedNames': PropType<MaybeArray<OnUpdateExpandedNames>>;
     readonly onUpdateExpandedNames: PropType<MaybeArray<OnUpdateExpandedNames>>;
@@ -94,6 +98,10 @@ declare const _default: import("vue").DefineComponent<{
         readonly type: PropType<"show" | "if">;
         readonly default: "if";
     };
+    readonly triggerAreas: {
+        readonly type: PropType<("extra" | "main" | "arrow")[]>;
+        readonly default: () => string[];
+    };
     readonly onItemHeaderClick: PropType<MaybeArray<OnItemHeaderClick>>;
     readonly 'onUpdate:expandedNames': PropType<MaybeArray<OnUpdateExpandedNames>>;
     readonly onUpdateExpandedNames: PropType<MaybeArray<OnUpdateExpandedNames>>;
@@ -302,6 +310,10 @@ declare const _default: import("vue").DefineComponent<{
         readonly type: PropType<"show" | "if">;
         readonly default: "if";
     };
+    readonly triggerAreas: {
+        readonly type: PropType<("extra" | "main" | "arrow")[]>;
+        readonly default: () => string[];
+    };
     readonly onItemHeaderClick: PropType<MaybeArray<OnItemHeaderClick>>;
     readonly 'onUpdate:expandedNames': PropType<MaybeArray<OnUpdateExpandedNames>>;
     readonly onUpdateExpandedNames: PropType<MaybeArray<OnUpdateExpandedNames>>;
@@ -354,6 +366,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly defaultExpandedNames: string | number | (string | number)[] | null;
     readonly arrowPlacement: "left" | "right";
     readonly accordion: boolean;
+    readonly triggerAreas: ("extra" | "main" | "arrow")[];
     readonly onExpandedNamesChange: MaybeArray<OnUpdateExpandedNames> | undefined;
 }, {}>;
 export default _default;

package/lib/collapse/src/Collapse.js

@@ -23,6 +23,9 @@ exports.collapseProps = Object.assign(Object.assign({}, _mixins_1.useTheme.props
     }, displayDirective: {
         type: String,
         default: 'if'
+    }, triggerAreas: {
+        type: Array,
+        default: () => ['main', 'extra', 'arrow']
     }, onItemHeaderClick: [Function, Array], 'onUpdate:expandedNames': [Function, Array], onUpdateExpandedNames: [Function, Array], 
     // deprecated
     onExpandedNamesChange: {

package/lib/collapse/src/CollapseItem.d.ts

@@ -20,6 +20,7 @@ declare const _default: import("vue").DefineComponent<{
     randomName: string;
     mergedClsPrefix: import("vue").Ref<string>;
     collapsed: import("vue").ComputedRef<boolean>;
+    triggerAreas: import("vue").Ref<("extra" | "main" | "arrow")[]>;
     mergedDisplayDirective: import("vue").ComputedRef<"show" | "if">;
     arrowPlacement: import("vue").ComputedRef<"left" | "right">;
     handleClick(e: MouseEvent): void;

package/lib/collapse/src/CollapseItem.js

@@ -54,6 +54,7 @@ exports.default = (0, vue_1.defineComponent)({
             randomName,
             mergedClsPrefix: mergedClsPrefixRef,
             collapsed: collapsedRef,
+            triggerAreas: (0, vue_1.toRef)(collapseProps, 'triggerAreas'),
             mergedDisplayDirective: (0, vue_1.computed)(() => {
                 const { displayDirective } = props;
                 if (displayDirective) {
@@ -67,6 +68,14 @@ exports.default = (0, vue_1.defineComponent)({
                 return collapseProps.arrowPlacement;
             }),
             handleClick(e) {
+                let happensInArea = 'main';
+                if ((0, seemly_1.happensIn)(e, 'arrow'))
+                    happensInArea = 'arrow';
+                if ((0, seemly_1.happensIn)(e, 'extra'))
+                    happensInArea = 'extra';
+                if (!collapseProps.triggerAreas.includes(happensInArea)) {
+                    return;
+                }
                 if (NCollapse && !props.disabled) {
                     NCollapse.toggleItem(collapsedRef.value, mergedNameRef.value, e);
                 }
@@ -74,7 +83,7 @@ exports.default = (0, vue_1.defineComponent)({
         };
     },
     render() {
-        const { collapseSlots, $slots, arrowPlacement, collapsed, mergedDisplayDirective, mergedClsPrefix, disabled } = this;
+        const { collapseSlots, $slots, arrowPlacement, collapsed, mergedDisplayDirective, mergedClsPrefix, disabled, triggerAreas } = this;
         const headerNode = (0, _utils_1.resolveSlotWithProps)($slots.header, { collapsed }, () => [this.title]);
         const headerExtraSlot = $slots['header-extra'] || collapseSlots['header-extra'];
         const arrowSlot = $slots.arrow || collapseSlots.arrow;
@@ -82,7 +91,10 @@ exports.default = (0, vue_1.defineComponent)({
                 `${mergedClsPrefix}-collapse-item`,
                 `${mergedClsPrefix}-collapse-item--${arrowPlacement}-arrow-placement`,
                 disabled && `${mergedClsPrefix}-collapse-item--disabled`,
-                !collapsed && `${mergedClsPrefix}-collapse-item--active`
+                !collapsed && `${mergedClsPrefix}-collapse-item--active`,
+                triggerAreas.map((area) => {
+                    return `${mergedClsPrefix}-collapse-item--trigger-area-${area}`;
+                })
             ] },
             (0, vue_1.h)("div", { class: [
                     `${mergedClsPrefix}-collapse-item__header`,
@@ -90,7 +102,7 @@ exports.default = (0, vue_1.defineComponent)({
                 ] },
                 (0, vue_1.h)("div", { class: `${mergedClsPrefix}-collapse-item__header-main`, onClick: this.handleClick },
                     arrowPlacement === 'right' && headerNode,
-                    (0, vue_1.h)("div", { class: `${mergedClsPrefix}-collapse-item-arrow`, key: this.rtlEnabled ? 0 : 1 }, (0, _utils_1.resolveSlotWithProps)(arrowSlot, { collapsed }, () => {
+                    (0, vue_1.h)("div", { class: `${mergedClsPrefix}-collapse-item-arrow`, key: this.rtlEnabled ? 0 : 1, "data-arrow": true }, (0, _utils_1.resolveSlotWithProps)(arrowSlot, { collapsed }, () => {
                         var _a;
                         return [
                             (0, vue_1.h)(_internal_1.NBaseIcon, { clsPrefix: mergedClsPrefix }, {
@@ -99,7 +111,7 @@ exports.default = (0, vue_1.defineComponent)({
                         ];
                     })),
                     arrowPlacement === 'left' && headerNode),
-                (0, _utils_1.resolveWrappedSlotWithProps)(headerExtraSlot, { collapsed }, (children) => ((0, vue_1.h)("div", { class: `${mergedClsPrefix}-collapse-item__header-extra`, onClick: this.handleClick }, children)))),
+                (0, _utils_1.resolveWrappedSlotWithProps)(headerExtraSlot, { collapsed }, (children) => ((0, vue_1.h)("div", { class: `${mergedClsPrefix}-collapse-item__header-extra`, onClick: this.handleClick, "data-extra": true }, children)))),
             (0, vue_1.h)(CollapseItemContent_1.default, { clsPrefix: mergedClsPrefix, displayDirective: mergedDisplayDirective, show: !collapsed }, $slots)));
     }
 });

package/lib/collapse/src/styles/index.cssr.js

@@ -31,7 +31,7 @@ exports.default = (0, cssr_1.cB)('collapse', 'width: 100%;', [(0, cssr_1.cB)('co
  color: var(--n-arrow-color-disabled);
  `)])]), (0, cssr_1.cB)('collapse-item', 'margin-left: 32px;'), (0, cssr_1.c)('&:first-child', 'margin-top: 0;'), (0, cssr_1.c)('&:first-child >', [(0, cssr_1.cE)('header', 'padding-top: 0;')]), (0, cssr_1.cM)('left-arrow-placement', [(0, cssr_1.cE)('header', [(0, cssr_1.cB)('collapse-item-arrow', 'margin-right: 4px;')])]), (0, cssr_1.cM)('right-arrow-placement', [(0, cssr_1.cE)('header', [(0, cssr_1.cB)('collapse-item-arrow', 'margin-left: 4px;')])]), (0, cssr_1.cE)('content-wrapper', [(0, cssr_1.cE)('content-inner', 'padding-top: 16px;'), (0, fade_in_height_expand_cssr_1.fadeInHeightExpandTransition)({
   duration: '0.15s'
-})]), (0, cssr_1.cM)('active', [(0, cssr_1.cE)('header', [(0, cssr_1.cM)('active', [(0, cssr_1.cB)('collapse-item-arrow', 'transform: rotate(90deg);')])])]), (0, cssr_1.c)('&:not(:first-child)', 'border-top: 1px solid var(--n-divider-color);'), (0, cssr_1.cE)('header', `
+})]), (0, cssr_1.cM)('active', [(0, cssr_1.cE)('header', [(0, cssr_1.cM)('active', [(0, cssr_1.cB)('collapse-item-arrow', 'transform: rotate(90deg);')])])]), (0, cssr_1.c)('&:not(:first-child)', 'border-top: 1px solid var(--n-divider-color);'), (0, cssr_1.cNotM)('disabled', [(0, cssr_1.cM)('trigger-area-main', [(0, cssr_1.cE)('header', [(0, cssr_1.cE)('header-main', 'cursor: pointer;'), (0, cssr_1.cB)('collapse-item-arrow', 'cursor: default;')])]), (0, cssr_1.cM)('trigger-area-arrow', [(0, cssr_1.cE)('header', [(0, cssr_1.cB)('collapse-item-arrow', 'cursor: pointer;')])]), (0, cssr_1.cM)('trigger-area-extra', [(0, cssr_1.cE)('header', [(0, cssr_1.cE)('header-extra', 'cursor: pointer;')])])]), (0, cssr_1.cE)('header', `
  font-size: var(--n-title-font-size);
  display: flex;
  flex-wrap: nowrap;
@@ -48,7 +48,6 @@ exports.default = (0, cssr_1.cB)('collapse', 'width: 100%;', [(0, cssr_1.cB)('co
  transition: color .3s var(--n-bezier);
  flex: 1;
  color: var(--n-title-text-color);
- cursor: pointer;
  `), (0, cssr_1.cE)('header-extra', `
  display: flex;
  align-items: center;

package/lib/data-table/src/utils.js

@@ -159,9 +159,12 @@ function formatCsvCell(value) {
     }
 }
 function generateCsv(columns, data) {
-    const header = columns.map((col) => col.title).join(',');
+    const exportableColumns = columns.filter((column) => column.type !== 'expand' && column.type !== 'selection');
+    const header = exportableColumns.map((col) => col.title).join(',');
     const rows = data.map((row) => {
-        return columns.map((col) => formatCsvCell(row[col.key])).join(',');
+        return exportableColumns
+            .map((col) => formatCsvCell(row[col.key]))
+            .join(',');
     });
     return [header, ...rows].join('\n');
 }

package/lib/date-picker/src/interface.d.ts

@@ -71,8 +71,27 @@ export type DatePickerInjection = {
 } & ReturnType<typeof uniCalendarValidation> & ReturnType<typeof dualCalendarValidation>;
 export declare const datePickerInjectionKey: import("vue").InjectionKey<DatePickerInjection>;
 export type IsDateDisabled = IsSingleDateDisabled | IsRangeDateDisabled;
-export type IsSingleDateDisabled = (date: number) => boolean;
-export type IsRangeDateDisabled = (date: number, position: 'start' | 'end', value: [number, number] | null) => boolean;
+export type IsSingleDateDisabledDetail = {
+    type: 'date';
+    year: number;
+    month: number;
+    date: number;
+} | {
+    type: 'month';
+    year: number;
+    month: number;
+} | {
+    type: 'year';
+    year: number;
+} | {
+    type: 'quarter';
+    year: number;
+    quarter: number;
+} | {
+    type: 'input';
+};
+export type IsSingleDateDisabled = (timestamp: number, detail: IsSingleDateDisabledDetail) => boolean;
+export type IsRangeDateDisabled = (timestamp: number, position: 'start' | 'end', value: [number, number] | null) => boolean;
 export interface TimeValidator {
     isHourDisabled?: IsHourDisabled;
     isMinuteDisabled?: IsMinuteDisabled;

package/lib/date-picker/src/panel/date.d.ts

@@ -1170,7 +1170,7 @@ declare const _default: import("vue").DefineComponent<{
     calendarYear: import("vue").ComputedRef<string>;
     calendarMonth: import("vue").ComputedRef<string>;
     weekdays: import("vue").ComputedRef<string[]>;
-    mergedIsDateDisabled: (ts: number) => boolean;
+    mergedIsDateDisabled: (ts: number, detail: import("../interface").IsSingleDateDisabledDetail) => boolean;
     nextYear: () => void;
     prevYear: () => void;
     nextMonth: () => void;

package/lib/date-picker/src/panel/date.js

@@ -57,7 +57,12 @@ exports.default = (0, vue_1.defineComponent)({
                             [`${mergedClsPrefix}-date-panel-date--current`]: dateItem.isCurrentDate,
                             [`${mergedClsPrefix}-date-panel-date--selected`]: dateItem.selected,
                             [`${mergedClsPrefix}-date-panel-date--excluded`]: !dateItem.inCurrentMonth,
-                            [`${mergedClsPrefix}-date-panel-date--disabled`]: this.mergedIsDateDisabled(dateItem.ts),
+                            [`${mergedClsPrefix}-date-panel-date--disabled`]: this.mergedIsDateDisabled(dateItem.ts, {
+                                type: 'date',
+                                year: dateItem.dateObject.year,
+                                month: dateItem.dateObject.month,
+                                date: dateItem.dateObject.date
+                            }),
                             [`${mergedClsPrefix}-date-panel-date--week-hovered`]: this.isWeekHovered(dateItem),
                             [`${mergedClsPrefix}-date-panel-date--week-selected`]: dateItem.inSelectedWeek
                         }

package/lib/date-picker/src/panel/datetime.d.ts

@@ -1147,7 +1147,7 @@ declare const _default: import("vue").DefineComponent<{
     calendarYear: import("vue").ComputedRef<string>;
     calendarMonth: import("vue").ComputedRef<string>;
     weekdays: import("vue").ComputedRef<string[]>;
-    mergedIsDateDisabled: (ts: number) => boolean;
+    mergedIsDateDisabled: (ts: number, detail: import("../interface").IsSingleDateDisabledDetail) => boolean;
     nextYear: () => void;
     prevYear: () => void;
     nextMonth: () => void;

package/lib/date-picker/src/panel/datetime.js

@@ -51,7 +51,12 @@ exports.default = (0, vue_1.defineComponent)({
                             [`${mergedClsPrefix}-date-panel-date--current`]: dateItem.isCurrentDate,
                             [`${mergedClsPrefix}-date-panel-date--selected`]: dateItem.selected,
                             [`${mergedClsPrefix}-date-panel-date--excluded`]: !dateItem.inCurrentMonth,
-                            [`${mergedClsPrefix}-date-panel-date--disabled`]: this.mergedIsDateDisabled(dateItem.ts)
+                            [`${mergedClsPrefix}-date-panel-date--disabled`]: this.mergedIsDateDisabled(dateItem.ts, {
+                                type: 'date',
+                                year: dateItem.dateObject.year,
+                                month: dateItem.dateObject.month,
+                                date: dateItem.dateObject.date
+                            })
                         }
                     ], onClick: () => {
                         this.handleDateClick(dateItem);

package/lib/date-picker/src/panel/month.d.ts

@@ -1155,7 +1155,7 @@ declare const _default: import("vue").DefineComponent<{
     calendarYear: import("vue").ComputedRef<string>;
     calendarMonth: import("vue").ComputedRef<string>;
     weekdays: import("vue").ComputedRef<string[]>;
-    mergedIsDateDisabled: (ts: number) => boolean;
+    mergedIsDateDisabled: (ts: number, detail: import("../interface").IsSingleDateDisabledDetail) => boolean;
     nextYear: () => void;
     prevYear: () => void;
     nextMonth: () => void;

package/lib/date-picker/src/panel/month.js

@@ -45,7 +45,24 @@ exports.default = (0, vue_1.defineComponent)({
                     item.selected &&
                         `${mergedClsPrefix}-date-panel-month-calendar__picker-col-item--selected`,
                     !useAsQuickJump &&
-                        mergedIsDateDisabled(item.ts) &&
+                        mergedIsDateDisabled(item.ts, item.type === 'year'
+                            ? {
+                                type: 'year',
+                                year: item.dateObject.year
+                            }
+                            : item.type === 'month'
+                                ? {
+                                    type: 'month',
+                                    year: item.dateObject.year,
+                                    month: item.dateObject.month
+                                }
+                                : item.type === 'quarter'
+                                    ? {
+                                        type: 'month',
+                                        year: item.dateObject.year,
+                                        month: item.dateObject.quarter
+                                    }
+                                    : null) &&
                         `${mergedClsPrefix}-date-panel-month-calendar__picker-col-item--disabled`
                 ], onClick: () => {
                     useAsQuickJump

package/lib/date-picker/src/panel/panelHeader.d.ts

@@ -1175,7 +1175,7 @@ declare const _default: import("vue").DefineComponent<{
         calendarYear: import("vue").ComputedRef<string>;
         calendarMonth: import("vue").ComputedRef<string>;
         weekdays: import("vue").ComputedRef<string[]>;
-        mergedIsDateDisabled: (ts: number) => boolean;
+        mergedIsDateDisabled: (ts: number, detail: import("../interface").IsSingleDateDisabledDetail) => boolean;
         nextYear: () => void;
         prevYear: () => void;
         nextMonth: () => void;
@@ -2385,7 +2385,7 @@ declare const _default: import("vue").DefineComponent<{
         calendarYear: import("vue").ComputedRef<string>;
         calendarMonth: import("vue").ComputedRef<string>;
         weekdays: import("vue").ComputedRef<string[]>;
-        mergedIsDateDisabled: (ts: number) => boolean;
+        mergedIsDateDisabled: (ts: number, detail: import("../interface").IsSingleDateDisabledDetail) => boolean;
         nextYear: () => void;
         prevYear: () => void;
         nextMonth: () => void;

package/lib/date-picker/src/panel/use-calendar.d.ts

@@ -1,7 +1,7 @@
 import { type ExtractPropTypes, type PropType } from 'vue';
 import type { VirtualListInst } from 'vueuc';
 import type { ScrollbarInst } from '../../../_internal';
-import type { Shortcuts } from '../interface';
+import type { IsSingleDateDisabledDetail, Shortcuts } from '../interface';
 import type { DateItem, MonthItem, YearItem, QuarterItem } from '../utils';
 declare const useCalendarProps: {
     readonly actions: {
@@ -1147,7 +1147,7 @@ declare function useCalendar(props: ExtractPropTypes<typeof useCalendarProps>, t
     calendarYear: import("vue").ComputedRef<string>;
     calendarMonth: import("vue").ComputedRef<string>;
     weekdays: import("vue").ComputedRef<string[]>;
-    mergedIsDateDisabled: (ts: number) => boolean;
+    mergedIsDateDisabled: (ts: number, detail: IsSingleDateDisabledDetail) => boolean;
     nextYear: () => void;
     prevYear: () => void;
     nextMonth: () => void;

package/lib/date-picker/src/panel/use-calendar.js

@@ -110,11 +110,11 @@ function useCalendar(props, type) {
         }
         return (0, date_fns_1.getTime)((0, date_fns_1.startOfDay)(value));
     }
-    function mergedIsDateDisabled(ts) {
+    function mergedIsDateDisabled(ts, detail) {
         const { isDateDisabled: { value: isDateDisabled } } = validation;
         if (!isDateDisabled)
             return false;
-        return isDateDisabled(ts);
+        return isDateDisabled(ts, detail);
     }
     function handleDateInput(value) {
         const date = (0, utils_1.strictParse)(value, mergedDateFormatRef.value, new Date(), panelCommon.dateFnsOptions.value);
@@ -184,7 +184,26 @@ function useCalendar(props, type) {
         return false;
     }
     function handleDateClick(dateItem) {
-        if (mergedIsDateDisabled(dateItem.ts)) {
+        if (mergedIsDateDisabled(dateItem.ts, dateItem.type === 'date'
+            ? {
+                type: 'date',
+                year: dateItem.dateObject.year,
+                month: dateItem.dateObject.month,
+                date: dateItem.dateObject.date
+            }
+            : dateItem.type === 'month'
+                ? {
+                    type: 'month',
+                    year: dateItem.dateObject.year,
+                    month: dateItem.dateObject.month
+                }
+                : dateItem.type === 'year'
+                    ? { type: 'year', year: dateItem.dateObject.year }
+                    : {
+                        type: 'quarter',
+                        year: dateItem.dateObject.year,
+                        quarter: dateItem.dateObject.quarter
+                    })) {
             return;
         }
         let newValue;

package/lib/date-picker/src/panel/use-dual-calendar.js

@@ -227,8 +227,9 @@ function useDualCalendar(props, type) {
         const isDateDisabled = isDateDisabledRef.value;
         if (!isDateDisabled)
             return false;
-        if (!Array.isArray(props.value))
+        if (!Array.isArray(props.value)) {
             return isDateDisabled(ts, 'start', null);
+        }
         if (selectingPhaseRef.value === 'start') {
             // before you really start to select
             return isDateDisabled(ts, 'start', null);

package/lib/date-picker/src/validation-utils.js

@@ -34,7 +34,7 @@ function uniCalendarValidation(props, mergedValueRef) {
             !isDateDisabled) {
             return false;
         }
-        return isDateDisabled(value);
+        return isDateDisabled(value, { type: 'input' });
     });
     const isTimeInvalidRef = (0, vue_1.computed)(() => {
         const { type } = props;

package/lib/form/src/Form.js

@@ -59,7 +59,7 @@ exports.default = (0, vue_1.defineComponent)({
         };
         function validate(validateCallback, shouldRuleBeApplied = () => true) {
             return __awaiter(this, void 0, void 0, function* () {
-                yield new Promise((resolve, reject) => {
+                return yield new Promise((resolve, reject) => {
                     const formItemValidationPromises = [];
                     for (const key of (0, _utils_1.keysOf)(formItems)) {
                         const formItemInstances = formItems[key];
@@ -71,21 +71,29 @@ exports.default = (0, vue_1.defineComponent)({
                     }
                     void Promise.all(formItemValidationPromises).then((results) => {
                         const formInvalid = results.some((result) => !result.valid);
-                        const errors = results
-                            .filter((result) => { var _a; return (_a = result.errors) === null || _a === void 0 ? void 0 : _a.length; })
-                            .map((result) => result.errors);
-                        const warnings = results
-                            .filter((result) => { var _a; return (_a = result.warnings) === null || _a === void 0 ? void 0 : _a.length; })
-                            .map((result) => result.warnings);
+                        const errors = [];
+                        const warnings = [];
+                        results.forEach((result) => {
+                            var _a, _b;
+                            if ((_a = result.errors) === null || _a === void 0 ? void 0 : _a.length) {
+                                errors.push(result.errors);
+                            }
+                            if ((_b = result.warnings) === null || _b === void 0 ? void 0 : _b.length) {
+                                warnings.push(result.warnings);
+                            }
+                        });
                         if (validateCallback) {
-                            validateCallback((errors === null || errors === void 0 ? void 0 : errors.length) ? errors : undefined, {
-                                warnings: (warnings === null || warnings === void 0 ? void 0 : warnings.length)
-                                    ? warnings
-                                    : undefined
+                            validateCallback(errors.length ? errors : undefined, {
+                                warnings: warnings.length ? warnings : undefined
                             });
                         }
+                        if (formInvalid) {
+                            reject(errors.length ? errors : undefined);
+                        }
                         else {
-                            formInvalid ? reject(errors) : resolve();
+                            resolve({
+                                warnings: warnings.length ? warnings : undefined
+                            });
                         }
                     });
                 });

package/lib/form/src/FormItem.js

@@ -130,13 +130,13 @@ exports.default = (0, vue_1.defineComponent)({
                     shouldRuleBeApplied = options.shouldRuleBeApplied;
                     asyncValidatorOptions = options.options;
                 }
-                yield new Promise((resolve, reject) => {
+                return yield new Promise((resolve, reject) => {
                     void internalValidate(trigger, shouldRuleBeApplied, asyncValidatorOptions).then(({ valid, errors, warnings }) => {
                         if (valid) {
                             if (validateCallback) {
                                 validateCallback(undefined, { warnings });
                             }
-                            resolve();
+                            resolve({ warnings });
                         }
                         else {
                             if (validateCallback) {

package/lib/form/src/interface.d.ts

@@ -28,7 +28,11 @@ export interface FormItemInternalValidateResult {
     warnings: ValidateError[] | undefined;
 }
 export type FormItemInternalValidate = (trigger: ValidationTrigger | string | null | undefined, shouldRuleBeApplied?: ShouldRuleBeApplied, options?: ValidateOption) => Promise<FormItemInternalValidateResult>;
-export type FormItemValidate = ((options: FormItemValidateOptions) => Promise<void>) & ((trigger?: string, callback?: ValidateCallback) => Promise<void>);
+export type FormItemValidate = ((options: FormItemValidateOptions) => Promise<{
+    warnings: ValidateError[] | undefined;
+}>) & ((trigger?: string, callback?: ValidateCallback) => Promise<{
+    warnings: ValidateError[] | undefined;
+}>);
 export interface FormItemInst {
     validate: FormItemValidate;
     restoreValidation: () => void;
@@ -53,7 +57,9 @@ export type ValidateCallback = (errors: ValidateError[] | undefined, extra: {
 export type FormValidateCallback = (errors: ValidateError[][] | undefined, extra: {
     warnings: ValidateError[][] | undefined;
 }) => void;
-export type FormValidate = (callback?: FormValidateCallback, shouldRuleBeApplied?: ShouldRuleBeApplied) => Promise<void>;
+export type FormValidate = (callback?: FormValidateCallback, shouldRuleBeApplied?: ShouldRuleBeApplied) => Promise<{
+    warnings: ValidateError[][] | undefined;
+}>;
 export type FormValidationError = ValidateError[];
 export interface FormInst {
     validate: FormValidate;

package/lib/tree/src/Tree.d.ts

@@ -1224,7 +1224,7 @@ declare const _default: import("vue").DefineComponent<{
     themeClass: import("vue").Ref<string> | undefined;
     onRender: (() => void) | undefined;
     handleKeydown: (e: KeyboardEvent) => {
-        enterBehavoir: import("./interface").TreeOverrideNodeClickBehaviorReturn | null;
+        enterBehavior: import("./interface").TreeOverrideNodeClickBehaviorReturn | null;
     };
     scrollTo: import("vueuc").VirtualListScrollTo;
     getCheckedData: () => {

package/lib/tree/src/interface.d.ts

@@ -124,7 +124,7 @@ export interface MotionData {
 }
 export interface InternalTreeInst {
     handleKeydown: (e: KeyboardEvent) => {
-        enterBehavoir: TreeOverrideNodeClickBehaviorReturn | null;
+        enterBehavior: TreeOverrideNodeClickBehaviorReturn | null;
     };
 }
 export interface TreeInst {

package/lib/tree/src/keyboard.d.ts

@@ -16,6 +16,6 @@ export declare function useKeyboard({ props, fNodesRef, mergedExpandedKeysRef, m
 }): {
     pendingNodeKeyRef: Ref<null | Key>;
     handleKeydown: (e: KeyboardEvent) => {
-        enterBehavoir: TreeOverrideNodeClickBehaviorReturn | null;
+        enterBehavior: TreeOverrideNodeClickBehaviorReturn | null;
     };
 };