@mixd-id/web-scaffold 0.1.240411104 → 0.1.240411106

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mixd-id/web-scaffold",
   "private": false,
-  "version": "0.1.240411104",
+  "version": "0.1.240411106",
   "scripts": {
     "dev": "vite serve",
     "build": "vite build",

package/src/components/List.vue

@@ -372,7 +372,7 @@ export default{
     },
 
     load(){
-      if(this.computedSrc){
+      if(this.computedSrc && this.preset){
         if(!this.preset.columns){
           this.preset.columns = JSON.parse(JSON.stringify(this.cConfig.columns))
         }
@@ -399,7 +399,7 @@ export default{
     },
 
     loadNext(){
-      if(this.computedSrc && this.readyState !== 4 &&
+      if(this.computedSrc && this.preset && this.readyState !== 4 &&
           ((this.data ?? {}).hasNext !== false) &&
           !(this.preset.pivot ?? {}).enabled &&
           this.dataItems) {
@@ -472,7 +472,7 @@ export default{
     },
 
     async loadEnums(items){
-      if(!items) return
+      if(!items || !this.preset) return
 
       return Promise.all((this.preset.columns ?? []).map(async column => {
 
@@ -523,7 +523,7 @@ export default{
     },
 
     loadExt(){
-      if(!this.extBar.open) return
+      if(!this.extBar.open || !this.preset) return
 
       this.readyState = 3
       return this.useSocket().send(this.computedSrc, {
@@ -543,7 +543,7 @@ export default{
     },
 
     loadExtNext(){
-      if(!this.preset.filters) return
+      if(!this.preset?.filters) return
 
       return this.useSocket().send(this.computedSrc, {
         ...this.preset,
@@ -626,7 +626,7 @@ export default{
           return sortsFn(a, b, this.sorts, 0)
         })
       }
-      else if((this.preset.sorts ?? []).length > 0){
+      else if((this.preset?.sorts ?? []).length > 0){
         return (items ?? []).sort((a, b) => {
           return sortsFn(a, b, this.preset.sorts, 0)
         })
@@ -636,6 +636,8 @@ export default{
     },
 
     loadQueued(items){
+      if(!this.preset) return
+
       const key = items[0] && items[0].uid ? 'uid' : 'id'
 
       this.useSocket().send(this.computedSrc, {
@@ -698,7 +700,7 @@ export default{
           const key = pivotRow.key
           const presetColumn = this.preset.columns.find(_ => _.key === key)
           let value = item[pivotRow.key]
-          switch(presetColumn.type){
+          switch(presetColumn?.type){
 
             case 'bool':
             case 'boolean':

package/src/components/Modal.vue

@@ -380,7 +380,7 @@ export default{
 .modal{
 	@apply fixed;
 	@apply bg-base-400 dark:bg-base-300;
-	@apply border-[1px] border-text-50 flex max-h-[90vh] max-w-full;
+	@apply border-[1px] border-text-50 flex md:max-w-[95vw] max-h-[90vh] max-w-full;
 	@apply rounded-xl overflow-hidden transition-all;
   z-index: 101;
 }

package/src/utils/importer.js

@@ -32,6 +32,10 @@ const getCellText = (cell, image) => {
 
 const cellKey = (row, col) => row + ',' + col
 
+// Header labels often carry stray padding in the source file ("TEKS PROGRAM "),
+// normalise them so the column mapping does not depend on it
+const columnName = (value) => `${value ?? ''}`.trim()
+
 // Maps the cell an image is anchored on to its media entry ({ buffer, extension, name }).
 // Only the top left anchor counts, an image spilling over its neighbours stays on one cell.
 const getWorksheetImages = (workbook, worksheet) => {
@@ -118,10 +122,10 @@ const analyseRequest = async(req) => {
     header.eachCell((cell) => {
       if(cell.isMerged){
         const sub = worksheet.getCell(cell.address.replace(/\d/g, '') + '2').value
-        columns.push(cell.value + '>' + sub)
+        columns.push(columnName(cell.value) + '>' + columnName(sub))
       }
       else{
-        columns.push(cell.value)
+        columns.push(columnName(cell.value))
       }
     })
 
@@ -190,11 +194,11 @@ const importRequest = async(req) => {
     header.eachCell((cell, index) => {
       if(cell.isMerged){
         const sub = worksheet.getCell(cell.address.replace(/\d/g, '') + '2').value
-        columnAddress[cell.value + '>' + sub] = index
+        columnAddress[columnName(cell.value) + '>' + columnName(sub)] = index
         rowStart = 3
       }
       else{
-        columnAddress[cell.value] = index
+        columnAddress[columnName(cell.value)] = index
       }
     })
 
@@ -227,8 +231,9 @@ const importRequest = async(req) => {
         let isItalic = false
         for(let idx in keys){
           const key = keys[idx]
-          if(key.value && columnAddress[key.value]){
-            const cell = row.getCell(columnAddress[key.value])
+          const address = columnAddress[columnName(key.value)]
+          if(key.value && address){
+            const cell = row.getCell(address)
             if(cell.font && cell.font.italic){
               isItalic = true
               break
@@ -243,9 +248,10 @@ const importRequest = async(req) => {
       if(keys){
         for(let idx in keys){
           const key = keys[idx]
-          if(key.value && columnAddress[key.value]){
-            const cell = row.getCell(columnAddress[key.value])
-            obj[key.key] = getCellText(cell, cellImages.get(cellKey(index, columnAddress[key.value])))
+          const address = columnAddress[columnName(key.value)]
+          if(key.value && address){
+            const cell = row.getCell(address)
+            obj[key.key] = getCellText(cell, cellImages.get(cellKey(index, address)))
           }
         }
       }