@d-mok/quasar-app-extension-quasar-axe 2.1.45 → 2.1.46

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@d-mok/quasar-app-extension-quasar-axe",
-    "version": "2.1.45",
+    "version": "2.1.46",
     "description": "A Quasar App Extension",
     "author": "d-mok <49301824+d-mok@users.noreply.github.com>",
     "license": "MIT",

package/src/templates/src/utils/dialog/advanced.ts

@@ -89,7 +89,7 @@ export async function askTable<T extends object>(
     title: string,
     message: string = '',
     prefills: T[][],
-    isValid: Predicate<T> = $ => true
+    validator: (_: T) => true | string = $ => true
 ): Promise<T[]> {
     if (prefills.flat().length === 0)
         throwError('Error', 'All prefills are empty array.')
@@ -98,7 +98,7 @@ export async function askTable<T extends object>(
         message,
         content: prefills.find($ => $.length > 0),
         sample: [...prefills].reverse().find($ => $.length > 0)![0],
-        isValid,
+        validator,
         cancel: true,
     })
 }

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

@@ -27,6 +27,13 @@
                         v-if="exist"
                     ></handson>
                 </q-card>
+                <div
+                    v-for="e in errorMsg()"
+                    class="text-red"
+                    style="text-align: right"
+                >
+                    {{ e }}
+                </div>
             </q-card-section>
 
             <q-card-actions align="right">
@@ -59,6 +66,7 @@ import { ref } from 'vue'
 import { toSchema, isMatchSchema, isPrimitive, clone } from './schema'
 import { unparseCSV } from '../../csv'
 import { copyToClipboard } from 'quasar'
+import { validate } from 'json-schema'
 
 defineEmits([...useDialogPluginComponent.emits])
 
@@ -72,7 +80,7 @@ const props = defineProps<{
     message: string
     content: row[]
     sample: row
-    isValid: (_: row) => boolean
+    validator: (_: row) => true | string
     cancel: boolean
 }>()
 
@@ -93,10 +101,22 @@ setTimeout(() => {
 function allValid() {
     if (!props.cancel) return true
     return dummy.value.every(
-        $ => props.isValid($) && isPrimitive($) && isMatchSchema($, schema)
+        $ =>
+            props.validator($) === true &&
+            isPrimitive($) &&
+            isMatchSchema($, schema)
     )
 }
 
+function errorMsg(): string[] {
+    let msgs: string[] = []
+    for (let i = 0; i < dummy.value.length; i++) {
+        let valid = props.validator(dummy.value[i])
+        if (valid !== true) msgs.push(`row ${i + 1}: ${valid}`)
+    }
+    return msgs
+}
+
 // filter blank
 
 function isEmptyVal(x: any): boolean {