Commit Graph

6453 Commits

Author SHA1 Message Date
nocobase[bot]
217e5b67cb Merge branch 'main' into next 2024-10-22 13:18:38 +00:00
nocobase[bot]
98815fd8b6 chore(versions): 😊 publish v1.3.36-beta 2024-10-22 13:18:30 +00:00
katherinehhh
13a0541dec Merge branch 'main' into next 2024-10-22 21:15:50 +08:00
Katherine
2f9ad6b2a7
fix: show pagination bar with data in the table (#5480)
* fix: show pagination bar with data in the table

* refactor: local improve

* fix: bug

* fix: test

* fix: test
2024-10-22 20:36:51 +08:00
nocobase[bot]
ce6664d64e Merge branch 'main' into next 2024-10-22 10:29:37 +00:00
YANG QIA
475e219943
fix(tree): issue of creating path collection for inheritance tree collection (#5486) 2024-10-22 17:54:34 +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
Zhichao Gu
d6b2c02c32
feat: show create popup when select calendar slot (#5483) 2024-10-22 16:59:35 +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
chenos
e39d014b67
feat: support for the USE_DB_SCHEMA_IN_SUBAPP environment variable (#5481) 2024-10-22 14:24:34 +08:00
nocobase[bot]
b08f364555 Merge branch 'main' into next 2024-10-22 06:19:37 +00: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]
f0abab4ad0 Merge branch 'main' into next 2024-10-22 02:59:59 +00:00
Zhichao Gu
063ebd9d05
fix(formula): formula scope calc bug if fieldname like todos.0.sub_todos.0.title (#5469) 2024-10-22 10:59:37 +08:00
nocobase[bot]
cd5e8e453d Merge branch 'main' into next
Some checks are pending
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-21 23:43:58 +00:00
dependabot[bot]
16f9620b61
chore(deps): bump eslint-plugin-react from 7.33.2 to 7.37.1 (#5475)
Some checks are pending
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
Bumps [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) from 7.33.2 to 7.37.1.
- [Release notes](https://github.com/jsx-eslint/eslint-plugin-react/releases)
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jsx-eslint/eslint-plugin-react/compare/v7.33.2...v7.37.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-react
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-10-22 07:43:35 +08:00
nocobase[bot]
cd7abe02f8 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-21 12:47:37 +00:00
xilesun
03d7a67999 chore(ci): fix changelog-and-release.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 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-21 20:47:06 +08:00
nocobase[bot]
6429c98d98 Merge branch 'main' into next 2024-10-21 12:31:11 +00:00
nocobase[bot]
56c385ad8a docs: update changelogs 2024-10-21 12:30:44 +00:00
nocobase[bot]
bcaf448575 Merge branch 'main' into next 2024-10-21 09:44:28 +00:00
nocobase[bot]
740bc669bd chore(versions): 😊 publish v1.3.35-beta 2024-10-21 09:44:20 +00:00
nocobase[bot]
5d8ba245a9 Merge branch 'main' into next 2024-10-21 09:43:07 +00:00
Junyi
350fb46f76
fix(plugin-workflow-mailer): fix placeholder of mailer node (#5470)
* fix(plugin-workflow-mailer): fix placeholder of mailer node

* refactor(plugin-workflow-mailer): remove required option in some fields
2024-10-21 17:42:48 +08:00
nocobase[bot]
f490ecf79e 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-21 03:42:10 +00:00
nocobase[bot]
452c7e17c7 docs: update changelogs
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-21 03:41:48 +00:00
nocobase[bot]
f12495a86a Merge branch 'main' into next 2024-10-21 01:04:12 +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
chenos
4213df357c chore(block-action-panel): update package.json 2024-10-20 14:52:35 +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
nocobase[bot]
2ccfaf4f76 Merge branch 'main' into next 2024-10-18 09:50:00 +00:00
Katherine
361558a0d0
fix: remove zoom level configuration for map fields in table column (#5457)
Some checks failed
Build docker image / build-and-push (push) Has been cancelled
Build pro image / build-and-push (push) Has been cancelled
Deploy client docs / Build (push) Has been cancelled
E2E / Build (push) Has been cancelled
NocoBase frontEnd test / frontend-test (18) (push) Has been cancelled
E2E / Core and plugins (push) Has been cancelled
E2E / plugin-workflow (push) Has been cancelled
E2E / plugin-workflow-approval (push) Has been cancelled
E2E / plugin-data-source-main (push) Has been cancelled
E2E / Comment on PR (push) Has been cancelled
2024-10-18 17:49:37 +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