Commit Graph

5464 Commits

Author SHA1 Message Date
Zeke Zhang
7122996cf6 Merge branch 'main' into next 2024-07-06 17:46:05 +08:00
Zeke Zhang
2de6e2d0cc
chore(CI): sync changes from next branch (#4832) 2024-07-06 17:45:17 +08:00
Zeke Zhang
6182f2be4b chore(CI): improve configuration of E2E workflow 2024-07-06 10:50:07 +08:00
Zeke Zhang
efd89f57db Merge branch 'main' into next 2024-07-06 10:38:26 +08:00
Zeke Zhang
ecfa790d42
chore(CI): add a job for E2E of workflow-approval (#4831) 2024-07-06 10:05:54 +08:00
chenos
73c383d2b5
fix: base ref (#4829) 2024-07-05 23:12:26 +08:00
Zeke Zhang
ec5e4b0336
feat: open subpages within the main page (#4797)
* feat: open subpages within the main page

* fix: fix known bugs and fix tests

* refactor: optimize popups style

* fix(style): avoid flickering

* chore: add comment

* fix: optimize nested popups

* refactor: optimize path after closing popup

* fix: fix draging

* chore: optimize routing stack

* feat: add back button for sub page

* test: add e2e test

* fix: enable returning from URL-opened pop-ups and subpages

* fix: enable subpages to navigate via main page menu

* refactor: optimize code

* fix: fix closePopup method

* fix: ensure block data refreshes after submitting from pop-up

* fix: add 404 info when popup is deleted and add e2e test

* fix: fix embed page

* chore: add translation

* fix(duplicate): fix e2e test

* fix: fix filterByTK

* chore(CI): add job for workflow-approval

* chore(CI): fix syntax

* chore(CI): add 'plugin-workflow-approval' in needs
2024-07-05 20:15:11 +08:00
chenos
9b691e7bf1 fix: e2e ci 2024-07-05 18:27:19 +08:00
Junyi
fa6498ae78
chore(plugin-workflow): expose entire error into node result (#4799) 2024-07-05 17:16:05 +08:00
GitHub Actions Bot
4c63f815e0 chore: update changelog 2024-07-05 09:10:11 +00:00
GitHub Actions Bot
415eb52cef chore(versions): 😊 publish v1.2.12-alpha 2024-07-05 09:10:05 +00:00
Katherine
5fa0c6a10f
style: list block overflowY (#4822) 2024-07-05 15:19:27 +08:00
Junyi
0ba1bca5d8
feat(client): add disabled option to props of SchemaSettingsItem (#4817)
* feat(client): add disabled option to props of SchemaSettingsItem

* docs(client): add doc and demo

* feat(client): add disabled option to SchemaInitializerItem
2024-07-05 13:28:59 +08:00
Chareice
b3c0e5fbe3
Merge branch 'main' into next 2024-07-05 10:24:41 +08:00
Chareice
3da0fcf3dd
chore: update package.json 2024-07-05 10:07:35 +08:00
Katherine
a754bcedd8
fix: external data source filterTargetKey undefined in filter action (#4815)
* fix: external data source filterTargetKey undefined in filter action

* fix: bug
2024-07-05 09:45:52 +08:00
xilesun
ade9b70d51 Merge branch 'main' into next 2024-07-05 09:20:21 +08:00
YANG QIA
cfcf9291dc
fix(database): should not add field when binding error (#4804)
* fix(database): should not add field when binding error

* fix: test

* chore: test

* chore: test

* chore: test

* chore: test

* Update nocobase-test-backend.yml

* chore: test

---------

Co-authored-by: Chareice <chareice@live.com>
2024-07-05 08:49:24 +08:00
ChengLei Shao
a1b2c25a94
feat: beforeAddDataSource hook (#4810) 2024-07-05 08:46:35 +08:00
chenos
5dc626d2d6
fix: target key value is empty (#4796) 2024-07-05 06:47:21 +08:00
ChengLei Shao
7084e8d35f
chore(ci): release database after closed (#4819)
* chore(ci): release database after closed

* chore: clean database

* chore: test
2024-07-04 21:48:51 +08:00
xilesun
eb20d0be15 Merge branch 'main' into next 2024-07-04 18:24:27 +08:00
YANG QIA
88519c9c8f
fix: bug (#4816) 2024-07-04 18:23:48 +08:00
ChengLei Shao
fbfbcdeb2c
chore: add import export permission to admin & member user (#4809)
* chore: add import export permission to admin & member user

* fix: test
2024-07-04 17:32:52 +08:00
ChengLei Shao
31b7a3f4b9
chore: add import export permission to member user (#4808) 2024-07-04 07:52:57 +08:00
Katherine
89859c683a
fix: sub-form acl check (#4806) 2024-07-03 20:01:27 +08:00
chenos
9a09f9e73d
fix: version calculation error when creating migration (#4805) 2024-07-03 17:23:28 +08:00
Zeke Zhang
2e14e9939e Merge branch 'main' into next 2024-07-02 14:58:12 +08:00
Zeke Zhang
d12763c6ee
chore(e2e): optimize timeout to avoid lost report (#4798) 2024-07-02 14:55:27 +08:00
Katherine
6609870aed
fix: table height shrinking with large data set at full height (#4787) 2024-07-02 13:58:15 +08:00
xilesun
4138432878 Merge branch 'main' into next 2024-07-02 12:23:25 +08:00
YANG QIA
73d510511d
Update pull_request_template.md
Add related issues block
2024-07-02 12:22:31 +08:00
chenos
8d8105a205
fix(popups): correct value for filterByTk (#4792)
* feat: add CollectionManager.getFilterByTk method

* refactor: optimize and add tests

* fix: use correct filterByTK value

---------

Co-authored-by: Zeke Zhang <958414905@qq.com>
2024-07-02 10:59:54 +08:00
Katherine
9e95aec449
fix: incorrect highlight linkage for association field (#4794) 2024-07-02 10:19:51 +08:00
Zeke Zhang
55fc3deaaf
refactor: include sourceId in popup URL (#4788)
* refactor: include sourceId in popup URL

* test: add e2e test

* fix(subPage): include sourceId in popup URL
2024-07-02 09:54:08 +08:00
YANG QIA
9059665023
Merge branch 'main' into next (#4791)
* fix: external data source not reloading when title field is updated (#4786)

* style: list block style improve (#4785)

* chore(client): change default icon size of icon picker

---------

Co-authored-by: Katherine <katherine_15995@163.com>
2024-07-01 18:43:59 +08:00
xilesun
906e0773d2 chore(client): change default icon size of icon picker 2024-07-01 18:03:26 +08:00
Katherine
12a8f2e6ac
style: list block style improve (#4785) 2024-07-01 16:38:02 +08:00
Katherine
59c9c0e06e
fix: external data source not reloading when title field is updated (#4786) 2024-07-01 16:12:49 +08:00
xilesun
74ef97343b Merge branch 'main' into next 2024-07-01 10:24:26 +08:00
YANG QIA
f553813738
Update pull_request_template.md 2024-07-01 10:17:20 +08:00
xilesun
9d48dbdcaa chore: update pull request template 2024-07-01 10:15:50 +08:00
Sheldon Guo
95749f3d88
feat(client): support linkage style in table and form (#4467)
* feat: support linkage style in table and form

* fix: removed linkage rule in table column, fixed formitem style not refreshing, use colorpicker

* chore: remove unused functions and improve effect execution performance

* feat: add some e2e test for linkage style in table, extract linkage
  style logic to hooks

* feat: add some e2e test

* fix: fix some e2e test error

* test: fix e2e tests

* fix: replace deprecated api

* chore: give color picker a empty string as default value

* chore: improve some code

* refactor: remove useless code

* fix:  fix some incompatibility problem of old schema

* fix: fix some e2e test errors

---------

Co-authored-by: Zeke Zhang <958414905@qq.com>
2024-07-01 09:13:37 +08:00
Zeke Zhang
05cf9986b0
feat: enable direct dialog opening via URL and support for page mode (#4706)
* refactor: optimize page tabs routing

* test: add e2e test for page tabs

* feat: add popup routing

* fix: resolve nested issue

* refactor: rename file utils to pagePopupUtils

* perf: enhance animation and overall performance

* fix: fix filterByTK

* fix(sourceId): resolve error when sourceId is undefined

* fix: fix List and GridCard

* fix: fix params not fresh

* fix: fix parent record

* fix: resolve the issue on block data not refreshing after popup closure

* feat: bind tab with URL in popups

* feat(sub-page): enable popup to open in page mode

* chore: optimize

* feat: support association fields

* fix: address the issue of no data in associaiton field

* fix: resolve the issue with opening nested dialog in association field

* fix: fix the issue of dialog content not refreshing

* perf: use useNavigateNoUpdate to replace useNavigate

* perf: enhance popups performance by avoiding unnecessary rendering

* fix: fix tab page

* fix: fix bulk edit action

* chore: fix unit test

* chore: fix unit tests

* fix: fix bug to pass e2e tests

* chore: fix build

* fix: fix bugs to pass e2e tests

* chore: avoid crashing

* chore: make e2e tests pass

* chore: make e2e tests pass

* chore: fix unit tests

* fix(multi-app): fix known issues

* fix(Duplicate): should no page mode

* chore: fix build

* fix(mobile): fix known issues

* fix: fix open mode of Add new

* refactor: rename 'popupUid' to 'popupuid'

* refactor: rename 'subPageUid' tp 'subpageuid'

* refactor(subpage): simplify configuration of router

* fix(variable): refresh data after value change

* test: add e2e test for sub page

* refactor: refactor and add tests

* fix: fix association field

* refactor(subPage): avoid blank page occurrences

* chore: fix unit tests

* fix: correct first-click context setting for association fields

* refactor: use Action's uid for subpage

* refactor: rename x-nb-popup-context to x-action-context and move it to Action schema

* feat: add context during the creation of actions

* chore: fix build

* chore: make e2e tests pass

* fix(addChild): fix context of Add child

* fix: avoid loss or query string

* fix: avoid including 'popups' in the path

* fix: resolve issue with popup variables and add tests

* chore(e2e): fix e2e test

* fix(sideMenu): resolve the disappearing sidebar issue and add tests

* chore(e2e): fix e2e test

* fix: should refresh block data after mutiple popups closed

* chore: fix e2e test

* fix(associationField): fix wrong context

* fix: address issue with special characters
2024-06-30 23:25:01 +08:00
hongboji
99f88ee09f
test: approvals workflow e2e (#4781) 2024-06-30 21:31:27 +08:00
chenos
44580ff9a8 chore: update next branch ci 2024-06-30 19:41:39 +08:00
chenos
cd3be19f06 chore: update ci 2024-06-30 19:32:42 +08:00
Sheldon Guo
ac7e48c5f6 refactor: rewrite the UI of the code scanner. (#4677)
* feat: workbench block

* feat: mobilePage

* fix: update WorkbenchAction

* feat: support qrcode embed in markdown and scan in mobile

* fix: fix markdown button be covered problem

* fix: fix unit test error

* fix: fix unit test errors

* refactor: use react router in qrcode scanner

* feat: markdown add loading

* fix: fix blank content in print page

* refactor: change plugin dependencies to devDependencies

* feat: add some padding in markdown editor

* chore: improve some code

* feat: improve code

* fix: add QRCodeScanner

* fix: iconColor

* fix: Improve code

* feat: Improve code

* fix: version

* chore: improve some code

* chore: improve some code

* fix: i18n

* refactor: refact the UI of code scanner

* feat: add some locale

* feat: add qrbox

* feat: add image upload and fix qrbox

* feat: fix full screen problem

* fix: fix not full screen problem

* fix: add some error handling

* feat: add album locale

---------

Co-authored-by: chenos <chenlinxh@gmail.com>
2024-06-30 19:32:32 +08:00
chenos
acac61199d chore: update ci 2024-06-30 19:30:45 +08:00
shz
512557f80a
feat(plugin-workflow): add date range options to system variables (#4728)
* feat(plugin-workflow): add date range options to system variable in workflow plugin

* feat(plugin-workflow): fix according to code review

* feat(plugin-workflow): add more functions

* feat(plugin-workflow): fix according to code review

* feat(plugin-workflow): add test

* feat(plugin-workflow): support india timezone

* feat(plugin-workflow): fix test

* feat(plugin-workflow): add ts type

* feat(plugin-workflow): fix

* feat(plugin-workflow): fix
2024-06-30 16:30:31 +08:00