Skip to content

Commit 3476223

Browse files
FalkWolskyFalkWolsky
authored
Merge pull request #767 from Lowcoder-Pro/dev
Lowcoder Plugin System
2 parents 7758d4a + 348c98e commit 3476223

File tree

117 files changed

+2998
-924
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+2998
-924
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ client/node_modules/
99
client/packages/lowcoder-plugin-demo/.yarn/install-state.gz
1010
client/packages/lowcoder-plugin-demo/yarn.lock
1111
client/packages/lowcoder-plugin-demo/.yarn/cache/@types-node-npm-16.18.68-56f72825c0-094ae9ed80.zip
12+
application-dev.yml

‎client/packages/lowcoder-comps/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-comps",
3-
"version": "0.0.26",
3+
"version": "0.0.27",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {

‎client/packages/lowcoder/src/comps/comps/numberInputComp/numberInputComp.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ import {
5252

5353
import { useContext } from "react";
5454
import { EditorContext } from "comps/editorState";
55+
import { migrateOldData } from "comps/generators/simpleGenerators";
56+
import { fixOldInputCompData } from "../textInputComp/textInputConstants";
5557

5658
const getStyle = (style: InputLikeStyleType) => {
5759
return css`
@@ -372,7 +374,7 @@ const CustomInputNumber = (props: RecordConstructorToView<typeof childrenMap>) =
372374
);
373375
};
374376

375-
const NumberInputTmpComp = (function () {
377+
let NumberInputTmpComp = (function () {
376378
return new UICompBuilder(childrenMap, (props) => {
377379
return props.label({
378380
required: props.required,
@@ -434,6 +436,8 @@ const NumberInputTmpComp = (function () {
434436
.build();
435437
})();
436438

439+
NumberInputTmpComp = migrateOldData(NumberInputTmpComp, fixOldInputCompData);
440+
437441
const NumberInputTmp2Comp = withMethodExposing(
438442
NumberInputTmpComp,
439443
refMethods([

‎client/packages/lowcoder/src/comps/comps/selectInputComp/checkboxComp.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import { ValueFromOption } from "lowcoder-design";
2222
import { EllipsisTextCss } from "lowcoder-design";
2323
import { trans } from "i18n";
2424
import { RefControl } from "comps/controls/refControl";
25+
import { migrateOldData } from "comps/generators/simpleGenerators";
26+
import { fixOldInputCompData } from "../textInputComp/textInputConstants";
2527

2628
export const getStyle = (style: CheckboxStyleType) => {
2729
return css`
@@ -126,7 +128,7 @@ const CheckboxGroup = styled(AntdCheckboxGroup) <{
126128
}}
127129
`;
128130

129-
const CheckboxBasicComp = (function () {
131+
let CheckboxBasicComp = (function () {
130132
const childrenMap = {
131133
defaultValue: arrayStringExposingStateControl("defaultValue"),
132134
value: arrayStringExposingStateControl("value"),
@@ -176,6 +178,8 @@ const CheckboxBasicComp = (function () {
176178
.build();
177179
})();
178180

181+
CheckboxBasicComp = migrateOldData(CheckboxBasicComp, fixOldInputCompData);
182+
179183
export const CheckboxComp = withExposingConfigs(CheckboxBasicComp, [
180184
new NameConfig("value", trans("selectInput.valueDesc")),
181185
SelectInputInvalidConfig,

‎client/packages/lowcoder/src/comps/comps/selectInputComp/multiSelectComp.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ import { SelectInputInvalidConfig, useSelectInputValidate } from "./selectInputC
1414

1515
import { PaddingControl } from "../../controls/paddingControl";
1616
import { MarginControl } from "../../controls/marginControl";
17-
import { useEffect, useRef } from "react";
17+
import { migrateOldData } from "comps/generators/simpleGenerators";
18+
import { fixOldInputCompData } from "../textInputComp/textInputConstants";
1819

19-
const MultiSelectBasicComp = (function () {
20+
let MultiSelectBasicComp = (function () {
2021
const childrenMap = {
2122
...SelectChildrenMap,
2223
defaultValue: arrayStringExposingStateControl("defaultValue", ["1", "2"]),
@@ -52,6 +53,8 @@ const MultiSelectBasicComp = (function () {
5253
.build();
5354
})();
5455

56+
MultiSelectBasicComp = migrateOldData(MultiSelectBasicComp, fixOldInputCompData);
57+
5558
export const MultiSelectComp = withExposingConfigs(MultiSelectBasicComp, [
5659
new NameConfig("value", trans("selectInput.valueDesc")),
5760
new NameConfig("inputValue", trans("select.inputValueDesc")),

‎client/packages/lowcoder/src/comps/comps/selectInputComp/radioComp.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import {
1111
} from "./selectInputConstants";
1212
import { EllipsisTextCss, ValueFromOption } from "lowcoder-design";
1313
import { trans } from "i18n";
14+
import { fixOldInputCompData } from "../textInputComp/textInputConstants";
15+
import { migrateOldData } from "comps/generators/simpleGenerators";
1416

1517
const getStyle = (style: RadioStyleType) => {
1618
return css`
@@ -93,7 +95,7 @@ const Radio = styled(AntdRadioGroup)<{
9395
}}
9496
`;
9597

96-
const RadioBasicComp = (function () {
98+
let RadioBasicComp = (function () {
9799
return new UICompBuilder(RadioChildrenMap, (props) => {
98100
const [
99101
validateState,
@@ -129,6 +131,8 @@ const RadioBasicComp = (function () {
129131
.build();
130132
})();
131133

134+
RadioBasicComp = migrateOldData(RadioBasicComp, fixOldInputCompData);
135+
132136
export const RadioComp = withExposingConfigs(RadioBasicComp, [
133137
new NameConfig("value", trans("selectInput.valueDesc")),
134138
SelectInputInvalidConfig,

‎client/packages/lowcoder/src/comps/comps/selectInputComp/segmentedControl.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ import { RefControl } from "comps/controls/refControl";
2525

2626
import { useContext } from "react";
2727
import { EditorContext } from "comps/editorState";
28+
import { migrateOldData } from "comps/generators/simpleGenerators";
29+
import { fixOldInputCompData } from "../textInputComp/textInputConstants";
30+
2831

2932
const getStyle = (style: SegmentStyleType) => {
3033
return css`
@@ -83,7 +86,7 @@ const SegmentChildrenMap = {
8386
...formDataChildren,
8487
};
8588

86-
const SegmentedControlBasicComp = (function () {
89+
let SegmentedControlBasicComp = (function () {
8790
return new UICompBuilder(SegmentChildrenMap, (props) => {
8891
const [
8992
validateState,
@@ -147,6 +150,8 @@ const SegmentedControlBasicComp = (function () {
147150
.build();
148151
})();
149152

153+
SegmentedControlBasicComp = migrateOldData(SegmentedControlBasicComp, fixOldInputCompData);
154+
150155
export const SegmentedControlComp = withExposingConfigs(SegmentedControlBasicComp, [
151156
new NameConfig("value", trans("selectInput.valueDesc")),
152157
SelectInputInvalidConfig,

‎client/packages/lowcoder/src/comps/comps/selectInputComp/selectComp.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ import {
1717
} from "./selectInputConstants";
1818
import { useRef } from "react";
1919
import { RecordConstructorToView } from "lowcoder-core";
20+
import { fixOldInputCompData } from "../textInputComp/textInputConstants";
21+
import { migrateOldData } from "comps/generators/simpleGenerators";
2022

21-
const SelectBasicComp = (function () {
23+
let SelectBasicComp = (function () {
2224
const childrenMap = {
2325
...SelectChildrenMap,
2426
defaultValue: stringExposingStateControl("defaultValue"),
@@ -55,6 +57,8 @@ const SelectBasicComp = (function () {
5557
.build();
5658
})();
5759

60+
SelectBasicComp = migrateOldData(SelectBasicComp, fixOldInputCompData);
61+
5862
export const SelectComp = withExposingConfigs(SelectBasicComp, [
5963
new NameConfig("value", trans("selectInput.valueDesc")),
6064
new NameConfig("inputValue", trans("select.inputValueDesc")),

‎client/packages/lowcoder/src/comps/comps/textInputComp/inputComp.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import styled from "styled-components";
1111
import { UICompBuilder } from "../../generators";
1212
import { FormDataPropertyView } from "../formComp/formDataConstants";
1313
import {
14+
fixOldInputCompData,
1415
getStyle,
1516
inputRefMethods,
1617
TextInputBasicSection,
@@ -30,6 +31,7 @@ import { IconControl } from "comps/controls/iconControl";
3031
import { hasIcon } from "comps/utils";
3132
import { InputRef } from "antd/es/input";
3233
import { RefControl } from "comps/controls/refControl";
34+
import { migrateOldData } from "comps/generators/simpleGenerators";
3335

3436
import React, { useContext } from "react";
3537
import { EditorContext } from "comps/editorState";
@@ -52,7 +54,7 @@ const childrenMap = {
5254
suffixIcon: IconControl,
5355
};
5456

55-
export const InputComp = new UICompBuilder(childrenMap, (props) => {
57+
let InputBasicComp = new UICompBuilder(childrenMap, (props) => {
5658
const [inputProps, validateState] = useTextInputProps(props);
5759
return props.label({
5860
required: props.required,
@@ -108,3 +110,8 @@ export const InputComp = new UICompBuilder(childrenMap, (props) => {
108110
...TextInputConfigs,
109111
])
110112
.build();
113+
114+
115+
const InputComp = migrateOldData(InputBasicComp, fixOldInputCompData);
116+
117+
export { InputComp };

‎client/packages/lowcoder/src/comps/comps/textInputComp/mentionComp.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { UICompBuilder } from "../../generators";
1212
import { FormDataPropertyView } from "../formComp/formDataConstants";
1313
import {
1414
checkMentionListData,
15+
fixOldInputCompData,
1516
textInputChildren,
1617
} from "./textInputConstants";
1718
import {
@@ -42,7 +43,7 @@ import { blurMethod, focusWithOptions } from "comps/utils/methodUtils";
4243
import {
4344
textInputValidate,
4445
} from "../textInputComp/textInputConstants";
45-
import { jsonControl } from "@lowcoder-ee/comps/controls/codeControl";
46+
import { jsonControl } from "comps/controls/codeControl";
4647
import {
4748
submitEvent,
4849
eventHandlerControl,
@@ -54,6 +55,7 @@ import {
5455

5556
import React, { useContext } from "react";
5657
import { EditorContext } from "comps/editorState";
58+
import { migrateOldData } from "comps/generators/simpleGenerators";
5759

5860
const Wrapper = styled.div<{
5961
$style: InputLikeStyleType;
@@ -267,12 +269,15 @@ let MentionTmpComp = (function () {
267269
.build();
268270
})();
269271

272+
270273
MentionTmpComp = class extends MentionTmpComp {
271274
override autoHeight(): boolean {
272275
return this.children.autoHeight.getView();
273276
}
274277
};
275278

279+
MentionTmpComp = migrateOldData(MentionTmpComp, fixOldInputCompData);
280+
276281
const TextareaTmp2Comp = withMethodExposing(
277282
MentionTmpComp,
278283
refMethods([focusWithOptions, blurMethod])

‎client/packages/lowcoder/src/comps/comps/textInputComp/passwordComp.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { LabelControl } from "../../controls/labelControl";
1313
import { UICompBuilder, withDefault } from "../../generators";
1414
import { FormDataPropertyView } from "../formComp/formDataConstants";
1515
import {
16+
fixOldInputCompData,
1617
getStyle,
1718
inputRefMethods,
1819
TextInputBasicSection,
@@ -40,14 +41,15 @@ import { hasIcon } from "comps/utils";
4041
import { RefControl } from "comps/controls/refControl";
4142
import React, { useContext } from "react";
4243
import { EditorContext } from "comps/editorState";
44+
import { migrateOldData } from "comps/generators/simpleGenerators";
4345

4446
const PasswordStyle = styled(InputPassword)<{
4547
$style: InputLikeStyleType;
4648
}>`
4749
${(props) => props.$style && getStyle(props.$style)}
4850
`;
4951

50-
const PasswordTmpComp = (function () {
52+
let PasswordTmpComp = (function () {
5153
const childrenMap = {
5254
...textInputChildren,
5355
viewRef: RefControl<InputRef>,
@@ -111,6 +113,8 @@ const PasswordTmpComp = (function () {
111113
.build();
112114
})();
113115

116+
PasswordTmpComp = migrateOldData(PasswordTmpComp, fixOldInputCompData);
117+
114118
const PasswordTmp2Comp = withMethodExposing(PasswordTmpComp, inputRefMethods);
115119

116120
export const PasswordComp = withExposingConfigs(PasswordTmp2Comp, [

‎client/packages/lowcoder/src/comps/comps/textInputComp/textAreaComp.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { AutoHeightControl } from "../../controls/autoHeightControl";
1010
import { UICompBuilder, withDefault } from "../../generators";
1111
import { FormDataPropertyView } from "../formComp/formDataConstants";
1212
import {
13+
fixOldInputCompData,
1314
getStyle,
1415
TextInputBasicSection,
1516
textInputChildren,
@@ -35,6 +36,7 @@ import { blurMethod, focusWithOptions } from "comps/utils/methodUtils";
3536

3637
import React, { useContext } from "react";
3738
import { EditorContext } from "comps/editorState";
39+
import { migrateOldData } from "comps/generators/simpleGenerators";
3840

3941
const TextAreaStyled = styled(TextArea)<{
4042
$style: InputLikeStyleType;
@@ -126,6 +128,8 @@ TextAreaTmpComp = class extends TextAreaTmpComp {
126128
}
127129
};
128130

131+
TextAreaTmpComp = migrateOldData(TextAreaTmpComp, fixOldInputCompData);
132+
129133
const TextareaTmp2Comp = withMethodExposing(
130134
TextAreaTmpComp,
131135
refMethods([focusWithOptions, blurMethod])

‎client/packages/lowcoder/src/comps/comps/textInputComp/textInputConstants.tsx

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,3 +305,17 @@ export function checkMentionListData(data: any) {
305305
}
306306
return data
307307
}
308+
309+
// separate defaultValue and value for old components
310+
export function fixOldInputCompData(oldData: any) {
311+
if (!oldData) return oldData;
312+
if (Boolean(oldData.value) && !Boolean(oldData.defaultValue)) {
313+
const value = oldData.value;
314+
return {
315+
...oldData,
316+
defaultValue: value,
317+
value: '',
318+
};
319+
}
320+
return oldData;
321+
}

‎deploy/docker/Dockerfile

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,14 @@
22
## Build Lowcoder api-service application
33
##
44
FROM maven:3.9-eclipse-temurin-17 AS build-api-service
5+
6+
# Build lowcoder-api
57
COPY ./server/api-service /lowcoder-server
68
WORKDIR /lowcoder-server
79
RUN --mount=type=cache,target=/root/.m2 mvn -f pom.xml clean package -DskipTests
810

911
# Create required folder structure
10-
RUN mkdir -p /lowcoder/api-service/plugins /lowcoder/api-service/config /lowcoder/api-service/logs
11-
12-
# Define lowcoder main jar and plugin jars
13-
ARG JAR_FILE=/lowcoder-server/lowcoder-server/target/lowcoder-server-*.jar
14-
ARG PLUGIN_JARS=/lowcoder-server/lowcoder-plugins/*/target/*.jar
15-
16-
# Copy lowcoder server application and plugins
17-
RUN cp ${JAR_FILE} /lowcoder/api-service/server.jar \
18-
&& cp ${PLUGIN_JARS} /lowcoder/api-service/plugins/
12+
RUN mkdir -p /lowcoder/api-service/config /lowcoder/api-service/logs /lowcoder/plugins
1913

2014
# Copy lowcoder server configuration
2115
COPY server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml /lowcoder/api-service/config/
@@ -43,6 +37,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends gosu \
4337
# Copy lowcoder server configuration
4438
COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder/api-service /lowcoder/api-service
4539

40+
# Copy lowcoder api service app, dependencies and libs
41+
COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/distribution/target/lowcoder-api-service-bin/app /lowcoder/api-service/app
42+
COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/distribution/target/lowcoder-api-service-bin/dependencies /lowcoder/api-service/dependencies
43+
COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/distribution/target/lowcoder-api-service-bin/libs /lowcoder/api-service/libs
44+
COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/distribution/target/lowcoder-api-service-bin/plugins /lowcoder/api-service/plugins
45+
COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/distribution/target/lowcoder-api-service-bin/set-classpath.sh /lowcoder/api-service/set-classpath.sh
46+
4647
EXPOSE 8080
4748
CMD [ "sh" , "/lowcoder/api-service/entrypoint.sh" ]
4849

@@ -202,6 +203,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal
202203

203204
# Add lowcoder api-service
204205
COPY --chown=lowcoder:lowcoder --from=lowcoder-ce-api-service /lowcoder/api-service /lowcoder/api-service
206+
RUN mkdir -p /lowcoder/plugins/ && chown lowcoder:lowcoder /lowcoder/plugins/
205207

206208
# Add lowcoder node-service
207209
COPY --chown=lowcoder:lowcoder --from=lowcoder-ce-node-service /lowcoder/node-service /lowcoder/node-service

‎deploy/docker/api-service/entrypoint.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,16 @@ ${JAVA_HOME}/bin/java -version
2727
echo
2828

2929
cd /lowcoder/api-service
30+
source set-classpath.sh
31+
3032
exec gosu ${USER_ID}:${GROUP_ID} ${JAVA_HOME}/bin/java \
33+
-Djava.util.prefs.userRoot=/tmp \
3134
-Djava.security.egd=file:/dev/./urandom \
3235
-Dhttps.protocols=TLSv1.1,TLSv1.2 \
3336
-Dlog4j2.formatMsgNoLookups=true \
3437
-Dspring.config.location="file:///lowcoder/api-service/config/application.yml,file:///lowcoder/api-service/config/application-selfhost.yml" \
3538
--add-opens java.base/java.nio=ALL-UNNAMED \
39+
-cp "${LOWCODER_CLASSPATH:=.}" \
3640
${JAVA_OPTS} \
37-
-jar "${APP_JAR}" --spring.webflux.base-path=${CONTEXT_PATH} ${CUSTOM_APP_PROPERTIES}
41+
org.lowcoder.api.ServerApplication --spring.webflux.base-path=${CONTEXT_PATH} ${CUSTOM_APP_PROPERTIES}
3842

‎server/api-service/.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ dependency-reduced-pom.xml
2323
.run/**
2424
logs/**
2525
tmp/**
26-
/openblocks-server/logs/
2726

27+
# Ignore plugin.properties which are generated dynamically
28+
**/plugin.properties
2829

2930
# to ignore the node_modeules folder
3031
node_modules
@@ -34,5 +35,4 @@ package-lock.json
3435
# test coverage
3536
coverage-summary.json
3637
app/client/cypress/locators/Widgets.json
37-
/openblocks-domain/logs/
38-
application-lowcoder.yml
38+
application-lowcoder.yml

0 commit comments

Comments
 (0)