@hostlink/nuxt-light 1.48.4 → 1.48.5

package/dist/module.json

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

package/dist/runtime/components/l-btn.d.vue.ts

@@ -1,9 +1,9 @@
 import type { QBtnProps } from "quasar";
-export interface LBtnProps extends QBtnProps {
+export type LBtnProps = QBtnProps & {
     permission?: string;
     confirmMessage?: string;
     confirmTitle?: string;
-}
+};
 declare var __VLS_10: {};
 type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_10) => any;

package/dist/runtime/components/l-btn.vue

@@ -1,9 +1,7 @@
 <script setup>
 import { useQuasar, QBtn } from "quasar";
+import { computed } from "vue";
 const props = defineProps({
-  permission: { type: String, required: false, default: "" },
-  confirmMessage: { type: String, required: false, default: "" },
-  confirmTitle: { type: String, required: false, default: "Confirm" },
   size: { type: null, required: false },
   type: { type: null, required: false },
   to: { type: null, required: false },
@@ -38,11 +36,14 @@ const props = defineProps({
   round: { type: Boolean, required: false, skipCheck: true },
   percentage: { type: null, required: false },
   darkPercentage: { type: Boolean, required: false, skipCheck: true },
-  onClick: { type: Function, required: false }
+  onClick: { type: Function, required: false },
+  permission: { type: String, required: false, default: "" },
+  confirmMessage: { type: String, required: false, default: "" },
+  confirmTitle: { type: String, required: false, default: "Confirm" }
 });
 const $q = useQuasar();
-const { onClick, ...filteredProps } = props;
-const handleClick = function() {
+const { onClick } = props;
+const handleClick = function(evt) {
   if (props.confirmMessage) {
     $q.dialog({
       title: props.confirmTitle,
@@ -50,17 +51,21 @@ const handleClick = function() {
       ok: "Yes",
       cancel: "No"
     }).onOk(() => {
-      onClick?.();
+      onClick?.(evt);
     });
   } else {
-    onClick?.();
+    onClick?.(evt);
   }
 };
+const filteredProps = computed(() => {
+  const { onClick: onClick2, ...rest } = props;
+  return rest;
+});
 </script>
 
 <template>
     <q-btn v-if="$light.isGranted($props.permission)" @click="handleClick"
-        v-bind="$light.getButtonProps(filteredProps)">
+        v-bind="{ ...filteredProps, ...$light.getButtonProps(filteredProps) }">
         <slot></slot>
     </q-btn>
 </template>

package/dist/runtime/components/l-btn.vue.d.ts

@@ -1,9 +1,9 @@
 import type { QBtnProps } from "quasar";
-export interface LBtnProps extends QBtnProps {
+export type LBtnProps = QBtnProps & {
     permission?: string;
     confirmMessage?: string;
     confirmTitle?: string;
-}
+};
 declare var __VLS_10: {};
 type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_10) => any;

package/dist/runtime/components/l-table.d.vue.ts

@@ -1,11 +1,14 @@
+import type { Component } from "vue";
 import { Dialog } from 'quasar';
 import type { QTableColumn, QTableProps } from 'quasar';
-export interface LTableColumn extends QTableColumn {
+export type LTableColumn = QTableColumn & {
+    searchType?: "date" | "text" | "number" | "select";
     searchable?: boolean;
-    searchType?: string;
-    searchOptions?: Array<any> | Function;
+    searchOptions?: Record<string, any>[] | Function;
     searchMultiple?: boolean;
     searchIndex?: string;
+    component?: Component;
+    componentProps?: any;
     gql?: Record<string, any>;
     /**
      * @deprecated use gql instead
@@ -13,10 +16,10 @@ export interface LTableColumn extends QTableColumn {
     gqlField?: string | Array<string> | Object;
     backgroundColor?: string | Function;
     searchMethod?: string;
-}
+};
 export type LTableProps = QTableProps & {
     columns?: Array<LTableColumn>;
-    actions?: Array<string>;
+    actions?: Array<'view' | 'edit' | 'delete' | 'update'>;
     sortBy?: any;
     rowKey?: string;
     modelName?: any;
@@ -27,6 +30,7 @@ export type LTableProps = QTableProps & {
     addComponentProps?: any;
     rows?: Array<any>;
     name?: string;
+    searchStyle?: string;
 };
 export interface LTableRequest {
     sort: string;
@@ -91,7 +95,7 @@ declare const __VLS_component: import("vue").DefineComponent<LTableProps, {
     bordered: boolean;
     fullscreen: boolean;
     selected: any[];
-    actions: Array<string>;
+    actions: Array<"view" | "edit" | "delete" | "update">;
     pagination: {
         sortBy?: string | null;
         descending?: boolean;

package/dist/runtime/components/l-table.vue

@@ -104,7 +104,8 @@ const props = defineProps({
   onRequestData: { type: Function, required: false },
   addComponent: { type: Object, required: false },
   addComponentProps: { type: null, required: false },
-  name: { type: String, required: false }
+  name: { type: String, required: false },
+  searchStyle: { type: String, required: false }
 });
 const isServerSide = props.rows == void 0;
 const light = useLight();
@@ -138,7 +139,7 @@ let actionView = false;
 let actionDelete = false;
 if (props.actions.length > 0) {
   actionView = props.actions.includes("view");
-  activeEdit = props.actions.includes("edit");
+  activeEdit = props.actions.includes("edit") || props.actions.includes("update");
   actionDelete = props.actions.includes("delete");
 }
 if (props.sortBy) {
@@ -514,8 +515,7 @@ const visibleColumns = props.name ? useStorage("l-table-visible-columns-" + simp
                     <q-checkbox v-model="props.selected" />
                 </q-td>
                 <q-td v-if="hasRowExpand" auto-width>
-                    <q-btn :class="{ 'text-grey-8': !isDark }" flat round size="sm"
-                        :icon="props.expand ? 'sym_o_expand_more' : 'sym_o_expand_less'"
+                    <q-btn flat round size="sm" :icon="props.expand ? 'sym_o_expand_more' : 'sym_o_expand_less'"
                         @click="props.expand = !props.expand"></q-btn>
                 </q-td>
 
@@ -610,7 +610,7 @@ const visibleColumns = props.name ? useStorage("l-table-visible-columns-" + simp
                         <template v-if="col.searchType == 'number'">
                             <q-input style="min-width: 80px;" dense clearable filled square
                                 v-model.number="filters[col.name]" @keydown.enter.prevent="onFilters" @clear="onFilters"
-                                mask="##########" :enterkeyhint="$t('search')"></q-input>
+                                mask="##########" :enterkeyhint="$t('search')" :style="col.searchStyle"></q-input>
                         </template>
 
                         <template v-if="col.searchType == 'select'">
@@ -619,18 +619,19 @@ const visibleColumns = props.name ? useStorage("l-table-visible-columns-" + simp
                                 emit-value map-options :multiple="col.searchMultiple" :color="$light.color" use-input
                                 input-debounce="0" @filter="(val, update) => {
   searchSelectFilter(val, update, col.name);
-}" />
+}" :style="col.searchStyle" />
                         </template>
 
                         <template v-if="col.searchType == 'date'">
                             <l-date-picker dense clearable filled square :outlined="false" hide-bottom-space
-                                v-model="filters[col.name]" @update:model-value="onFilters" range @clear="onFilters" />
+                                v-model="filters[col.name]" @update:model-value="onFilters" range @clear="onFilters"
+                                :style="col.searchStyle" />
                         </template>
 
                         <template v-if="!col.searchType || col.searchType == 'text'">
                             <q-input style="min-width: 80px;" dense clearable filled square v-model="filters[col.name]"
                                 @keydown.enter.prevent="onFilters" @clear="onFilters" :enterkeyhint="$t('search')"
-                                :color="$light.color"></q-input>
+                                :color="$light.color" :style="col.searchStyle"></q-input>
 
                         </template>
 

package/dist/runtime/components/l-table.vue.d.ts

@@ -1,11 +1,14 @@
+import type { Component } from "vue";
 import { Dialog } from 'quasar';
 import type { QTableColumn, QTableProps } from 'quasar';
-export interface LTableColumn extends QTableColumn {
+export type LTableColumn = QTableColumn & {
+    searchType?: "date" | "text" | "number" | "select";
     searchable?: boolean;
-    searchType?: string;
-    searchOptions?: Array<any> | Function;
+    searchOptions?: Record<string, any>[] | Function;
     searchMultiple?: boolean;
     searchIndex?: string;
+    component?: Component;
+    componentProps?: any;
     gql?: Record<string, any>;
     /**
      * @deprecated use gql instead
@@ -13,10 +16,10 @@ export interface LTableColumn extends QTableColumn {
     gqlField?: string | Array<string> | Object;
     backgroundColor?: string | Function;
     searchMethod?: string;
-}
+};
 export type LTableProps = QTableProps & {
     columns?: Array<LTableColumn>;
-    actions?: Array<string>;
+    actions?: Array<'view' | 'edit' | 'delete' | 'update'>;
     sortBy?: any;
     rowKey?: string;
     modelName?: any;
@@ -27,6 +30,7 @@ export type LTableProps = QTableProps & {
     addComponentProps?: any;
     rows?: Array<any>;
     name?: string;
+    searchStyle?: string;
 };
 export interface LTableRequest {
     sort: string;
@@ -91,7 +95,7 @@ declare const __VLS_component: import("vue").DefineComponent<LTableProps, {
     bordered: boolean;
     fullscreen: boolean;
     selected: any[];
-    actions: Array<string>;
+    actions: Array<"view" | "edit" | "delete" | "update">;
     pagination: {
         sortBy?: string | null;
         descending?: boolean;

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

@@ -1,25 +1,9 @@
-import type { Component } from "vue";
 import { type Field } from "@hostlink/light";
-export interface LightModelField extends Field {
-    label: string;
-    sortable?: boolean;
-    searchable?: boolean;
-    autoWidth?: boolean;
-    searchType?: "date" | "text" | "number" | "select";
+import { type LTableColumn } from "../components/l-table.vue.js";
+export type LightModelField = Omit<LTableColumn, "name" | "field"> & Field & {
     name?: string;
-    /**
-     * @deprecated use gql instead
-     */
-    gqlField?: Record<string, any>;
-    to?: (row: any) => string;
-    field?: (row: any) => string;
-    component?: Component;
-    componentProps?: any;
-    format?: (value: any, row: any) => any;
-    style?: any;
-    align?: "left" | "center" | "right";
-    searchOptions?: Record<string, any>[];
-}
+    field?: string | ((row: any) => any);
+};
 export interface LightModel {
     name: string;
     fields: Record<string, LightModelField>;

package/dist/runtime/formkit/Form.vue

@@ -101,7 +101,6 @@ const localClass = computed(() => {
         <q-card-section :class="localClass">
             <slot v-bind="context"></slot>
         </q-card-section>
-
         <q-card-actions align="right" v-if="context.actions">
             <l-btn icon="sym_o_check" :label="context.submitLabel ?? 'Submit'" @click="onSubmit"
                 :disabled="!isNoDirtyCheck && !context.state.dirty" :loading="context.state.loading"></l-btn>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "1.48.4",
+  "version": "1.48.5",
   "description": "HostLink Nuxt Light Framework",
   "repository": {
     "type": "git",