7381 Commits

Author SHA1 Message Date
nocobase[bot]
771bc6b5e0 Merge branch 'main' into next 2024-12-06 10:25:06 +00:00
Katherine
6874b06c7e
fix: inherited fields not appear in field list and cannot override in… (#5800)
* fix: inherited fields not appear in field list and cannot override inherited field

* fix: bug
2024-12-06 18:24:44 +08:00
nocobase[bot]
3c7138fff9 Merge branch 'next' into develop 2024-12-06 10:24:01 +00:00
Katherine
73c2efd4c1
feat: support configuring text, icon, and type for add and select buttons in sub-table (#5778)
* feat: support configuring text, icon, and type for sub-table buttons

* refactor: action style improve

* fix: bug

* fix: bug

* fix: bug
2024-12-06 18:23:37 +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]
21df4994cb Merge branch 'next' into develop 2024-12-06 08:20:10 +00:00
nocobase[bot]
7c02524b9f chore(versions): 😊 publish v1.5.0-beta.2 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]
44c9b93fb6 Merge branch 'next' into develop 2024-12-06 06:37:36 +00:00
nocobase[bot]
f549ea0b3b Merge branch 'main' into next 2024-12-06 06:37:11 +00:00
mahuantest
2952d28224
Update Video in README.md 2024-12-06 14:36:43 +08:00
nocobase[bot]
4d3b4ae61a Merge branch 'next' into develop 2024-12-06 04:05:27 +00:00
nocobase[bot]
86151659d7 Merge branch 'main' into next 2024-12-06 04:05:04 +00:00
Katherine
c86b1efdf7
fix: select readPretty (#5807) 2024-12-06 12:04:38 +08:00
Zeke Zhang
de19124fa1
fix(Navigate): fix the issue where mobile login redirects to desktop page (#5805) 2024-12-06 10:50:27 +08:00
Zeke Zhang
db7c9bac42
fix: prevent multiple requests from being triggered (#5804) 2024-12-06 09:32:14 +08:00
nocobase[bot]
2657e8feb0 Merge branch 'next' into develop 2024-12-05 15:28:59 +00:00
nocobase[bot]
5168a608ab Merge branch 'main' into next 2024-12-05 15:28:37 +00:00
Zeke Zhang
6a7f2f2913
fix(Calendar): fix popup issue (#5793)
* test(e2e): add e2e test

* fix(Calendar): fix popup issue
2024-12-05 23:28:14 +08:00
nocobase[bot]
b906326c6f Merge branch 'next' into develop 2024-12-05 15:01:23 +00:00
nocobase[bot]
eee875a0ce Merge branch 'main' into next 2024-12-05 15:01:01 +00:00
Katherine
7f370bb29d
fix: error when clicking on a blank date in the calendar (#5803) 2024-12-05 23:00:37 +08:00
nocobase[bot]
f647abaf1d docs: update changelogs 2024-12-05 14:53:35 +00:00
nocobase[bot]
5a0b884a7d Merge branch 'next' into develop 2024-12-05 14:34:15 +00:00
nocobase[bot]
f29b7760ab Merge branch 'main' into next 2024-12-05 14:32:43 +00:00
nocobase[bot]
713563ada7 chore(versions): 😊 publish v1.4.3 v1.4.3 2024-12-05 14:32:22 +00:00
nocobase[bot]
8fef0f473e Merge branch 'next' into develop 2024-12-05 12:49:09 +00:00
nocobase[bot]
405a761028 Merge branch 'main' into next 2024-12-05 12:48:46 +00:00
chenos
387f570dcf fix(client): prevent error when this.app is undefined 2024-12-05 20:47:39 +08:00
nocobase[bot]
bb77a14973 Merge branch 'next' into develop 2024-12-05 12:44:01 +00:00
nocobase[bot]
d98d95845b Merge branch 'main' into next 2024-12-05 12:43:36 +00:00
YANG QIA
e610f10d38
fix(users): token is not cleared when a user has no role signing in (#5790) 2024-12-05 20:43:10 +08:00
gchust
201b3c43d2
fix: async chunks has been cached incorrectly (#5801) 2024-12-05 20:30:30 +08:00
nocobase[bot]
7181861692 Merge branch 'next' into develop 2024-12-05 11:20:16 +00:00
nocobase[bot]
f356cc917f Merge branch 'main' into next 2024-12-05 11:19:55 +00:00
Sheldon Guo
411614eb86
chore(notification-in-app-message): update titles for detail URLs in forms and localization files (#5742)
* chore(notification-in-app-message): update titles for detail URLs in forms and localization files
2024-12-05 19:19:33 +08:00
nocobase[bot]
54efc909b1 Merge branch 'next' into develop 2024-12-05 09:56:09 +00:00
nocobase[bot]
41c165288e Merge branch 'main' into next 2024-12-05 09:55:47 +00:00
chenos
7f674aafb2
fix: blank page when user has no role (#5797) 2024-12-05 17:55:21 +08:00
Zeke Zhang
92e87ee1da Merge branch 'next' into develop 2024-12-05 16:36:42 +08:00
nocobase[bot]
91fecb85b2 Merge branch 'main' into next 2024-12-05 08:24:51 +00:00
Junyi
7c6e863c8d
fix(test): add roleName to login in mock server (#5794) 2024-12-05 16:24:25 +08:00
Katherine
9ad93ed790
fix: configure action button to be left-aligned (#5798) 2024-12-05 15:50:47 +08:00