ronds-metadata 1.0.79 → 1.0.82

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

@@ -5,6 +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';
 
 var EditableAction = function EditableAction(props) {
   var _editConfig$editCellK;
@@ -62,44 +63,44 @@ var EditableAction = function EditableAction(props) {
     disabled: (editConfig.curRow || editConfig.curRow === 0) && editConfig.curRow !== record._rowKey_,
     size: "small",
     onClick: onEdit,
-    title: '编辑'
-  }, "\u7F16\u8F91")), editConfig.curRow === record._rowKey_ && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
+    title: tr('编辑')
+  }, tr('编辑'))), editConfig.curRow === record._rowKey_ && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
     type: "link",
     onClick: onSave,
     style: {
       padding: 0,
       marginRight: '10px'
     }
-  }, "\u786E\u5B9A"), editConfig.type === 'edit' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
+  }, tr('确定')), editConfig.type === 'edit' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
     type: "link",
     onClick: onCancel,
     style: {
       padding: 0,
       marginRight: '10px'
     }
-  }, "\u53D6\u6D88")))), type === 'freedom' && /*#__PURE__*/React.createElement(React.Fragment, null, (record._rowKey_ === (editConfig === null || editConfig === void 0 ? void 0 : (_editConfig$editCellK = editConfig.editCellKey) === null || _editConfig$editCellK === void 0 ? void 0 : _editConfig$editCellK.rowIndex) || isFreeEditRow(editConfig.curRow, record._rowKey_)) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
+  }, tr('取消'))))), type === 'freedom' && /*#__PURE__*/React.createElement(React.Fragment, null, (record._rowKey_ === (editConfig === null || editConfig === void 0 ? void 0 : (_editConfig$editCellK = editConfig.editCellKey) === null || _editConfig$editCellK === void 0 ? void 0 : _editConfig$editCellK.rowIndex) || isFreeEditRow(editConfig.curRow, record._rowKey_)) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
     type: "link",
     onClick: onSave,
     style: {
       padding: 0,
       marginRight: '10px'
     }
-  }, "\u786E\u5B9A"))), /*#__PURE__*/React.createElement(_Popconfirm, {
+  }, tr('确定')))), /*#__PURE__*/React.createElement(_Popconfirm, {
     placement: 'left',
-    title: "\u786E\u8BA4\u5220\u9664\u8BE5\u6761\u6570\u636E\uFF1F",
+    title: tr('确认删除该条数据'),
     onConfirm: onDelete,
     onCancel: function onCancel(e) {
       e.stopPropagation();
     },
-    okText: "\u786E\u5B9A",
-    cancelText: "\u53D6\u6D88"
+    okText: tr('确定'),
+    cancelText: tr('取消')
   }, /*#__PURE__*/React.createElement(_Button, {
     type: "link",
     style: {
       padding: 0,
       marginRight: '10px'
     }
-  }, "\u5220\u9664")));
+  }, tr('删除'))));
 };
 
 export default EditableAction;

package/es/comps/Editable/comps/EditableCell.js

@@ -8,6 +8,7 @@ import { EditableContext } from '../interface';
 import { getDataCell, isFreeEditCell, isFreeEditRow } from '../utils';
 import "./index.css";
 import Texty from './Texty';
+import { tr } from '../../../framework/locale';
 
 var EditableCell = function EditableCell(props) {
   var title = props.title,
@@ -30,13 +31,13 @@ var EditableCell = function EditableCell(props) {
     if ((editConfig === null || editConfig === void 0 ? void 0 : editConfig.curRow) && (editConfig === null || editConfig === void 0 ? void 0 : editConfig.curRow) !== 'undefined') {
       if (isFreeEditRow(editConfig.curRow, rowIndex)) return;
 
-      _message.warning('请先保存正在编辑的行');
+      _message.warning(tr('请先保存正在编辑的行'));
 
       return;
     }
 
     if (((editConfig === null || editConfig === void 0 ? void 0 : (_editConfig$editCellK = editConfig.editCellKey) === null || _editConfig$editCellK === void 0 ? void 0 : _editConfig$editCellK.rowIndex) || (editConfig === null || editConfig === void 0 ? void 0 : (_editConfig$editCellK2 = editConfig.editCellKey) === null || _editConfig$editCellK2 === void 0 ? void 0 : _editConfig$editCellK2.rowIndex) === 0) && rowIndex !== editConfig.editCellKey.rowIndex) {
-      _message.warning('请先保存正在编辑的行');
+      _message.warning(tr('请先保存正在编辑的行'));
 
       return;
     }
@@ -51,9 +52,6 @@ var EditableCell = function EditableCell(props) {
   };
 
   var onCellClick = function onCellClick() {
-    // if (!isFreeEditCell(editConfig.editCellKey, dataIndex, rowIndex)) {
-    //   editableStream.next({ type: 'editCellKey', payload: { dataIndex: undefined, rowIndex: undefined } });
-    // }
     if (isAddColumn) {
       editableStream.next({
         type: 'editHeardCellKey',

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

@@ -14,6 +14,7 @@ var _excluded = ["title", "dataIndex", "isAddColumn", "children"];
 import { PlusSquareOutlined, DeleteOutlined } from '@ant-design/icons';
 import React from 'react';
 import { EditableContext } from '../interface';
+import { tr } from '../../../framework/locale';
 import "./index.css";
 
 var EditableHeardCell = function EditableHeardCell(props) {
@@ -102,7 +103,7 @@ var EditableHeardCell = function EditableHeardCell(props) {
       setAddColumn(_objectSpread({}, _));
       addColumnRef.current = _;
     },
-    placeholder: "\u8BF7\u8F93\u5165key"
+    placeholder: tr('请输入key')
   }), /*#__PURE__*/React.createElement(_Input, {
     value: addColumn.title,
     style: {
@@ -114,13 +115,13 @@ var EditableHeardCell = function EditableHeardCell(props) {
       setAddColumn(_objectSpread({}, _));
       addColumnRef.current = _;
     },
-    placeholder: "\u8BF7\u8F93\u5165title",
+    placeholder: tr('请输入title'),
     onPressEnter: onAddColumn
   })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {
     type: "primary",
     block: true,
     onClick: onAddColumn
-  }, "\u786E\u5B9A")));
+  }, tr('确定'))));
 
   var onVisibleChange = function onVisibleChange(b) {
     setVisible(b);
@@ -143,13 +144,13 @@ var EditableHeardCell = function EditableHeardCell(props) {
     className: "".concat(editConfig.editHeardCellKey === dataIndex ? 'editable-th-hover-delete' : 'display-none')
   }, /*#__PURE__*/React.createElement(_Popconfirm, {
     placement: 'left',
-    title: "\u786E\u8BA4\u5220\u9664\u8BE5\u6761\u5217\uFF1F",
+    title: tr('确认会删除该列'),
     onConfirm: onDeleteColumn,
     onCancel: function onCancel(e) {
       e.stopPropagation();
     },
-    okText: "\u786E\u5B9A",
-    cancelText: "\u53D6\u6D88"
+    okText: tr('确定'),
+    cancelText: tr('取消')
   }, /*#__PURE__*/React.createElement(_Button, {
     type: "link",
     icon: /*#__PURE__*/React.createElement(DeleteOutlined, null)

package/es/comps/Editable/index.js

@@ -18,6 +18,7 @@ import { isFreeEditRow, removeCurKeyFromEditRow } from './utils';
 import EditableHeardCell from './comps/EditableHeardCell';
 import useMemoSubject from '../../framework/rxjs-hooks/useMemoSubject';
 import useObservable from '../../framework/rxjs-hooks/useObservable';
+import { tr } from '../../framework/locale';
 import "./index.css";
 
 var Editable = function Editable(props) {
@@ -297,7 +298,7 @@ var Editable = function Editable(props) {
     if (!readonly) {
       var _aciton_ = {
         dataKey: '_aciton_',
-        title: '操作',
+        title: tr('操作'),
         width: 40,
         ellipsis: true,
         fixed: 'left',
@@ -338,7 +339,7 @@ var Editable = function Editable(props) {
   var onAddRow = function onAddRow() {
     if (defaultValue) {
       if (type === 'freedom' && editRowKey) {
-        _message.warn('请先保存正在编辑的行');
+        _message.warn(tr('请先保存正在编辑的行'));
 
         return;
       }
@@ -415,7 +416,7 @@ var Editable = function Editable(props) {
       marginTop: '5px'
     },
     onClick: onAddRow
-  }, "\u6DFB\u52A0\u4E00\u884C")));
+  }, tr('添加一行'))));
 };
 
 export default Editable;

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

@@ -383,7 +383,7 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
         }
       }))), (refIds[index] || refSchema[index]) && /*#__PURE__*/React.createElement("div", {
         style: {
-          border: '1px solid #d9d9d9',
+          border: 'var(--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: '1px solid #d9d9d9',
+                border: 'var(--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 #d9d9d9',
+                border: '1px solid var(--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 #d9d9d9',
+                border: '1px solid var(--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 #d9d9d9',
+                border: '1px solid var(--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 #d9d9d9',
+          border: '1px solid var(--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 #d9d9d9',
+                border: '1px solid var(--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 #d9d9d9',
+                border: '1px solid var(--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 #d9d9d9',
+                border: '1px solid var(--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 #d9d9d9',
+                border: '1px solid var(--color-border-1)',
                 padding: '10px',
                 marginBottom: '10px'
               }

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-06 12:08:47
+ * @LastEditTime: 2022-05-07 10:48:55
  */
 import React from 'react';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
@@ -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 #d9d9d9',
+      border: '1px solid var(--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 #d9d9d9',
+        border: '1px solid var(--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 #d9d9d9',
+        border: '1px solid var(--color-border-1)',
         width: '100%',
         borderRadius: '4px'
       }

package/es/comps/MetadataForm/utils.js

@@ -5,7 +5,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-06 11:24:37
+ * @LastEditTime: 2022-05-06 13:43:47
  */
 import React from 'react';
 import Input from './DataCell/Input';
@@ -63,47 +63,5 @@ export function renderForm(schemaRef, options, stream$) {
     _form.push(getDataCell(_properties[i], options));
   }
 
-  hasRenderAfter(_form, stream$);
   return /*#__PURE__*/React.createElement(React.Fragment, null, _form);
-}
-var __ref__ = [];
-var __count__ = 0;
-
-function hasRenderAfter(_form, stream$) {
-  var _loop = function _loop(i) {
-    if (_form[i].props.type === 'ref') {
-      if (__ref__.findIndex(function (it) {
-        return it === _form[i].key;
-      }) === -1) {
-        __ref__.push(_form[i].key);
-      }
-    } // if (_form[i].props.type === 'array' && _form[i].props.items.type === 'ref') {
-    //   if (__ref__.findIndex((it) => it === _form[i].key) === -1) {
-    //     __ref__.push(_form[i].key);
-    //   }
-    // }
-
-  };
-
-  for (var i = 0; i < _form.length; i++) {
-    _loop(i);
-  }
-
-  var idx = _form.findIndex(function (it) {
-    return it.props.type === 'ref';
-  }); // 表单渲染结束
-
-
-  if (idx === -1) {
-    __count__ = __count__ + 1;
-
-    if (__count__ === __ref__.length && __ref__.length !== 0) {
-      stream$ && stream$.next({
-        type: 'onRenderAfter',
-        payload: ''
-      });
-      __ref__ = [];
-      __count__ = 0;
-    }
-  }
 }

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

@@ -0,0 +1,14 @@
+declare const _default: {
+    操作: string;
+    添加一行: string;
+    编辑: string;
+    删除: string;
+    确定: string;
+    取消: string;
+    确认删除该条数据: string;
+    请先保存正在编辑的行: string;
+    请输入key: string;
+    请输入title: string;
+    确认会删除该列: string;
+};
+export default _default;

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

@@ -0,0 +1,13 @@
+export default {
+  操作: 'Operation',
+  添加一行: 'Add New Line',
+  编辑: 'Edit',
+  删除: 'Delete',
+  确定: 'Confirm',
+  取消: 'Cancel',
+  确认删除该条数据: 'Confirm to delete this piece of data?',
+  请先保存正在编辑的行: 'Please save the line being edited first',
+  请输入key: 'Please enter key',
+  请输入title: 'Please enter title',
+  确认会删除该列: 'Confirm will delete the column?'
+};

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

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

package/es/comps/locales/index.js

@@ -0,0 +1,10 @@
+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
+  });
+};
+export { setLocale, getLocale } from '../../framework/locale';

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

@@ -0,0 +1,14 @@
+declare const _default: {
+    操作: string;
+    添加一行: string;
+    编辑: string;
+    删除: string;
+    确定: string;
+    取消: string;
+    确定删除该条数据: string;
+    请先保存正在编辑的行: string;
+    请输入key: string;
+    请输入title: string;
+    确认会删除该列: string;
+};
+export default _default;

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

@@ -0,0 +1,13 @@
+export default {
+  操作: '操作',
+  添加一行: '添加一行',
+  编辑: '编辑',
+  删除: '删除',
+  确定: '确定',
+  取消: '取消',
+  确定删除该条数据: '确定删除该条数据?',
+  请先保存正在编辑的行: '请先保存正在编辑的行',
+  请输入key: '请输入key',
+  请输入title: '请输入title',
+  确认会删除该列: '确认会删除该列?'
+};

package/es/config.d.ts

@@ -1,14 +1,17 @@
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 export interface IConfig {
     /** 多语言 */
     locale: 'zh-CN' | 'en-US';
+    theme: 'normal' | 'dark';
     msgpack: boolean;
     openLoading: boolean;
     baseUrl: string;
 }
+export declare const cssPrefix = "ronds-metadata";
+export declare const globalSettingStream: BehaviorSubject<IConfig>;
 /** 设置配置 */
 export declare const setConfig: (opts: Partial<IConfig>) => void;
 /**  获取单个配置 */
 export declare function getConfigByKey<K extends keyof IConfig>(key: K): IConfig[K];
 /**  获取全部配置 */
 export declare const getConfig: () => IConfig;
-export declare const cssPrefix = "ronds-base-chart";

package/es/config.js

@@ -1,10 +1,37 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+
+/*
+ * @Author: wangxian
+ * @Date: 2021-09-18 14:15:04
+ * @LastEditTime: 2022-05-09 15:26:10
+ */
+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 * as jq from './framework/libs/jquery.min.js';
+import { setLocale } from './framework/locale/index';
+window.jQuery = window.jQuery || jq;
 var defaultConfig = {
   locale: 'zh-CN',
+  theme: 'normal',
   msgpack: false,
   openLoading: true,
   baseUrl: '/phm'
 };
+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.theme;
+}), distinctUntilChanged()).subscribe(function (p) {
+  window.jQuery('body').removeClass("".concat(cssPrefix, "-dark"));
+  window.jQuery('body').removeClass("".concat(cssPrefix, "-normal"));
+  window.jQuery('body').addClass("".concat(cssPrefix, "-").concat(p));
+});
 var config = defaultConfig;
 /** 设置配置 */
 
@@ -20,5 +47,4 @@ export function getConfigByKey(key) {
 
 export var getConfig = function getConfig() {
   return config;
-};
-export var cssPrefix = 'ronds-base-chart';
+};