@stonecrop/desktop 0.10.10 → 0.10.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stonecrop/desktop",
-  "version": "0.10.10",
+  "version": "0.10.12",
   "license": "MIT",
   "type": "module",
   "author": {
@@ -32,10 +32,10 @@
     "**/*.css"
   ],
   "dependencies": {
-    "@stonecrop/aform": "0.10.10",
-    "@stonecrop/atable": "0.10.10",
-    "@stonecrop/themes": "0.10.10",
-    "@stonecrop/stonecrop": "0.10.10"
+    "@stonecrop/aform": "0.10.12",
+    "@stonecrop/atable": "0.10.12",
+    "@stonecrop/stonecrop": "0.10.12",
+    "@stonecrop/themes": "0.10.12"
   },
   "peerDependencies": {
     "vue": "^3.5.28"

package/src/components/Desktop.vue

@@ -575,8 +575,9 @@ const getRecordFormSchema = (): SchemaTypes[] => {
 			return []
 		}
 
-		// Data is provided via v-model:data="currentViewData" — no need to spread values into schema
-		return 'toArray' in doctype.schema ? doctype.schema.toArray() : doctype.schema
+		// Convert schema to array and resolve Doctype fields (both cardinality: 'one' and 'many')
+		const schemaArray = 'toArray' in doctype.schema ? doctype.schema.toArray() : doctype.schema
+		return registry.resolveSchema(schemaArray)
 	} catch {
 		return []
 	}
@@ -662,6 +663,25 @@ const handleDelete = async (recordId?: string) => {
 }
 
 // Event handlers
+const getRecordIdFromRow = (rowElement: HTMLTableRowElement): string | null => {
+	const cell = rowElement.querySelector('td[data-rowindex]')
+	if (!cell) return null
+
+	const rowIndexAttr = cell.getAttribute('data-rowindex')
+	if (rowIndexAttr === null) return null
+
+	const rowIndex = parseInt(rowIndexAttr, 10)
+	if (isNaN(rowIndex)) return null
+
+	const records = getRecords()
+	const record = records[rowIndex]
+	if (!record) return null
+
+	const idField = props.recordIdField || 'id'
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+	return record[idField] || record.id || null
+}
+
 const handleClick = async (event: Event) => {
 	const target = event.target as HTMLElement
 	const action = target.getAttribute('data-action')
@@ -670,7 +690,6 @@ const handleClick = async (event: Event) => {
 		await createNewRecord()
 	}
 
-	// Handle table cell clicks for actions
 	const cell = target.closest('td, th')
 	if (cell) {
 		const cellText = cell.textContent?.trim()
@@ -687,24 +706,14 @@ const handleClick = async (event: Event) => {
 				}
 			}
 		} else if (cellText?.includes('Edit') && row) {
-			// Get the record ID from the row
-			const cells = row.querySelectorAll('td')
-			if (cells.length > 0) {
-				const idCell = cells[0] // Assuming ID is in first column
-				const recordId = idCell.textContent?.trim()
-				if (recordId) {
-					await openRecord(recordId)
-				}
+			const recordId = getRecordIdFromRow(row)
+			if (recordId) {
+				await openRecord(recordId)
 			}
 		} else if (cellText?.includes('Delete') && row) {
-			// Get the record ID from the row
-			const cells = row.querySelectorAll('td')
-			if (cells.length > 0) {
-				const idCell = cells[0] // Assuming ID is in first column
-				const recordId = idCell.textContent?.trim()
-				if (recordId) {
-					await handleDelete(recordId)
-				}
+			const recordId = getRecordIdFromRow(row)
+			if (recordId) {
+				await handleDelete(recordId)
 			}
 		}
 	}