antdv-next 1.5.3 → 1.5.5

package/dist/spin/index.js

@@ -1,7 +1,7 @@
 import { devUseWarning, isDev } from "../_util/warning.js";
 import { useComponentBaseConfig, useComponentConfig } from "../config-provider/context.js";
 import { useSize } from "../config-provider/hooks/useSize.js";
-import { getAttrStyleAndClass as getAttrStyleAndClass$1, useMergeSemantic, useSemanticRootStyle, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
+import { getAttrStyleAndClass, useMergeSemantic, useSemanticRootStyle, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
 import { getSlotPropsFnRun, toPropsRefs as toPropsRefs$1 } from "../_util/tools.js";
 import Indicator from "./Indicator/index.js";
 import style_default from "./style/index.js";
@@ -60,7 +60,7 @@ const Spin = /* @__PURE__ */ defineComponent((props, { slots, attrs, expose }) =
 		const description = getSlotPropsFnRun(slots, props, "description");
 		const tip = getSlotPropsFnRun(slots, props, "tip");
 		const mergedDescription = description ?? tip;
-		const { style, className, restAttrs } = getAttrStyleAndClass$1(attrs);
+		const { style, className, restAttrs } = getAttrStyleAndClass(attrs);
 		if (isDev) {
 			warning.deprecated(size !== "default", "size=\"default\"", "size=\"medium\"");
 			warning.deprecated(!props.tip && !slots.tip, "tip", "description");

package/dist/splitter/Panel.js

@@ -1,16 +1,20 @@
+import { normalizeStyle as normalizeStyle$1 } from "../_util/styleUtils.js";
 import { createVNode, defineComponent, mergeProps } from "vue";
 import { clsx } from "@v-c/util";
 //#region src/splitter/Panel.tsx
 const InternalPanel = /* @__PURE__ */ defineComponent((props, { slots, attrs }) => {
 	return () => {
-		const { prefixCls, class: className, size, style = {}, destroyOnHidden } = props;
+		const { prefixCls, class: className, size, style = {}, destroyOnHidden, supportMotion } = props;
 		const isHidden = size === 0;
-		const panelClassName = clsx(`${prefixCls}-panel`, { [`${prefixCls}-panel-hidden`]: isHidden }, className);
+		const panelClassName = clsx(`${prefixCls}-panel`, {
+			[`${prefixCls}-panel-hidden`]: isHidden,
+			[`${prefixCls}-panel-transition`]: supportMotion
+		}, className);
 		const hasSize = size !== void 0;
 		return createVNode("div", mergeProps(attrs, {
 			"class": panelClassName,
 			"style": {
-				...style,
+				...normalizeStyle$1(style) || {},
 				flexBasis: hasSize ? typeof size === "number" ? `${size}px` : size : "auto",
 				flexGrow: hasSize ? 0 : 1
 			}
@@ -26,6 +30,11 @@ const InternalPanel = /* @__PURE__ */ defineComponent((props, { slots, attrs })
 			type: String,
 			required: false
 		},
+		supportMotion: {
+			type: Boolean,
+			required: false,
+			default: void 0
+		},
 		style: {
 			type: Object,
 			required: false

package/dist/splitter/SplitBar.js

@@ -215,7 +215,18 @@ const SplitBar = /* @__PURE__ */ defineComponent((props, { slots, attrs }) => {
 			type: Boolean,
 			required: true
 		},
-		draggerIcon: { required: false },
+		draggerIcon: {
+			type: [
+				Function,
+				String,
+				Number,
+				null,
+				Object,
+				Boolean
+			],
+			required: false,
+			default: void 0
+		},
 		collapsibleIcon: {
 			type: Object,
 			required: false

package/dist/splitter/Splitter.js

@@ -109,7 +109,8 @@ const Splitter = /* @__PURE__ */ defineComponent((props, { slots, attrs, expose
 				}
 			}, {
 				"prefixCls": prefixCls.value,
-				"size": panelSizes.value[idx]
+				"size": panelSizes.value[idx],
+				"supportMotion": collapsible?.motion && movingIndex.value === void 0
 			}), { default: () => [item._$slots?.default?.()] });
 			let splitBar = null;
 			const resizableInfo = resizableInfos.value[idx];

package/dist/splitter/hooks/sizeUtil.js

@@ -1,4 +1,20 @@
 //#region src/splitter/hooks/sizeUtil.ts
+function fitPtgSizes(sizes, minSizes, maxSizes) {
+	const mergedMinSizes = sizes.map((size, index) => size === 0 ? 0 : minSizes[index] ?? 0);
+	const mergedMaxSizes = sizes.map((size, index) => size === 0 ? 0 : maxSizes[index] ?? 1);
+	const invalidLimits = mergedMinSizes.some((min, index) => min > mergedMaxSizes[index]);
+	const totalMin = mergedMinSizes.reduce((sum, size) => sum + size, 0);
+	const totalMax = mergedMaxSizes.reduce((sum, size) => sum + size, 0);
+	if (invalidLimits || totalMin > 1 || totalMax < 1) return sizes;
+	const result = sizes.map((size, index) => Math.min(mergedMaxSizes[index], Math.max(mergedMinSizes[index], size)));
+	const total = result.reduce((sum, size) => sum + size, 0);
+	if (total === 1) return result;
+	const grow = total < 1;
+	const spaces = result.map((size, index) => grow ? mergedMaxSizes[index] - size : size - mergedMinSizes[index]);
+	const totalSpace = spaces.reduce((sum, space) => sum + space, 0);
+	const rest = 1 - total;
+	return result.map((size, index) => size + rest * (spaces[index] / totalSpace));
+}
 function autoPtgSizes(ptgSizes, minPtgSizes, maxPtgSizes) {
 	let currentTotalPtg = 0;
 	const undefinedIndexes = [];
@@ -14,7 +30,7 @@ function autoPtgSizes(ptgSizes, minPtgSizes, maxPtgSizes) {
 			return ptgSizes.map(() => avg);
 		}
 		const scale = 1 / currentTotalPtg;
-		return ptgSizes.map((size) => size * scale);
+		return fitPtgSizes(ptgSizes.map((size) => size * scale), minPtgSizes, maxPtgSizes);
 	}
 	if (restPtg < 0) {
 		const scale = 1 / currentTotalPtg;

package/dist/splitter/interface.d.ts

@@ -46,9 +46,10 @@ interface SplitterProps extends ComponentBaseProps {
   vertical?: boolean;
   draggerIcon?: VueNode;
   /**
-   * Collapse configuration. ant-design 6.4.0 PR #57044.
+   * Collapse configuration. Set `motion: true` to enable collapse animation.
    */
   collapsible?: {
+    motion?: boolean;
     icon?: {
       start?: VueNode;
       end?: VueNode;
@@ -98,6 +99,7 @@ interface PanelProps {
 interface InternalPanelProps extends PanelProps {
   class?: string;
   prefixCls?: string;
+  supportMotion?: boolean;
 }
 interface UseResizeProps {
   basicsState: number[];

package/dist/splitter/style/index.js

@@ -1,5 +1,6 @@
 import { genFocusOutline, resetComponent } from "../../style/index.js";
 import { genCssVar, genStyleHooks } from "../../theme/util/genStyleUtils.js";
+import { genNoMotionStyle } from "../../style/motion/util.js";
 //#region src/splitter/style/index.ts
 const centerStyle = {
 	position: "absolute",
@@ -212,7 +213,11 @@ const genSplitterStyle = (token) => {
 				padding: 0,
 				overflow: "hidden"
 			},
-			[`&:has(${componentCls}:only-child)`]: { overflow: "hidden" }
+			[`&:has(${componentCls}:only-child)`]: { overflow: "hidden" },
+			"&-transition": {
+				transition: `flex-basis ${token.motionDurationSlow} ${token.motionEaseInOut}`,
+				...genNoMotionStyle()
+			}
 		}
 	} };
 };

package/dist/statistic/Number.js

@@ -1,3 +1,4 @@
+import { isNumber } from "../_util/is.js";
 import { createVNode, defineComponent } from "vue";
 //#region src/statistic/Number.tsx
 const StatisticNumber = /* @__PURE__ */ defineComponent((props) => {
@@ -14,7 +15,7 @@ const StatisticNumber = /* @__PURE__ */ defineComponent((props) => {
 				let int = cells[2] || "0";
 				let decimal = cells[4] || "";
 				int = int.replace(/\B(?=(\d{3})+(?!\d))/g, groupSeparator);
-				if (typeof precision === "number") decimal = decimal.padEnd(precision, "0").slice(0, precision > 0 ? precision : 0);
+				if (isNumber(precision)) decimal = decimal.padEnd(precision, "0").slice(0, precision > 0 ? precision : 0);
 				if (decimal) decimal = `${decimalSeparator}${decimal}`;
 				valueNode = [createVNode("span", {
 					"key": "int",

package/dist/statistic/Statistic.js

@@ -1,6 +1,7 @@
 import { useComponentBaseConfig } from "../config-provider/context.js";
 import { useMergeSemantic, useSemanticRootStyle, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
 import { clsx as clsx$1, getSlotPropsFnRun, toPropsRefs } from "../_util/tools.js";
+import { isFunction, isRenderable } from "../_util/is.js";
 import skeleton_default from "../skeleton/index.js";
 import StatisticNumber from "./Number.js";
 import style_default from "./style/index.js";
@@ -55,7 +56,7 @@ const Statistic = /* @__PURE__ */ defineComponent((props, { slots, attrs, emit,
 			"style": [mergedStyles.value.root, attrs.style],
 			"onMouseenter": handleMouseEnter,
 			"onMouseleave": handleMouseLeave
-		}), [!!title && createVNode("div", {
+		}), [isRenderable(title) && createVNode("div", {
 			"class": headerClassNames,
 			"style": mergedStyles.value.header
 		}, [createVNode("div", {
@@ -70,12 +71,12 @@ const Statistic = /* @__PURE__ */ defineComponent((props, { slots, attrs, emit,
 			"style": [valueStyle, mergedStyles.value.content],
 			"class": contentClassNames
 		}, [
-			!!prefix && createVNode("span", {
+			isRenderable(prefix) && createVNode("span", {
 				"class": prefixClassNames,
 				"style": mergedStyles.value.prefix
 			}, [prefix]),
-			valueRender ? valueRender(valueNode) : valueNode,
-			!!suffix && createVNode("span", {
+			isFunction(valueRender) ? valueRender(valueNode) : valueNode,
+			isRenderable(suffix) && createVNode("span", {
 				"class": suffixClassNames,
 				"style": mergedStyles.value.suffix
 			}, [suffix])

package/dist/steps/ProgressIcon.js

@@ -1,5 +1,5 @@
 import { genCssVar } from "../theme/util/genStyleUtils.js";
-import { Fragment, createTextVNode, createVNode, defineComponent } from "vue";
+import { Fragment, createVNode, defineComponent } from "vue";
 import { clsx } from "@v-c/util";
 //#region src/steps/ProgressIcon.tsx
 const ProgressIcon = /* @__PURE__ */ defineComponent((props, { slots }) => {
@@ -15,18 +15,15 @@ const ProgressIcon = /* @__PURE__ */ defineComponent((props, { slots }) => {
 			"width": "100%",
 			"height": "100%",
 			"xmlns": "http://www.w3.org/2000/svg",
+			"role": "progressbar",
 			"aria-valuemax": 100,
 			"aria-valuemin": 0,
 			"aria-valuenow": percent
-		}, [
-			createVNode("title", null, [createTextVNode("Progress")]),
-			createVNode("circle", { "class": clsx(circleCls, `${circleCls}-rail`) }, null),
-			createVNode("circle", {
-				"class": clsx(circleCls, `${circleCls}-ptg`),
-				"stroke-dasharray": dashArray,
-				"transform": "rotate(-90 50 50)"
-			}, null)
-		]), slots?.default?.()]);
+		}, [createVNode("circle", { "class": clsx(circleCls, `${circleCls}-rail`) }, null), createVNode("circle", {
+			"class": clsx(circleCls, `${circleCls}-ptg`),
+			"stroke-dasharray": dashArray,
+			"transform": "rotate(-90 50 50)"
+		}, null)]), slots?.default?.()]);
 	};
 }, {
 	props: {

package/dist/steps/index.js

@@ -2,8 +2,8 @@ import { devUseWarning, isDev } from "../_util/warning.js";
 import { useComponentBaseConfig } from "../config-provider/context.js";
 import { useSize } from "../config-provider/hooks/useSize.js";
 import { genCssVar } from "../theme/util/genStyleUtils.js";
-import { useMergeSemantic, useSemanticRootStyle, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
-import { getSlotPropsFnRun, toPropsRefs as toPropsRefs$1 } from "../_util/tools.js";
+import { getAttrStyleAndClass, useMergeSemantic, useSemanticRootStyle, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
+import { getSlotPropsFnRun, toPropsRefs } from "../_util/tools.js";
 import InternalTooltip from "../tooltip/index.js";
 import { TARGET_CLS } from "../_util/wave/interface.js";
 import wave_default from "../_util/wave/index.js";
@@ -15,7 +15,6 @@ import style_default from "./style/index.js";
 import useDisplaySteps from "./useDisplaySteps.js";
 import { Fragment, computed, createVNode, defineComponent, isVNode, mergeDefaults, mergeProps } from "vue";
 import { clsx } from "@v-c/util";
-import { getAttrStyleAndClass } from "@v-c/util/dist/props-util";
 import { CheckOutlined } from "@antdv-next/icons";
 import VcSteps from "@v-c/steps";
 //#region src/steps/index.tsx
@@ -26,7 +25,7 @@ const waveEffectClassNames = { itemIcon: TARGET_CLS };
 const Steps = /* @__PURE__ */ defineComponent((props, { slots, attrs, emit }) => {
 	const internalContent = useInternalContext();
 	const { direction: rtlDirection, class: contextClassName, style: contextStyle, classes: contextClassNames, styles: contextStyles, prefixCls, rootPrefixCls } = useComponentBaseConfig("steps", props);
-	const { size, items, responsive, type, classes, styles } = toPropsRefs$1(props, "size", "items", "responsive", "type", "classes", "styles");
+	const { size, items, responsive, type, classes, styles } = toPropsRefs(props, "size", "items", "responsive", "type", "classes", "styles");
 	const components = computed(() => {
 		return {
 			root: internalContent.value?.rootComponent,

package/dist/switch/index.d.ts

@@ -27,12 +27,10 @@ interface SwitchProps extends ComponentBaseProps, SwitchEmitsProps {
   defaultChecked?: CheckedValueType;
   /**
    * Alias for `checked`.
-   * @since 5.12.0
    */
   value?: CheckedValueType;
   /**
    * Alias for `defaultChecked`.
-   * @since 5.12.0
    */
   defaultValue?: CheckedValueType;
   /**

package/dist/table/Column.d.ts

@@ -9,7 +9,11 @@ interface ColumnSlots {
   default?: () => any;
 }
 /**
- * Syntactic sugar for `columns` prop. HOC will not work on this.
+ * Syntactic sugar for the `columns` prop.
+ *
+ * Kebab-case template attributes (`data-index`, `min-width`, ...) are
+ * remapped to the camelCase field names the table understands in
+ * `convertColumnsToColumnProps` (see `./utils.ts`).
  */
 declare const Column: import("vue").DefineSetupFnComponent<ColumnProps<AnyObject>, EmptyEmit, SlotsType<ColumnSlots>, ColumnProps<AnyObject>, import("vue").PublicProps>;
 //#endregion

package/dist/table/Column.js

@@ -1,7 +1,11 @@
 import { defineComponent } from "vue";
 //#region src/table/Column.tsx
 /**
-* Syntactic sugar for `columns` prop. HOC will not work on this.
+* Syntactic sugar for the `columns` prop.
+*
+* Kebab-case template attributes (`data-index`, `min-width`, ...) are
+* remapped to the camelCase field names the table understands in
+* `convertColumnsToColumnProps` (see `./utils.ts`).
 */
 const Column = /* @__PURE__ */ defineComponent(() => {
 	return () => null;
@@ -13,6 +17,11 @@ const Column = /* @__PURE__ */ defineComponent(() => {
 			required: false,
 			skipCheck: true
 		},
+		resizable: {
+			type: Boolean,
+			required: false,
+			default: void 0
+		},
 		sorter: {
 			type: [
 				Boolean,

package/dist/table/ColumnGroup.js

@@ -16,6 +16,11 @@ const ColumnGroup = /* @__PURE__ */ defineComponent(() => {
 			required: false,
 			skipCheck: true
 		},
+		resizable: {
+			type: Boolean,
+			required: false,
+			default: void 0
+		},
 		sorter: {
 			type: [
 				Boolean,

package/dist/table/InternalTable.d.ts

@@ -52,7 +52,7 @@ type TableStylesType<RecordType = AnyObject> = SemanticStylesType<TableProps<Rec
   header?: ComponentsSemanticStyles;
   pagination?: PaginationSemanticStyles;
 }>;
-interface TableProps<RecordType = AnyObject> extends ComponentBaseProps, Omit<TableProps$1<RecordType>, 'transformColumns' | 'internalHooks' | 'internalRefs' | 'data' | 'columns' | 'scroll' | 'emptyText' | 'className' | 'style' | 'classNames' | 'styles' | 'getPopupContainer' | 'onUpdate:expandedRowKeys' | 'onScroll'> {
+interface TableProps<RecordType = AnyObject> extends ComponentBaseProps, Omit<TableProps$1<RecordType>, 'transformColumns' | 'internalHooks' | 'internalRefs' | 'data' | 'columns' | 'scroll' | 'emptyText' | 'className' | 'style' | 'classNames' | 'styles' | 'getPopupContainer' | 'onUpdate:expandedRowKeys' | 'onScroll' | 'onResizeColumn'> {
   classes?: TableClassNamesType<RecordType>;
   styles?: TableStylesType<RecordType>;
   dropdownPrefixCls?: string;
@@ -80,12 +80,15 @@ interface TableEmits<RecordType = AnyObject> {
   'change': (pagination: TablePaginationConfig, filters: Record<string, FilterValue | null>, sorter: SorterResult<RecordType> | SorterResult<RecordType>[], extra: TableCurrentDataSource<RecordType>) => void;
   'update:expandedRowKeys': (keys: readonly Key[]) => void;
   'scroll': NonNullable<TableProps$1['onScroll']>;
+  /** Fired once per drag on a `resizable` column. `columnKey` is the key the width is tracked by (the column `key`, or its position when unset). */
+  'resizeColumn': (width: number, column: ColumnType$1<RecordType>, columnKey: Key) => void;
 }
 interface TableExpose extends Reference {}
 interface TableEmitsProps<RecordType = AnyObject> {
   onChange?: TableEmits<RecordType>['change'];
   'onUpdate:expandedRowKeys'?: TableEmits<RecordType>['update:expandedRowKeys'];
   onScroll?: TableEmits<RecordType>['scroll'];
+  onResizeColumn?: TableEmits<RecordType>['resizeColumn'];
 }
 interface TableSlots<RecordType = AnyObject> {
   default?: () => any;

package/dist/table/InternalTable.js

@@ -2,8 +2,8 @@ import { devUseWarning, isDev } from "../_util/warning.js";
 import { useComponentBaseConfig, useConfig } from "../config-provider/context.js";
 import { useSize } from "../config-provider/hooks/useSize.js";
 import useToken from "../theme/useToken.js";
-import { useMergeSemantic, useSemanticRootStyle, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
-import { getSlotPropsFnRun, toPropsRefs as toPropsRefs$1 } from "../_util/tools.js";
+import { getAttrStyleAndClass, mergeClassNames, mergeStyles, resolveStyleOrClass, useMergeSemantic, useSemanticRootStyle, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
+import { getSlotPropsFnRun, toPropsRefs } from "../_util/tools.js";
 import useCSSVarCls from "../config-provider/hooks/useCSSVarCls.js";
 import { TableMeasureRowContextProvider } from "./TableMeasureRowContext.js";
 import ConfigProvider from "../config-provider/index.js";
@@ -30,7 +30,6 @@ import style_default from "./style/index.js";
 import { convertColumnsToColumnProps } from "./utils.js";
 import { computed, createVNode, defineComponent, h, inject, isVNode, mergeDefaults, mergeProps, provide, shallowRef, watch, watchEffect } from "vue";
 import { clsx } from "@v-c/util";
-import { getAttrStyleAndClass } from "@v-c/util/dist/props-util";
 import { omit } from "es-toolkit";
 import pickAttrs from "@v-c/util/dist/pickAttrs";
 import VcTable, { INTERNAL_HOOKS, VirtualTable } from "@v-c/table";
@@ -82,7 +81,7 @@ const InternalTable = /* @__PURE__ */ defineComponent((props, { slots, emit, att
 			}
 		};
 	});
-	const { classes, styles } = toPropsRefs$1(props, "classes", "styles");
+	const { classes, styles } = toPropsRefs(props, "classes", "styles");
 	const mergedSize = useSize(computed(() => props.size));
 	const mergedProps = computed(() => {
 		return {
@@ -191,9 +190,9 @@ const InternalTable = /* @__PURE__ */ defineComponent((props, { slots, emit, att
 		globalLocale
 	});
 	const sortedData = computed(() => getSortData(rawData.value, sortStates.value, childrenColumnName.value));
-	const filterStates = shallowRef(collectFilterStates(mergedColumns.value, true));
+	const filterStates = shallowRef(collectFilterStates(baseColumns.value ?? mergedColumns.value, true));
 	const filterStateWarning = isDev ? devUseWarning("Table") : void 0;
-	const mergedFilterStates = computed(() => getMergedFilterStates(mergedColumns.value, filterStates.value, filterStateWarning));
+	const mergedFilterStates = computed(() => getMergedFilterStates(mergedColumns.value, filterStates.value, filterStateWarning, baseColumns.value));
 	const filters = computed(() => generateFilterInfo(mergedFilterStates.value));
 	const onFilterChange = (filters, filterStates) => {
 		triggerOnChange({
@@ -340,12 +339,18 @@ const InternalTable = /* @__PURE__ */ defineComponent((props, { slots, emit, att
 			if (typeof expandable.indentSize !== "number") expandable.indentSize = typeof props.indentSize === "number" ? props.indentSize : 15;
 			return expandable;
 		})();
-		const renderPagination = (placement = "end") => createVNode(pagination_default, mergeProps(mergedPagination.value, {
-			"classes": mergedClassNames.value.pagination,
-			"styles": mergedStyles.value.pagination,
-			"class": clsx(`${prefixCls.value}-pagination`, `${prefixCls.value}-pagination-${placement}`, mergedPagination.value.class, mergedPagination.value.className),
-			"size": getPaginationSize(mergedPagination.value.size, mergedSize.value)
-		}), null);
+		const renderPagination = (placement = "end") => {
+			const paginationProps = mergedPagination.value;
+			const paginationSize = getPaginationSize(paginationProps.size, mergedSize.value);
+			const paginationClasses = (info) => mergeClassNames({}, mergedClassNames.value.pagination, resolveStyleOrClass(paginationProps.classes, info));
+			const paginationStyles = (info) => mergeStyles(resolveStyleOrClass(paginationProps.styles, info), mergedStyles.value.pagination);
+			return createVNode(pagination_default, mergeProps(paginationProps, {
+				"classes": paginationClasses,
+				"styles": paginationStyles,
+				"class": clsx(`${prefixCls.value}-pagination`, `${prefixCls.value}-pagination-${placement}`),
+				"size": paginationSize
+			}), null);
+		};
 		const paginationNodes = (() => {
 			if (props.pagination === false || !mergedPagination.value.total) return {
 				top: null,
@@ -406,7 +411,7 @@ const InternalTable = /* @__PURE__ */ defineComponent((props, { slots, emit, att
 				"styles": mergedStyles.value,
 				"expandable": mergedExpandableConfig,
 				"prefixCls": prefixCls.value,
-				"direction": props.direction ?? direction.value,
+				"direction": direction.value,
 				"headerCell": slots.headerCell || contextHeaderCell.value || props.headerCell ? renderHeaderCell : void 0,
 				"bodyCell": slots.bodyCell || props.bodyCell || contextBodyCell.value || configCtx.value?.transformCellText ? renderBodyCell : void 0,
 				"className": tableClassName,
@@ -419,7 +424,8 @@ const InternalTable = /* @__PURE__ */ defineComponent((props, { slots, emit, att
 				"title": title,
 				"footer": footer,
 				"summary": summary,
-				"onUpdate:expandedRowKeys": (keys) => emit("update:expandedRowKeys", keys)
+				"onUpdate:expandedRowKeys": (keys) => emit("update:expandedRowKeys", keys),
+				"onResizeColumn": (width, column, columnKey) => emit("resizeColumn", width, column, columnKey)
 			}), null),
 			paginationNodes.bottom
 		] })]);
@@ -512,9 +518,12 @@ const InternalTable = /* @__PURE__ */ defineComponent((props, { slots, emit, att
 			required: false
 		},
 		rowKey: {
-			type: [String, Function],
-			required: false,
-			skipCheck: true
+			type: [
+				String,
+				Number,
+				Function
+			],
+			required: false
 		},
 		tableLayout: {
 			type: String,
@@ -651,7 +660,8 @@ const InternalTable = /* @__PURE__ */ defineComponent((props, { slots, emit, att
 	emits: [
 		"change",
 		"update:expandedRowKeys",
-		"scroll"
+		"scroll",
+		"resizeColumn"
 	],
 	name: "AInternalTable",
 	inheritAttrs: false

package/dist/table/Table.js

@@ -16,13 +16,20 @@ const ForwardTable = /* @__PURE__ */ defineComponent((props, { slots, attrs, exp
 			return tableRef.value?.nativeElement;
 		}
 	});
-	return () => createVNode(InternalTable, mergeProps(omit(props, ["onUpdate:expandedRowKeys", "onChange"]), attrs, {
+	return () => createVNode(InternalTable, mergeProps(omit(props, [
+		"onUpdate:expandedRowKeys",
+		"onChange",
+		"onResizeColumn"
+	]), attrs, {
 		"onChange": (pagination, filters, sorter, extra) => {
 			emit("change", pagination, filters, sorter, extra);
 		},
 		"onUpdate:expandedRowKeys": (keys) => {
 			emit("update:expandedRowKeys", keys);
 		},
+		"onResizeColumn": (width, column, columnKey) => {
+			emit("resizeColumn", width, column, columnKey);
+		},
 		"_renderTimes": renderTimesRef.value,
 		"ref": tableRef
 	}), slots);
@@ -110,9 +117,12 @@ const ForwardTable = /* @__PURE__ */ defineComponent((props, { slots, attrs, exp
 			required: false
 		},
 		rowKey: {
-			type: [String, Function],
-			required: false,
-			skipCheck: true
+			type: [
+				String,
+				Number,
+				Function
+			],
+			required: false
 		},
 		tableLayout: {
 			type: String,
@@ -249,7 +259,8 @@ const ForwardTable = /* @__PURE__ */ defineComponent((props, { slots, attrs, exp
 	emits: [
 		"change",
 		"update:expandedRowKeys",
-		"scroll"
+		"scroll",
+		"resizeColumn"
 	],
 	name: "ATable",
 	inheritAttrs: false

package/dist/table/hooks/useFilter/FilterDropdown.js

@@ -87,10 +87,10 @@ const FilterDropdown = /* @__PURE__ */ defineComponent((props, { slots }) => {
 		const filterState = props.filterState;
 		return !!(filterState && (filterState.filteredKeys?.length || filterState.forceFiltered));
 	});
-	const triggerVisible = (newVisible) => {
-		visible.value = newVisible;
-		filterDropdownProps.value.onOpenChange?.(newVisible);
-		column.value.onFilterDropdownOpenChange?.(newVisible);
+	const triggerOpen = (nextOpen) => {
+		visible.value = nextOpen;
+		filterDropdownProps.value.onOpenChange?.(nextOpen);
+		column.value.onFilterDropdownOpenChange?.(nextOpen);
 	};
 	if (isDev) {
 		const warning = devUseWarning("Table");
@@ -110,7 +110,7 @@ const FilterDropdown = /* @__PURE__ */ defineComponent((props, { slots }) => {
 	};
 	const onCheck = (keys, info) => {
 		const { node, checked } = info;
-		if (!props.filterMultiple) onSelectKeys({ selectedKeys: checked && node.key ? [node.key] : [] });
+		if (!props.filterMultiple) onSelectKeys({ selectedKeys: checked ? [node.key] : [] });
 		else onSelectKeys({ selectedKeys: keys });
 	};
 	watch([propFilteredKeys, mergedVisible], ([nextKeys, nextVisible]) => {
@@ -142,7 +142,7 @@ const FilterDropdown = /* @__PURE__ */ defineComponent((props, { slots }) => {
 		});
 	};
 	const onConfirm = () => {
-		triggerVisible(false);
+		triggerOpen(false);
 		internalTriggerFilter(filteredKeysSync.value);
 	};
 	const onReset = ({ confirm, closeDropdown } = {
@@ -150,21 +150,21 @@ const FilterDropdown = /* @__PURE__ */ defineComponent((props, { slots }) => {
 		closeDropdown: false
 	}) => {
 		if (confirm) internalTriggerFilter([]);
-		if (closeDropdown) triggerVisible(false);
+		if (closeDropdown) triggerOpen(false);
 		searchValue.value = "";
 		if (column.value.filterResetToDefaultFilteredValue) setFilteredKeysSync((column.value.defaultFilteredValue || []).map((key) => String(key)));
 		else setFilteredKeysSync([]);
 	};
 	const doFilter = ({ closeDropdown } = { closeDropdown: true }) => {
-		if (closeDropdown) triggerVisible(false);
+		if (closeDropdown) triggerOpen(false);
 		internalTriggerFilter(filteredKeysSync.value);
 	};
 	const filterDropdownDefined = computed(() => props.filterDropdownRender !== void 0 || column.value?.filterDropdown !== void 0);
-	const onVisibleChange = (newVisible, info) => {
+	const onDropdownOpenChange = (nextOpen, info) => {
 		if (info?.source === "trigger") {
-			if (newVisible && propFilteredKeys.value !== void 0) setFilteredKeysSync(wrapStringListType(propFilteredKeys.value));
-			if (!newVisible && !hasPropDropdownRender && !column.value.filterDropdown && props.filterOnClose) onConfirm();
-			else triggerVisible(newVisible);
+			if (nextOpen && propFilteredKeys.value !== void 0) setFilteredKeysSync(wrapStringListType(propFilteredKeys.value));
+			if (!nextOpen && !hasPropDropdownRender && !column.value.filterDropdown && props.filterOnClose) onConfirm();
+			else triggerOpen(nextOpen);
 		}
 	};
 	const dropdownMenuClass = computed(() => clsx({ [`${props.dropdownPrefixCls}-menu-without-submenu`]: !hasSubMenu(column?.value?.filters || []) }));
@@ -218,7 +218,7 @@ const FilterDropdown = /* @__PURE__ */ defineComponent((props, { slots }) => {
 				filters: column.value.filters,
 				visible: mergedVisible.value,
 				close: () => {
-					triggerVisible(false);
+					triggerOpen(false);
 				}
 			};
 			let filterNode = null;
@@ -357,7 +357,7 @@ const FilterDropdown = /* @__PURE__ */ defineComponent((props, { slots }) => {
 		}, {
 			...filterDropdownProps.value,
 			open: mergedVisible.value,
-			onOpenChange: onVisibleChange,
+			onOpenChange: onDropdownOpenChange,
 			popupRender: () => {
 				if (typeof filterDropdownProps.value.popupRender === "function") return filterDropdownProps.value.popupRender(dropdownContent);
 				if (typeof filterDropdownProps.value.dropdownRender === "function") return filterDropdownProps.value.dropdownRender(dropdownContent);

package/dist/table/hooks/useFilter/index.d.ts

@@ -30,7 +30,9 @@ interface FilterConfig<RecordType = AnyObject> {
   getPopupContainer?: GetPopupContainer;
   rootClassName?: string;
 }
-declare function getMergedFilterStates<RecordType extends AnyObject = AnyObject>(rawMergedColumns: ColumnsType<RecordType>, filterStates: FilterState<RecordType>[], warning?: ReturnType<typeof devUseWarning>): FilterState<RecordType>[];
+declare function getMergedFilterStates<RecordType extends AnyObject = AnyObject>(rawMergedColumns: ColumnsType<RecordType>, filterStates: FilterState<RecordType>[], warning?: ReturnType<typeof devUseWarning>,
+/** Columns before applying the responsive filter. */
+baseColumns?: ColumnsType<RecordType>): FilterState<RecordType>[];
 declare function useFilter<RecordType extends AnyObject = AnyObject>(props: FilterConfig<RecordType>): readonly [TransformColumns<RecordType>, FilterState<RecordType>[], Record<string, FilterValue | null>];
 //#endregion
 export { FilterConfig, FilterState, collectFilterStates, useFilter as default, flattenKeys, generateFilterInfo, getFilterData, getMergedFilterStates };

package/dist/table/hooks/useFilter/index.js

@@ -112,8 +112,8 @@ function getMergedColumns(rawMergedColumns) {
 		return [column];
 	});
 }
-function getMergedFilterStates(rawMergedColumns, filterStates, warning) {
-	const mergedColumns = getMergedColumns(rawMergedColumns || []);
+function getMergedFilterStates(rawMergedColumns, filterStates, warning, baseColumns) {
+	const mergedColumns = getMergedColumns(baseColumns ?? rawMergedColumns ?? []);
 	const collectedStates = collectFilterStates(mergedColumns, false);
 	if (collectedStates.length === 0) return collectedStates;
 	let filteredKeysIsAllNotControlled = true;

package/dist/table/hooks/useSelection.js

@@ -55,14 +55,18 @@ function useSelection(config, rowSelection) {
 			keys.forEach((key) => {
 				let record = getRecordByKey(key);
 				if (!record && preserveRecordsRef.value.has(key)) record = preserveRecordsRef.value.get(key);
-				newCache.set(key, record);
+				if (record !== void 0) newCache.set(key, record);
 			});
 			preserveRecordsRef.value = newCache;
 		}
 	};
-	watch(mergedSelectedKeys, (nextKeys) => {
+	watch([
+		mergedSelectedKeys,
+		data,
+		preserveSelectedRowKeys
+	], ([nextKeys]) => {
 		updatePreserveRecordsCache(nextKeys);
-	});
+	}, { immediate: true });
 	const flattedData = computed(() => flattenData(childrenColumnName.value, pageData.value));
 	const keyEntities = computed(() => {
 		if (checkStrictly.value) return { keyEntities: null };