plain-design 1.0.0-beta.61 → 1.0.0-beta.63

package/package.json

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

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

@@ -203,7 +203,7 @@ export const i18n = (() => {
       const val1 = lang1[key];
       const val2 = lang2[key];
       if (!!val1 && !!val2) {
-        if (typeof lang1 === "object" && typeof lang2 === "object") {
+        if (typeof val1 === "object" && typeof val2 === "object") {
           result[key] = merge(val1, val2);
         } else {
           result[key] = val2;

package/src/packages/i18n/lang/en-us.ts

@@ -53,6 +53,10 @@ export const EnUsLocale: tZhCnLocale = {
     lookUp: 'Look up',
     operation: 'Operation',
     noFilter: 'No filter',
+    back: 'Back',
+    error403: 'You do not have permission to access this page',
+    error404: 'The page does not exist or has expired',
+    error500: 'Page abnormality, please report the issue to the system administrator',
     validate: {
       require: ' Require',
       notMatchPattern: ' not match patter',

package/src/packages/i18n/lang/zh-cn.ts

@@ -51,6 +51,10 @@ export const ZhCnLocale = {
     lookUp: '查看',
     operation: '操作',
     noFilter: '暂无筛选',
+    back: '返回',
+    error403: '您没有权限访问该页面',
+    error404: '页面不存在或者页面已经失效',
+    error500: '页面异常，请向系统管理员反馈问题',
     validate: {
       require: '必填',
       notMatchPattern: '不符合表达式',