mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 14:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,584 Commits 93 Branches 321 Tags 223 MiB
4404f5fa13
Commit Graph

183 Commits

Author SHA1 Message Date
jack zhang
4404f5fa13
feat: encryption field (#4975) 
* feat: add @nocobase/plugin-field-encryption

* fix: bug

* fix: hook

* fix: add operators

* feat: add hidden

* fix: i18n

* fix: bug

* feat: env add ENCRYPTION_FIELD_KEY

* fix: exception handling

* fix: error message i18n

* fix: add `addFieldInterfaces()` alias

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: workflow env

* fix: bug

* fix: e2e

* fix: e2e bug

* fix: move `checkKey()` to field

* fix: move EncryptionField to database package

* fix: move encryption plugin to pro

* chore: encryption field in field type map

* fix: unit test

* fix: remove console

* fix: add more value check

* fix: bug

* fix: bug

* fix: bug

---------

Co-authored-by: chenos <chenlinxh@gmail.com>
Co-authored-by: Chareice <chareice@live.com>
 2024-08-09 17:14:37 +08:00
Zeke Zhang
16a233e8a3
fix(CI): continue on error (#4999)
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 FrontEnd Test / frontend-test (18) (push) Waiting to run
Details
2024-08-06 23:02:02 +08:00
chenos
4d2e379f74 Merge branch 'main' into next 
# Conflicts:
#	packages/presets/nocobase/package.json
 2024-08-06 17:55:45 +08:00
chenos
f8bc36066e fix: manual release 2024-08-06 17:52:23 +08:00
chenos
de44880ec2 fix: update build ci 2024-07-23 12:35:07 +08:00
chenos
e9443574d8
fix: build image ci (#4929)
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
Test on Windows / build (push) Waiting to run
Details 
* fix: ci

* fix: ci
 2024-07-22 17:28:48 +08:00
chenos
01b4539fc0
chore: update build-pro-image.yml 2024-07-22 16:24:19 +08:00
chenos
55188e1118
chore: update build-pro-image.yml 2024-07-22 15:47:15 +08:00
GitHub Actions Bot
39f43cb9f7 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 FrontEnd Test / frontend-test (18) (push) Waiting to run
Details
2024-07-21 03:08:05 +00:00
chenos
ef06db3eb7 chore: update ci
Some checks are pending
auto-merge / push-commit (push) Waiting to run
Details
2024-07-21 11:07:30 +08:00
GitHub Actions Bot
89e1747de4 Merge branch 'main' into next 2024-07-16 10:58:47 +00:00
chenos
db5aa815d4 fix: release ci 2024-07-16 18:58:20 +08:00
GitHub Actions Bot
8c20647e52 Merge branch 'main' into next 2024-07-16 08:25:55 +00:00
chenos
32b8bf6cdf chore: auto merge 2024-07-16 16:13:24 +08:00
GitHub Actions Bot
4d3c7feb9a Merge branch 'main' into next 2024-07-16 08:05:15 +00:00
chenos
393b6bb27e chore: update release ci 2024-07-16 16:04:28 +08:00
chenos
f22632234c Merge branch 'main' into next 
# Conflicts:
#	.github/workflows/manual-release.yml
 2024-07-16 15:52:33 +08:00
chenos
31c54896fb chore: update release ci 2024-07-16 15:50:21 +08:00
GitHub Actions Bot
82f3e52c34 Merge branch 'main' into next 2024-07-16 07:43:56 +00:00
chenos
0f322748a6 chore: update release ci 2024-07-16 15:43:07 +08:00
GitHub Actions Bot
f4bd3b1755 Merge branch 'main' into next 2024-07-16 07:41:22 +00:00
chenos
7f6cb69471 chore: update release ci 2024-07-16 15:40:26 +08:00
Zeke Zhang
9c7fcb013f
refactor: optimize e2e workflow (#4883) 
* refactor: optimize e2e workflow

* fix: fix

* Revert "fix: fix"

This reverts commit f256b2394b.

* Revert "refactor: optimize e2e workflow"

This reverts commit bb7d8c783e.

* refactor: optimize e2e workflow

* refactor: make better for workflow

* chore: optimize git logs

* fix: should to fetch all

* chore: test

* chore: test

* Revertt "chore: test"

This reverts commit 049088ad19.

* chore: test
 2024-07-16 08:48:45 +08:00
chenos
0f94e46629 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 
# Conflicts:
#	.github/workflows/release-next.yml
 2024-07-11 00:05:15 +08:00
chenos
a7a0c41d30 fix: unexpected value 'ref' 2024-07-10 23:55:28 +08:00
chenos
b56422139f chore: update release ci 2024-07-10 23:52:59 +08:00
chenos
559518f6e9
chore: next release ci (#4861) 
* test: ci

* test: ci

* test: ci

* fix: jq

* fix: jq

* fix: release ci

* fix: ci

* fix: ci

* fix: build

* fix: ci

* fix: env

* fix: jq

* fix: cache

* test: ci

* test: ci

* test: ci

* test: ci

* fix: ci

* fix: ci

* fix: ci

* fix: ci

* fix: ci

* test: ci

* fix: ci

* fix: ci

* fix: ci

* fix: ci

* fix: ci

* fix: cache

* fix: ci

* fix(cli): improve upgrade command

* fix: workflow_dispatch
 2024-07-10 23:49:16 +08:00
Junyi
9033f73584
refactor(server): sync manager and ci (#4858) 
* refactor(server): add available property on sync manager

* chore(ci): add redis service into test ci
 2024-07-10 21:48:58 +08:00
Zeke Zhang
36f70c8aba Merge branch 'main' into next 2024-07-10 14:48:10 +08:00
Zeke Zhang
b30bc625fd
chore(bot): optimize comment content (#4856)
Some checks failed
Build Docker Image / build-and-push (push) Has been cancelled
Details
Build Pro Image / build-and-push (push) Has been cancelled
Details
deploy client docs / Build (push) Has been cancelled
Details
E2E / Build (push) Has been cancelled
Details
NocoBase Backend Test / sqlite-test (20, false) (push) Has been cancelled
Details
NocoBase Backend Test / sqlite-test (20, true) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Has been cancelled
Details
NocoBase Backend Test / mysql-test (20, false) (push) Has been cancelled
Details
NocoBase Backend Test / mysql-test (20, true) (push) Has been cancelled
Details
NocoBase Backend Test / mariadb-test (20, false) (push) Has been cancelled
Details
NocoBase Backend Test / mariadb-test (20, true) (push) Has been cancelled
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Has been cancelled
Details
Test on Windows / build (push) Has been cancelled
Details
E2E / Core and plugins (push) Has been cancelled
Details
E2E / plugin-workflow (push) Has been cancelled
Details
E2E / plugin-workflow-approval (push) Has been cancelled
Details
E2E / plugin-data-source-main (push) Has been cancelled
Details
E2E / Comment on PR (push) Has been cancelled
Details 
* chore(bot): optimize comment content

* fix: use String.replace instead of String.replaceAll

* chore: add continue-on-error

* fix: fix syntax error
 2024-07-10 14:46:36 +08:00
chenos
90bd83b568 Merge branch 'main' into next 2024-07-10 13:51:06 +08:00
chenos
fac228a174
chore: fetch-depth=0 (#4854) 2024-07-10 13:50:22 +08:00
chenos
4cd2454882 Merge branch 'main' into next 
# Conflicts:
#	packages/core/client/src/schema-component/antd/page/Page.tsx
 2024-07-09 09:17:52 +08:00
Junyi
e4b3546583
fix(ci): fix ci script error for pro (#4845) 
* fix(ci): fix ci script error on pro

* fix(ci): fix ci script

* feat(ci): add base branch input for main repo

* test(ci): test pr branch number

* test(ci): test pr branch number
 2024-07-08 22:13:35 +08:00
Zeke Zhang
33b1fedd20 chore(CI): fix typo
Some checks are pending
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
2024-07-06 17:47:54 +08:00
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
Some checks failed
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 FrontEnd Test / frontend-test (18) (push) Waiting to run
Details
NocoBase Backend Test / sqlite-test (20, false) (push) Has been cancelled
Details
NocoBase Backend Test / sqlite-test (20, true) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Has been cancelled
Details
NocoBase Backend Test / mysql-test (20, false) (push) Has been cancelled
Details
NocoBase Backend Test / mysql-test (20, true) (push) Has been cancelled
Details
NocoBase Backend Test / mariadb-test (20, false) (push) Has been cancelled
Details
NocoBase Backend Test / mariadb-test (20, true) (push) Has been cancelled
Details
Test on Windows / build (push) Has been cancelled
Details
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)
Some checks are pending
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
2024-07-06 10:05:54 +08:00
chenos
73c383d2b5
fix: base ref (#4829)
Some checks are pending
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
2024-07-05 23:12:26 +08:00
Zeke Zhang
ec5e4b0336
feat: open subpages within the main page (#4797)
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 FrontEnd Test / frontend-test (18) (push) Waiting to run
Details 
* 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
xilesun
ade9b70d51 Merge branch 'main' into next 2024-07-05 09:20:21 +08:00
ChengLei Shao
7084e8d35f
chore(ci): release database after closed (#4819)
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-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 
* chore(ci): release database after closed

* chore: clean database

* chore: test
 2024-07-04 21:48:51 +08:00
Zeke Zhang
2e14e9939e Merge branch 'main' into next
Some checks failed
Build Docker Image / build-and-push (push) Has been cancelled
Details
Build Pro Image / build-and-push (push) Has been cancelled
Details
E2E / Build (push) Has been cancelled
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Has been cancelled
Details
E2E / Core and plugins (push) Has been cancelled
Details
E2E / plugin-workflow (push) Has been cancelled
Details
E2E / plugin-data-source-main (push) Has been cancelled
Details
E2E / Comment on PR (push) Has been cancelled
Details
2024-07-02 14:58:12 +08:00
Zeke Zhang
d12763c6ee
chore(e2e): optimize timeout to avoid lost report (#4798)
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
deploy client docs / Build (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-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Details
2024-07-02 14:55: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
chenos
acac61199d chore: update ci 2024-06-30 19:30:45 +08:00