naive-ui 2.19.7 → 2.19.11

package/es/upload/src/Upload.js

@@ -50,8 +50,7 @@ function createXhrHandlers(inst, file, XHR) {
         handleXHRError(e) {
             const fileAfterChange = Object.assign({}, file, {
                 status: 'error',
-                percentage,
-                file: null
+                percentage
             });
             XhrMap.delete(file.id);
             doChange(fileAfterChange, e);
@@ -162,7 +161,7 @@ const uploadProps = Object.assign(Object.assign({}, useTheme.props), { name: {
     }, listType: {
         type: String,
         default: 'text'
-    }, onPreview: Function, createThumbnailUrl: Function, abstract: Boolean });
+    }, onPreview: Function, createThumbnailUrl: Function, abstract: Boolean, max: Number });
 export default defineComponent({
     name: 'Upload',
     props: uploadProps,
@@ -173,7 +172,13 @@ export default defineComponent({
         const { mergedClsPrefixRef } = useConfig(props);
         const themeRef = useTheme('Upload', 'Upload', style, uploadLight, props, mergedClsPrefixRef);
         const formItem = useFormItem(props);
-        const { mergedDisabledRef } = formItem;
+        const maxReachedRef = computed(() => {
+            const { max } = props;
+            if (max !== undefined) {
+                return mergedFileListRef.value.length >= max;
+            }
+            return false;
+        });
         const uncontrolledFileListRef = ref(props.defaultFileList);
         const controlledFileListRef = toRef(props, 'fileList');
         const inputElRef = ref(null);
@@ -205,7 +210,11 @@ export default defineComponent({
             if (!files || files.length === 0)
                 return;
             const { onBeforeUpload } = props;
-            const filesAsArray = props.multiple ? Array.from(files) : [files[0]];
+            let filesAsArray = props.multiple ? Array.from(files) : [files[0]];
+            const { max } = props;
+            if (max) {
+                filesAsArray = filesAsArray.slice(0, max - mergedFileListRef.value.length);
+            }
             void Promise.all(filesAsArray.map((file) => __awaiter(this, void 0, void 0, function* () {
                 const fileInfo = {
                     id: createId(),
@@ -332,7 +341,6 @@ export default defineComponent({
         provide(uploadInjectionKey, {
             mergedClsPrefixRef,
             mergedThemeRef: themeRef,
-            disabledRef: mergedDisabledRef,
             showCancelButtonRef: toRef(props, 'showCancelButton'),
             showDownloadButtonRef: toRef(props, 'showDownloadButton'),
             showRemoveButtonRef: toRef(props, 'showRemoveButton'),
@@ -351,7 +359,8 @@ export default defineComponent({
             openFileDialog,
             draggerInsideRef,
             handleFileAddition,
-            mergedDisabledRef,
+            mergedDisabledRef: formItem.mergedDisabledRef,
+            maxReachedRef,
             fileListStyleRef: toRef(props, 'fileListStyle'),
             abstractRef: toRef(props, 'abstract'),
             cssVarsRef

package/es/upload/src/UploadFile.js

@@ -169,7 +169,7 @@ export default defineComponent({
             progressStatus: progressStatusRef,
             buttonType: buttonTypeRef,
             showProgress: showProgressRef,
-            disabled: NUpload.disabledRef,
+            disabled: NUpload.mergedDisabledRef,
             showCancelButton: showCancelButtonRef,
             showRemoveButton: showRemoveButtonRef,
             showDownloadButton: showDownloadButtonRef,

package/es/upload/src/UploadFileList.js

@@ -12,7 +12,7 @@ export default defineComponent({
         if (!NUpload) {
             throwError('upload-file-list', '`n-upload-file-list` must be placed inside `n-upload`.');
         }
-        const { mergedClsPrefixRef, listTypeRef, mergedFileListRef, fileListStyleRef, cssVarsRef, mergedDisabledRef } = NUpload;
+        const { mergedClsPrefixRef, listTypeRef, mergedFileListRef, fileListStyleRef, cssVarsRef } = NUpload;
         const isImageCardTypeRef = computed(() => listTypeRef.value === 'image-card');
         const renderFileList = () => mergedFileListRef.value.map((file) => (h(NUploadFile, { clsPrefix: mergedClsPrefixRef.value, key: file.id, file: file, listType: listTypeRef.value })));
         const renderUploadFileList = () => isImageCardTypeRef.value ? (h(NImageGroup, null, { default: renderFileList })) : (h(NFadeInExpandTransition, { group: true }, {
@@ -22,8 +22,6 @@ export default defineComponent({
             const { value: mergedClsPrefix } = mergedClsPrefixRef;
             return (h("div", { class: [
                     `${mergedClsPrefix}-upload-file-list`,
-                    mergedDisabledRef.value &&
-                        `${mergedClsPrefix}-upload-file-list--disabled`,
                     isImageCardTypeRef.value &&
                         `${mergedClsPrefix}-upload-file-list--grid`
                 ], style: [cssVarsRef.value, fileListStyleRef.value] },

package/es/upload/src/UploadTrigger.js

@@ -1,4 +1,6 @@
 import { h, defineComponent, inject, computed } from 'vue';
+import { AddIcon } from '../../_internal/icons';
+import { NBaseIcon } from '../../_internal';
 import { throwError } from '../../_utils';
 import { uploadInjectionKey } from './interface';
 import NUploadDragger from './UploadDragger';
@@ -12,10 +14,10 @@ export default defineComponent({
         if (!NUpload) {
             throwError('upload-trigger', '`n-upload-trigger` must be placed inside `n-upload`.');
         }
-        const { mergedClsPrefixRef, mergedDisabledRef, listTypeRef, disabledRef, dragOverRef, openFileDialog, draggerInsideRef, handleFileAddition } = NUpload;
+        const { mergedClsPrefixRef, mergedDisabledRef, maxReachedRef, listTypeRef, dragOverRef, openFileDialog, draggerInsideRef, handleFileAddition } = NUpload;
         const isImageCardTypeRef = computed(() => listTypeRef.value === 'image-card');
         function handleTriggerClick() {
-            if (disabledRef.value)
+            if (mergedDisabledRef.value || maxReachedRef.value)
                 return;
             openFileDialog();
         }
@@ -33,8 +35,11 @@ export default defineComponent({
         }
         function handleTriggerDrop(e) {
             e.preventDefault();
-            if (!draggerInsideRef.value || disabledRef.value)
+            if (!draggerInsideRef.value ||
+                mergedDisabledRef.value ||
+                maxReachedRef.value) {
                 return;
+            }
             const dataTransfer = e.dataTransfer;
             const files = dataTransfer === null || dataTransfer === void 0 ? void 0 : dataTransfer.files;
             if (files) {
@@ -53,11 +58,14 @@ export default defineComponent({
                 handleDragLeave: handleTriggerDragLeave
             })) : (h("div", { class: [
                     `${mergedClsPrefix}-upload-trigger`,
-                    mergedDisabledRef.value &&
+                    (mergedDisabledRef.value || maxReachedRef.value) &&
                         `${mergedClsPrefix}-upload-trigger--disabled`,
                     isImageCardTypeRef.value &&
                         `${mergedClsPrefix}-upload-trigger--image-card`
-                ], onClick: handleTriggerClick, onDrop: handleTriggerDrop, onDragover: handleTriggerDragOver, onDragenter: handleTriggerDragEnter, onDragleave: handleTriggerDragLeave }, isImageCardTypeRef.value ? (h(NUploadDragger, null, slots)) : (slots)));
+                ], onClick: handleTriggerClick, onDrop: handleTriggerDrop, onDragover: handleTriggerDragOver, onDragenter: handleTriggerDragEnter, onDragleave: handleTriggerDragLeave }, isImageCardTypeRef.value ? (h(NUploadDragger, null, {
+                default: slots.default ||
+                    (() => (h(NBaseIcon, { clsPrefix: mergedClsPrefix }, { default: () => h(AddIcon, null) })))
+            })) : (slots)));
         };
     }
 });

package/es/upload/src/interface.d.ts

@@ -41,7 +41,6 @@ export declare type OnUpdateFileList = (fileList: FileInfo[]) => void;
 export interface UploadInjection {
     mergedClsPrefixRef: Ref<string>;
     mergedThemeRef: Ref<MergedTheme<UploadTheme>>;
-    disabledRef: Ref<boolean>;
     showCancelButtonRef: Ref<boolean>;
     showRemoveButtonRef: Ref<boolean>;
     showDownloadButtonRef: Ref<boolean>;
@@ -60,6 +59,7 @@ export interface UploadInjection {
     };
     fileListStyleRef: Ref<string | CSSProperties | undefined>;
     mergedDisabledRef: Ref<boolean>;
+    maxReachedRef: Ref<boolean>;
     abstractRef: Ref<boolean>;
     cssVarsRef: Ref<CSSProperties>;
     submit: (fileId?: string) => void;

package/es/upload/src/styles/index.cssr.js

@@ -35,7 +35,9 @@ export default c([cB('upload', [cM('dragger-inside', [cE('trigger', `
  `), cM('image-card', `
  width: 96px;
  height: 96px;
- `, [cB('upload-dragger', `
+ `, [cB('base-icon', `
+ font-size: 24px;
+ `), cB('upload-dragger', `
  padding: 0;
  height: 100%;
  width: 100%;

package/es/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "2.19.7";
+declare const _default: "2.19.11";
 export default _default;

package/es/version.js

@@ -1 +1 @@
-export default '2.19.7';
+export default '2.19.11';

package/lib/_internal/icons/Add.js

@@ -4,8 +4,7 @@ const vue_1 = require("vue");
 exports.default = (0, vue_1.defineComponent)({
     name: 'Add',
     render() {
-        return ((0, vue_1.h)("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 512 512" },
-            (0, vue_1.h)("line", { x1: "256", y1: "112", x2: "256", y2: "400", style: "fill: none; stroke: currentColor; stroke-linecap: round; stroke-linejoin: round; stroke-width: 32px; " }),
-            (0, vue_1.h)("line", { x1: "400", y1: "256", x2: "112", y2: "256", style: "fill: none; stroke: currentColor; stroke-linecap: round; stroke-linejoin: round; stroke-width: 32px;" })));
+        return ((0, vue_1.h)("svg", { width: "512", height: "512", viewBox: "0 0 512 512", fill: "none", xmlns: "http://www.w3.org/2000/svg" },
+            (0, vue_1.h)("path", { d: "M256 112V400M400 256H112", stroke: "currentColor", "stroke-width": "32", "stroke-linecap": "round", "stroke-linejoin": "round" })));
     }
 });

package/lib/_internal/selection/src/Selection.d.ts

@@ -1,4 +1,4 @@
-import { PropType } from 'vue';
+import { PropType, InputHTMLAttributes } from 'vue';
 import type { SelectBaseOption } from '../../../select/src/interface';
 import { RenderTag } from './interface';
 import type { RenderLabel, RenderLabelImpl } from '../../select-menu/src/interface';
@@ -44,6 +44,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    inputProps: PropType<InputHTMLAttributes>;
     focused: BooleanConstructor;
     renderTag: PropType<RenderTag>;
     onKeyup: PropType<(e: KeyboardEvent) => void>;
@@ -545,6 +546,7 @@ declare const _default: import("vue").DefineComponent<{
     loading?: unknown;
     autofocus?: unknown;
     showArrow?: unknown;
+    inputProps?: unknown;
     focused?: unknown;
     renderTag?: unknown;
     onKeyup?: unknown;
@@ -789,6 +791,7 @@ declare const _default: import("vue").DefineComponent<{
     bordered?: boolean | undefined;
     renderLabel?: RenderLabel | undefined;
     onClear?: ((e: MouseEvent) => void) | undefined;
+    inputProps?: InputHTMLAttributes | undefined;
     renderTag?: RenderTag | undefined;
     onDeleteOption?: ((option: SelectBaseOption) => void) | undefined;
     maxTagCount?: number | "responsive" | undefined;

package/lib/_internal/selection/src/Selection.js

@@ -33,7 +33,7 @@ exports.default = (0, vue_1.defineComponent)({
         }, loading: Boolean, autofocus: Boolean, showArrow: {
             type: Boolean,
             default: true
-        }, focused: Boolean, renderTag: Function, onKeyup: Function, onKeydown: Function, onClick: Function, onBlur: Function, onFocus: Function, onDeleteOption: Function, maxTagCount: [String, Number], onClear: Function, onPatternInput: Function, renderLabel: Function }),
+        }, inputProps: Object, focused: Boolean, renderTag: Function, onKeyup: Function, onKeydown: Function, onClick: Function, onBlur: Function, onFocus: Function, onDeleteOption: Function, maxTagCount: [String, Number], onClear: Function, onPatternInput: Function, renderLabel: Function }),
     setup(props) {
         const patternInputMirrorRef = (0, vue_1.ref)(null);
         const patternInputRef = (0, vue_1.ref)(null);
@@ -410,7 +410,7 @@ exports.default = (0, vue_1.defineComponent)({
                 ? this.selectedOptions.slice(0, maxTagCount)
                 : this.selectedOptions).map(createTag);
             const input = filterable ? ((0, vue_1.h)("div", { class: `${clsPrefix}-base-selection-input-tag`, ref: "inputTagElRef", key: "__input-tag__" },
-                (0, vue_1.h)("input", { ref: "patternInputRef", tabindex: -1, disabled: disabled, value: this.pattern, autofocus: this.autofocus, class: `${clsPrefix}-base-selection-input-tag__input`, onBlur: this.handlePatternInputBlur, onFocus: this.handlePatternInputFocus, onKeydown: this.handlePatternKeyDown, onInput: this.handlePatternInputInput, onCompositionstart: this.handleCompositionStart, onCompositionend: this.handleCompositionEnd }),
+                (0, vue_1.h)("input", Object.assign({}, this.inputProps, { ref: "patternInputRef", tabindex: -1, disabled: disabled, value: this.pattern, autofocus: this.autofocus, class: `${clsPrefix}-base-selection-input-tag__input`, onBlur: this.handlePatternInputBlur, onFocus: this.handlePatternInputFocus, onKeydown: this.handlePatternKeyDown, onInput: this.handlePatternInputInput, onCompositionstart: this.handleCompositionStart, onCompositionend: this.handleCompositionEnd })),
                 (0, vue_1.h)("span", { ref: "patternInputMirrorRef", class: `${clsPrefix}-base-selection-input-tag__mirror` }, this.pattern ? this.pattern : ''))) : null;
             // May Overflow
             const renderCounter = maxTagCountResponsive
@@ -491,7 +491,7 @@ exports.default = (0, vue_1.defineComponent)({
                     (this.active || !this.selected) &&
                     !this.isCompositing;
                 body = ((0, vue_1.h)("div", { ref: "patternInputWrapperRef", class: `${clsPrefix}-base-selection-label` },
-                    (0, vue_1.h)("input", { ref: "patternInputRef", class: `${clsPrefix}-base-selection-input`, value: this.patternInputFocused && this.active ? this.pattern : '', placeholder: "", readonly: disabled, disabled: disabled, tabindex: -1, autofocus: this.autofocus, onFocus: this.handlePatternInputFocus, onBlur: this.handlePatternInputBlur, onInput: this.handlePatternInputInput, onCompositionstart: this.handleCompositionStart, onCompositionend: this.handleCompositionEnd }),
+                    (0, vue_1.h)("input", Object.assign({}, this.inputProps, { ref: "patternInputRef", class: `${clsPrefix}-base-selection-input`, value: this.patternInputFocused && this.active ? this.pattern : '', placeholder: "", readonly: disabled, disabled: disabled, tabindex: -1, autofocus: this.autofocus, onFocus: this.handlePatternInputFocus, onBlur: this.handlePatternInputBlur, onInput: this.handlePatternInputInput, onCompositionstart: this.handleCompositionStart, onCompositionend: this.handleCompositionEnd })),
                     showPlaceholder ? null : this.patternInputFocused &&
                         this.active ? null : ((0, vue_1.h)("div", { class: `${clsPrefix}-base-selection-label__render-label ${clsPrefix}-base-selection-overlay`, key: "input" }, renderTag
                         ? renderTag({

package/lib/anchor/src/AnchorAdapter.d.ts

@@ -19,6 +19,7 @@ declare const anchorProps: {
         readonly type: NumberConstructor;
         readonly default: 12;
     };
+    readonly internalScrollable: BooleanConstructor;
     readonly ignoreGap: BooleanConstructor;
     readonly offsetTarget: import("vue").PropType<string | import("./utils").OffsetTarget | (() => HTMLElement)>;
     readonly listenTo: import("vue").PropType<string | import("../../affix/src/utils").ScrollTarget | (() => HTMLElement) | undefined>;
@@ -104,6 +105,7 @@ declare const _default: import("vue").DefineComponent<{
         readonly type: NumberConstructor;
         readonly default: 12;
     };
+    readonly internalScrollable: BooleanConstructor;
     readonly ignoreGap: BooleanConstructor;
     readonly offsetTarget: import("vue").PropType<string | import("./utils").OffsetTarget | (() => HTMLElement)>;
     readonly listenTo: import("vue").PropType<string | import("../../affix/src/utils").ScrollTarget | (() => HTMLElement) | undefined>;
@@ -178,6 +180,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly showRail?: unknown;
     readonly showBackground?: unknown;
     readonly bound?: unknown;
+    readonly internalScrollable?: unknown;
     readonly ignoreGap?: unknown;
     readonly offsetTarget?: unknown;
     readonly listenTo?: unknown;
@@ -200,6 +203,7 @@ declare const _default: import("vue").DefineComponent<{
     affix: boolean;
     showRail: boolean;
     showBackground: boolean;
+    internalScrollable: boolean;
     ignoreGap: boolean;
 } & {
     bottom?: number | undefined;
@@ -260,6 +264,7 @@ declare const _default: import("vue").DefineComponent<{
     offsetBottom: number | undefined;
     showRail: boolean;
     showBackground: boolean;
+    internalScrollable: boolean;
     ignoreGap: boolean;
 }>;
 export default _default;

package/lib/anchor/src/BaseAnchor.d.ts

@@ -20,10 +20,11 @@ export declare const baseAnchorProps: {
         readonly type: NumberConstructor;
         readonly default: 12;
     };
+    readonly internalScrollable: BooleanConstructor;
     readonly ignoreGap: BooleanConstructor;
     readonly offsetTarget: PropType<string | OffsetTarget | (() => HTMLElement)>;
 };
-export declare const baseAnchorPropKeys: ("type" | "bound" | "showRail" | "showBackground" | "ignoreGap" | "offsetTarget")[];
+export declare const baseAnchorPropKeys: ("type" | "bound" | "showRail" | "showBackground" | "internalScrollable" | "ignoreGap" | "offsetTarget")[];
 declare const _default: import("vue").DefineComponent<{
     mergedClsPrefix: {
         type: StringConstructor;
@@ -45,6 +46,7 @@ declare const _default: import("vue").DefineComponent<{
         readonly type: NumberConstructor;
         readonly default: 12;
     };
+    internalScrollable: BooleanConstructor;
     ignoreGap: BooleanConstructor;
     offsetTarget: PropType<string | OffsetTarget | (() => HTMLElement)>;
 }, {
@@ -61,6 +63,7 @@ declare const _default: import("vue").DefineComponent<{
     showRail?: unknown;
     showBackground?: unknown;
     bound?: unknown;
+    internalScrollable?: unknown;
     ignoreGap?: unknown;
     offsetTarget?: unknown;
 } & {
@@ -69,6 +72,7 @@ declare const _default: import("vue").DefineComponent<{
     mergedClsPrefix: string;
     showRail: boolean;
     showBackground: boolean;
+    internalScrollable: boolean;
     ignoreGap: boolean;
 } & {
     offsetTarget?: string | OffsetTarget | (() => HTMLElement) | undefined;
@@ -77,6 +81,7 @@ declare const _default: import("vue").DefineComponent<{
     bound: number;
     showRail: boolean;
     showBackground: boolean;
+    internalScrollable: boolean;
     ignoreGap: boolean;
 }>;
 export default _default;

package/lib/anchor/src/BaseAnchor.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.baseAnchorPropKeys = exports.baseAnchorProps = void 0;
 const vue_1 = require("vue");
+const lodash_1 = require("lodash");
 const seemly_1 = require("seemly");
 const vooks_1 = require("vooks");
+const _internal_1 = require("../../_internal");
 const _utils_1 = require("../../_utils");
 const Link_1 = require("./Link");
-const lodash_1 = require("lodash");
 const utils_1 = require("./utils");
 exports.baseAnchorProps = {
     type: {
@@ -25,6 +26,7 @@ exports.baseAnchorProps = {
         type: Number,
         default: 12
     },
+    internalScrollable: Boolean,
     ignoreGap: Boolean,
     offsetTarget: [String, Object, Function]
 };
@@ -238,7 +240,7 @@ exports.default = (0, vue_1.defineComponent)({
     render() {
         var _a;
         const { mergedClsPrefix, mergedShowRail, isBlockType, $slots } = this;
-        return ((0, vue_1.h)("div", { class: [
+        const Anchor = ((0, vue_1.h)("div", { class: [
                 `${mergedClsPrefix}-anchor`,
                 isBlockType && `${mergedClsPrefix}-anchor--block`,
                 mergedShowRail && `${mergedClsPrefix}-anchor--show-rail`
@@ -251,5 +253,8 @@ exports.default = (0, vue_1.defineComponent)({
                             `${mergedClsPrefix}-anchor-rail__bar--active`
                     ] }))) : null, (_a = $slots.default) === null || _a === void 0 ? void 0 :
             _a.call($slots)));
+        return this.internalScrollable ? ((0, vue_1.h)(_internal_1.NScrollbar, null, {
+            default: () => Anchor
+        })) : (Anchor);
     }
 });

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

@@ -33,6 +33,7 @@ declare const autoCompleteProps: {
     readonly value: StringConstructor;
     readonly blurAfterSelect: BooleanConstructor;
     readonly clearAfterSelect: BooleanConstructor;
+    readonly getShow: PropType<(inputValue: string) => boolean>;
     readonly size: PropType<"small" | "medium" | "large">;
     readonly options: {
         readonly type: PropType<AutoCompleteOptions>;
@@ -428,6 +429,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly value: StringConstructor;
     readonly blurAfterSelect: BooleanConstructor;
     readonly clearAfterSelect: BooleanConstructor;
+    readonly getShow: PropType<(inputValue: string) => boolean>;
     readonly size: PropType<"small" | "medium" | "large">;
     readonly options: {
         readonly type: PropType<AutoCompleteOptions>;
@@ -1081,6 +1083,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly value?: unknown;
     readonly blurAfterSelect?: unknown;
     readonly clearAfterSelect?: unknown;
+    readonly getShow?: unknown;
     readonly size?: unknown;
     readonly options?: unknown;
     readonly zIndex?: unknown;
@@ -1462,6 +1465,7 @@ declare const _default: import("vue").DefineComponent<{
     clearable?: boolean | undefined;
     "onUpdate:value"?: MaybeArray<OnUpdateValue> | undefined;
     onUpdateValue?: MaybeArray<OnUpdateValue> | undefined;
+    getShow?: ((inputValue: string) => boolean) | undefined;
 }>, {
     disabled: boolean | undefined;
     onInput: MaybeArray<OnUpdateValue> | undefined;

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

@@ -28,7 +28,7 @@ const autoCompleteProps = Object.assign(Object.assign({}, _mixins_1.useTheme.pro
     }, disabled: {
         type: Boolean,
         default: undefined
-    }, placeholder: String, value: String, blurAfterSelect: Boolean, clearAfterSelect: Boolean, size: String, options: {
+    }, placeholder: String, value: String, blurAfterSelect: Boolean, clearAfterSelect: Boolean, getShow: Function, size: String, options: {
         type: Array,
         default: () => []
     }, zIndex: Number, 'onUpdate:value': [Function, Array], onUpdateValue: [Function, Array], onSelect: [Function, Array], onBlur: [Function, Array], onFocus: [Function, Array], 
@@ -61,8 +61,15 @@ exports.default = (0, vue_1.defineComponent)({
         const selectOptionsRef = (0, vue_1.computed)(() => {
             return (0, utils_1.mapAutoCompleteOptionsToSelectOptions)(props.options);
         });
+        const mergedShowOptionsRef = (0, vue_1.computed)(() => {
+            const { getShow } = props;
+            if (getShow) {
+                return getShow(mergedValueRef.value || '');
+            }
+            return !!mergedValueRef.value;
+        });
         const activeRef = (0, vue_1.computed)(() => {
-            return (!!mergedValueRef.value &&
+            return (mergedShowOptionsRef.value &&
                 canBeActivatedRef.value &&
                 !!selectOptionsRef.value.length);
         });

package/lib/calendar/src/Calendar.d.ts

@@ -1342,6 +1342,7 @@ declare const _default: import("vue").DefineComponent<{
         selectDate: string;
         datePlaceholder: string;
         datetimePlaceholder: string;
+        monthPlaceholder: string;
         startDatePlaceholder: string;
         endDatePlaceholder: string;
         startDatetimePlaceholder: string;

package/lib/cascader/src/Cascader.js

@@ -732,7 +732,7 @@ exports.default = (0, vue_1.defineComponent)({
                         }))
                     }),
                     (0, vue_1.h)(vueuc_1.VFollower, { key: "selectMenu", ref: "selectMenuFollowerRef", show: this.mergedShow && this.showSelectMenu, containerClass: this.namespace, width: "target", placement: "bottom-start", to: this.adjustedTo, teleportDisabled: this.adjustedTo === _utils_1.useAdjustedTo.tdkey }, {
-                        default: () => ((0, vue_1.h)(CascaderSelectMenu_1.default, { ref: "selectMenuInstRef", value: this.mergedValue, show: this.mergedShow && this.showSelectMenu, pattern: this.pattern, multiple: this.multiple, tmNodes: this.treeMate.treeNodes, style: this.cssVars }))
+                        default: () => ((0, vue_1.h)(CascaderSelectMenu_1.default, { ref: "selectMenuInstRef", value: this.mergedValue, show: this.mergedShow && this.showSelectMenu, pattern: this.pattern, multiple: this.multiple, tmNodes: this.treeMate.treeNodes, filter: this.filter, labelField: this.labelField, separator: this.separator, style: this.cssVars }))
                     })
                 ]
             })));

package/lib/cascader/src/CascaderSelectMenu.d.ts

@@ -1,7 +1,7 @@
 import { PropType } from 'vue';
 import { TreeNode } from 'treemate';
 import type { SelectBaseOption, SelectGroupOption, SelectIgnoredOption } from '../../select/src/interface';
-import { TmNode, Value, Filter, CascaderOption } from './interface';
+import { TmNode, Value, Filter } from './interface';
 declare const _default: import("vue").DefineComponent<{
     value: {
         type: PropType<Value | null>;
@@ -17,9 +17,14 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<TmNode[]>;
         default: () => never[];
     };
-    filter: {
-        type: PropType<Filter>;
-        default: (pattern: string, _: CascaderOption, path: CascaderOption[]) => boolean;
+    filter: PropType<Filter>;
+    labelField: {
+        type: StringConstructor;
+        required: true;
+    };
+    separator: {
+        type: StringConstructor;
+        required: true;
     };
 }, {
     prev: () => void;
@@ -366,17 +371,21 @@ declare const _default: import("vue").DefineComponent<{
     multiple?: unknown;
     tmNodes?: unknown;
     filter?: unknown;
+    labelField?: unknown;
+    separator?: unknown;
 } & {
     value: Value | null;
     pattern: string;
-    filter: Filter;
     show: boolean;
+    separator: string;
     multiple: boolean;
+    labelField: string;
     tmNodes: TmNode[];
-} & {}>, {
+} & {
+    filter?: Filter | undefined;
+}>, {
     value: Value | null;
     pattern: string;
-    filter: Filter;
     show: boolean;
     multiple: boolean;
     tmNodes: TmNode[];

package/lib/cascader/src/CascaderSelectMenu.js

@@ -24,9 +24,14 @@ exports.default = (0, vue_1.defineComponent)({
             type: Array,
             default: () => []
         },
-        filter: {
-            type: Function,
-            default: (pattern, _, path) => path.some((option) => option.label && ~option.label.indexOf(pattern))
+        filter: Function,
+        labelField: {
+            type: String,
+            required: true
+        },
+        separator: {
+            type: String,
+            required: true
         }
     },
     setup(props) {
@@ -35,15 +40,23 @@ exports.default = (0, vue_1.defineComponent)({
          } = (0, vue_1.inject)(interface_1.cascaderInjectionKey);
         const menuInstRef = (0, vue_1.ref)(null);
         const selectOptionsRef = (0, vue_1.computed)(() => {
-            return (0, utils_1.createSelectOptions)(props.tmNodes, mergedCheckStrategyRef.value === 'child');
+            return (0, utils_1.createSelectOptions)(props.tmNodes, mergedCheckStrategyRef.value === 'child', props.labelField, props.separator);
+        });
+        const mergedFilterRef = (0, vue_1.computed)(() => {
+            const { filter } = props;
+            if (filter)
+                return filter;
+            const { labelField } = props;
+            return (pattern, _, path) => path.some((option) => option[labelField] && ~option[labelField].indexOf(pattern));
         });
         const filteredSelectOptionsRef = (0, vue_1.computed)(() => {
-            const { filter, pattern } = props;
-            return selectOptionsRef.value
-                .filter((option) => {
-                return filter(pattern, { label: option.label, value: option.value }, option.path);
-            })
-                .map((option) => ({
+            const { pattern } = props;
+            const { value: mergedFilter } = mergedFilterRef;
+            return (pattern
+                ? selectOptionsRef.value.filter((option) => {
+                    return mergedFilter(pattern, option.rawNode, option.path);
+                })
+                : selectOptionsRef.value).map((option) => ({
                 value: option.value,
                 label: option.label
             }));

package/lib/cascader/src/utils.d.ts

@@ -6,7 +6,8 @@ declare function traverseWithCallback<T extends {
     children?: T[];
 }>(options: T[], beforeCallback: (node: T) => void, afterCallback: (node: T) => void): void;
 export { getRawNodePath };
-declare function createSelectOptions(tmNodes: TmNode[], checkStrategyIsChild: boolean): Array<SelectBaseOption & {
+declare function createSelectOptions(tmNodes: TmNode[], checkStrategyIsChild: boolean, labelField: string, separator: string): Array<SelectBaseOption & {
+    rawNode: CascaderOption;
     path: CascaderOption[];
 }>;
 declare function getPathLabel(node: TmNode | null, separator: string, labelField: string): string;

package/lib/cascader/src/utils.js

@@ -21,7 +21,7 @@ function traverseWithCallback(options, beforeCallback, afterCallback) {
     }
 }
 exports.traverseWithCallback = traverseWithCallback;
-function createSelectOptions(tmNodes, checkStrategyIsChild) {
+function createSelectOptions(tmNodes, checkStrategyIsChild, labelField, separator) {
     const selectOptions = [];
     const path = [];
     traverseWithCallback(tmNodes, (tmNode) => {
@@ -31,8 +31,11 @@ function createSelectOptions(tmNodes, checkStrategyIsChild) {
             const { rawNode } = tmNode;
             path.push(rawNode);
             selectOptions.push({
-                label: path.map((rawNodeInPath) => rawNodeInPath.label).join('/'),
+                label: path
+                    .map((rawNodeInPath) => rawNodeInPath[labelField])
+                    .join(separator),
                 value: tmNode.key,
+                rawNode: tmNode.rawNode,
                 path: Array.from(path)
             });
         }

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

@@ -61,7 +61,6 @@ export interface NCollapseInjection {
     props: ExtractPropTypes<typeof collapseProps>;
     expandedNamesRef: Ref<string | number | Array<string | number> | null>;
     mergedClsPrefixRef: Ref<string>;
-    collectedItemNames: Array<string | number>;
     slots: Slots;
     toggleItem: (collapse: boolean, name: string | number, event: MouseEvent) => void;
 }

package/lib/collapse/src/Collapse.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collapseInjectionKey = void 0;
 const vue_1 = require("vue");
-const lodash_1 = require("lodash");
+const vooks_1 = require("vooks");
 const _mixins_1 = require("../../_mixins");
 const _utils_1 = require("../../_utils");
 const styles_1 = require("../styles");
 const index_cssr_1 = require("./styles/index.cssr");
-const vooks_1 = require("vooks");
 const collapseProps = Object.assign(Object.assign({}, _mixins_1.useTheme.props), { defaultExpandedNames: {
         type: [Array, String],
         default: null
@@ -41,7 +40,6 @@ exports.default = (0, vue_1.defineComponent)({
         const uncontrolledExpandedNamesRef = (0, vue_1.ref)(props.defaultExpandedNames);
         const controlledExpandedNamesRef = (0, vue_1.computed)(() => props.expandedNames);
         const mergedExpandedNamesRef = (0, vooks_1.useMergedState)(controlledExpandedNamesRef, uncontrolledExpandedNamesRef);
-        const collectedItemNames = [];
         const themeRef = (0, _mixins_1.useTheme)('Collapse', 'Collapse', index_cssr_1.default, styles_1.collapseLight, props, mergedClsPrefixRef);
         function doUpdateExpandedNames(names) {
             const { 'onUpdate:expandedNames': _onUpdateExpandedNames, onUpdateExpandedNames, onExpandedNamesChange } = props;
@@ -81,7 +79,7 @@ exports.default = (0, vue_1.defineComponent)({
                     doItemHeaderClick({ name, expanded: true, event });
                 }
                 else {
-                    const activeNames = (0, lodash_1.intersection)(expandedNames, collectedItemNames);
+                    const activeNames = expandedNames.slice();
                     const index = activeNames.findIndex((activeName) => name === activeName);
                     if (~index) {
                         activeNames.splice(index, 1);
@@ -100,7 +98,6 @@ exports.default = (0, vue_1.defineComponent)({
             props,
             mergedClsPrefixRef,
             expandedNamesRef: mergedExpandedNamesRef,
-            collectedItemNames,
             slots,
             toggleItem
         });