lowcoder-org · aaron1604 · May 18, 2023 · May 18, 2023 · May 18, 2023 · May 22, 2023
diff --git a/client/packages/lowcoder-comps/package.json b/client/packages/lowcoder-comps/package.json
@@ -16,7 +16,7 @@
     "big.js": "^6.2.1",
     "lowcoder-cli": "workspace:^",
     "lowcoder-sdk": "workspace:^",
-    "mermaid": "^10.0.2",
+    "mermaid": "^10.1.0",
     "react": "17",
     "react-dom": "17",
     "typescript": "4.8.4"
@@ -47,6 +47,14 @@
           "w": 15,
           "h": 60
         }
+      },
+      "mermaid": {
+        "name": "Mermaid",
+        "icon": "./icons/icon-chart.svg",
+        "layoutInfo": {
+          "w": 15,
+          "h": 60
+        }
       }
     }
   },

diff --git a/client/packages/lowcoder-comps/src/index.ts b/client/packages/lowcoder-comps/src/index.ts
@@ -1,9 +1,11 @@
 import { ChartCompWithDefault } from "./comps/chartComp/chartComp";
 import { ImageEditorComp } from "./comps/imageEditorComp/index";
 import { CalendarComp } from "./comps/calendarComp/calendarComp";
+import { MermaidComp } from "./comps/mermaidComp";
 
 export default {
   chart: ChartCompWithDefault,
   imageEditor: ImageEditorComp,
   calendar: CalendarComp,
+  mermaid: MermaidComp,
 };
diff --git a/client/packages/lowcoder-design/src/icons/index.ts b/client/packages/lowcoder-design/src/icons/index.ts
@@ -230,6 +230,7 @@ export { ReactComponent as HelpDiscordIcon } from "./icon-help-discord.svg";
 export { ReactComponent as LeftAudio } from "./icon-left-comp-audio.svg";
 export { ReactComponent as LeftButton } from "./icon-left-comp-button.svg";
 export { ReactComponent as LeftChart } from "./icon-left-comp-chart.svg";
+export { ReactComponent as LeftMermaid } from "./icon-left-comp-chart.svg";
 export { ReactComponent as LeftCheckbox } from "./icon-left-comp-checkbox.svg";
 export { ReactComponent as LeftCommon } from "./icon-left-comp-common.svg";
 export { ReactComponent as LeftContainer } from "./icon-left-comp-container.svg";

diff --git a/client/packages/lowcoder/src/comps/index.tsx b/client/packages/lowcoder/src/comps/index.tsx
@@ -774,6 +774,19 @@ const uiCompMap: Registry = {
       h: 35,
     },
   },
+  mermaid: {
+    name: trans("uiComp.mermaidCompName"),
+    enName: "Mermaid",
+    description: trans("uiComp.mermaidCompDesc"),
+    categories: ["dataDisplay", "common"],
+    icon: ChartCompIcon,
+    comp: remoteComp({ ...builtInRemoteComps, compName: "mermaid" }),
+    keywords: trans("uiComp.mermaidCompKeywords"),
+    layoutInfo: {
+      w: 11,
+      h: 35,
+    },
+  },
   imageEditor: {
     name: trans("uiComp.imageEditorCompName"),
     enName: "Image Editor",

diff --git a/client/packages/lowcoder/src/comps/uiCompRegistry.ts b/client/packages/lowcoder/src/comps/uiCompRegistry.ts
@@ -53,6 +53,7 @@ export type UICompType =
   | "moduleContainer"
   | "textArea"
   | "chart"
+  | "mermaid"
   | "imageEditor"
   | "calendar"
   | "password"
@@ -83,6 +84,7 @@ export type UICompType =
   | "progress"
   | "progressCircle"
   | "chart"
+  | "mermaid"
   | "fileViewer"
   | "divider"
   | "qrCode"

diff --git a/client/packages/lowcoder/src/i18n/locales/en.ts b/client/packages/lowcoder/src/i18n/locales/en.ts
@@ -806,6 +806,9 @@ export const en = {
     chartCompName: "Chart",
     chartCompDesc: "Chart component",
     chartCompKeywords: "",
+    mermaidCompName: "Mermaid",
+    mermaidCompDesc: "Mermaid component",
+    mermaidCompKeywords: "",
     carouselCompName: "Carousel",
     carouselCompDesc: "Carousel component",
     carouselCompKeywords: "",
@@ -2395,4 +2398,4 @@ export const en = {
   slotControl: {
     configSlotView: "Configure slot view",
   },
-};
+};
diff --git a/client/packages/lowcoder/src/pages/editor/editorConstants.tsx b/client/packages/lowcoder/src/pages/editor/editorConstants.tsx
@@ -3,6 +3,7 @@ import {
   LeftAudio,
   LeftButton,
   LeftChart,
+  LeftMermaid,
   LeftCheckbox,
   LeftCommon,
   LeftContainer,
@@ -73,6 +74,7 @@ export const CompStateIcon: {
   progress: <LeftProgress />,
   progressCircle: <LeftProgress />,
   chart: <LeftChart />,
+  mermaid: <LeftMermaid />,
   fileViewer: <LeftFileViewer />,
   divider: <LeftDivider />,
   qrCode: <LeftQrCode />,

diff --git a/client/yarn.lock b/client/yarn.lock
@@ -3855,6 +3855,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@khanacademy/simple-markdown@npm:^0.8.6":
+  version: 0.8.6
+  resolution: "@khanacademy/simple-markdown@npm:0.8.6"
+  dependencies:
+    "@types/react": ">=16.0.0"
+  peerDependencies:
+    react: 16.14.0
+    react-dom: 16.14.0
+  checksum: 19f4c79f6648813f9fba922fc8d0e3175eaafe345b8647fe835477528ed13e680c150a4e1a687fa208972ebceaea9dff6066c83de753eb26a8eaec769efe5c07
+  languageName: node
+  linkType: hard
+
 "@lezer/common@npm:^0.16.0, @lezer/common@npm:^0.16.1":
   version: 0.16.1
   resolution: "@lezer/common@npm:0.16.1"
@@ -8316,13 +8328,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dagre-d3-es@npm:7.0.9":
-  version: 7.0.9
-  resolution: "dagre-d3-es@npm:7.0.9"
+"dagre-d3-es@npm:7.0.10":
+  version: 7.0.10
+  resolution: "dagre-d3-es@npm:7.0.10"
   dependencies:
     d3: ^7.8.2
     lodash-es: ^4.17.21
-  checksum: 5f24ad9558e84066e70cfa6979320d93079979ac8b0a3b033e5330742aeeba74e205f66794ab6e0a82354b061a4e29c10a291590d7b2cf82b5780fab5443f5ba
+  checksum: 25194e80dfad48db0dc2e0a273a7c9fcbfdc4cf993b219eaa1e0e0ce0cbb8c63be42fa2aa0c5f9bf9b324c34b8b2e300bb2a1606d5ae35c2de00f9c4ac317d8e
   languageName: node
   linkType: hard
 
@@ -8817,10 +8829,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dompurify@npm:2.4.3":
-  version: 2.4.3
-  resolution: "dompurify@npm:2.4.3"
-  checksum: b440981f2a38cada2085759cc3d1e2f94571afc34343d011a8a6aa1ad91ae6abf651adbfa4994b0e2283f0ce81f7891cdb04b67d0b234c8d190cb70e9691f026
+"dompurify@npm:2.4.5":
+  version: 2.4.5
+  resolution: "dompurify@npm:2.4.5"
+  checksum: d6d3c3b320f15cdb5b26aa1902c3275a3ab2c3705a9df4420bb94691d7c4df67959ec7b91e486c308320791b0ee000456f042734c45d76721e61c2768eac706e
   languageName: node
   linkType: hard
 
@@ -13560,7 +13572,7 @@ __metadata:
     jest: 29.3.0
     lowcoder-cli: "workspace:^"
     lowcoder-sdk: "workspace:^"
-    mermaid: ^10.0.2
+    mermaid: ^10.1.0
     react: 17
     react-dom: 17
     typescript: 4.8.4
@@ -14173,18 +14185,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mermaid@npm:^10.0.2":
-  version: 10.0.2
-  resolution: "mermaid@npm:10.0.2"
+"mermaid@npm:^10.1.0":
+  version: 10.1.0
+  resolution: "mermaid@npm:10.1.0"
   dependencies:
     "@braintree/sanitize-url": ^6.0.0
+    "@khanacademy/simple-markdown": ^0.8.6
     cytoscape: ^3.23.0
     cytoscape-cose-bilkent: ^4.1.0
     cytoscape-fcose: ^2.1.0
     d3: ^7.4.0
-    dagre-d3-es: 7.0.9
+    dagre-d3-es: 7.0.10
     dayjs: ^1.11.7
-    dompurify: 2.4.3
+    dompurify: 2.4.5
     elkjs: ^0.8.2
     khroma: ^2.0.0
     lodash-es: ^4.17.21
@@ -14193,7 +14206,7 @@ __metadata:
     ts-dedent: ^2.2.0
     uuid: ^9.0.0
     web-worker: ^1.2.0
-  checksum: 930e8509ba928b3598dcd7f7512e4d60c0d252a95fa7bd4f5c2cdf055409febc75d71909419151301f64012e699dd964419c50200808aff1770cc4014ece82c6
+  checksum: d38c72aee917948491e782aac885ac0c71eb5f51f904a6d4bf1ceeb97d502b77da41524ee04de6cd1b0f9b645ad8853319f5ac60a7cce248de2484c2fd616b8e
   languageName: node
   linkType: hard
 

diff --git a/server/node-service/package.json b/server/node-service/package.json
@@ -35,7 +35,7 @@
     "@aws-sdk/client-s3": "^3.332.0",
     "@aws-sdk/s3-request-presigner": "^3.332.0",
     "@google-cloud/bigquery": "^6.1.0",
-    "@google-cloud/storage": "^6.10.1",
+    "@google-cloud/storage": "^6.9.3",
     "@supabase/supabase-js": "^2.10.0",
     "@types/axios": "^0.14.0",
     "@types/express": "^4.17.14",

diff --git a/server/node-service/yarn.lock b/server/node-service/yarn.lock
@@ -2017,7 +2017,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-
 "@google-cloud/storage@npm:^6.9.3, @google-cloud/storage@npm:^6.9.5":
   version: 6.10.1
   resolution: "@google-cloud/storage@npm:6.10.1"
@@ -8940,7 +8939,7 @@ __metadata:
     "@aws-sdk/client-s3": ^3.332.0
     "@aws-sdk/s3-request-presigner": ^3.332.0
     "@google-cloud/bigquery": ^6.1.0
-    "@google-cloud/storage": ^6.10.1
+    "@google-cloud/storage": ^6.9.3
     "@supabase/supabase-js": ^2.10.0
     "@types/axios": ^0.14.0
     "@types/express": ^4.17.14