plain-design 1.0.0-beta.57 → 1.0.0-beta.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plain-design",
-  "version": "1.0.0-beta.57",
+  "version": "1.0.0-beta.59",
   "description": "",
   "main": "dist/plain-design.min.js",
   "module": "dist/plain-design.commonjs.min.js",

package/src/packages/i18n/i18n.utils.ts

@@ -1,6 +1,7 @@
 import {createSyncHooks, reactive} from "plain-design-composition";
 import {ZhCnLocale} from './lang/zh-cn';
 import {deepmerge} from "../components/PageThemeUtils/deepmerge";
+import {PlainObject} from "plain-utils/utils/event";
 
 /**
  /**
@@ -159,19 +160,53 @@ export const i18n = (() => {
    */
   const setLangs = (langs: any) => {
 
-    let mergeLangs = {} as any;
+    let result = {} as any;
     Object.keys({ ...state.langs, ...langs }).forEach(localeName => {
-      mergeLangs[localeName] = {
-        ...state.langs[localeName],
-        ...langs[localeName]
-      };
+      result[localeName] = mergeLangs(
+        state.langs[localeName],
+        langs[localeName],
+        (lang1, lang2) => {
+          return mergeLangs(
+            lang1,
+            lang2,
+            (item1, item2) => {
+              return {
+                ...item1,
+                ...item2,
+              };
+            }
+          );
+        }
+      );
     });
 
-    state.langs = mergeLangs;
+    state.langs = result;
 
     hooks.onUpdateLangs.exec(undefined);
   };
 
+  const mergeLangs = (lang1: PlainObject | undefined, lang2: PlainObject | undefined, merge: (val1: PlainObject, val2: PlainObject) => PlainObject | undefined): PlainObject | undefined => {
+
+    if (!lang1 || !lang2) {
+      return lang1 || lang2;
+    }
+
+    const keys = new Set<string>();
+    Object.keys(lang1).forEach(key => {keys.add(key);});
+    Object.keys(lang2).forEach(key => {keys.add(key);});
+    const result = {} as PlainObject;
+    keys.forEach((key) => {
+      const val1 = lang1[key];
+      const val2 = lang2[key];
+      if (!!val1 && !!val2) {
+        result[key] = merge(val1, val2);
+      } else {
+        result[key] = val1 || val2;
+      }
+    });
+    return result;
+  };
+
   return {
     $t,
     $intl,