@finema/core 3.16.1 → 3.16.3

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@finema/core",
-  "version": "3.16.1",
+  "version": "3.16.3",
   "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.1";
+const version = "3.16.3";
 
 const nuxtAppOptions = {
   head: {

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

@@ -5,10 +5,15 @@ type __VLS_Props = {
     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_53: any, __VLS_54: any;
+declare var __VLS_25: {}, __VLS_32: {}, __VLS_34: {}, __VLS_47: any, __VLS_48: {
+    row: any;
+}, __VLS_57: any, __VLS_58: any;
 type __VLS_Slots = {} & {
-    [K in NonNullable<typeof __VLS_53>]?: (props: typeof __VLS_54) => any;
+    [K in NonNullable<typeof __VLS_47>]?: (props: typeof __VLS_48) => any;
+} & {
+    [K in NonNullable<typeof __VLS_57>]?: (props: typeof __VLS_58) => any;
 } & {
     loading?: (props: typeof __VLS_25) => any;
 } & {

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

@@ -74,24 +74,29 @@
   to && column.accessorKey !== 'actions' ? 'pointer-events-none relative z-10' : 'relative z-10'
 "
         >
-          <component
-            :is="
+          <slot
+            :name="`${column.accessorKey}-cell`"
+            :row="row"
+          >
+            <component
+              :is="
   column.type === COLUMN_TYPES.COMPONENT ? column.component : columnTypeComponents[column.type]
 "
-            v-if="
+              v-if="
   column.type === COLUMN_TYPES.COMPONENT || columnTypeComponents[column.type]
 "
-            :value="transformValue(column, row)"
-            :column="column"
-            :row="row"
-          />
-          <template v-else>
-            {{ transformValue(column, row) }}
-          </template>
+              :value="transformValue(column, row)"
+              :column="column"
+              :row="row"
+            />
+            <template v-else>
+              {{ transformValue(column, row) }}
+            </template>
+          </slot>
         </div>
       </template>
       <template
-        v-for="(_, slotName) of $slots"
+        v-for="slotName in forwardedSlotNames"
         :key="slotName"
         #[slotName]="slotProps"
       >
@@ -116,7 +121,7 @@
 </template>
 
 <script setup>
-import { computed, ref } from "vue";
+import { computed, ref, useSlots } from "vue";
 import {
   COLUMN_TYPES
 } from "#core/components/Table/types";
@@ -124,6 +129,7 @@ import ColumnNumber from "#core/components/Table/ColumnNumber.vue";
 import ColumnImage from "#core/components/Table/ColumnImage.vue";
 import {
   useAppConfig,
+  useRoute,
   useUiConfig,
   useWatchChange,
   StringHelper
@@ -140,8 +146,14 @@ const props = defineProps({
   options: { type: Object, required: true },
   ui: { type: null, required: false },
   to: { type: [String, Function], required: false },
-  target: { type: [String, Function], required: false }
+  target: { type: [String, Function], required: false },
+  preserveQuery: { type: Boolean, required: false }
 });
+const route = useRoute();
+const slots = useSlots();
+const forwardedSlotNames = computed(
+  () => Object.keys(slots).filter((name) => !name.endsWith("-cell"))
+);
 const columnTypeComponents = {
   [COLUMN_TYPES.NUMBER]: ColumnNumber,
   [COLUMN_TYPES.IMAGE]: ColumnImage,
@@ -171,10 +183,23 @@ const transformValue = (column, row) => {
   return row.getValue(column.accessorKey);
 };
 const resolveTo = (rowOriginal) => {
-  if (typeof props.to === "function") {
-    return props.to(rowOriginal);
+  const resolved = typeof props.to === "function" ? props.to(rowOriginal) : props.to;
+  if (!props.preserveQuery || !resolved) {
+    return resolved;
+  }
+  if (typeof resolved === "string") {
+    return {
+      path: resolved,
+      query: route.query
+    };
   }
-  return props.to;
+  return {
+    ...resolved,
+    query: {
+      ...route.query,
+      ...resolved.query || {}
+    }
+  };
 };
 const resolveTarget = (rowOriginal) => {
   if (typeof props.target === "function") {

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

@@ -5,10 +5,15 @@ type __VLS_Props = {
     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_53: any, __VLS_54: any;
+declare var __VLS_25: {}, __VLS_32: {}, __VLS_34: {}, __VLS_47: any, __VLS_48: {
+    row: any;
+}, __VLS_57: any, __VLS_58: any;
 type __VLS_Slots = {} & {
-    [K in NonNullable<typeof __VLS_53>]?: (props: typeof __VLS_54) => any;
+    [K in NonNullable<typeof __VLS_47>]?: (props: typeof __VLS_48) => any;
+} & {
+    [K in NonNullable<typeof __VLS_57>]?: (props: typeof __VLS_58) => any;
 } & {
     loading?: (props: typeof __VLS_25) => any;
 } & {

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

@@ -14,6 +14,7 @@ type __VLS_Props = {
     };
     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, {} & {

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

@@ -21,6 +21,7 @@
       :column-pinning="computedColumnPinning"
       :to="to"
       :target="target"
+      :preserve-query="preserveQuery"
       @page-change="onPageChange"
       @search="emits('search', q)"
       @select="emits('select', $event)"
@@ -53,7 +54,8 @@ const props = defineProps({
     right: []
   }) },
   to: { type: [String, Function], required: false },
-  target: { type: [String, Function], required: false }
+  target: { type: [String, Function], required: false },
+  preserveQuery: { type: Boolean, required: false }
 });
 defineSlots();
 const tableContainer = ref();

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

@@ -14,6 +14,7 @@ type __VLS_Props = {
     };
     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, {} & {

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.1",
+  "version": "3.16.3",
   "repository": "https://gitlab.finema.co/finema/ui-kit",
   "license": "MIT",
   "author": "Finema Dev Core Team",