Skip to content

Commit 9b1e389

Browse files
FalkWolskyFalkWolsky
authored
Merge branch 'dev' into subscription-handling
2 parents 33c7134 + 6514883 commit 9b1e389

File tree

135 files changed

+2511
-532
lines changed

Some content is hidden

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

135 files changed

+2511
-532
lines changed

‎client/packages/lowcoder-cli/client.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ declare var PUBLIC_URL: string;
2929
declare var REACT_APP_EDITION: string;
3030
declare var REACT_APP_LANGUAGES: string;
3131
declare var REACT_APP_COMMIT_ID: string;
32-
declare var REACT_APP_API_HOST: string;
33-
declare var LOWCODER_NODE_SERVICE_URL: string;
32+
declare var REACT_APP_API_SERVICE_URL: string;
33+
declare var REACT_APP_NODE_SERVICE_URL: string;
3434
declare var REACT_APP_ENV: string;
3535
declare var REACT_APP_BUILD_ID: string;
3636
declare var REACT_APP_LOG_LEVEL: string;

‎client/packages/lowcoder-cli/dev-utils/buildVars.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ export const buildVars = [
1616
defaultValue: "00000",
1717
},
1818
{
19-
name: "REACT_APP_API_HOST",
19+
name: "REACT_APP_API_SERVICE_URL",
2020
defaultValue: "",
2121
},
2222
{
23-
name: "LOWCODER_NODE_SERVICE_URL",
23+
name: "REACT_APP_NODE_SERVICE_URL",
2424
defaultValue: "",
2525
},
2626
{

‎client/packages/lowcoder-comps/src/comps/basicChartComp/chartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import {
2626
chartColorPalette,
2727
getPromiseAfterDispatch,
2828
dropdownControl,
29-
useMergeCompStyles,
3029
} from "lowcoder-sdk";
3130
import { getEchartsLocale, trans } from "i18n/comps";
3231
import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -74,8 +73,6 @@ BasicChartTmpComp = withViewFn(BasicChartTmpComp, (comp) => {
7473
log.error('theme chart error: ', error);
7574
}
7675

77-
useMergeCompStyles?.(childrenToProps(comp.children), comp.dispatch);
78-
7976
const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
8077
await getPromiseAfterDispatch(
8178
dispatch,

‎client/packages/lowcoder-comps/src/comps/calendarComp/calendarComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ import {
4545
jsonValueExposingStateControl,
4646
CalendarDeleteIcon,
4747
Tooltip,
48-
useMergeCompStyles,
4948
EditorContext,
5049
CompNameContext,
5150
} from 'lowcoder-sdk';
@@ -137,8 +136,6 @@ let CalendarBasicComp = (function () {
137136
const [left, setLeft] = useState<number | undefined>(undefined);
138137
const [licensed, setLicensed] = useState<boolean>(props.licenseKey !== "");
139138

140-
useMergeCompStyles?.(props, dispatch);
141-
142139
useEffect(() => {
143140
setLicensed(props.licenseKey !== "");
144141
}, [props.licenseKey]);

‎client/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
chartColorPalette,
2626
getPromiseAfterDispatch,
2727
dropdownControl,
28-
useMergeCompStyles,
2928
} from "lowcoder-sdk";
3029
import { getEchartsLocale, trans } from "i18n/comps";
3130
import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -71,8 +70,6 @@ CandleStickChartTmpComp = withViewFn(CandleStickChartTmpComp, (comp) => {
7170
log.error('theme chart error: ', error);
7271
}
7372

74-
useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
75-
7673
const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
7774
await getPromiseAfterDispatch(
7875
dispatch,

‎client/packages/lowcoder-comps/src/comps/chartsGeoMapComp/chartsGeoMapComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import {
2626
chartColorPalette,
2727
getPromiseAfterDispatch,
2828
dropdownControl,
29-
useMergeCompStyles,
3029
} from "lowcoder-sdk";
3130
import { getEchartsLocale, trans } from "i18n/comps";
3231
import { ItemColorComp } from "comps/basicChartComp/chartConfigs/lineChartConfig";
@@ -83,8 +82,6 @@ MapTmpComp = withViewFn(MapTmpComp, (comp) => {
8382
log.error('theme chart error: ', error);
8483
}
8584

86-
useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
87-
8885
const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
8986
await getPromiseAfterDispatch(
9087
dispatch,

‎client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
chartColorPalette,
2626
getPromiseAfterDispatch,
2727
dropdownControl,
28-
useMergeCompStyles,
2928
} from "lowcoder-sdk";
3029
import { getEchartsLocale, trans } from "i18n/comps";
3130
import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -72,8 +71,6 @@ FunnelChartTmpComp = withViewFn(FunnelChartTmpComp, (comp) => {
7271
log.error('theme chart error: ', error);
7372
}
7473

75-
useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
76-
7774
const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
7875
await getPromiseAfterDispatch(
7976
dispatch,

‎client/packages/lowcoder-comps/src/comps/gaugeChartComp/gaugeChartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import {
2626
getPromiseAfterDispatch,
2727
dropdownControl,
2828
JSONObject,
29-
useMergeCompStyles,
3029
} from "lowcoder-sdk";
3130
import { getEchartsLocale, trans } from "i18n/comps";
3231
import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -73,8 +72,6 @@ GaugeChartTmpComp = withViewFn(GaugeChartTmpComp, (comp) => {
7372
log.error('theme chart error: ', error);
7473
}
7574

76-
useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
77-
7875
const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
7976
await getPromiseAfterDispatch(
8077
dispatch,

‎client/packages/lowcoder-comps/src/comps/graphChartComp/graphChartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import {
2626
getPromiseAfterDispatch,
2727
dropdownControl,
2828
JSONObject,
29-
useMergeCompStyles,
3029
} from "lowcoder-sdk";
3130
import { getEchartsLocale, trans } from "i18n/comps";
3231
import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -73,8 +72,6 @@ GraphChartTmpComp = withViewFn(GraphChartTmpComp, (comp) => {
7372
log.error('theme chart error: ', error);
7473
}
7574

76-
useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
77-
7875
const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
7976
await getPromiseAfterDispatch(
8077
dispatch,

‎client/packages/lowcoder-comps/src/comps/heatmapChartComp/heatmapChartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
chartColorPalette,
2626
getPromiseAfterDispatch,
2727
dropdownControl,
28-
useMergeCompStyles,
2928
} from "lowcoder-sdk";
3029
import { getEchartsLocale, trans } from "i18n/comps";
3130
import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -72,8 +71,6 @@ HeatmapChartTmpComp = withViewFn(HeatmapChartTmpComp, (comp) => {
7271
log.error('theme chart error: ', error);
7372
}
7473

75-
useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
76-
7774
const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
7875
await getPromiseAfterDispatch(
7976
dispatch,

‎client/packages/lowcoder-comps/src/comps/radarChartComp/radarChartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
chartColorPalette,
2626
getPromiseAfterDispatch,
2727
dropdownControl,
28-
useMergeCompStyles,
2928
} from "lowcoder-sdk";
3029
import { getEchartsLocale, trans } from "i18n/comps";
3130
import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -72,8 +71,6 @@ RadarChartTmpComp = withViewFn(RadarChartTmpComp, (comp) => {
7271
log.error('theme chart error: ', error);
7372
}
7473

75-
useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
76-
7774
const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
7875
await getPromiseAfterDispatch(
7976
dispatch,

‎client/packages/lowcoder-comps/src/comps/sankeyChartComp/sankeyChartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
chartColorPalette,
2626
getPromiseAfterDispatch,
2727
dropdownControl,
28-
useMergeCompStyles,
2928
} from "lowcoder-sdk";
3029
import { getEchartsLocale, trans } from "i18n/comps";
3130
import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -72,8 +71,6 @@ SankeyChartTmpComp = withViewFn(SankeyChartTmpComp, (comp) => {
7271
log.error('theme chart error: ', error);
7372
}
7473

75-
useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
76-
7774
const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
7875
await getPromiseAfterDispatch(
7976
dispatch,

‎client/packages/lowcoder-comps/src/comps/sunburstChartComp/sunburstChartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
chartColorPalette,
2626
getPromiseAfterDispatch,
2727
dropdownControl,
28-
useMergeCompStyles,
2928
} from "lowcoder-sdk";
3029
import { getEchartsLocale, trans } from "i18n/comps";
3130
import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -72,8 +71,6 @@ SunburstChartTmpComp = withViewFn(SunburstChartTmpComp, (comp) => {
7271
log.error('theme chart error: ', error);
7372
}
7473

75-
useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
76-
7774
const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
7875
await getPromiseAfterDispatch(
7976
dispatch,

‎client/packages/lowcoder-comps/src/comps/themeriverChartComp/themeriverChartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
chartColorPalette,
2626
getPromiseAfterDispatch,
2727
dropdownControl,
28-
useMergeCompStyles,
2928
} from "lowcoder-sdk";
3029
import { getEchartsLocale, trans } from "i18n/comps";
3130
import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -72,8 +71,6 @@ ThemeriverChartTmpComp = withViewFn(ThemeriverChartTmpComp, (comp) => {
7271
log.error('theme chart error: ', error);
7372
}
7473

75-
useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
76-
7774
const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
7875
await getPromiseAfterDispatch(
7976
dispatch,

‎client/packages/lowcoder-comps/src/comps/treeChartComp/treechartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
chartColorPalette,
2626
getPromiseAfterDispatch,
2727
dropdownControl,
28-
useMergeCompStyles,
2928
} from "lowcoder-sdk";
3029
import { getEchartsLocale, trans } from "i18n/comps";
3130
import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -72,8 +71,6 @@ TreeChartTmpComp = withViewFn(TreeChartTmpComp, (comp) => {
7271
log.error('theme chart error: ', error);
7372
}
7473

75-
useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
76-
7774
const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
7875
await getPromiseAfterDispatch(
7976
dispatch,

‎client/packages/lowcoder-comps/src/comps/treemapChartComp/treemapChartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
chartColorPalette,
2626
getPromiseAfterDispatch,
2727
dropdownControl,
28-
useMergeCompStyles,
2928
} from "lowcoder-sdk";
3029
import { getEchartsLocale, trans } from "i18n/comps";
3130
import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -72,8 +71,6 @@ TreemapChartTmpComp = withViewFn(TreemapChartTmpComp, (comp) => {
7271
log.error('theme chart error: ', error);
7372
}
7473

75-
useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
76-
7774
const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
7875
await getPromiseAfterDispatch(
7976
dispatch,

‎client/packages/lowcoder-sdk-webpack-bundle/src/dev-utils/buildVars.cjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ const buildVars = [
1616
defaultValue: "00000",
1717
},
1818
{
19-
name: "REACT_APP_API_HOST",
19+
name: "REACT_APP_API_SERVICE_URL",
2020
defaultValue: "",
2121
},
2222
{
23-
name: "LOWCODER_NODE_SERVICE_URL",
23+
name: "REACT_APP_NODE_SERVICE_URL",
2424
defaultValue: "",
2525
},
2626
{

‎client/packages/lowcoder-sdk-webpack-bundle/webpack.config.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ module.exports = {
102102
plugins: [
103103
new webpack.DefinePlugin({
104104
...define,
105-
REACT_APP_API_HOST: JSON.stringify(apiBaseUrl),
105+
REACT_APP_API_SERVICE_URL: JSON.stringify(apiBaseUrl),
106106
REACT_APP_BUNDLE_TYPE: JSON.stringify("sdk"),
107107
}),
108108
new webpack.IgnorePlugin({

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-sdk",
3-
"version": "2.4.11",
3+
"version": "2.4.12",
44
"type": "module",
55
"files": [
66
"src",

‎client/packages/lowcoder-sdk/src/dev-utils/buildVars.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ export const buildVars = [
1616
defaultValue: "00000",
1717
},
1818
{
19-
name: "REACT_APP_API_HOST",
19+
name: "REACT_APP_API_SERVICE_URL",
2020
defaultValue: "",
2121
},
2222
{
23-
name: "LOWCODER_NODE_SERVICE_URL",
23+
name: "REACT_APP_NODE_SERVICE_URL",
2424
defaultValue: "",
2525
},
2626
{

‎client/packages/lowcoder-sdk/vite.config.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const apiBaseUrl = "http://localhost:8000";
2121
export const viteConfig: UserConfig = {
2222
define: {
2323
...define,
24-
REACT_APP_API_HOST: JSON.stringify(apiBaseUrl),
24+
REACT_APP_API_SERVICE_URL: JSON.stringify(apiBaseUrl),
2525
REACT_APP_BUNDLE_TYPE: JSON.stringify("sdk"),
2626
},
2727
assetsInclude: ["**/*.md"],

‎client/packages/lowcoder/src/app-env.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ declare var PUBLIC_URL: string;
3535
declare var REACT_APP_EDITION: string;
3636
declare var REACT_APP_LANGUAGES: string;
3737
declare var REACT_APP_COMMIT_ID: string;
38-
declare var REACT_APP_API_HOST: string;
39-
declare var LOWCODER_NODE_SERVICE_URL: string;
38+
declare var REACT_APP_API_SERVICE_URL: string;
39+
declare var REACT_APP_NODE_SERVICE_URL: string;
4040
declare var REACT_APP_ENV: string;
4141
declare var REACT_APP_BUILD_ID: string;
4242
declare var REACT_APP_LOG_LEVEL: string;

0 commit comments

Comments
 (0)