@drax/crud-vue 2.0.7 → 2.1.0

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.0.7",
+  "version": "2.1.0",
   "type": "module",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
@@ -50,5 +50,5 @@
     "vue-tsc": "^3.2.4",
     "vuetify": "^3.11.8"
   },
-  "gitHead": "7f2c7c7fa1b3e77276c8ce1ec7e86c008a51a776"
+  "gitHead": "44c490f35d122a1d2f8533f5de0e17dbb4fbaacb"
 }

package/src/components/CrudForm.vue

@@ -8,6 +8,7 @@ import type {PropType} from "vue";
 import {useCrudStore} from "../stores/UseCrudStore";
 import {useCrud} from "../composables/UseCrud";
 import {useAuth} from '@drax/identity-vue'
+import type {ValidationRule} from "vuetify";
 
 const {hasPermission} = useAuth()
 const {t, te} = useI18n()
@@ -125,6 +126,11 @@ const menuInputErrors = computed(() => {
     }
 )
 
+const rules = computed(() => {
+  return (fieldName: string) => {
+    return entity.getRule(fieldName) as ValidationRule[] || undefined
+  }
+})
 
 </script>
 
@@ -165,6 +171,7 @@ const menuInputErrors = computed(() => {
                   :append-inner-icon="field?.appendInnerIcon"
                   :preview="field?.preview"
                   :previewHeight="field?.previewHeight"
+                  :rules="rules(field.name)"
               />
             </slot>
 
@@ -206,6 +213,7 @@ const menuInputErrors = computed(() => {
                           :prepend-icon="field?.prependIcon"
                           :append-icon="field?.appendIcon"
                           :append-inner-icon="field?.appendInnerIcon"
+                          :rules="rules(field.name)"
                       />
                     </slot>
 
@@ -259,6 +267,7 @@ const menuInputErrors = computed(() => {
                           :prepend-icon="field?.prependIcon"
                           :append-icon="field?.appendIcon"
                           :append-inner-icon="field?.appendInnerIcon"
+                          :rules="rules(field.name)"
                       />
                     </slot>
 

package/src/components/CrudFormField.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import {computed, ref} from "vue";
+import type {ValidationRule} from "vuetify"
 import type {PropType} from "vue";
 import CrudFormList from "./CrudFormList.vue";
 import CrudAutocomplete from "./CrudAutocomplete.vue";
@@ -15,11 +16,9 @@ const {t, te} = useI18n()
 
 const {hasPermission} = useAuth()
 
-
-
 const valueModel = defineModel<any>({type: [String, Number, Boolean, Object, Array], default: false})
 
-const {index, entity, field, disableRules, parentField, errorMessages} = defineProps({
+const {index, entity, field, disableRules, parentField, errorMessages, rules} = defineProps({
   entity: {type: Object as PropType<IEntityCrud>, required: true},
   field: {type: Object as PropType<IEntityCrudField | IEntityCrudFilter | undefined>, required: true},
   prependIcon: {type: String, default: ''},
@@ -36,6 +35,7 @@ const {index, entity, field, disableRules, parentField, errorMessages} = defineP
   previewHeight: {type: String, default: '100px'},
   parentField: {type: String, default: null, required: false},
   errorMessages: {type: Array as PropType<string[]>, default: null, required: false},
+  rules: {type: Array as PropType<ValidationRule[]>, required: false},
   index: {type: Number, default: null, required: false},
   density: {type: String as PropType<'comfortable' | 'compact' | 'default'>, default: 'default'},
   variant: {
@@ -60,10 +60,7 @@ const label = computed(() => {
   return te(i18n) ? t(i18n) : field.label
 })
 
-const rules = computed(() => {
-  if (disableRules) return undefined
-  return entity.getRule(field.name) as any
-})
+
 
 const storeErrorMessages = computed(() => {
       let sIndex = (index != null && index >= 0) ? `${index}.` : ''
@@ -78,6 +75,7 @@ const inputErrors = computed(() => {
 
 defineEmits(['updateValue'])
 
+
 </script>
 
 <template>