9656 Commits

Author SHA1 Message Date
nocobase[bot]
e127edfac7 Merge branch 'next' into develop 2025-04-13 06:04:35 +00:00
nocobase[bot]
42f66bbd29 Merge branch 'main' into next 2025-04-13 06:04:15 +00:00
Zeke Zhang
4bc16e52f2
fix(defaultValue): avoid directly displaying variable strings (#6649) 2025-04-13 14:03:51 +08:00
nocobase[bot]
f11eef2e4f Merge branch 'next' into develop 2025-04-11 16:42:59 +00:00
nocobase[bot]
62d857b1bc chore(versions): 😊 publish v1.7.0-beta.16 v1.7.0-beta.16 2025-04-11 16:42:25 +00:00
nocobase[bot]
57dad5bedc Merge branch 'next' into develop 2025-04-11 15:49:17 +00:00
mytharcher
02b7fbd1c1 Merge branch 'main' into next 2025-04-11 23:47:30 +08:00
nocobase[bot]
777f07859a Merge branch 'next' into develop 2025-04-11 15:39:42 +00:00
chenos
cec36c849f
fix: await addNewTexts 2025-04-11 23:39:20 +08:00
nocobase[bot]
d69fbfeb1b docs: update changelogs 2025-04-11 13:39:50 +00:00
nocobase[bot]
8b983f8913 chore(versions): 😊 publish v1.6.18 v1.6.18 2025-04-11 13:05:40 +00:00
nocobase[bot]
401984d9d9 Merge branch 'next' into develop 2025-04-11 12:46:53 +00:00
gchust
b20c8b05bd
fix: incorrect variable input style (#6645)
* fix: textarea variable style issue

* fix: variable input border radius not correct

* fix: unit tests error
2025-04-11 20:46:31 +08:00
nocobase[bot]
645bf632f8 Merge branch 'next' into develop 2025-04-11 11:54:28 +00:00
Katherine
9f8fb0e362
fix: workflow node edit drawer title shows [object Object] (#6648) 2025-04-11 19:54:01 +08:00
nocobase[bot]
26d937b864 Merge branch 'next' into develop 2025-04-11 06:26:55 +00:00
nocobase[bot]
8c5edfc494 Merge branch 'main' into next 2025-04-11 06:26:34 +00:00
Katherine
c509e5f9e2
fix: subtable description overlapping with add new button (#6646) 2025-04-11 14:26:12 +08:00
nocobase[bot]
3ecf1c8a64 Merge branch 'next' into develop 2025-04-11 00:46:37 +00:00
Junyi
e65ff559c2
fix(plugin-workflow): fix loading enabled workflows list with stats (#6642)
* fix(plugin-workflow): fix loading enabled workflows list with stats

* fix(plugin-workflow): add fallback logic to make sure workflow has stats
2025-04-11 08:46:14 +08:00
Junyi
32ae82bb31
refactor(client): add default type fallback api for (#6644) 2025-04-11 08:45:48 +08:00
Zeke Zhang
fb5e627e8d Merge branch 'next' into develop 2025-04-10 23:04:41 +08:00
Zeke Zhang
6d435dbcf8 Merge branch 'main' into next 2025-04-10 22:57:07 +08:00
Zeke Zhang
49a9c6365b
refactor: optimize prompt information (#6641)
* fix: update error block to display a custom image and improved messages when no pages are found

* feat: add no pages result display with custom message and icon in LayoutContent

* feat: add translations for UI editor prompts and update no pages message in multiple locales

* feat: add tip display when no pages are found in LayoutContent

* fix: ensure minimum height for mobile tab bar content

* fix: remove unnecessary margin from mobile action page styles and block initializer
2025-04-10 22:50:57 +08:00
nocobase[bot]
faab08083b Merge branch 'next' into develop 2025-04-10 14:46:04 +00:00
Zeke Zhang
9ab6f7a956 style(mobile): fix top-right corner style 2025-04-10 22:45:17 +08:00
nocobase[bot]
36fcede987 Merge branch 'next' into develop 2025-04-10 06:37:42 +00:00
chenos
5852901b19 fix: test error 2025-04-10 14:36:57 +08:00
nocobase[bot]
265aacee22 Merge branch 'next' into develop 2025-04-10 05:52:08 +00:00
nocobase[bot]
ee260e24f6 Merge branch 'main' into next 2025-04-10 05:51:47 +00:00
Katherine
7886581f08
fix: dashed underline caused by horizontal form layout in modal (#6639)
* fix: dashed underline caused by horizontal form layout in modal

* fix: e2e test
2025-04-10 13:51:25 +08:00
nocobase[bot]
e2b5477f52 Merge branch 'next' into develop 2025-04-10 03:29:29 +00:00
nocobase[bot]
95952c7a45 chore(versions): 😊 publish v1.7.0-beta.15 v1.7.0-beta.15 2025-04-10 03:29:03 +00:00
nocobase[bot]
f6c27821f2 Merge branch 'next' into develop 2025-04-10 03:01:48 +00:00
Junyi
5717e91a0b
fix(plugin-workflow): fix oom when create job with unsafe integer id (#6637)
* fix(plugin-workflow): fix oom when create job with unsafe integer id

* chore(plugin-workflow): remove useless code

* chore(plugin-workflow): remove only for test case

* fix(plugin-workflow): fix test cases

* fix(plugin-workflow): fix test case

* fix(plugin-workflow): fix pg test case
2025-04-10 11:01:25 +08:00
nocobase[bot]
345a3dd27c Merge branch 'next' into develop 2025-04-10 01:07:10 +00:00
chenos
29d7cf3dbf fix: assign overwrite strategy 2025-04-10 09:06:32 +08:00
gchust
f9b2720ef2
fix: save as template error if block is using a deleted ref template (#6638) 2025-04-09 22:42:53 +08:00
nocobase[bot]
b7559068bd Merge branch 'next' into develop 2025-04-09 13:44:08 +00:00
nocobase[bot]
ab8316bc21 Merge branch 'main' into next 2025-04-09 13:43:43 +00:00
Junyi
86380b2ba5
refactor(plugin-workflow-delay): support to use variable for duration (#6621) 2025-04-09 21:43:15 +08:00
nocobase[bot]
865235a6c4 Merge branch 'next' into develop 2025-04-09 11:29:14 +00:00
nocobase[bot]
eeec17265c chore(versions): 😊 publish v1.7.0-beta.14 v1.7.0-beta.14 2025-04-09 11:28:40 +00:00
nocobase[bot]
b10ae3aff6 Merge branch 'next' into develop 2025-04-09 11:06:32 +00:00
ajie
41961fb923
fix: correct role union calculation logic (#6605)
* refactor: enhance role merging logic: prioritize strategy actions over existing actions

* refactor: union role acl

* refactor: union role acl

* refactor: union role acl

* fix: assign getKeys

* fix: assign

* refactor: switch role set default role record

* refactor: switch role set default role record

* refactor: switch role set default role record

* refactor: switch role set default role record

* refactor: add setCurrentRole cache

* fix: e2e test

* fix: setCurrentRole

* refactor: switch role

---------

Co-authored-by: chenos <chenlinxh@gmail.com>
2025-04-09 19:06:05 +08:00
nocobase[bot]
d7f0330fca Merge branch 'next' into develop 2025-04-09 06:45:45 +00:00
nocobase[bot]
2d9545a719 Merge branch 'main' into next 2025-04-09 06:45:08 +00:00
nocobase[bot]
6f4e27a286 docs: update changelogs 2025-04-09 06:44:38 +00:00
nocobase[bot]
e83f60ce80 Merge branch 'next' into develop 2025-04-09 06:28:49 +00:00
nocobase[bot]
876b71bc61 Merge branch 'main' into next 2025-04-09 06:28:23 +00:00