jwyu 1 tahun lalu
induk
melakukan
3f8c2b22a2
3 mengubah file dengan 7 tambahan dan 7 penghapusan
  1. 2 3
      src/lang/en.js
  2. 1 1
      src/lang/modules/ReportManagement/SmartReport.js
  3. 4 3
      src/lang/zh.js

+ 2 - 3
src/lang/en.js

@@ -4,11 +4,10 @@
 import { transformLanguageData } from "./langUtils";
 import commonLang from "./commonLang";
 
-const allEn = [];
+let allEn = {};
 const importAllLang = (en) => {
   en.keys().forEach((key) => {
-    // console.log(en(key).default);
-    allEn.push(en(key).default);
+    allEn={...allEn,...en(key).default}
   });
 };
 importAllLang(require.context("./modules", true, /\En.js$/));

+ 1 - 1
src/lang/modules/ReportManagement/SmartReport.js

@@ -3,7 +3,7 @@
  */
 
 /* 英文 */
-export const SmartReportEnS = {
+export const SmartReportEn = {
   smart_add_report:'Add report',
   smart_filter_options:'Filter options',
   smart_publish_time:'Publish Time',

+ 4 - 3
src/lang/zh.js

@@ -4,16 +4,17 @@
 import { transformLanguageData } from "./langUtils";
 import commonLang from "./commonLang";
 
-const allZh = [];
+let allZh = {};
 const importAllLang = (zh) => {
   zh.keys().forEach((key) => {
-    console.log(...zh(key).default,'--==--');
+    allZh={...allZh,...zh(key).default}
   });
 };
+
 importAllLang(require.context("./modules", true, /\Zh.js$/));
 
 export default {
-  // ...allZh,
+  ...allZh,
   // 公共模块
   Dialog: transformLanguageData(commonLang.Dialog, "zh"),
   Confirm: transformLanguageData(commonLang.Confirm, "zh"),