@ramathibodi/nuxt-commons 0.1.51 → 0.1.53

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": "^3.0.0"
   },
-  "version": "0.1.51",
+  "version": "0.1.53",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/runtime/components/document/TemplateBuilder.vue

@@ -323,7 +323,6 @@ const ruleOptions = (inputType: string) => (value: any) => {
                     </form-table>
                   </v-col>
                   <v-col cols="12">
-                    {{optionData}}
                     <form-table v-model="optionData.items"
                                 hide-default-footer
                                 :importable="false"

package/dist/runtime/components/form/ActionPad.vue

@@ -2,14 +2,16 @@
 import {computed, defineExpose, ref, watchEffect} from 'vue'
 import {cloneDeep, isEqual} from 'lodash-es'
 import type {FormDialogCallback} from '../../types/formDialog'
+import FormPadComponent from './Pad.vue'
 
-interface Props {
+interface Props extends /* @vue-ignore */ InstanceType<typeof FormPadComponent['$props']> {
   title?: string
   initialData?: object
   saveCaption?: string
   cancelCaption?: string
   readonly?: boolean
   showTitle?: boolean
+  skipValidation?:boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -17,6 +19,7 @@ const props = withDefaults(defineProps<Props>(), {
   cancelCaption: 'ยกเลิก',
   readonly: false,
   showTitle: false,
+  skipValidation:false
 })
 
 const isSaving = ref<boolean>(false)
@@ -27,7 +30,7 @@ const formDataOriginalValue = ref<object>()
 const emit = defineEmits(['create', 'update'])
 
 function save() {
-  if (formPadRef.value.isValid) {
+  if (props.skipValidation || formPadRef.value?.isValid) {
     isSaving.value = true
     emit((isCreating.value) ? 'create' : 'update', cloneDeep(formData.value), callback)
   }
@@ -39,7 +42,7 @@ function cancel() {
 
 function reset() {
   formDataOriginalValue.value = undefined
-  formPadRef.value.reset()
+  formPadRef.value?.reset()
   loadFormData()
 }
 
@@ -82,7 +85,7 @@ function setOriginalData(originalData?: object) {
   formDataOriginalValue.value = originalData
 }
 
-defineExpose({setOriginalData,operation})
+defineExpose({setOriginalData,operation,formPad: formPadRef})
 </script>
 
 <template>
@@ -102,6 +105,7 @@ defineExpose({setOriginalData,operation})
             v-model="formData"
             :readonly="readonly"
             isolated
+            v-bind="$attrs"
         >
           <template #default="slotData">
             <slot

package/dist/runtime/components/form/EditPad.vue

@@ -1,9 +1,10 @@
 <script lang="ts" setup>
-import {computed, ref, watchEffect} from 'vue'
+import {computed, defineExpose, ref, watchEffect} from 'vue'
 import {cloneDeep, isEqual} from 'lodash-es'
 import type {FormDialogCallback} from '../../types/formDialog'
+import FormPadComponent from './Pad.vue'
 
-interface Props {
+interface Props extends /* @vue-ignore */ InstanceType<typeof FormPadComponent['$props']> {
   title?: string
   initialData?: object
   formData?: object
@@ -11,6 +12,7 @@ interface Props {
   cancelCaption?: string
   readonly?: boolean
   showTitle?: boolean
+  skipValidation?:boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -18,6 +20,7 @@ const props = withDefaults(defineProps<Props>(), {
   cancelCaption: 'ยกเลิก',
   readonly: false,
   showTitle: false,
+  skipValidation:false
 })
 
 const isSaving = ref<boolean>(false)
@@ -28,7 +31,7 @@ const formDataOriginalValue = ref<object>()
 const emit = defineEmits(['create', 'update'])
 
 function save() {
-  if (formPadRef.value.isValid) {
+  if (props.skipValidation || formPadRef.value?.isValid) {
     isSaving.value = true
     emit((isCreating.value) ? 'create' : 'update', cloneDeep(formData.value), callback)
   }
@@ -40,7 +43,7 @@ function cancel() {
 
 function reset() {
   formDataOriginalValue.value = undefined
-  formPadRef.value.reset()
+  formPadRef.value?.reset()
   loadFormData()
 }
 
@@ -83,7 +86,7 @@ const operation = ref({ isDataChange, isCreating, isSaving, save, cancel })
 
 watchEffect(loadFormData)
 
-defineExpose({operation})
+defineExpose({operation,formPad:formPadRef})
 </script>
 
 <template>
@@ -103,6 +106,7 @@ defineExpose({operation})
           v-model="formData"
           :readonly="readonly"
           isolated
+          v-bind="$attrs"
       >
         <template #default="slotData">
           <slot

package/dist/runtime/components/form/Table.vue

@@ -43,8 +43,7 @@ const props = withDefaults(defineProps<Props>(), {
   stringFields: ()=>[],
 })
 
-const emit = defineEmits(['update:modelValue'])
-
+const emit = defineEmits(['update:modelValue','open:dialog','close:dialog'])
 const attrs = useAttrs()
 const plainAttrs = computed(() => {
   return omit(attrs, ['modelValue', 'onUpdate:modelValue'])
@@ -175,6 +174,7 @@ function openDialog(item?: object) {
     currentItem.value = item
     nextTick(() => {
       isDialogOpen.value = true
+      emit('open:dialog',item)
     })
   }
 }
@@ -325,6 +325,7 @@ defineExpose({
               :form-data="currentItem"
               @create="createItem"
               @update="updateItem"
+              @afterLeave="emit('close:dialog')"
               :saveAndStay="saveAndStay"
               v-if="!props.inputPadOnly"
           >

package/dist/runtime/components/model/Pad.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, useTemplateRef } from 'vue'
+import { computed, useTemplateRef, defineExpose } from 'vue'
 import { type GraphqlModelItemProps, useGraphqlModelItem } from '../../composables/graphqlModelItem'
 import EditPad from '../form/EditPad.vue'
 
@@ -11,8 +11,6 @@ interface Props extends /* @vue-ignore */ InstanceType<typeof EditPad['$props']>
 }
 
 const props = withDefaults(defineProps<Props & GraphqlModelItemProps>(), {
-  saveCaption: 'บันทึก',
-  cancelCaption: 'ยกเลิก',
   fields: () => ['*'],
 })
 
@@ -29,12 +27,12 @@ const operation : any = computed(()=>{
   return Object.assign({},editPad.value?.operation,{canSave,reload,item})
 })
 
-defineExpose({ operation })
+defineExpose({ operation, formPad: editPad.value?.formPad })
 </script>
 
 <template>
-  <FormEditPad :form-data="item" ref="editPadRef" @create="createItem" @update="updateItem">
-    <template #titleToolbar="slotData">
+  <FormEditPad v-bind="$attrs" :form-data="item" ref="editPadRef" @create="createItem" @update="updateItem">
+    <template #titleToolbar>
       <slot name="titleToolbar" :operation="operation">
         <VToolbarTitle>
           <slot name="title" :operation="operation">

package/dist/runtime/components/model/Table.vue

@@ -46,6 +46,7 @@ const props = withDefaults(defineProps<Props & GraphqlModelProps>(), {
   onlyOwnerEdit: false,
 })
 
+const emit = defineEmits(['open:dialog','close:dialog'])
 const attrs = useAttrs()
 const plainAttrs = computed(() => {
   const returnAttrs = clone(attrs)
@@ -75,6 +76,7 @@ function openDialog(item?: object) {
   currentItem.value = item
   nextTick(() => {
     isDialogOpen.value = true
+    emit('open:dialog' , item)
   })
 }
 
@@ -83,6 +85,7 @@ function openDialogReadonly(item?: object) {
   currentItem.value = item
   nextTick(() => {
     isDialogOpen.value = true
+    emit('open:dialog' , item)
   })
 }
 
@@ -289,6 +292,7 @@ defineExpose({ reload,operation })
       :form-data="currentItem"
       @create="createItem"
       @update="updateItem"
+      @afterLeave="emit('close:dialog')"
       :saveAndStay="saveAndStay"
       :readonly="isDialogReadonly"
     >

package/dist/runtime/composables/userPermission.d.ts

@@ -1 +1 @@
-export declare const useUserPermission: () => unknown;
+export declare const useUserPermission: () => import("../types/permission").PermissionPlugin;

package/dist/runtime/plugins/permission.js

@@ -11,18 +11,18 @@ export default defineNuxtPlugin((nuxtApp) => {
     const arr = normalize(input);
     return arr.length === 0 || arr.every((v) => v.trim() === "");
   }
-  function check(permissionIds) {
+  const check = (permissionIds) => {
     if (isBlank(permissionIds)) return true;
     const auth = useAuthentication();
     const perms = normalize(permissionIds);
     return perms.some((id) => auth?.hasPermission(id));
-  }
-  function checkAll(permissionIds) {
+  };
+  const checkAll = (permissionIds) => {
     if (isBlank(permissionIds)) return true;
     const auth = useAuthentication();
     const perms = normalize(permissionIds);
     return perms.every((id) => auth?.hasPermission(id));
-  }
+  };
   nuxtApp.vueApp.directive("permission", (el, binding, vnode) => {
     if (!check(binding.value)) {
       vnode?.um?.forEach?.((um) => um());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ramathibodi/nuxt-commons",
-  "version": "0.1.51",
+  "version": "0.1.53",
   "description": "Ramathibodi Nuxt modules for common components",
   "repository": {
     "type": "git",