@finema/core 3.16.2 → 3.16.4

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@finema/core",
-  "version": "3.16.2",
+  "version": "3.16.4",
   "configKey": "core",
   "builder": {
     "@nuxt/module-builder": "1.0.2",

package/dist/module.mjs

@@ -4,7 +4,7 @@ import * as lodash from 'lodash-es';
 import * as theme from '../dist/runtime/theme/index.js';
 
 const name = "@finema/core";
-const version = "3.16.2";
+const version = "3.16.4";
 
 const nuxtAppOptions = {
   head: {

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

@@ -1,15 +1,13 @@
 import { type ISimpleTableOptions, type ITableOptions } from '#core/components/Table/types';
 import { tableTheme } from '#core/theme/table';
 type __VLS_Props = {
-    options: ITableOptions<any> & ISimpleTableOptions<any>;
+    options: ISimpleTableOptions<any> & Partial<ITableOptions<any>>;
     ui?: (typeof tableTheme)['slots'];
     to?: string | ((row: any) => any);
     target?: string | ((row: any) => string | undefined);
     preserveQuery?: boolean;
 };
-declare var __VLS_25: {}, __VLS_32: {}, __VLS_34: {}, __VLS_47: any, __VLS_48: {
-    row: any;
-}, __VLS_57: any, __VLS_58: any;
+declare var __VLS_25: {}, __VLS_32: {}, __VLS_34: {}, __VLS_47: any, __VLS_48: any, __VLS_57: any, __VLS_58: any;
 type __VLS_Slots = {} & {
     [K in NonNullable<typeof __VLS_47>]?: (props: typeof __VLS_48) => any;
 } & {

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

@@ -55,15 +55,15 @@
       </template>
       <template
         v-for="column in options.columns"
-        #[`${column.accessorKey}-cell`]="{ row }"
+        #[`${column.accessorKey}-cell`]="slotProps"
         :key="column.accessorKey"
       >
         <NuxtLink
           v-if="to && column.accessorKey !== 'actions'"
-          :to="resolveTo(row.original)"
-          :target="resolveTarget(row.original)"
+          :to="resolveTo(slotProps.row.original)"
+          :target="resolveTarget(slotProps.row.original)"
           :rel="
-  resolveTarget(row.original) === '_blank' ? 'noopener noreferrer' : void 0
+  resolveTarget(slotProps.row.original) === '_blank' ? 'noopener noreferrer' : void 0
 "
           class="absolute inset-0"
           tabindex="-1"
@@ -76,7 +76,7 @@
         >
           <slot
             :name="`${column.accessorKey}-cell`"
-            :row="row"
+            v-bind="slotProps"
           >
             <component
               :is="
@@ -85,12 +85,12 @@
               v-if="
   column.type === COLUMN_TYPES.COMPONENT || columnTypeComponents[column.type]
 "
-              :value="transformValue(column, row)"
+              :value="transformValue(column, slotProps.row)"
               :column="column"
-              :row="row"
+              :row="slotProps.row"
             />
             <template v-else>
-              {{ transformValue(column, row) }}
+              {{ transformValue(column, slotProps.row) }}
             </template>
           </slot>
         </div>
@@ -222,6 +222,9 @@ const onSelect = (rows) => {
 };
 const changePageLimit = (limit) => {
   pageLimit.value = limit;
+  if (!props.options.repo) {
+    return;
+  }
   props.options.repo.fetchPageChange(1, {
     params: {
       ...props.options.pageOptions?.request?.params,

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

@@ -1,15 +1,13 @@
 import { type ISimpleTableOptions, type ITableOptions } from '#core/components/Table/types';
 import { tableTheme } from '#core/theme/table';
 type __VLS_Props = {
-    options: ITableOptions<any> & ISimpleTableOptions<any>;
+    options: ISimpleTableOptions<any> & Partial<ITableOptions<any>>;
     ui?: (typeof tableTheme)['slots'];
     to?: string | ((row: any) => any);
     target?: string | ((row: any) => string | undefined);
     preserveQuery?: boolean;
 };
-declare var __VLS_25: {}, __VLS_32: {}, __VLS_34: {}, __VLS_47: any, __VLS_48: {
-    row: any;
-}, __VLS_57: any, __VLS_58: any;
+declare var __VLS_25: {}, __VLS_32: {}, __VLS_34: {}, __VLS_47: any, __VLS_48: any, __VLS_57: any, __VLS_58: any;
 type __VLS_Slots = {} & {
     [K in NonNullable<typeof __VLS_47>]?: (props: typeof __VLS_48) => any;
 } & {

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

@@ -3,7 +3,7 @@ import { tableTheme } from '../../theme/table.js';
 type __VLS_Props = {
     page: number;
     pageLimit: number;
-    options: ITableOptions<any> & ISimpleTableOptions<any>;
+    options: ISimpleTableOptions<any> & Partial<ITableOptions<any>>;
     ui?: (typeof tableTheme)['slots'];
 };
 declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {

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

@@ -34,7 +34,8 @@
   })
 "
           >
-            {{ modelValue }}  {{ appConfig.core?.locale === "th" ? "\u0E23\u0E32\u0E22\u0E01\u0E32\u0E23" : "items" }}
+            {{ modelValue }}
+            {{ appConfig.core?.locale === "th" ? "\u0E23\u0E32\u0E22\u0E01\u0E32\u0E23" : "items" }}
           </p>
         </template>
       </USelect>
@@ -45,8 +46,12 @@
   })
 "
       >
-        <span v-if="options.pageOptions">{{ pageBetween }} {{ appConfig.core?.locale === "th" ? "\u0E08\u0E32\u0E01\u0E17\u0E31\u0E49\u0E07\u0E2B\u0E21\u0E14" : "of total" }} {{ totalCountWithComma }}</span>
-        <span v-else>{{ appConfig.core?.locale === "th" ? "\u0E17\u0E31\u0E49\u0E07\u0E2B\u0E21\u0E14" : "Total" }} {{ options.rawData.length }} {{ appConfig.core?.locale === "th" ? "\u0E23\u0E32\u0E22\u0E01\u0E32\u0E23" : "items" }}</span>
+        <span v-if="options.pageOptions">{{ pageBetween }}
+          {{ appConfig.core?.locale === "th" ? "\u0E08\u0E32\u0E01\u0E17\u0E31\u0E49\u0E07\u0E2B\u0E21\u0E14" : "of total" }}
+          {{ totalCountWithComma }}</span>
+        <span v-else>{{ appConfig.core?.locale === "th" ? "\u0E17\u0E31\u0E49\u0E07\u0E2B\u0E21\u0E14" : "Total" }}
+          {{ options.rawData.length }}
+          {{ appConfig.core?.locale === "th" ? "\u0E23\u0E32\u0E22\u0E01\u0E32\u0E23" : "items" }}</span>
       </p>
     </div>
     <UPagination
@@ -71,9 +76,11 @@
           :ui="{ label: themePagination.label }"
           square
           :to="to?.(item.value)"
-          :class="theme.buttonPagination({
-  class: [ui?.buttonPagination]
-})"
+          :class="
+  theme.buttonPagination({
+    class: [ui?.buttonPagination]
+  })
+"
         />
       </template>
     </UPagination>
@@ -98,7 +105,9 @@ const props = defineProps({
   options: { type: Object, required: true },
   ui: { type: null, required: false }
 });
-const themePagination = computed(() => useUiConfig(paginationTheme, "pagination")());
+const themePagination = computed(
+  () => useUiConfig(paginationTheme, "pagination")()
+);
 const appConfig = useAppConfig();
 const pageLimitItems = [
   {

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

@@ -3,7 +3,7 @@ import { tableTheme } from '../../theme/table.js';
 type __VLS_Props = {
     page: number;
     pageLimit: number;
-    options: ITableOptions<any> & ISimpleTableOptions<any>;
+    options: ISimpleTableOptions<any> & Partial<ITableOptions<any>>;
     ui?: (typeof tableTheme)['slots'];
 };
 declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {

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

@@ -7,6 +7,9 @@ type Slot = TableSlots<any> & {
 type __VLS_Props = {
     options: ISimpleTableOptions<any>;
     ui?: (typeof tableTheme)['slots'];
+    to?: string | ((row: any) => any);
+    target?: string | ((row: any) => string | undefined);
+    preserveQuery?: boolean;
 };
 type __VLS_Slots = Slot;
 declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;

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

@@ -7,7 +7,10 @@
   isHideLimitSelect: true,
   rawData: itemsByPage
 }"
-    :ui="ui"
+    :ui="computedUi"
+    :to="to"
+    :target="target"
+    :preserve-query="preserveQuery"
     @page-change="onPageChange"
   >
     <template
@@ -29,9 +32,21 @@ import { initPageOptions } from "#core/composables/loaderPage";
 import { useCoreConfig } from "#core/composables/useConfig";
 const props = defineProps({
   options: { type: Object, required: true },
-  ui: { type: null, required: false }
+  ui: { type: null, required: false },
+  to: { type: [String, Function], required: false },
+  target: { type: [String, Function], required: false },
+  preserveQuery: { type: Boolean, required: false }
 });
 defineSlots();
+const computedUi = computed(() => {
+  if (!props.to) {
+    return props.ui;
+  }
+  return {
+    ...props.ui,
+    td: [props.ui?.td, "cursor-pointer", "relative"].filter(Boolean).join(" ")
+  };
+});
 const currentPage = ref(1);
 const coreConfig = useCoreConfig();
 const pageOptions = computed(() => {

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

@@ -7,6 +7,9 @@ type Slot = TableSlots<any> & {
 type __VLS_Props = {
     options: ISimpleTableOptions<any>;
     ui?: (typeof tableTheme)['slots'];
+    to?: string | ((row: any) => any);
+    target?: string | ((row: any) => string | undefined);
+    preserveQuery?: boolean;
 };
 type __VLS_Slots = Slot;
 declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;

package/dist/runtime/composables/useTable.js

@@ -1,20 +1,38 @@
 import { get } from "@vueuse/core";
 import { computed, ObjectHelper } from "#imports";
 export const useTable = (options) => computed(() => {
+  const {
+    repo,
+    columns,
+    transformItems,
+    options: nestedOptions,
+    ...inlineOptions
+  } = options;
   return createTableOptions(
-    options.repo,
-    options.columns(),
-    typeof options.options === "function" ? options.options() : options.options ?? {},
-    options.transformItems
+    repo,
+    columns(),
+    {
+      ...inlineOptions,
+      ...typeof nestedOptions === "function" ? nestedOptions() : nestedOptions ?? {}
+    },
+    transformItems
   );
 });
 export const useTableSimple = (options) => computed(() => {
+  const {
+    items,
+    status,
+    columns,
+    options: nestedOptions,
+    ...inlineOptions
+  } = options;
   return {
-    items: options.items(),
-    columns: options.columns(),
-    rawData: options.items(),
-    status: options.status ? options.status() : ObjectHelper.createStatus(),
-    ...typeof options.options === "function" ? options.options() : options.options ?? {}
+    items: items(),
+    columns: columns(),
+    rawData: items(),
+    status: status ? status() : ObjectHelper.createStatus(),
+    ...inlineOptions,
+    ...typeof nestedOptions === "function" ? nestedOptions() : nestedOptions ?? {}
   };
 });
 export const createTableOptions = (repo, columns, options, transformItems) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finema/core",
-  "version": "3.16.2",
+  "version": "3.16.4",
   "repository": "https://gitlab.finema.co/finema/ui-kit",
   "license": "MIT",
   "author": "Finema Dev Core Team",