ronds-metadata 1.0.83 → 1.0.86

package/es/comps/Editable/comps/EditableHeardCell.js

@@ -16,6 +16,7 @@ import React from 'react';
 import { EditableContext } from '../interface';
 import { tr } from '../../../framework/locale';
 import "./index.css";
+import Texty from './Texty';
 
 var EditableHeardCell = function EditableHeardCell(props) {
   var title = props.title,
@@ -157,7 +158,7 @@ var EditableHeardCell = function EditableHeardCell(props) {
   }))), /*#__PURE__*/React.createElement("div", {
     onMouseOver: onMouseOver,
     onMouseLeave: onMouseLeave
-  }, children)));
+  }, /*#__PURE__*/React.createElement(Texty, null, children))));
 };
 
 export default EditableHeardCell;

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

@@ -388,7 +388,7 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
         }
       }))), (refIds[index] || refSchema[index]) && /*#__PURE__*/React.createElement("div", {
         style: {
-          border: 'var(--color-border-1)',
+          border: 'var(--ronds-metadata-color-border-1)',
           padding: '10px',
           marginBottom: '10px'
         }

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

@@ -130,7 +130,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
           case 'number':
             return /*#__PURE__*/React.createElement("div", {
               style: {
-                border: 'var(--color-border-1)',
+                border: 'var(--ronds-metadata-color-border-1)',
                 padding: '10px',
                 marginBottom: '10px'
               }
@@ -154,7 +154,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
           case 'ref':
             return /*#__PURE__*/React.createElement("div", {
               style: {
-                border: '1px solid var(--color-border-1)',
+                border: '1px solid var(--ronds-metadata-color-border-1)',
                 padding: '10px',
                 display: 'flex',
                 alignItems: 'center',
@@ -214,7 +214,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
           case 'array':
             return /*#__PURE__*/React.createElement("div", {
               style: {
-                border: '1px solid var(--color-border-1)',
+                border: '1px solid var(--ronds-metadata-color-border-1)',
                 borderRadius: '5px',
                 padding: '10px',
                 marginBottom: '10px',
@@ -301,7 +301,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
           case 'enum':
             return /*#__PURE__*/React.createElement("div", {
               style: {
-                border: '1px solid var(--color-border-1)',
+                border: '1px solid var(--ronds-metadata-color-border-1)',
                 padding: '10px',
                 marginBottom: '10px'
               }

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

@@ -208,7 +208,7 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
         }
       }))), refIds[index] && /*#__PURE__*/React.createElement("div", {
         style: {
-          border: '1px solid var(--color-border-1)',
+          border: '1px solid var(--ronds-metadata-color-border-1)',
           padding: '10px',
           marginBottom: '10px'
         }

package/es/comps/MetadataEditV2/components/MetaPropsEdit.js

@@ -158,7 +158,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
           case 'number':
             return /*#__PURE__*/React.createElement("div", {
               style: {
-                border: '1px solid var(--color-border-1)',
+                border: '1px solid var(--ronds-metadata-color-border-1)',
                 padding: '10px',
                 marginBottom: '10px'
               }
@@ -179,7 +179,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
           case 'ref':
             return /*#__PURE__*/React.createElement("div", {
               style: {
-                border: '1px solid var(--color-border-1)',
+                border: '1px solid var(--ronds-metadata-color-border-1)',
                 padding: '10px',
                 display: 'flex',
                 alignItems: 'center',
@@ -231,7 +231,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
           case 'array':
             return /*#__PURE__*/React.createElement("div", {
               style: {
-                border: '1px solid var(--color-border-1)',
+                border: '1px solid var(--ronds-metadata-color-border-1)',
                 borderRadius: '5px',
                 padding: '10px',
                 marginBottom: '10px',
@@ -309,7 +309,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
           case 'enum':
             return /*#__PURE__*/React.createElement("div", {
               style: {
-                border: '1px solid var(--color-border-1)',
+                border: '1px solid var(--ronds-metadata-color-border-1)',
                 padding: '10px',
                 marginBottom: '10px'
               }

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

@@ -73,7 +73,7 @@ function Index(props) {
   }, help || (items === null || items === void 0 ? void 0 : items.type))), /*#__PURE__*/React.createElement("div", {
     style: {
       padding: '10px',
-      border: '1px solid var(--color-border-1)',
+      border: '1px solid var(--ronds-metadata-color-border-1)',
       width: '100%',
       borderRadius: '4px'
     }

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

@@ -161,7 +161,7 @@ function Index(props) {
     }, extraInfo.label || id)), /*#__PURE__*/React.createElement("div", {
       style: {
         padding: '10px',
-        border: '1px solid var(--color-border-1)',
+        border: '1px solid var(--ronds-metadata-color-border-1)',
         width: '100%',
         borderRadius: '4px'
       }
@@ -176,7 +176,7 @@ function Index(props) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       style: {
         padding: '10px',
-        border: '1px solid var(--color-border-1)',
+        border: '1px solid var(--ronds-metadata-color-border-1)',
         width: '100%',
         borderRadius: '4px'
       }

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

@@ -9,7 +9,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-05 09:26:37
+ * @LastEditTime: 2022-05-10 16:14:43
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -38,16 +38,12 @@ function Index(props) {
   };
 
   var options = React.useMemo(function () {
-    var _extraInfo$enum;
-
     var _options = [];
 
     var _enum = props.enum || [];
 
-    if ((extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$enum = extraInfo.enum) === null || _extraInfo$enum === void 0 ? void 0 : _extraInfo$enum.value) || (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.value)) {
-      var _extraInfo$enum2;
-
-      _enum = (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$enum2 = extraInfo.enum) === null || _extraInfo$enum2 === void 0 ? void 0 : _extraInfo$enum2.value) || (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.value);
+    if (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.value) {
+      _enum = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.value;
     } // 目前是更具那么的id判断的，暂未考虑重名问题
 
 
@@ -84,7 +80,7 @@ function Index(props) {
       help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
       tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
     }), /*#__PURE__*/React.createElement(_Select, {
-      mode: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.mode,
+      mode: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.isMutiple) ? 'multiple' : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.mode,
       onSelect: onSelect,
       disabled: (_extraInfo$disabled = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled !== void 0 ? _extraInfo$disabled : disabled,
       placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
@@ -105,7 +101,7 @@ function Index(props) {
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
   }, /*#__PURE__*/React.createElement(_Select, {
-    mode: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.mode,
+    mode: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.isMutiple) ? 'multiple' : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.mode,
     onSelect: onSelect,
     disabled: (_extraInfo$disabled2 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled2 !== void 0 ? _extraInfo$disabled2 : disabled,
     placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
@@ -127,7 +123,7 @@ function Index(props) {
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
   }), /*#__PURE__*/React.createElement(_Select, {
-    mode: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.mode,
+    mode: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.isMutiple) ? 'multiple' : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.mode,
     onSelect: onSelect,
     disabled: (_extraInfo$disabled3 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled3 !== void 0 ? _extraInfo$disabled3 : disabled,
     placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,

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

@@ -1,6 +1,7 @@
 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,6 +11,7 @@ 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/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 15:52:41
+ * @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: 'zh-CN',
+  locale: window.localStorage.getItem(localeKey) || 'zh-CN',
   theme: 'normal',
   msgpack: false,
   openLoading: true,
@@ -24,7 +24,6 @@ export var globalSettingStream = new BehaviorSubject(defaultConfig);
 globalSettingStream.pipe(map(function (p) {
   return p.locale;
 }), distinctUntilChanged()).subscribe(function (p) {
-  initLocaleMessage();
   setLocale(p);
 });
 globalSettingStream.pipe(map(function (p) {

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/es/framework/metadata/index.js

@@ -294,8 +294,10 @@ export var JsonMetadataProvider = /*#__PURE__*/function (_MetadataProvider) {
       } else if (valueType === 'text') {
         return this.get_type('str');
       } else if (valueType == 'enum') {
+        var _value$enum;
+
         var _enum = [];
-        value['enum'].forEach(function (en) {
+        (_value$enum = value['enum']) === null || _value$enum === void 0 ? void 0 : _value$enum.forEach(function (en) {
           _enum.push(en['value']);
         });
         return this._make_enum(value.id, _enum);

package/es/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-09 11:58:09
+ * @LastEditTime: 2022-05-11 09:02:18
  */
 import "./theme.css";
 export { default as MetadataEdit } from './comps/MetadataEdit';

package/es/theme.css

@@ -1,6 +1,6 @@
 .ronds-metadata-dark {
-  --color-border-1: #314162;
+  --ronds-metadata-color-border-1: #314162;
 }
 .ronds-metadata-normal {
-  --color-border-1: #d9d9d9;
+  --ronds-metadata-color-border-1: #d9d9d9;
 }

package/package.json

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