Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 08a6e05

Browse files
Merge branch 'main' into fix-container-height-reset-on-child-delete
2 parents c9ca7b5 + d9df265 commit 08a6e05

File tree

4 files changed

+21
-5
lines changed

4 files changed

+21
-5
lines changed

‎client/packages/lowcoder/src/comps/comps/tabs/tabbedContainerComp.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ const TabbedContainer = (props: TabbedContainerProps) => {
164164
// log.debug("TabbedContainer. props: ", props);
165165

166166
return (
167-
<div style={{padding: props.style.margin}}>
167+
<div style={{padding: props.style.margin,height: '100%'}}>
168168
<StyledTabs
169169
activeKey={activeKey}
170170
$style={style}

‎client/packages/lowcoder/src/comps/comps/triContainerComp/triContainer.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export function TriContainer(props: TriContainerProps) {
7878
const paddingWidth = isMobile ? 7 : 19;
7979

8080
return (
81-
<div style={{padding: style.margin}}>
81+
<div style={{padding: style.margin,height: '100%'}}>
8282
<Wrapper $style={style}>
8383
{showHeader && (
8484
<BackgroundColorContext.Provider value={container.style.headerBackground}>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,18 @@ export const COLOR_PALETTE = [
5757
"#2693FF",
5858
"#4965F2",
5959
"#3377FF",
60+
"#ff4d4f",
61+
"#d4380d",
62+
"#873800",
63+
"#ffc53d",
64+
"#d4b106",
65+
"#3f6600",
66+
"#73d13d",
67+
"#08979c",
68+
"#003a8c",
69+
"#597ef7",
70+
"#531dab",
71+
"#780650",
6072
] as const;
6173

6274
export const PHONE_NUMBER_PATTERN = /^1\d{10}$/;

‎deploy/docker/Dockerfile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ CMD [ "sh" , "/lowcoder/api-service/entrypoint.sh" ]
6666
##
6767
FROM ubuntu:jammy as build-node-service
6868

69-
RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl ca-certificates
69+
RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl ca-certificates build-essential
7070

7171
# Download nodejs and install yarn
7272
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
174174
&& curl -fsSL https://www.mongodb.org/static/pgp/server-4.4.asc | gpg --dearmor -o /usr/share/keyrings/mongodb-archive-keyring.gpg \
175175
&& 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 \
176176
&& curl -sL https://deb.nodesource.com/setup_19.x | bash - \
177-
&& 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 \
178-
&& dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb \
177+
&& if [ "$(dpkg --print-architecture)" = "amd64" ] || [ "$(dpkg --print-architecture)" = "i386" ]; then \
178+
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; \
179+
else \
180+
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; \
181+
fi \
182+
&& dpkg -i libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb \
179183
&& apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends -y \
180184
mongodb-org \
181185
redis \

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /