mrxy-yk 1.12.2 → 1.12.3

package/dist/components/form-table/FormTable.d.ts

@@ -1,4 +1,5 @@
 import { FormRules } from 'element-plus';
+import { HotInstance } from 'handsontable';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
 type __VLS_Props = {
     data: Record<PropertyKey, any>[];
@@ -10,7 +11,7 @@ type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_9) => any;
 };
 declare const __VLS_base: DefineComponent<__VLS_Props, {
-    readonly hotInstance: any;
+    readonly hotInstance: HotInstance;
     redrawing(data?: Record<PropertyKey, any>[]): void;
     validate(): Promise<unknown>;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {}, any>;

package/dist/components/form-table/FormTable.vue.setup.js

@@ -108,7 +108,9 @@ var FormTable_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 						callback(true);
 						return;
 					}
-					const error = await validatorRaw(rules[i], value, tableData[row]);
+					const physicalRow = hotInstance.toPhysicalRow(row);
+					const rawRow = hotInstance.getSourceDataAtRow(physicalRow);
+					const error = await validatorRaw(rules[i], value, rawRow);
 					if (error) {
 						if (ObjectUtil.isNotEmpty(row)) {
 							console.log(error.message);

package/dist/components/form-table/FormTableColumn.vue.setup.js

@@ -17,7 +17,7 @@ var FormTableColumn_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/
 		function reloadTd(td) {
 			const prev = tdMap.get(td);
 			if (prev) {
-				prev.destroy();
+				prev.destroy?.();
 				render(null, prev.wrapper);
 				prev.wrapper.remove();
 				tdMap.delete(td);
@@ -26,12 +26,28 @@ var FormTableColumn_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/
 			td.classList.add("yk-form-table-column");
 		}
 		function slotRender(instance, td, row, col, _prop, value, wrapper, slotName = "default") {
-			const rowData = reactive((instance.getSourceData?.() ?? [])[row] ?? {});
-			const watchHandle = watch(() => rowData[_prop], (newVal) => {
-				if (instance.getDataAtCell?.(row, col) !== newVal) instance.setDataAtCell?.(row, col, newVal);
-			});
+			const physicalRow = instance.toPhysicalRow(row);
+			const rawRow = instance.getSourceDataAtRow(physicalRow);
+			let rowData = rawRow;
 			const targetSlot = slots[slotName];
 			if (!targetSlot) return;
+			if (slotName === "default") tdMap.set(td, {
+				wrapper,
+				row,
+				col
+			});
+			else if (slotName === "selection") {
+				rowData = reactive(rawRow);
+				const watchHandle = watch(() => rowData[_prop], (newVal) => {
+					if (instance.getDataAtCell?.(row, col) !== newVal) instance.setDataAtCell?.(row, col, newVal);
+				});
+				tdMap.set(td, {
+					wrapper,
+					destroy: watchHandle,
+					row,
+					col
+				});
+			}
 			const vNodes = targetSlot({
 				row: rowData,
 				value,
@@ -44,15 +60,6 @@ var FormTableColumn_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/
 				return;
 			}
 			render(createVNode(Fragment, null, vNodes.map((vn) => cloneVNode(vn))), wrapper);
-			const destroy = () => {
-				watchHandle();
-			};
-			tdMap.set(td, {
-				wrapper,
-				destroy,
-				row,
-				col
-			});
 		}
 		function isMultiSelected(instance) {
 			const selected = instance.getSelected?.();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mrxy-yk",
-  "version": "1.12.2",
+  "version": "1.12.3",
   "private": false,
   "type": "module",
   "description": "A collection of Vue 3 components and utilities",

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "framework": "vue",
   "name": "mrxy-yk",
-  "version": "1.12.2",
+  "version": "1.12.3",
   "js-types-syntax": "typescript",
   "contributions": {
     "html": {