adminforth 1.3.28 → 1.3.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.3.28",
+  "version": "1.3.29",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/spa/src/components/ResourceForm.vue

@@ -197,7 +197,13 @@ const columnError = (column) => {
       if ( column.maxLength && currentValues.value[column.name]?.length > column.maxLength ) {
         return `This field must be shorter than ${column.maxLength} characters`;
       }
+      
       if ( column.minLength && currentValues.value[column.name]?.length < column.minLength ) {
+        // if column.required[mode.value] is false, then we check if the field is empty
+        let needToCheckEmpty = column.required[mode.value] || currentValues.value[column.name]?.length > 0;
+        if (!needToCheckEmpty) {
+          return null;
+        }
         return `This field must be longer than ${column.minLength} characters`;
       }
     }
@@ -212,10 +218,12 @@ const columnError = (column) => {
         return `This field must be less than ${column.maxValue}`;
       }
     }
-
-    const error = applyRegexValidation(currentValues.value[column.name], column.validation);
-    if (error) {
-      return error;
+    console.log('column.validation: ', JSON.stringify(column), 'aa', JSON.stringify(currentValues.value[column.name]));
+    if (currentValues.value[column.name] && column.validation) {
+      const error = applyRegexValidation(currentValues.value[column.name], column.validation);
+      if (error) {
+        return error;
+      }
     }
 
     return null;

package/spa/src/views/CreateView.vue

@@ -18,7 +18,8 @@
         Cancel
       </button>
 
-      <button  @click="saveRecord"
+      <button  
+        @click="saveRecord"
         class="flex items-center py-1 px-3 text-sm font-medium rounded-default text-red-600 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-red-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-red-500 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700 disabled:opacity-50"
         :disabled="saving || (validating && !isValid)"
       > 

package/spa/src/views/EditView.vue

@@ -17,8 +17,9 @@
         Cancel
       </button>
 
-      <button  @click="saveRecord"
-        class="flex items-center py-1 px-3 text-sm font-medium  rounded-default text-red-600 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-red-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-red-500 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
+      <button
+        @click="saveRecord"
+        class="flex items-center py-1 px-3 text-sm font-medium  rounded-default text-red-600 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-red-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-red-500 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700 disabled:opacity-50"
         :disabled="saving || (validating && !isValid)"
       >
         <IconFloppyDiskSolid class="w-4 h-4" />

package/types/AdminForthConfig.ts

@@ -1524,17 +1524,17 @@ export type ValidationObject = {
     /**
      * Whether to check case sensitivity (i flag)
      */
-    caseSensitive: boolean,
+    caseSensitive?: boolean,
     
     /**
      * Whether to check Multiline strings (m flag)
      */
-    multiline: boolean, 
+    multiline?: boolean, 
     
     /**
      * Whether to check global strings (g flag)
      */
-    global: boolean
+    global?: boolean
   }
 
 export type AdminForthComponentDeclarationFull = {