8134 Commits

Author SHA1 Message Date
nocobase[bot]
f3917a41b1 Merge branch 'main' into next 2025-01-10 16:12:00 +00:00
nocobase[bot]
efb124984c chore(versions): 😊 publish v1.4.22 v1.4.22 2025-01-10 16:11:39 +00:00
mytharcher
fcef6c11da Merge branch 'next' into develop 2025-01-11 00:09:50 +08:00
mytharcher
6f55a2a0d0 Merge branch 'main' into next 2025-01-11 00:09:02 +08:00
Junyi
4751bda137
chore(evaluators): upgrade formulajs version to 4.4.9 (#6037) 2025-01-10 23:08:17 +08:00
nocobase[bot]
4582009346 Merge branch 'next' into develop 2025-01-10 11:43:14 +00:00
nocobase[bot]
dc25e8a9d4 Merge branch 'main' into next 2025-01-10 11:42:53 +00:00
Junyi
2efa3eddea
fix(plugin-workflow): fix logger api (#6036) 2025-01-10 19:42:29 +08:00
mytharcher
5c7a38c569 Merge branch 'next' into develop 2025-01-10 17:05:15 +08:00
mytharcher
ff526f9a78 Merge branch 'main' into next 2025-01-10 16:46:08 +08:00
Junyi
a3ae8032f4
fix(plugin-workflow): fix duplicate triggering (#6022)
* fix(plugin-workflow): fix duplicate triggering

* fix(plugin-workflow): await executing before resume

* fix(plugin-workflow): fix failed test case
2025-01-10 15:03:08 +08:00
nocobase[bot]
4a999dc952 Merge branch 'next' into develop 2025-01-10 04:02:43 +00:00
nocobase[bot]
dd4f9b7829 Merge branch 'main' into next 2025-01-10 04:02:20 +00:00
nocobase[bot]
da24f729f2 docs: update changelogs 2025-01-10 04:01:54 +00:00
nocobase[bot]
a66b603005 Merge branch 'next' into develop 2025-01-10 03:59:58 +00:00
nocobase[bot]
39a40b11eb chore(versions): 😊 publish v1.5.0-beta.27 v1.5.0-beta.27 2025-01-10 03:59:31 +00:00
nocobase[bot]
0b5a1fc70b Merge branch 'next' into develop 2025-01-10 03:54:45 +00:00
nocobase[bot]
1dc496a0ea Merge branch 'main' into next 2025-01-10 03:53:33 +00:00
nocobase[bot]
bea0974067 chore(versions): 😊 publish v1.4.21 v1.4.21 2025-01-10 03:53:19 +00:00
nocobase[bot]
98a98b5fa0 chore(versions): 😊 publish v1.6.0-alpha.12 v1.6.0-alpha.12 2025-01-10 03:51:12 +00:00
chenos
7eb5d4f759 Merge branch 'develop' of github.com:nocobase/nocobase into develop 2025-01-10 11:34:39 +08:00
nocobase[bot]
813120f20d Merge branch 'next' into develop 2025-01-10 03:34:27 +00:00
chenos
4289abc848 Merge branch 'main' into develop 2025-01-10 11:34:00 +08:00
Katherine
3b7dfc4cf7
refactor: remove linkage rules from Associate button (#6016)
* refactor: remove linkage rules from Associate button

* fix: bug
2025-01-10 11:33:59 +08:00
nocobase[bot]
ff03d4e7bd Merge branch 'main' into next 2025-01-10 03:33:45 +00:00
chenos
53eca84eda fix: docker image 2025-01-10 11:33:12 +08:00
nocobase[bot]
83d69a1eae Merge branch 'main' into next 2025-01-10 03:27:06 +00:00
chenos
cad134f6ef chore: update Dockerfile 2025-01-10 11:26:24 +08:00
nocobase[bot]
158134baf4 Merge branch 'next' into develop 2025-01-10 03:11:25 +00:00
Zeke Zhang
64a7ca31b5 Merge branch 'main' into next 2025-01-10 11:10:36 +08:00
chenos
27f788f132
fix: resolve missing public path in icon file paths (#6034)
* fix: resolve missing public path in icon file paths

* fix: error
2025-01-10 11:07:40 +08:00
Zeke Zhang
e1889ef502
fix(variable): fix incorrect field display of current record in sub-details (#6030) 2025-01-10 10:56:52 +08:00
nocobase[bot]
afde0bfd4d Merge branch 'next' into develop 2025-01-10 02:43:30 +00:00
nocobase[bot]
0546fa8d88 Merge branch 'main' into next 2025-01-10 02:43:09 +00:00
chenos
80bd0e9870 fix: use posix.resolve 2025-01-10 10:42:35 +08:00
nocobase[bot]
2c7cc0e99f Merge branch 'next' into develop 2025-01-10 02:15:24 +00:00
nocobase[bot]
fa3f7fec7f Merge branch 'main' into next 2025-01-10 02:15:00 +00:00
chenos
5ecd48ad15 fix: ensure URL paths start with public path and redirect public path without trailing slash 2025-01-10 10:13:44 +08:00
nocobase[bot]
8f31316d7e Merge branch 'next' into develop 2025-01-10 02:08:49 +00:00
nocobase[bot]
470f07f3ae Merge branch 'main' into next 2025-01-10 02:08:26 +00:00
Katherine
fa60e339b4
chore: get link by app.getHref (#6029) 2025-01-10 10:08:00 +08:00
nocobase[bot]
e8cdcc94ae Merge branch 'next' into develop 2025-01-10 01:36:03 +00:00
nocobase[bot]
f5635f8067 Merge branch 'main' into next 2025-01-10 01:35:36 +00:00
Katherine
a1c0d6b969
refactor: support linkage rules in the details block to hide(reserved value) (#6031) 2025-01-10 09:35:10 +08:00
chenos
fae1ca9e02 feat: add process.env.ENV_VARS_AES_SECRET_KEY 2025-01-09 23:37:45 +08:00
nocobase[bot]
0a39303350 Merge branch 'main' into next 2025-01-09 13:32:53 +00:00
ChengLei Shao
9b8c274fc9
fix: fields sort (#6028) 2025-01-09 21:31:39 +08:00
nocobase[bot]
fac8ea5ba0 Merge branch 'next' into develop 2025-01-09 11:16:25 +00:00
Zeke Zhang
2ddaeb62a6 Merge branch 'main' into next 2025-01-09 19:15:38 +08:00
Zeke Zhang
ea82812222
fix(linkageRules): fix invalid issue of form linkage rules (#5876) (#6023)
* fix(linkageRules): fix invalid issue of form linkage rules (#5876)

* test: add e2e test

* fix: complete the fix

* fix: fix e2e errors

* fix: fix e2e errors

* feat(table): add support for conditional styling based on pretty mode

* feat(FormItem): enhance wrapperStyle to conditionally apply padding based on background color

* chore: skip e2e test

---------

Co-authored-by: sheldon guo <sheldon_66@163.com>
2025-01-09 19:08:18 +08:00