fit2cloud-ui-plus 1.1.18 → 1.2.0

package/src/hooks/use-locale/index.ts

@@ -1,10 +1,10 @@
-import { computed, isRef, ref, unref } from 'vue'
-import { get } from 'lodash-unified'
+import {computed, isRef, ref, unref} from 'vue'
+import {get} from 'lodash-unified'
 import Chinese from '@/locale/lang/zh-cn'
-import { useGlobalConfig } from '@/hooks'
-import type { MaybeRef } from '@vueuse/core'
-import type { Ref } from 'vue'
-import type { Language } from '@/locale'
+import {useGlobalConfig} from '@/hooks'
+import type {MaybeRef} from '@vueuse/core'
+import type {Ref} from 'vue'
+import type {Language} from '@/locale'
 
 export type TranslatorOption = Record<string, string | number>
 export type Translator = (path: string, option?: TranslatorOption) => string
@@ -16,18 +16,22 @@ export type LocaleContext = {
 
 export const buildTranslator =
   (locale: MaybeRef<Language>): Translator =>
-  (path, option) =>
-    translate(path, option, unref(locale))
+    (path, option) =>
+      translate(path, option, unref(locale))
 
 export const translate = (
   path: string,
   option: undefined | TranslatorOption,
   locale: Language
-): string =>
-  (get(locale, path, path) as string).replace(
-    /\{(\w+)\}/g,
-    (_, key) => `${option?.[key] ?? `{${key}}`}`
-  )
+): string => {
+  if (!i18nHandler) {
+    return (get(locale, path, path) as string).replace(
+      /\{(\w+)\}/g,
+      (_, key) => `${option?.[key] ?? `{${key}}`}`
+    )
+  }
+  return i18nHandler(path);
+}
 
 export const buildLocaleContext = (
   locale: MaybeRef<Language>
@@ -45,3 +49,9 @@ export const useLocale = () => {
   const locale = useGlobalConfig('locale')
   return buildLocaleContext(computed(() => locale.value || Chinese))
 }
+
+let i18nHandler: Function;
+
+export const i18n = (fn: Function | undefined) => {
+  i18nHandler = fn || i18nHandler;
+};

package/src/index.ts

@@ -1,7 +1,7 @@
 import PackageJSON from "../package.json"
 
 import type {App} from 'vue'
-import {GlobalConfig, provideGlobalConfig} from "@/hooks";
+import {GlobalConfig, i18n, provideGlobalConfig} from "@/hooks";
 
 const components = import.meta.globEager('@/components/*/index.ts');
 
@@ -10,6 +10,7 @@ const install = (app: App, config: GlobalConfig): void => {
     let component = components[key].default;
     app.use(component)
   })
+  i18n(config.i18n)
   provideGlobalConfig(config)
 }
 

package/src/locale/index.ts

@@ -1,6 +1,10 @@
 export { default as en } from './lang/en'
 export { default as zhCn } from './lang/zh-cn'
 export { default as zhTw } from './lang/zh-tw'
+export { default as ja } from './lang/ja'
+export { default as ms } from './lang/ms'
+export { default as ru } from './lang/ru'
+export { default as ptBr } from './lang/pt-br'
 
 export type TranslatePair = {
   [key: string]: string | string[] | TranslatePair

package/src/locale/lang/ja.ts

@@ -0,0 +1,59 @@
+export default {
+  name: 'ja',
+  fu: {
+    filter_bar: {
+      filter: "フィルター",
+      results: "件の結果",
+      clear: "条件をクリア",
+      drawer_title: "フィルター条件",
+      cancel: "キャンセル",
+      search: "検索",
+      refresh: "リフレッシュ",
+      select_all: "すべて選択",
+      more: "もっと見る"
+    },
+    search_bar: {
+      search: "検索",
+      adv_search: "高度な検索",
+      ok: "確定",
+      cancel: "キャンセル",
+      please_select: "選択してください",
+      please_input: "入力してください",
+      like: "を含む",
+      not_like: "含まない",
+      in: "に属する",
+      not_in: "に属さない",
+      gt: "より大きい",
+      ge: "以上",
+      lt: "より小さい",
+      le: "以下",
+      eq: "等しい",
+      ne: "等しくない",
+      between: "の間",
+      select_date: '日付を選択',
+      start_date: '開始日',
+      end_date: '終了日',
+      select_date_time: '日時を選択',
+      start_date_time: '開始日時',
+      end_date_time: '終了日時',
+      range_separator: "から",
+      data_time_error: "開始日は終了日より後にすることはできません",
+      clean: "クリア",
+      refresh: "リフレッシュ",
+    },
+    table: {
+      ok: "確定",
+      cancel: "キャンセル",
+      custom_table_fields: "フィールドを選択",
+      custom_table_fields_desc: "固定フィールドは選択範囲外で、ドラッグして順序をカスタマイズできます",
+      custom_table_rows: "オプション列",
+      more: "もっと"
+    },
+    steps: {
+      cancel: "キャンセル",
+      next: "次へ",
+      prev: "前へ",
+      finish: "完了",
+    }
+  }
+}

package/src/locale/lang/ms.ts

@@ -0,0 +1,59 @@
+export default {
+  name: 'ms',
+  fu: {
+    filter_bar: {
+      filter: "Penapis",
+      results: "keputusan",
+      clear: "Kosongkan syarat",
+      drawer_title: "Syarat Penapisan",
+      cancel: "Batal",
+      search: "Cari",
+      refresh: "Segar semula",
+      select_all: "Pilih Semua",
+      more: "Lagi"
+    },
+    search_bar: {
+      search: "Cari",
+      adv_search: "Carian Lanjutan",
+      ok: "Sahkan",
+      cancel: "Batal",
+      please_select: "Sila pilih",
+      please_input: "Sila masukkan",
+      like: "Mengandungi",
+      not_like: "Tidak mengandungi",
+      in: "Termasuk dalam",
+      not_in: "Tidak termasuk dalam",
+      gt: "Lebih besar daripada",
+      ge: "Lebih besar atau sama dengan",
+      lt: "Kurang daripada",
+      le: "Kurang atau sama dengan",
+      eq: "Sama dengan",
+      ne: "Tidak sama dengan",
+      between: "Antara",
+      select_date: 'Pilih tarikh',
+      start_date: 'Tarikh mula',
+      end_date: 'Tarikh tamat',
+      select_date_time: 'Pilih tarikh dan masa',
+      start_date_time: 'Tarikh dan masa mula',
+      end_date_time: 'Tarikh dan masa tamat',
+      range_separator: "hingga",
+      data_time_error: "Tarikh mula tidak boleh lebih besar daripada tarikh tamat",
+      clean: "Kosongkan",
+      refresh: "Segar semula",
+    },
+    table: {
+      ok: "Sahkan",
+      cancel: "Batal",
+      custom_table_fields: "Suai Medan Jadual",
+      custom_table_fields_desc: "Medan tetap tidak boleh dipilih. Seret untuk menyesuaikan susunan.",
+      custom_table_rows: "Lajur Pilihan",
+      more: "Lagi"
+    },
+    steps: {
+      cancel: "Batal",
+      next: "Seterusnya",
+      prev: "Sebelumnya",
+      finish: "Selesai",
+    }
+  }
+}

package/src/locale/lang/pt-br.ts

@@ -0,0 +1,59 @@
+export default {
+  name: 'pt-br',
+  fu: {
+    filter_bar: {
+      filter: "Filtrar",
+      results: "resultados",
+      clear: "Limpar filtros",
+      drawer_title: "Filtros",
+      cancel: "Cancelar",
+      search: "Pesquisar",
+      refresh: "Atualizar",
+      select_all: "Selecionar todos",
+      more: "Mais"
+    },
+    search_bar: {
+      search: "Pesquisar",
+      adv_search: "Pesquisa avançada",
+      ok: "Confirmar",
+      cancel: "Cancelar",
+      please_select: "Selecione",
+      please_input: "Digite",
+      like: "Contém",
+      not_like: "Não contém",
+      in: "Está em",
+      not_in: "Não está em",
+      gt: "Maior que",
+      ge: "Maior ou igual a",
+      lt: "Menor que",
+      le: "Menor ou igual a",
+      eq: "Igual a",
+      ne: "Diferente de",
+      between: "Entre",
+      select_date: 'Selecionar data',
+      start_date: 'Data inicial',
+      end_date: 'Data final',
+      select_date_time: 'Selecionar data e hora',
+      start_date_time: 'Data e hora inicial',
+      end_date_time: 'Data e hora final',
+      range_separator: "até",
+      data_time_error: "A data inicial não pode ser maior que a data final",
+      clean: "Limpar",
+      refresh: "Atualizar",
+    },
+    table: {
+      ok: "Confirmar",
+      cancel: "Cancelar",
+      custom_table_fields: "Selecione o campo",
+      custom_table_fields_desc: "Campos fixos não estão disponíveis para seleção. Arraste para personalizar a ordem.",
+      custom_table_rows: "Colunas de opções",
+      more: "Mais"
+    },
+    steps: {
+      cancel: "Cancelar",
+      next: "Próximo",
+      prev: "Anterior",
+      finish: "Concluir",
+    }
+  }
+}

package/src/locale/lang/ru.ts

@@ -0,0 +1,59 @@
+export default {
+  name: 'ru',
+  fu: {
+    filter_bar: {
+      filter: "Фильтр",
+      results: "результатов",
+      clear: "Очистить условия",
+      drawer_title: "Условия фильтрации",
+      cancel: "Отмена",
+      search: "Поиск",
+      refresh: "Обновить",
+      select_all: "Выбрать все",
+      more: "Еще"
+    },
+    search_bar: {
+      search: "Поиск",
+      adv_search: "Расширенный поиск",
+      ok: "ОК",
+      cancel: "Отмена",
+      please_select: "Пожалуйста, выберите",
+      please_input: "Пожалуйста, введите",
+      like: "Содержит",
+      not_like: "Не содержит",
+      in: "Входит в",
+      not_in: "Не входит в",
+      gt: "Больше",
+      ge: "Больше или равно",
+      lt: "Меньше",
+      le: "Меньше или равно",
+      eq: "Равно",
+      ne: "Не равно",
+      between: "Между",
+      select_date: 'Выбрать дату',
+      start_date: 'Начальная дата',
+      end_date: 'Конечная дата',
+      select_date_time: 'Выбрать дату и время',
+      start_date_time: 'Начальная дата и время',
+      end_date_time: 'Конечная дата и время',
+      range_separator: "до",
+      data_time_error: "Начальная дата не может быть больше конечной",
+      clean: "Очистить",
+      refresh: "Обновить",
+    },
+    table: {
+      ok: "ОК",
+      cancel: "Отмена",
+      custom_table_fields: "Выберите поле",
+      custom_table_fields_desc: "Фиксированные поля не доступны для выбора, можно перетаскивать для изменения порядка",
+      custom_table_rows: "Столбцы с опциями",
+      more: "Еще"
+    },
+    steps: {
+      cancel: "Отмена",
+      next: "Следующий шаг",
+      prev: "Предыдущий шаг",
+      finish: "Завершить",
+    }
+  }
+}

package/src/locale/lang/zh-cn.ts

@@ -44,7 +44,7 @@ export default {
     table: {
       ok: "确定",
       cancel: "取消",
-      custom_table_fields: "自定义表格字段",
+      custom_table_fields: "选择字段",
       custom_table_fields_desc: "固定字段不在选择范围，可拖拽自定义顺序",
       custom_table_rows: "选项列",
       more: "更多"

package/src/locale/lang/zh-tw.ts

@@ -44,7 +44,7 @@ export default {
     table: {
       ok: "確定",
       cancel: "取消",
-      custom_table_fields: "自定義表格字段",
+      custom_table_fields: "選項字段",
       custom_table_fields_desc: "固定欄位不在選擇範圍，可拖拽自定義順序",
       custom_table_rows: "選項列",
       more: "更多"

package/src/styles/components/filter-bar.scss

@@ -76,11 +76,13 @@
     font-size: 14px;
     line-height: 22px;
     height: 22px;
-    min-width: 76px;
-    max-width: 76px;
     color: var(--fu-filter-bar-color);
     cursor: pointer;
     margin-left: 6px;
+
+    & > i.el-icon {
+      margin-right: 4px;
+    }
   }
 
   @include e(drawer) {