Merge branch 'main' into fix_label_position

lowcoder-org · Aug 7, 2023 · abb55f1 · abb55f1
2 parents fd3cacb + d75f5a4
commit abb55f1
Show file tree

Hide file tree

Showing 14 changed files with 628 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
@@ -288,4 +288,5 @@ export { ReactComponent as ExpandIcon } from "icons/icon-expand.svg";
 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 LottieIcon } from "icons/icon-lottie.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",