@finema/core 2.36.1 → 2.38.0

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

@@ -1,5 +1,5 @@
-<template>
-  <form class="form">
-    <slot />
-  </form>
-</template>
+<template>
+  <form class="form">
+    <slot />
+  </form>
+</template>

package/dist/runtime/components/Form/types.d.ts

@@ -79,4 +79,5 @@ export interface IFileValue {
     path?: string;
     name?: string;
     size?: number;
+    id?: string;
 }

package/dist/runtime/components/Image.vue

@@ -1,32 +1,32 @@
 <template>
-  <UseImage v-bind="$props">
-    <template #loading>
-      <slot name="loading">
-        <div
-          class="flex h-full w-full items-center justify-center"
-        >
-          <Loader
-            :loading="true"
-          />
-        </div>
-      </slot>
-    </template>
-
-    <template #error>
-      <slot name="error">
-        <div
-          class="flex h-full w-full items-center justify-center"
-        >
-          <p class="text-error-400">
-            <Icon
-              name="i-heroicons:exclamation-circle-solid"
-              class="text-error-400 size-8"
-            />
-          </p>
-        </div>
-      </slot>
-    </template>
-  </UseImage>
+  <UseImage v-bind="$props">
+    <template #loading>
+      <slot name="loading">
+        <div
+          class="flex h-full w-full items-center justify-center"
+        >
+          <Loader
+            :loading="true"
+          />
+        </div>
+      </slot>
+    </template>
+
+    <template #error>
+      <slot name="error">
+        <div
+          class="flex h-full w-full items-center justify-center"
+        >
+          <p class="text-error-400">
+            <Icon
+              name="i-heroicons:exclamation-circle-solid"
+              class="text-error-400 size-8"
+            />
+          </p>
+        </div>
+      </slot>
+    </template>
+  </UseImage>
 </template>
 
 <script setup>

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

@@ -1,21 +1,21 @@
 <template>
-  <DevOnly>
-    <TeleportSafe
-      to="#dev-logs"
-    >
-      <LogItem
-        v-if="typeof data !== 'undefined'"
-        :data="data"
-        :title="title"
-      />
-      <LogItem
-        v-for="(item, index) in dataItems"
-        :key="index"
-        :data="item"
-        :title="`${title} #${index + 1}`"
-      />
-    </TeleportSafe>
-  </DevOnly>
+  <DevOnly>
+    <TeleportSafe
+      to="#dev-logs"
+    >
+      <LogItem
+        v-if="typeof data !== 'undefined'"
+        :data="data"
+        :title="title"
+      />
+      <LogItem
+        v-for="(item, index) in dataItems"
+        :key="index"
+        :data="item"
+        :title="`${title} #${index + 1}`"
+      />
+    </TeleportSafe>
+  </DevOnly>
 </template>
 
 <script setup>

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

@@ -1,71 +1,71 @@
 <template>
-  <div
-    v-if="!isHideCaption"
-    class="mb-4 text-gray-500"
-  >
-    <span class="font-bold">ผลลัพธ์ทั้งหมด:</span>
-    จำนวน
-    <span class="font-bold">{{ pageOptions?.totalCount || rawData.length || 0 }}</span>
-    รายการ
-  </div>
-  <UTable
-    :loading="status.isLoading"
-    :columns="uTableCompatibleColumns"
-    :data="rawData"
-    v-bind="$attrs"
-  >
-    <template #loading-state>
-      <div class="flex h-60 items-center justify-center">
-        <Icon
-          name="i-svg-spinners:180-ring-with-bg"
-          class="text-primary size-8"
-        />
-      </div>
-    </template>
-    <template #empty-state>
-      <Empty />
-    </template>
-    <template
-      v-for="column in columns.filter((item) => !!item.type)"
-      #[`${column.accessorKey}-cell`]="{ row }"
-      :key="column.accessorKey"
-    >
-      <component
-        :is="column.type === COLUMN_TYPES.COMPONENT ? column.component : columnTypeComponents[column.type]"
-        v-if="column.type === COLUMN_TYPES.COMPONENT || columnTypeComponents[column.type]"
-        :value="transformValue(column, row)"
-        :column="column"
-        :row="row"
-      />
-    </template>
-    <template
-      v-for="(_, slotName) of $slots"
-      #[slotName]="slotProps"
-    >
-      <slot
-        :name="slotName"
-        v-bind="slotProps || {}"
-      />
-    </template>
-  </UTable>
-  <div
-    v-if="!isHidePagination && pageOptions"
-    :class="theme.paginationContainer({})"
-  >
-    <p
-      :class="theme.paginationInfo({})"
-    >
-      {{ pageBetween }} รายการ จากทั้งหมด {{ totalCountWithComma }} รายการ
-    </p>
-    <Pagination
-      v-if="pageOptions.totalPage > 1"
-      v-model:page="page"
-      :default-page="pageOptions?.currentPage || 1"
-      :items-per-page="pageOptions.limit"
-      :total="pageOptions.totalCount"
-      @update:page="onPageChange"
-    />
-  </div>
+  <div
+    v-if="!isHideCaption"
+    class="mb-4 text-gray-500"
+  >
+    <span class="font-bold">ผลลัพธ์ทั้งหมด:</span>
+    จำนวน
+    <span class="font-bold">{{ pageOptions?.totalCount || rawData.length || 0 }}</span>
+    รายการ
+  </div>
+  <UTable
+    :loading="status.isLoading"
+    :columns="uTableCompatibleColumns"
+    :data="rawData"
+    v-bind="$attrs"
+  >
+    <template #loading-state>
+      <div class="flex h-60 items-center justify-center">
+        <Icon
+          name="i-svg-spinners:180-ring-with-bg"
+          class="text-primary size-8"
+        />
+      </div>
+    </template>
+    <template #empty-state>
+      <Empty />
+    </template>
+    <template
+      v-for="column in columns.filter((item) => !!item.type)"
+      #[`${column.accessorKey}-cell`]="{ row }"
+      :key="column.accessorKey"
+    >
+      <component
+        :is="column.type === COLUMN_TYPES.COMPONENT ? column.component : columnTypeComponents[column.type]"
+        v-if="column.type === COLUMN_TYPES.COMPONENT || columnTypeComponents[column.type]"
+        :value="transformValue(column, row)"
+        :column="column"
+        :row="row"
+      />
+    </template>
+    <template
+      v-for="(_, slotName) of $slots"
+      #[slotName]="slotProps"
+    >
+      <slot
+        :name="slotName"
+        v-bind="slotProps || {}"
+      />
+    </template>
+  </UTable>
+  <div
+    v-if="!isHidePagination && pageOptions"
+    :class="theme.paginationContainer({})"
+  >
+    <p
+      :class="theme.paginationInfo({})"
+    >
+      {{ pageBetween }} รายการ จากทั้งหมด {{ totalCountWithComma }} รายการ
+    </p>
+    <Pagination
+      v-if="pageOptions.totalPage > 1"
+      v-model:page="page"
+      :default-page="pageOptions?.currentPage || 1"
+      :items-per-page="pageOptions.limit"
+      :total="pageOptions.totalCount"
+      @update:page="onPageChange"
+    />
+  </div>
 </template>
 
 <script setup>

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

@@ -1,5 +1,5 @@
 <template>
-  {{ getValue || "-" }}
+  {{ getValue || "-" }}
 </template>
 
 <script setup>

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

@@ -1,5 +1,5 @@
 <template>
-  {{ getValue || "-" }}
+  {{ getValue || "-" }}
 </template>
 
 <script setup>

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

@@ -1,8 +1,8 @@
 <template>
-  <Image
-    class="h-12 rounded"
-    :src="getValue"
-  />
+  <Image
+    class="h-12 rounded"
+    :src="getValue"
+  />
 </template>
 
 <script setup>

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

@@ -1,5 +1,5 @@
 <template>
-  {{ getValue }}
+  {{ getValue }}
 </template>
 
 <script setup>

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

@@ -1,24 +1,24 @@
 <template>
-  <Base
-    v-bind="$attrs"
-    :columns="options.columns"
-    :raw-data="itemsByPage"
-    :status="options.status"
-    :page-options="pageOptions"
-    :is-hide-pagination="options.isHidePagination"
-    :is-hide-caption="options.isHideCaption"
-    @page-change="onPageChange"
-  >
-    <template
-      v-for="(_, slot) of $slots"
-      #[slot]="slotProps"
-    >
-      <slot
-        :name="slot"
-        v-bind="slotProps || {}"
-      />
-    </template>
-  </Base>
+  <Base
+    v-bind="$attrs"
+    :columns="options.columns"
+    :raw-data="itemsByPage"
+    :status="options.status"
+    :page-options="pageOptions"
+    :is-hide-pagination="options.isHidePagination"
+    :is-hide-caption="options.isHideCaption"
+    @page-change="onPageChange"
+  >
+    <template
+      v-for="(_, slot) of $slots"
+      #[slot]="slotProps"
+    >
+      <slot
+        :name="slot"
+        v-bind="slotProps || {}"
+      />
+    </template>
+  </Base>
 </template>
 
 <script setup>

package/dist/runtime/composables/loaderPage.js

@@ -21,6 +21,7 @@ export const usePageLoader = (loaderOptions) => {
   const config = useCoreConfig();
   const fetch = reactive({
     status: ObjectHelper.createStatus(),
+    statusNextPage: ObjectHelper.createStatus(),
     items: [],
     options: initPageOptions({
       limit: config.limit_per_page,
@@ -54,6 +55,7 @@ export const usePageLoader = (loaderOptions) => {
     add.status = ObjectHelper.createStatus();
     update.status = ObjectHelper.createStatus();
     fetch.status = ObjectHelper.createStatus();
+    fetch.statusNextPage = ObjectHelper.createStatus();
     find.item = null;
     del.item = null;
     update.item = null;
@@ -184,6 +186,35 @@ export const usePageLoader = (loaderOptions) => {
   const fetchSearch = async (query = "", opts) => {
     await fetchPage(1, query, opts);
   };
+  const fetchNextPage = async (opts) => {
+    const {
+      page: _page,
+      ...params
+    } = fetch.options?.request?.params || {};
+    await apiFetchHelper(
+      () => ({
+        status: fetch.status,
+        items: fetch.items,
+        options: fetch.options
+      }),
+      (data) => {
+        fetch.statusNextPage = data;
+      },
+      (data) => {
+        fetch.options = data;
+      },
+      (data) => {
+        fetch.items = [...fetch.items, ...data];
+      },
+      fetch.options.currentPage + 1,
+      fetch.options.search || "",
+      {
+        ...loaderOptions,
+        params,
+        ...opts
+      }
+    );
+  };
   const fetchPageChange = async (page, opts) => {
     const {
       page: _page,
@@ -232,6 +263,7 @@ export const usePageLoader = (loaderOptions) => {
     fetchPage,
     fetchSearch,
     fetchPageChange,
+    fetchNextPage,
     fetchSetLoading,
     findSetLoading,
     findRun,

package/dist/runtime/helpers/apiPageHelper.d.ts

@@ -46,6 +46,7 @@ export interface IPageLoaderOptions<T> {
 export interface IUsePageLoader<T> {
     fetch: {
         status: IStatus;
+        statusNextPage: IStatus;
         items: T[];
         options: IPageOptions;
     };
@@ -72,6 +73,7 @@ export interface IUsePageLoader<T> {
     };
     fetchPage: (page?: number, query?: string, opts?: IPageFetchLoaderOptions) => Promise<void>;
     fetchPageChange: (page: number, opts?: IPageFetchLoaderOptions) => Promise<void>;
+    fetchNextPage: (opts?: IPageFetchLoaderOptions) => Promise<void>;
     fetchSearch: (query: string, opts?: IPageFetchLoaderOptions) => Promise<void>;
     fetchSetLoading: () => void;
     findSetLoading: () => void;

package/dist/runtime/server/tsconfig.json

@@ -1,3 +1,3 @@
-{
-  "extends": "../../../.nuxt/tsconfig.server.json",
-}
+{
+  "extends": "../../../.nuxt/tsconfig.server.json",
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finema/core",
-  "version": "2.36.1",
+  "version": "2.38.0",
   "repository": "https://gitlab.finema.co/finema/ui-kit",
   "license": "MIT",
   "author": "Finema Dev Core Team",
@@ -93,4 +93,4 @@
   "lint-staged": {
     "*": "eslint --fix --quiet"
   }
-}
+}