Skip to content

Commit fba0274

Browse files
FalkWolskyFalkWolsky
authored
Merge branch 'dev' into main
2 parents 0d9726f + a07a418 commit fba0274

File tree

156 files changed

+9062
-379
lines changed

Some content is hidden

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

156 files changed

+9062
-379
lines changed

‎.DS_Store

6 KB
Binary file not shown.

‎client/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.8
1+
2.1.0

‎client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"@types/qrcode.react": "^1.0.2",
3434
"@types/react-grid-layout": "^1.3.0",
3535
"@types/react-helmet": "^6.1.5",
36-
"@types/react-resizable": "^1.7.4",
36+
"@types/react-resizable": "^3.0.5",
3737
"@types/react-router-dom": "^5.3.2",
3838
"@types/shelljs": "^0.8.11",
3939
"@types/styled-components": "^5.1.19",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ declare var LOWCODER_NODE_SERVICE_URL: string;
3434
declare var LOWCODER_SHOW_BRAND: string;
3535
declare var LOWCODER_CUSTOM_LOGO: string;
3636
declare var LOWCODER_CUSTOM_LOGO_SQUARE: string;
37+
declare var LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string;
3738
declare var REACT_APP_ENV: string;
3839
declare var REACT_APP_BUILD_ID: string;
3940
declare var REACT_APP_LOG_LEVEL: string;

‎client/packages/lowcoder-comps/icons/mermaidchart.svg

Lines changed: 18 additions & 0 deletions
Loading

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-comps",
3-
"version": "0.0.13",
3+
"version": "0.0.15",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {
@@ -15,6 +15,7 @@
1515
"@types/react-dom": "17",
1616
"big.js": "^6.2.1",
1717
"echarts-extension-gmap": "^1.6.0",
18+
"echarts-wordcloud": "^2.1.0",
1819
"lowcoder-cli": "workspace:^",
1920
"lowcoder-sdk": "workspace:^",
2021
"mermaid": "^10.2.4",
@@ -29,16 +30,16 @@
2930
"name": "Chart",
3031
"icon": "./icons/icon-chart.svg",
3132
"layoutInfo": {
32-
"w": 11,
33-
"h": 35
33+
"w": 15,
34+
"h": 40
3435
}
3536
},
3637
"imageEditor": {
3738
"name": "Image Editor",
3839
"icon": "./icons/icon-chart.svg",
3940
"layoutInfo": {
4041
"w": 15,
41-
"h": 60
42+
"h": 40
4243
}
4344
},
4445
"calendar": {
@@ -48,6 +49,14 @@
4849
"w": 15,
4950
"h": 60
5051
}
52+
},
53+
"mermaid": {
54+
"name": "Mermaid",
55+
"icon": "./icons/mermaidchart.svg",
56+
"layoutInfo": {
57+
"w": 15,
58+
"h": 40
59+
}
5160
}
5261
}
5362
},

‎client/packages/lowcoder-comps/src/comps/chartComp/reactEcharts/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import * as echarts from "echarts";
2+
import "echarts-wordcloud";
23
import { EChartsReactProps, EChartsInstance, EChartsOptionWithMap } from "./types";
34
import EChartsReactCore from "./core";
45

‎client/packages/lowcoder-comps/src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import { ChartCompWithDefault } from "./comps/chartComp/chartComp";
22
import { ImageEditorComp } from "./comps/imageEditorComp/index";
33
import { CalendarComp } from "./comps/calendarComp/calendarComp";
4+
import { MermaidComp } from "comps/mermaidComp";
45

56
export default {
67
chart: ChartCompWithDefault,
78
imageEditor: ImageEditorComp,
89
calendar: CalendarComp,
10+
mermaid: MermaidComp,
911
};

‎client/packages/lowcoder-design/src/icons/icon-mermaid.svg

Lines changed: 18 additions & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ export { ReactComponent as AudioCompIcon } from "./icon-insert-audio.svg";
168168
export { ReactComponent as VideoCompIcon } from "./icon-insert-video.svg";
169169
export { ReactComponent as videoPlayTriangle } from "./icon-video-play-triangle.svg";
170170
export { ReactComponent as DrawerCompIcon } from "./icon-drawer.svg";
171+
export { ReactComponent as LeftMeetingIcon } from "./icon-left-comp-video.svg";
171172
export { ReactComponent as PlusIcon } from "./icon-plus.svg";
172173
export { ReactComponent as HomeIcon } from "./icon-application-home.svg";
173174
export { ReactComponent as HomeModuleIcon } from "./icon-application-module.svg";
@@ -223,6 +224,7 @@ export { ReactComponent as GraphqlIcon } from "./icon-query-Graphql.svg";
223224
export { ReactComponent as SnowflakeIcon } from "./icon-query-snowflake.svg";
224225
export { ReactComponent as MariaDBIcon } from "./icon-query-MariaDB.svg";
225226
export { ReactComponent as imageEditorIcon } from "./icon-insert-imageEditor.svg";
227+
export { ReactComponent as MermaidIcon } from "./icon-mermaid.svg";
226228
export { ReactComponent as HomeSettingsIcon } from "./icon-home-settings.svg";
227229
export { ReactComponent as HomeSettingsActiveIcon } from "./icon-home-settings-active.svg";
228230
export { ReactComponent as HelpGithubIcon } from "./icon-help-github.svg";
@@ -236,6 +238,7 @@ export { ReactComponent as LeftContainer } from "./icon-left-comp-container.svg"
236238
export { ReactComponent as LeftDate } from "./icon-left-comp-date.svg";
237239
export { ReactComponent as LeftDivider } from "./icon-left-comp-divider.svg";
238240
export { ReactComponent as LeftDrawer } from "./icon-left-comp-drawer.svg";
241+
export { ReactComponent as LeftMeeting } from "./icon-left-comp-video.svg";
239242
export { ReactComponent as LeftFile } from "./icon-left-comp-file.svg";
240243
export { ReactComponent as LeftFileViewer } from "./icon-left-comp-fileViewer.svg";
241244
export { ReactComponent as LeftForm } from "./icon-left-comp-form.svg";

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ export const buildVars = [
3535
name: "LOWCODER_NODE_SERVICE_URL",
3636
defaultValue: "",
3737
},
38+
{
39+
name: "LOWCODER_CUSTOM_AUTH_WELCOME_TEXT",
40+
defaultValue: "",
41+
},
3842
{
3943
name: "REACT_APP_ENV",
4044
defaultValue: "production",

‎client/packages/lowcoder/docker-compose.yaml

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
version: '3'
2+
3+
services:
4+
mysql:
5+
image: mysql:8.0.22
6+
command: --default-authentication-plugin=mysql_native_password
7+
volumes:
8+
- mysqlvol:/var/lib/mysql
9+
- ./backup:/var/backup
10+
environment:
11+
MYSQL_ROOT_PASSWORD: defaultpassword
12+
ports:
13+
- "3306:3306"
14+
15+
redis:
16+
image: redis
17+
volumes:
18+
- redisvol:/data
19+
20+
taxi-rider-api:
21+
image: ridyio/ridy-rider-api
22+
restart: always
23+
depends_on:
24+
- "mysql"
25+
- "redis"
26+
- "taxi-admin-api"
27+
volumes:
28+
- ./img:/app/uploads
29+
- ./config-new:/app/config
30+
environment:
31+
- MYSQL_HOST=mysql
32+
- GATEWAY_SERVER_URL=http://x.x.x.x:3333
33+
- RIDER_SERVER_URL=http://x.x.x.x:4000
34+
- ENCRYPTION_KEY=lPw3ethAy4WqnWa3b4TAbCUJr89RifEs
35+
- REDIS_HOST=redis
36+
ports:
37+
- "4000:3000"
38+
39+
taxi-driver-api:
40+
image: ridyio/ridy-driver-api
41+
restart: always
42+
depends_on:
43+
- "mysql"
44+
- "redis"
45+
- "taxi-admin-api"
46+
volumes:
47+
- ./img:/app/uploads
48+
- ./config-new:/app/config
49+
environment:
50+
- MYSQL_HOST=mysql
51+
- GATEWAY_SERVER_URL=http://x.x.x.x:3333
52+
- DRIVER_SERVER_URL=http://x.x.x.x:4002
53+
- REDIS_HOST=redis
54+
- ENCRYPTION_KEY=lPw3ethAy4WqnWa3b4TAbCUJr89RifEs
55+
ports:
56+
- "4002:3000"
57+
58+
taxi-admin-api:
59+
image: ridyio/ridy-admin-api
60+
restart: always
61+
depends_on:
62+
- "mysql"
63+
- "redis"
64+
links:
65+
- mysql
66+
volumes:
67+
- ./img:/app/uploads
68+
- ./config-new:/app/config
69+
environment:
70+
- MYSQL_HOST=mysql
71+
- REDIS_HOST=redis
72+
ports:
73+
- "4001:3000"
74+
75+
taxi-admin-panel:
76+
image: ridyio/ridy-admin-panel
77+
restart: always
78+
volumes:
79+
- taxiassets:/usr/share/nginx/html/assets
80+
ports:
81+
- "4003:80"
82+
83+
payment-gateways:
84+
image: ridyio/delivery-gateway-box
85+
depends_on:
86+
- "taxi-rider-api"
87+
ports:
88+
- "3333:3333"
89+
environment:
90+
- MYSQL_HOST=mysql
91+
- TEST_MODE=true
92+
- MYSQL_DB=ridy
93+
- GATEWAY_SERVER_URL=http://x.x.x.x:3333
94+
- ENCRYPTION_KEY=lPw3ethAy4WqnWa3b4TAbCUJr89RifEs
95+
96+
volumes:
97+
redisvol:
98+
mysqlvol:
99+
taxiassets:

‎client/packages/lowcoder/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
"@types/react-signature-canvas": "^1.0.2",
3737
"@types/react-test-renderer": "^18.0.0",
3838
"@types/react-virtualized": "^9.21.21",
39+
"agora-access-token": "^2.0.4",
40+
"agora-rtc-sdk-ng": "^4.19.0",
41+
"agora-rtm-sdk": "^1.5.1",
3942
"ali-oss": "^6.17.1",
4043
"antd": "5.7.2",
4144
"antd-img-crop": "^4.12.2",
@@ -46,6 +49,7 @@
4649
"copy-to-clipboard": "^3.3.3",
4750
"core-js": "^3.25.2",
4851
"echarts": "^5.4.2",
52+
"echarts-wordcloud": "^2.1.0",
4953
"eslint4b-prebuilt-2": "^7.32.0",
5054
"file-saver": "^2.0.5",
5155
"github-markdown-css": "^5.1.0",

‎client/packages/lowcoder/src/api/configApi.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ export interface ConfigResponse extends ApiResponse {
88
}
99

1010
class ConfigApi extends Api {
11-
static configURL = "/v1/configs";
11+
static configURL = "/configs";
1212

13-
static fetchConfig(): AxiosPromise<ConfigResponse> {
14-
return Api.get(ConfigApi.configURL);
13+
static fetchConfig(orgId?: string): AxiosPromise<ConfigResponse> {
14+
let authConfigURL = ConfigApi.configURL;
15+
if(orgId?.length) {
16+
authConfigURL += `?orgId?=${orgId}`;
17+
}
18+
return Api.get(authConfigURL);
1519
}
1620
}
1721

‎client/packages/lowcoder/src/api/inviteApi.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ export type InviteInfo = {
1414
inviteCode: string;
1515
createUserName: string;
1616
invitedOrganizationName: string;
17+
invitedOrganizationId: string;
1718
};
1819

1920
class InviteApi extends Api {
20-
static getInviteURL = "/v1/invitation";
21+
static getInviteURL = "/invitation";
2122
static acceptInviteURL = (invitationId: string) => `/v1/invitation/${invitationId}/invite`;
2223

2324
// generate invitation

‎client/packages/lowcoder/src/api/userApi.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ export interface CommonLoginParam {
99
invitationId?: string;
1010
authId?: string;
1111
source?: string;
12+
orgId?: string;
1213
}
1314

1415
export interface CommonBindParam {
@@ -17,8 +18,8 @@ export interface CommonBindParam {
1718
source?: string;
1819
}
1920

20-
interface ThirdPartyAuthRequest {
21-
state: string;
21+
export interface ThirdPartyAuthRequest {
22+
state?: string;
2223
code: string;
2324
redirectUrl: string;
2425
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ declare var LOWCODER_NODE_SERVICE_URL: string;
3737
declare var LOWCODER_SHOW_BRAND: string;
3838
declare var LOWCODER_CUSTOM_LOGO: string;
3939
declare var LOWCODER_CUSTOM_LOGO_SQUARE: string;
40+
declare var LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string;
4041
declare var REACT_APP_ENV: string;
4142
declare var REACT_APP_BUILD_ID: string;
4243
declare var REACT_APP_LOG_LEVEL: string;

0 commit comments

Comments
 (0)