From 47a8b6566e5b2043992e5883a8e605487b188afa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AC=BC=E7=94=BB=E7=AC=A6?= <mail@xnx3.com>
Date: Mon, 10 Feb 2025 15:47:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=AF=AD=E8=A8=80=E7=9A=84Se?=
 =?UTF-8?q?lect=E6=9C=AC=E8=BA=AB=E4=B8=8D=E8=A2=AB=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/public/index.html                  |   6 +-
 .../src/components/setting/SettingDrawer.vue  | 146 +++++++++---------
 2 files changed, 77 insertions(+), 75 deletions(-)

diff --git a/jshERP-web/public/index.html b/jshERP-web/public/index.html
index ae73055f2..d79a8d54b 100644
--- a/jshERP-web/public/index.html
+++ b/jshERP-web/public/index.html
@@ -304,10 +304,12 @@ translate.selectLanguageTag.show = false;
 
 //VUE的渲染需要时间，所以留出一点点时间来进行翻译切换
 document.addEventListener('DOMContentLoaded', function () {
-    console.log('页面 DOM 已渲染完毕');
+    //页面 DOM 已渲染完毕，当然最好是能监控到整个vue渲染完毕后触发最好
+    translate.execute();
+    //2秒后再一次，避免有遗漏
     setTimeout(function(){
     	translate.execute();
-    },500);
+    },2000);
 });
 </script>
 <!-- 全局配置-多语言切换-结束 -->
diff --git a/jshERP-web/src/components/setting/SettingDrawer.vue b/jshERP-web/src/components/setting/SettingDrawer.vue
index d2d58228a..c140d5196 100644
--- a/jshERP-web/src/components/setting/SettingDrawer.vue
+++ b/jshERP-web/src/components/setting/SettingDrawer.vue
@@ -89,79 +89,79 @@
             <div style="float:left; width: 40%; line-height: 30px">{{langSetTitle}}</div>
             <div style="float:left; width: 60%" id="langSetting">
               <a-select placeholder="请选择语言" showSearch optionFilterProp="children" :value="currentLang" @change="handleChangeLang" style="width:150px">
-                <a-select-option value="chinese_simplified">简体中文</a-select-option>
-                <a-select-option value="chinese_traditional">繁體中文</a-select-option>
-                <a-select-option value="english">English</a-select-option>
-                <a-select-option value="korean">한국어</a-select-option>
-                <a-select-option value="japanese">しろうと</a-select-option>
-                <a-select-option value="vietnamese">Tiếng Việt</a-select-option>
-                <a-select-option value="hindi">हिन्दी</a-select-option>
-                <a-select-option value="russian">Русский язык</a-select-option>
-                <a-select-option value="french">Français</a-select-option>
-                <a-select-option value="ukrainian">УкраїнськаName</a-select-option>
-                <a-select-option value="norwegian">Norge</a-select-option>
-                <a-select-option value="welsh">color name</a-select-option>
-                <a-select-option value="dutch">nederlands</a-select-option>
-                <a-select-option value="filipino">Pilipino</a-select-option>
-                <a-select-option value="lao">ກະຣຸນາ</a-select-option>
-                <a-select-option value="telugu">తెలుగుQFontDatabase</a-select-option>
-                <a-select-option value="romanian">Română</a-select-option>
-                <a-select-option value="nepali">नेपालीName</a-select-option>
-                <a-select-option value="haitian_creole">Kreyòl ayisyen</a-select-option>
-                <a-select-option value="czech">český</a-select-option>
-                <a-select-option value="swedish">Svenska</a-select-option>
-                <a-select-option value="malagasy">Malagasy</a-select-option>
-                <a-select-option value="burmese">ဗာရမ်</a-select-option>
-                <a-select-option value="pashto">پښتوName</a-select-option>
-                <a-select-option value="thai">คนไทย</a-select-option>
-                <a-select-option value="armenian">Արմենյան</a-select-option>
-                <a-select-option value="persian">Persian</a-select-option>
-                <a-select-option value="kurdish">Kurdî</a-select-option>
-                <a-select-option value="turkish">Türkçe</a-select-option>
-                <a-select-option value="bulgarian">български</a-select-option>
-                <a-select-option value="malay">Malay</a-select-option>
-                <a-select-option value="swahili">Kiswahili</a-select-option>
-                <a-select-option value="oriya">ଓଡିଆ</a-select-option>
-                <a-select-option value="icelandic">ÍslandName</a-select-option>
-                <a-select-option value="irish">Íris</a-select-option>
-                <a-select-option value="khmer">ខ្មែរKCharselect unicode block name</a-select-option>
-                <a-select-option value="gujarati">ગુજરાતી</a-select-option>
-                <a-select-option value="slovak">Slovenská</a-select-option>
-                <a-select-option value="kannada">ಕನ್ನಡ್Name</a-select-option>
-                <a-select-option value="hebrew">היברית</a-select-option>
-                <a-select-option value="hungarian">magyar</a-select-option>
-                <a-select-option value="marathi">मराठीName</a-select-option>
-                <a-select-option value="tamil">தாமில்</a-select-option>
-                <a-select-option value="estonian">eesti keel</a-select-option>
-                <a-select-option value="malayalam">മലമാലം</a-select-option>
-                <a-select-option value="inuktitut">ᐃᓄᒃᑎᑐᑦ</a-select-option>
-                <a-select-option value="arabic">بالعربية</a-select-option>
-                <a-select-option value="deutsch">Deutsch</a-select-option>
-                <a-select-option value="slovene">slovenščina</a-select-option>
-                <a-select-option value="bengali">বেঙ্গালী</a-select-option>
-                <a-select-option value="urdu">اوردو</a-select-option>
-                <a-select-option value="azerbaijani">azerbaijani</a-select-option>
-                <a-select-option value="portuguese">português</a-select-option>
-                <a-select-option value="samoan">lifiava</a-select-option>
-                <a-select-option value="afrikaans">afrikaans</a-select-option>
-                <a-select-option value="tongan">汤加语</a-select-option>
-                <a-select-option value="greek">ελληνικά</a-select-option>
-                <a-select-option value="indonesian">IndonesiaName</a-select-option>
-                <a-select-option value="spanish">Español</a-select-option>
-                <a-select-option value="danish">dansk</a-select-option>
-                <a-select-option value="amharic">amharic</a-select-option>
-                <a-select-option value="punjabi">ਪੰਜਾਬੀName</a-select-option>
-                <a-select-option value="albanian">albanian</a-select-option>
-                <a-select-option value="lithuanian">Lietuva</a-select-option>
-                <a-select-option value="italian">italiano</a-select-option>
-                <a-select-option value="maltese">Malti</a-select-option>
-                <a-select-option value="finnish">suomi</a-select-option>
-                <a-select-option value="catalan">català</a-select-option>
-                <a-select-option value="croatian">hrvatski</a-select-option>
-                <a-select-option value="bosnian">bosnian</a-select-option>
-                <a-select-option value="polish">Polski</a-select-option>
-                <a-select-option value="latvian">latviešu</a-select-option>
-                <a-select-option value="maori">Maori</a-select-option>
+                <a-select-option class="ignore" value="chinese_simplified">简体中文</a-select-option>
+                <a-select-option class="ignore" value="chinese_traditional">繁體中文</a-select-option>
+                <a-select-option class="ignore" value="english">English</a-select-option>
+                <a-select-option class="ignore" value="korean">한국어</a-select-option>
+                <a-select-option class="ignore" value="japanese">しろうと</a-select-option>
+                <a-select-option class="ignore" value="vietnamese">Tiếng Việt</a-select-option>
+                <a-select-option class="ignore" value="hindi">हिन्दी</a-select-option>
+                <a-select-option class="ignore" value="russian">Русский язык</a-select-option>
+                <a-select-option class="ignore" value="french">Français</a-select-option>
+                <a-select-option class="ignore" value="ukrainian">УкраїнськаName</a-select-option>
+                <a-select-option class="ignore" value="norwegian">Norge</a-select-option>
+                <a-select-option class="ignore" value="welsh">color name</a-select-option>
+                <a-select-option class="ignore" value="dutch">nederlands</a-select-option>
+                <a-select-option class="ignore" value="filipino">Pilipino</a-select-option>
+                <a-select-option class="ignore" value="lao">ກະຣຸນາ</a-select-option>
+                <a-select-option class="ignore" value="telugu">తెలుగుQFontDatabase</a-select-option>
+                <a-select-option class="ignore" value="romanian">Română</a-select-option>
+                <a-select-option class="ignore" value="nepali">नेपालीName</a-select-option>
+                <a-select-option class="ignore" value="haitian_creole">Kreyòl ayisyen</a-select-option>
+                <a-select-option class="ignore" value="czech">český</a-select-option>
+                <a-select-option class="ignore" value="swedish">Svenska</a-select-option>
+                <a-select-option class="ignore" value="malagasy">Malagasy</a-select-option>
+                <a-select-option class="ignore" value="burmese">ဗာရမ်</a-select-option>
+                <a-select-option class="ignore" value="pashto">پښتوName</a-select-option>
+                <a-select-option class="ignore" value="thai">คนไทย</a-select-option>
+                <a-select-option class="ignore" value="armenian">Արմենյան</a-select-option>
+                <a-select-option class="ignore" value="persian">Persian</a-select-option>
+                <a-select-option class="ignore" value="kurdish">Kurdî</a-select-option>
+                <a-select-option class="ignore" value="turkish">Türkçe</a-select-option>
+                <a-select-option class="ignore" value="bulgarian">български</a-select-option>
+                <a-select-option class="ignore" value="malay">Malay</a-select-option>
+                <a-select-option class="ignore" value="swahili">Kiswahili</a-select-option>
+                <a-select-option class="ignore" value="oriya">ଓଡିଆ</a-select-option>
+                <a-select-option class="ignore" value="icelandic">ÍslandName</a-select-option>
+                <a-select-option class="ignore" value="irish">Íris</a-select-option>
+                <a-select-option class="ignore" value="khmer">ខ្មែរKCharselect unicode block name</a-select-option>
+                <a-select-option class="ignore" value="gujarati">ગુજરાતી</a-select-option>
+                <a-select-option class="ignore" value="slovak">Slovenská</a-select-option>
+                <a-select-option class="ignore" value="kannada">ಕನ್ನಡ್Name</a-select-option>
+                <a-select-option class="ignore" value="hebrew">היברית</a-select-option>
+                <a-select-option class="ignore" value="hungarian">magyar</a-select-option>
+                <a-select-option class="ignore" value="marathi">मराठीName</a-select-option>
+                <a-select-option class="ignore" value="tamil">தாமில்</a-select-option>
+                <a-select-option class="ignore" value="estonian">eesti keel</a-select-option>
+                <a-select-option class="ignore" value="malayalam">മലമാലം</a-select-option>
+                <a-select-option class="ignore" value="inuktitut">ᐃᓄᒃᑎᑐᑦ</a-select-option>
+                <a-select-option class="ignore" value="arabic">بالعربية</a-select-option>
+                <a-select-option class="ignore" value="deutsch">Deutsch</a-select-option>
+                <a-select-option class="ignore" value="slovene">slovenščina</a-select-option>
+                <a-select-option class="ignore" value="bengali">বেঙ্গালী</a-select-option>
+                <a-select-option class="ignore" value="urdu">اوردو</a-select-option>
+                <a-select-option class="ignore" value="azerbaijani">azerbaijani</a-select-option>
+                <a-select-option class="ignore" value="portuguese">português</a-select-option>
+                <a-select-option class="ignore" value="samoan">lifiava</a-select-option>
+                <a-select-option class="ignore" value="afrikaans">afrikaans</a-select-option>
+                <a-select-option class="ignore" value="tongan">汤加语</a-select-option>
+                <a-select-option class="ignore" value="greek">ελληνικά</a-select-option>
+                <a-select-option class="ignore" value="indonesian">IndonesiaName</a-select-option>
+                <a-select-option class="ignore" value="spanish">Español</a-select-option>
+                <a-select-option class="ignore" value="danish">dansk</a-select-option>
+                <a-select-option class="ignore" value="amharic">amharic</a-select-option>
+                <a-select-option class="ignore" value="punjabi">ਪੰਜਾਬੀName</a-select-option>
+                <a-select-option class="ignore" value="albanian">albanian</a-select-option>
+                <a-select-option class="ignore" value="lithuanian">Lietuva</a-select-option>
+                <a-select-option class="ignore" value="italian">italiano</a-select-option>
+                <a-select-option class="ignore" value="maltese">Malti</a-select-option>
+                <a-select-option class="ignore" value="finnish">suomi</a-select-option>
+                <a-select-option class="ignore" value="catalan">català</a-select-option>
+                <a-select-option class="ignore" value="croatian">hrvatski</a-select-option>
+                <a-select-option class="ignore" value="bosnian">bosnian</a-select-option>
+                <a-select-option class="ignore" value="polish">Polski</a-select-option>
+                <a-select-option class="ignore" value="latvian">latviešu</a-select-option>
+                <a-select-option class="ignore" value="maori">Maori</a-select-option>
               </a-select>
             </div>
           </div>