mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 05:57:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into next
Some checks are pending
Build Docker Image / build-and-push (push) Waiting to run
Details
Build Pro Image / build-and-push (push) Waiting to run
Details
E2E / Build (push) Waiting to run
Details
E2E / Core and plugins (push) Blocked by required conditions
Details
E2E / plugin-workflow (push) Blocked by required conditions
Details
E2E / plugin-workflow-approval (push) Blocked by required conditions
Details
E2E / plugin-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase Backend Test / sqlite-test (20, false) (push) Waiting to run
Details
NocoBase Backend Test / sqlite-test (20, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
Details
NocoBase Backend Test / mysql-test (20, false) (push) Waiting to run
Details
NocoBase Backend Test / mysql-test (20, true) (push) Waiting to run
Details
NocoBase Backend Test / mariadb-test (20, false) (push) Waiting to run
Details
NocoBase Backend Test / mariadb-test (20, true) (push) Waiting to run
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Details
Test on Windows / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
GitHub Actions Bot 2024-09-06 15:28:24 +00:00
commit 3abe5fb072
4 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/client/package.json
View File

@ -57,7 +57,7 @@
"react-i18next": "^11.15.1", "react-i18next": "^11.15.1",
"react-iframe": "~1.8.5", "react-iframe": "~1.8.5",
"react-image-lightbox": "^5.1.4", "react-image-lightbox": "^5.1.4",
"react-intersection-observer": "9.8.1", "react-intersection-observer": "9.13.0",
"react-js-cron": "^3.1.0", "react-js-cron": "^3.1.0",
"react-quill": "^2.0.0", "react-quill": "^2.0.0",
"react-router-dom": "^6.11.2", "react-router-dom": "^6.11.2",

2
packages/core/client/src/modules/blocks/filter-blocks/form/__e2e__/schemaInitializer.test.ts
View File

@ -105,7 +105,7 @@ test.describe('configure fields', () => {
}); });
// expect: should only display the record with the `root` role // expect: should only display the record with the `root` role
await expect(page.getByRole('button', { name: 'root,admin,member' })).toBeVisible(); await expect(page.getByRole('button', { name: 'root' })).toBeVisible();
await expect(page.getByRole('button', { name: record.roles.map((item) => item.name).join(',') })).not.toBeVisible(); await expect(page.getByRole('button', { name: record.roles.map((item) => item.name).join(',') })).not.toBeVisible();
}); });

3
packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts
View File

@ -69,7 +69,6 @@ export const userCollection = {
type: 'string', type: 'string',
title: '{{t("Phone")}}', title: '{{t("Phone")}}',
'x-component': 'Input', 'x-component': 'Input',
'x-validator': 'phone',
required: true, required: true,
}, },
}, },
@ -213,7 +212,6 @@ export const usersSchema: ISchema = {
phone: { phone: {
title: '{{t("Phone")}}', title: '{{t("Phone")}}',
'x-component': 'Input', 'x-component': 'Input',
'x-validator': 'phone',
'x-decorator': 'FormItem', 'x-decorator': 'FormItem',
required: false, required: false,
}, },
@ -376,7 +374,6 @@ export const usersSchema: ISchema = {
phone: { phone: {
title: '{{t("Phone")}}', title: '{{t("Phone")}}',
'x-component': 'Input', 'x-component': 'Input',
'x-validator': 'phone',
'x-decorator': 'FormItem', 'x-decorator': 'FormItem',
required: false, required: false,
}, },

30
yarn.lock
View File

@ -5493,10 +5493,10 @@
resolved "https://registry.npmmirror.com/@remix-run/router/-/router-1.14.0.tgz#9bc39a5a3a71b81bdb310eba6def5bc3966695b7" resolved "https://registry.npmmirror.com/@remix-run/router/-/router-1.14.0.tgz#9bc39a5a3a71b81bdb310eba6def5bc3966695b7"
integrity sha512-WOHih+ClN7N8oHk9N4JUiMxQJmRVaOxcg8w7F/oHUXzJt920ekASLI/7cYX8XkntDWRhLZtsk6LbGrkgOAvi5A== integrity sha512-WOHih+ClN7N8oHk9N4JUiMxQJmRVaOxcg8w7F/oHUXzJt920ekASLI/7cYX8XkntDWRhLZtsk6LbGrkgOAvi5A==
"@remix-run/router@1.19.0": "@remix-run/router@1.19.1":
version "1.19.0" version "1.19.1"
resolved "https://registry.npmmirror.com/@remix-run/router/-/router-1.19.0.tgz#745dbffbce67f05386d57ca22c51dfd85c979593" resolved "https://registry.npmmirror.com/@remix-run/router/-/router-1.19.1.tgz#984771bfd1de2715f42394c87fb716c1349e014f"
integrity sha512-zDICCLKEwbVYTS6TjYaWtHXxkdoUvD/QXvyVZjGCsWz5vyH7aFeONlPffPdW+Y/t6KT0MgXb2Mfjun9YpWN1dA== integrity sha512-S45oynt/WH19bHbIXjtli6QmwNYvaz+vtnubvNpNDvUOoA/OWh6j1OikIP3G+v5GHdxyC6EXoChG3HgYGEUfcg==
"@restart/hooks@^0.4.7": "@restart/hooks@^0.4.7":
version "0.4.15" version "0.4.15"
@ -7021,9 +7021,9 @@
integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g== integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==
"@types/multer@^1.4.5": "@types/multer@^1.4.5":
version "1.4.11" version "1.4.12"
resolved "https://registry.npmmirror.com/@types/multer/-/multer-1.4.11.tgz#c70792670513b4af1159a2b60bf48cc932af55c5" resolved "https://registry.npmmirror.com/@types/multer/-/multer-1.4.12.tgz#da67bd0c809f3a63fe097c458c0d4af1fea50ab7"
integrity sha512-svK240gr6LVWvv3YGyhLlA+6LRRWA4mnGIU7RcNmgjBYFl6665wcXrRfxGp5tEPVHUNm5FMcmq7too9bxCwX/w== integrity sha512-pQ2hoqvXiJt2FP9WQVLPRO+AmiIm/ZYkavPlIQnx282u4ZrVdztx0pkh3jjpQt0Kz+YI0YhSG264y08UJKoUQg==
dependencies: dependencies:
"@types/express" "*" "@types/express" "*"
@ -22481,10 +22481,10 @@ react-image-lightbox@^5.1.4:
prop-types "^15.7.2" prop-types "^15.7.2"
react-modal "^3.11.1" react-modal "^3.11.1"
react-intersection-observer@9.8.1, react-intersection-observer@^9.8.1: react-intersection-observer@9.13.0, react-intersection-observer@^9.8.1:
version "9.8.1" version "9.13.0"
resolved "https://registry.npmmirror.com/react-intersection-observer/-/react-intersection-observer-9.8.1.tgz#9c3631c0c9acd624a2af1c192318752ea73b5d91" resolved "https://registry.npmmirror.com/react-intersection-observer/-/react-intersection-observer-9.13.0.tgz#ee10827954cf6ccc204d027f8400a6ddb8df163a"
integrity sha512-QzOFdROX8D8MH3wE3OVKH0f3mLjKTtEN1VX/rkNuECCff+aKky0pIjulDhr3Ewqj5el/L+MhBkM3ef0Tbt+qUQ== integrity sha512-y0UvBfjDiXqC8h0EWccyaj4dVBWMxgEx0t5RGNzQsvkfvZwugnKwxpu70StY4ivzYuMajavwUDjH4LJyIki9Lw==
react-intl@^6.4.4: react-intl@^6.4.4:
version "6.5.5" version "6.5.5"
@ -22591,11 +22591,11 @@ react-router-dom@6.3.0, react-router-dom@6.x, react-router-dom@^6.11.2, react-ro
react-router "6.21.0" react-router "6.21.0"
react-router@6.21.0, react-router@6.3.0, react-router@^6.11.2: react-router@6.21.0, react-router@6.3.0, react-router@^6.11.2:
version "6.26.0" version "6.26.1"
resolved "https://registry.npmmirror.com/react-router/-/react-router-6.26.0.tgz#d5af4c46835b202348ef2b7ddacd32a2db539fde" resolved "https://registry.npmmirror.com/react-router/-/react-router-6.26.1.tgz#88c64837e05ffab6899a49df2a1484a22471e4ce"
integrity sha512-wVQq0/iFYd3iZ9H2l3N3k4PL8EEHcb0XlU2Na8nEwmiXgIUElEH6gaJDtUQxJ+JFzmIXaQjfdpcGWaM6IoQGxg== integrity sha512-kIwJveZNwp7teQRI5QmwWo39A5bXRyqpH0COKKmPnyD2vBvDwgFXSqDUYtt1h+FEyfnE8eXr7oe0MxRzVwCcvQ==
dependencies: dependencies:
"@remix-run/router" "1.19.0" "@remix-run/router" "1.19.1"
react-side-effect@^2.1.0: react-side-effect@^2.1.0:
version "2.1.2" version "2.1.2"