From 4e34e82ba91e683bcebf38ddf0d5aee9249e5581 Mon Sep 17 00:00:00 2001 From: RAHEEL Date: Tue, 21 Nov 2023 16:16:39 +0500 Subject: [PATCH 01/49] fix: fix error on deleting table's column inside resp layout --- .../responsiveLayout/responsiveLayout.tsx | 3 +- .../pages/setting/idSource/createModal.tsx | 33 ------------------- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/responsiveLayout/responsiveLayout.tsx b/client/packages/lowcoder/src/comps/comps/responsiveLayout/responsiveLayout.tsx index d0519a21a..db094bba5 100644 --- a/client/packages/lowcoder/src/comps/comps/responsiveLayout/responsiveLayout.tsx +++ b/client/packages/lowcoder/src/comps/comps/responsiveLayout/responsiveLayout.tsx @@ -277,7 +277,8 @@ class ResponsiveLayoutImplComp extends ResponsiveLayoutBaseComp implements ICont }, } as CompAction; } - if (value.type === "delete" && columns.length <= 1) { + const { path } = action; + if (value.type === "delete" && path[0] === 'columns' && columns.length <= 1) { messageInstance.warning(trans("responsiveLayout.atLeastOneColumnError")); // at least one column return this; diff --git a/client/packages/lowcoder/src/pages/setting/idSource/createModal.tsx b/client/packages/lowcoder/src/pages/setting/idSource/createModal.tsx index 4846dc9fa..5e46418de 100644 --- a/client/packages/lowcoder/src/pages/setting/idSource/createModal.tsx +++ b/client/packages/lowcoder/src/pages/setting/idSource/createModal.tsx @@ -176,39 +176,6 @@ function CreateModal(props: CreateModalProp) { ); })} - {/* - - - - {"Client secret"}: - - - } - rules={[{ - required: true, - message: trans("idSource.formPlaceholder", { - label: 'Client secret', - }) - }]} - > - - */} ); From 5358d9ea3a26a4057f581a10a0e69cc5957b1ec5 Mon Sep 17 00:00:00 2001 From: FalkWolsky Date: Tue, 21 Nov 2023 18:47:29 +0100 Subject: [PATCH 02/49] Improved Documentation --- README.md | 2 +- client/packages/lowcoder-sdk/package.json | 2 +- client/packages/lowcoder/src/i18n/locales/en.ts | 2 +- .../lowcoder/src/pages/userAuth/authComponents.tsx | 4 ++-- deploy/docker/README.md | 9 ++++++--- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b603176f7..91c71b72f 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ You can access Lowcoder from [cloud-hosted version](https://app.lowcoder.cloud/) ## đŸ’Ș Contributing - Language support: If you have experience with a language that isn't currently supported by our product, send us a pull request. - Create and share components or demos: If you've created something that might be useful to others, add the link here. -- [Frontend contributing guide](https://github.com/lowcoder-org/lowcoder/tree/develop/client) +- [Frontend contributing guide](https://github.com/lowcoder-org/lowcoder/tree/main/client) ## đŸ„‡ Sponsors Accelerate the growth of Lowcoder and unleash its potential with your Sponsorship – together, we're shaping the future of Lowcode for everyone! diff --git a/client/packages/lowcoder-sdk/package.json b/client/packages/lowcoder-sdk/package.json index 051c06a3c..bee4317a6 100644 --- a/client/packages/lowcoder-sdk/package.json +++ b/client/packages/lowcoder-sdk/package.json @@ -1,6 +1,6 @@ { "name": "lowcoder-sdk", - "version": "2.1.8", + "version": "2.1.9", "type": "module", "files": [ "src", diff --git a/client/packages/lowcoder/src/i18n/locales/en.ts b/client/packages/lowcoder/src/i18n/locales/en.ts index 73756da19..cd946d31b 100644 --- a/client/packages/lowcoder/src/i18n/locales/en.ts +++ b/client/packages/lowcoder/src/i18n/locales/en.ts @@ -2094,7 +2094,7 @@ export const en = { inviteWelcomeTitle: "{username} invite you to login {productName}", terms: "Terms", privacy: "Privacy Policy", - registerHint: "I have read and agree", + registerHint: "I have read and agree to the", chooseAccount: "Choose your Account", signInLabel: "Sign in with {name}", bindAccount: "Bind Account", diff --git a/client/packages/lowcoder/src/pages/userAuth/authComponents.tsx b/client/packages/lowcoder/src/pages/userAuth/authComponents.tsx index 81847b6b3..7df9dd684 100644 --- a/client/packages/lowcoder/src/pages/userAuth/authComponents.tsx +++ b/client/packages/lowcoder/src/pages/userAuth/authComponents.tsx @@ -203,11 +203,11 @@ export const TermsAndPrivacyInfo = (props: { onCheckChange: (e: CheckboxChangeEv props.onCheckChange(e)} /> - {trans("userAuth.registerHint")} + {trans("userAuth.registerHint")}{`: `} {trans("userAuth.terms")} - {` `} + {` & `} {trans("userAuth.privacy")} diff --git a/deploy/docker/README.md b/deploy/docker/README.md index a219714c5..16ecadd74 100644 --- a/deploy/docker/README.md +++ b/deploy/docker/README.md @@ -32,7 +32,6 @@ Image can be configured by setting environment variables. | `PGID` | ID of group of the user running services. | `9001` | | `MONGODB_URL` | Mongo database connection string | `mongodb://localhost:27017/lowcoder?authSource=admin` | | `REDIS_URL` | Redis server URL | `redis://localhost:6379` | -| `ENABLE_USER_SIGN_UP` | Enable registration of new users | `true` | | `ENCRYPTION_PASSWORD` | Encryption password | `lowcoder.org` | | `ENCRYPTION_SALT` | Salt used for encrypting password | `lowcoder.org` | | `CORS_ALLOWED_DOMAINS` | CORS allowed domains | `*` | @@ -45,6 +44,9 @@ Image can be configured by setting environment variables. | `DEFAULT_ORG_GROUP_COUNT` | Default maximum groups per organization | `100` | | `DEFAULT_ORG_APP_COUNT` | Default maximum applications per organization | `1000` | | `DEFAULT_DEVELOPER_COUNT` | Default maximum developers | `100` | +| `COMMON_WORKSPACE_MODE` | SAAS to activate, ENTERPRISE to switch off - Workspaces | `SAAS` | +| `ENABLE_USER_SIGN_UP` | Control if users create their own Workspace automatic when Sign Up | `true` | +| `AUTH_EMAIL_ENABLE` | Control to show the eMail Login after Admin user is set | `true` | ## Building api-service image @@ -80,8 +82,9 @@ Image can be configured by setting environment variables. | `DEFAULT_DEVELOPER_COUNT` | Default maximum developers | `100` | | `LOWCODER_MAX_QUERY_TIMEOUT` | Lowcoder max query timeout (in seconds) | `120` | | `LOWCODER_MAX_REQUEST_SIZE` | Lowcoder max request size | `20m` | - - +| `COMMON_WORKSPACE_MODE` | SAAS to activate, ENTERPRISE to switch off - Workspaces | `SAAS` | +| `ENABLE_USER_SIGN_UP` | Control is users can create their own Workspace when Sign Up | `true` | +| `AUTH_EMAIL_ENABLE` | Control to show the eMail Login after Admin user is set | `true` | ## Building node-service image From f44837850e0a7069979c74536163759faa3b3691 Mon Sep 17 00:00:00 2001 From: FalkWolsky Date: Tue, 21 Nov 2023 19:09:32 +0100 Subject: [PATCH 03/49] Improved Documentation --- client/packages/lowcoder-comps/package.json | 2 +- client/packages/lowcoder/index.html | 2 +- client/packages/lowcoder/package.json | 1 - client/packages/lowcoder/src/app-env.d.ts | 2 +- client/yarn.lock | 8 -------- 5 files changed, 3 insertions(+), 12 deletions(-) diff --git a/client/packages/lowcoder-comps/package.json b/client/packages/lowcoder-comps/package.json index f07a3e2f4..0fb29c955 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.18", + "version": "0.0.19", "type": "module", "license": "MIT", "dependencies": { diff --git a/client/packages/lowcoder/index.html b/client/packages/lowcoder/index.html index 2a45e2639..6b1afd54d 100644 --- a/client/packages/lowcoder/index.html +++ b/client/packages/lowcoder/index.html @@ -9,7 +9,7 @@ + + + + + + + + + + diff --git a/client/packages/lowcoder-design/src/icons/index.ts b/client/packages/lowcoder-design/src/icons/index.ts index 4be847768..61c1679f8 100644 --- a/client/packages/lowcoder-design/src/icons/index.ts +++ b/client/packages/lowcoder-design/src/icons/index.ts @@ -64,6 +64,7 @@ export { ReactComponent as WarningWhiteIcon } from "./icon-warning-white.svg"; export { ReactComponent as WarningIcon } from "./icon-warning.svg"; export { ReactComponent as WidthDragIcon } from "./icon-widthDrag.svg"; export { ReactComponent as ManyCheckboxIcon } from "./manyCheckbox.svg"; +export { ReactComponent as Layout } from "./icon-ShowLayout.svg"; export { ReactComponent as Left } from "./icon-ShowLeft.svg"; export { ReactComponent as Middle } from "./icon-ShowMiddle.svg"; export { ReactComponent as Right } from "./icon-ShowRight.svg"; diff --git a/client/packages/lowcoder/index.html b/client/packages/lowcoder/index.html index 6b1afd54d..c83e225aa 100644 --- a/client/packages/lowcoder/index.html +++ b/client/packages/lowcoder/index.html @@ -2,16 +2,11 @@ - - + + + +