ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into merge_from_upstream

Browse Source
This commit is contained in:
sealday 2024-03-30 02:24:40 +08:00
commit e4125ee1df
90 changed files with 257 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
CHANGELOG.md
View File

@ -7,6 +7,52 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
## [v0.21.0-alpha.1](https://github.com/nocobase/nocobase/compare/v0.20.0-alpha.17...v0.21.0-alpha.1) - 2024-03-29
### Merged
- fix: association parent request [`#3865`](https://github.com/nocobase/nocobase/pull/3865)
- test: add unit test for parseHTML [`#3870`](https://github.com/nocobase/nocobase/pull/3870)
- fix(data-vi): bug when filtering chart with assocations [`#3867`](https://github.com/nocobase/nocobase/pull/3867)
- fix: table settings get collectionField [`#3837`](https://github.com/nocobase/nocobase/pull/3837)
- refactor(plugin-workflow): add transaction check from data source [`#3857`](https://github.com/nocobase/nocobase/pull/3857)
- fix(data-vi): charts size bug when changing chart type [`#3859`](https://github.com/nocobase/nocobase/pull/3859)
- fix(server): commands failed to load properly on Windows [`#3858`](https://github.com/nocobase/nocobase/pull/3858)
- fix(LinkageRules): should work properly after the block is saved as a template [`#3855`](https://github.com/nocobase/nocobase/pull/3855)
- test: main data source e2e test [`#3816`](https://github.com/nocobase/nocobase/pull/3816)
- fix: delete field style improve [`#3820`](https://github.com/nocobase/nocobase/pull/3820)
- chore: remove add-attach option from bulk update action [`#3854`](https://github.com/nocobase/nocobase/pull/3854)
- refactor: default role & default field storage [`#3844`](https://github.com/nocobase/nocobase/pull/3844)
- refactor: linkage rule fireImmediately [`#3847`](https://github.com/nocobase/nocobase/pull/3847)
- fix: reporting error when clicking on the print button for the detail block [`#3845`](https://github.com/nocobase/nocobase/pull/3845)
- fix(data-vi): canvas height keeps increasing when filtering/reseting [`#3849`](https://github.com/nocobase/nocobase/pull/3849)
- create nocobase app unit test [`#3833`](https://github.com/nocobase/nocobase/pull/3833)
- refactor(DataBlock): details block [`#3776`](https://github.com/nocobase/nocobase/pull/3776)
- fix: client internal method (T-3711 and T-3712 and T-3713) [`#3839`](https://github.com/nocobase/nocobase/pull/3839)
- refactor(DataBlock): grid card block [`#3781`](https://github.com/nocobase/nocobase/pull/3781)
- refactor(DataBlock): filter form [`#3785`](https://github.com/nocobase/nocobase/pull/3785)
- fix: improve app manager [`#3841`](https://github.com/nocobase/nocobase/pull/3841)
- refactor(DataBlock): kanban and gantt and map and calendar [`#3792`](https://github.com/nocobase/nocobase/pull/3792)
- refactor(DataBlock): filter collapse block [`#3786`](https://github.com/nocobase/nocobase/pull/3786)
- refactor(DataBlock): table selector [`#3784`](https://github.com/nocobase/nocobase/pull/3784)
- refactor(DataBlock): list block [`#3779`](https://github.com/nocobase/nocobase/pull/3779)
- refactor(DataBlock): form block [`#3771`](https://github.com/nocobase/nocobase/pull/3771)
- fix(client): disable the default onSubmit event of the form [`#3834`](https://github.com/nocobase/nocobase/pull/3834)
- fix(data-vi): charts flickers [`#3836`](https://github.com/nocobase/nocobase/pull/3836)
- fix: acl e2e failed [`#3835`](https://github.com/nocobase/nocobase/pull/3835)
- chore: menu permissions & plugins setting permissions [`#3822`](https://github.com/nocobase/nocobase/pull/3822)
- fix: e2e-failed [`#3828`](https://github.com/nocobase/nocobase/pull/3828)
- fix: missing button icon [`#3832`](https://github.com/nocobase/nocobase/pull/3832)
- refactor: action icon [`#3831`](https://github.com/nocobase/nocobase/pull/3831)
- Optimize building tools [`#3824`](https://github.com/nocobase/nocobase/pull/3824)
- optimize ci [`#3825`](https://github.com/nocobase/nocobase/pull/3825)
### Commits
- chore(versions): 😊 publish v0.21.0-alpha.1 [`6e20ab1`](https://github.com/nocobase/nocobase/commit/6e20ab1a77303cf27debc2b851ab44bc90f107a6)
- feat: update docker config [`f2d4188`](https://github.com/nocobase/nocobase/commit/f2d4188ccf5137bf75700832052dac8292e1da12)
- chore: update changelog [`dd0538a`](https://github.com/nocobase/nocobase/commit/dd0538ae048353266f99f52fbd9f6a9de420c572)
## [v0.20.0-alpha.17](https://github.com/nocobase/nocobase/compare/v0.20.0-alpha.16...v0.20.0-alpha.17) - 2024-03-26
### Merged

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"npmClient": "yarn",
"useWorkspaces": true,
"npmClientArgs": ["--ignore-engines"],

6
packages/core/acl/package.json
View File

@ -1,13 +1,13 @@
{
"name": "@nocobase/acl",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"description": "",
"license": "Apache-2.0",
"main": "./lib/index.js",
"types": "./lib/index.d.ts",
"dependencies": {
"@nocobase/resourcer": "0.20.0-alpha.17",
"@nocobase/utils": "0.20.0-alpha.17",
"@nocobase/resourcer": "0.21.0-alpha.1",
"@nocobase/utils": "0.21.0-alpha.1",
"minimatch": "^5.1.1"
},
"repository": {

8
packages/core/actions/package.json
View File

@ -1,14 +1,14 @@
{
"name": "@nocobase/actions",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"description": "",
"license": "Apache-2.0",
"main": "./lib/index.js",
"types": "./lib/index.d.ts",
"dependencies": {
"@nocobase/cache": "0.20.0-alpha.17",
"@nocobase/database": "0.20.0-alpha.17",
"@nocobase/resourcer": "0.20.0-alpha.17"
"@nocobase/cache": "0.21.0-alpha.1",
"@nocobase/database": "0.21.0-alpha.1",
"@nocobase/resourcer": "0.21.0-alpha.1"
},
"repository": {
"type": "git",

10
packages/core/app/package.json
View File

@ -1,17 +1,17 @@
{
"name": "@nocobase/app",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"description": "",
"license": "AGPL-3.0",
"main": "./lib/index.js",
"types": "./lib/index.d.ts",
"dependencies": {
"@nocobase/database": "0.20.0-alpha.17",
"@nocobase/preset-nocobase": "0.20.0-alpha.17",
"@nocobase/server": "0.20.0-alpha.17"
"@nocobase/database": "0.21.0-alpha.1",
"@nocobase/preset-nocobase": "0.21.0-alpha.1",
"@nocobase/server": "0.21.0-alpha.1"
},
"devDependencies": {
"@nocobase/client": "0.20.0-alpha.17"
"@nocobase/client": "0.21.0-alpha.1"
},
"repository": {
"type": "git",

12
packages/core/auth/package.json
View File

@ -1,16 +1,16 @@
{
"name": "@nocobase/auth",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"description": "",
"license": "Apache-2.0",
"main": "./lib/index.js",
"types": "./lib/index.d.ts",
"dependencies": {
"@nocobase/actions": "0.20.0-alpha.17",
"@nocobase/cache": "0.20.0-alpha.17",
"@nocobase/database": "0.20.0-alpha.17",
"@nocobase/resourcer": "0.20.0-alpha.17",
"@nocobase/utils": "0.20.0-alpha.17",
"@nocobase/actions": "0.21.0-alpha.1",
"@nocobase/cache": "0.21.0-alpha.1",
"@nocobase/database": "0.21.0-alpha.1",
"@nocobase/resourcer": "0.21.0-alpha.1",
"@nocobase/utils": "0.21.0-alpha.1",
"@types/jsonwebtoken": "^8.5.8",
"jsonwebtoken": "^8.5.1"
},

2
packages/core/build/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/build",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"description": "Library build tool based on rollup.",
"main": "lib/index.js",
"types": "./lib/index.d.ts",

2
packages/core/cache/package.json vendored
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/cache",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"description": "",
"license": "Apache-2.0",
"main": "./lib/index.js",

6
packages/core/cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/cli",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"description": "",
"license": "Apache-2.0",
"main": "./src/index.js",
@ -8,7 +8,7 @@
"nocobase": "./bin/index.js"
},
"dependencies": {
"@nocobase/app": "0.20.0-alpha.17",
"@nocobase/app": "0.21.0-alpha.1",
"@types/fs-extra": "^11.0.1",
"@umijs/utils": "3.5.20",
"chalk": "^4.1.1",
@ -25,7 +25,7 @@
"tsx": "^4.6.2"
},
"devDependencies": {
"@nocobase/devtools": "0.20.0-alpha.17"
"@nocobase/devtools": "0.21.0-alpha.1"
},
"repository": {
"type": "git",

8
packages/core/client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/client",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.mjs",
@ -26,9 +26,9 @@
"@formily/reactive-react": "^2.2.27",
"@formily/shared": "^2.2.27",
"@formily/validator": "^2.2.27",
"@nocobase/evaluators": "0.20.0-alpha.17",
"@nocobase/sdk": "0.20.0-alpha.17",
"@nocobase/utils": "0.20.0-alpha.17",
"@nocobase/evaluators": "0.21.0-alpha.1",
"@nocobase/sdk": "0.21.0-alpha.1",
"@nocobase/utils": "0.21.0-alpha.1",
"ahooks": "^3.7.2",
"antd": "^5.12.8",
"antd-style": "3.4.5",

2
packages/core/create-nocobase-app/package.json
View File

@ -1,6 +1,6 @@
{
"name": "create-nocobase-app",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "src/index.js",
"license": "Apache-2.0",
"dependencies": {

12
packages/core/data-source-manager/package.json
View File

@ -1,16 +1,16 @@
{
"name": "@nocobase/data-source-manager",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"description": "",
"license": "Apache-2.0",
"main": "./lib/index.js",
"types": "./lib/index.d.ts",
"dependencies": {
"@nocobase/actions": "0.20.0-alpha.17",
"@nocobase/cache": "0.20.0-alpha.17",
"@nocobase/database": "0.20.0-alpha.17",
"@nocobase/resourcer": "0.20.0-alpha.17",
"@nocobase/utils": "0.20.0-alpha.17",
"@nocobase/actions": "0.21.0-alpha.1",
"@nocobase/cache": "0.21.0-alpha.1",
"@nocobase/database": "0.21.0-alpha.1",
"@nocobase/resourcer": "0.21.0-alpha.1",
"@nocobase/utils": "0.21.0-alpha.1",
"@types/jsonwebtoken": "^8.5.8",
"jsonwebtoken": "^8.5.1"
},

6
packages/core/database/package.json
View File

@ -1,13 +1,13 @@
{
"name": "@nocobase/database",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"description": "",
"main": "./lib/index.js",
"types": "./lib/index.d.ts",
"license": "Apache-2.0",
"dependencies": {
"@nocobase/logger": "0.20.0-alpha.17",
"@nocobase/utils": "0.20.0-alpha.17",
"@nocobase/logger": "0.21.0-alpha.1",
"@nocobase/utils": "0.21.0-alpha.1",
"async-mutex": "^0.3.2",
"chalk": "^4.1.1",
"cron-parser": "4.4.0",

8
packages/core/devtools/package.json
View File

@ -1,13 +1,13 @@
{
"name": "@nocobase/devtools",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"description": "",
"license": "Apache-2.0",
"main": "./src/index.js",
"dependencies": {
"@nocobase/build": "0.20.0-alpha.17",
"@nocobase/client": "0.20.0-alpha.17",
"@nocobase/test": "0.20.0-alpha.17",
"@nocobase/build": "0.21.0-alpha.1",
"@nocobase/client": "0.21.0-alpha.1",
"@nocobase/test": "0.21.0-alpha.1",
"@types/koa": "^2.13.4",
"@types/koa-bodyparser": "^4.3.4",
"@types/lodash": "^4.14.177",

4
packages/core/evaluators/package.json
View File

@ -1,13 +1,13 @@
{
"name": "@nocobase/evaluators",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"description": "",
"main": "./lib/index.js",
"types": "./lib/index.d.ts",
"license": "Apache-2.0",
"dependencies": {
"@formulajs/formulajs": "4.2.0",
"@nocobase/utils": "0.20.0-alpha.17",
"@nocobase/utils": "0.21.0-alpha.1",
"mathjs": "^10.6.0"
},
"repository": {

2
packages/core/logger/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/logger",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"description": "nocobase logging library",
"license": "Apache-2.0",
"main": "./lib/index.js",

4
packages/core/resourcer/package.json
View File

@ -1,12 +1,12 @@
{
"name": "@nocobase/resourcer",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"description": "",
"main": "./lib/index.js",
"types": "./lib/index.d.ts",
"license": "Apache-2.0",
"dependencies": {
"@nocobase/utils": "0.20.0-alpha.17",
"@nocobase/utils": "0.21.0-alpha.1",
"deepmerge": "^4.2.2",
"koa-compose": "^4.1.0",
"lodash": "^4.17.21",

2
packages/core/sdk/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/sdk",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "Apache-2.0",
"main": "lib/index.js",
"types": "lib/index.d.ts",

26
packages/core/server/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/server",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "lib/index.js",
"types": "./lib/index.d.ts",
"license": "Apache-2.0",
@ -10,18 +10,18 @@
"@koa/cors": "^3.1.0",
"@koa/multer": "^3.0.2",
"@koa/router": "^9.4.0",
"@nocobase/acl": "0.20.0-alpha.17",
"@nocobase/actions": "0.20.0-alpha.17",
"@nocobase/auth": "0.20.0-alpha.17",
"@nocobase/cache": "0.20.0-alpha.17",
"@nocobase/data-source-manager": "0.20.0-alpha.17",
"@nocobase/database": "0.20.0-alpha.17",
"@nocobase/evaluators": "0.20.0-alpha.17",
"@nocobase/logger": "0.20.0-alpha.17",
"@nocobase/resourcer": "0.20.0-alpha.17",
"@nocobase/sdk": "0.20.0-alpha.17",
"@nocobase/telemetry": "0.20.0-alpha.17",
"@nocobase/utils": "0.20.0-alpha.17",
"@nocobase/acl": "0.21.0-alpha.1",
"@nocobase/actions": "0.21.0-alpha.1",
"@nocobase/auth": "0.21.0-alpha.1",
"@nocobase/cache": "0.21.0-alpha.1",
"@nocobase/data-source-manager": "0.21.0-alpha.1",
"@nocobase/database": "0.21.0-alpha.1",
"@nocobase/evaluators": "0.21.0-alpha.1",
"@nocobase/logger": "0.21.0-alpha.1",
"@nocobase/resourcer": "0.21.0-alpha.1",
"@nocobase/sdk": "0.21.0-alpha.1",
"@nocobase/telemetry": "0.21.0-alpha.1",
"@nocobase/utils": "0.21.0-alpha.1",
"@types/decompress": "4.2.4",
"@types/ini": "^1.3.31",
"@types/koa-send": "^4.1.3",

4
packages/core/telemetry/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/telemetry",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"description": "nocobase telemetry library",
"license": "Apache-2.0",
"main": "./lib/index.js",
@ -11,7 +11,7 @@
"directory": "packages/telemetry"
},
"dependencies": {
"@nocobase/utils": "0.20.0-alpha.17",
"@nocobase/utils": "0.21.0-alpha.1",
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/instrumentation": "^0.46.0",
"@opentelemetry/resources": "^1.19.0",

6
packages/core/test/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/test",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "lib/index.js",
"module": "./src/index.ts",
"types": "./lib/index.d.ts",
@ -41,12 +41,12 @@
},
"dependencies": {
"@faker-js/faker": "8.1.0",
"@nocobase/server": "0.20.0-alpha.17",
"@nocobase/server": "0.21.0-alpha.1",
"@playwright/test": "^1.42.1",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.0.0",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "^14.4.3",
"@testing-library/jest-dom": "^6.4.2",
"@types/supertest": "^2.0.11",
"@vitejs/plugin-react": "^4.0.0",
"jsdom": "^16.0.0",

2
packages/core/utils/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/utils",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "lib/index.js",
"types": "./lib/index.d.ts",
"license": "Apache-2.0",

2
packages/plugins/@nocobase/plugin-acl/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "权限控制",
"description": "Based on roles, resources, and actions, access control can precisely manage interface configuration permissions, data operation permissions, menu access permissions, and plugin permissions.",
"description.zh-CN": "基于角色、资源和操作的权限控制，可以精确控制界面配置权限、数据操作权限、菜单访问权限、插件权限。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/acl",

2
packages/plugins/@nocobase/plugin-action-bulk-edit/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-action-bulk-edit",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/action-bulk-edit",
"homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-bulk-edit",

2
packages/plugins/@nocobase/plugin-action-bulk-update/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-action-bulk-update",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/action-bulk-update",
"homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-bulk-update",

2
packages/plugins/@nocobase/plugin-action-duplicate/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-action-duplicate",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/action-duplicate",
"homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-duplicate",

2
packages/plugins/@nocobase/plugin-action-print/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-action-print",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/action-print",
"homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-print",

2
packages/plugins/@nocobase/plugin-api-doc/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-api-doc",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"displayName": "API documentation",
"displayName.zh-CN": "API 文档",
"description": "An OpenAPI documentation generator for NocoBase HTTP API.",

2
packages/plugins/@nocobase/plugin-api-keys/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "认证：API 密钥",
"description": "Allows users to use API key to access application's HTTP API",
"description.zh-CN": "允许用户使用 API 密钥访问应用的 HTTP API",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/api-keys",

2
packages/plugins/@nocobase/plugin-audit-logs/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-audit-logs",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"displayName": "Audit logs (deprecated)",
"displayName.zh-CN": "审计日志（废弃）",
"description": "This plugin is deprecated. There will be a new audit log plugin in the future.",

2
packages/plugins/@nocobase/plugin-auth/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-auth",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/auth",
"homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/auth",

2
packages/plugins/@nocobase/plugin-backup-restore/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "应用的备份与还原",
"description": "Backup and restore applications for scenarios such as application replication, migration, and upgrades.",
"description.zh-CN": "备份和还原应用，可用于应用的复制、迁移、升级等场景。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/backup-restore",

2
packages/plugins/@nocobase/plugin-calendar/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-calendar",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"displayName": "Calendar",
"displayName.zh-CN": "日历",
"description": "Provides callendar collection template and block for managing date data, typically for date/time related information such as events, appointments, tasks, and so on.",

2
packages/plugins/@nocobase/plugin-cas/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "认证：CAS",
"description": "CAS authentication.",
"description.zh-CN": "通过 CAS 协议认证身份。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/auth-cas",

2
packages/plugins/@nocobase/plugin-charts/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "图表（废弃）",
"description": "The plugin has been deprecated, please use the data visualization plugin instead.",
"description.zh-CN": "已废弃插件，请使用数据可视化插件代替。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "./dist/server/index.js",
"license": "AGPL-3.0",
"devDependencies": {

2
packages/plugins/@nocobase/plugin-china-region/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-china-region",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"displayName": "Administrative divisions of China",
"displayName.zh-CN": "中国行政区划",
"description": "Provides data and field type for administrative divisions of China.",

2
packages/plugins/@nocobase/plugin-client/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "WEB 客户端",
"description": "Provides a client interface for the NocoBase server",
"description.zh-CN": "为 NocoBase 服务端提供客户端界面",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "./dist/server/index.js",
"license": "AGPL-3.0",
"devDependencies": {

2
packages/plugins/@nocobase/plugin-collection-manager/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "数据源：主数据库",
"description": "NocoBase main database, supports relational databases such as MySQL, PostgreSQL, SQLite and so on.",
"description.zh-CN": "NocoBase 主数据库，支持 MySQL、PostgreSQL、SQLite 等关系型数据库。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/data-source-main",
"homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/data-source-main",

2
packages/plugins/@nocobase/plugin-custom-request/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-custom-request",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/action-custom-request",
"homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-custom-request",

2
packages/plugins/@nocobase/plugin-data-source-manager/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-data-source-manager",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "dist/server/index.js",
"displayName": "Data source manager",
"displayName.zh-CN": "数据源管理",

2
packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditCollectionAction.tsx
View File

@ -69,7 +69,7 @@ const getSchema = (schema: IField, record: any, compile, getContainer): ISchema
'x-decorator': 'FormItem',
'x-component': 'Select',
enum: '{{filterTargetKeyOptions}}',
'x-visible': '{{isView}}',
'x-visible': '{{!!isView}}',
},
footer: {
type: 'void',

2
packages/plugins/@nocobase/plugin-data-visualization/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-data-visualization",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"displayName": "Data visualization",
"displayName.zh-CN": "数据可视化",
"description": "Provides data visualization feature, including chart block and chart filter block, support line charts, area charts, bar charts and more than a dozen kinds of charts, you can also extend more chart types.",

2
packages/plugins/@nocobase/plugin-disable-pm-add/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-disable-pm-add",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "./dist/server/index.js",
"peerDependencies": {
"@nocobase/client": "0.x",

2
packages/plugins/@nocobase/plugin-error-handler/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "错误处理器",
"description": "Handling application errors and exceptions.",
"description.zh-CN": "处理应用程序中的错误和异常。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"devDependencies": {

2
packages/plugins/@nocobase/plugin-excel-formula-field/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-excel-formula-field",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"description": "",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",

2
packages/plugins/@nocobase/plugin-export/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "操作：导出记录",
"description": "Export filtered records to excel, you can configure which fields to export.",
"description.zh-CN": "导出筛选后的记录到 Excel 中，可以配置导出哪些字段。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/action-export",

2
packages/plugins/@nocobase/plugin-file-manager/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-file-manager",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"displayName": "File manager",
"displayName.zh-CN": "文件管理器",
"description": "Provides files storage services with files collection template and attachment field.",

2
packages/plugins/@nocobase/plugin-formula-field/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "数据表字段：公式",
"description": "Configure and store the results of calculations between multiple field values in the same record, supporting both Math.js and Excel formula functions.",
"description.zh-CN": "可以配置并存储同一条记录的多字段值之间的计算结果，支持 Math.js 和 Excel formula functions 两种引擎",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/field-formula",

2
packages/plugins/@nocobase/plugin-gantt/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-gantt",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"displayName": "Block: Gantt",
"displayName.zh-CN": "区块：甘特图",
"description": "Provides Gantt block.",

2
packages/plugins/@nocobase/plugin-graph-collection-manager/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "可视化数据表管理",
"description": "An ER diagram-like tool. Currently only the Master database is supported.",
"description.zh-CN": "类似 ER 图的工具，目前只支持主数据库。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/graph-collection-manager",

2
packages/plugins/@nocobase/plugin-iframe-block/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "区块：iframe",
"description": "Create an iframe block on the page to embed and display external web pages or content.",
"description.zh-CN": "在页面上创建和管理iframe，用于嵌入和展示外部网页或内容。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/block-iframe",

2
packages/plugins/@nocobase/plugin-import/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "操作：导入记录",
"description": "Import records using excel templates. You can configure which fields to import and templates will be generated automatically.",
"description.zh-CN": "使用 Excel 模板导入数据，可以配置导入哪些字段，自动生成模板。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/action-import",

2
packages/plugins/@nocobase/plugin-kanban/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-kanban",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/block-kanban",
"homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/block-kanban",

7
packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.tsx
View File

@ -24,7 +24,14 @@ export const KanbanCard: any = observer(
<SchemaComponentOptions components={{}} scope={{}}>
<Card
onClick={(e) => {
const targetElement = e.target as Element; // 将事件目标转换为Element类型
const currentTargetElement = e.currentTarget as Element;
if (currentTargetElement.contains(targetElement)) {
setVisible(true);
e.stopPropagation();
} else {
e.stopPropagation();
}
}}
bordered={false}
hoverable

2
packages/plugins/@nocobase/plugin-localization-management/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-localization-management",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/localization-management",
"homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/localization-management",

2
packages/plugins/@nocobase/plugin-logger/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "日志",
"description": "Server-side logs, mainly including API request logs and system runtime logs, and allows to package and download log files.",
"description.zh-CN": "服务端日志，主要包括接口请求日志和系统运行日志，并支持打包和下载日志文件。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/logger",

2
packages/plugins/@nocobase/plugin-map/package.json
View File

@ -2,7 +2,7 @@
"name": "@nocobase/plugin-map",
"displayName": "Block: Map",
"displayName.zh-CN": "区块：地图",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"description": "Map block, support Gaode map and Google map, you can also extend more map types.",
"description.zh-CN": "地图区块，支持高德地图和 Google 地图，你也可以扩展更多地图类型。",
"license": "AGPL-3.0",

2
packages/plugins/@nocobase/plugin-math-formula-field/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "数学公式字段",
"description": "A powerful mathematical formula field plugin designed to provide flexible mathematical and formula calculation capabilities for databases or data management systems. It seamlessly integrates with various database systems such as MySQL, PostgreSQL, and offers an intuitive user interface for defining and executing mathematical formula fields.",
"description.zh-CN": "一个功能强大的数学公式字段插件，旨在为数据库或数据管理系统提供灵活的数学计算和公式计算功能。它可以与各种数据库系统（如MySQL、PostgreSQL）无缝集成，并提供直观的用户界面来定义和执行数学公式字段。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"devDependencies": {

2
packages/plugins/@nocobase/plugin-mobile-client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-mobile-client",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/mobile-client",
"homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/mobile-client",

2
packages/plugins/@nocobase/plugin-mock-collections/package.json
View File

@ -2,7 +2,7 @@
"name": "@nocobase/plugin-mock-collections",
"displayName": "mock-collections",
"description": "mock-collections",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "./dist/server/index.js",
"license": "AGPL-3.0",
"peerDependencies": {

2
packages/plugins/@nocobase/plugin-multi-app-manager/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "多应用管理器",
"description": "Dynamically create multiple apps without separate deployments.",
"description.zh-CN": "无需单独部署即可动态创建多个应用。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/multi-app-manager",

2
packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "多应用数据表共享",
"description": "",
"description.zh-CN": "",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "./dist/server/index.js",
"devDependencies": {
"@formily/react": "2.x",

2
packages/plugins/@nocobase/plugin-notifications/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-notifications",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"description": "",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",

2
packages/plugins/@nocobase/plugin-oidc/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "认证：OIDC",
"description": "OIDC (OpenID Connect) authentication.",
"description.zh-CN": "通过 OIDC (OpenID Connect) 协议认证身份。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/auth-oidc",

2
packages/plugins/@nocobase/plugin-saml/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "认证：SAML 2.0",
"description": "SAML 2.0 authentication.",
"description.zh-CN": "通过 SAML 2.0 协议认证身份。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/auth-saml",

2
packages/plugins/@nocobase/plugin-sample-hello/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-sample-hello",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "./dist/server/index.js",
"displayName": "Hello",
"displayName.zh-CN": "Hello",

2
packages/plugins/@nocobase/plugin-sequence-field/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "数据表字段：自动编码",
"description": "Automatically generate codes based on configured rules, supporting combinations of dates, numbers, and text.",
"description.zh-CN": "根据配置的规则自动生成编码，支持日期、数字、文本的组合。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/field-sequence",

2
packages/plugins/@nocobase/plugin-sms-auth/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "认证：短信",
"description": "SMS authentication.",
"description.zh-CN": "通过短信验证码认证身份。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/auth-sms",
"homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/auth-sms",

2
packages/plugins/@nocobase/plugin-snapshot-field/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "数据表字段：关系快照",
"description": "When adding a new record, create a snapshot for its relational record and save in the new record. The snapshot will not be updated when the relational record is updated.",
"description.zh-CN": "在添加数据时，为它的关系数据创建快照，并保存在当前的数据中。关系数据更新时，快照不会更新。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/field-snapshot",

2
packages/plugins/@nocobase/plugin-system-settings/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "系统设置",
"description": "Used to adjust the system title, logo, language, etc.",
"description.zh-CN": "用于调整系统的标题、LOGO、语言等。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/system-settings",

2
packages/plugins/@nocobase/plugin-theme-editor/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@nocobase/plugin-theme-editor",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"main": "dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/theme-editor",
"homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/theme-editor",

2
packages/plugins/@nocobase/plugin-ui-routes-storage/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "路由管理",
"description": "manage the routes of nocobase",
"description.zh-CN": "管理页面路由。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"devDependencies": {

2
packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "UI schema 存储服务",
"description": "Provides centralized UI schema storage service.",
"description.zh-CN": "提供中心化的 UI schema 存储服务。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/ui-schema-storage",

2
packages/plugins/@nocobase/plugin-users/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "用户",
"description": "Provides basic user model, as well as created by and updated by fields.",
"description.zh-CN": "提供了基础的用户模型，以及创建人和最后更新人字段。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/users",

2
packages/plugins/@nocobase/plugin-verification/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "验证码",
"description": "verification setting.",
"description.zh-CN": "验证码配置。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/verification",

2
packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "工作流：数据操作触发器",
"description": "Bind action buttons to trigger workflow events when clicked.",
"description.zh-CN": "可对数据操作按钮绑定，在点击后触发对应的工作流事件。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/plugins/workflow-action-trigger",

2
packages/plugins/@nocobase/plugin-workflow-aggregate/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "工作流：聚合查询节点",
"description": "Used to aggregate data against the database in workflow, such as: statistics, sum, average, etc.",
"description.zh-CN": "可用于在工作流中对数据库进行聚合查询，如：统计数量、求和、平均值等。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/workflow-aggregate",

2
packages/plugins/@nocobase/plugin-workflow-delay/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "工作流：延时节点",
"description": "Could be used in workflow parallel branch for waiting other branches.",
"description.zh-CN": "可用于工作流并行分支中等待其他分支执行完成。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/workflow-delay",

2
packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "工作流：动态表达式计算节点",
"description": "Useful plugin for doing dynamic calculation based on expression collection records in workflow.",
"description.zh-CN": "用于在工作流中进行基于数据行的动态表达式计算。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/workflow-dynamic-calculation",

2
packages/plugins/@nocobase/plugin-workflow-loop/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "工作流：循环节点",
"description": "Used to repeat the sub-process processing of each value in an array, and can also be used for fixed times of sub-process processing.",
"description.zh-CN": "用于对一个数组中的每个值进行重复的子流程处理，也可用于固定次数的重复子流程处理。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/workflow-loop",

2
packages/plugins/@nocobase/plugin-workflow-manual/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "工作流：人工处理节点",
"description": "Could be used for workflows which some of decisions are made by users.",
"description.zh-CN": "用于人工控制部分决策的流程。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/workflow-manual",

2
packages/plugins/@nocobase/plugin-workflow-parallel/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "工作流：并行分支节点",
"description": "Could be used for parallel execution of branch processes in the workflow.",
"description.zh-CN": "用于在工作流中需要并行执行的分支流程。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/workflow-parallel",

2
packages/plugins/@nocobase/plugin-workflow-request/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "工作流：HTTP 请求节点",
"description": "Send HTTP requests to any HTTP service for data interaction in workflow.",
"description.zh-CN": "可用于在工作流中向任意 HTTP 服务发送请求，进行数据交互。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/workflow-request",

2
packages/plugins/@nocobase/plugin-workflow-sql/package.json
View File

@ -4,7 +4,7 @@
"displayName.zh-CN": "工作流：SQL 节点",
"description": "Execute SQL statements in workflow.",
"description.zh-CN": "可用于在工作流中对数据库执行任意 SQL 语句。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/workflow-sql",

2
packages/plugins/@nocobase/plugin-workflow-test/package.json
View File

@ -2,7 +2,7 @@
"name": "@nocobase/plugin-workflow-test",
"displayName": "Workflow: test kit",
"displayName.zh-CN": "工作流：测试工具包",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "dist/server/index.js",
"types": "./dist/server/index.d.ts",

4
packages/plugins/@nocobase/plugin-workflow/package.json
View File

@ -4,13 +4,13 @@
"displayName.zh-CN": "工作流",
"description": "A powerful BPM tool that provides foundational support for business automation, with the capability to extend unlimited triggers and nodes.",
"description.zh-CN": "一个强大的 BPM 工具，为业务自动化提供基础支持，并且可任意扩展更多的触发器和节点。",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"homepage": "https://docs.nocobase.com/handbook/workflow",
"homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/workflow",
"dependencies": {
"@nocobase/plugin-workflow-test": "0.20.0-alpha.17"
"@nocobase/plugin-workflow-test": "0.21.0-alpha.1"
},
"devDependencies": {
"@ant-design/icons": "5.x",

4
packages/plugins/@nocobase/plugin-workflow/src/server/instructions/CreateInstruction.ts
View File

@ -11,7 +11,7 @@ export class CreateInstruction extends Instruction {
const { collection, params: { appends = [], ...params } = {} } = node.config;
const [dataSourceName, collectionName] = parseCollectionName(collection);
const { repository, model } = this.workflow.app.dataSourceManager.dataSources
const { repository, filterTargetKey } = this.workflow.app.dataSourceManager.dataSources
.get(dataSourceName)
.collectionManager.getCollection(collectionName);
const options = processor.getParsedValue(params, node.id);
@ -33,7 +33,7 @@ export class CreateInstruction extends Instruction {
return set;
}, new Set());
result = await repository.findOne({
filterByTk: created[model.primaryKeyAttribute],
filterByTk: created[filterTargetKey],
appends: Array.from(includeFields),
transaction,
});

6
packages/plugins/@nocobase/plugin-workflow/src/server/triggers/CollectionTrigger.ts
View File

@ -42,7 +42,7 @@ async function handler(this: CollectionTrigger, workflow: WorkflowModel, data: M
.get(dataSourceName)
.collectionManager.getCollection(collectionName);
const { transaction, context } = options;
const { repository, model } = collection;
const { repository, filterTargetKey } = collection;
// NOTE: if no configured fields changed, do not trigger
if (
@ -62,7 +62,7 @@ async function handler(this: CollectionTrigger, workflow: WorkflowModel, data: M
// const calculation = toCalculation(condition);
const count = await repository.count({
filter: {
$and: [condition, { [model.primaryKeyAttribute]: data[model.primaryKeyAttribute] }],
$and: [condition, { [filterTargetKey]: data[filterTargetKey] }],
},
context,
transaction,
@ -82,7 +82,7 @@ async function handler(this: CollectionTrigger, workflow: WorkflowModel, data: M
return set;
}, new Set());
result = await repository.findOne({
filterByTk: data[model.primaryKeyAttribute],
filterByTk: data[filterTargetKey],
appends: Array.from(includeFields),
transaction,
});

14
packages/plugins/@nocobase/plugin-workflow/src/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.ts
View File

@ -283,8 +283,11 @@ export default class ScheduleTrigger {
}
schedule(workflow: WorkflowModel, record, nextTime, toggle = true, options = {}) {
const { model } = this.workflow.app.db.getCollection(workflow.config.collection);
const recordPk = record.get(model.primaryKeyAttribute);
const [dataSourceName, collectionName] = parseCollectionName(workflow.config.collection);
const { filterTargetKey } = this.workflow.app.dataSourceManager.dataSources
.get(dataSourceName)
.collectionManager.getCollection(collectionName);
const recordPk = record.get(filterTargetKey);
if (toggle) {
const nextInterval = Math.max(0, nextTime - Date.now());
const key = `${workflow.id}:${recordPk}@${nextTime}`;
@ -307,8 +310,11 @@ export default class ScheduleTrigger {
}
async trigger(workflow: WorkflowModel, record, nextTime, { transaction }: Transactionable = {}) {
const { repository, model } = this.workflow.app.db.getCollection(workflow.config.collection);
const recordPk = record.get(model.primaryKeyAttribute);
const [dataSourceName, collectionName] = parseCollectionName(workflow.config.collection);
const { repository, filterTargetKey } = this.workflow.app.dataSourceManager.dataSources
.get(dataSourceName)
.collectionManager.getCollection(collectionName);
const recordPk = record.get(filterTargetKey);
const data = await repository.findOne({
filterByTk: recordPk,
appends: workflow.config.appends,

114
packages/presets/nocobase/package.json
View File

@ -1,66 +1,66 @@
{
"name": "@nocobase/preset-nocobase",
"version": "0.20.0-alpha.17",
"version": "0.21.0-alpha.1",
"license": "AGPL-3.0",
"main": "./lib/server/index.js",
"dependencies": {
"@formily/json-schema": "2.x",
"@nocobase/plugin-acl": "0.20.0-alpha.17",
"@nocobase/plugin-action-bulk-edit": "0.20.0-alpha.17",
"@nocobase/plugin-action-bulk-update": "0.20.0-alpha.17",
"@nocobase/plugin-action-duplicate": "0.20.0-alpha.17",
"@nocobase/plugin-action-print": "0.20.0-alpha.17",
"@nocobase/plugin-api-doc": "0.20.0-alpha.17",
"@nocobase/plugin-api-keys": "0.20.0-alpha.17",
"@nocobase/plugin-audit-logs": "0.20.0-alpha.17",
"@nocobase/plugin-auth": "0.20.0-alpha.17",
"@nocobase/plugin-backup-restore": "0.20.0-alpha.17",
"@nocobase/plugin-calendar": "0.20.0-alpha.17",
"@nocobase/plugin-cas": "0.20.0-alpha.17",
"@nocobase/plugin-charts": "0.20.0-alpha.17",
"@nocobase/plugin-china-region": "0.20.0-alpha.17",
"@nocobase/plugin-client": "0.20.0-alpha.17",
"@nocobase/plugin-collection-manager": "0.20.0-alpha.17",
"@nocobase/plugin-custom-request": "0.20.0-alpha.17",
"@nocobase/plugin-data-source-manager": "0.20.0-alpha.17",
"@nocobase/plugin-data-visualization": "0.20.0-alpha.17",
"@nocobase/plugin-error-handler": "0.20.0-alpha.17",
"@nocobase/plugin-export": "0.20.0-alpha.17",
"@nocobase/plugin-file-manager": "0.20.0-alpha.17",
"@nocobase/plugin-formula-field": "0.20.0-alpha.17",
"@nocobase/plugin-gantt": "0.20.0-alpha.17",
"@nocobase/plugin-graph-collection-manager": "0.20.0-alpha.17",
"@nocobase/plugin-iframe-block": "0.20.0-alpha.17",
"@nocobase/plugin-import": "0.20.0-alpha.17",
"@nocobase/plugin-kanban": "0.20.0-alpha.17",
"@nocobase/plugin-localization-management": "0.20.0-alpha.17",
"@nocobase/plugin-logger": "0.20.0-alpha.17",
"@nocobase/plugin-map": "0.20.0-alpha.17",
"@nocobase/plugin-mobile-client": "0.20.0-alpha.17",
"@nocobase/plugin-mock-collections": "0.20.0-alpha.17",
"@nocobase/plugin-multi-app-manager": "0.20.0-alpha.17",
"@nocobase/plugin-multi-app-share-collection": "0.20.0-alpha.17",
"@nocobase/plugin-oidc": "0.20.0-alpha.17",
"@nocobase/plugin-saml": "0.20.0-alpha.17",
"@nocobase/plugin-sequence-field": "0.20.0-alpha.17",
"@nocobase/plugin-sms-auth": "0.20.0-alpha.17",
"@nocobase/plugin-snapshot-field": "0.20.0-alpha.17",
"@nocobase/plugin-system-settings": "0.20.0-alpha.17",
"@nocobase/plugin-theme-editor": "0.20.0-alpha.17",
"@nocobase/plugin-ui-schema-storage": "0.20.0-alpha.17",
"@nocobase/plugin-users": "0.20.0-alpha.17",
"@nocobase/plugin-verification": "0.20.0-alpha.17",
"@nocobase/plugin-workflow": "0.20.0-alpha.17",
"@nocobase/plugin-workflow-action-trigger": "0.20.0-alpha.17",
"@nocobase/plugin-workflow-aggregate": "0.20.0-alpha.17",
"@nocobase/plugin-workflow-delay": "0.20.0-alpha.17",
"@nocobase/plugin-workflow-dynamic-calculation": "0.20.0-alpha.17",
"@nocobase/plugin-workflow-loop": "0.20.0-alpha.17",
"@nocobase/plugin-workflow-manual": "0.20.0-alpha.17",
"@nocobase/plugin-workflow-parallel": "0.20.0-alpha.17",
"@nocobase/plugin-workflow-request": "0.20.0-alpha.17",
"@nocobase/plugin-workflow-sql": "0.20.0-alpha.17",
"@nocobase/server": "0.20.0-alpha.17",
"@nocobase/plugin-acl": "0.21.0-alpha.1",
"@nocobase/plugin-action-bulk-edit": "0.21.0-alpha.1",
"@nocobase/plugin-action-bulk-update": "0.21.0-alpha.1",
"@nocobase/plugin-action-duplicate": "0.21.0-alpha.1",
"@nocobase/plugin-action-print": "0.21.0-alpha.1",
"@nocobase/plugin-api-doc": "0.21.0-alpha.1",
"@nocobase/plugin-api-keys": "0.21.0-alpha.1",
"@nocobase/plugin-audit-logs": "0.21.0-alpha.1",
"@nocobase/plugin-auth": "0.21.0-alpha.1",
"@nocobase/plugin-backup-restore": "0.21.0-alpha.1",
"@nocobase/plugin-calendar": "0.21.0-alpha.1",
"@nocobase/plugin-cas": "0.21.0-alpha.1",
"@nocobase/plugin-charts": "0.21.0-alpha.1",
"@nocobase/plugin-china-region": "0.21.0-alpha.1",
"@nocobase/plugin-client": "0.21.0-alpha.1",
"@nocobase/plugin-collection-manager": "0.21.0-alpha.1",
"@nocobase/plugin-custom-request": "0.21.0-alpha.1",
"@nocobase/plugin-data-source-manager": "0.21.0-alpha.1",
"@nocobase/plugin-data-visualization": "0.21.0-alpha.1",
"@nocobase/plugin-error-handler": "0.21.0-alpha.1",
"@nocobase/plugin-export": "0.21.0-alpha.1",
"@nocobase/plugin-file-manager": "0.21.0-alpha.1",
"@nocobase/plugin-formula-field": "0.21.0-alpha.1",
"@nocobase/plugin-gantt": "0.21.0-alpha.1",
"@nocobase/plugin-graph-collection-manager": "0.21.0-alpha.1",
"@nocobase/plugin-iframe-block": "0.21.0-alpha.1",
"@nocobase/plugin-import": "0.21.0-alpha.1",
"@nocobase/plugin-kanban": "0.21.0-alpha.1",
"@nocobase/plugin-localization-management": "0.21.0-alpha.1",
"@nocobase/plugin-logger": "0.21.0-alpha.1",
"@nocobase/plugin-map": "0.21.0-alpha.1",
"@nocobase/plugin-mobile-client": "0.21.0-alpha.1",
"@nocobase/plugin-mock-collections": "0.21.0-alpha.1",
"@nocobase/plugin-multi-app-manager": "0.21.0-alpha.1",
"@nocobase/plugin-multi-app-share-collection": "0.21.0-alpha.1",
"@nocobase/plugin-oidc": "0.21.0-alpha.1",
"@nocobase/plugin-saml": "0.21.0-alpha.1",
"@nocobase/plugin-sequence-field": "0.21.0-alpha.1",
"@nocobase/plugin-sms-auth": "0.21.0-alpha.1",
"@nocobase/plugin-snapshot-field": "0.21.0-alpha.1",
"@nocobase/plugin-system-settings": "0.21.0-alpha.1",
"@nocobase/plugin-theme-editor": "0.21.0-alpha.1",
"@nocobase/plugin-ui-schema-storage": "0.21.0-alpha.1",
"@nocobase/plugin-users": "0.21.0-alpha.1",
"@nocobase/plugin-verification": "0.21.0-alpha.1",
"@nocobase/plugin-workflow": "0.21.0-alpha.1",
"@nocobase/plugin-workflow-action-trigger": "0.21.0-alpha.1",
"@nocobase/plugin-workflow-aggregate": "0.21.0-alpha.1",
"@nocobase/plugin-workflow-delay": "0.21.0-alpha.1",
"@nocobase/plugin-workflow-dynamic-calculation": "0.21.0-alpha.1",
"@nocobase/plugin-workflow-loop": "0.21.0-alpha.1",
"@nocobase/plugin-workflow-manual": "0.21.0-alpha.1",
"@nocobase/plugin-workflow-parallel": "0.21.0-alpha.1",
"@nocobase/plugin-workflow-request": "0.21.0-alpha.1",
"@nocobase/plugin-workflow-sql": "0.21.0-alpha.1",
"@nocobase/server": "0.21.0-alpha.1",
"cronstrue": "^2.11.0"
},
"repository": {