@ramathibodi/nuxt-commons 0.1.46 → 0.1.48

package/dist/module.json

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

package/dist/runtime/components/ExportCSV.vue

@@ -9,12 +9,14 @@ interface ExportButtonProps extends /* @vue-ignore */ InstanceType<typeof VBtn['
   sheetName?: string
   modelValue?: object[]
   stringFields?: Array<string>
+  tooltip?: string | Record<string,any> | undefined
 }
 
 const props = withDefaults(defineProps<ExportButtonProps>(), {
   fileName: 'download',
   sheetName: 'Sheet1',
   stringFields: ()=>[],
+  tooltip: ()=>({text: 'Export', location: 'bottom'}),
 })
 
 const alert = useAlert()
@@ -84,6 +86,7 @@ function flattenObject(obj: any, parentKey = '', separator = '.') {
       :disabled="loading"
       text="Export CSV"
       @click="exportFile"
+      v-tooltip="props.tooltip"
   >
     <template
         v-for="(_, name, index) in ($slots as {})"

package/dist/runtime/components/FileBtn.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import {ref, watch} from 'vue'
+import {ref} from 'vue'
 import {VBtn} from 'vuetify/components/VBtn'
 
 interface Props extends /* @vue-ignore */ InstanceType<typeof VBtn['$props']> {
@@ -7,11 +7,13 @@ interface Props extends /* @vue-ignore */ InstanceType<typeof VBtn['$props']> {
   multiple?: boolean
   iconOnly?: boolean
   modelValue?: File | File[] | undefined
+  tooltip?: string | Record<string,any> | undefined
 }
 
 const props = withDefaults(defineProps<Props>(), {
   multiple: false,
   accept: '*',
+  tooltip: 'Upload File',
 })
 
 const emit = defineEmits<{
@@ -41,6 +43,7 @@ defineExpose({ reset })
   <v-btn
     v-bind="$attrs"
     @click="openFileInput"
+    v-tooltip="tooltip"
   >
     <template
       v-for="(_, name, index) in ($slots as {})"

package/dist/runtime/components/ImportCSV.vue

@@ -6,10 +6,12 @@ import { VBtn } from 'vuetify/components/VBtn'
 
 interface ImportButtonProps extends /* @vue-ignore */ InstanceType<typeof VBtn['$props']> {
   stringFields?: Array<string>
+  tooltip?: string | Record<string,any> | undefined
 }
 
 const props = withDefaults(defineProps<ImportButtonProps>(), {
   stringFields: ()=>[],
+  tooltip: ()=>({text: 'Import', location: 'bottom'}),
 })
 
 const alert = useAlert()
@@ -120,6 +122,7 @@ const parseIfJson = (value: any) => {
       accept=".csv, .xlsx"
       :multiple="false"
       @update:model-value="uploadedFile"
+      :tooltip="props.tooltip"
   >
     <template
         v-for="(_, name, index) in ($slots as {})"

package/dist/runtime/composables/document/template.js

@@ -112,13 +112,27 @@ export function escapeObjectForInlineBinding(obj) {
 export function buildValidationRules(validationString) {
   validationString = validationString.replace(/^\[|]$/g, "").trim();
   if (!validationRulesRegex.test(validationString)) return "";
-  const rules = validationString.split(",").map((rule) => {
+  const rules = [];
+  let current = "";
+  let depth = 0;
+  for (let char of validationString) {
+    if (char === "," && depth === 0) {
+      if (current.trim()) rules.push(current.trim());
+      current = "";
+    } else {
+      if (char === "(") depth++;
+      if (char === ")") depth--;
+      current += char;
+    }
+  }
+  if (current.trim()) rules.push(current.trim());
+  const formatted = rules.map((rule) => {
     rule = rule.trim();
     if (!rule.startsWith("rules.")) rule = `rules.${rule}`;
     if (!/\(.+\)$/.test(rule)) rule += "()";
     return rule.replace(/"/g, "'");
   });
-  return `:rules="[${rules.join(",")}]"`;
+  return `:rules="[${formatted.join(",")}]"`;
 }
 export function processDefaultTemplate(item, insideTemplate, optionString, validationRules) {
   if (!validationRules) validationRules = item.validationRules ? buildValidationRules(item.validationRules) || "" : "";

package/dist/runtime/composables/document/templateFormTable.js

@@ -5,5 +5,7 @@ import {
 } from "./template.js";
 export function processTemplateFormTable(item, parentTemplates) {
   let tableOptions = Object.assign({ title: item.inputLabel || "", formTemplate: "" }, item.inputOptions);
-  return processDefaultTemplate(item, `<template #form="{data,rules}">${useDocumentTemplate(tableOptions.formTemplate)}</template>`, `title="${tableOptions.title}" :headers='${escapeObjectForInlineBinding(tableOptions.headers || {})}'`);
+  let tableHeader = tableOptions.headers || [];
+  if (!tableHeader.some((h) => h.key === "action")) tableHeader.push({ title: "Action", key: "action", width: "100px" });
+  return processDefaultTemplate(item, `<template #form="{data,rules}">${useDocumentTemplate(tableOptions.formTemplate)}</template>`, `title="${tableOptions.title}" :headers='${escapeObjectForInlineBinding(tableHeader)}'`);
 }

package/dist/runtime/composables/graphqlOperation.js

@@ -1,3 +1,4 @@
+import { cloneDeep } from "lodash-es";
 import { classAttributes, isClassConstructor } from "../utils/object.js";
 import { useGraphQl } from "./graphql.js";
 import { graphqlInputType, graphqlOperation, graphqlType, scalarType } from "#imports";
@@ -36,8 +37,9 @@ export function buildFields(operationFields, fields, depth = 0) {
 }
 export function buildVariables(outputVariables, inputVariables, reject, isRoot = true) {
   if (!outputVariables) return void 0;
+  let localOutputVariables = cloneDeep(outputVariables);
   if (inputVariables) {
-    outputVariables.map((variable) => {
+    localOutputVariables.map((variable) => {
       if (variable.type && !scalarType.includes(variable.type)) {
         if (variable.list) {
           if (inputVariables[variable.name] && Array.isArray(inputVariables[variable.name])) {
@@ -58,7 +60,7 @@ export function buildVariables(outputVariables, inputVariables, reject, isRoot =
       return variable;
     });
   }
-  outputVariables.forEach((variable) => {
+  localOutputVariables.forEach((variable) => {
     if (variable.required && variable.value === void 0) {
       console.warn("Required variable " + variable.name + " is not found, operation abort");
       if (reject) {
@@ -67,10 +69,10 @@ export function buildVariables(outputVariables, inputVariables, reject, isRoot =
       }
     }
   });
-  const usedVariables = outputVariables.map((variable) => variable.name);
+  const usedVariables = localOutputVariables.map((variable) => variable.name);
   const droppedVariable = Object.keys(inputVariables || {}).filter((key) => !usedVariables.includes(key));
   if (droppedVariable.length > 0) console.debug("There is data not appeared in schema and dropped before operation.", droppedVariable);
-  return outputVariables.reduce((acc, item) => {
+  return localOutputVariables.reduce((acc, item) => {
     acc[item.name] = isRoot ? item : item.value;
     return acc;
   }, {});

package/dist/runtime/composables/menu.js

@@ -20,7 +20,7 @@ export function routeToMenuItem(route) {
     };
     if (route.children) {
       const menuItems = new Array();
-      for (const children of route.children.sort((a, b) => (a.path?.toString() ?? "").localeCompare(b.path?.toString() ?? ""))) {
+      for (const children of route.children.sort((a, b) => (a.name?.toString() ?? "").localeCompare(b.name?.toString() ?? ""))) {
         const childMenuItem = routeToMenuItem(children);
         if (childMenuItem) menuItems.push(childMenuItem);
         menuItem.menuItems = menuItems;
@@ -31,7 +31,7 @@ export function routeToMenuItem(route) {
 }
 export function createMenu() {
   const menuAll = ref([]);
-  const routes = useRouter().getRoutes().sort((a, b) => (a.path?.toString() ?? "").localeCompare(b.path?.toString() ?? ""));
+  const routes = useRouter().getRoutes().sort((a, b) => (a.name?.toString() ?? "").localeCompare(b.name?.toString() ?? ""));
   for (const route of routes) {
     const paths = route.path.split("/");
     if (paths.length == 2) {

package/dist/runtime/composables/utils/validation.js

@@ -7,7 +7,7 @@ export function useRules() {
   const requireIf = (conditionIf, customError = "This field is required") => (value) => condition(!!value || value === false || value === 0 || !conditionIf, customError);
   const requireTrue = (customError = "This field must be true") => (value) => condition(!!value, customError);
   const requireTrueIf = (conditionIf, customError = "This field must be true") => (value) => condition(!!value || !conditionIf, customError);
-  const numeric = (customError = "This field must be a number") => (value) => condition(!value || !Number.isNaN(value), customError);
+  const numeric = (customError = "This field must be a number") => (value) => condition(!value || !isNaN(Number(value)), customError);
   const range = (minValue, maxValue, customError = `Value is out of range (${minValue}-${maxValue})`) => (value) => condition(!value || value >= minValue && value <= maxValue, customError);
   const integer = (customError = "This field must be an integer") => (value) => condition(!value || isInteger(value) || /^\+?-?\d+$/.test(value), customError);
   const unique = (data, fieldName, customError = "This field must be unique") => (value) => condition(!value || !data || !find(data, [fieldName, value]), customError);

package/package.json

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