ronds-metadata 1.0.81 → 1.0.84

package/es/comps/Editable/comps/EditableAction.js

@@ -5,7 +5,7 @@ import _Button from "antd/es/button";
 import React from 'react';
 import { EditableContext } from '../interface';
 import { isFreeEditRow } from '../utils';
-import { tr } from '@/framework/locale';
+import { tr } from '../../../framework/locale';
 
 var EditableAction = function EditableAction(props) {
   var _editConfig$editCellK;

package/es/comps/MetadataEdit/components/MetaFieldsEdit.js

@@ -189,6 +189,11 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
+            if (!defaultValues) {
+              _context4.next = 17;
+              break;
+            }
+
             _ruleTypes = ruleTypes;
             _refIds = refIds;
             form.setFieldsValue({
@@ -196,40 +201,40 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
             });
             i = 0;
 
-          case 4:
+          case 5:
             if (!(i < defaultValues.length)) {
-              _context4.next = 14;
+              _context4.next = 15;
               break;
             }
 
             _ruleTypes[i] = defaultValues[i].type;
 
             if (!(defaultValues[i].type === 'ref')) {
-              _context4.next = 11;
+              _context4.next = 12;
               break;
             }
 
             if (!(defaultValues[i].refId.indexOf('Rule.Form') > -1)) {
-              _context4.next = 10;
+              _context4.next = 11;
               break;
             }
 
-            _context4.next = 10;
+            _context4.next = 11;
             return processSpecialRuleData(defaultValues[i].refId, i);
 
-          case 10:
+          case 11:
             _refIds[i] = defaultValues[i].refId;
 
-          case 11:
+          case 12:
             i++;
-            _context4.next = 4;
+            _context4.next = 5;
             break;
 
-          case 14:
+          case 15:
             setRefIds(_objectSpread({}, _refIds));
             setRuleTypes(_objectSpread({}, _ruleTypes));
 
-          case 16:
+          case 17:
           case "end":
             return _context4.stop();
         }

package/es/comps/locales/index.d.ts

@@ -1,2 +1 @@
-export declare const initLocaleMessage: () => void;
 export { setLocale, getLocale } from '../../framework/locale';

package/es/comps/locales/index.js

@@ -1,10 +1,8 @@
 import zhCN from './zh-CN';
 import enUS from './en-US';
 import { initLocale } from '../../framework/locale';
-export var initLocaleMessage = function initLocaleMessage() {
-  initLocale({
-    'zh-CN': zhCN,
-    'en-US': enUS
-  });
-};
+initLocale({
+  'zh-CN': zhCN,
+  'en-US': enUS
+});
 export { setLocale, getLocale } from '../../framework/locale';

package/es/config.js

@@ -3,17 +3,17 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-09 14:06:06
+ * @LastEditTime: 2022-05-10 08:41:39
  */
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { distinctUntilChanged } from 'rxjs/internal/operators/distinctUntilChanged';
 import { map } from 'rxjs/internal/operators/map';
-import { initLocaleMessage } from './comps/locales/index';
+import { setLocale } from './comps/locales/index';
 import * as jq from './framework/libs/jquery.min.js';
-import { setLocale } from './framework/locale/index';
+import { localeKey } from './framework/locale';
 window.jQuery = window.jQuery || jq;
 var defaultConfig = {
-  locale: 'en-US',
+  locale: window.localStorage.getItem(localeKey) || 'zh-CN',
   theme: 'normal',
   msgpack: false,
   openLoading: true,
@@ -21,9 +21,10 @@ var defaultConfig = {
 };
 export var cssPrefix = 'ronds-metadata';
 export var globalSettingStream = new BehaviorSubject(defaultConfig);
-globalSettingStream.subscribe(function (p) {
-  initLocaleMessage();
-  setLocale(p.locale);
+globalSettingStream.pipe(map(function (p) {
+  return p.locale;
+}), distinctUntilChanged()).subscribe(function (p) {
+  setLocale(p);
 });
 globalSettingStream.pipe(map(function (p) {
   return p.theme;

package/es/framework/locale/index.d.ts

@@ -1,4 +1,5 @@
 import DI18n from './dil8/index';
+export declare const localeKey = "epm_locale";
 declare let di18n: DI18n;
 export declare function initLocale(messages: Record<'zh-CN' | 'en-US', Record<string, string>>): void;
 export declare function setLocale(l: 'zh-CN' | 'en-US'): void;

package/es/framework/locale/index.js

@@ -1,6 +1,7 @@
 import DI18n from './dil8/index';
+export var localeKey = 'epm_locale';
 var di18n = new DI18n({
-  locale: 'zh-CN',
+  locale: window.localStorage.getItem(localeKey) || 'zh-CN',
   isReplace: false,
   messages: {}
 });
@@ -8,6 +9,7 @@ export function initLocale(messages) {
   di18n.setMessages(messages);
 }
 export function setLocale(l) {
+  window.localStorage.setItem(localeKey, l || '');
   di18n.setLocale(l);
 }
 export function getLocale() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.0.81",
+  "version": "1.0.84",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",