Merge branch 'main' into mention_component

lowcoder-org · Aug 7, 2023 · 1a56b61 · 1a56b61
2 parents 13c9647 + bbe7184
commit 1a56b61
Show file tree

Hide file tree

Showing 15 changed files with 627 additions and 8 deletions.
diff --git a/client/packages/lowcoder-design/src/icons/icon-autocomplete-comp.svg b/client/packages/lowcoder-design/src/icons/icon-autocomplete-comp.svg
diff --git a/client/packages/lowcoder-design/src/icons/index.ts b/client/packages/lowcoder-design/src/icons/index.ts
@@ -289,4 +289,5 @@ export { ReactComponent as CompressIcon } from "icons/icon-compress.svg";
 export { ReactComponent as TableCellsIcon } from "icons/icon-table-cells.svg"; // Added By Aqib Mirza
 export { ReactComponent as TimeLineIcon } from "icons/icon-timeline-comp.svg"
 export { ReactComponent as LottieIcon } from "icons/icon-lottie.svg";
-export { ReactComponent as MentionIcon } from "icons/icon-mention-comp.svg";
+export { ReactComponent as MentionIcon } from "icons/icon-mention-comp.svg";
+export { ReactComponent as AutoCompleteCompIcon } from "icons/icon-autocomplete-comp.svg";
diff --git a/client/packages/lowcoder/package.json b/client/packages/lowcoder/package.json
@@ -42,6 +42,7 @@
     "axios": "^0.21.1",
     "buffer": "^6.0.3",
     "clsx": "^1.2.1",
+    "cnchar": "^3.2.4",
     "copy-to-clipboard": "^3.3.3",
     "core-js": "^3.25.2",
     "echarts": "^5.4.2",

diff --git a/client/packages/lowcoder/src/base/codeEditor/extensions.tsx b/client/packages/lowcoder/src/base/codeEditor/extensions.tsx
@@ -111,7 +111,7 @@ const defaultTheme = EditorView.theme({
   "&.cm-editor": {
     backgroundColor: "#ffffff",
     width: "100%",
-    height: "100%",
+    // height: "100%",
     "font-size": "13px",
     transition: "all .4s ease",
     outline: "none",