3663 Commits

Author SHA1 Message Date
nocobase[bot]
402c3f4b3a chore(versions): 😊 publish v1.7.0-beta.20 2025-04-18 00:52:00 +00:00
nocobase[bot]
8e36ec3611 Merge branch 'next' into develop 2025-04-17 14:42:34 +00:00
Junyi
42cbe1e1dd
fix(plugin-workflow-manual): acl (#6693)
* fix(plugin-workflow-manual): fix acl for tasks

* test(plugin-workflow-manual): add test case

* fix(plugin-workflow-manual): fix test case
2025-04-17 22:42:13 +08:00
nocobase[bot]
b04e877d31 chore(versions): 😊 publish v1.7.0-beta.19 2025-04-17 08:13:12 +00:00
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]
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]
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
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
63a842aab3
fix(plugin-workflow-manual): fix task status (#6676) 2025-04-16 09:48:48 +08: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
xilesun
58d089bcf9 fix: markdown 2025-04-15 17:11:55 +08:00
xilesun
14abd8ab4c fix: message id 2025-04-15 11:36:23 +08:00
YANG QIA
5aab0d32a3
Update packages/plugins/@nocobase/plugin-ai/src/client/ai-employees/chatbox/Conversations.tsx
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-04-15 10:38:00 +08:00
xilesun
1c0f83311f chore: update & fix 2025-04-15 10:20:47 +08:00
nocobase[bot]
eaef54083d Merge branch 'next' into develop 2025-04-15 01:07:35 +00:00
chenos
1c627ea9a4 fix: test error 2025-04-15 09:06:44 +08:00
nocobase[bot]
19281cf797 Merge branch 'next' into develop 2025-04-14 16:53:23 +00:00
nocobase[bot]
bc7af8b80f chore(versions): 😊 publish v1.7.0-beta.17 2025-04-14 16:52:54 +00:00
nocobase[bot]
094885bbc2 Merge branch 'next' into develop 2025-04-14 15:59:25 +00:00
chenos
bcc1d8aa6c fix: deps 2025-04-14 23:58:53 +08:00
nocobase[bot]
caaaffd9b6 Merge branch 'next' into develop 2025-04-14 15:38:57 +00:00
nocobase[bot]
9f14c75b8f Merge branch 'main' into next 2025-04-14 15:36:38 +00:00
nocobase[bot]
4da85db68b chore(versions): 😊 publish v1.6.20 2025-04-14 15:35:54 +00:00
nocobase[bot]
291ff5108d Merge branch 'next' into develop 2025-04-14 15:05:41 +00:00
chenos
29e2e81a6b Merge branch 'main' into next
# Conflicts:
#	packages/plugins/@nocobase/plugin-departments/package.json
#	packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTable.tsx
#	packages/plugins/@nocobase/plugin-departments/src/server/__tests__/actions.test.ts
#	packages/plugins/@nocobase/plugin-departments/src/server/__tests__/data-sync.test.ts
#	packages/plugins/@nocobase/plugin-departments/src/server/__tests__/destroy-department-check.test.ts
#	packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-department-owners.test.ts
#	packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-departments-info.test.ts
#	packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-main-department.test.ts
#	packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts
#	packages/plugins/@nocobase/plugin-field-attachment-url/package.json
#	packages/plugins/@nocobase/plugin-field-attachment-url/src/client/component/AttachmentUrl.tsx
#	packages/plugins/@nocobase/plugin-field-attachment-url/src/client/hook/index.ts
#	packages/plugins/@nocobase/plugin-field-attachment-url/src/client/interfaces/attachment-url.tsx
#	packages/plugins/@nocobase/plugin-field-attachment-url/src/server/plugin.ts
#	packages/plugins/@nocobase/plugin-workflow-response-message/package.json
#	packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/instruction.test.ts
#	packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/multiple.test.ts
#	packages/presets/nocobase/package.json
2025-04-14 23:04:58 +08:00
chenos
1db56657e8
feat: make commercial plugins free (#6663)
* feat: make commercial plugins free

* fix: rm pkg

* fix: deps

* fix: deps

* fix: deps

* fix: test error

* fix: test error

* fix: test error
2025-04-14 22:56:34 +08:00
nocobase[bot]
4b2dacab6b Merge branch 'next' into develop 2025-04-14 14:35:47 +00:00