Commit Graph

3110 Commits

Author SHA1 Message Date
Chareice
29ab715daa
Merge branch 'next' into feat/subquery-field 2024-10-22 17:26:05 +08:00
Chareice
53e3f3595c
Merge branch 'main' into next 2024-10-22 17:23:25 +08:00
ChengLei Shao
749b28cef3
chore: datasource sql logger (#5485) 2024-10-22 17:07:57 +08:00
Katherine
c903b43a17
feat: subTable support pagination (#5450)
* refactor: subtable support pagination settings

* fix: bug

* fix: bug
2024-10-22 17:00:11 +08:00
nocobase[bot]
beb393ffb3 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-22 07:31:13 +00:00
Chareice
1ee6ca7bef
chore: ignore error when write to exclude
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 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-22 15:16:59 +08:00
nocobase[bot]
61fd4e3461 Merge branch 'main' into next 2024-10-22 07:14:16 +00:00
Jinx
1da28b62e0
fix: Grid.Col displayName correct (#4958) 2024-10-22 14:44:29 +08:00
Chareice
3245d32b80
Merge branch 'next' into feat/subquery-field 2024-10-22 14:21:24 +08:00
Junyi
dc34e027e3
fix(client): fix typo in upload component (#5460) (#5479)
* fix(client): fix typo in upload component (#5460)

* fix(client): fix typo in upload component

* fix(plugin-file-manager): fix rule hook

* fix(plugin-file-manager): fix useless log
2024-10-22 14:19:03 +08:00
nocobase[bot]
cb336ed4d9 Merge branch 'main' into next 2024-10-22 05:43:44 +00:00
ChengLei Shao
f3ef42968e
fix: sync event in inherited collection (#5477)
* fix: sync event in inherited collection

* fix: hooks options
2024-10-22 13:43:24 +08:00
Katherine
fc79c4397a
fix: variable value is lost after refreshing markdown block popup (#5478) 2024-10-22 11:29:32 +08:00
nocobase[bot]
740bc669bd chore(versions): 😊 publish v1.3.35-beta 2024-10-21 09:44:20 +00:00
nocobase[bot]
f980099603 chore(versions): 😊 publish v1.3.34-beta 2024-10-21 01:04:05 +00:00
Zeke Zhang
d0a85bf2ab Merge branch 'main' into next 2024-10-21 09:01:53 +08:00
Zeke Zhang
dd71cdaaa4
feat(variable): add a new variable named Parent object (#5449)
* feat(variable): add a new variable named Parent object

* test: add tests and fix bug

* fix(linkageRules): fix issue with variable options in subtables

* test: add e2e test
2024-10-21 08:46:04 +08:00
chenos
865681960b chore: update handlebars documentation link
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-20 14:53:53 +08:00
Junyi
50b2695797
feat(plugin-workflow): add component (#5464)
* feat(plugin-workflow): add fieldset card component

* fix(plugin-workflow): fix schema name caused wrong ui
2024-10-20 14:22:44 +08:00
chenos
eda732ef5f
chore: upgrade appleboy/scp-action (#5461)
* chore: upgrade appleboy/scp-action

* fix: build
2024-10-20 10:47:01 +08:00
Junyi
d553e51b51
fix(client): fix typo in upload component (#5460)
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
* fix(client): fix typo in upload component

* fix(plugin-file-manager): fix rule hook
2024-10-19 15:13:46 +08:00
chenos
72867c6acb fix(sdk): cannot convert a symbol value to a string
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-18 23:52:07 +08:00
Junyi
cdc2d62842
feat(client): support json input in variable input (#5453) 2024-10-18 22:58:48 +08:00
Katherine
012f648bb2
fix: incorrect time display for noTimeZone datetime field with showTi… (#5458)
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
* fix: incorrect time display for noTimeZone datetime field with showTime enabled

* fix: test
2024-10-18 18:03:21 +08:00
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
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
Katherine
adc5ecf216
refactor: reverseField (#5423) 2024-10-18 10:22:23 +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
katherinehhh
522bb9bac7 fix: bug 2024-10-17 23:28:23 +08:00
katherinehhh
a9a5bd7364 fix: bug 2024-10-17 23:01:59 +08:00
katherinehhh
d0eafa0c57 Merge branch 'next' into feat/subquery-field 2024-10-17 22:28:29 +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
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]
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