Commit Graph

6605 Commits

Author SHA1 Message Date
Katherine
1649a1d692
feat: blocks support layout settings (#5429)
* feat: form and details blocks support layout settings

* refactor: kanban & list & grid card support layout

* fix: bug

* fix: bug

* fix: test

* fix: bug

* fix: style improve
2024-10-18 17:46:51 +08:00
chenos
0ec5ddfdf4 fix: update axios version 2024-10-18 17:07:04 +08:00
chenos
6ec03ca15d fix: update axios version 2024-10-18 17:00:21 +08:00
katherinehhh
bc0de80479 Merge branch 'main' into next 2024-10-18 15:39:52 +08:00
Katherine
fadda05424
fix: adjust supported availableTypes for uuid, nano, and id (#5427) 2024-10-18 15:01:07 +08:00
nocobase[bot]
35b64881da Merge branch 'main' into next
Some checks are pending
Build docker image / build-and-push (push) Waiting to run
Build pro image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase backend test / sqlite-test (20, false) (push) Waiting to run
NocoBase backend test / sqlite-test (20, true) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, public, false) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, public, true) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
NocoBase backend test / mysql-test (20, false) (push) Waiting to run
NocoBase backend test / mysql-test (20, true) (push) Waiting to run
NocoBase backend test / mariadb-test (20, false) (push) Waiting to run
NocoBase backend test / mariadb-test (20, true) (push) Waiting to run
NocoBase frontEnd test / frontend-test (18) (push) Waiting to run
Test on Windows / build (push) Waiting to run
2024-10-18 05:29:48 +00:00
YANG QIA
aab4ba5874
Update auto-merge.yml
Some checks are pending
Build docker image / build-and-push (push) Waiting to run
Build pro image / build-and-push (push) Waiting to run
Deploy client docs / Build (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase frontEnd test / frontend-test (18) (push) Waiting to run
2024-10-18 13:29:25 +08:00
nocobase[bot]
976a5d6da7 Merge branch 'main' into next 2024-10-18 05:02:04 +00:00
xilesun
c208ddbbb9 fix(ci): typo 2024-10-18 13:01:37 +08:00
nocobase[bot]
30652fe325 Merge branch 'main' into next 2024-10-18 04:58:14 +00:00
xilesun
28612eb57c chore(ci): update auto-merge.yml 2024-10-18 12:57:45 +08:00
Zeke Zhang
2bfe8bafb4 Merge branch 'main' into next 2024-10-18 12:47:39 +08:00
Zeke Zhang
988476ea3e
feat(filterForm): add 'Allow multiple selection' for association fields (#5451)
* feat(filterForm): add 'Allow multiple selection' for association fields

* test: add e2e test
2024-10-18 12:42:35 +08:00
Zeke Zhang
760f807850 Merge branch 'main' into next 2024-10-18 12:11:39 +08:00
Zeke Zhang
32b3b76172
fix(variable): fix issue of not parsing URL variables (#5454)
* fix(variable): fix issue of not parsing URL variables

* test: add e2e test
2024-10-18 12:09:29 +08:00
Katherine
eff3dfdd54
feat: support configuring disassociation button in sub-tables (#5425)
* feat: support configuring disassociation button in sub-tables

* fix: bug

* refactor: locale improve

* fix: filter action test
2024-10-18 12:01:14 +08:00
Katherine
d120259c67
refactor: use filterable property to control field filtering capability (#5455) 2024-10-18 11:48:40 +08:00
nocobase[bot]
68cea3470e Merge branch 'main' into next 2024-10-18 02:31:25 +00:00
xilesun
495dde46ab chore(ci): optimize 2024-10-18 10:30:58 +08:00
Katherine
adc5ecf216
refactor: reverseField (#5423) 2024-10-18 10:22:23 +08:00
chenos
c20374e145 chore: update yarn.lock 2024-10-18 10:03:27 +08:00
Katherine
f2e6e02577
feat: configure edit permissions for user profiles & change password (#5422)
* feat: configure edit permissions for user profiles

* fix: bug

* fix: bug

* refactor: locale improve

* refactor: currentUser
2024-10-18 09:09:32 +08:00
gchust
d158585efd
fix: unit tests error, caused by #5442 (#5448)
* fix: unit tests error, caused by #5442

* fix: unit test errors  casued by #5442
2024-10-17 21:18:25 +08:00
Junyi
50056439d9
fix(plugin-workflow-request): fix error message for test request node (#5443)
* fix(plugin-workflow-request): fix error message for test request node

* fix(plugin-workflow-request): fix type
2024-10-17 19:10:12 +08:00
nocobase[bot]
486f76fa46 Merge branch 'main' into next 2024-10-17 10:30:28 +00:00
Junyi
c8741e7656
fix(plugin-file-manager): fix calling rule hook on read-pretty fields (#5447) 2024-10-17 18:30:09 +08:00
nocobase[bot]
231adb0b60 Merge branch 'main' into next 2024-10-17 10:01:20 +00:00
Junyi
9f6b162782
fix(client): fix selected background color of table row (#5445) 2024-10-17 18:00:58 +08:00
gchust
997bdd1609
fix: missing translate for input component option (#5444) 2024-10-17 16:18:49 +08:00
gchust
821d790169
fix: field component options has not been translated correctly (#5442)
Some checks are pending
Build docker image / build-and-push (push) Waiting to run
Build pro image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase frontEnd test / frontend-test (18) (push) Waiting to run
2024-10-17 13:38:40 +08:00
nocobase[bot]
ce3618033e Merge branch 'main' into next
Some checks are pending
Build docker image / build-and-push (push) Waiting to run
Build pro image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase frontEnd test / frontend-test (18) (push) Waiting to run
2024-10-17 04:02:02 +00:00
Katherine
2061f702a8
fix: data clearing bug when selecting association data with data scope in nested sub-table (#5441)
Some checks failed
Build docker image / build-and-push (push) Waiting to run
Build pro image / build-and-push (push) Waiting to run
Deploy client docs / Build (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase frontEnd test / frontend-test (18) (push) Waiting to run
Auto merge main -> next / push-commit (push) Has been cancelled
NocoBase backend test / sqlite-test (20, false) (push) Has been cancelled
NocoBase backend test / sqlite-test (20, true) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, nocobase, false) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, nocobase, true) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, public, false) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, public, true) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, nocobase, false) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, nocobase, true) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, public, false) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, public, true) (push) Has been cancelled
NocoBase backend test / mysql-test (20, false) (push) Has been cancelled
NocoBase backend test / mysql-test (20, true) (push) Has been cancelled
NocoBase backend test / mariadb-test (20, false) (push) Has been cancelled
NocoBase backend test / mariadb-test (20, true) (push) Has been cancelled
Test on Windows / build (push) Has been cancelled
2024-10-17 12:01:41 +08:00
Katherine
737aa11fc5
fix: allow table column title to be reset to default (#5439) 2024-10-17 11:34:32 +08:00
nocobase[bot]
88b8782d11 Merge branch 'main' into next 2024-10-17 01:39:10 +00:00
Junyi
54b7bb6d52
fix(plugin-file-manager): fix e2e due to component changed (#5437) 2024-10-17 09:38:48 +08:00
nocobase[bot]
94db9ab723 Merge branch 'main' into next 2024-10-16 23:43:10 +00:00
nocobase[bot]
57d179f21e docs: update changelogs 2024-10-16 23:32:47 +00:00
nocobase[bot]
cc7b1ff828 Merge branch 'main' into next 2024-10-16 23:26:33 +00:00
nocobase[bot]
fb88833b44 chore(versions): 😊 publish v1.3.33-beta 2024-10-16 23:26:23 +00:00
Chareice
a78f2e1702
chore: filter to date event
Some checks failed
Build docker image / build-and-push (push) Waiting to run
Build pro image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase frontEnd test / frontend-test (18) (push) Waiting to run
NocoBase backend test / sqlite-test (20, false) (push) Has been cancelled
NocoBase backend test / sqlite-test (20, true) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, nocobase, false) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, nocobase, true) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, public, false) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, public, true) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, nocobase, false) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, nocobase, true) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, public, false) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, public, true) (push) Has been cancelled
NocoBase backend test / mysql-test (20, false) (push) Has been cancelled
NocoBase backend test / mysql-test (20, true) (push) Has been cancelled
NocoBase backend test / mariadb-test (20, false) (push) Has been cancelled
NocoBase backend test / mariadb-test (20, true) (push) Has been cancelled
Test on Windows / build (push) Has been cancelled
2024-10-16 23:24:36 +08:00
Junyi
379ae83862
feat(plugin-workflow): add test run for nodes (#5407)
* feat(plugin-workflow): add test run for nodes

* fix(plugin-workflow): fix locale

* test(plugin-workflow): add test cases
2024-10-16 22:39:20 +08:00
Junyi
05b9703101
feat(plugin-workflow-loop): add more configuration (#5342)
* feat(plugin-workflow-loop): add more configuration

* fix(plugin-workflow-loop): fix scope variable on current loop node

* refactor(plugin-workflow-loop): adjust order of exit options

* chore(plugin-workflow-loop): add migration

* fix(plugin-workflow): fix condition branch constant

* fix(plugin-workflow): fix additionalScope argument in parsing variable

* fix(plugin-workflow-loop): dependencies

* fix(plugin-workflow-loop): fix type

* fix(plugin-workflow-loop): fix client variable issues

* fix(plugin-workflow-loop): only use basic calculation due to expression variable issues

* refactor(plugin-workflow-loop): adjust configuration fields

* fix(plugin-workflow-loop): fix locale

* refactor(plugin-workflow-loop): adjust order of configuration fields

* fix(plugin-workflow-loop): fix number type properties

* fix(plugin-workflow-loop): fix null items in array are skipped
2024-10-16 21:15:35 +08:00
nocobase[bot]
d30644cdab Merge branch 'main' into next
Some checks are pending
Build docker image / build-and-push (push) Waiting to run
Build pro image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase backend test / sqlite-test (20, false) (push) Waiting to run
NocoBase backend test / sqlite-test (20, true) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, public, false) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, public, true) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
NocoBase backend test / mysql-test (20, false) (push) Waiting to run
NocoBase backend test / mysql-test (20, true) (push) Waiting to run
NocoBase backend test / mariadb-test (20, false) (push) Waiting to run
NocoBase backend test / mariadb-test (20, true) (push) Waiting to run
NocoBase frontEnd test / frontend-test (18) (push) Waiting to run
Test on Windows / build (push) Waiting to run
2024-10-16 07:35:32 +00:00
Junyi
0c2b07ea33
fix(plugin-file-manager): fix storage field in template to load more storages (#5430)
Some checks are pending
Auto merge main -> next / push-commit (push) Waiting to run
Build docker image / build-and-push (push) Waiting to run
Build pro image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase frontEnd test / frontend-test (18) (push) Waiting to run
2024-10-16 15:35:14 +08:00
Katherine
cb8eb0d035
fix: action button style (#5433) 2024-10-16 15:18:09 +08:00
ChengLei Shao
7bd96fd154
fix: restore with datetime no tz (#5432) 2024-10-16 14:25:00 +08:00
Katherine
52ad416140
style: optimize expand/collapse button styles (#5431)
Some checks are pending
Build docker image / build-and-push (push) Waiting to run
Build pro image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase frontEnd test / frontend-test (18) (push) Waiting to run
2024-10-16 10:56:38 +08:00
nocobase[bot]
96c3bf1a08 Merge branch 'main' into next 2024-10-16 01:25:28 +00:00
Zeke Zhang
c2a8dced55
fix(Tabs): prevent mismatched activeKey (#5412)
Some checks are pending
Auto merge main -> next / push-commit (push) Waiting to run
Build docker image / build-and-push (push) Waiting to run
Build pro image / build-and-push (push) Waiting to run
Deploy client docs / Build (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase frontEnd test / frontend-test (18) (push) Waiting to run
* test: add e2e test

* fix(Tabs): prevent mismatched activeKey

* fix(bulkEdit): prevent incorrect URL modification

* Revert "fix(bulkEdit): prevent incorrect URL modification"

This reverts commit 28f685ffeb.

* fix: avoid affecting the Tabs of the upper-level popup

* fix(Duplicate): avoid affecting the Tabs of the upper-level popup

* refactor: migrate e2e to plugin

* test(Duplicate): add e2e test
2024-10-16 09:25:07 +08:00
nocobase[bot]
7e518c17fc Merge branch 'main' into next
Some checks are pending
Build docker image / build-and-push (push) Waiting to run
Build pro image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase frontEnd test / frontend-test (18) (push) Waiting to run
2024-10-15 12:20:33 +00:00