@hostlink/nuxt-light 1.67.2 → 1.67.3

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "1.67.2",
+  "version": "1.67.3",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/components/L/ActionBtn.d.vue.ts

@@ -1,13 +1,15 @@
-declare var __VLS_8: {};
-type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_8) => any;
-};
-declare const __VLS_base: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;
 export default _default;
-type __VLS_WithSlots<T, S> = T & {
-    new (): {
-        $slots: S;
+declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+    tooltip: {
+        type: StringConstructor;
+        default: string;
     };
-};
+}>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    tooltip: {
+        type: StringConstructor;
+        default: string;
+    };
+}>> & Readonly<{}>, {
+    tooltip: string;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/runtime/components/L/ActionBtn.vue

@@ -1,5 +1,11 @@
 <template>
     <q-btn flat round size="sm">
-        <slot></slot>
+        <q-tooltip v-if="tooltip">{{ tooltip }}</q-tooltip>
     </q-btn>
-</template>
+</template>
+
+<script setup>
+defineProps({
+  tooltip: { type: String, default: "" }
+});
+</script>

package/dist/runtime/components/L/ActionBtn.vue.d.ts

@@ -1,13 +1,15 @@
-declare var __VLS_8: {};
-type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_8) => any;
-};
-declare const __VLS_base: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;
 export default _default;
-type __VLS_WithSlots<T, S> = T & {
-    new (): {
-        $slots: S;
+declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+    tooltip: {
+        type: StringConstructor;
+        default: string;
     };
-};
+}>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    tooltip: {
+        type: StringConstructor;
+        default: string;
+    };
+}>> & Readonly<{}>, {
+    tooltip: string;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/runtime/components/L/DeleteBtn.d.vue.ts

@@ -1,20 +1,30 @@
 declare const _default: typeof __VLS_export;
 export default _default;
-declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
-type __VLS_WithSlots<T, S> = T & (new () => {
-    $slots: S;
-});
-declare const __VLS_base: import("vue").DefineComponent<{
-    icon?: any;
-    to?: any;
-}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+    to: (ObjectConstructor | StringConstructor)[];
+    icon: {
+        type: StringConstructor;
+        default: string;
+    };
+    tooltip: {
+        type: StringConstructor;
+        default: string;
+    };
+}>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     submit: (...args: any[]) => void;
-}, string, import("vue").PublicProps, Readonly<{
-    icon?: any;
-    to?: any;
-}> & Readonly<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    to: (ObjectConstructor | StringConstructor)[];
+    icon: {
+        type: StringConstructor;
+        default: string;
+    };
+    tooltip: {
+        type: StringConstructor;
+        default: string;
+    };
+}>> & Readonly<{
     onSubmit?: ((...args: any[]) => any) | undefined;
-}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-type __VLS_Slots = {
-    default?: ((props: {}) => any) | undefined;
-};
+}>, {
+    icon: string;
+    tooltip: string;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/runtime/components/L/DeleteBtn.vue

@@ -2,7 +2,11 @@
 import { useQuasar } from "quasar";
 import { useI18n } from "vue-i18n";
 const { t } = useI18n();
-const props = defineProps(["to", "icon"]);
+const props = defineProps({
+  to: [String, Object],
+  icon: { type: String, default: "sym_o_delete" },
+  tooltip: { type: String, default: "" }
+});
 const emit = defineEmits(["submit"]);
 const qua = useQuasar();
 const onDelete = () => {
@@ -19,7 +23,7 @@ const onDelete = () => {
 </script>
 
 <template>
-    <q-btn flat round :icon="icon || 'sym_o_delete'" @click="onDelete">
-        <slot></slot>
+    <q-btn flat round :icon="icon" @click="onDelete">
+        <q-tooltip v-if="tooltip">{{ tooltip }}</q-tooltip>
     </q-btn>
 </template>

package/dist/runtime/components/L/DeleteBtn.vue.d.ts

@@ -1,20 +1,30 @@
 declare const _default: typeof __VLS_export;
 export default _default;
-declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
-type __VLS_WithSlots<T, S> = T & (new () => {
-    $slots: S;
-});
-declare const __VLS_base: import("vue").DefineComponent<{
-    icon?: any;
-    to?: any;
-}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+    to: (ObjectConstructor | StringConstructor)[];
+    icon: {
+        type: StringConstructor;
+        default: string;
+    };
+    tooltip: {
+        type: StringConstructor;
+        default: string;
+    };
+}>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     submit: (...args: any[]) => void;
-}, string, import("vue").PublicProps, Readonly<{
-    icon?: any;
-    to?: any;
-}> & Readonly<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    to: (ObjectConstructor | StringConstructor)[];
+    icon: {
+        type: StringConstructor;
+        default: string;
+    };
+    tooltip: {
+        type: StringConstructor;
+        default: string;
+    };
+}>> & Readonly<{
     onSubmit?: ((...args: any[]) => any) | undefined;
-}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-type __VLS_Slots = {
-    default?: ((props: {}) => any) | undefined;
-};
+}>, {
+    icon: string;
+    tooltip: string;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/runtime/components/L/Table.d.vue.ts

@@ -79,17 +79,17 @@ export interface LTableRequest {
     }) => void;
 }
 declare function requestServerInteraction(): void;
-declare var __VLS_135: any, __VLS_138: string, __VLS_139: any, __VLS_170: any, __VLS_173: any, __VLS_343: string, __VLS_344: any;
+declare var __VLS_114: any, __VLS_117: string, __VLS_118: any, __VLS_149: any, __VLS_152: any, __VLS_322: string, __VLS_323: any;
 type __VLS_Slots = {} & {
-    [K in NonNullable<typeof __VLS_138>]?: (props: typeof __VLS_139) => any;
+    [K in NonNullable<typeof __VLS_117>]?: (props: typeof __VLS_118) => any;
 } & {
-    [K in NonNullable<typeof __VLS_343>]?: (props: typeof __VLS_344) => any;
+    [K in NonNullable<typeof __VLS_322>]?: (props: typeof __VLS_323) => any;
 } & {
-    actions?: (props: typeof __VLS_135) => any;
+    actions?: (props: typeof __VLS_114) => any;
 } & {
-    'row-expand'?: (props: typeof __VLS_170) => any;
+    'row-expand'?: (props: typeof __VLS_149) => any;
 } & {
-    'top-right'?: (props: typeof __VLS_173) => any;
+    'top-right'?: (props: typeof __VLS_152) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<LTableProps, {
     requestServerInteraction: typeof requestServerInteraction;

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

@@ -597,21 +597,18 @@ const hasFilters = computed(() => {
 
                         <l-action-btn v-if="actionView && props.row.canView"
                             :to="`/${modelName}/${props.row[primaryKey]}/view`"
-                            :icon="light.styles.table.actionIcons.view">
-                            <q-tooltip>{{ $t("View") }}</q-tooltip>
-                        </l-action-btn>
+                            :icon="light.styles.table.actionIcons.view"
+                            :tooltip="$t('View')" />
 
                         <l-action-btn v-if="activeEdit && props.row.canUpdate"
                             :to="`/${modelName}/${props.row[primaryKey]}/edit`"
-                            :icon="light.styles.table.actionIcons.edit">
-                            <q-tooltip>{{ $t("Edit") }}</q-tooltip>
-                        </l-action-btn>
+                            :icon="light.styles.table.actionIcons.edit"
+                            :tooltip="$t('Edit')" />
 
                         <l-delete-btn v-if="actionDelete && props.row.canDelete"
                             :icon="light.styles.table.actionIcons.delete"
-                            @submit="onDelete(props.row[primaryKey])" size="sm">
-                            <q-tooltip>{{ $t("Delete") }}</q-tooltip>
-                        </l-delete-btn>
+                            :tooltip="$t('Delete')"
+                            @submit="onDelete(props.row[primaryKey])" size="sm" />
 
                         <slot name="actions" v-bind="props"></slot>
                     </div>

package/dist/runtime/components/L/Table.vue.d.ts

@@ -79,17 +79,17 @@ export interface LTableRequest {
     }) => void;
 }
 declare function requestServerInteraction(): void;
-declare var __VLS_135: any, __VLS_138: string, __VLS_139: any, __VLS_170: any, __VLS_173: any, __VLS_343: string, __VLS_344: any;
+declare var __VLS_114: any, __VLS_117: string, __VLS_118: any, __VLS_149: any, __VLS_152: any, __VLS_322: string, __VLS_323: any;
 type __VLS_Slots = {} & {
-    [K in NonNullable<typeof __VLS_138>]?: (props: typeof __VLS_139) => any;
+    [K in NonNullable<typeof __VLS_117>]?: (props: typeof __VLS_118) => any;
 } & {
-    [K in NonNullable<typeof __VLS_343>]?: (props: typeof __VLS_344) => any;
+    [K in NonNullable<typeof __VLS_322>]?: (props: typeof __VLS_323) => any;
 } & {
-    actions?: (props: typeof __VLS_135) => any;
+    actions?: (props: typeof __VLS_114) => any;
 } & {
-    'row-expand'?: (props: typeof __VLS_170) => any;
+    'row-expand'?: (props: typeof __VLS_149) => any;
 } & {
-    'top-right'?: (props: typeof __VLS_173) => any;
+    'top-right'?: (props: typeof __VLS_152) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<LTableProps, {
     requestServerInteraction: typeof requestServerInteraction;

package/dist/runtime/formkit/Checkbox.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { getErrorMessage } from "formkit-quasar";
+import { useErrorMessage } from "./useErrorMessage";
 import { computed } from "vue";
 const props = defineProps({
   context: Object
@@ -8,7 +8,7 @@ const value = computed({
   get: () => props.context.value,
   set: (val) => props.context.node.input(val)
 });
-const { error, errorMessage } = getErrorMessage(props.context.node);
+const { error, errorMessage } = useErrorMessage(props.context.node);
 </script>
 
 <template>

package/dist/runtime/formkit/DatePicker.vue

@@ -1,10 +1,10 @@
 <script setup>
 import { computed } from "vue";
-import { getErrorMessage } from "formkit-quasar";
+import { useErrorMessage } from "./useErrorMessage";
 const props = defineProps({
   context: Object
 });
-const { error, errorMessage } = getErrorMessage(props.context.node);
+const { error, errorMessage } = useErrorMessage(props.context.node);
 const value = computed({
   get: () => props.context.value,
   set: (val) => props.context.node.input(val)

package/dist/runtime/formkit/Editor.vue

@@ -1,10 +1,10 @@
 <script setup>
 import { computed } from "vue";
-import { getErrorMessage } from "formkit-quasar";
+import { useErrorMessage } from "./useErrorMessage";
 const props = defineProps({
   context: Object
 });
-const { error, errorMessage } = getErrorMessage(props.context.node);
+const { error, errorMessage } = useErrorMessage(props.context.node);
 const value = computed({
   get: () => props.context.value,
   set: (val) => props.context.node.input(val)

package/dist/runtime/formkit/File.vue

@@ -1,11 +1,11 @@
 <script setup>
 import { computed } from "vue";
-import { getErrorMessage } from "formkit-quasar";
+import { useErrorMessage } from "./useErrorMessage";
 import { useLight } from "#imports";
 const props = defineProps({
   context: Object
 });
-const { error, errorMessage } = getErrorMessage(props.context.node);
+const { error, errorMessage } = useErrorMessage(props.context.node);
 const value = computed({
   get: () => props.context.value,
   set: (val) => props.context.node.input(val)

package/dist/runtime/formkit/FilePicker.vue

@@ -1,10 +1,10 @@
 <script setup>
 import { computed } from "vue";
-import { getErrorMessage } from "formkit-quasar";
+import { useErrorMessage } from "./useErrorMessage";
 const props = defineProps({
   context: Object
 });
-const { error, errorMessage } = getErrorMessage(props.context.node);
+const { error, errorMessage } = useErrorMessage(props.context.node);
 const value = computed({
   get: () => props.context.value,
   set: (val) => props.context.node.input(val)

package/dist/runtime/formkit/FileUpload.vue

@@ -1,10 +1,10 @@
 <script setup>
 import { computed } from "vue";
-import { getErrorMessage } from "formkit-quasar";
+import { useErrorMessage } from "./useErrorMessage";
 const props = defineProps({
   context: Object
 });
-const { error, errorMessage } = getErrorMessage(props.context.node);
+const { error, errorMessage } = useErrorMessage(props.context.node);
 const value = computed({
   get: () => props.context.value,
   set: (val) => props.context.node.input(val)

package/dist/runtime/formkit/GroupSelect.vue

@@ -1,10 +1,10 @@
 <script setup>
-import { getErrorMessage } from "formkit-quasar";
+import { useErrorMessage } from "./useErrorMessage";
 import { computed } from "vue";
 const props = defineProps({
   context: Object
 });
-const { error, errorMessage } = getErrorMessage(props.context.node);
+const { error, errorMessage } = useErrorMessage(props.context.node);
 const value = computed({
   get: () => props.context.value,
   set: (val) => props.context.node.input(val)

package/dist/runtime/formkit/Input.vue

@@ -1,6 +1,6 @@
 <script setup>
-import { computed } from "vue";
-import { getErrorMessage } from "formkit-quasar";
+import { computed, ref } from "vue";
+import { useErrorMessage } from "./useErrorMessage";
 import { useI18n } from "vue-i18n";
 const props = defineProps({
   context: {
@@ -9,7 +9,9 @@ const props = defineProps({
   }
 });
 const { t } = useI18n();
-const { error, errorMessage } = getErrorMessage(props.context.node);
+const error = ref(false);
+const errorMessage = ref("");
+useErrorMessage(props.context.node, error, errorMessage);
 const value = computed({
   get: () => props.context?.value,
   set: (val) => {

package/dist/runtime/formkit/InputSelect.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { computed } from "vue";
-import { getErrorMessage } from "formkit-quasar";
+import { useErrorMessage } from "./useErrorMessage";
 import { useI18n } from "vue-i18n";
 const props = defineProps({
   context: {
@@ -9,7 +9,7 @@ const props = defineProps({
   }
 });
 const { t } = useI18n();
-const { error, errorMessage } = getErrorMessage(props.context.node);
+const { error, errorMessage } = useErrorMessage(props.context.node);
 const value = computed({
   get: () => props.context?.value,
   set: (val) => props.context.node.input(val)

package/dist/runtime/formkit/InputXlsx.vue

@@ -1,10 +1,10 @@
 <script setup>
 import { computed } from "vue";
-import { getErrorMessage } from "formkit-quasar";
+import { useErrorMessage } from "./useErrorMessage";
 const props = defineProps({
   context: Object
 });
-const { error, errorMessage } = getErrorMessage(props.context.node);
+const { error, errorMessage } = useErrorMessage(props.context.node);
 const value = computed({
   get: () => props.context.value,
   set: (val) => props.context.node.input(val)

package/dist/runtime/formkit/OptionGroup.vue

@@ -1,12 +1,12 @@
 <script setup>
 import { useLight } from "#imports";
 import { computed } from "vue";
-import { getErrorMessage } from "formkit-quasar";
+import { useErrorMessage } from "./useErrorMessage";
 const light = useLight();
 const props = defineProps({
   context: Object
 });
-const { error, errorMessage } = getErrorMessage(props.context.node);
+const { error, errorMessage } = useErrorMessage(props.context.node);
 const value = computed({
   get: () => props.context.value,
   set: (val) => props.context.node.input(val)

package/dist/runtime/formkit/Radio.vue

@@ -1,10 +1,10 @@
 <script setup>
 import { computed } from "vue";
-import { getErrorMessage } from "formkit-quasar";
+import { useErrorMessage } from "./useErrorMessage";
 const props = defineProps({
   context: Object
 });
-const { error, errorMessage } = getErrorMessage(props.context.node);
+const { error, errorMessage } = useErrorMessage(props.context.node);
 const value = computed({
   get: () => props.context.value,
   set: (val) => props.context.node.input(val)

package/dist/runtime/formkit/Select.vue

@@ -1,10 +1,10 @@
 <script setup>
-import { getErrorMessage } from "formkit-quasar";
+import { useErrorMessage } from "./useErrorMessage";
 import { computed } from "vue";
 const props = defineProps({
   context: Object
 });
-const { error, errorMessage } = getErrorMessage(props.context.node);
+const { error, errorMessage } = useErrorMessage(props.context.node);
 const value = computed({
   get: () => props.context.value,
   set: (val) => props.context.node.input(val)

package/dist/runtime/formkit/Textarea.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { computed } from "vue";
-import { getErrorMessage } from "formkit-quasar";
+import { useErrorMessage } from "./useErrorMessage";
 import { useI18n } from "vue-i18n";
 const props = defineProps({
   context: {
@@ -9,7 +9,7 @@ const props = defineProps({
   }
 });
 const { t } = useI18n();
-const { error, errorMessage } = getErrorMessage(props.context.node);
+const { error, errorMessage } = useErrorMessage(props.context.node);
 const value = computed({
   get: () => props.context?.value,
   set: (val) => {

package/dist/runtime/formkit/TimePicker.vue

@@ -1,10 +1,10 @@
 <script setup>
 import { computed } from "vue";
-import { getErrorMessage } from "formkit-quasar";
+import { useErrorMessage } from "./useErrorMessage";
 const props = defineProps({
   context: Object
 });
-const { error, errorMessage } = getErrorMessage(props.context.node);
+const { error, errorMessage } = useErrorMessage(props.context.node);
 const value = computed({
   get: () => props.context.value,
   set: (val) => props.context.node.input(val)

package/dist/runtime/formkit/useErrorMessage.d.ts

@@ -0,0 +1,3 @@
+import type { Ref } from 'vue';
+import type { FormKitNode } from '@formkit/core';
+export declare function useErrorMessage(node: FormKitNode, error: Ref<boolean>, errorMessage: Ref<string>): () => void;

package/dist/runtime/formkit/useErrorMessage.js

@@ -0,0 +1,34 @@
+import { getValidationMessages } from "@formkit/validation";
+export function useErrorMessage(node, error, errorMessage) {
+  const showErrorMessage = (msg) => {
+    if (msg.name === "message-updated") {
+      if (msg.payload.type === "validation") {
+        errorMessage.value = msg.payload.value;
+      }
+    }
+    if (msg.name === "message-removed") {
+      if (msg.payload.type === "validation") {
+        errorMessage.value = "";
+        error.value = false;
+      }
+      if (msg.payload.type === "state") {
+        error.value = false;
+      }
+    }
+    if (msg.name === "message-added") {
+      errorMessage.value = "";
+      error.value = false;
+      const messages = getValidationMessages(node);
+      for (const message of messages) {
+        if (message[0]) {
+          errorMessage.value = message[1][0].value;
+          error.value = true;
+          break;
+        }
+      }
+    }
+  };
+  const events = ["message-added", "message-removed", "message-updated"];
+  const receipts = events.map((event) => node.on(event, showErrorMessage));
+  return () => receipts.forEach((receipt) => node.off(receipt));
+}

package/dist/runtime/plugin.js

@@ -8,7 +8,6 @@ import "./assets/main.css";
 import message_en from "./locales/en.json";
 import message_zh from "./locales/zh-hk.json";
 localStorage.getItem("locale") || localStorage.setItem("locale", "en");
-import { createQuasarPlugin } from "formkit-quasar";
 import { createLightPlugin } from "./formkit/index.js";
 import { plugin, defaultConfig } from "@formkit/vue";
 import getApiBase from "./composables/getApiBase.js";
@@ -61,7 +60,7 @@ export default defineNuxtPlugin((nuxtApp) => {
     locale = "zhTW";
   }
   nuxtApp.vueApp.use(plugin, defaultConfig({
-    plugins: [createQuasarPlugin(), createLightPlugin()],
+    plugins: [createLightPlugin()],
     locales: {
       zhTW
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "1.67.2",
+  "version": "1.67.3",
   "description": "HostLink Nuxt Light Framework",
   "repository": {
     "type": "git",
@@ -32,7 +32,12 @@
   },
   "dependencies": {
     "@azure/msal-browser": "^4.26.2",
+    "@formkit/core": "^1.7.2",
     "@formkit/drag-and-drop": "^0.5.3",
+    "@formkit/i18n": "^1.7.2",
+    "@formkit/inputs": "^1.7.2",
+    "@formkit/validation": "^1.7.2",
+    "@formkit/vue": "^1.7.2",
     "@hostlink/light": "^3.2.7",
     "@nuxt/module-builder": "^1.0.1",
     "@quasar/extras": "^1.17.0",
@@ -42,7 +47,6 @@
     "defu": "^6.1.4",
     "diff2html": "^3.4.47",
     "dompurify": "^3.3.1",
-    "formkit-quasar": "^0.0.15",
     "json-to-graphql-query": "^2.3.0",
     "nuxt-quasar-ui": "^3.0.0",
     "quasar": "^2.18.5",