7863 Commits

Author SHA1 Message Date
nocobase[bot]
e3cc7e2b8f Merge branch 'next' into develop 2025-04-17 07:11:41 +00:00
chenos
0fc8f5d0cf Merge branch 'main' into next
# Conflicts:
#	yarn.lock
2025-04-17 15:11:07 +08:00
chenos
8abdb8eaac chore: upgrade tar to version 7.4.3 2025-04-17 15:09:10 +08:00
nocobase[bot]
7f1d642848 chore(versions): 😊 publish v1.6.21 2025-04-17 06:51:36 +00:00
nocobase[bot]
11b57d0de4 Merge branch 'next' into develop 2025-04-17 06:31:20 +00:00
nocobase[bot]
66ecba9d96 Merge branch 'main' into next 2025-04-17 06:30:55 +00:00
Junyi
9add517d75
refactor(client): add delay API for scenarios without delay (#6681) 2025-04-17 14:30:32 +08:00
nocobase[bot]
a8e0a6e826 Merge branch 'next' into develop 2025-04-17 04:35:28 +00:00
Katherine
f5fb2844da
feat(custom-request): support selected table records in custom request (#6647)
* feat: support selected table records in custom request

* fix: test

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: merge bug

* fix: e2e test

* fix: e2e test
2025-04-17 12:35:03 +08:00
nocobase[bot]
11d1d2497d Merge branch 'next' into develop 2025-04-17 04:19:40 +00:00
nocobase[bot]
1c343cad66 Merge branch 'main' into next 2025-04-17 04:19:18 +00:00
Junyi
18447848ca
fix(client): add fault tolerant when no x-component in schema (#6691) 2025-04-17 12:18:51 +08:00
nocobase[bot]
f9cb9bd376 Merge branch 'next' into develop 2025-04-17 04:14:27 +00:00
nocobase[bot]
00629d118e Merge branch 'main' into next 2025-04-17 04:14:06 +00:00
ajie
454ab34921
fix: ci build (#6687) 2025-04-17 12:13:41 +08:00
nocobase[bot]
1e9967697f Merge branch 'next' into develop 2025-04-17 03:45:21 +00:00
nocobase[bot]
ff772fc5cf Merge branch 'main' into next 2025-04-17 03:44:59 +00:00
Katherine
0961c4399d
fix: association field detection to be based on type (#6692) 2025-04-17 11:44:38 +08:00
nocobase[bot]
41949b31e2 Merge branch 'next' into develop 2025-04-17 02:33:08 +00:00
Katherine
38f8cf9d56
fix: linkage rules compatibility with legacy data (#6686)
* fix: linkage rules compatibility with legacy data

* fix: bug
2025-04-17 10:32:41 +08:00
nocobase[bot]
d775eb1280 Merge branch 'next' into develop 2025-04-17 01:04:32 +00:00
nocobase[bot]
1652b50edf Merge branch 'main' into next 2025-04-17 01:04:09 +00:00
YANG QIA
824ad7f29e
fix: bug (#6684) 2025-04-17 09:03:33 +08:00
nocobase[bot]
e6f6246be7 Merge branch 'next' into develop 2025-04-16 13:48:14 +00:00
mytharcher
10a6fbba41 fix(plugin-workflow-manual): fix merge error 2025-04-16 21:47:18 +08:00
nocobase[bot]
9f7af37f62 Merge branch 'next' into develop 2025-04-16 13:20:45 +00:00
nocobase[bot]
ccbb2d0783 Merge branch 'main' into next 2025-04-16 13:20:20 +00:00
xilesun
18791bfe2d fix(departments): test error 2025-04-16 21:18:34 +08:00
nocobase[bot]
f1ad2c5aec Merge branch 'next' into develop 2025-04-16 13:07:17 +00:00
mytharcher
42a9d5a6cb Merge branch 'main' into next 2025-04-16 21:06:12 +08:00
gchust
181c24c2a3
fix: layload errors if component not exist (#6683) 2025-04-16 20:40:32 +08:00
Junyi
8d8229f8ca
fix(client): fix upload component locale (#6682) 2025-04-16 18:40:05 +08:00
ajie
5eda5ba21d
fix: fixed an error importing xlsx time field (#6672) 2025-04-16 17:14:23 +08:00
nocobase[bot]
7c9cbb5774 Merge branch 'next' into develop 2025-04-16 07:53:14 +00:00
Katherine
6fef3d7bed
feat: support variables on the left side of linkage rule conditions (#6609)
* feat: support linkage rules setting for association block action

* chore: linkage rule

* fix: bug

* fix: bug

* refactor: linkage rule

* refactor: code imporve

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* refactor: code imporve

* fix: test

* fix: test

* fix: test

* test: e2e test

* fix: bug

* fix: bug

* fix: test

* fix: e2e test

* fix: bug

* chore: support legacy leftVar in linkage rules

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: create submit linkage rule

* fix: action panel

* refactor: code improve

* fix: bug

* fix: test

* fix: test

* fix: code improve

* fix: e2e test

* fix: bug

* refactor: refresh & expend action support linkage rule

* refactor: code improve

* fix: test

* fix: bug

* fix: bug

* fix: e2e test

* fix: e2e test

* fix: e2e test

* fix: test

* refactor: code improve

* fix: e2e test

* fix: bug

* fix: e2e test

* fix: e2e test

* fix: test

* fix: e2e test

* fix: e2e test

* fix: bug
2025-04-16 15:52:51 +08:00
Junyi
baec449c03
fix(client): fix input component (#6679)
* fix(client): fix input component

* fix(client): remove useless definition
2025-04-16 12:33:46 +08:00
nocobase[bot]
80dccdf71a Merge branch 'next' into develop 2025-04-16 03:45:32 +00:00
Katherine
cb518dd162
fix: field descriptions display issue in workflow (#6680) 2025-04-16 11:45:08 +08:00
Junyi
63a842aab3
fix(plugin-workflow-manual): fix task status (#6676) 2025-04-16 09:48:48 +08:00
nocobase[bot]
4bff1e25cb Merge branch 'next' into develop 2025-04-15 16:11:58 +00:00
nocobase[bot]
f1c9a14e6c chore(versions): 😊 publish v1.7.0-beta.18 2025-04-15 16:11:32 +00:00
nocobase[bot]
0a6fbbf5ec Merge branch 'next' into develop 2025-04-15 15:45:00 +00:00
Junyi
aefd78bc09
fix(plugin-acl): fix role in cache (#6674) 2025-04-15 23:44:35 +08:00
nocobase[bot]
149e88d141 Merge branch 'next' into develop 2025-04-15 14:55:47 +00:00
chenos
dbed7f71b0 Merge branch 'main' into next
# Conflicts:
#	packages/core/create-nocobase-app/templates/app/package.json.tpl
2025-04-15 22:54:59 +08:00
chenos
5808ee57e2
chore(deps): upgrade some dependencies to latest versions (#6673)
* chore(deps): upgrade some dependencies to latest versions

* fix: --skip-dev-dependencies

* fix: compression
2025-04-15 22:53:07 +08:00
Katherine
91207a77f1
fix: vertical scrollbar appears when iframe block is set to full height (#6675) 2025-04-15 22:50:48 +08:00
nocobase[bot]
0892a57a73 Merge branch 'next' into develop 2025-04-15 13:31:31 +00:00
Junyi
bc519a118c
fix(plugin-workflow): fix migration (#6667)
* fix(plugin-workflow): fix migration

* fix(plugin-workflow): change findOrCreate to simple logic
2025-04-15 21:31:05 +08:00
nocobase[bot]
17279bb94c Merge branch 'next' into develop 2025-04-15 08:42:21 +00:00