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 fba0274

Browse files
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;
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

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
};
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";

0 commit comments

Comments
(0)

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