@d-mok/quasar-app-extension-quasar-axe 3.1.25 → 3.1.26

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@d-mok/quasar-app-extension-quasar-axe",
-    "version": "3.1.25",
+    "version": "3.1.26",
     "description": "A Quasar App Extension",
     "main": "src/index.js",
     "scripts": {

package/src/templates/src/utils/dialog/custom/dialogTable.vue

@@ -23,7 +23,7 @@
                 >
                     <handson
                         v-model="dummy"
-                        :spec="spec"
+                        :sample="sample"
                         :allowAddRow="allowAddRow"
                         v-if="exist"
                     ></handson>
@@ -106,20 +106,13 @@ setTimeout(() => {
 
 let dummy = ref(content.map($ => clone($, Object.keys(sample))))
 
-let spec = Object.mapValues(sample, v => {
-    if (typeof v === 'string') return 'string'
-    if (typeof v === 'number') return 'number'
-    if (typeof v === 'boolean') return 'boolean'
-    throw 'non-primitive type in sample'
-})
-
 function checkSpec(row: any): boolean {
     return v.is(
         v.object(
-            Object.mapValues(spec, val => {
-                if (val === 'string') return v.string()
-                if (val === 'number') return v.number()
-                if (val === 'boolean') return v.boolean()
+            Object.mapValues(sample, val => {
+                if (typeof val === 'string') return v.string()
+                if (typeof val === 'number') return v.number()
+                if (typeof val === 'boolean') return v.boolean()
                 return v.never('Invalid type:' + val)
             })
         ),
@@ -130,7 +123,7 @@ function checkSpec(row: any): boolean {
 function err(): string | false {
     for (let i = 0; i < dummy.value.length; i++) {
         if (!checkSpec(dummy.value[i])) {
-            return `row ${i + 1}: spec error<br>spec:${JSON.stringify(spec)}`
+            return `row ${i + 1}: spec error<br>spec:${JSON.stringify(sample)}`
         }
     }
     for (let i = 0; i < dummy.value.length; i++) {

package/src/templates/src/utils/dialog/custom/handson.vue

@@ -7,7 +7,7 @@
         width="100%"
         stretchH="all"
         :data="content"
-        :colHeaders="Object.keys(spec)"
+        :colHeaders="Object.keys(sample)"
         :columns="columns()"
         :rowHeaders="true"
         :afterChange="shake"
@@ -39,20 +39,20 @@ const content = defineModel<Record<string, string | number | boolean>[]>({
     required: true,
 })
 
-const { spec, allowAddRow } = defineProps<{
-    spec: Record<string, 'string' | 'number' | 'boolean'>
+const { sample, allowAddRow } = defineProps<{
+    sample: Record<string, string | number | boolean>
     allowAddRow: boolean
 }>()
 
 function columns() {
-    return Object.entries(spec).map(([field, type]) => ({
+    return Object.entries(sample).map(([field, val]) => ({
         data: field,
         type:
-            {
-                number: 'numeric',
-                string: 'text',
-                boolean: 'checkbox',
-            }[type] ?? 'text',
+            typeof val === 'boolean'
+                ? 'checkbox'
+                : typeof val === 'number'
+                ? 'numeric'
+                : 'text',
         allowEmpty: false,
     }))
 }
@@ -80,7 +80,7 @@ function coerceBoolean(x: any): boolean {
 function shake(): void {
     for (let row of content.value) {
         for (let [k, v] of Object.entries(row)) {
-            let type = spec[k]
+            let type = typeof sample[k]
             if (type === 'string') row[k] = coerceString(v)
             if (type === 'number') row[k] = coerceNumber(v)
             if (type === 'boolean') row[k] = coerceBoolean(v)