8134 Commits

Author SHA1 Message Date
nocobase[bot]
f5c09856eb Merge branch 'next' into develop 2025-01-15 20:33:19 +00:00
nocobase[bot]
c0bdaec473 Merge branch 'main' into next 2025-01-15 20:32:45 +00:00
Zeke Zhang
9af7fb951c
fix(mobile): fix SafeArea not working issue (#6068) 2025-01-16 04:32:17 +08:00
chenos
5aec227032 Merge branch 'next' into develop
# Conflicts:
#	packages/plugins/@nocobase/plugin-workflow/src/client/variable.tsx
2025-01-15 21:09:10 +08:00
nocobase[bot]
e5d398d8a1 Merge branch 'main' into next 2025-01-15 13:06:02 +00:00
chenos
2c936b6eb1
feat: improve the extensibility of file-storage (#6071) 2025-01-15 21:05:35 +08:00
Junyi
04b3540739
chore(plugin-workflow): cherry pick (#6057)
* refactor(plugin-workflow): change api of manually execute (#5850)

* feat: add subflow node

* feat: add execution event

* feat: add force option

* feat: avoid recurring call

* feat: add stack to execution

* feat: add cyclic call validator

* feat: collection trigger add execution stack

* fix: stack

* fix: manual execute

* refactor(plugin-workflow): adjust api and implementent

* chore: revert locale back

* feat: trigger field set add scope variables

* feat: add changeOnSelect

* feat: variables support ID reference

* feat: change locale

* refactor(plugin-workflow): support execute by passing filterByTk for a record

* refactor(plugin-workflow): adjust props name

* fix(plugin-workflow): fix execute variable context

* fix(plugin-workflow): fix variables and locales

* chore(plugin-workflow): remove demo code

* fix(plugin-workflow): fix import

* fix(plugin-workflow): fix build error

---------

Co-authored-by: mytharcher <mytharcher@gmail.com>

* fix(plugin-workflow): fix schedule picker value (#6039)

* fix(plugin-workflow): fix variable compoent onchange (#5964)

---------

Co-authored-by: shz <huanghui9850@gmail.com>
2025-01-15 17:42:49 +08:00
nocobase[bot]
9bf8fb3bb1 Merge branch 'next' into develop 2025-01-15 09:00:48 +00:00
nocobase[bot]
540a22ba31 Merge branch 'main' into next 2025-01-15 09:00:22 +00:00
Junyi
6906d87375
fix(plugin-workflow): fix repeat field component (#6067) 2025-01-15 16:59:58 +08:00
nocobase[bot]
72b39d662d Merge branch 'next' into develop 2025-01-15 04:16:30 +00:00
nocobase[bot]
3ee422d8e1 Merge branch 'main' into next 2025-01-15 04:16:10 +00:00
Katherine
5bdada4c1f
chore: set inputReadOnly for DatePicker based on device type (#6065) 2025-01-15 12:15:46 +08:00
nocobase[bot]
b6901c92a7 Merge branch 'next' into develop 2025-01-15 03:11:06 +00:00
nocobase[bot]
ddfacb3c9a Merge branch 'main' into next 2025-01-15 03:10:43 +00:00
Katherine
8ba098faeb
fix: datepicker client test (#6064) 2025-01-15 11:10:21 +08:00
nocobase[bot]
bf7355180d Merge branch 'next' into develop 2025-01-15 02:36:50 +00:00
nocobase[bot]
c492f84ec2 Merge branch 'main' into next 2025-01-15 02:36:28 +00:00
mahuantest
86b354d7de
doc: Update README.ja-JP.md 2025-01-15 10:36:04 +08:00
nocobase[bot]
7749b4b8f1 Merge branch 'next' into develop 2025-01-14 12:52:58 +00:00
nocobase[bot]
d63accfb3f Merge branch 'main' into next 2025-01-14 12:52:30 +00:00
nocobase[bot]
7346dd0f41 docs: update changelogs 2025-01-14 12:52:01 +00:00
nocobase[bot]
358f4b11d0 Merge branch 'next' into develop 2025-01-14 12:21:36 +00:00
nocobase[bot]
49da664b9a Merge branch 'main' into next 2025-01-14 12:19:54 +00:00
nocobase[bot]
c9747e2990 chore(versions): 😊 publish v1.4.24 v1.4.24 2025-01-14 12:19:29 +00:00
nocobase[bot]
3de514b302 Merge branch 'next' into develop 2025-01-14 11:40:31 +00:00
xilesun
bbb89d5f35 Merge branch 'main' into next 2025-01-14 19:39:39 +08:00
YANG QIA
04d75cf430
fix(data-vi): remove the LIMIT clause when using aggregate functions without dimensions (#6062) 2025-01-14 18:30:40 +08:00
nocobase[bot]
f45d1408dd Merge branch 'next' into develop 2025-01-14 09:08:21 +00:00
nocobase[bot]
ca8ab6c97f Merge branch 'main' into next 2025-01-14 09:07:53 +00:00
chenyongxin
aa13199bbd
feat: datePicker component input read only (#6061) 2025-01-14 17:07:30 +08:00
nocobase[bot]
dc3cd8e210 Merge branch 'next' into develop 2025-01-14 08:52:17 +00:00
nocobase[bot]
4a58559331 Merge branch 'main' into next 2025-01-14 08:51:53 +00:00
ChengLei Shao
41c86e77a8
fix: init sort field by primary key (#6059)
* fix: init sort field by primary key

* fix: sort key

* fix: test
2025-01-14 16:51:30 +08:00
nocobase[bot]
83bbb2cedd Merge branch 'next' into develop 2025-01-14 07:58:28 +00:00
nocobase[bot]
d0372a88a5 chore(versions): 😊 publish v1.5.0-beta.28 v1.5.0-beta.28 2025-01-14 07:57:58 +00:00
nocobase[bot]
5665841d73 Merge branch 'next' into develop 2025-01-14 07:32:04 +00:00
nocobase[bot]
49f4c3c923 Merge branch 'main' into next 2025-01-14 07:31:43 +00:00
Katherine
d0cb923ade
fix: incorrect loading of modal association fields in table block (#6060) 2025-01-14 15:31:22 +08:00
nocobase[bot]
4f523316b4 chore(versions): 😊 publish v1.6.0-alpha.14 v1.6.0-alpha.14 2025-01-14 05:56:55 +00:00
nocobase[bot]
814693476d chore(versions): 😊 publish v1.6.0-alpha.13 v1.6.0-alpha.13 2025-01-14 05:27:59 +00:00
katherinehhh
0cbd1ca795 Merge branch 'next' into develop 2025-01-14 13:18:43 +08:00
nocobase[bot]
4a7d737d16 Merge branch 'main' into next 2025-01-14 05:12:57 +00:00
Katherine
6df9d66837
fix: client e2e test (#6058) 2025-01-14 13:12:21 +08:00
nocobase[bot]
19a63ebab3 Merge branch 'main' into next 2025-01-14 02:06:28 +00:00
Katherine
565e55559a
fix: public form style issue (#6055) 2025-01-14 10:06:07 +08:00
nocobase[bot]
a897091a29 Merge branch 'next' into develop 2025-01-14 00:52:54 +00:00
Chareice
9b85cb1876
fix: test 2025-01-14 08:52:24 +08:00
Chareice
4668b97417
fix: ws error 2025-01-13 22:17:05 +08:00
nocobase[bot]
f299eedb1b Merge branch 'next' into develop 2025-01-13 13:31:20 +00:00