From f1f3c18eba2d0a342fb686d0fa8e12ff796f770c Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Mon, 15 Apr 2024 16:36:58 +0800
Subject: [PATCH 1/8] =?UTF-8?q?feat(locale):=20=E6=94=AF=E6=8C=81=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/_utils/helper.ts      |  2 +-
 .../src/config-provider/OConfigProvider.vue   | 17 +++++
 .../__demo__/ConfigProviderBasic.vue          | 63 ++++++++++++++++
 .../src/config-provider/__demo__/TheChild.vue | 11 +++
 .../src/config-provider/__demo__/TheIndex.vue |  9 +++
 .../opendesign/src/config-provider/index.ts   | 13 ++++
 .../opendesign/src/config-provider/provide.ts |  6 ++
 .../opendesign/src/config-provider/types.ts   | 13 ++++
 packages/opendesign/src/locale/index.ts       | 73 +++++++++++++++++++
 packages/opendesign/src/locale/lang/en-us.ts  |  9 +++
 packages/opendesign/src/locale/lang/zh-cn.ts  |  9 +++
 packages/opendesign/src/locale/types.ts       | 10 +++
 packages/portal/src/router.ts                 |  8 +-
 13 files changed, 241 insertions(+), 2 deletions(-)
 create mode 100644 packages/opendesign/src/config-provider/OConfigProvider.vue
 create mode 100644 packages/opendesign/src/config-provider/__demo__/ConfigProviderBasic.vue
 create mode 100644 packages/opendesign/src/config-provider/__demo__/TheChild.vue
 create mode 100644 packages/opendesign/src/config-provider/__demo__/TheIndex.vue
 create mode 100644 packages/opendesign/src/config-provider/index.ts
 create mode 100644 packages/opendesign/src/config-provider/provide.ts
 create mode 100644 packages/opendesign/src/config-provider/types.ts
 create mode 100644 packages/opendesign/src/locale/index.ts
 create mode 100644 packages/opendesign/src/locale/lang/en-us.ts
 create mode 100644 packages/opendesign/src/locale/lang/zh-cn.ts
 create mode 100644 packages/opendesign/src/locale/types.ts

diff --git a/packages/opendesign/src/_utils/helper.ts b/packages/opendesign/src/_utils/helper.ts
index a11baebf..ba3f9581 100644
--- a/packages/opendesign/src/_utils/helper.ts
+++ b/packages/opendesign/src/_utils/helper.ts
@@ -131,7 +131,7 @@ export function getValueByPath(obj: object, path: string) {
     return;
   }
 
-  let temp = obj;
+  let temp: any = obj;
   for (let i = 0; i < keys.length; i++) {
     if (!isObject(temp)) {
       return;
diff --git a/packages/opendesign/src/config-provider/OConfigProvider.vue b/packages/opendesign/src/config-provider/OConfigProvider.vue
new file mode 100644
index 00000000..d1269bd3
--- /dev/null
+++ b/packages/opendesign/src/config-provider/OConfigProvider.vue
@@ -0,0 +1,17 @@
+<script setup lang="ts">
+import { provide, reactive, toRefs } from 'vue';
+import { configProviderProps } from './types';
+import { configProviderInjectKey } from './provide';
+
+const props = defineProps(configProviderProps);
+
+const { locale } = toRefs(props);
+
+const globalConfig = reactive({
+  locale,
+});
+provide(configProviderInjectKey, globalConfig);
+</script>
+<template>
+  <slot></slot>
+</template>
diff --git a/packages/opendesign/src/config-provider/__demo__/ConfigProviderBasic.vue b/packages/opendesign/src/config-provider/__demo__/ConfigProviderBasic.vue
new file mode 100644
index 00000000..d28861d4
--- /dev/null
+++ b/packages/opendesign/src/config-provider/__demo__/ConfigProviderBasic.vue
@@ -0,0 +1,63 @@
+<script setup lang="ts">
+import { ref } from 'vue';
+import { OButton } from '../../button';
+import '../../button/style';
+import { OConfigProvider } from '../index';
+import TheChild from './TheChild.vue';
+import { useLocale, addLocale } from '../../locale';
+
+const langes = {
+  jp: {
+    locale: 'ja-JP',
+    pagination: {
+      goto: '移動',
+      page: 'ページ',
+      countPerPage: '件/ページ',
+      total: '総計 {0} 件',
+    },
+  },
+  en: {
+    locale: 'en-US',
+    pagination: {
+      goto: 'go to',
+      page: 'Page',
+      countPerPage: ' / Page',
+      total: 'Total: {0} {2} {1}',
+    },
+  },
+};
+
+const locale = ref(langes.en);
+
+const select = (lang) => {
+  locale.value = langes[lang];
+};
+
+addLocale(langes);
+
+const setLocale = (lang) => {
+  useLocale(lang);
+};
+</script>
+<template>
+  <h4>&lt;OConfigProvider /&gt;全局配置</h4>
+  <section>
+    <OButton @click="select('zh')">zh-CN</OButton>
+    <OButton @click="select('en')">en-US</OButton>
+    <OButton @click="select('jp')">ja-JP</OButton>
+  </section>
+  <section style="align-items: flex-start">
+    <OConfigProvider :locale="locale"> <TheChild /> </OConfigProvider>
+  </section>
+
+  <h4>JS动态配置</h4>
+  <section>
+    <OButton @click="setLocale('zh-CN')">zh-CN</OButton>
+    <OButton @click="setLocale('en')">en-US</OButton>
+    <OButton @click="setLocale('jp')">ja-JP</OButton>
+  </section>
+  <section style="align-items: flex-start">
+    <TheChild />
+  </section>
+</template>
+<style lang="scss"></style>
diff --git a/packages/opendesign/src/config-provider/__demo__/TheChild.vue b/packages/opendesign/src/config-provider/__demo__/TheChild.vue
new file mode 100644
index 00000000..5b5ad218
--- /dev/null
+++ b/packages/opendesign/src/config-provider/__demo__/TheChild.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+import { useI18n } from '../../locale';
+
+const { t, locale } = useI18n();
+</script>
+<template>
+  <div>locale: {{ locale }}</div>
+  <div>pagination.goto: {{ t('pagination.goto') }}</div>
+  <div>pagination.total: {{ t('pagination.total', 100, 1, 2) }}</div>
+</template>
+<style lang="scss"></style>
diff --git a/packages/opendesign/src/config-provider/__demo__/TheIndex.vue b/packages/opendesign/src/config-provider/__demo__/TheIndex.vue
new file mode 100644
index 00000000..a6286ff0
--- /dev/null
+++ b/packages/opendesign/src/config-provider/__demo__/TheIndex.vue
@@ -0,0 +1,9 @@
+<script setup lang="ts">
+import ConfigProviderBasic from './ConfigProviderBasic.vue';
+</script>
+<template>
+  <div class="page-demo">
+    <ConfigProviderBasic />
+  </div>
+</template>
+<style lang="scss"></style>
diff --git a/packages/opendesign/src/config-provider/index.ts b/packages/opendesign/src/config-provider/index.ts
new file mode 100644
index 00000000..e1cbc754
--- /dev/null
+++ b/packages/opendesign/src/config-provider/index.ts
@@ -0,0 +1,13 @@
+import _OConfigProvider from './OConfigProvider.vue';
+import type { App } from 'vue';
+
+const OConfigProvider = Object.assign(_OConfigProvider, {
+  install(app: App) {
+    app.component(_OConfigProvider.name, _OConfigProvider);
+  },
+});
+
+export { OConfigProvider };
+
+export * from './types';
+export * from './provide';
diff --git a/packages/opendesign/src/config-provider/provide.ts b/packages/opendesign/src/config-provider/provide.ts
new file mode 100644
index 00000000..85443e1d
--- /dev/null
+++ b/packages/opendesign/src/config-provider/provide.ts
@@ -0,0 +1,6 @@
+import { InjectionKey } from 'vue';
+import { LanguageT } from '../locale/types';
+
+export const configProviderInjectKey: InjectionKey<{
+  locale?: LanguageT;
+}> = Symbol('provide-config-provider');
diff --git a/packages/opendesign/src/config-provider/types.ts b/packages/opendesign/src/config-provider/types.ts
new file mode 100644
index 00000000..92e4ae15
--- /dev/null
+++ b/packages/opendesign/src/config-provider/types.ts
@@ -0,0 +1,13 @@
+import { LanguageT } from '../locale/types';
+import { ExtractPropTypes, PropType } from 'vue';
+
+export const configProviderProps = {
+  /**
+   * 语言词条
+   */
+  locale: {
+    type: Object as PropType<LanguageT>,
+  },
+};
+
+export type ConfigProviderPropsT = ExtractPropTypes<typeof configProviderProps>;
diff --git a/packages/opendesign/src/locale/index.ts b/packages/opendesign/src/locale/index.ts
new file mode 100644
index 00000000..597b7114
--- /dev/null
+++ b/packages/opendesign/src/locale/index.ts
@@ -0,0 +1,73 @@
+import { logger } from '../_utils/log';
+import { getValueByPath } from '../_utils/helper';
+import { isString } from '../_utils/is';
+import { configProviderInjectKey } from '../config-provider';
+import { computed, inject, ref } from 'vue';
+import zhCN from './lang/zh-cn';
+import { LanguageT, i18nLanguages } from './types';
+
+const currentLocal = ref('zh-CN');
+const i18nLanguage = ref<Record<string, LanguageT>>({
+  'zh-CN': zhCN,
+});
+
+/**
+ * 添加语言包
+ * @param locale 语言包
+ * @param opts 配置
+ */
+export function addLocale(
+  locale: i18nLanguages,
+  opts?: {
+    overwrite?: boolean;
+  }
+) {
+  Object.keys(locale).forEach((key) => {
+    if (!i18nLanguage.value[key] || opts?.overwrite) {
+      i18nLanguage.value[key] = locale[key];
+    }
+  });
+}
+
+/**
+ * 使用语言包
+ * @param localeKey
+ * @returns
+ */
+export function useLocale(localeKey: string) {
+  if (!i18nLanguage.value[localeKey]) {
+    logger.warn(`no ${localeKey} languages found`);
+    return;
+  }
+  currentLocal.value = localeKey;
+}
+
+export function useI18n() {
+  const configProvider = inject(configProviderInjectKey, {});
+  const languages = computed(() => {
+    return configProvider.locale ?? i18nLanguage.value[currentLocal.value];
+  });
+  const locale = computed(() => languages.value.locale);
+
+  const transform = (key: string, ...args: string[]): string => {
+    if (!languages.value) {
+      logger.warn('no languages configed');
+      return '';
+    }
+    const value = getValueByPath(languages.value, key);
+
+    // 处理变量替换
+    if (args.length > 0 && isString(value)) {
+      return value.replace(/{(\d+)}/g, (match, index) => {
+        return args[index] ?? match;
+      });
+    }
+
+    return value;
+  };
+
+  return {
+    locale,
+    t: transform,
+  };
+}
diff --git a/packages/opendesign/src/locale/lang/en-us.ts b/packages/opendesign/src/locale/lang/en-us.ts
new file mode 100644
index 00000000..1c418ae6
--- /dev/null
+++ b/packages/opendesign/src/locale/lang/en-us.ts
@@ -0,0 +1,9 @@
+export default {
+  locale: 'en-US',
+  pagination: {
+    goto: 'Goto',
+    page: 'Page',
+    countPerPage: ' / Page',
+    total: 'Total: {0}',
+  },
+};
diff --git a/packages/opendesign/src/locale/lang/zh-cn.ts b/packages/opendesign/src/locale/lang/zh-cn.ts
new file mode 100644
index 00000000..25278f3c
--- /dev/null
+++ b/packages/opendesign/src/locale/lang/zh-cn.ts
@@ -0,0 +1,9 @@
+export default {
+  locale: 'zh-CN',
+  pagination: {
+    goto: '前往',
+    page: '页',
+    countPerPage: '条/页',
+    total: '共 {0} 条',
+  },
+};
diff --git a/packages/opendesign/src/locale/types.ts b/packages/opendesign/src/locale/types.ts
new file mode 100644
index 00000000..aa424ed5
--- /dev/null
+++ b/packages/opendesign/src/locale/types.ts
@@ -0,0 +1,10 @@
+export interface LanguageT {
+  locale: string;
+  pagination: {
+    goto: string;
+    page: string;
+    countPerPage: string;
+    total: string;
+  };
+}
+export type i18nLanguages = Record<string, LanguageT>;
diff --git a/packages/portal/src/router.ts b/packages/portal/src/router.ts
index fcd6c9c7..66b71718 100644
--- a/packages/portal/src/router.ts
+++ b/packages/portal/src/router.ts
@@ -1,4 +1,4 @@
-import { createRouter, createWebHashHistory, createWebHistory } from 'vue-router';
+import { createRouter, createWebHistory } from 'vue-router';
 import TheHome from './pages/TheHome.vue';
 
 export const routes = [
@@ -8,6 +8,12 @@ export const routes = [
     label: '通用',
     component: TheHome,
   },
+  {
+    path: '/config-provider',
+    name: 'config-provider',
+    label: '全局配置 config-provider',
+    component: () => import('@components/config-provider/__demo__/TheIndex.vue'),
+  },
   // {
   //   path: '/date-picker',
   //   name: 'DatePicker',
-- 
Gitee


From 6459655e3482a54134e7a98ac350f05ae248db26 Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Mon, 15 Apr 2024 16:45:01 +0800
Subject: [PATCH 2/8] =?UTF-8?q?fix(useTheme):=20=E4=BF=AE=E5=A4=8DuseTheme?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E7=B1=BB=E5=9E=8B=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/hooks/use-theme.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/opendesign/src/hooks/use-theme.ts b/packages/opendesign/src/hooks/use-theme.ts
index a93c27e5..bd0765d8 100644
--- a/packages/opendesign/src/hooks/use-theme.ts
+++ b/packages/opendesign/src/hooks/use-theme.ts
@@ -6,7 +6,7 @@ const THEME_KEY = '__theme__';
 export function useTheme(defaultTheme: string = 'light') {
   if (!isClient) {
     return {
-      theme: defaultTheme,
+      theme: ref(defaultTheme),
     };
   }
   const currentTheme = ref<string>(localStorage.getItem(THEME_KEY) || defaultTheme);
-- 
Gitee


From d61feeaa6ee0f5e8640214a215e89733b23c23e4 Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Mon, 15 Apr 2024 16:57:04 +0800
Subject: [PATCH 3/8] =?UTF-8?q?feat(i18n):=20=E5=A2=9E=E5=8A=A0=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/index.ts             |  2 ++
 packages/opendesign/src/locale/index.ts      |  2 +-
 packages/portal/src/components/TheHeader.vue | 35 +++++++++++++++++++-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/packages/opendesign/src/index.ts b/packages/opendesign/src/index.ts
index 6a8ce2b2..70146cf8 100644
--- a/packages/opendesign/src/index.ts
+++ b/packages/opendesign/src/index.ts
@@ -2,6 +2,8 @@ export * from './_utils/export';
 export * from './hooks';
 export * from './directves';
 
+export * from './locale';
+
 export * from './icon';
 export * from './icon-components';
 export * from './button';
diff --git a/packages/opendesign/src/locale/index.ts b/packages/opendesign/src/locale/index.ts
index 597b7114..d9e70907 100644
--- a/packages/opendesign/src/locale/index.ts
+++ b/packages/opendesign/src/locale/index.ts
@@ -45,7 +45,7 @@ export function useLocale(localeKey: string) {
 export function useI18n() {
   const configProvider = inject(configProviderInjectKey, {});
   const languages = computed(() => {
-    return configProvider.locale ?? i18nLanguage.value[currentLocal.value];
+    return configProvider?.locale ?? i18nLanguage.value[currentLocal.value];
   });
   const locale = computed(() => languages.value.locale);
 
diff --git a/packages/portal/src/components/TheHeader.vue b/packages/portal/src/components/TheHeader.vue
index 29782504..d71cb0ff 100644
--- a/packages/portal/src/components/TheHeader.vue
+++ b/packages/portal/src/components/TheHeader.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import { computed, watchEffect } from 'vue';
-import { initIconLoading, initRound, initSize, ODropdown, ODropdownItem } from '@opensig/opendesign/src';
+import { initIconLoading, initRound, initSize, ODropdown, ODropdownItem, useLocale, addLocale, useI18n } from '@opensig/opendesign/src';
 import { OIconAdd } from '@opensig/opendesign/src/icon-components';
+import enUS from '@opensig/opendesign/src/locale/lang/en-us';
 
 import '../../../opendesign/src/dropdown/style';
 
@@ -56,6 +57,30 @@ const globalSetting = () => {
   initIconLoading(OIconAdd);
   initSize('large');
 };
+
+const locales = [
+  {
+    value: 'zh-CN',
+    label: '中文',
+  },
+  {
+    value: 'en-US',
+    label: 'English',
+  },
+];
+
+addLocale({
+  'en-US': enUS,
+});
+
+const { locale } = useI18n();
+const currentLocale = computed(() => {
+  const rlt = locales.find((item) => item.value === locale.value);
+  return rlt || locales[0];
+});
+const changeLocale = (l: (typeof locales)[0]) => {
+  useLocale(l.value);
+};
 </script>
 <template>
   <div class="the-header">
@@ -74,6 +99,14 @@ const globalSetting = () => {
           </template>
         </ODropdown>
       </div>
+      <div class="tool-item">
+        <ODropdown>
+          {{ currentLocale?.label }}
+          <template #dropdown>
+            <ODropdownItem v-for="item in locales" :key="item.value" :label="item.label" :value="item.value" @click="changeLocale(item)" />
+          </template>
+        </ODropdown>
+      </div>
       <!-- <div class="tool-item" @click="changeStyle">
         <svg v-if="currentStyle === 'light'" version="1.1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 32 32">
           <path
-- 
Gitee


From c0adc9935ddcb540bf1676baf2a5010a601f1b03 Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Mon, 15 Apr 2024 17:40:40 +0800
Subject: [PATCH 4/8] =?UTF-8?q?feat(i18n/pagination):=20pagination?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/locale/index.ts       |  2 +-
 packages/opendesign/src/option/OOption.vue    | 30 +++++++++----------
 .../opendesign/src/pagination/OPagination.vue | 18 +++++------
 .../opendesign/src/pagination/pagination.ts   |  4 +--
 packages/opendesign/src/select/OSelect.vue    |  2 +-
 5 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/packages/opendesign/src/locale/index.ts b/packages/opendesign/src/locale/index.ts
index d9e70907..b5893bf3 100644
--- a/packages/opendesign/src/locale/index.ts
+++ b/packages/opendesign/src/locale/index.ts
@@ -49,7 +49,7 @@ export function useI18n() {
   });
   const locale = computed(() => languages.value.locale);
 
-  const transform = (key: string, ...args: string[]): string => {
+  const transform = (key: string, ...args: any[]): string => {
     if (!languages.value) {
       logger.warn('no languages configed');
       return '';
diff --git a/packages/opendesign/src/option/OOption.vue b/packages/opendesign/src/option/OOption.vue
index b660efcf..7fc640dd 100644
--- a/packages/opendesign/src/option/OOption.vue
+++ b/packages/opendesign/src/option/OOption.vue
@@ -1,11 +1,14 @@
 <script setup lang="ts">
-import { computed, inject, ref, watchEffect } from 'vue';
+import { computed, inject, ref, toRefs, watchEffect } from 'vue';
 import { selectOptionInjectKey } from '../select/provide';
 import { optionProps } from './types';
 import { OCheckbox } from '../checkbox';
 
 const props = defineProps(optionProps);
 
+// label增加响应式，用于支持国际化切换语言
+const { label, value } = toRefs(props);
+
 const selectInject = inject(selectOptionInjectKey, null);
 
 const isMultiple = selectInject?.multiple;
@@ -16,28 +19,25 @@ const currentVal = computed(() => {
 
 const isActive = ref(false);
 watchEffect(() => {
-  const old = isActive.value;
-  isActive.value = !!currentVal.value?.includes(props.value);
+  isActive.value = !!currentVal.value?.includes(value.value);
 
-  if (isActive.value && old !== isActive.value) {
-    // 初始化select的值、相应modelValue变化
+  // 初始化select的值、相应modelValue变化
 
-    selectInject?.select(
-      {
-        label: props.label || `${props.value}`,
-        value: props.value,
-      },
-      false
-    );
-  }
+  selectInject?.select(
+    {
+      label: label.value || `${value.value}`,
+      value: value.value,
+    },
+    false
+  );
 });
 
 const clickOption = () => {
   if (!props.disabled) {
     selectInject?.select(
       {
-        label: props.label || `${props.value}`,
-        value: props.value,
+        label: label.value || `${value.value}`,
+        value: value.value,
       },
       true
     );
diff --git a/packages/opendesign/src/pagination/OPagination.vue b/packages/opendesign/src/pagination/OPagination.vue
index 1785b4e3..42ad5487 100644
--- a/packages/opendesign/src/pagination/OPagination.vue
+++ b/packages/opendesign/src/pagination/OPagination.vue
@@ -10,6 +10,7 @@ import { paginationProps } from './types';
 import { getRoundClass } from '../_utils/style-class';
 import { OIcon } from '../icon';
 import { OOptionList } from '../option';
+import { useI18n } from '../locale';
 
 const props = defineProps(paginationProps);
 
@@ -21,21 +22,18 @@ const emits = defineEmits<{
   (e: 'change', value: { page: number; pageSize: number }): void;
 }>();
 
-const Labels = {
-  total: '总条数:',
-  goto: '前往',
-  page: '页',
-  sizeLabel: '条/页',
-};
+const { t } = useI18n();
 
 const simpleLayout = ['pager'];
 
 let currentPageSize = ref(props.pageSize || props.pageSizes[0]);
 let currentPage = ref(Math.round(props.page));
 
-const pageSizeList = getSizeOptions(currentPageSize.value, Labels.sizeLabel, props.pageSizes);
+const pageSizeList = computed(() => {
+  return getSizeOptions(currentPageSize.value, props.pageSizes, t('pagination.countPerPage'));
+});
 
-const defaultSizeLabel = currentPageSize.value + Labels.sizeLabel;
+const defaultSizeLabel = computed(() => currentPageSize.value + t('pagination.countPerPage'));
 
 const layout = computed(() => {
   return props.simple ? simpleLayout : props.layout;
@@ -143,7 +141,7 @@ defineExpose({
   <div class="o-pagination" :class="[`o-pagination-${props.variant}`, round.class.value]" :style="round.style.value">
     <div class="o-pagination-wrap">
       <!-- total -->
-      <div v-if="layout.includes('total') || $props.showTotal" class="o-pagination-total">{{ Labels.total }}&nbsp;{{ props.total }}</div>
+      <div v-if="layout.includes('total') || $props.showTotal" class="o-pagination-total">{{ t('pagination.total', props.total) }}</div>
       <!-- sizes -->
       <template v-if="layout.includes('pagesize')">
         <div class="o-pagination-size">
@@ -233,7 +231,7 @@ defineExpose({
       <!-- jumper -->
       <template v-if="layout.includes('jumper')">
         <div class="o-pagination-goto">
-          <span>{{ Labels.goto }}</span>
+          <span>{{ t('pagination.goto') }}</span>
           <OInputNumber
             :model-value="currentPage"
             class="o-pagination-input"
diff --git a/packages/opendesign/src/pagination/pagination.ts b/packages/opendesign/src/pagination/pagination.ts
index af78770b..64af3e3f 100644
--- a/packages/opendesign/src/pagination/pagination.ts
+++ b/packages/opendesign/src/pagination/pagination.ts
@@ -9,7 +9,7 @@ export function getPagerList(totalPage: number, currentPage = 1, showPageCount =
   const activePage = currentPage > totalPage ? totalPage : currentPage;
 
   const maxCount = showPageCount > 3 ? showPageCount : 3;
-  let pages: Array<{ value: number | 'left' | 'right'; isMore?: boolean; list?: number[] }> = [];
+  const pages: Array<{ value: number | 'left' | 'right'; isMore?: boolean; list?: number[] }> = [];
 
   /**
    * 如果页码小于最大显示页码数，直接显示全部
@@ -87,7 +87,7 @@ export function getPagerList(totalPage: number, currentPage = 1, showPageCount =
 export type PagerListT = ReturnType<typeof getPagerList>;
 export type PagerItemT = PagerListT[0];
 
-export function getSizeOptions(currentPageSize: number, sufix: string, pageSizes: number[]) {
+export function getSizeOptions(currentPageSize: number, pageSizes: number[], sufix: string) {
   return pageSizes.map((item) => ({
     label: item + sufix,
     value: item,
diff --git a/packages/opendesign/src/select/OSelect.vue b/packages/opendesign/src/select/OSelect.vue
index 79fe6811..2ef41b51 100644
--- a/packages/opendesign/src/select/OSelect.vue
+++ b/packages/opendesign/src/select/OSelect.vue
@@ -210,7 +210,7 @@ provide(selectOptionInjectKey, {
         }
       }
     } else {
-      if (!optionLabels.value[option.value]) {
+      if (optionLabels.value[option.value] !== option.label) {
         optionLabels.value[option.value] = option.label;
       }
     }
-- 
Gitee


From 0c03f39e6edbea954c222b167fd897a631f3841d Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Mon, 15 Apr 2024 17:43:23 +0800
Subject: [PATCH 5/8] =?UTF-8?q?feat(i18n):=20placeholder=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/cascader/types.ts    | 1 -
 packages/opendesign/src/date-picker/types.ts | 1 -
 packages/opendesign/src/select/types.ts      | 1 -
 packages/opendesign/src/textarea/types.ts    | 1 -
 4 files changed, 4 deletions(-)

diff --git a/packages/opendesign/src/cascader/types.ts b/packages/opendesign/src/cascader/types.ts
index a3388996..27b2006e 100644
--- a/packages/opendesign/src/cascader/types.ts
+++ b/packages/opendesign/src/cascader/types.ts
@@ -52,7 +52,6 @@ export const cascaderProps = {
    */
   placeholder: {
     type: String,
-    default: 'please select...',
   },
   /**
    * 下拉选项触发方式 PopupTriggerT
diff --git a/packages/opendesign/src/date-picker/types.ts b/packages/opendesign/src/date-picker/types.ts
index 06cb213f..f85c8ae4 100644
--- a/packages/opendesign/src/date-picker/types.ts
+++ b/packages/opendesign/src/date-picker/types.ts
@@ -89,7 +89,6 @@ const commonPickerProps = {
    */
   placeholder: {
     type: String,
-    default: '',
   },
   /**
    * 是否禁用
diff --git a/packages/opendesign/src/select/types.ts b/packages/opendesign/src/select/types.ts
index 6df64c81..bed3aec4 100644
--- a/packages/opendesign/src/select/types.ts
+++ b/packages/opendesign/src/select/types.ts
@@ -57,7 +57,6 @@ export const selectProps = {
    */
   placeholder: {
     type: String,
-    default: 'please select...',
   },
   /**
    * 是否支持多选
diff --git a/packages/opendesign/src/textarea/types.ts b/packages/opendesign/src/textarea/types.ts
index 77554923..9b228a07 100644
--- a/packages/opendesign/src/textarea/types.ts
+++ b/packages/opendesign/src/textarea/types.ts
@@ -49,7 +49,6 @@ export const textareaProps = {
    */
   placeholder: {
     type: String,
-    default: '',
   },
   /**
    * 是否禁用
-- 
Gitee


From 67acec88ad7080d17e9236e9a6c26f8c865b826c Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Tue, 16 Apr 2024 12:05:43 +0800
Subject: [PATCH 6/8] =?UTF-8?q?feat(i18n/upload):=20upload=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/locale/lang/en-us.ts  |  9 ++++
 packages/opendesign/src/locale/lang/zh-cn.ts  |  9 ++++
 packages/opendesign/src/upload/OUpload.vue    |  8 +++-
 packages/opendesign/src/upload/UploadItem.vue | 48 +++++++++++++++----
 .../opendesign/src/upload/UploadSelect.vue    | 10 ++--
 .../src/upload/__demo__/UploadBasic.vue       |  1 -
 .../opendesign/src/upload/style/style.scss    |  4 +-
 packages/opendesign/src/upload/types.ts       |  6 +++
 packages/opendesign/src/upload/util.ts        |  6 ---
 9 files changed, 78 insertions(+), 23 deletions(-)

diff --git a/packages/opendesign/src/locale/lang/en-us.ts b/packages/opendesign/src/locale/lang/en-us.ts
index 1c418ae6..19e6a1b3 100644
--- a/packages/opendesign/src/locale/lang/en-us.ts
+++ b/packages/opendesign/src/locale/lang/en-us.ts
@@ -6,4 +6,13 @@ export default {
     countPerPage: ' / Page',
     total: 'Total: {0}',
   },
+  upload: {
+    buttonLabel: 'Upload',
+    drag: 'Click or drag file to this area to upload',
+    dragHover: 'Release to upload',
+    retry: 'Click to retry',
+    delete: 'Delete',
+    preview: 'Preview',
+    edit: 'Edit',
+  },
 };
diff --git a/packages/opendesign/src/locale/lang/zh-cn.ts b/packages/opendesign/src/locale/lang/zh-cn.ts
index 25278f3c..0f098d14 100644
--- a/packages/opendesign/src/locale/lang/zh-cn.ts
+++ b/packages/opendesign/src/locale/lang/zh-cn.ts
@@ -6,4 +6,13 @@ export default {
     countPerPage: '条/页',
     total: '共 {0} 条',
   },
+  upload: {
+    buttonLabel: '点击上传',
+    drag: '点击或拖拽文件到此处上传',
+    dragHover: '释放文件并开始上传',
+    retry: '点击重试',
+    delete: '删除',
+    preview: '预览',
+    edit: '编辑',
+  },
 };
diff --git a/packages/opendesign/src/upload/OUpload.vue b/packages/opendesign/src/upload/OUpload.vue
index 1e2d8394..c73c5f68 100644
--- a/packages/opendesign/src/upload/OUpload.vue
+++ b/packages/opendesign/src/upload/OUpload.vue
@@ -5,11 +5,12 @@ import { isArray, isFunction } from '../_utils/is';
 import { filterSlots } from '../_utils/vue-utils';
 import UploadItem from './UploadItem.vue';
 import slot from './slot';
-import { UploadLabel, doUploadFileList, doUploadFile, generateImageDataUrl, isPictureType } from './util';
+import { doUploadFileList, doUploadFile, generateImageDataUrl, isPictureType } from './util';
 import UploadSelect from './UploadSelect.vue';
 import { IconAdd } from '../_utils/icons';
 import InputSelect from './InputSelect.vue';
 import { formItemInjectKey } from '../form/provide';
+import { useI18n } from '../locale';
 
 const props = defineProps(uploadProps);
 const emits = defineEmits<{
@@ -25,6 +26,8 @@ const emitUpdateValue = (value: UploadFileT[]) => {
   emits('update:modelValue', value);
 };
 
+const { t } = useI18n();
+
 const fileList = ref<UploadFileT[]>(props.modelValue ?? props.defaultFileList ?? []);
 watch(
   () => props.modelValue,
@@ -234,6 +237,7 @@ defineExpose({
         :draggable="props.draggable"
         :btn-label="props.btnLabel"
         :drag-label="props.dragLabel"
+        :drag-hover-label="props.dragHoverLabel"
         :btn-props="props.btnProps"
         @to-select="doSelect"
         @selected="onFileSelected"
@@ -279,7 +283,7 @@ defineExpose({
             <IconAdd class="o-upload-card-add-icon" />
             <div class="o-upload-card-label">
               <slot name="select-add-label">
-                {{ props.btnLabel ?? UploadLabel.btnLabel }}
+                {{ props.btnLabel ?? t('upload.buttonLabel') }}
               </slot>
             </div>
           </slot>
diff --git a/packages/opendesign/src/upload/UploadItem.vue b/packages/opendesign/src/upload/UploadItem.vue
index f0bb68bc..45fb64eb 100644
--- a/packages/opendesign/src/upload/UploadItem.vue
+++ b/packages/opendesign/src/upload/UploadItem.vue
@@ -1,11 +1,11 @@
-
 <script setup lang="ts">
 import { IconLoading, IconLinkPrefix, IconRefresh, IconDelete, IconPreview, IconFile, IconEdit } from '../_utils/icons';
 import { UploadFileT, UploadListTypeT } from './types';
 import { OIcon } from '../icon';
 import { OFigure } from '../figure';
 import { ref } from 'vue';
-import slots  from './slot';
+import slots from './slot';
+import { useI18n } from '../locale';
 
 interface UploadFileItemPropsT {
   file: UploadFileT;
@@ -20,6 +20,8 @@ const emits = defineEmits<{
   (e: 'retry', file: UploadFileT): void;
 }>();
 
+const { t } = useI18n();
+
 const onFileRemove = (file: UploadFileT) => {
   emits('remove', file);
 };
@@ -74,11 +76,34 @@ const onPreview = () => {
               'is-show': showLoading(props.file),
             }"
           >
-            <IconRefresh v-if="props.file.retry" class="o-upload-icon-btn o-upload-icon-retry" @click="onFileUploadRetry(props.file)" />
-            <IconPreview v-if="props.file.status !== 'failed'" class="o-upload-icon-btn o-upload-icon-preview" @click="onPreview" />
-            <IconLoading v-if="showLoading(props.file)" class="o-rotating" />
-            <IconEdit v-if="props.file.status === 'finished'" class="o-upload-icon-btn o-upload-icon-edit" @click="onFileReplace(props.file)" />
-            <IconDelete class="o-upload-icon-btn o-upload-icon-remove" @click="onFileRemove(props.file)" />
+            <OIcon
+              v-if="props.file.retry"
+              button
+              class="o-upload-icon-btn o-upload-icon-retry"
+              :icon="IconRefresh"
+              @click="onFileUploadRetry(props.file)"
+              :title="t('upload.retry')"
+            />
+            <OIcon
+              button
+              v-if="props.file.status !== 'failed' && props.file.imgUrl"
+              :icon="IconPreview"
+              class="o-upload-icon-btn o-upload-icon-preview"
+              @click="onPreview"
+              :title="t('upload.preview')"
+            />
+            <OIcon v-if="showLoading(props.file)" class="o-upload-icon-loading">
+              <IconLoading class="o-rotating" />
+            </OIcon>
+            <OIcon
+              button
+              :icon="IconEdit"
+              v-if="props.file.status === 'finished'"
+              class="o-upload-icon-btn o-upload-icon-edit"
+              @click="onFileReplace(props.file)"
+              :title="t('upload.edit')"
+            />
+            <OIcon button class="o-upload-icon-btn o-upload-icon-remove" :icon="IconDelete" @click="onFileRemove(props.file)" :title="t('upload.delete')" />
           </div>
 
           <div v-if="props.file.status === 'uploading' && props.file.percent" class="o-upload-progress o-upload-card-progress">
@@ -108,8 +133,15 @@ const onPreview = () => {
             class="o-upload-row-icon o-upload-icon-hover-in o-upload-icon-retry"
             :icon="IconRefresh"
             @click="onFileUploadRetry(props.file)"
+            :title="t('upload.retry')"
+          />
+          <OIcon
+            button
+            class="o-upload-row-icon o-upload-icon-remove o-upload-icon-hover-in"
+            :icon="IconDelete"
+            @click="onFileRemove(props.file)"
+            :title="t('upload.delete')"
           />
-          <OIcon button class="o-upload-row-icon o-upload-icon-remove o-upload-icon-hover-in" :icon="IconDelete" @click="onFileRemove(props.file)" />
         </div>
 
         <div v-if="props.file.status === 'uploading' && props.file.percent" class="o-upload-progress o-upload-row-progress">
diff --git a/packages/opendesign/src/upload/UploadSelect.vue b/packages/opendesign/src/upload/UploadSelect.vue
index ab3715b3..9b37a16a 100644
--- a/packages/opendesign/src/upload/UploadSelect.vue
+++ b/packages/opendesign/src/upload/UploadSelect.vue
@@ -1,15 +1,15 @@
-
 <script setup lang="ts">
 import { ref } from 'vue';
 import { IconAdd } from '../_utils/icons';
 import OButton from '../button/OButton.vue';
-import { UploadLabel } from './util';
 import { UploadBtnType } from './types';
 import slot from './slot';
+import { useI18n } from '../locale';
 
 interface UploadSelectPropsT {
   draggable?: boolean;
   dragLabel?: string;
+  dragHoverLabel?: string;
   btnLabel?: string;
   disabled?: boolean;
   btnProps?: UploadBtnType;
@@ -22,6 +22,8 @@ const emits = defineEmits<{
   (e: 'selected', files: FileList): void;
 }>();
 
+const { t } = useI18n();
+
 const onSelectClick = () => {
   if (props.disabled) {
     return;
@@ -94,14 +96,14 @@ const onDrap = (e: DragEvent) => {
       >
         <slot :name="slot.names.selectDrag">
           <IconAdd class="o-upload-drag-icon" />
-          <div class="o-upload-drag-label">{{ props.dragLabel ?? UploadLabel.dragLabel }}</div>
+          <div class="o-upload-drag-label">{{ !isDragging ? props.dragLabel ?? t('upload.drag') : props.dragHoverLabel ?? t('upload.dragHover') }}</div>
           <div v-if="$slots[slot.names.selectDragExtra]" class="o-upload-select-extra">
             <slot :name="slot.names.selectDragExtra"></slot>
           </div>
         </slot>
       </div>
       <OButton v-else :disabled="props.disabled" v-bind="props.btnProps" :icon="IconAdd">
-        {{ props.btnLabel ?? UploadLabel.btnLabel }}
+        {{ props.btnLabel ?? t('upload.buttonLabel') }}
       </OButton>
     </slot>
   </div>
diff --git a/packages/opendesign/src/upload/__demo__/UploadBasic.vue b/packages/opendesign/src/upload/__demo__/UploadBasic.vue
index 466e10dc..18ce52ed 100644
--- a/packages/opendesign/src/upload/__demo__/UploadBasic.vue
+++ b/packages/opendesign/src/upload/__demo__/UploadBasic.vue
@@ -77,7 +77,6 @@ const onSelect = (f: UploadFileT[]) => {
         v-model="singleFileList"
         :on-after-select="onAfterSelect"
         :upload-request="uploadRequest"
-        btn-label="上传(单选)"
         :btn-props="{ size: 'large' }"
         color="normal"
         variant="solid"
diff --git a/packages/opendesign/src/upload/style/style.scss b/packages/opendesign/src/upload/style/style.scss
index c97bf9e3..3e90bc66 100644
--- a/packages/opendesign/src/upload/style/style.scss
+++ b/packages/opendesign/src/upload/style/style.scss
@@ -212,8 +212,6 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  color: var(--o-color-info1-inverse);
-  font-size: var(--upload-icon-size-l);
 
   background-color: var(--upload-card-mask);
   border-radius: inherit;
@@ -233,6 +231,8 @@
 
   > .o-upload-icon-btn {
     cursor: pointer;
+    color: var(--o-color-info1-inverse);
+    font-size: var(--upload-icon-size-l);
     @include hover {
       &:hover {
         color: var(--upload-card-icon-color-hover);
diff --git a/packages/opendesign/src/upload/types.ts b/packages/opendesign/src/upload/types.ts
index 96d8382f..65627687 100644
--- a/packages/opendesign/src/upload/types.ts
+++ b/packages/opendesign/src/upload/types.ts
@@ -120,6 +120,12 @@ export const uploadProps = {
   dragLabel: {
     type: String,
   },
+  /**
+   * 拖拽区域拖拽中的提示文本
+   */
+  dragHoverLabel: {
+    type: String,
+  },
   /**
    * 文件列表类型
    */
diff --git a/packages/opendesign/src/upload/util.ts b/packages/opendesign/src/upload/util.ts
index ceb6298a..381e9ba6 100644
--- a/packages/opendesign/src/upload/util.ts
+++ b/packages/opendesign/src/upload/util.ts
@@ -1,6 +1,5 @@
 import { UploadFileT, UploadRequestT, UploadRequestOptionT } from './types';
 import { isFunction } from '../_utils/is';
-import { Slots } from 'vue';
 
 interface OptionsT {
   uploadRequest?: (options: UploadRequestOptionT) => UploadRequestT;
@@ -10,11 +9,6 @@ interface OptionsT {
   onError?: (file: UploadFileT) => void;
 }
 
-export const UploadLabel = {
-  btnLabel: '上传文件',
-  dragLabel: '点击或拖拽文件到此处上传',
-};
-
 /**
  * 发起上传请求
  */
-- 
Gitee


From f0c7c7f37581287b7954ade700ae74d53d9a74d4 Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Tue, 16 Apr 2024 17:17:11 +0800
Subject: [PATCH 7/8] =?UTF-8?q?feat(i18n/select):=20select=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=9B=20dialog=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0actions=E6=8F=92=E6=A7=BD=EF=BC=9Bactions=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E4=BC=A0=E9=80=92icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/dialog/ODialog.vue    | 31 +++++-----
 packages/opendesign/src/dialog/style/index.ts |  1 +
 packages/opendesign/src/dialog/types.ts       |  5 +-
 packages/opendesign/src/locale/lang/en-us.ts  |  7 +++
 packages/opendesign/src/locale/lang/zh-cn.ts  |  7 +++
 packages/opendesign/src/select/OSelect.vue    | 61 ++++++++-----------
 packages/opendesign/src/select/style/index.ts |  2 +-
 packages/portal/src/components/TheHeader.vue  |  1 +
 8 files changed, 64 insertions(+), 51 deletions(-)

diff --git a/packages/opendesign/src/dialog/ODialog.vue b/packages/opendesign/src/dialog/ODialog.vue
index bc04a68b..4697e289 100644
--- a/packages/opendesign/src/dialog/ODialog.vue
+++ b/packages/opendesign/src/dialog/ODialog.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { computed, ref } from 'vue';
 import { IconClose } from '../_utils/icons';
 import { OLayer } from '../layer';
 import { OButton } from '../button';
@@ -6,7 +7,6 @@ import { OScroller } from '../scroller';
 
 import { dialogProps } from './types';
 import { mergeClass } from '../_utils/dom';
-import { computed, ref } from 'vue';
 import { isPhonePad } from '../_utils/global';
 import { isBoolean } from '../_utils/is';
 
@@ -92,21 +92,24 @@ defineExpose({
     >
       <slot></slot>
     </div>
-    <div v-if="$slots.footer || props.actions" class="o-dlg-footer">
+    <div v-if="$slots.footer || $slots.actions || props.actions" class="o-dlg-footer">
       <slot name="footer">
         <div class="o-dlg-actions">
-          <OButton
-            v-for="item in props.actions"
-            :key="item.id"
-            class="o-dlg-btn"
-            :color="item.color"
-            :variant="!item.variant && isPhonePad ? 'text' : item.variant"
-            :size="item.size"
-            :round="item.round"
-            @click="item.onClick"
-          >
-            {{ item.label }}
-          </OButton>
+          <slot name="actions">
+            <OButton
+              v-for="item in props.actions"
+              :key="item.id"
+              class="o-dlg-btn"
+              :color="item.color"
+              :variant="!item.variant && isPhonePad ? 'text' : item.variant"
+              :size="item.size"
+              :round="item.round"
+              :icon="item.icon"
+              @click="item.onClick"
+            >
+              {{ item.label }}
+            </OButton>
+          </slot>
         </div>
       </slot>
     </div>
diff --git a/packages/opendesign/src/dialog/style/index.ts b/packages/opendesign/src/dialog/style/index.ts
index b2ada149..3b198c95 100644
--- a/packages/opendesign/src/dialog/style/index.ts
+++ b/packages/opendesign/src/dialog/style/index.ts
@@ -1,4 +1,5 @@
 import '../../_styles';
 import '../../layer/style';
+import '../../button/style';
 import '../../scroller/style';
 import './index.scss';
diff --git a/packages/opendesign/src/dialog/types.ts b/packages/opendesign/src/dialog/types.ts
index 0d8512ba..d4406f16 100644
--- a/packages/opendesign/src/dialog/types.ts
+++ b/packages/opendesign/src/dialog/types.ts
@@ -1,4 +1,4 @@
-import { ExtractPropTypes, PropType } from 'vue';
+import { ExtractPropTypes, PropType, Component } from 'vue';
 import { layerProps } from '../layer/types';
 import { ColorT, SizeT, VariantT, RoundT } from '../_utils/types';
 
@@ -10,8 +10,9 @@ export interface DialogActionT {
   color?: ColorT;
   variant?: VariantT;
   size?: SizeT;
-  label: string;
+  label?: string;
   round?: RoundT;
+  icon?: Component;
   onClick: () => void;
 }
 
diff --git a/packages/opendesign/src/locale/lang/en-us.ts b/packages/opendesign/src/locale/lang/en-us.ts
index 19e6a1b3..d2b9d062 100644
--- a/packages/opendesign/src/locale/lang/en-us.ts
+++ b/packages/opendesign/src/locale/lang/en-us.ts
@@ -1,5 +1,8 @@
 export default {
   locale: 'en-US',
+  empty: {
+    description: 'No Data',
+  },
   pagination: {
     goto: 'Goto',
     page: 'Page',
@@ -15,4 +18,8 @@ export default {
     preview: 'Preview',
     edit: 'Edit',
   },
+  select: {
+    cancel: 'Cancel',
+    confirm: 'Ok',
+  },
 };
diff --git a/packages/opendesign/src/locale/lang/zh-cn.ts b/packages/opendesign/src/locale/lang/zh-cn.ts
index 0f098d14..6eaea64c 100644
--- a/packages/opendesign/src/locale/lang/zh-cn.ts
+++ b/packages/opendesign/src/locale/lang/zh-cn.ts
@@ -1,5 +1,8 @@
 export default {
   locale: 'zh-CN',
+  empty: {
+    description: '暂无数据',
+  },
   pagination: {
     goto: '前往',
     page: '页',
@@ -15,4 +18,8 @@ export default {
     preview: '预览',
     edit: '编辑',
   },
+  select: {
+    cancel: '取消',
+    confirm: '确定',
+  },
 };
diff --git a/packages/opendesign/src/select/OSelect.vue b/packages/opendesign/src/select/OSelect.vue
index 2ef41b51..33907c1d 100644
--- a/packages/opendesign/src/select/OSelect.vue
+++ b/packages/opendesign/src/select/OSelect.vue
@@ -4,7 +4,7 @@ import { defaultSize, isPhonePad } from '../_utils/global';
 import { IconChevronDown, IconClose, IconLoading } from '../_utils/icons';
 import { OPopup } from '../popup';
 import { OPopover } from '../popover';
-import { ODialog, DialogActionT } from '../dialog';
+import { ODialog } from '../dialog';
 import { selectOptionInjectKey } from './provide';
 import { SelectOptionT, selectProps, SelectValueT } from './types';
 import { getRoundClass } from '../_utils/style-class';
@@ -15,6 +15,8 @@ import SelectOption from './SelectOption.vue';
 import slot from './slot';
 import { filterSlots } from '../_utils/vue-utils';
 import { formItemInjectKey } from '../form/provide';
+import { useI18n } from '../locale';
+import { OButton } from '../button';
 
 // TODO 下拉展开时，选中值默认在视口里
 const props = defineProps(selectProps);
@@ -25,11 +27,7 @@ const emits = defineEmits<{
   (e: 'clear', evt: Event): void;
 }>();
 
-const Labels = {
-  empty: '暂无数据',
-  cancel: '取消',
-  confirm: '确定',
-};
+const { t } = useI18n();
 
 const selectRef = ref<HTMLElement>();
 const optionsRef = ref<HTMLElement | null>(null);
@@ -255,32 +253,20 @@ const onSelectClick = () => {
 const onSelectDlgChange = (visible: boolean) => {
   onOptionVisibleChange(visible);
 };
-const selectDlgAction: DialogActionT[] = [
-  {
-    id: 'cancel',
-    label: Labels.cancel,
-    variant: 'text',
-    size: 'large',
-    onClick: () => {
-      isSelecting.value = false;
-      valueList.value = [...finalValueList.value];
-    },
-  },
-  {
-    id: 'ok',
-    label: Labels.confirm,
-    variant: 'text',
-    size: 'large',
-    onClick: () => {
-      isSelecting.value = false;
-
-      finalValueList.value = [...valueList.value];
-
-      emitChange(valueList.value);
-      emitUpdateValue(valueList.value);
-    },
-  },
-];
+
+const onselectDlgCancelClick = () => {
+  isSelecting.value = false;
+  valueList.value = [...finalValueList.value];
+};
+
+const onselectDlgOkClick = () => {
+  isSelecting.value = false;
+
+  finalValueList.value = [...valueList.value];
+
+  emitChange(valueList.value);
+  emitUpdateValue(valueList.value);
+};
 </script>
 <template>
   <div
@@ -356,7 +342,7 @@ const selectDlgAction: DialogActionT[] = [
           <slot>
             <div class="o-select-empty">
               <slot name="empty">
-                <span>{{ Labels.empty }}</span>
+                <span>{{ t('empty.description') }}</span>
               </slot>
             </div>
           </slot>
@@ -369,7 +355,6 @@ const selectDlgAction: DialogActionT[] = [
           :before-hide="props.beforeOptionsHide"
           hide-close
           class="o-select-dlg"
-          :actions="props.multiple ? selectDlgAction : undefined"
           :mask-close="!props.multiple"
           :class="{
             'is-loading': props.loading,
@@ -380,6 +365,14 @@ const selectDlgAction: DialogActionT[] = [
           <template v-if="props.optionTitle" #header>
             <div class="o-select-options-head">{{ props.optionTitle }}</div>
           </template>
+          <template #actions v-if="props.multiple">
+            <OButton class="o-dlg-btn" variant="text" size="large" @click="onselectDlgCancelClick">
+              {{ t('select.cancel') }}
+            </OButton>
+            <OButton class="o-dlg-btn" variant="text" size="large" @click="onselectDlgOkClick">
+              {{ t('select.confirm') }}
+            </OButton>
+          </template>
           <SelectOption
             :size="props.size"
             :wrap-class="props.optionWrapClass"
diff --git a/packages/opendesign/src/select/style/index.ts b/packages/opendesign/src/select/style/index.ts
index 75dc5e96..9608de6d 100644
--- a/packages/opendesign/src/select/style/index.ts
+++ b/packages/opendesign/src/select/style/index.ts
@@ -1,6 +1,6 @@
 import '../../_styles';
 import '../../popover/style';
 import '../../scroller/style';
-import '../../dialog/style';
 import '../../button/style';
+import '../../dialog/style';
 import './index.scss';
diff --git a/packages/portal/src/components/TheHeader.vue b/packages/portal/src/components/TheHeader.vue
index d71cb0ff..399d34ab 100644
--- a/packages/portal/src/components/TheHeader.vue
+++ b/packages/portal/src/components/TheHeader.vue
@@ -81,6 +81,7 @@ const currentLocale = computed(() => {
 const changeLocale = (l: (typeof locales)[0]) => {
   useLocale(l.value);
 };
+window.setLocale = changeLocale;
 </script>
 <template>
   <div class="the-header">
-- 
Gitee


From aa9c6d0d7755acea276874a6434524abbc57580f Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Tue, 16 Apr 2024 17:56:12 +0800
Subject: [PATCH 8/8] =?UTF-8?q?feat(i18n/table):=20table=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/locale/lang/en-us.ts | 5 +++--
 packages/opendesign/src/locale/lang/zh-cn.ts | 5 +++--
 packages/opendesign/src/select/OSelect.vue   | 2 +-
 packages/opendesign/src/table/OTable.vue     | 7 +++++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/opendesign/src/locale/lang/en-us.ts b/packages/opendesign/src/locale/lang/en-us.ts
index d2b9d062..36a9e4ac 100644
--- a/packages/opendesign/src/locale/lang/en-us.ts
+++ b/packages/opendesign/src/locale/lang/en-us.ts
@@ -1,7 +1,8 @@
 export default {
   locale: 'en-US',
-  empty: {
-    description: 'No Data',
+  common: {
+    empty: 'No Data',
+    loading: 'loading...',
   },
   pagination: {
     goto: 'Goto',
diff --git a/packages/opendesign/src/locale/lang/zh-cn.ts b/packages/opendesign/src/locale/lang/zh-cn.ts
index 6eaea64c..41c5dc33 100644
--- a/packages/opendesign/src/locale/lang/zh-cn.ts
+++ b/packages/opendesign/src/locale/lang/zh-cn.ts
@@ -1,7 +1,8 @@
 export default {
   locale: 'zh-CN',
-  empty: {
-    description: '暂无数据',
+  common: {
+    empty: '暂无数据',
+    loading: '加载中...',
   },
   pagination: {
     goto: '前往',
diff --git a/packages/opendesign/src/select/OSelect.vue b/packages/opendesign/src/select/OSelect.vue
index 33907c1d..ba244718 100644
--- a/packages/opendesign/src/select/OSelect.vue
+++ b/packages/opendesign/src/select/OSelect.vue
@@ -342,7 +342,7 @@ const onselectDlgOkClick = () => {
           <slot>
             <div class="o-select-empty">
               <slot name="empty">
-                <span>{{ t('empty.description') }}</span>
+                <span>{{ t('common.empty') }}</span>
               </slot>
             </div>
           </slot>
diff --git a/packages/opendesign/src/table/OTable.vue b/packages/opendesign/src/table/OTable.vue
index fa8a8e1c..f6f27f06 100644
--- a/packages/opendesign/src/table/OTable.vue
+++ b/packages/opendesign/src/table/OTable.vue
@@ -4,6 +4,7 @@ import { getColumnData, getBodyData } from './table';
 import { computed } from 'vue';
 import { IconLoading } from '../_utils/icons';
 import { isString } from '../_utils/is';
+import { useI18n } from '../locale';
 
 const props = defineProps(tableProps);
 
@@ -19,12 +20,14 @@ defineSlots<{
   [k: `td_${string}`]: (props: { row: TableRowT }) => any;
 }>();
 
+const { t } = useI18n();
+
 const columnData = computed(() => getColumnData(props.columns));
 
 const tableData = computed(() => getBodyData(columnData, props.data, props.cellSpan));
 
-const emptyLabel = props.emptyLabel || '无数据';
-const loadingLabel = props.loadingLabel || '正在加载...';
+const emptyLabel = computed(() => props.emptyLabel || t('common.empty'));
+const loadingLabel = computed(() => props.loadingLabel || t('common.loading'));
 
 const boderClass = computed(() => {
   if (isString(props.border)) {
-- 
Gitee