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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@d-mok/quasar-app-extension-quasar-axe",
-    "version": "2.1.45",
+    "version": "2.1.47",
     "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
+    validators: [(_: T) => boolean, 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,
+        validators,
         cancel: true,
     })
 }
@@ -110,21 +110,15 @@ export async function askArray(
     title: string,
     message: string = '',
     prefill: string[] = [],
-    isValid: Predicate<string> = $ => true
+    validators: [(_: string) => boolean, string][] = [[$ => true, '']]
 ): Promise<string[]> {
-    function split(s: string): string[] {
-        return s.split('\n').filter($ => $.trim() !== '')
-    }
-
-    let str: string = await base(dialogTextarea, {
+    let result = await askTable(
         title,
         message,
-        prefill: prefill.join('\n'),
-        isValid: (s: string) => split(s).every(isValid),
-        cancel: true,
-    })
-
-    return split(str)
+        [prefill.map($ => ({ value: $ })), [{ value: '' }]],
+        validators.map(([fn, err]) => [$ => fn($.value), err])
+    )
+    return result.pluck('value').unmatch([''])
 }
 
 type FormPrefill = Record<
@@ -148,13 +142,13 @@ export async function askForm<T extends FormPrefill>(
     title: string,
     message: string,
     prefill: T,
-    validator: (_: FormFlat<T>) => true | string = $ => true
+    validators: [(_: FormFlat<T>) => boolean, string][] = [[$ => true, '']],
 ): Promise<FormFlat<T>> {
     return await base(dialogForm, {
         title,
         message,
         prefill,
-        validator,
+        validators,
     })
 }
 

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

@@ -41,10 +41,11 @@
                     />
                 </div>
                 <div
+                    v-show="errorMsg()"
                     class="text-red"
                     style="text-align: right"
                 >
-                    {{ validator(dummy) === true ? ' ' : validator(dummy) }}
+                    {{ errorMsg() }}
                 </div>
             </q-card-section>
 
@@ -90,7 +91,7 @@ const props = defineProps<{
     title: string
     message: string
     prefill: prefill
-    validator: (_: row) => true | string
+    validators: [(_: row) => boolean, string][]
 }>()
 
 function makeSample(p: prefill): row {
@@ -119,10 +120,20 @@ function getType(field: string): string {
     return 'string'
 }
 
+// valid check
+
 function valid() {
     return (
-        props.validator(dummy.value) === true &&
+        props.validators.every(v => v[0](dummy.value)) &&
         isMatchSchema(dummy.value, schema)
     )
 }
+
+function errorMsg(): string | undefined {
+    for (let [f, e] of props.validators) {
+        let ok = f(dummy.value)
+        if (!ok) return e
+    }
+    return undefined
+}
 </script>

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

@@ -27,6 +27,13 @@
                         v-if="exist"
                     ></handson>
                 </q-card>
+                <div
+                    v-show="errorMsg()"
+                    class="text-red"
+                    style="text-align: right"
+                >
+                    {{ errorMsg() }}
+                </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
+    validators: [(_: row) => boolean, string][]
     cancel: boolean
 }>()
 
@@ -93,10 +101,23 @@ setTimeout(() => {
 function allValid() {
     if (!props.cancel) return true
     return dummy.value.every(
-        $ => props.isValid($) && isPrimitive($) && isMatchSchema($, schema)
+        $ =>
+            props.validators.every(v => v[0]($)) &&
+            isPrimitive($) &&
+            isMatchSchema($, schema)
     )
 }
 
+function errorMsg(): string | undefined {
+    for (let i = 0; i < dummy.value.length; i++) {
+        for (let [f, e] of props.validators) {
+            let ok = f(dummy.value[i])
+            if (!ok) return `row ${i + 1}: ${e}`
+        }
+    }
+    return undefined
+}
+
 // filter blank
 
 function isEmptyVal(x: any): boolean {