@d-mok/quasar-app-extension-quasar-axe 2.2.7 → 2.2.9

package/package.json

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

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

@@ -89,7 +89,8 @@ export async function askTable<T extends object>(
     title: string,
     message: string = '',
     prefills: T[][],
-    validators: [(_: T) => boolean, string][] = [[$ => true, '']]
+    validators: [(_: T) => boolean, string][] = [[$ => true, '']],
+    arrayValidator: [(_: T[]) => boolean, string][] = [[$ => true, '']]
 ): Promise<T[]> {
     if (prefills.flat().length === 0)
         throwError('Error', 'All prefills are empty array.')
@@ -99,6 +100,7 @@ export async function askTable<T extends object>(
         content: prefills.find($ => $.length > 0),
         sample: [...prefills].reverse().find($ => $.length > 0)![0],
         validators,
+        arrayValidator,
         cancel: true,
         allowAddRow: true,
     })
@@ -111,7 +113,8 @@ export async function editTable<T extends object>(
     title: string,
     message: string = '',
     prefill: T[],
-    validators: [(_: T) => boolean, string][] = [[$ => true, '']]
+    validators: [(_: T) => boolean, string][] = [[$ => true, '']],
+    arrayValidator: [(_: T[]) => boolean, string][] = [[$ => true, '']]
 ): Promise<T[]> {
     if (prefill.length === 0) throwError('Error', 'prefill is empty array.')
     return await base(dialogTable, {
@@ -120,6 +123,7 @@ export async function editTable<T extends object>(
         content: prefill,
         sample: prefill[0],
         validators,
+        arrayValidator,
         cancel: true,
         allowAddRow: false,
     })
@@ -132,13 +136,15 @@ export async function askArray(
     title: string,
     message: string = '',
     prefill: string[] = [],
-    validators: [(_: string) => boolean, string][] = [[$ => true, '']]
+    validators: [(_: string) => boolean, string][] = [[$ => true, '']],
+    arrayValidator: [(_: string[]) => boolean, string][] = [[$ => true, '']]
 ): Promise<string[]> {
     let result = await askTable(
         title,
         message,
         [prefill.map($ => ({ value: $ })), [{ value: '' }]],
-        validators.map(([fn, err]) => [$ => fn($.value), err])
+        validators.map(([fn, err]) => [$ => fn($.value), err]),
+        arrayValidator.map(([fn, err]) => [$ => fn($.pluck('value')), err])
     )
     return result.pluck('value').unmatch([''])
 }
@@ -208,6 +214,7 @@ export async function showTable(
         content,
         sample: content[0],
         validators: [[($: any) => true, '']],
+        arrayValidators: [[($: any) => true, '']],
         cancel: false,
         allowAddRow: false,
     })

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

@@ -7,7 +7,7 @@
         <q-card
             :style="{
                 'max-width': '100%',
-                width: Object.keys(sample).length * 150 + 100 + 'px',
+                width: Object.keys(sample).length * 200 + 200 + 'px',
             }"
         >
             <q-card-section>
@@ -81,6 +81,7 @@ const props = defineProps<{
     content: row[]
     sample: row
     validators: [(_: row) => boolean, string][]
+    arrayValidators: [(_: row[]) => boolean, string][]
     cancel: boolean
     allowAddRow: boolean
 }>()
@@ -101,21 +102,29 @@ setTimeout(() => {
 
 function allValid() {
     if (!props.cancel) return true
-    return dummy.value.every(
+    let rowsOK = dummy.value.every(
         $ =>
-            props.validators.every(v => v[0]($)) &&
+            props.validators.every(([checker, msg]) => checker($)) &&
             isPrimitive($) &&
             isMatchSchema($, schema)
     )
+    let arrayOK = props.arrayValidators.every(([checker, msg]) =>
+        checker(dummy.value)
+    )
+    return rowsOK && arrayOK
 }
 
 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}`
+        for (let [checker, msg] of props.validators) {
+            let ok = checker(dummy.value[i])
+            if (!ok) return `row ${i + 1}: ${msg}`
         }
     }
+    for (let [checker, msg] of props.arrayValidators) {
+        let ok = checker(dummy.value)
+        if (!ok) return msg
+    }
     return undefined
 }