Skip to content

Commit 8833e9c

Browse files
author
Aqib Mirza
committed
fix: package-version and mermaid integration
1 parent cbb71e9 commit 8833e9c

File tree

8 files changed

+249
-107
lines changed

8 files changed

+249
-107
lines changed

‎client/packages/lowcoder-comps/package.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"big.js": "^6.2.1",
1717
"lowcoder-cli": "workspace:^",
1818
"lowcoder-sdk": "workspace:^",
19-
"mermaid": "^10.0.2",
19+
"mermaid": "^10.1.x0",
2020
"react": "17",
2121
"react-dom": "17",
2222
"typescript": "4.8.4"
@@ -47,6 +47,14 @@
4747
"w": 15,
4848
"h": 60
4949
}
50+
},
51+
"mermaid": {
52+
"name": "Mermaid",
53+
"icon": "./icons/icon-chart.svg",
54+
"layoutInfo": {
55+
"w": 15,
56+
"h": 60
57+
}
5058
}
5159
}
5260
},

‎client/packages/lowcoder-comps/src/index.ts

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
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ export { ReactComponent as HelpDiscordIcon } from "./icon-help-discord.svg";
230230
export { ReactComponent as LeftAudio } from "./icon-left-comp-audio.svg";
231231
export { ReactComponent as LeftButton } from "./icon-left-comp-button.svg";
232232
export { ReactComponent as LeftChart } from "./icon-left-comp-chart.svg";
233+
export { ReactComponent as LeftMermaid } from "./icon-left-comp-chart.svg";
233234
export { ReactComponent as LeftCheckbox } from "./icon-left-comp-checkbox.svg";
234235
export { ReactComponent as LeftCommon } from "./icon-left-comp-common.svg";
235236
export { ReactComponent as LeftContainer } from "./icon-left-comp-container.svg";

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

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ import { ModalComp } from "comps/hooks/modalComp";
44
import { ButtonComp } from "./comps/buttonComp/buttonComp";
55
import { DropdownComp } from "./comps/buttonComp/dropdownComp";
66
import { LinkComp } from "./comps/buttonComp/linkComp";
7-
import { ContainerComp, defaultContainerData } from "./comps/containerComp/containerComp";
7+
import {
8+
ContainerComp,
9+
defaultContainerData,
10+
} from "./comps/containerComp/containerComp";
811
import { CustomComp } from "./comps/customComp/customComp";
912
import { DatePickerComp, DateRangeComp } from "./comps/dateComp/dateComp";
1013
import { DividerComp } from "./comps/dividerComp";
@@ -95,7 +98,12 @@ import {
9598

9699
import { defaultFormData, FormComp } from "./comps/formComp/formComp";
97100
import { IFrameComp } from "./comps/iframeComp";
98-
import { defaultGridData, defaultListViewData, GridComp, ListViewComp } from "./comps/listViewComp";
101+
import {
102+
defaultGridData,
103+
defaultListViewData,
104+
GridComp,
105+
ListViewComp,
106+
} from "./comps/listViewComp";
99107
import { ModuleComp } from "./comps/moduleComp/moduleComp";
100108
import { NavComp } from "./comps/navComp/navComp";
101109
import { TableComp } from "./comps/tableComp";
@@ -774,6 +782,19 @@ const uiCompMap: Registry = {
774782
h: 35,
775783
},
776784
},
785+
mermaid: {
786+
name: trans("uiComp.mermaidCompName"),
787+
enName: "Mermaid",
788+
description: trans("uiComp.mermaidCompDesc"),
789+
categories: ["dataDisplay", "common"],
790+
icon: ChartCompIcon,
791+
comp: remoteComp({ ...builtInRemoteComps, compName: "mermaid" }),
792+
keywords: trans("uiComp.mermaidCompKeywords"),
793+
layoutInfo: {
794+
w: 11,
795+
h: 35,
796+
},
797+
},
777798
imageEditor: {
778799
name: trans("uiComp.imageEditorCompName"),
779800
enName: "Image Editor",
@@ -807,7 +828,7 @@ const uiCompMap: Registry = {
807828
layoutInfo: {
808829
w: 24,
809830
h: 60,
810-
}
831+
},
811832
},
812833
signature: {
813834
name: trans("uiComp.signatureCompName"),

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import { JSONValue } from "util/jsonTypes";
55
import { EditorState } from "./editorState";
66
import { trans } from "i18n";
77

8-
export type ExposingMultiCompConstructor = ReturnType<typeof withExposingConfigs>;
8+
export type ExposingMultiCompConstructor = ReturnType<
9+
typeof withExposingConfigs
10+
>;
911
// Required when the container generates default child comps
1012
type CompDefaultDataFunction = (
1113
compName: string,
@@ -53,6 +55,7 @@ export type UICompType =
5355
| "moduleContainer"
5456
| "textArea"
5557
| "chart"
58+
| "mermaid"
5659
| "imageEditor"
5760
| "calendar"
5861
| "password"
@@ -83,6 +86,7 @@ export type UICompType =
8386
| "progress"
8487
| "progressCircle"
8588
| "chart"
89+
| "mermaid"
8690
| "fileViewer"
8791
| "divider"
8892
| "qrCode"
@@ -113,7 +117,10 @@ export type UICompType =
113117

114118
export const uiCompRegistry = {} as Record<UICompType | string, UICompManifest>;
115119

116-
export function registerComp(compType: UICompType | string, manifest: UICompManifest) {
120+
export function registerComp(
121+
compType: UICompType | string,
122+
manifest: UICompManifest
123+
) {
117124
uiCompRegistry[compType] = {
118125
...manifest,
119126
keywords: [manifest.name, manifest.enName, manifest.keywords]

0 commit comments

Comments
 (0)