@finema/core 2.35.1 → 2.35.2

package/dist/module.json

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

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

@@ -1,17 +1,17 @@
 <template>
-  <FormField
-    :label="label"
-    :name="name"
-    :description="description"
-    :hint="hint"
-    :data-testid="name"
-    :help="help"
-    :error="errorMessage"
-    :required="!!required"
-    :ui="containerUi"
-  >
-    <slot />
-  </FormField>
+  <FormField
+    :label="label"
+    :name="name"
+    :description="description"
+    :hint="hint"
+    :data-testid="name"
+    :help="help"
+    :error="errorMessage"
+    :required="!!required"
+    :ui="containerUi"
+  >
+    <slot />
+  </FormField>
 </template>
 
 <script setup>

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

@@ -1,22 +1,22 @@
 <template>
-  <div
+  <div
     :class="[theme.base({
   class: [$props.class, ui?.base]
-})]"
-  >
-    <component
-      :is="componentMap[option.type]?.component"
-      v-for="option in options.filter((item) => !item.isHide)"
-      :key="option.props.name"
-      :class="option.class"
-      :form="form"
+})]"
+  >
+    <component
+      :is="componentMap[option.type]?.component"
+      v-for="option in options.filter((item) => !item.isHide)"
+      :key="option.props.name"
+      :class="option.class"
+      :form="form"
       v-bind="{
   ...getFieldBinding(option),
   ...componentMap[option.type]?.props
-}"
-      v-on="option.on ?? {}"
-    />
-  </div>
+}"
+      v-on="option.on ?? {}"
+    />
+  </div>
 </template>
 
 <script setup>

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

@@ -1,22 +1,22 @@
 <template>
-  <FieldWrapper
-    v-bind="wrapperProps"
-    label=""
-    description=""
-  >
-    <Checkbox
-      :model-value="value"
-      :disabled="wrapperProps.disabled"
-      :name="name"
-      :label="label"
-      :description="description"
-      :required="required"
-      :variant="variant"
-      :indicator="indicator"
-      :ui="ui"
-      @update:modelValue="onChange"
-    />
-  </FieldWrapper>
+  <FieldWrapper
+    v-bind="wrapperProps"
+    label=""
+    description=""
+  >
+    <Checkbox
+      :model-value="value"
+      :disabled="wrapperProps.disabled"
+      :name="name"
+      :label="label"
+      :description="description"
+      :required="required"
+      :variant="variant"
+      :indicator="indicator"
+      :ui="ui"
+      @update:modelValue="onChange"
+    />
+  </FieldWrapper>
 </template>
 
 <script setup>

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

@@ -1,5 +1,5 @@
 <template>
-  <component :is="props.component" :value="value" v-bind="props"/>
+  <component :is="props.component" :value="value" v-bind="props"/>
 </template>
 
 <script setup>

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

@@ -1,24 +1,24 @@
 <template>
-  <FieldWrapper v-bind="wrapperProps">
-    <InputNumber
-      :model-value="value"
-      :disabled="wrapperProps.disabled"
-      :name="name"
-      :placeholder="wrapperProps.placeholder"
-      :autofocus="!!autoFocus"
-      :readonly="readonly"
-      :orientation="orientation"
-      :increment-disabled="incrementDisabled"
-      :decrement-disabled="decrementDisabled"
-      :min="min"
-      :max="max"
-      :step="step"
-      :disable-wheel-change="disableWheelChange"
-      :format-options="formatOptions"
-      :ui="ui"
-      @update:model-value="onChange"
-    />
-  </FieldWrapper>
+  <FieldWrapper v-bind="wrapperProps">
+    <InputNumber
+      :model-value="value"
+      :disabled="wrapperProps.disabled"
+      :name="name"
+      :placeholder="wrapperProps.placeholder"
+      :autofocus="!!autoFocus"
+      :readonly="readonly"
+      :orientation="orientation"
+      :increment-disabled="incrementDisabled"
+      :decrement-disabled="decrementDisabled"
+      :min="min"
+      :max="max"
+      :step="step"
+      :disable-wheel-change="disableWheelChange"
+      :format-options="formatOptions"
+      :ui="ui"
+      @update:model-value="onChange"
+    />
+  </FieldWrapper>
 </template>
 
 <script setup>

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

@@ -1,57 +1,57 @@
 <template>
-  <FieldWrapper v-bind="wrapperProps">
-    <SelectMenu
-      :model-value="value"
-      :items="options"
-      multiple
-      :placeholder="wrapperProps.placeholder"
-      :disabled="wrapperProps.disabled"
-      :loading="loading"
-      :search-input="searchInput"
-      :selected-icon="selectedIcon"
-      value-key="value"
-      label-key="label"
-      :icon="icon"
-      :ui="ui"
-      :ignore-filter="!!$attrs.onSearch"
-      @update:model-value="onChange"
-      @update:searchTerm="onSearch"
-    >
-      <template #default="{ modelValue }">
-        <div
-          v-if="!ArrayHelper.isEmpty(value)"
+  <FieldWrapper v-bind="wrapperProps">
+    <SelectMenu
+      :model-value="value"
+      :items="options"
+      multiple
+      :placeholder="wrapperProps.placeholder"
+      :disabled="wrapperProps.disabled"
+      :loading="loading"
+      :search-input="searchInput"
+      :selected-icon="selectedIcon"
+      value-key="value"
+      label-key="label"
+      :icon="icon"
+      :ui="ui"
+      :ignore-filter="!!$attrs.onSearch"
+      @update:model-value="onChange"
+      @update:searchTerm="onSearch"
+    >
+      <template #default="{ modelValue }">
+        <div
+          v-if="!ArrayHelper.isEmpty(value)"
           :class="theme.tagsWrapper({
   class: [ui?.tagsWrapper]
-})"
-        >
-          <div
-            v-for="_value in ArrayHelper.toArray(modelValue)"
-            :key="_value"
+})"
+        >
+          <div
+            v-for="_value in ArrayHelper.toArray(modelValue)"
+            :key="_value"
             :class="theme.tagsItem({
   class: [ui?.tagsItem]
-})"
-          >
-            <div
+})"
+          >
+            <div
               :class="theme.tagsItemText({
   class: [ui?.tagsItemText]
-})"
-            >
-              {{ options.find((item) => item.value === _value)?.label || _value }}
-              <Icon
+})"
+            >
+              {{ options.find((item) => item.value === _value)?.label || _value }}
+              <Icon
                 :name="theme.tagsItemDeleteIcon({
   class: [ui?.tagsItemDeleteIcon]
-})"
+})"
                 :class="theme.tagsItemDelete({
   class: [ui?.tagsItemDelete]
-})"
-                @click.stop="handleDelete(_value)"
-              />
-            </div>
-          </div>
-        </div>
-      </template>
-    </SelectMenu>
-  </FieldWrapper>
+})"
+                @click.stop="handleDelete(_value)"
+              />
+            </div>
+          </div>
+        </div>
+      </template>
+    </SelectMenu>
+  </FieldWrapper>
 </template>
 
 <script setup>

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

@@ -1,22 +1,22 @@
 <template>
-  <FieldWrapper v-bind="wrapperProps">
-    <Textarea
-      :model-value="value"
-      :disabled="wrapperProps.disabled"
-      :name="name"
-      :resize="resize"
-      :placeholder="wrapperProps.placeholder"
-      :autofocus="!!autoFocus"
-      :autoresize="autoresize"
-      :rows="rows"
-      :maxrows="maxrows"
-      :loading="loading"
-      :loading-icon="loadingIcon"
-      :readonly="readonly"
-      :ui="ui"
-      @update:model-value="onChange"
-    />
-  </FieldWrapper>
+  <FieldWrapper v-bind="wrapperProps">
+    <Textarea
+      :model-value="value"
+      :disabled="wrapperProps.disabled"
+      :name="name"
+      :resize="resize"
+      :placeholder="wrapperProps.placeholder"
+      :autofocus="!!autoFocus"
+      :autoresize="autoresize"
+      :rows="rows"
+      :maxrows="maxrows"
+      :loading="loading"
+      :loading-icon="loadingIcon"
+      :readonly="readonly"
+      :ui="ui"
+      @update:model-value="onChange"
+    />
+  </FieldWrapper>
 </template>
 
 <script setup>

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

@@ -1,46 +1,46 @@
 <template>
-  <FieldWrapper v-bind="wrapperProps">
-    <Datepicker
-      v-model="innerValue"
-      :disabled="wrapperProps.disabled"
-      cancel-text="ยกเลิก"
-      select-text="เลือก"
-      locale="th"
-      time-picker
-      :placeholder="wrapperProps.placeholder"
-      :format="format"
-      :min-time="minTime"
-      :max-time="maxTime"
-      :start-time="startTime"
-      :required="required"
-      :enable-seconds="enableSeconds"
-      @update:model-value="onChange"
-    >
-      <template #dp-input="{ value: innerValue }">
-        <Input
-          :trailing-icon="innerValue ? void 0 : 'i-heroicons-clock'"
-          type="text"
-          :disabled="wrapperProps.disabled"
-          :model-value="innerValue"
-          :placeholder="wrapperProps.placeholder"
-          :readonly="true"
+  <FieldWrapper v-bind="wrapperProps">
+    <Datepicker
+      v-model="innerValue"
+      :disabled="wrapperProps.disabled"
+      cancel-text="ยกเลิก"
+      select-text="เลือก"
+      locale="th"
+      time-picker
+      :placeholder="wrapperProps.placeholder"
+      :format="format"
+      :min-time="minTime"
+      :max-time="maxTime"
+      :start-time="startTime"
+      :required="required"
+      :enable-seconds="enableSeconds"
+      @update:model-value="onChange"
+    >
+      <template #dp-input="{ value: innerValue }">
+        <Input
+          :trailing-icon="innerValue ? void 0 : 'i-heroicons-clock'"
+          type="text"
+          :disabled="wrapperProps.disabled"
+          :model-value="innerValue"
+          :placeholder="wrapperProps.placeholder"
+          :readonly="true"
           :ui="{
   base: 'cursor-pointer select-none',
   trailingIcon: 'cursor-pointer'
-}"
-        />
-      </template>
-      <template #clear-icon="{ clear }">
-        <Icon
-          :name="clearIcon"
+}"
+        />
+      </template>
+      <template #clear-icon="{ clear }">
+        <Icon
+          :name="clearIcon"
           :class="theme.clearIcon({
   class: [ui?.clearIcon]
-})"
-          @click.stop="clear"
-        />
-      </template>
-    </Datepicker>
-  </FieldWrapper>
+})"
+          @click.stop="clear"
+        />
+      </template>
+    </Datepicker>
+  </FieldWrapper>
 </template>
 
 <script setup>
@@ -82,7 +82,10 @@ const {
 const onChange = (value2) => {
   let timeText = void 0;
   if (value2) {
-    timeText = `${value2.hours}:${value2.minutes}${props.enableSeconds ? `:${value2.seconds}` : ""}`;
+    const hours = value2.hours?.toString().padStart(2, "0") ?? "00";
+    const minutes = value2.minutes?.toString().padStart(2, "0") ?? "00";
+    const seconds = props.enableSeconds ? value2.seconds?.toString().padStart(2, "0") ?? "00" : "";
+    timeText = `${hours}:${minutes}${props.enableSeconds ? `:${seconds}` : ""}`;
   }
   handleChange(timeText);
   emits("change", timeText);

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

@@ -1,21 +1,21 @@
 <template>
-  <FieldWrapper
-    v-bind="wrapperProps"
-    label=""
-    description=""
-  >
-    <Switch
-      :model-value="value"
-      :disabled="wrapperProps.disabled"
-      :name="name"
-      :ui="ui"
-      :label="label"
-      :description="description"
-      :loading="loading"
-      :loading-icon="loadingIcon"
-      @update:modelValue="onChange"
-    />
-  </FieldWrapper>
+  <FieldWrapper
+    v-bind="wrapperProps"
+    label=""
+    description=""
+  >
+    <Switch
+      :model-value="value"
+      :disabled="wrapperProps.disabled"
+      :name="name"
+      :ui="ui"
+      :label="label"
+      :description="description"
+      :loading="loading"
+      :loading-icon="loadingIcon"
+      @update:modelValue="onChange"
+    />
+  </FieldWrapper>
 </template>
 
 <script setup>

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

@@ -1,34 +1,34 @@
 <template>
-  <FieldWrapper v-bind="wrapperProps">
-    <div
-      ref="dropzoneRef"
-      :class="theme.base()"
-    >
-      <div :class="theme.wrapper()">
-        <!-- Empty State -->
-        <EmptyState
-          v-if="uploadState.isEmpty.value"
-          :theme="theme"
-          :select-file-label="selectFileLabel"
-          :select-file-sub-label="selectFileSubLabel"
-          :placeholder="placeholder"
-          @open-file="uploadState.handleOpenFile"
-        />
-
-        <!-- Success State -->
-        <SuccessState
-          v-if="uploadState.isSuccess.value"
-          :theme="theme"
-          :value="value"
-          :disabled="wrapperProps.disabled"
-          :readonly="wrapperProps.readonly"
-          @preview="uploadState.handlePreview"
-          @download="handleDownloadFile"
-          @delete="uploadState.handleDeleteFile"
-        />
-      </div>
-    </div>
-  </FieldWrapper>
+  <FieldWrapper v-bind="wrapperProps">
+    <div
+      ref="dropzoneRef"
+      :class="theme.base()"
+    >
+      <div :class="theme.wrapper()">
+        <!-- Empty State -->
+        <EmptyState
+          v-if="uploadState.isEmpty.value"
+          :theme="theme"
+          :select-file-label="selectFileLabel"
+          :select-file-sub-label="selectFileSubLabel"
+          :placeholder="placeholder"
+          @open-file="uploadState.handleOpenFile"
+        />
+
+        <!-- Success State -->
+        <SuccessState
+          v-if="uploadState.isSuccess.value"
+          :theme="theme"
+          :value="value"
+          :disabled="wrapperProps.disabled"
+          :readonly="wrapperProps.readonly"
+          @preview="uploadState.handlePreview"
+          @download="handleDownloadFile"
+          @delete="uploadState.handleDeleteFile"
+        />
+      </div>
+    </div>
+  </FieldWrapper>
 </template>
 
 <script setup>

package/dist/runtime/components/Form/fileState/EmptyState.vue

@@ -1,25 +1,25 @@
 <template>
-  <div :class="theme.placeholderWrapper()">
-    <Icon
-      :name="icons.uploadIcon"
-      :class="theme.labelIcon()"
-    />
-    <div :class="theme.labelWrapper()">
-      <p
-        class="text-primary cursor-pointer font-bold"
-        @click="$emit('openFile')"
-      >
-        {{ selectFileLabel }}
-      </p>
-      <p>{{ selectFileSubLabel }}</p>
-    </div>
-    <p
-      v-if="placeholder"
-      :class="theme.placeholder()"
-    >
-      {{ placeholder }}
-    </p>
-  </div>
+  <div :class="theme.placeholderWrapper()">
+    <Icon
+      :name="icons.uploadIcon"
+      :class="theme.labelIcon()"
+    />
+    <div :class="theme.labelWrapper()">
+      <p
+        class="text-primary cursor-pointer font-bold"
+        @click="$emit('openFile')"
+      >
+        {{ selectFileLabel }}
+      </p>
+      <p>{{ selectFileSubLabel }}</p>
+    </div>
+    <p
+      v-if="placeholder"
+      :class="theme.placeholder()"
+    >
+      {{ placeholder }}
+    </p>
+  </div>
 </template>
 
 <script setup>

package/dist/runtime/components/Form/fileState/FailedState.vue

@@ -1,37 +1,37 @@
 <template>
-  <div :class="theme.onFailedWrapper()">
-    <div :class="theme.onFailedFailedImgWrapper()">
-      <Icon
-        :name="getFileIcon(selectedFile)"
-        :class="theme.onFailedFailedIconClass()"
-      />
-    </div>
-    <div :class="theme.onFailedTextWrapper()">
-      <div class="truncate">
-        <h1 class="truncate font-bold">
-          {{ selectedFile.name }}
-        </h1>
-        <p class="text-error truncate font-light">
-          {{ uploadFailedLabel }}
-        </p>
-        <Button
-          variant="link"
-          :icon="icons.actionRetryIcon"
-          :class="theme.actionRetryBtnClass()"
-          color="primary"
-          @click="$emit('retry')"
-        >
-          {{ retryLabel }}
-        </Button>
-      </div>
-      <Icon
-        :name="icons.actionDeleteIcon"
-        :class="theme.actionDeleteIconClass()"
-        title="ลบไฟล์"
-        @click="$emit('delete')"
-      />
-    </div>
-  </div>
+  <div :class="theme.onFailedWrapper()">
+    <div :class="theme.onFailedFailedImgWrapper()">
+      <Icon
+        :name="getFileIcon(selectedFile)"
+        :class="theme.onFailedFailedIconClass()"
+      />
+    </div>
+    <div :class="theme.onFailedTextWrapper()">
+      <div class="truncate">
+        <h1 class="truncate font-bold">
+          {{ selectedFile.name }}
+        </h1>
+        <p class="text-error truncate font-light">
+          {{ uploadFailedLabel }}
+        </p>
+        <Button
+          variant="link"
+          :icon="icons.actionRetryIcon"
+          :class="theme.actionRetryBtnClass()"
+          color="primary"
+          @click="$emit('retry')"
+        >
+          {{ retryLabel }}
+        </Button>
+      </div>
+      <Icon
+        :name="icons.actionDeleteIcon"
+        :class="theme.actionDeleteIconClass()"
+        title="ลบไฟล์"
+        @click="$emit('delete')"
+      />
+    </div>
+  </div>
 </template>
 
 <script setup>

package/dist/runtime/components/Form/fileState/LoadingState.vue

@@ -1,28 +1,28 @@
 <template>
-  <div :class="theme.onLoadingWrapper()">
-    <div :class="theme.onLoadingPlaceholderWrapper()">
-      <Icon
-        :name="getFileIcon(selectedFile)"
-        :class="theme.onLoadingPlaceholderIconClass()"
-      />
-    </div>
-    <div :class="theme.onLoadingTextWrapper()">
-      <div class="truncate">
-        <h1 class="truncate font-bold">
-          {{ selectedFile.name }}
-        </h1>
-        <p class="truncate font-light text-gray-400">
-          {{ getFileSize(selectedFile) }} - {{ percent }}% {{ uploadingLabel }}
-        </p>
-      </div>
-      <div>
-        <Icon
-          :name="icons.loadingIcon"
-          :class="theme.onLoadingLoadingIconClass()"
-        />
-      </div>
-    </div>
-  </div>
+  <div :class="theme.onLoadingWrapper()">
+    <div :class="theme.onLoadingPlaceholderWrapper()">
+      <Icon
+        :name="getFileIcon(selectedFile)"
+        :class="theme.onLoadingPlaceholderIconClass()"
+      />
+    </div>
+    <div :class="theme.onLoadingTextWrapper()">
+      <div class="truncate">
+        <h1 class="truncate font-bold">
+          {{ selectedFile.name }}
+        </h1>
+        <p class="truncate font-light text-gray-400">
+          {{ getFileSize(selectedFile) }} - {{ percent }}% {{ uploadingLabel }}
+        </p>
+      </div>
+      <div>
+        <Icon
+          :name="icons.loadingIcon"
+          :class="theme.onLoadingLoadingIconClass()"
+        />
+      </div>
+    </div>
+  </div>
 </template>
 
 <script setup>

package/dist/runtime/components/Form/fileState/PreviewModal.vue

@@ -1,29 +1,29 @@
 <template>
-  <Modal
-    :close="{ onClick: () => emits('close', false) }"
-    :dismissible="false"
-    :title="value?.name"
+  <Modal
+    :close="{ onClick: () => emits('close', false) }"
+    :dismissible="false"
+    :title="value?.name"
     :ui="{
   content: 'max-w-3xl'
-}"
-  >
-    <template #body>
-      <div class="flex justify-center">
-        <img
-          v-if="value && isImageFromPath(value.path)"
-          :src="value.url"
-          alt="img-preview"
-          class="max-h-96 max-w-full rounded-lg"
-        />
-        <video
-          v-else-if="value && isVideoFromPath(value.path)"
-          :src="value.url"
-          controls
-          class="max-h-96 max-w-full"
-        />
-      </div>
-    </template>
-  </Modal>
+}"
+  >
+    <template #body>
+      <div class="flex justify-center">
+        <img
+          v-if="value && isImageFromPath(value.path)"
+          :src="value.url"
+          alt="img-preview"
+          class="max-h-96 max-w-full rounded-lg"
+        />
+        <video
+          v-else-if="value && isVideoFromPath(value.path)"
+          :src="value.url"
+          controls
+          class="max-h-96 max-w-full"
+        />
+      </div>
+    </template>
+  </Modal>
 </template>
 
 <script setup>

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/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/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.35.1",
+  "version": "2.35.2",
   "repository": "https://gitlab.finema.co/finema/ui-kit",
   "license": "MIT",
   "author": "Finema Dev Core Team",
@@ -93,4 +93,4 @@
   "lint-staged": {
     "*": "eslint --fix --quiet"
   }
-}
+}