Merge branch 'main' into fix-container-fix-height-issue

Author: FalkWolsky

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

@@ -91,14 +91,15 @@ const TimelineComp = (
   return (
     <div
       style={{
-        margin: style.margin,
-        padding: style.padding,
-        width: widthCalculator(style.margin),
-        height: heightCalculator(style.margin),
+        margin: style.margin ?? '3px',
+        padding: style.padding ?? '3px',
+        width: widthCalculator(style.margin ?? '3px'),
+        height: heightCalculator(style.margin ?? '3px'),
         background: style.background,
         overflow: "auto",
         overflowX: "hidden",
         borderRadius: style.radius,
+        //height: '100%'
       }}
     >
       <Timeline

client/packages/lowcoder/src/util/stringUtils.ts

@@ -57,6 +57,18 @@ export const COLOR_PALETTE = [
   "#2693FF",
   "#4965F2",
   "#3377FF",
+  "#ff4d4f",
+  "#d4380d",
+  "#873800",
+  "#ffc53d",
+  "#d4b106",
+  "#3f6600",
+  "#73d13d",
+  "#08979c",
+  "#003a8c",
+  "#597ef7",
+  "#531dab",
+  "#780650",
 ] as const;
 
 export const PHONE_NUMBER_PATTERN = /^1\d{10}$/;

deploy/docker/Dockerfile

@@ -66,7 +66,7 @@ CMD [ "sh" , "/lowcoder/api-service/entrypoint.sh" ]
 ##
 FROM ubuntu:jammy as build-node-service
 
-RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl ca-certificates
+RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl ca-certificates build-essential
 
 # Download nodejs and install yarn
 RUN curl -sL https://deb.nodesource.com/setup_19.x | bash - \
@@ -174,8 +174,12 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal
   && curl -fsSL https://www.mongodb.org/static/pgp/server-4.4.asc | gpg --dearmor -o /usr/share/keyrings/mongodb-archive-keyring.gpg \
   && echo "deb [signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg arch=amd64,arm64] http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list \
   && curl -sL https://deb.nodesource.com/setup_19.x | bash - \
-  && curl -sL http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb --output libssl1.1_1.1.1f-1ubuntu2_amd64.deb \
-  && dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb \
+  && if [ "$(dpkg --print-architecture)" = "amd64" ] || [ "$(dpkg --print-architecture)" = "i386" ]; then \
+    curl -sL http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb --output libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb; \
+  else \
+    curl -sL http://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb --output libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb; \
+  fi \
+  && dpkg -i libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb \
   && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends -y \
       mongodb-org \
       redis \