diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 000000000..102244ca1 Binary files /dev/null and b/.DS_Store differ diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 633ad06d7..7eb957c82 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,15 +6,19 @@ updates: directory: "/server/api-service" schedule: interval: "monthly" + target-branch: "dev" - package-ecosystem: "npm" directory: "/server/node-service" schedule: interval: "monthly" + target-branch: "dev" - package-ecosystem: "npm" directory: "/client" schedule: interval: "monthly" + target-branch: "dev" - package-ecosystem: "docker" directory: "/deploy/docker" schedule: interval: "monthly" + target-branch: "dev" diff --git a/client/README.md b/client/README.md index 0130a7c73..3f504a8ee 100644 --- a/client/README.md +++ b/client/README.md @@ -6,18 +6,18 @@ #### Use prebuilt docker image -Simply run below command to start a backend server. +Simply run the below command to start a backend server. ```bash docker run -d --name lowcoder -p 3000:3000 -v "$PWD/stacks:/lowcoder-stacks" lowcoderorg/lowcoder-ce ``` -For more information, view our [docs](../docs/self-hosting) +For more information, view our [docs](https://docs.lowcoder.cloud/lowcoder-documentation/setup-and-run/self-hosting) #### Build Docker image from source -1. Check out source code and change to source dir. -2. Use the command below to build Docker image : +1. Check out the source code and change to source dir. +2. Use the command below to build a Docker image : ```bash docker build -f ./deploy/docker/Dockerfile -t lowcoder-dev . @@ -31,11 +31,21 @@ docker run -d --name lowcoder-dev -p 3000:3000 -v "$PWD/stacks:/lowcoder-stacks" ### Start develop -1. Check out source code. +1. Check out the source code. 2. Change to client dir in the repository root via cd client. -3. Run yarn to install dependencies: . -4. Start dev server: `LOWCODER_API_SERVICE_URL=http://localhost:3000 yarn start`. -5. After dev server starts successfully, it will be automatically opened in the default browser. + +```bash +cd client +``` + +4. Run yarn to install dependencies: . + +```bash +yarn install +``` + +5. Start dev server: `LOWCODER_API_SERVICE_URL=http://localhost:3000 yarn start`. +6. After the dev server starts successfully, it will be automatically opened in the default browser. ### Before submitting a pull request diff --git a/client/VERSION b/client/VERSION index db1527897..50aea0e7a 100644 --- a/client/VERSION +++ b/client/VERSION @@ -1 +1 @@ -1.1.8 \ No newline at end of file +2.1.0 \ No newline at end of file diff --git a/client/package.json b/client/package.json index 829ffdd41..f10da6f8c 100644 --- a/client/package.json +++ b/client/package.json @@ -33,7 +33,7 @@ "@types/qrcode.react": "^1.0.2", "@types/react-grid-layout": "^1.3.0", "@types/react-helmet": "^6.1.5", - "@types/react-resizable": "^1.7.4", + "@types/react-resizable": "^3.0.5", "@types/react-router-dom": "^5.3.2", "@types/shelljs": "^0.8.11", "@types/styled-components": "^5.1.19", diff --git a/client/packages/lowcoder-cli/client.d.ts b/client/packages/lowcoder-cli/client.d.ts index 2621660f5..98926bd29 100644 --- a/client/packages/lowcoder-cli/client.d.ts +++ b/client/packages/lowcoder-cli/client.d.ts @@ -34,6 +34,7 @@ declare var LOWCODER_NODE_SERVICE_URL: string; declare var LOWCODER_SHOW_BRAND: string; declare var LOWCODER_CUSTOM_LOGO: string; declare var LOWCODER_CUSTOM_LOGO_SQUARE: string; +declare var LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string; declare var REACT_APP_ENV: string; declare var REACT_APP_BUILD_ID: string; declare var REACT_APP_LOG_LEVEL: string; diff --git a/client/packages/lowcoder-comps/icons/mermaidchart.svg b/client/packages/lowcoder-comps/icons/mermaidchart.svg new file mode 100644 index 000000000..de1181bf2 --- /dev/null +++ b/client/packages/lowcoder-comps/icons/mermaidchart.svg @@ -0,0 +1,18 @@ + + + diff --git a/client/packages/lowcoder-comps/package.json b/client/packages/lowcoder-comps/package.json index 081b36f1d..9af9f74c4 100644 --- a/client/packages/lowcoder-comps/package.json +++ b/client/packages/lowcoder-comps/package.json @@ -1,6 +1,6 @@ { "name": "lowcoder-comps", - "version": "0.0.12", + "version": "0.0.15", "type": "module", "license": "MIT", "dependencies": { @@ -14,6 +14,8 @@ "@types/react": "17", "@types/react-dom": "17", "big.js": "^6.2.1", + "echarts-extension-gmap": "^1.6.0", + "echarts-wordcloud": "^2.1.0", "lowcoder-cli": "workspace:^", "lowcoder-sdk": "workspace:^", "mermaid": "^10.2.4", @@ -28,8 +30,8 @@ "name": "Chart", "icon": "./icons/icon-chart.svg", "layoutInfo": { - "w": 11, - "h": 35 + "w": 15, + "h": 40 } }, "imageEditor": { @@ -37,7 +39,7 @@ "icon": "./icons/icon-chart.svg", "layoutInfo": { "w": 15, - "h": 60 + "h": 40 } }, "calendar": { @@ -47,6 +49,14 @@ "w": 15, "h": 60 } + }, + "mermaid": { + "name": "Mermaid", + "icon": "./icons/mermaidchart.svg", + "layoutInfo": { + "w": 15, + "h": 40 + } } } }, diff --git a/client/packages/lowcoder-comps/src/comps/calendarComp/calendarComp.tsx b/client/packages/lowcoder-comps/src/comps/calendarComp/calendarComp.tsx index 9e91a9558..37c15507f 100644 --- a/client/packages/lowcoder-comps/src/comps/calendarComp/calendarComp.tsx +++ b/client/packages/lowcoder-comps/src/comps/calendarComp/calendarComp.tsx @@ -49,7 +49,7 @@ import { viewClassNames, FormWrapper, } from "./calendarConstants"; -import moment from "moment"; +import dayjs from "dayjs"; const childrenMap = { events: jsonValueExposingStateControl("events", defaultData), @@ -79,8 +79,8 @@ let CalendarBasicComp = (function () { return { title: item.title, id: item.id, - start: moment(item.start, DateParser).format(), - end: moment(item.end, DateParser).format(), + start: dayjs(item.start, DateParser).format(), + end: dayjs(item.end, DateParser).format(), allDay: item.allDay, color: isValidColor(item.color || "") ? item.color : theme?.theme?.primary, ...(item.groupId ? { groupId: item.groupId } : null), @@ -104,7 +104,7 @@ let CalendarBasicComp = (function () { const isList = eventInfo.view.type === "listWeek"; let sizeClass = ""; if ([ViewType.WEEK, ViewType.DAY].includes(eventInfo.view.type as ViewType)) { - const duration = moment(eventInfo.event.end).diff(moment(eventInfo.event.start), "minutes"); + const duration = dayjs(eventInfo.event.end).diff(dayjs(eventInfo.event.start), "minutes"); if (duration <= 30 || eventInfo.event.allDay) { sizeClass = "small"; } else if (duration <= 60) { @@ -114,7 +114,7 @@ let CalendarBasicComp = (function () { } } const stateClass = - moment().isAfter(moment(eventInfo.event.end)) && + dayjs().isAfter(dayjs(eventInfo.event.end)) && (eventInfo.view.type as ViewType) !== ViewType.MONTH ? "past" : ""; @@ -125,6 +125,7 @@ let CalendarBasicComp = (function () { isList={isList} bg={eventInfo.backgroundColor} theme={theme?.theme} + allDay={showAllDay} $style={props.style} >