feat: add DesignMarkdown

yuntijs · Nov 2, 2023 · d604a37 · d604a37
1 parent 70c270d
commit d604a37
Show file tree

Hide file tree

Showing 7 changed files with 102 additions and 24 deletions.
diff --git a/packages/react-markdown-lowcode-materials/demo/assets.json b/packages/react-markdown-lowcode-materials/demo/assets.json
@@ -57,19 +57,19 @@
     {
       "id": "@tenx-ui/materials",
       "meta": {
-        "url": "http://172.22.96.37/@tenx-ui/materials@1.5.11/build/lowcode/meta.js",
+        "url": "http://172.22.96.37/@tenx-ui/materials@latest/build/lowcode/meta.js",
         "exportName": "TenxUiMaterialsMeta"
       },
       "urls": [
-        "http://172.22.96.37/@tenx-ui/materials@1.5.11/dist/TenxUiMaterials.js",
-        "http://172.22.96.37/@tenx-ui/materials@1.5.11/dist/TenxUiMaterials.css"
+        "http://172.22.96.37/@tenx-ui/materials@latest/dist/TenxUiMaterials.js",
+        "http://172.22.96.37/@tenx-ui/materials@latest/dist/TenxUiMaterials.css"
       ],
       "library": "TenxUiMaterials",
       "package": "@tenx-ui/materials",
-      "version": "1.5.11",
+      "version": "latest",
       "editUrls": [
-        "http://172.22.96.37/@tenx-ui/materials@1.5.11/build/lowcode/view.css",
-        "http://172.22.96.37/@tenx-ui/materials@1.5.11/build/lowcode/view.js"
+        "http://172.22.96.37/@tenx-ui/materials@latest/build/lowcode/view.css",
+        "http://172.22.96.37/@tenx-ui/materials@latest/build/lowcode/view.js"
       ]
     },
     {
@@ -95,11 +95,11 @@
   ],
   "components": [
     {
-      "url": "http://172.22.96.37/@tenx-ui/materials@1.5.11/build/lowcode/meta.js",
-      "version": "1.5.11",
+      "url": "http://172.22.96.37/@tenx-ui/materials@latest/build/lowcode/meta.js",
+      "version": "latest",
       "reference": {
         "id": "@tenx-ui/materials",
-        "version": "1.5.11"
+        "version": "latest"
       },
       "exportName": "TenxUiMaterialsMeta"
     },

diff --git a/packages/react-markdown-lowcode-materials/lowcode/markdown/meta.ts b/packages/react-markdown-lowcode-materials/lowcode/markdown/meta.ts
@@ -21,15 +21,19 @@ const MarkdownMeta: IPublicTypeComponentMetadata = {
           label: '内容',
           tip: 'children | 内容',
         },
-        setter: ['TextAreaSetter'],
+        setter: {
+          componentName: 'TextAreaSetter',
+        },
       },
       {
         name: 'className',
         title: {
           label: '类名',
           tip: 'className | 类名',
         },
-        setter: ['StringSetter'],
+        setter: {
+          componentName: 'StringSetter',
+        },
       },
       {
         title: {

diff --git a/packages/react-markdown-lowcode-materials/lowcode/view.tsx b/packages/react-markdown-lowcode-materials/lowcode/view.tsx
@@ -1,4 +1,25 @@
+import React from 'react';
 import Markdown from '../src';
 
 // 不需要对设计态进行特殊处理的，直接导出即可
-export default Markdown;
+const DesignMarkdown = props => {
+  const { children, ...otherProps } = props;
+  return (
+    <div>
+      <Markdown
+        {...otherProps}
+        components={{
+          // 解决编辑态 a 链接跳转问题
+          a(props) {
+            const { href, ...rest } = props;
+            return <a {...rest} />;
+          },
+          ...(otherProps.components || {}),
+        }}
+      >
+        {(children || '').toString()}
+      </Markdown>
+    </div>
+  );
+};
+export default DesignMarkdown;
diff --git a/packages/react-markdown-lowcode-materials/package.json b/packages/react-markdown-lowcode-materials/package.json
@@ -24,6 +24,7 @@
     "@alilc/lowcode-types": "^1.2.1",
     "@babel/runtime": "^7.0.0",
     "react-markdown": "^9.0.0",
+    "rehype-highlight": "^7.0.0",
     "remark-gfm": "^4.0.0"
   },
   "peerDependencies": {

diff --git a/packages/react-markdown-lowcode-materials/src/index.tsx b/packages/react-markdown-lowcode-materials/src/index.tsx
@@ -1,11 +1,15 @@
 import React from 'react';
 import OriginalMarkdown, { Options } from 'react-markdown';
+import rehypeHighlight from 'rehype-highlight';
 import remarkGfm from 'remark-gfm';
-
 const Markdown = (props: Options) => {
-  const { children, remarkPlugins, ...otherProps } = props;
+  const { children, rehypePlugins, remarkPlugins, ...otherProps } = props;
   return (
-    <OriginalMarkdown {...otherProps} remarkPlugins={[remarkGfm, ...(remarkPlugins || [])]}>
+    <OriginalMarkdown
+      {...otherProps}
+      rehypePlugins={[rehypeHighlight, ...(rehypePlugins || [])]}
+      remarkPlugins={[remarkGfm, ...(remarkPlugins || [])]}
+    >
       {(props.children || '').toString()}
     </OriginalMarkdown>
   );

diff --git a/packages/shared/src/services/assets.json b/packages/shared/src/services/assets.json
@@ -57,19 +57,19 @@
     {
       "id": "@tenx-ui/materials",
       "meta": {
-        "url": "http://172.22.96.37/@tenx-ui/materials@1.5.9/build/lowcode/meta.js",
+        "url": "http://172.22.96.37/@tenx-ui/materials@latest/build/lowcode/meta.js",
         "exportName": "TenxUiMaterialsMeta"
       },
       "urls": [
-        "http://172.22.96.37/@tenx-ui/materials@1.5.9/dist/TenxUiMaterials.js",
-        "http://172.22.96.37/@tenx-ui/materials@1.5.9/dist/TenxUiMaterials.css"
+        "http://172.22.96.37/@tenx-ui/materials@latest/dist/TenxUiMaterials.js",
+        "http://172.22.96.37/@tenx-ui/materials@latest/dist/TenxUiMaterials.css"
       ],
       "library": "TenxUiMaterials",
       "package": "@tenx-ui/materials",
-      "version": "1.5.9",
+      "version": "latest",
       "editUrls": [
-        "http://172.22.96.37/@tenx-ui/materials@1.5.9/build/lowcode/view.css",
-        "http://172.22.96.37/@tenx-ui/materials@1.5.9/build/lowcode/view.js"
+        "http://172.22.96.37/@tenx-ui/materials@latest/build/lowcode/view.css",
+        "http://172.22.96.37/@tenx-ui/materials@latest/build/lowcode/view.js"
       ]
     },
     {
@@ -102,11 +102,11 @@
   ],
   "components": [
     {
-      "url": "http://172.22.96.37/@tenx-ui/materials@1.5.9/build/lowcode/meta.js",
-      "version": "1.5.9",
+      "url": "http://172.22.96.37/@tenx-ui/materials@latest/build/lowcode/meta.js",
+      "version": "latest",
       "reference": {
         "id": "@tenx-ui/materials",
-        "version": "1.5.9"
+        "version": "latest"
       },
       "exportName": "TenxUiMaterialsMeta"
     },

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml