2428 Commits

Author SHA1 Message Date
Zeke Zhang
3140edf798
fix: refresh issues (#5838)
* fix(associationField): fix the issue where the configuration popup does not show when reopened

* test: add e2e test

* refactor: extract template code

* chore(e2e): fix e2e error
2024-12-10 00:07:34 +08:00
katherinehhh
12df6e42e5 Merge branch 'next' into develop 2024-12-09 20:54:08 +08:00
nocobase[bot]
7633e93b79 chore(versions): 😊 publish v1.6.0-alpha.4 2024-12-09 09:46:48 +00:00
chenyongxin
075ff36042
plugin-calendar add event open method (#5808)
* feat: plugin-calendar-add-event-open-method

* feat: modify plugin-calendar locale file

* feat: modify plugin-calendar locale file
2024-12-09 14:52:55 +08:00
nocobase[bot]
ca1e5442e5 Merge branch 'main' into next 2024-12-09 02:41:11 +00:00
Katherine
49821eee4e
fix: mobile background color display issue (#5809) 2024-12-09 10:40:48 +08:00
nocobase[bot]
504b665d72 chore(versions): 😊 publish v1.6.0-alpha.3 2024-12-09 02:19:22 +00:00
nocobase[bot]
bb3714261c chore(versions): 😊 publish v1.4.6 2024-12-08 23:24:17 +00:00
nocobase[bot]
66d50efbae Merge branch 'next' into develop 2024-12-08 22:03:16 +00:00
nocobase[bot]
7c44d268dc Merge branch 'main' into next 2024-12-08 22:02:54 +00:00
ChengLei Shao
03f50fd638
fix: import by associations (#5833) 2024-12-09 06:02:30 +08:00
Katherine
0231ce7898
style: action penal style improve (#5834) 2024-12-08 20:19:16 +08:00
nocobase[bot]
f1a9d9fd74 Merge branch 'next' into develop 2024-12-08 10:24:53 +00:00
nocobase[bot]
ab38e954c1 Merge branch 'main' into next 2024-12-08 10:24:33 +00:00
ChengLei Shao
afa931bcad
fix: acl with fields association (#5832) 2024-12-08 18:24:12 +08:00
nocobase[bot]
5becd3c6c0 chore(versions): 😊 publish v1.4.5 2024-12-08 07:13:13 +00:00
chenos
9f111f5798 Merge branch 'next' into develop
# Conflicts:
#	packages/core/client/src/locale/zh-CN.json
2024-12-08 14:02:05 +08:00
chenos
6e8d7edc7d Merge branch 'main' into next 2024-12-08 14:00:12 +08:00
chenos
537bc23037
fix(acl): refresh the page when the user's role is incorrect (#5821)
* fix(acl): refresh the page when the user's role is incorrect

* fix: refresh

* fix: test error
2024-12-08 13:31:36 +08:00
nocobase[bot]
045b2e7469 chore(versions): 😊 publish v1.4.4 2024-12-08 05:19:18 +00:00
nocobase[bot]
aa709c3e70 Merge branch 'next' into develop 2024-12-08 05:15:33 +00:00
nocobase[bot]
395937cc1e Merge branch 'main' into next 2024-12-08 05:15:11 +00:00
YANG QIA
20b6ddc06b
fix(data-vi): issue when formating date with timezone in MySQL (#5829) 2024-12-08 13:14:44 +08:00
nocobase[bot]
6031d1fa35 Merge branch 'next' into develop 2024-12-08 04:59:09 +00:00
nocobase[bot]
448252141c Merge branch 'main' into next 2024-12-08 04:58:46 +00:00
ChengLei Shao
a732c84e63
fix: export by association (#5824) 2024-12-08 12:58:16 +08:00
nocobase[bot]
3f639929bd Merge branch 'next' into develop 2024-12-08 01:14:07 +00:00
Zeke Zhang
78146261d0 chore(e2e): make e2e more stable 2024-12-08 06:31:44 +08:00
Zeke Zhang
694c9b0928
fix(popup): completely solve the URL confusion issue (#5812)
* test(e2e): add test

* fix(enableLink): fix popup issue

* fix(enableLink): fix popup issue

* fix(popup): completely solve the URL confusion issue

* chore(e2e): fix e2e error

* chore(e2e): make e2e more stable
2024-12-08 00:12:01 +08:00
Katherine
db64d1cb52
fix: sub-table e2e test (#5823)
* fix: sub-table e2e test

* fix: test

* fix: test

* fix: test

* fix: test

* fix: test
2024-12-07 23:18:02 +08:00
nocobase[bot]
dd41466a2a Merge branch 'next' into develop 2024-12-07 13:29:04 +00:00
nocobase[bot]
ee60880672 Merge branch 'main' into next 2024-12-07 13:28:43 +00:00
YANG QIA
a0aa3b8663
fix(m2m-array): issue where updating m2m array fields in single relation collection (#5820)
* fix(m2m-array): issue where updating m2m array fields in single relation collection

* fix: select

* test: add test cases
2024-12-07 21:28:20 +08:00
katherinehhh
3723076cbe Merge branch 'next' into develop 2024-12-07 20:05:50 +08:00
Katherine
5fa6a86021
chore: add new & select record in sub-table (#5819)
* chore: add new & select record in sub-table

* fix: bug

* fix: bug

* fix: bug

* fix: test
2024-12-07 18:57:32 +08:00
nocobase[bot]
c3ad9a0aef Merge branch 'main' into next 2024-12-07 06:42:42 +00:00
Junyi
173fa2c05d
fix(plugin-workflow): fix date type for schedule field (#5816) 2024-12-07 14:42:15 +08:00
nocobase[bot]
54e3d83f94 Merge branch 'main' into next 2024-12-07 06:42:05 +00:00
Junyi
fb5c033524
fix(plugin-workflow): fix transaction across data sources (#5818) 2024-12-07 14:41:59 +08:00
nocobase[bot]
305241cfb4 Merge branch 'next' into develop 2024-12-06 08:25:32 +00:00
nocobase[bot]
74075c9450 Merge branch 'main' into next 2024-12-06 08:25:10 +00:00
Sheldon Guo
9d82164105
fix(plugin-notification-manager): notification channel name can not be edit when creating on demo site (#5811)
* fix(plugin-notification-manager):  notification channel name can not be edit when creating on demo site
2024-12-06 16:24:49 +08:00
nocobase[bot]
7c02524b9f chore(versions): 😊 publish v1.5.0-beta.2 2024-12-06 08:20:03 +00:00
nocobase[bot]
9a7abf3ce6 Merge branch 'next' into develop 2024-12-06 06:58:53 +00:00
nocobase[bot]
3e532fc4ca Merge branch 'main' into next 2024-12-06 06:58:21 +00:00
ChengLei Shao
ba1446c77f
chore: empty filter check (#5806)
* chore: empty filter check

* chore: test

* fix: test

* fix: test

---------

Co-authored-by: xilesun <2013xile@gmail.com>
2024-12-06 14:57:58 +08:00
nocobase[bot]
c70bc40f0f Merge branch 'next' into develop 2024-12-06 06:49:05 +00:00
nocobase[bot]
7ec1664f43 Merge branch 'main' into next 2024-12-06 06:48:02 +00:00
Katherine
eca3bf4a65
fix: incorrect QC code scan path in sub-application public form (#5799) 2024-12-06 14:47:41 +08:00
nocobase[bot]
2657e8feb0 Merge branch 'next' into develop 2024-12-05 15:28:59 +00:00