Skip to content

Commit 8fafb25

Browse files
authored
Merge branch 'main' into customSelect-forwardRef-warning
2 parents 6a2e6b7 + 417c528 commit 8fafb25

File tree

18 files changed

+946
-10
lines changed

18 files changed

+946
-10
lines changed
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,4 +288,6 @@ export { ReactComponent as ExpandIcon } from "icons/icon-expand.svg";
288288
export { ReactComponent as CompressIcon } from "icons/icon-compress.svg";
289289
export { ReactComponent as TableCellsIcon } from "icons/icon-table-cells.svg"; // Added By Aqib Mirza
290290
export { ReactComponent as TimeLineIcon } from "icons/icon-timeline-comp.svg"
291-
export { ReactComponent as LottieIcon } from "icons/icon-lottie.svg";
291+
export { ReactComponent as LottieIcon } from "icons/icon-lottie.svg";
292+
export { ReactComponent as MentionIcon } from "icons/icon-mention-comp.svg";
293+
export { ReactComponent as AutoCompleteCompIcon } from "icons/icon-autocomplete-comp.svg";

client/packages/lowcoder/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"axios": "^0.21.1",
4343
"buffer": "^6.0.3",
4444
"clsx": "^1.2.1",
45+
"cnchar": "^3.2.4",
4546
"copy-to-clipboard": "^3.3.3",
4647
"core-js": "^3.25.2",
4748
"echarts": "^5.4.2",

client/packages/lowcoder/src/base/codeEditor/extensions.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ const defaultTheme = EditorView.theme({
111111
"&.cm-editor": {
112112
backgroundColor: "#ffffff",
113113
width: "100%",
114-
height: "100%",
114+
// height: "100%",
115115
"font-size": "13px",
116116
transition: "all .4s ease",
117117
outline: "none",

0 commit comments

Comments
 (0)