@finema/core 1.4.65 → 1.4.67

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

@@ -1,25 +1,25 @@
-<template>{{ getValue }}</template>
-<script lang="ts" setup>
-import { computed } from 'vue'
-import { type IColumn } from '#core/components/Table/types'
-import { StringHelper } from '#imports'
-
-const props = defineProps<{
-  value: any
-  row: any
-  column: IColumn<{
-    max?: number
-  }>
-}>()
-
-const getValue = computed<string>(() => {
-  const value = props.value
-  const max = props.column.props?.max
-
-  if (max) {
-    return StringHelper.truncate(value, max)
-  }
-
-  return value ?? '-'
-})
-</script>
+<template>{{ getValue }}</template>
+<script lang="ts" setup>
+import { computed } from 'vue'
+import { type IColumn } from '#core/components/Table/types'
+import { StringHelper } from '#imports'
+
+const props = defineProps<{
+  value: any
+  row: any
+  column: IColumn<{
+    max?: number
+  }>
+}>()
+
+const getValue = computed<string>(() => {
+  const value = props.value
+  const max = props.column.props?.max
+
+  if (max) {
+    return StringHelper.truncate(value, max)
+  }
+
+  return value ?? '-'
+})
+</script>

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

@@ -1,64 +1,64 @@
-<template>
-  <Base
-    v-bind="$attrs"
-    :columns="options.columns"
-    :raw-data="itemsByPage"
-    :status="options.status"
-    :page-options="pageOptions"
-    :is-simple-pagination="isShowSimplePagination"
-    :is-hide-bottom-pagination="options.isHideBottomPagination"
-    @page-change="onPageChange"
-  >
-    <template v-for="(_, slot) of $slots" #[slot]="slotProps">
-      <slot :name="slot" v-bind="slotProps || {}" />
-    </template>
-  </Base>
-</template>
-<script lang="ts" setup>
-import { computed, type PropType, ref } from 'vue'
-import { type ISimpleTableOptions } from '#core/components/Table/types'
-import Base from '#core/components/Table/Base.vue'
-import { initPageOptions } from '#core/composables/loaderPage'
-import { useCoreConfig } from '#core/composables/useConfig'
-
-const props = defineProps({
-  options: { type: Object as PropType<ISimpleTableOptions>, required: true },
-})
-
-const currentPage = ref(1)
-const coreConfig = useCoreConfig()
-const isShowSimplePagination = computed(
-  (): boolean => props.options.isSimplePagination ?? coreConfig.is_simple_pagination
-)
-
-const pageOptions = computed(() => {
-  if (!props.options?.limit) {
-    return undefined
-  }
-
-  return {
-    ...initPageOptions({
-      limit: props.options.limit,
-      primary: props.options.primary,
-    }),
-    totalCount: props.options.rawData.length,
-    totalPage: Math.ceil(props.options.rawData.length / props.options.limit),
-    currentPage: currentPage.value,
-  }
-})
-
-const onPageChange = (page: number) => {
-  currentPage.value = page
-}
-
-const itemsByPage = computed(() => {
-  if (!pageOptions.value) {
-    return props.options?.rawData
-  }
-
-  const start = (pageOptions.value.currentPage - 1) * pageOptions.value.limit
-  const end = start + pageOptions.value.limit
-
-  return props.options?.rawData.slice(start, end)
-})
-</script>
+<template>
+  <Base
+    v-bind="$attrs"
+    :columns="options.columns"
+    :raw-data="itemsByPage"
+    :status="options.status"
+    :page-options="pageOptions"
+    :is-simple-pagination="isShowSimplePagination"
+    :is-hide-bottom-pagination="options.isHideBottomPagination"
+    @page-change="onPageChange"
+  >
+    <template v-for="(_, slot) of $slots" #[slot]="slotProps">
+      <slot :name="slot" v-bind="slotProps || {}" />
+    </template>
+  </Base>
+</template>
+<script lang="ts" setup>
+import { computed, type PropType, ref } from 'vue'
+import { type ISimpleTableOptions } from '#core/components/Table/types'
+import Base from '#core/components/Table/Base.vue'
+import { initPageOptions } from '#core/composables/loaderPage'
+import { useCoreConfig } from '#core/composables/useConfig'
+
+const props = defineProps({
+  options: { type: Object as PropType<ISimpleTableOptions>, required: true },
+})
+
+const currentPage = ref(1)
+const coreConfig = useCoreConfig()
+const isShowSimplePagination = computed(
+  (): boolean => props.options.isSimplePagination ?? coreConfig.is_simple_pagination
+)
+
+const pageOptions = computed(() => {
+  if (!props.options?.limit) {
+    return undefined
+  }
+
+  return {
+    ...initPageOptions({
+      limit: props.options.limit,
+      primary: props.options.primary,
+    }),
+    totalCount: props.options.rawData.length,
+    totalPage: Math.ceil(props.options.rawData.length / props.options.limit),
+    currentPage: currentPage.value,
+  }
+})
+
+const onPageChange = (page: number) => {
+  currentPage.value = page
+}
+
+const itemsByPage = computed(() => {
+  if (!pageOptions.value) {
+    return props.options?.rawData
+  }
+
+  const start = (pageOptions.value.currentPage - 1) * pageOptions.value.limit
+  const end = start + pageOptions.value.limit
+
+  return props.options?.rawData.slice(start, end)
+})
+</script>

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

@@ -1,60 +1,60 @@
-<template>
-  <div>
-    <div v-if="options.isEnabledSearch" class="mb-4 flex justify-end">
-      <UInput
-        v-model="q"
-        icon="i-heroicons-magnifying-glass"
-        :placeholder="options.searchPlaceholder || 'ค้นหา...'"
-      />
-    </div>
-    <Base
-      v-bind="$attrs"
-      :columns="options.columns"
-      :raw-data="options.rawData"
-      :status="options.status"
-      :page-options="options.pageOptions"
-      :is-simple-pagination="isShowSimplePagination"
-      :is-hide-bottom-pagination="options.isHideBottomPagination"
-      @page-change="onPageChange"
-    >
-      <template v-for="(_, slot) of $slots" #[slot]="slotProps">
-        <slot :name="slot" v-bind="slotProps || {}" />
-      </template>
-    </Base>
-  </div>
-</template>
-<script lang="ts" setup>
-import { type PropType } from 'vue'
-import { type ITableOptions } from '#core/components/Table/types'
-import { _debounce, computed, ref, watch } from '#imports'
-import { useCoreConfig } from '#core/composables/useConfig'
-import Base from '#core/components/Table/Base.vue'
-
-const emits = defineEmits<{
-  (event: 'pageChange', page: number): void
-  (event: 'search', q: string): void
-}>()
-
-const props = defineProps({
-  options: { type: Object as PropType<ITableOptions>, required: true },
-})
-
-const coreConfig = useCoreConfig()
-
-const q = ref(props.options?.pageOptions.search ?? '')
-
-const isShowSimplePagination = computed(
-  (): boolean => props.options.isSimplePagination ?? coreConfig.is_simple_pagination
-)
-
-watch(
-  q,
-  _debounce((value) => {
-    emits('search', value)
-  }, 500)
-)
-
-const onPageChange = (page: number) => {
-  emits('pageChange', page)
-}
-</script>
+<template>
+  <div>
+    <div v-if="options.isEnabledSearch" class="mb-4 flex justify-end">
+      <UInput
+        v-model="q"
+        icon="i-heroicons-magnifying-glass"
+        :placeholder="options.searchPlaceholder || 'ค้นหา...'"
+      />
+    </div>
+    <Base
+      v-bind="$attrs"
+      :columns="options.columns"
+      :raw-data="options.rawData"
+      :status="options.status"
+      :page-options="options.pageOptions"
+      :is-simple-pagination="isShowSimplePagination"
+      :is-hide-bottom-pagination="options.isHideBottomPagination"
+      @page-change="onPageChange"
+    >
+      <template v-for="(_, slot) of $slots" #[slot]="slotProps">
+        <slot :name="slot" v-bind="slotProps || {}" />
+      </template>
+    </Base>
+  </div>
+</template>
+<script lang="ts" setup>
+import { type PropType } from 'vue'
+import { type ITableOptions } from '#core/components/Table/types'
+import { _debounce, computed, ref, watch } from '#imports'
+import { useCoreConfig } from '#core/composables/useConfig'
+import Base from '#core/components/Table/Base.vue'
+
+const emits = defineEmits<{
+  (event: 'pageChange', page: number): void
+  (event: 'search', q: string): void
+}>()
+
+const props = defineProps({
+  options: { type: Object as PropType<ITableOptions>, required: true },
+})
+
+const coreConfig = useCoreConfig()
+
+const q = ref(props.options?.pageOptions.search ?? '')
+
+const isShowSimplePagination = computed(
+  (): boolean => props.options.isSimplePagination ?? coreConfig.is_simple_pagination
+)
+
+watch(
+  q,
+  _debounce((value) => {
+    emits('search', value)
+  }, 500)
+)
+
+const onPageChange = (page: number) => {
+  emits('pageChange', page)
+}
+</script>

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

@@ -1,65 +1,64 @@
-<template>
-  <UTabs
-    v-bind="attrs"
-    :model-value="modelValue"
-    :class="$props.class"
-    :items="items"
-    :orientation="orientation"
-    :default-index="defaultIndex"
-    :ui="ui"
-    @change="change"
-  >
-    <template #default="{ item, index, selected }">
-      <slot name="default" :item="item" :index="index" :selected="selected" />
-    </template>
-
-    <template #item="{ item, index, selected }">
-      <slot name="item" :item="item" :index="index" :selected="selected" />
-    </template>
-  </UTabs>
-</template>
-
-<script setup lang="ts">
-import { useUiConfig, type PropType, useUI, toRef } from '#imports'
-import type { Strategy } from '#core/types/utils'
-import { tabs } from '#core/ui.config'
-import type { TabItem } from '#ui/types'
-
-const config = useUiConfig<typeof tabs>(tabs, 'tabs')
-
-const props = defineProps({
-  modelValue: {
-    type: Number,
-    default: undefined,
-  },
-  items: {
-    type: Array as PropType<TabItem[]>,
-    default: () => [],
-  },
-  orientation: {
-    type: String as PropType<'horizontal' | 'vertical'>,
-    default: 'horizontal',
-    validator: (value: string) => ['horizontal', 'vertical'].includes(value),
-  },
-  defaultIndex: {
-    type: Number,
-    default: 0,
-  },
-  class: {
-    type: [String, Object, Array] as PropType<any>,
-    default: () => '',
-  },
-  ui: {
-    type: Object as PropType<Partial<typeof config> & { strategy?: Strategy }>,
-    default: () => ({}),
-  },
-})
-
-const emits = defineEmits(['update:modelValue', 'change'])
-
-const change = (index: number) => {
-  emits('change', index)
-}
-
-const { ui, attrs } = useUI('tabs', toRef(props, 'ui'), config, toRef(props, 'class'))
-</script>
+<template>
+  <UTabs
+    v-bind="attrs"
+    :model-value="modelValue"
+    :class="$props.class"
+    :items="items"
+    :orientation="orientation"
+    :default-index="defaultIndex"
+    :ui="ui"
+    @change="change"
+  >
+    <template #default="{ item, index, selected }">
+      <slot name="default" :item="item" :index="index" :selected="selected" />
+    </template>
+
+    <template #item="{ item, index, selected }">
+      <slot name="item" :item="item" :index="index" :selected="selected" />
+    </template>
+  </UTabs>
+</template>
+
+<script setup lang="ts">
+import { useUiConfig, type PropType, useUI, toRef } from '#imports'
+import { tabs } from '#core/ui.config'
+import type { Strategy, TabItem } from '#ui/types'
+
+const config = useUiConfig<typeof tabs>(tabs, 'tabs')
+
+const props = defineProps({
+  modelValue: {
+    type: Number,
+    default: undefined,
+  },
+  items: {
+    type: Array as PropType<TabItem[]>,
+    default: () => [],
+  },
+  orientation: {
+    type: String as PropType<'horizontal' | 'vertical'>,
+    default: 'horizontal',
+    validator: (value: string) => ['horizontal', 'vertical'].includes(value),
+  },
+  defaultIndex: {
+    type: Number,
+    default: 0,
+  },
+  class: {
+    type: [String, Object, Array] as PropType<any>,
+    default: () => '',
+  },
+  ui: {
+    type: Object as PropType<Partial<typeof config> & { strategy?: Strategy }>,
+    default: () => ({}),
+  },
+})
+
+const emits = defineEmits(['update:modelValue', 'change'])
+
+const change = (index: number) => {
+  emits('change', index)
+}
+
+const { ui, attrs } = useUI('tabs', toRef(props, 'ui'), config, toRef(props, 'class'))
+</script>

package/dist/runtime/core.config.d.ts

@@ -1,9 +1,11 @@
 export declare const core: {
     limit_per_page: number;
     default_primary_key: string;
+    time_format: string;
     date_format: string;
     date_time_format: string;
-    time_format: string;
+    date_format_system: string;
+    date_time_format_system: string;
     is_thai_year: boolean;
     is_thai_month: boolean;
     site_name: string;

package/dist/runtime/core.config.mjs

@@ -1,9 +1,11 @@
 export const core = {
   limit_per_page: 30,
   default_primary_key: "id",
+  time_format: "HH:mm",
   date_format: "dd-MM-yyyy",
   date_time_format: "dd-MM-yyyy HH:mm",
-  time_format: "HH:mm",
+  date_format_system: "yyyy-MM-dd",
+  date_time_format_system: "yyyy-MM-dd HH:mm",
   is_thai_year: false,
   is_thai_month: false,
   site_name: "",

package/dist/runtime/ui.css

@@ -1,32 +1,32 @@
-:root {
-  --dp-font-family: inherit !important;
-}
-
-.dp__theme_light {
-  --dp-primary-color: rgb(var(--color-primary-DEFAULT)) !important;
-  --dp-primary-disabled-color: rgb(var(--color-primary-200)) !important;
-}
-
-::-webkit-scrollbar {
-  -webkit-appearance: none;
-  width: 10px;
-  height: 10px;
-}
-
-::-webkit-scrollbar-thumb {
-  border-radius: 4px;
-  background-color: rgb(0 0 0 / 30%);
-  box-shadow: 0 0 1px rgb(255 255 255 / 50%);
-}
-
-
-html,
-body,
-#__nuxt,
-#__layout,
-.root-container {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-}
-
+:root {
+  --dp-font-family: inherit !important;
+}
+
+.dp__theme_light {
+  --dp-primary-color: rgb(var(--color-primary-DEFAULT)) !important;
+  --dp-primary-disabled-color: rgb(var(--color-primary-200)) !important;
+}
+
+::-webkit-scrollbar {
+  -webkit-appearance: none;
+  width: 10px;
+  height: 10px;
+}
+
+::-webkit-scrollbar-thumb {
+  border-radius: 4px;
+  background-color: rgb(0 0 0 / 30%);
+  box-shadow: 0 0 1px rgb(255 255 255 / 50%);
+}
+
+
+html,
+body,
+#__nuxt,
+#__layout,
+.root-container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+

package/dist/runtime/utils/TimeHelper.mjs

@@ -1,8 +1,10 @@
 import { addHours, addYears, format, formatISO, isDate, isValid, parse, subHours } from "date-fns";
 import * as locales from "date-fns/locale";
 import { useCoreConfig } from "#core/composables/useConfig";
-const dateFormat = useCoreConfig().date_format;
-const dateTimeFormat = useCoreConfig().date_time_format;
+const dateFormat = useCoreConfig().date_format_system;
+const dateFormatDisplay = useCoreConfig().date_format;
+const dateTimeFormat = useCoreConfig().date_time_format_system;
+const dateTimeFormatDisplay = useCoreConfig().date_time_format;
 const timeFormat = useCoreConfig().time_format;
 const isThaiYear = useCoreConfig().is_thai_year;
 const isThaiMonth = useCoreConfig().is_thai_month;
@@ -23,7 +25,7 @@ export class TimeHelper {
       return time;
     }
     const parsedTime = isDate(time) ? time : new Date(time);
-    const newTime = TimeHelper.thaiFormat(parsedTime, dateFormat);
+    const newTime = TimeHelper.thaiFormat(parsedTime, dateFormatDisplay);
     return isValid(parsedTime) ? newTime : time;
   };
   static displayDateTime = (time) => {
@@ -31,7 +33,7 @@ export class TimeHelper {
       return time;
     }
     const parsedTime = isDate(time) ? time : new Date(time);
-    const newTime = TimeHelper.thaiFormat(parsedTime, dateTimeFormat);
+    const newTime = TimeHelper.thaiFormat(parsedTime, dateTimeFormatDisplay);
     return isValid(parsedTime) ? newTime : time;
   };
   static toUTC = (time) => {

package/dist/runtime/utils/TimeHelper.spec.mjs

@@ -4,6 +4,8 @@ vi.mock("#core/composables/useConfig", () => ({
   useCoreConfig: () => ({
     date_format: "yyyy-MM-dd",
     date_time_format: "yyyy-MM-dd HH:mm",
+    date_format_system: "yyyy-MM-dd",
+    date_time_format_system: "yyyy-MM-dd HH:mm",
     time_format: "HH:mm",
     is_thai_year: false
   })

package/package.json

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

package/dist/runtime/types/utils.d.ts

@@ -1,29 +0,0 @@
-export type Strategy = 'merge' | 'override'
-
-export type NestedKeyOf<ObjectType extends object> = {
-  [Key in keyof ObjectType]: ObjectType[Key] extends object ? NestedKeyOf<ObjectType[Key]> : Key
-}[keyof ObjectType]
-
-export type DeepPartial<T> = Partial<{
-  [P in keyof T]: DeepPartial<T[P]> | Record<string, string>
-}>
-
-type DeepKey<T, Keys extends string[]> = Keys extends [infer First, ...infer Rest]
-  ? First extends keyof T
-    ? Rest extends string[]
-      ? DeepKey<T[First], Rest>
-      : never
-    : never
-  : T
-
-export type ExtractDeepKey<T, Path extends string[]> = DeepKey<T, Path> extends infer Result
-  ? Result extends Record<string, any>
-    ? keyof Result
-    : never
-  : never
-
-export type ExtractDeepObject<T, Path extends string[]> = DeepKey<T, Path> extends infer Result
-  ? Result extends Record<string, any>
-    ? Result
-    : never
-  : never