ronds-metadata 1.0.86 → 1.0.89

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

@@ -72,7 +72,7 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
 
               if (_refId === 'com.ronds.schema.default.Rule.Form') {
                 _properties = _properties.filter(function (it) {
-                  return it.id === 'common' || it.id === type;
+                  return it.id === 'common' || it.id === 'common-en-US' || it.id === type;
                 });
               }
 

package/es/comps/MetadataForm/DataCell/Array.js

@@ -8,7 +8,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-07 10:48:55
+ * @LastEditTime: 2022-05-11 11:13:58
  */
 import React from 'react';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
@@ -16,6 +16,7 @@ import { MetadataFormContext } from '../interface';
 import { useGetExtraInfo } from '../hooks';
 import { getDataCell } from '../utils';
 import { deepClone } from '../../../utils';
+import { tr } from '../../../framework/locale';
 
 function Index(props) {
   var _fieldRule$, _fieldRule$$value;
@@ -116,7 +117,7 @@ function Index(props) {
         return add();
       },
       icon: /*#__PURE__*/React.createElement(PlusOutlined, null)
-    }, "\u6DFB\u52A0")));
+    }, tr('添加'))));
   })));
 }
 

package/es/comps/MetadataForm/DataCell/Ref.js

@@ -48,10 +48,7 @@ function Index(props) {
   var _React$useState7 = React.useState(''),
       _React$useState8 = _slicedToArray(_React$useState7, 2),
       help = _React$useState8[0],
-      setHelp = _React$useState8[1]; // if (id === 'enum') {
-  //   debugger;
-  // }
-
+      setHelp = _React$useState8[1];
 
   var onSearch = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     var param, server, res, _options, i, obj;

package/es/comps/MetadataForm/hooks/index.js

@@ -5,13 +5,19 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: your name
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-05 09:37:02
+ * @LastEditTime: 2022-05-11 10:36:05
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \ronds.metadata\src\comps\MetadataForm\hooks\index.tsx
  */
+import { getLocale } from '../../../framework/locale';
 import moment from 'moment';
-import React from 'react';
+import React from 'react'; // 主题样式名映射
+
+var languageMap = {
+  'zh-CN': 'common',
+  'en-US': 'common-en-US'
+};
 export var useGetExtraInfo = function useGetExtraInfo(fields, id, form, type) {
   var _React$useState = React.useState({}),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -28,11 +34,12 @@ export var useGetExtraInfo = function useGetExtraInfo(fields, id, form, type) {
 
         for (var k in extraInfo) {
           _extraInfo[k] = extraInfo[k];
-        } // 兼容 common公共的属性
-
+        }
 
-        _extraInfo = _objectSpread(_objectSpread(_objectSpread({}, _extraInfo), _extraInfo['common']), _extraInfo[type]);
+        // 兼容 common公共的属性
+        _extraInfo = _objectSpread(_objectSpread(_objectSpread({}, _extraInfo), _extraInfo[languageMap[getLocale()]]), _extraInfo[type]);
         delete _extraInfo.common;
+        delete _extraInfo['common-en-US'];
         delete _extraInfo[type];
 
         // 时间格式转化

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

@@ -1,7 +1,6 @@
 import { FormInstance } from 'antd/lib/form/hooks/useForm';
 import './index.less';
 import { IMetaData } from '../../framework/metadata/types';
-import '../../theme.less';
 interface IMetadataFormProps {
     /**
      * 通过元数据JsonShema渲染表单

package/es/comps/MetadataForm/index.js

@@ -11,7 +11,6 @@ import { JsonMetadataProvider } from '../../framework/metadata';
 import { MetadataService } from '../../framework/metadata/MetadataService';
 import useMemoSubject from '../../framework/rxjs-hooks/useMemoSubject';
 import useObservable from '../../framework/rxjs-hooks/useObservable';
-import "../../theme.css";
 
 var MetadataForm = function MetadataForm(props) {
   var _Form$useForm = _Form.useForm(),

package/es/comps/locales/en-US.d.ts

@@ -1,6 +1,7 @@
 declare const _default: {
     操作: string;
     添加一行: string;
+    添加: string;
     编辑: string;
     删除: string;
     确定: string;

package/es/comps/locales/en-US.js

@@ -1,6 +1,7 @@
 export default {
   操作: 'Operation',
   添加一行: 'Add New Line',
+  添加: 'Add',
   编辑: 'Edit',
   删除: 'Delete',
   确定: 'Confirm',

package/es/comps/locales/zh-CN.d.ts

@@ -1,6 +1,7 @@
 declare const _default: {
     操作: string;
     添加一行: string;
+    添加: string;
     编辑: string;
     删除: string;
     确定: string;

package/es/comps/locales/zh-CN.js

@@ -1,6 +1,7 @@
 export default {
   操作: '操作',
   添加一行: '添加一行',
+  添加: '添加',
   编辑: '编辑',
   删除: '删除',
   确定: '确定',

package/package.json

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