ronds-metadata 1.1.60 → 1.1.62

package/es/comps/MdView/index.js

@@ -1,15 +1,19 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["node", "inline", "className", "children"];
 import React from "react";
 
 /*
  * @Author: wangxian
  * @Date: 2022-09-02 16:17:38
- * @LastEditTime: 2022-10-14 11:44:51
+ * @LastEditTime: 2022-11-22 16:55:15
  */
 import ReactMarkdown from 'react-markdown';
 import remarkGfm from 'remark-gfm';
 import rehypeRaw from 'rehype-raw';
 import 'github-markdown-css';
+import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
+import { oneLight } from 'react-syntax-highlighter/dist/esm/styles/prism';
 import './index.less';
 import MdNavbar from '../MdNavbar';
 
@@ -28,7 +32,26 @@ var MdView = function MdView(props) {
     className: "markdown-body react-mark-down"
   }, /*#__PURE__*/React.createElement(ReactMarkdown, {
     remarkPlugins: [remarkGfm],
-    rehypePlugins: [rehypeRaw]
+    rehypePlugins: [rehypeRaw],
+    components: {
+      code: function code(_ref) {
+        var node = _ref.node,
+            inline = _ref.inline,
+            className = _ref.className,
+            children = _ref.children,
+            props = _objectWithoutProperties(_ref, _excluded);
+
+        var match = /language-(\w+)/.exec(className || '');
+        return !inline && match ? /*#__PURE__*/React.createElement(SyntaxHighlighter, _extends({
+          showLineNumbers: true,
+          style: oneLight,
+          language: match[1],
+          PreTag: "div"
+        }, props), String(children).replace(/\n$/, '')) : /*#__PURE__*/React.createElement("code", _extends({
+          className: className
+        }, props), children);
+      }
+    }
   }, source)), isMarkNav && /*#__PURE__*/React.createElement("div", {
     style: {
       width: '250px',

package/es/comps/MdView/index.less

@@ -218,6 +218,14 @@
       line-height: 20px;
     }
   }
+  pre {
+    padding: 0 !important;
+    background-color: transparent;
+    code {
+      font-weight: 300;
+      background-color: transparent;
+    }
+  }
 
   // list
   ul,

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

@@ -1,20 +1,21 @@
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _extends from "@babel/runtime/helpers/esm/extends";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/upload/style";
 import _Upload from "antd/es/upload";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import "antd/es/date-picker/style";
 import _DatePicker from "antd/es/date-picker";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
 
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-10-10 11:27:15
+ * @LastEditTime: 2022-11-22 15:49:53
  */
 import React from 'react';
 import { UploadOutlined } from '@ant-design/icons';
@@ -33,6 +34,26 @@ function Index(props) {
   var formRefContext = React.useContext(MetadataRefContext);
   var extraInfo = useGetExtraInfo(formRefContext ? formRefContext.fields : formContext.fields, id, formContext.form, props.type);
 
+  var _React$useState = React.useState([]),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      rules = _React$useState2[0],
+      setRules = _React$useState2[1];
+
+  React.useEffect(function () {
+    var _rules = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.rules;
+
+    if (_rules) {
+      var _ = _rules.map(function (it) {
+        return {
+          pattern: new RegExp(eval(it === null || it === void 0 ? void 0 : it.regExp), 'g'),
+          message: it.message
+        };
+      });
+
+      setRules(_toConsumableArray(_));
+    }
+  }, [extraInfo]);
+
   var processInputType = function processInputType(_type) {
     var _extraInfo$disabled, _extraInfo$disabled2, _extraInfo$disabled3, _extraInfo$disabled4, _extraInfo$disabled5;
 
@@ -92,7 +113,7 @@ function Index(props) {
       fieldKey: [field === null || field === void 0 ? void 0 : field.fieldKey],
       rules: [{
         required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
-      }],
+      }].concat(_toConsumableArray(rules)),
       help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
       tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
     }), processInputType((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.type) || ''));
@@ -108,7 +129,7 @@ function Index(props) {
     name: name,
     rules: [{
       required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
-    }],
+    }].concat(_toConsumableArray(rules)),
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
   }, processInputType((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.type) || '')) : /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
@@ -120,7 +141,7 @@ function Index(props) {
     fieldKey: [field === null || field === void 0 ? void 0 : field.fieldKey],
     rules: [{
       required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
-    }],
+    }].concat(_toConsumableArray(rules)),
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
   }), processInputType((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.type) || ''));

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

@@ -26,7 +26,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-11-22 14:42:09
+ * @LastEditTime: 2022-11-22 16:10:55
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -35,7 +35,7 @@ import { MetadataService } from '../../../framework/metadata/MetadataService';
 import { deepClone } from '../../../utils';
 import { useAsyncMemo } from '../../../framework/hooks/use-async-memo';
 import { tr } from '../../../framework/locale';
-import useObservable from '@/framework/rxjs-hooks/useObservable';
+import useObservable from '../../../framework/rxjs-hooks/useObservable';
 
 function Index(props) {
   var _extraInfo$http6, _extraInfo$http7, _extraInfo$http8, _extraInfo$http9;

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

@@ -4,10 +4,10 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-11-22 14:13:25
+ * @LastEditTime: 2022-11-22 15:37:46
  */
 import React from 'react';
-import { deepClone, guid } from '../../../utils';
+import { deepClone } from '../../../utils';
 import './index.less';
 export function withAddOnAfter(WrappedComponent) {
   return function (props) {
@@ -48,7 +48,7 @@ export function withAddOnAfter(WrappedComponent) {
       key: "".concat(_name.toString(), "_div"),
       className: "with-add-on-after"
     }, /*#__PURE__*/React.createElement(WrappedComponent, _extends({
-      key: "".concat(_name.toString(), "_Wrapped_").concat(guid())
+      key: "".concat(_name.toString(), "_Wrapped}")
     }, props, {
       style: {
         padding: '0px',

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.1.60",
+  "version": "1.1.62",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -55,6 +55,7 @@
     "react-markdown": "^8.0.3",
     "react-markdown-editor-lite": "^1.3.2",
     "react-popper": "^2.2.3",
+    "react-syntax-highlighter": "^15.5.0",
     "rehype-raw": "^6.1.1",
     "remark-gfm": "^3.0.1",
     "rxjs": "^7.5.4"