Merge pull request #50 from WeBankFinTech/branch_joy

mayinrain · web-flow · commit 1b5cdbcd38e7 · 2024-10-31T10:27:00.000+08:00
国际化更新+metric文案修正
diff --git a/docs/.vitepress/components/BMetricTip/index.md b/docs/.vitepress/components/BMetricTip/index.md
@@ -1,4 +1,4 @@
-# BTagsPanel
+# BMetricTip
 图标悬浮提示说明
 
 ## 组件注册
diff --git a/packages/traction-widget/components/MetricTip/MetricTip.vue b/packages/traction-widget/components/MetricTip/MetricTip.vue
@@ -10,7 +10,7 @@
         </FTooltip>
     </span>
 </template>
-<script setup>
+<script setup lang="ts">
 import {
     defineProps
 } from 'vue';
diff --git a/packages/traction-widget/components/PageLoading/pageLoading.vue b/packages/traction-widget/components/PageLoading/pageLoading.vue
@@ -4,7 +4,7 @@
             <div class="tip">
                 <div class="tip-text">{{ tip }}</div>
                 <div class="tip-button">
-                    <FButton v-if="actionType === 'noPermissions'" type="default" @click="logout">退出登录</FButton>
+                    <FButton v-if="actionType === 'noPermissions'" type="default" @click="logout">{{ pageLoadingLocalObj?.logout }}</FButton>
                 </div>
             </div>
         </div>
@@ -13,7 +13,7 @@
             <div class="tip">
                 <div class="tip-text">{{ tip }}</div>
                 <div class="tip-button">
-                    <FButton v-if="actionType === 'noPermissions'" type="default" @click="logout">退出登录</FButton>
+                    <FButton v-if="actionType === 'noPermissions'" type="default" @click="logout">{{ pageLoadingLocalObj?.logout }}</FButton>
                 </div>
             </div>
 
@@ -23,6 +23,9 @@
 <script setup lang="ts">
 import { computed, PropType, defineEmits } from 'vue';
 import { FButton } from '@fesjs/fes-design';
+import { useLocale } from '../hooks/useLocale';
+const locale = useLocale();
+const pageLoadingLocalObj = locale.pageLoading || {};
 const props = defineProps({
     type: {
         type: String,
@@ -38,21 +41,16 @@ const props = defineProps({
             emptyInitResult?: string,
             emptyQueryResult?: string
         }>,
-        default: () => ({
-            loading: 'Loading. . .',
-            emptyInitResult: '这里还没有数据. . .',
-            emptyQueryResult: '没有符合条件的结果. . .',
-            noPermissions: '暂无权限'
-        })
+        default: () => ({})
     }
 });
 const emits = defineEmits(['logout']);
 const type = computed(() => props.type);
 const loadingText = computed(() => ({
     loading: 'Loading. . .',
-    emptyInitResult: '这里还没有数据. . .',
-    emptyQueryResult: '没有符合条件的结果. . .',
-    noPermissions: '暂无权限',
+    emptyInitResult: pageLoadingLocalObj?.noData,
+    emptyQueryResult: pageLoadingLocalObj?.noResult,
+    noPermissions: pageLoadingLocalObj?.noPermissions,
     ...props.loadingText
 }));
 const tip = computed(() => {
diff --git a/packages/traction-widget/components/Search/Search.vue b/packages/traction-widget/components/Search/Search.vue
@@ -16,31 +16,31 @@
                 'gap-16': props.isLetgo
             }">
             <FSpace :size="16" v-if="!props.isLetgo">
-                <FButton type="primary" @click="handleSearch">查询</FButton>
+                <FButton type="primary" @click="handleSearch">{{searchLocalObj?.search}}</FButton>
                 <template v-if="props.isAdvance">
                     <FButton v-if="isAdvanceCount" @click="handleAdvance"
                             :class="querySelectedCount > 0 ? 'selected-count' : ''">
-                            高级筛选{{querySelectedCount > 0 ? `（已选${querySelectedCount}项）` : ''}}
+                            {{searchLocalObj?.advance}}{{querySelectedCount > 0 ? `(${searchLocalObj?.selected}${querySelectedCount}${searchLocalObj?.item})` : ''}}
                     </FButton>
                     <FButton v-else @click="handleAdvance">
-                        高级筛选
+                        {{searchLocalObj?.advance}}
                     </FButton>
                 </template>
-                <FButton v-if="props.isReset" @click="handleReset">重置</FButton>
+                <FButton v-if="props.isReset" @click="handleReset">{{searchLocalObj?.reset}}</FButton>
                 <slot name="exButton"></slot>
             </FSpace>
             <template v-else>
-                <FButton type="primary" @click="handleSearch">查询</FButton>
+                <FButton type="primary" @click="handleSearch">{{searchLocalObj?.search}}</FButton>
                 <template v-if="props.isAdvance">
                     <FButton v-if="isAdvanceCount" @click="handleAdvance"
                             :class="querySelectedCount > 0 ? 'selected-count' : ''">
-                            高级筛选{{querySelectedCount > 0 ? `（已选${querySelectedCount}项）` : ''}}
+                            {{searchLocalObj?.advance}}{{querySelectedCount > 0 ? `(${searchLocalObj?.selected} ${querySelectedCount} ${searchLocalObj?.item})` : ''}}
                     </FButton>
                     <FButton v-else @click="handleAdvance">
-                        高级筛选
+                        {{searchLocalObj?.advance}}
                     </FButton>
                 </template>
-                <FButton v-if="props.isReset" @click="handleReset">重置</FButton>
+                <FButton v-if="props.isReset" @click="handleReset">{{searchLocalObj?.reset}}</FButton>
                 <slot name="exButton"></slot>
             </template>
         </div>
@@ -52,6 +52,9 @@ import getPrefixCls from '../_util/getPrefixCls';
 import { defineProps, defineEmits, computed } from 'vue';
 import { useFormModel } from '../hooks/useModel';
 import { isBoolean, isArray, isObject } from 'lodash-es';
+import { useLocale } from '../hooks/useLocale';
+const locale = useLocale();
+const searchLocalObj = locale.SearchData || {};
 
 const props = defineProps({
     // 查询表单
diff --git a/packages/traction-widget/components/TableHeaderConfig/TableHeaderConfig.vue b/packages/traction-widget/components/TableHeaderConfig/TableHeaderConfig.vue
@@ -11,14 +11,14 @@
         @update:show="$emit('update:show', $event)"
         >
           <template #title>
-            <span>设置表格</span>
-            <span class="title-desc">(设置表格需要显示的字段信息)</span>
+            <span>{{ tableHeaderConfigLocalObj?.title }}</span>
+            <span class="title-desc">({{ tableHeaderConfigLocalObj?.titleDesc }})</span>
         </template>
         <div class="table-header-config">
             <div class="content">
                 <ul class="section-list">
                     <li v-if="activatedHeadersLocal && activatedHeadersLocal.length > 0" class="section-item">
-                        <h3 class="sub-title">已选字段</h3>
+                        <h3 class="sub-title">{{ tableHeaderConfigLocalObj?.selectedFields }}</h3>
                         <ul class="header-list">
                             <li
                                 v-for="header in activatedHeadersLocal"
@@ -29,7 +29,7 @@
                         </ul>
                     </li>
                     <li v-if="inactivatedHeadersLocal && inactivatedHeadersLocal.length > 0" class="section-item">
-                        <h3 class="sub-title">可选字段</h3>
+                        <h3 class="sub-title">{{tableHeaderConfigLocalObj?.optionalFields}}</h3>
                         <ul class="header-list">
                             <li
                                 v-for="header in inactivatedHeadersLocal"
@@ -40,8 +40,8 @@
                         </ul>
                     </li>
                     <li v-if="inactivatedHeadersLocal && inactivatedHeadersLocal.length === 0" class="section-item">
-                        <h3 class="sub-title">可选字段</h3>
-                        <div class="hint">暂无可选字段</div>
+                        <h3 class="sub-title">{{tableHeaderConfigLocalObj?.optionalFields}}</h3>
+                        <div class="hint">{{tableHeaderConfigLocalObj?.noOptionalFields}}</div>
                     </li>
                 </ul>
             </div>
@@ -57,6 +57,9 @@ import {
 } from 'vue';
 import getPrefixCls from '../_util/getPrefixCls';
 import { cloneDeep } from 'lodash-es';
+import { useLocale } from '../hooks/useLocale';
+const locale = useLocale();
+const tableHeaderConfigLocalObj = locale.TableHeaderConfig || {};
 
 export interface ColItem {
     prop: string,
diff --git a/packages/traction-widget/components/TagSelector/TagSelector.vue b/packages/traction-widget/components/TagSelector/TagSelector.vue
@@ -9,8 +9,8 @@
                 <FSelect v-model="selectedList" class="hidden-select" filterable multiple :options="props.options" @change="handleChange" :getContainer="getContainer"></FSelect>
             </div>
             <div class="tag-label">
-                <span>已选：</span>
-                <span v-if="clearable" class="clearable" @click="handleClear">全部删除</span>
+                <span>{{ tagSelectorLocalObj?.selected }}</span>
+                <span v-if="clearable" class="clearable" @click="handleClear">{{ tagSelectorLocalObj?.clearAll }}</span>
             </div>
             <div class="tag-container">
                 <FTag
@@ -30,6 +30,10 @@
 <script setup lang="ts">
 import { defineProps, defineEmits, computed, useSlots, ref } from 'vue';
 import { FTag, FSelect } from '@fesjs/fes-design';
+import { useLocale } from '../hooks/useLocale';
+
+const locale = useLocale();
+const tagSelectorLocalObj = locale.TagSelector || {};
 
 const props = defineProps({
     // 已选的数据列表
diff --git a/packages/traction-widget/components/TagsPanel/TagsPanel.vue b/packages/traction-widget/components/TagsPanel/TagsPanel.vue
@@ -8,7 +8,7 @@
             :maxlength="maxlength" :showWordLimit="showWordLimit" @keyup.enter="addNewTag" @blur="addNewTag">
         </FInput>
         <FButton v-else v-show="numberLimit === 0 || tags.length < numberLimit" :disabled="disabled" class="button-nef-tag" @click="toggleTagInput">
-            <PlusOutlined />添加标签
+            <PlusOutlined />{{ tagsPanelLocalObj?.addTag }}
         </FButton>
     </div>
 </template>
@@ -20,24 +20,27 @@ import {
 import getPrefixCls from '../_util/getPrefixCls';
 import { useFormModel } from '../hooks/useModel';
 import { PlusOutlined } from '@fesjs/fes-design/icon';
+import { useLocale } from '../hooks/useLocale';
+const locale = useLocale();
+const tagsPanelLocalObj = locale.tagsPanel || {};
 
 const prefixCls = getPrefixCls('TagsPanel');
 
 const props = defineProps({
     // 标签数量限制, 默认为0表示不限制，非0则限制
     numberLimit: {
         type: Number,
-        default: 0,
+        default: 0
     },
     // 标签是否不可重复
     isUnique: {
         type: Boolean,
-        defalut: false,
+        defalut: false
     },
     // 输入校验
     regex: {
         type: RegExp,
-        default: null,
+        default: null
     },
     // 校验错误提示
     regexTip: {
@@ -47,32 +50,32 @@ const props = defineProps({
     // 标签最大长度
     maxlength: {
         type: Number,
-        default: 25,
+        default: 25
     },
     // 是否展示输入长度
     showWordLimit: {
         type: Boolean,
-        default : false,
+        default: false
     },
     // 是否可编辑
     disabled: {
         type: Boolean,
-        default: false,
+        default: false
     },
     // 尺寸，可选值：small、middle、large
     size: {
         type: String,
-        default: 'middle',
+        default: 'middle'
     },
     // 主题，可选值：dark、light、plain
     effect: {
         type: String,
-        default: 'light',
+        default: 'light'
     },
     // 类型，可选值：default、success、info、warning、danger
     type: {
         type: String,
-        default: 'default',
+        default: 'default'
     },
     // 双向绑定的标签数据
     tags: {
@@ -112,16 +115,16 @@ const addNewTag = () => {
     if (notNull(tempTagInput.value)) {
         let flag = true;
         if (props.regex) {
-            flag = props.regex.test(tempTagInput.value)
+            flag = props.regex.test(tempTagInput.value);
         }
-        if( flag) {
-            if ( props.isUnique && datasource.tags.find((item: any) => item === tempTagInput.value)) {
-                FMessage.warn('不能添加重复标签！');
+        if (flag) {
+            if (props.isUnique && datasource.tags.find((item: any) => item === tempTagInput.value)) {
+                FMessage.warn(tagsPanelLocalObj.repeatTip);
                 closeInput();
                 return;
             }
-            if (props.numberLimit!== 0 && datasource.tags.length >= props.numberLimit) {
-                FMessage.warn(`不能添加超过${props.numberLimit}标签!`);
+            if (props.numberLimit !== 0 && datasource.tags.length >= props.numberLimit) {
+                FMessage.warn(`${tagsPanelLocalObj.numberLimitTip}${props.numberLimit}${tagsPanelLocalObj.tag}!`);
                 closeInput();
                 return;
             }
diff --git a/packages/traction-widget/components/hooks/useLocale.ts b/packages/traction-widget/components/hooks/useLocale.ts
@@ -0,0 +1,17 @@
+import { ref } from 'vue';
+import zhCN from '../locales/lang/zhCN.ts';
+import enUS from '../locales/lang/enUS.ts';
+
+// 定义 locale 类型
+type Locale = Record<string, any>;
+
+export function useLocale (): Locale {
+    const locale = ref<Locale>({});
+    const storedLocale = localStorage.getItem('fes_locale');
+    if (storedLocale === 'en-US') {
+        locale.value = enUS;
+    } else {
+        locale.value = zhCN;
+    }
+    return locale.value;
+}
diff --git a/packages/traction-widget/components/locales/index.ts b/packages/traction-widget/components/locales/index.ts
@@ -0,0 +1,11 @@
+export { default as zhCN } from './lang/zhCN';
+export { default as enUS } from './lang/enUS';
+
+export interface TypeTranslatePair {
+    [key: string]: string | string[] | TypeTranslatePair
+}
+
+export interface TypeLanguage {
+    name: string
+    [key: string]: string | string[] | TypeTranslatePair
+}
diff --git a/packages/traction-widget/components/locales/lang/enUS.ts b/packages/traction-widget/components/locales/lang/enUS.ts
@@ -0,0 +1,36 @@
+export default {
+    name: 'en',
+    desc: '英文',
+    pageLoading: {
+        logout: 'Logout',
+        noData: 'No data here. . .',
+        noResult: 'No results match the conditions. . .',
+        noPermissions: 'No permissions'
+    },
+    SearchData: {
+        search: 'Search',
+        advance: 'Advanced Filter',
+        advanceCount: 'Advanced Filter (selected {count} items)',
+        selected: 'selected',
+        item: 'items',
+        reset: 'Reset'
+    },
+    TableHeaderConfig: {
+        title: 'Set Table',
+        titleDesc: 'Set the fields to be displayed in the table',
+        selectedFields: 'Selected Fields',
+        optionalFields: 'Optional Fields',
+        noOptionalFields: 'No optional fields available'
+    },
+    TagSelector: {
+        clearAll: 'Clear All',
+        selected: 'Selected: '
+    },
+    tagsPanel: {
+        addTag: 'Add Tag',
+        regTip: 'Tag input does not match the validation rules',
+        repeatTip: 'Cannot add duplicate tags!',
+        numberLimitTip: 'Cannot add more than ',
+        tag: 'tags'
+    }
+};
diff --git a/packages/traction-widget/components/locales/lang/zhCN.ts b/packages/traction-widget/components/locales/lang/zhCN.ts
@@ -0,0 +1,35 @@
+export default {
+    name: 'zh-cn',
+    desc: '中文',
+    pageLoading: {
+        logout: '退出登录',
+        noData: '这里还没有数据. . .',
+        noResult: '没有符合条件的结果. . .',
+        noPermissions: '暂无权限'
+    },
+    SearchData: {
+        search: '查询',
+        advance: '高级筛选',
+        selected: '已选：',
+        item: '项',
+        reset: '重置'
+    },
+    TableHeaderConfig: {
+        title: '设置表格',
+        titleDesc: '设置表格需要显示的字段信息',
+        selectedFields: '已选字段',
+        optionalFields: '可选字段',
+        noOptionalFields: '暂无可选字段'
+    },
+    TagSelector: {
+        clearAll: '全部删除',
+        selected: '已选：'
+    },
+    tagsPanel: {
+        addTag: '添加标签',
+        regTip: '标签输入不符合校验规则',
+        repeatTip: '不能添加重复标签！',
+        numberLimitTip: '不能添加超过',
+        tag: '标签'
+    }
+};

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# BTagsPanel`
	`1`	`+# BMetricTip`
`2`	`2`	`图标悬浮提示说明`
`3`	`3`
`4`	`4`	`## 组件注册`