Skip to content

Commit 358f1ab

Browse files
authored
Merge pull request #420 from lowcoder-org/echarts-wordcloud
Adding eCharts Wordcloud Support (as our Lead Dev is currently not available, I surpassed the review. But tested everything...)
2 parents 7a7f854 + d2bf3f7 commit 358f1ab

File tree

14 files changed

+88
-5
lines changed

14 files changed

+88
-5
lines changed

.DS_Store

0 Bytes
Binary file not shown.
Lines changed: 18 additions & 0 deletions
Loading

client/packages/lowcoder-comps/package.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-comps",
3-
"version": "0.0.13",
3+
"version": "0.0.15",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {
@@ -15,6 +15,7 @@
1515
"@types/react-dom": "17",
1616
"big.js": "^6.2.1",
1717
"echarts-extension-gmap": "^1.6.0",
18+
"echarts-wordcloud": "^2.1.0",
1819
"lowcoder-cli": "workspace:^",
1920
"lowcoder-sdk": "workspace:^",
2021
"mermaid": "^10.2.4",
@@ -29,16 +30,16 @@
2930
"name": "Chart",
3031
"icon": "./icons/icon-chart.svg",
3132
"layoutInfo": {
32-
"w": 11,
33-
"h": 35
33+
"w": 15,
34+
"h": 40
3435
}
3536
},
3637
"imageEditor": {
3738
"name": "Image Editor",
3839
"icon": "./icons/icon-chart.svg",
3940
"layoutInfo": {
4041
"w": 15,
41-
"h": 60
42+
"h": 40
4243
}
4344
},
4445
"calendar": {
@@ -48,6 +49,14 @@
4849
"w": 15,
4950
"h": 60
5051
}
52+
},
53+
"mermaid": {
54+
"name": "Mermaid",
55+
"icon": "./icons/mermaidchart.svg",
56+
"layoutInfo": {
57+
"w": 15,
58+
"h": 40
59+
}
5160
}
5261
}
5362
},

client/packages/lowcoder-comps/src/comps/chartComp/reactEcharts/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import * as echarts from "echarts";
2+
import "echarts-wordcloud";
23
import { EChartsReactProps, EChartsInstance, EChartsOptionWithMap } from "./types";
34
import EChartsReactCore from "./core";
45

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import { ChartCompWithDefault } from "./comps/chartComp/chartComp";
22
import { ImageEditorComp } from "./comps/imageEditorComp/index";
33
import { CalendarComp } from "./comps/calendarComp/calendarComp";
4+
import { MermaidComp } from "comps/mermaidComp";
45

56
export default {
67
chart: ChartCompWithDefault,
78
imageEditor: ImageEditorComp,
89
calendar: CalendarComp,
10+
mermaid: MermaidComp,
911
};
Lines changed: 18 additions & 0 deletions
Loading

client/packages/lowcoder-design/src/icons/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ export { ReactComponent as GraphqlIcon } from "./icon-query-Graphql.svg";
224224
export { ReactComponent as SnowflakeIcon } from "./icon-query-snowflake.svg";
225225
export { ReactComponent as MariaDBIcon } from "./icon-query-MariaDB.svg";
226226
export { ReactComponent as imageEditorIcon } from "./icon-insert-imageEditor.svg";
227+
export { ReactComponent as MermaidIcon } from "./icon-mermaid.svg";
227228
export { ReactComponent as HomeSettingsIcon } from "./icon-home-settings.svg";
228229
export { ReactComponent as HomeSettingsActiveIcon } from "./icon-home-settings-active.svg";
229230
export { ReactComponent as HelpGithubIcon } from "./icon-help-github.svg";

client/packages/lowcoder/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"copy-to-clipboard": "^3.3.3",
5050
"core-js": "^3.25.2",
5151
"echarts": "^5.4.2",
52+
"echarts-wordcloud": "^2.1.0",
5253
"eslint4b-prebuilt-2": "^7.32.0",
5354
"file-saver": "^2.0.5",
5455
"github-markdown-css": "^5.1.0",

client/packages/lowcoder/src/comps/index.tsx

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ import {
100100
MentionIcon,
101101
AutoCompleteCompIcon,
102102
ResponsiveLayoutCompIcon,
103+
MermaidIcon,
103104
} from "lowcoder-design";
104105

105106
import { defaultFormData, FormComp } from "./comps/formComp/formComp";
@@ -841,6 +842,19 @@ const uiCompMap: Registry = {
841842
h: 60,
842843
},
843844
},
845+
mermaid: {
846+
name: trans("uiComp.mermaidCompName"),
847+
enName: "Mermaid Charts",
848+
comp: remoteComp({ ...builtInRemoteComps, compName: "mermaid" }),
849+
description: trans("uiComp.mermaidCompDesc"),
850+
categories: ["dataDisplay"],
851+
icon: MermaidIcon,
852+
keywords: trans("uiComp.mermaidCompKeywords"),
853+
layoutInfo: {
854+
w: 15,
855+
h: 60,
856+
},
857+
},
844858
scanner: {
845859
name: trans("uiComp.scannerCompName"),
846860
enName: "Scanner",

client/packages/lowcoder/src/comps/uiCompRegistry.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ export type UICompType =
8989
| "progress"
9090
| "progressCircle"
9191
| "chart"
92+
| "mermaid" //Added By Falk Wolsky
9293
| "fileViewer"
9394
| "divider"
9495
| "qrCode"

0 commit comments

Comments
 (0)