From e78505645b614de4a93bc5659c518b1f163c625c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=99=E7=A0=81=E7=94=9F=E8=8A=B1?= <18523774412@qq.com>
Date: Thu, 5 Jan 2023 12:23:54 +0800
Subject: [PATCH] =?UTF-8?q?refactor(lang):=E5=B0=86pages=E5=86=85=E7=9A=84?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=AF=AD=E8=A8=80=E5=8C=85=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=88=B0=E9=80=82=E5=BD=93=E7=9A=84=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/baInput/components/iconSelector.vue   | 12 ++++++------
 web/src/lang/{pages => common}/en/401.ts             |  0
 web/src/lang/{pages => common}/en/404.ts             |  0
 web/src/lang/{pages => common}/en/axios.ts           |  0
 web/src/lang/{pages => common}/en/pagesTitle.ts      |  0
 web/src/lang/{pages => common}/en/utils.ts           |  4 ++++
 web/src/lang/{pages => common}/en/validate.ts        |  0
 web/src/lang/{pages => common}/zh-cn/401.ts          |  0
 web/src/lang/{pages => common}/zh-cn/404.ts          |  0
 web/src/lang/{pages => common}/zh-cn/axios.ts        |  0
 web/src/lang/{pages => common}/zh-cn/pagesTitle.ts   |  0
 web/src/lang/{pages => common}/zh-cn/utils.ts        |  4 ++++
 web/src/lang/{pages => common}/zh-cn/validate.ts     |  0
 web/src/lang/pages/en/iconSelector.ts                |  6 ------
 web/src/lang/pages/en/index.ts                       |  7 -------
 web/src/lang/pages/zh-cn/iconSelector.ts             |  6 ------
 web/src/lang/pages/zh-cn/index.ts                    |  7 -------
 17 files changed, 14 insertions(+), 32 deletions(-)
 rename web/src/lang/{pages => common}/en/401.ts (100%)
 rename web/src/lang/{pages => common}/en/404.ts (100%)
 rename web/src/lang/{pages => common}/en/axios.ts (100%)
 rename web/src/lang/{pages => common}/en/pagesTitle.ts (100%)
 rename web/src/lang/{pages => common}/en/utils.ts (92%)
 rename web/src/lang/{pages => common}/en/validate.ts (100%)
 rename web/src/lang/{pages => common}/zh-cn/401.ts (100%)
 rename web/src/lang/{pages => common}/zh-cn/404.ts (100%)
 rename web/src/lang/{pages => common}/zh-cn/axios.ts (100%)
 rename web/src/lang/{pages => common}/zh-cn/pagesTitle.ts (100%)
 rename web/src/lang/{pages => common}/zh-cn/utils.ts (92%)
 rename web/src/lang/{pages => common}/zh-cn/validate.ts (100%)
 delete mode 100644 web/src/lang/pages/en/iconSelector.ts
 delete mode 100644 web/src/lang/pages/en/index.ts
 delete mode 100644 web/src/lang/pages/zh-cn/iconSelector.ts
 delete mode 100644 web/src/lang/pages/zh-cn/index.ts

diff --git a/web/src/components/baInput/components/iconSelector.vue b/web/src/components/baInput/components/iconSelector.vue
index 1ea5bd16..0a6e8b54 100644
--- a/web/src/components/baInput/components/iconSelector.vue
+++ b/web/src/components/baInput/components/iconSelector.vue
@@ -4,28 +4,28 @@
             <transition name="el-zoom-in-center">
                 <div class="icon-selector-box">
                     <div class="selector-header">
-                        <div class="selector-title">{{ title ? title : $t('iconSelector.Please select an icon') }}</div>
+                        <div class="selector-title">{{ title ? title : $t('utils.Please select an icon') }}</div>
                         <div class="selector-tab">
                             <span
-                                :title="'Element Puls ' + $t('iconSelector.Icon')"
+                                :title="'Element Puls ' + $t('utils.Icon')"
                                 @click="onChangeTab('ele')"
                                 :class="state.iconType == 'ele' ? 'active' : ''"
                                 >ele</span
                             >
                             <span
-                                :title="'Font Awesome ' + $t('iconSelector.Icon')"
+                                :title="'Font Awesome ' + $t('utils.Icon')"
                                 @click="onChangeTab('awe')"
                                 :class="state.iconType == 'awe' ? 'active' : ''"
                                 >awe</span
                             >
                             <span
-                                :title="$t('iconSelector.Ali iconcont Icon')"
+                                :title="$t('utils.Ali iconcont Icon')"
                                 @click="onChangeTab('ali')"
                                 :class="state.iconType == 'ali' ? 'active' : ''"
                                 >ali</span
                             >
                             <span
-                                :title="$t('iconSelector.Local icon title')"
+                                :title="$t('utils.Local icon title')"
                                 @click="onChangeTab('local')"
                                 :class="state.iconType == 'local' ? 'active' : ''"
                                 >local</span
@@ -55,7 +55,7 @@
                 v-model="state.inputValue"
                 :size="size"
                 :disabled="disabled"
-                :placeholder="$t('search') + $t('iconSelector.Icon')"
+                :placeholder="$t('search') + $t('utils.Icon')"
                 ref="selectorInput"
                 @focus="onInputFocus"
                 @blur="onInputBlur"
diff --git a/web/src/lang/pages/en/401.ts b/web/src/lang/common/en/401.ts
similarity index 100%
rename from web/src/lang/pages/en/401.ts
rename to web/src/lang/common/en/401.ts
diff --git a/web/src/lang/pages/en/404.ts b/web/src/lang/common/en/404.ts
similarity index 100%
rename from web/src/lang/pages/en/404.ts
rename to web/src/lang/common/en/404.ts
diff --git a/web/src/lang/pages/en/axios.ts b/web/src/lang/common/en/axios.ts
similarity index 100%
rename from web/src/lang/pages/en/axios.ts
rename to web/src/lang/common/en/axios.ts
diff --git a/web/src/lang/pages/en/pagesTitle.ts b/web/src/lang/common/en/pagesTitle.ts
similarity index 100%
rename from web/src/lang/pages/en/pagesTitle.ts
rename to web/src/lang/common/en/pagesTitle.ts
diff --git a/web/src/lang/pages/en/utils.ts b/web/src/lang/common/en/utils.ts
similarity index 92%
rename from web/src/lang/pages/en/utils.ts
rename to web/src/lang/common/en/utils.ts
index 6db09b64..9d91fc4e 100644
--- a/web/src/lang/pages/en/utils.ts
+++ b/web/src/lang/common/en/utils.ts
@@ -54,4 +54,8 @@ export default {
     'color picker': 'color picker',
     color: 'color',
     choice: ' Choice',
+    Icon: 'Icon',
+    'Local icon title': 'Local icon:/src/assets/icons Inside.svg',
+    'Please select an icon': 'Please select an icon',
+    'Ali iconcont Icon': 'Ali Iconfont Icon',
 }
diff --git a/web/src/lang/pages/en/validate.ts b/web/src/lang/common/en/validate.ts
similarity index 100%
rename from web/src/lang/pages/en/validate.ts
rename to web/src/lang/common/en/validate.ts
diff --git a/web/src/lang/pages/zh-cn/401.ts b/web/src/lang/common/zh-cn/401.ts
similarity index 100%
rename from web/src/lang/pages/zh-cn/401.ts
rename to web/src/lang/common/zh-cn/401.ts
diff --git a/web/src/lang/pages/zh-cn/404.ts b/web/src/lang/common/zh-cn/404.ts
similarity index 100%
rename from web/src/lang/pages/zh-cn/404.ts
rename to web/src/lang/common/zh-cn/404.ts
diff --git a/web/src/lang/pages/zh-cn/axios.ts b/web/src/lang/common/zh-cn/axios.ts
similarity index 100%
rename from web/src/lang/pages/zh-cn/axios.ts
rename to web/src/lang/common/zh-cn/axios.ts
diff --git a/web/src/lang/pages/zh-cn/pagesTitle.ts b/web/src/lang/common/zh-cn/pagesTitle.ts
similarity index 100%
rename from web/src/lang/pages/zh-cn/pagesTitle.ts
rename to web/src/lang/common/zh-cn/pagesTitle.ts
diff --git a/web/src/lang/pages/zh-cn/utils.ts b/web/src/lang/common/zh-cn/utils.ts
similarity index 92%
rename from web/src/lang/pages/zh-cn/utils.ts
rename to web/src/lang/common/zh-cn/utils.ts
index add59100..a3433e10 100644
--- a/web/src/lang/pages/zh-cn/utils.ts
+++ b/web/src/lang/common/zh-cn/utils.ts
@@ -54,4 +54,8 @@ export default {
     'color picker': '颜色选择器',
     color: '颜色',
     choice: '选择',
+    Icon: '图标',
+    'Local icon title': '本地图标:/src/assets/icons中的.svg',
+    'Please select an icon': '请选择图标',
+    'Ali iconcont Icon': '阿里 Iconfont 图标',
 }
diff --git a/web/src/lang/pages/zh-cn/validate.ts b/web/src/lang/common/zh-cn/validate.ts
similarity index 100%
rename from web/src/lang/pages/zh-cn/validate.ts
rename to web/src/lang/common/zh-cn/validate.ts
diff --git a/web/src/lang/pages/en/iconSelector.ts b/web/src/lang/pages/en/iconSelector.ts
deleted file mode 100644
index 1ee40298..00000000
--- a/web/src/lang/pages/en/iconSelector.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-    Icon: 'Icon',
-    'Local icon title': 'Local icon:/src/assets/icons Inside.svg',
-    'Please select an icon': 'Please select an icon',
-    'Ali iconcont Icon': 'Ali Iconfont Icon',
-}
diff --git a/web/src/lang/pages/en/index.ts b/web/src/lang/pages/en/index.ts
deleted file mode 100644
index 428dba8e..00000000
--- a/web/src/lang/pages/en/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default {
-    'Member Center': 'Member Center',
-    'Steve Jobs': "Great art don't have to follow the trend, it alone can lead.-- Steve Jobs",
-    copyright: 'Copyright',
-    index: 'Home',
-    language: 'Language',
-}
diff --git a/web/src/lang/pages/zh-cn/iconSelector.ts b/web/src/lang/pages/zh-cn/iconSelector.ts
deleted file mode 100644
index 9199599e..00000000
--- a/web/src/lang/pages/zh-cn/iconSelector.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-    Icon: '图标',
-    'Local icon title': '本地图标:/src/assets/icons中的.svg',
-    'Please select an icon': '请选择图标',
-    'Ali iconcont Icon': '阿里 Iconfont 图标',
-}
diff --git a/web/src/lang/pages/zh-cn/index.ts b/web/src/lang/pages/zh-cn/index.ts
deleted file mode 100644
index 8c1fde8d..00000000
--- a/web/src/lang/pages/zh-cn/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default {
-    'Member Center': '会员中心',
-    'Steve Jobs': '伟大的艺术品不必追随潮流，他本身就能引领潮流。 -- 乔布斯',
-    copyright: '版权所有',
-    index: '首页',
-    language: '语言',
-}