@sdata/web-vue 4.5.0 → 4.5.1

package/es/file-previewer/use-pdf-js.js

@@ -1,6 +1,6 @@
-import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.146.0/helpers/esm/objectSpread2.js";
+import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.147.0/helpers/esm/objectSpread2.js";
 import { isServerRendering } from "../_utils/dom.js";
-import _asyncToGenerator from "../_virtual/_@oxc-project_runtime@0.146.0/helpers/esm/asyncToGenerator.js";
+import _asyncToGenerator from "../_virtual/_@oxc-project_runtime@0.147.0/helpers/esm/asyncToGenerator.js";
 import { shallowRef } from "vue";
 //#region components/file-previewer/use-pdf-js.ts
 var pdfModulePromise;
@@ -54,13 +54,18 @@ function usePdfJs(context) {
 	let renderTask = null;
 	let activePage = null;
 	let loadId = 0;
+	let renderId = 0;
 	function load() {
 		return _load.apply(this, arguments);
 	}
 	function _load() {
 		_load = _asyncToGenerator(function* () {
 			const url = context.src();
-			if (!url || isServerRendering) return;
+			if (isServerRendering) return;
+			if (!url) {
+				yield destroy();
+				return;
+			}
 			const currentId = ++loadId;
 			context.onStatus("loading");
 			try {
@@ -69,14 +74,12 @@ function usePdfJs(context) {
 				if (currentId !== loadId) return;
 				const props = (_context$pdfProps = context.pdfProps()) !== null && _context$pdfProps !== void 0 ? _context$pdfProps : {};
 				yield resolveWorker(props, pdfjs);
-				yield destroy();
+				if (currentId !== loadId) return;
+				yield releaseResources();
 				if (currentId !== loadId) return;
 				loadingTask = pdfjs.getDocument(_objectSpread2({ url }, props.documentParams));
 				const pdfDoc = yield loadingTask.promise;
-				if (currentId !== loadId) {
-					loadingTask = null;
-					return;
-				}
+				if (currentId !== loadId) return;
 				doc.value = pdfDoc;
 				numPages.value = pdfDoc.numPages;
 				page.value = Math.min(Math.max((_props$page = props.page) !== null && _props$page !== void 0 ? _props$page : 1, 1), pdfDoc.numPages);
@@ -97,6 +100,8 @@ function usePdfJs(context) {
 			var _context$pdfProps2, _props$scale, _props$rotation;
 			const pdfDoc = doc.value;
 			if (!pdfDoc) return;
+			const documentId = loadId;
+			const currentRenderId = ++renderId;
 			const props = (_context$pdfProps2 = context.pdfProps()) !== null && _context$pdfProps2 !== void 0 ? _context$pdfProps2 : {};
 			const scale = (_props$scale = props.scale) !== null && _props$scale !== void 0 ? _props$scale : 1;
 			const rotation = (_props$rotation = props.rotation) !== null && _props$rotation !== void 0 ? _props$rotation : 0;
@@ -108,37 +113,40 @@ function usePdfJs(context) {
 			if (activePage) try {
 				activePage.cleanup();
 			} catch (_unused3) {}
-			const pdfPage = yield pdfDoc.getPage(target);
-			activePage = pdfPage;
-			const viewport = pdfPage.getViewport({
-				scale,
-				rotation
-			});
-			if (!canvas.getContext("2d")) return;
-			const dpr = window.devicePixelRatio || 1;
-			canvas.width = Math.floor(viewport.width * dpr);
-			canvas.height = Math.floor(viewport.height * dpr);
-			canvas.style.width = `${Math.floor(viewport.width)}px`;
-			canvas.style.height = `${Math.floor(viewport.height)}px`;
-			const renderParams = _objectSpread2(_objectSpread2({
-				canvas,
-				viewport
-			}, dpr !== 1 ? { transform: [
-				dpr,
-				0,
-				0,
-				dpr,
-				0,
-				0
-			] } : {}), props.renderParams);
-			const task = pdfPage.render(renderParams);
-			renderTask = task;
 			try {
-				yield task.promise;
+				const pdfPage = yield pdfDoc.getPage(target);
+				if (documentId !== loadId || doc.value !== pdfDoc || currentRenderId !== renderId) return;
+				activePage = pdfPage;
+				const viewport = pdfPage.getViewport({
+					scale,
+					rotation
+				});
+				if (!canvas.getContext("2d")) return;
+				const dpr = window.devicePixelRatio || 1;
+				canvas.width = Math.floor(viewport.width * dpr);
+				canvas.height = Math.floor(viewport.height * dpr);
+				canvas.style.width = `${Math.floor(viewport.width)}px`;
+				canvas.style.height = `${Math.floor(viewport.height)}px`;
+				const renderParams = _objectSpread2(_objectSpread2({
+					canvas,
+					viewport
+				}, dpr !== 1 ? { transform: [
+					dpr,
+					0,
+					0,
+					dpr,
+					0,
+					0
+				] } : {}), props.renderParams);
+				const task = pdfPage.render(renderParams);
+				renderTask = task;
+				try {
+					yield task.promise;
+				} finally {
+					if (renderTask === task) renderTask = null;
+				}
 			} catch (error) {
-				if (!isCancelledError(error)) throw error;
-			} finally {
-				if (renderTask === task) renderTask = null;
+				if (documentId === loadId && currentRenderId === renderId && !isCancelledError(error)) context.onStatus("error");
 			}
 		});
 		return _render.apply(this, arguments);
@@ -158,6 +166,17 @@ function usePdfJs(context) {
 	}
 	function _destroy() {
 		_destroy = _asyncToGenerator(function* () {
+			loadId++;
+			yield releaseResources();
+		});
+		return _destroy.apply(this, arguments);
+	}
+	function releaseResources() {
+		return _releaseResources.apply(this, arguments);
+	}
+	function _releaseResources() {
+		_releaseResources = _asyncToGenerator(function* () {
+			renderId++;
 			if (renderTask) {
 				try {
 					renderTask.cancel();
@@ -179,7 +198,7 @@ function usePdfJs(context) {
 				yield task.destroy();
 			} catch (_unused6) {}
 		});
-		return _destroy.apply(this, arguments);
+		return _releaseResources.apply(this, arguments);
 	}
 	return {
 		doc,

package/es/form/form-item-label.vue_vue_type_script_setup_true_lang.js

@@ -1,5 +1,5 @@
 import { formInjectionKey } from "./context.js";
-import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.146.0/helpers/esm/objectSpread2.js";
+import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.147.0/helpers/esm/objectSpread2.js";
 import { getPrefixCls } from "../_utils/global-config.js";
 import { isNumber } from "../_utils/is.js";
 import resize_observer_v2_default from "../_components/resize-observer-v2.js";

package/es/form/form-item-message.vue_vue_type_script_setup_true_lang.js

@@ -1,4 +1,4 @@
-import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.146.0/helpers/esm/objectSpread2.js";
+import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.147.0/helpers/esm/objectSpread2.js";
 import { getPrefixCls } from "../_utils/global-config.js";
 import { Fragment, Transition, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, defineComponent, normalizeClass, openBlock, renderList, renderSlot, toDisplayString, unref, withCtx } from "vue";
 //#region components/form/form-item-message.vue?vue&type=script&setup=true&lang.ts

package/es/form/form-item.vue_vue_type_script_setup_true_lang.js

@@ -1,16 +1,18 @@
 import { formInjectionKey, formItemInjectionKey } from "./context.js";
-import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.146.0/helpers/esm/objectSpread2.js";
+import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.147.0/helpers/esm/objectSpread2.js";
 import { getPrefixCls } from "../_utils/global-config.js";
 import { useI18n } from "../locale/index.js";
+import _asyncToGenerator from "../_virtual/_@oxc-project_runtime@0.147.0/helpers/esm/asyncToGenerator.js";
 import { getValueByPath, setValueByPath } from "../_utils/get-value-by-path.js";
 import { getFinalValidateMessage, getFinalValidateStatus, getFormElementId } from "./utils.js";
 import grid_col_default from "../grid/grid-col.js";
 import grid_row_default from "../grid/grid-row.js";
 import form_item_label_default from "./form-item-label.js";
 import form_item_message_default from "./form-item-message.js";
-import _objectDestructuringEmpty from "../_virtual/_@oxc-project_runtime@0.146.0/helpers/esm/objectDestructuringEmpty.js";
-import _extends from "../_virtual/_@oxc-project_runtime@0.146.0/helpers/esm/extends.js";
-import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createSlots, createTextVNode, createVNode, defineComponent, getCurrentInstance, inject, mergeProps, nextTick, normalizeClass, onBeforeUnmount, onMounted, openBlock, provide, reactive, ref, renderSlot, toDisplayString, toRef, toRefs, unref, withCtx } from "vue";
+import _objectDestructuringEmpty from "../_virtual/_@oxc-project_runtime@0.147.0/helpers/esm/objectDestructuringEmpty.js";
+import _extends from "../_virtual/_@oxc-project_runtime@0.147.0/helpers/esm/extends.js";
+import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createSlots, createTextVNode, createVNode, defineComponent, getCurrentInstance, inject, mergeProps, nextTick, normalizeClass, onBeforeUnmount, onMounted, openBlock, provide, reactive, ref, renderSlot, toDisplayString, toRef, toRefs, unref, watch, withCtx } from "vue";
+import { cloneDeep } from "es-toolkit";
 import { Schema } from "b-validate";
 //#region components/form/form-item.vue?vue&type=script&setup=true&lang.ts
 var form_item_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent(_objectSpread2(_objectSpread2({}, { name: "FormItem" }), {}, {
@@ -267,12 +269,13 @@ var form_item_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 			return (_props$wrapperColStyl = props.wrapperColStyle) !== null && _props$wrapperColStyl !== void 0 ? _props$wrapperColStyl : formCtx.wrapperColStyle;
 		});
 		const mergedLabelAttrs = computed(() => _objectSpread2({ for: fieldId.value }, props.labelAttrs));
-		const initialValue = getValueByPath(formCtx.model, props.field);
+		let initialValue = cloneDeep(getValueByPath(formCtx.model, props.field));
 		const formValidateStatus = reactive({});
 		const validateMessage = reactive({});
 		const finalStatus = computed(() => getFinalValidateStatus(formValidateStatus));
 		const finalMessage = computed(() => getFinalValidateMessage(validateMessage));
 		const validateDisabled = ref(false);
+		let validationId = 0;
 		const fieldValue = computed(() => getValueByPath(formCtx.model, props.field));
 		const computedDisabled = computed(() => {
 			var _props$disabled;
@@ -304,12 +307,14 @@ var form_item_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 		const validateField = () => {
 			var _i18nMessage$value$fo;
 			if (validateDisabled.value) return Promise.resolve();
+			const currentValidationId = ++validationId;
 			const rules = mergedRules.value;
 			if (!field.value || rules.length === 0) {
 				if (finalStatus.value) clearValidate();
 				return Promise.resolve();
 			}
 			const _field = field.value;
+			const _label = props.label;
 			const _value = fieldValue.value;
 			updateValidateState(_field, {
 				status: "",
@@ -317,6 +322,21 @@ var form_item_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 			});
 			const schema = new Schema({ [_field]: rules.map((_ref2) => {
 				let rule = _extends({}, (_objectDestructuringEmpty(_ref2), _ref2));
+				if (rule.validator) {
+					const validator = rule.validator;
+					rule.validator = function() {
+						var _ref3 = _asyncToGenerator(function* (value, callback) {
+							try {
+								yield validator(value, callback);
+							} catch (error) {
+								callback(error instanceof Error && error.message ? error.message : String(error) || "Error");
+							}
+						});
+						return function(_x, _x2) {
+							return _ref3.apply(this, arguments);
+						};
+					}();
+				}
 				if (!rule.type && !rule.validator) rule.type = "string";
 				return rule;
 			}) }, {
@@ -325,15 +345,17 @@ var form_item_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 			});
 			return new Promise((resolve) => {
 				schema.validate({ [_field]: _value }, (err) => {
-					var _err$_field$message;
 					const hasError = Boolean(err === null || err === void 0 ? void 0 : err[_field]);
-					updateValidateState(_field, {
-						status: hasError ? "error" : "",
-						message: (_err$_field$message = err === null || err === void 0 ? void 0 : err[_field].message) !== null && _err$_field$message !== void 0 ? _err$_field$message : ""
-					});
+					if (currentValidationId === validationId) {
+						var _err$_field$message;
+						updateValidateState(_field, {
+							status: hasError ? "error" : "",
+							message: (_err$_field$message = err === null || err === void 0 ? void 0 : err[_field].message) !== null && _err$_field$message !== void 0 ? _err$_field$message : ""
+						});
+					}
 					resolve(hasError ? {
-						label: props.label,
-						field: field.value,
+						label: _label,
+						field: _field,
 						value: err[_field].value,
 						type: err[_field].type,
 						isRequiredError: Boolean(err[_field].requiredError),
@@ -380,6 +402,7 @@ var form_item_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 			updateValidateState
 		}));
 		const clearValidate = () => {
+			validationId++;
 			if (field.value) updateValidateState(field.value, {
 				status: "",
 				message: ""
@@ -404,7 +427,7 @@ var form_item_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 		const resetField = () => {
 			clearValidate();
 			validateDisabled.value = true;
-			if ((formCtx === null || formCtx === void 0 ? void 0 : formCtx.model) && field.value) setValueByPath(formCtx.model, field.value, initialValue);
+			if ((formCtx === null || formCtx === void 0 ? void 0 : formCtx.model) && field.value) setValueByPath(formCtx.model, field.value, cloneDeep(initialValue));
 			nextTick(() => {
 				validateDisabled.value = false;
 			});
@@ -424,12 +447,28 @@ var form_item_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 				(_formCtx$addField = formCtx.addField) === null || _formCtx$addField === void 0 || _formCtx$addField.call(formCtx, formItemInfo);
 			}
 		});
-		onBeforeUnmount(() => {
-			if (formItemInfo.field) {
+		watch(field, (nextField, previousField) => {
+			validationId++;
+			if (previousField) updateValidateState(previousField, {
+				status: "",
+				message: ""
+			});
+			initialValue = cloneDeep(getValueByPath(formCtx.model, nextField));
+			if (!previousField && nextField) {
+				var _formCtx$addField2;
+				(_formCtx$addField2 = formCtx.addField) === null || _formCtx$addField2 === void 0 || _formCtx$addField2.call(formCtx, formItemInfo);
+			} else if (previousField && !nextField) {
 				var _formCtx$removeField;
 				(_formCtx$removeField = formCtx.removeField) === null || _formCtx$removeField === void 0 || _formCtx$removeField.call(formCtx, formItemInfo);
 			}
 		});
+		onBeforeUnmount(() => {
+			clearValidate();
+			if (formItemInfo.field) {
+				var _formCtx$removeField2;
+				(_formCtx$removeField2 = formCtx.removeField) === null || _formCtx$removeField2 === void 0 || _formCtx$removeField2.call(formCtx, formItemInfo);
+			}
+		});
 		const cls = computed(() => [
 			prefixCls,
 			`${prefixCls}-layout-${formCtx.layout}`,

package/es/form/form.vue_vue_type_script_setup_true_lang.js

@@ -1,10 +1,11 @@
 import { formInjectionKey } from "./context.js";
-import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.146.0/helpers/esm/objectSpread2.js";
+import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.147.0/helpers/esm/objectSpread2.js";
 import { getPrefixCls } from "../_utils/global-config.js";
-import { isArray, isBoolean, isFunction } from "../_utils/is.js";
+import { isArray, isBoolean, isFunction as isFunction$1 } from "../_utils/is.js";
 import { useSize } from "../_hooks/use-size.js";
 import { getFormElementId } from "./utils.js";
 import { computed, createElementBlock, defineComponent, normalizeClass, openBlock, provide, reactive, ref, renderSlot, toRefs, unref, withModifiers } from "vue";
+import { cloneDeep } from "es-toolkit";
 //#region components/form/form.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = ["id"];
 var form_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent(_objectSpread2(_objectSpread2({}, { name: "Form" }), {}, {
@@ -124,7 +125,8 @@ var form_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 			if (formItemInfo && formItemInfo.field) fields.push(formItemInfo);
 		};
 		const removeField = (formItemInfo) => {
-			if (formItemInfo && formItemInfo.field) fields.splice(fields.indexOf(formItemInfo), 1);
+			const index = fields.indexOf(formItemInfo);
+			if (index !== -1) fields.splice(index, 1);
 		};
 		const setFields = (data) => {
 			fields.forEach((field) => {
@@ -175,7 +177,7 @@ var form_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 					}
 				});
 				if (hasError && props.scrollToFirstError) scrollToFirstError(Object.keys(errors)[0]);
-				if (isFunction(callback)) callback(hasError ? errors : void 0);
+				if (isFunction$1(callback)) callback(hasError ? errors : void 0);
 				return hasError ? errors : void 0;
 			});
 		};
@@ -192,11 +194,12 @@ var form_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 					}
 				});
 				if (hasError && props.scrollToFirstError) scrollToFirstError(Object.keys(errors)[0]);
-				if (isFunction(callback)) callback(hasError ? errors : void 0);
+				if (isFunction$1(callback)) callback(hasError ? errors : void 0);
 				return hasError ? errors : void 0;
 			});
 		};
 		const handleSubmit = (e) => {
+			const values = cloneDeep(model.value);
 			const list = [];
 			fields.forEach((field) => {
 				list.push(field.validate());
@@ -213,12 +216,12 @@ var form_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 				if (hasError) {
 					props.scrollToFirstError && scrollToFirstError(Object.keys(errors)[0]);
 					emit("submitFailed", {
-						values: model.value,
+						values,
 						errors
 					}, e);
-				} else emit("submitSuccess", model.value, e);
+				} else emit("submitSuccess", values, e);
 				emit("submit", {
-					values: model.value,
+					values,
 					errors: hasError ? errors : void 0
 				}, e);
 			});

package/es/grid/context.d.ts

@@ -13,7 +13,7 @@ export type GridContext = Readonly<{
 }>;
 export declare const GridContextInjectionKey: InjectionKey<GridContext>;
 export type GridDataCollector = Readonly<{
-    collectItemData: (index: number, itemData: GridItemData) => void;
-    removeItemData: (index: number) => void;
+    collectItemData: (id: number, index: number, itemData: GridItemData) => void;
+    removeItemData: (id: number) => void;
 }>;
 export declare const GridDataCollectorInjectionKey: InjectionKey<GridDataCollector>;

package/es/grid/grid-col.vue_vue_type_script_setup_true_lang.js

@@ -1,4 +1,4 @@
-import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.146.0/helpers/esm/objectSpread2.js";
+import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.147.0/helpers/esm/objectSpread2.js";
 import { getPrefixCls } from "../_utils/global-config.js";
 import { isNull, isNumber, isObject, isString, isUndefined } from "../_utils/is.js";
 import pick from "../_utils/pick.js";
@@ -102,14 +102,15 @@ var grid_col_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineC
 				if (hasBreakpointValue(screenValue) && isNumber(screenValue)) result[`${prefixCls}-${screen}-${screenValue}`] = true;
 				else if (hasBreakpointValue(screenValue) && isObject(screenValue)) {
 					result[`${prefixCls}-${screen}-${screenValue.span}`] = screenValue.span;
-					result[`${prefixCls}-${screen}-offset-${screenValue.offset}`] = screenValue.offset;
-					result[`${prefixCls}-${screen}-order-${screenValue.order}`] = screenValue.order;
+					result[`${prefixCls}-${screen}-offset-${screenValue.offset}`] = hasBreakpointValue(screenValue.offset);
+					result[`${prefixCls}-${screen}-order-${screenValue.order}`] = hasBreakpointValue(screenValue.order);
 				}
 			});
 			return result;
 		});
 		const classNames = computed(() => {
-			return flexValue.value ? prefixCls : mergeClassName.value;
+			if (rowContext.div) return void 0;
+			return flexValue.value !== void 0 ? prefixCls : mergeClassName.value;
 		});
 		const paddingStyles = computed(() => {
 			const { gutter, div } = rowContext;
@@ -128,15 +129,15 @@ var grid_col_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineC
 			}
 			return result;
 		});
-		const flexStyles = computed(() => flexValue.value ? { flex: flexValue.value } : {});
+		const flexStyles = computed(() => flexValue.value !== void 0 ? { flex: flexValue.value } : {});
 		const responsiveConfig = computed(() => pick(props, responsiveArray));
 		const propSpan = useResponsiveValue(computed(() => _objectSpread2({
 			val: props.span,
 			key: "span"
 		}, responsiveConfig.value)));
 		const responsiveSpan = useResponsiveState(propSpan, 24, true);
-		const visible = computed(() => !!responsiveSpan.value);
-		const styles = computed(() => _objectSpread2(_objectSpread2({}, paddingStyles.value), flexStyles.value));
+		const visible = computed(() => rowContext.div || !!responsiveSpan.value);
+		const styles = computed(() => rowContext.div ? {} : _objectSpread2(_objectSpread2({}, paddingStyles.value), flexStyles.value));
 		return (_ctx, _cache) => {
 			return visible.value ? (openBlock(), createElementBlock("div", {
 				key: 0,

package/es/grid/grid-item.vue_vue_type_script_setup_true_lang.js

@@ -1,10 +1,10 @@
-import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.146.0/helpers/esm/objectSpread2.js";
+import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.147.0/helpers/esm/objectSpread2.js";
 import { getPrefixCls } from "../_utils/global-config.js";
 import { useIndex } from "../_hooks/use-index.js";
 import { GridContextInjectionKey, GridDataCollectorInjectionKey } from "./context.js";
 import { useResponsiveState } from "./hook/use-responsive-state.js";
 import { resolveItemData } from "./utils/index.js";
-import { computed, createElementBlock, defineComponent, inject, normalizeClass, normalizeStyle, onUnmounted, openBlock, ref, renderSlot, toRefs, watchEffect } from "vue";
+import { computed, createElementBlock, defineComponent, getCurrentInstance, inject, normalizeClass, normalizeStyle, onUnmounted, openBlock, ref, renderSlot, toRefs, watchEffect } from "vue";
 //#region components/grid/grid-item.vue?vue&type=script&setup=true&lang.ts
 /**
 * @version 2.15.0
@@ -43,6 +43,7 @@ var grid_item_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 		const props = __props;
 		const prefixCls = getPrefixCls("grid-item");
 		const domRef = ref();
+		const itemId = getCurrentInstance().uid;
 		const { computedIndex } = useIndex({
 			itemRef: domRef,
 			selector: `.${prefixCls}`
@@ -89,10 +90,10 @@ var grid_item_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 		});
 		const overflow = computed(() => gridContext.overflow);
 		watchEffect(() => {
-			if (computedIndex.value !== -1) gridDataCollector === null || gridDataCollector === void 0 || gridDataCollector.collectItemData(computedIndex.value, itemData.value);
+			if (computedIndex.value !== -1) gridDataCollector === null || gridDataCollector === void 0 || gridDataCollector.collectItemData(itemId, computedIndex.value, itemData.value);
 		});
 		onUnmounted(() => {
-			if (computedIndex.value !== -1) gridDataCollector === null || gridDataCollector === void 0 || gridDataCollector.removeItemData(computedIndex.value);
+			gridDataCollector === null || gridDataCollector === void 0 || gridDataCollector.removeItemData(itemId);
 		});
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", {

package/es/grid/grid-row.vue_vue_type_script_setup_true_lang.js

@@ -1,4 +1,4 @@
-import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.146.0/helpers/esm/objectSpread2.js";
+import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.147.0/helpers/esm/objectSpread2.js";
 import { getPrefixCls } from "../_utils/global-config.js";
 import { RowContextInjectionKey } from "./context.js";
 import { useResponsiveState } from "./hook/use-responsive-state.js";
@@ -54,6 +54,7 @@ var grid_row_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineC
 		const { gutter, align, justify, div, wrap } = toRefs(__props);
 		const prefixCls = getPrefixCls("row");
 		const classNames = computed(() => {
+			if (div.value) return {};
 			return {
 				[`${prefixCls}`]: !div.value,
 				[`${prefixCls}-nowrap`]: !wrap.value,

package/es/grid/grid.vue_vue_type_script_setup_true_lang.js

@@ -1,4 +1,4 @@
-import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.146.0/helpers/esm/objectSpread2.js";
+import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.147.0/helpers/esm/objectSpread2.js";
 import { getPrefixCls } from "../_utils/global-config.js";
 import { GridContextInjectionKey, GridDataCollectorInjectionKey } from "./context.js";
 import { useResponsiveState } from "./hook/use-responsive-state.js";
@@ -66,11 +66,7 @@ var grid_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 			"grid-template-columns": `repeat(${resCols.value}, minmax(0px, 1fr))`
 		}]);
 		const itemDataMap = reactive(/* @__PURE__ */ new Map());
-		const itemDataList = computed(() => {
-			const list = [];
-			for (const [index, itemData] of itemDataMap.entries()) list[index] = itemData;
-			return list;
-		});
+		const itemEntries = computed(() => [...itemDataMap.values()].sort((a, b) => a.index - b.index));
 		const gridContext = reactive({
 			overflow: false,
 			displayIndexList: [],
@@ -86,18 +82,21 @@ var grid_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 				cols: resCols.value,
 				collapsed: collapsed.value,
 				collapsedRows: collapsedRows.value,
-				itemDataList: itemDataList.value
+				itemDataList: itemEntries.value.map((item) => item.data)
 			});
 			gridContext.overflow = displayInfo.overflow;
-			gridContext.displayIndexList = displayInfo.displayIndexList;
+			gridContext.displayIndexList = displayInfo.displayIndexList.map((index) => itemEntries.value[index].index);
 		});
 		provide(GridContextInjectionKey, gridContext);
 		provide(GridDataCollectorInjectionKey, {
-			collectItemData(index, itemData) {
-				itemDataMap.set(index, itemData);
+			collectItemData(id, index, itemData) {
+				itemDataMap.set(id, {
+					index,
+					data: itemData
+				});
 			},
-			removeItemData(index) {
-				itemDataMap.delete(index);
+			removeItemData(id) {
+				itemDataMap.delete(id);
 			}
 		});
 		return (_ctx, _cache) => {

package/es/grid/style/col.scss

@@ -28,7 +28,7 @@ $col-prefix-cls: string.unquote('#{$prefix}-col');
   @include span(24, '');
 
   @mixin offset($offset, $adaptation) {
-    @if $offset > 0 {
+    @if $offset >= 0 {
       @include offset(($offset - 1), $adaptation);
 
       @if $adaptation == '' {
@@ -46,7 +46,7 @@ $col-prefix-cls: string.unquote('#{$prefix}-col');
   @include offset(23, '');
 
   @mixin order($order, $adaptation) {
-    @if $order > 0 {
+    @if $order >= 0 {
       @include order(($order - 1), $adaptation);
 
       @if $adaptation == '' {