diff --git a/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml index 34abcb336f..2c5378b214 100644 --- a/.github/workflows/manual-release.yml +++ b/.github/workflows/manual-release.yml @@ -6,6 +6,10 @@ concurrency: on: workflow_dispatch: + inputs: + is_feat: + description: 'is feat' + type: boolean jobs: push-commit: @@ -78,7 +82,7 @@ jobs: echo "packages/pro-plugins/" >> .git/info/exclude bash release.sh $IS_FEAT env: - IS_FEAT: false + IS_FEAT: ${{ inputs.is_feat && '--is-feat' || '' }} - name: push pro plugins continue-on-error: true uses: ad-m/github-push-action@master diff --git a/CHANGELOG.md b/CHANGELOG.md index 15be8db37d..f75b7f6293 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,137 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +## [v1.3.0-beta](https://github.com/nocobase/nocobase/compare/v1.2.39-alpha...v1.3.0-beta) - 2024-08-25 + +### Merged + +- feat(plugin-workflow-mailer): add variables [`#5120`](https://github.com/nocobase/nocobase/pull/5120) +- feat(client): add constant props api for variable input [`#5116`](https://github.com/nocobase/nocobase/pull/5116) +- fix(data-vi): add size settings for pie, bar and dualAxes [`#5113`](https://github.com/nocobase/nocobase/pull/5113) +- fix(mobile): avoid crashing [`#5109`](https://github.com/nocobase/nocobase/pull/5109) +- fix(varaible): resolve error on template block submission [`#5103`](https://github.com/nocobase/nocobase/pull/5103) +- feat: allows to filter child nodes in tree table blocks [`#5096`](https://github.com/nocobase/nocobase/pull/5096) +- feat: allow to set distinct for query measures [`#5091`](https://github.com/nocobase/nocobase/pull/5091) +- feat(kanban): add support for opening via URL [`#5083`](https://github.com/nocobase/nocobase/pull/5083) +- feat: create file record via path [`#5088`](https://github.com/nocobase/nocobase/pull/5088) +- refactor: update Chinese translation for "Style" [`#5078`](https://github.com/nocobase/nocobase/pull/5078) +- fix: resolve tab switching issue [`#5081`](https://github.com/nocobase/nocobase/pull/5081) +- fix(kanban): correct componentType to 'Kanban' [`#5080`](https://github.com/nocobase/nocobase/pull/5080) +- refactor: markdown rendering engine [`#5079`](https://github.com/nocobase/nocobase/pull/5079) +- fix(embed): fix the problem that switching tabs doesn't work [`#5074`](https://github.com/nocobase/nocobase/pull/5074) +- refactor: datetime field support timezone, defaultToCurrentTime, and onUpdateToCurrentTime [`#5012`](https://github.com/nocobase/nocobase/pull/5012) +- feat(data-vi): allow to set link for statistic chart [`#5073`](https://github.com/nocobase/nocobase/pull/5073) +- refactor(plugin-workflow): add calculation nodes group [`#5035`](https://github.com/nocobase/nocobase/pull/5035) +- fix(mobile): fix 'Edit link' setting [`#5068`](https://github.com/nocobase/nocobase/pull/5068) +- fix: html rendering in markdown block [`#5064`](https://github.com/nocobase/nocobase/pull/5064) +- fix: gridCard blocks cannot flip pages when using API data sources [`#5066`](https://github.com/nocobase/nocobase/pull/5066) +- fix(template): refresh parent data on submit button click in referenced template block [`#5057`](https://github.com/nocobase/nocobase/pull/5057) +- fix: html rendering in markdown block [`#5062`](https://github.com/nocobase/nocobase/pull/5062) +- fix(m2m-array): check naming collision [`#5059`](https://github.com/nocobase/nocobase/pull/5059) +- style: table column congirure fields bar style improve [`#5055`](https://github.com/nocobase/nocobase/pull/5055) +- fix(inherit): fix 'Add new' button for inherited collectons [`#5049`](https://github.com/nocobase/nocobase/pull/5049) +- feat(client): add parse options for variable input [`#5043`](https://github.com/nocobase/nocobase/pull/5043) +- fix(iframe): fix the popup contained Iframe block does not work [`#5039`](https://github.com/nocobase/nocobase/pull/5039) +- fix(plugin-workflow-aggregate): limit aggregate instruction to only work on db data source [`#5033`](https://github.com/nocobase/nocobase/pull/5033) +- fix: extend collection cache bug [`#5031`](https://github.com/nocobase/nocobase/pull/5031) +- feat: encryption field [`#4975`](https://github.com/nocobase/nocobase/pull/4975) +- fix: mobile auth [`#5015`](https://github.com/nocobase/nocobase/pull/5015) +- fix(client): show original field input component after cleared variable [`#5028`](https://github.com/nocobase/nocobase/pull/5028) +- feat: support to add Settings block in mobile [`#5025`](https://github.com/nocobase/nocobase/pull/5025) +- style: action style improve [`#5018`](https://github.com/nocobase/nocobase/pull/5018) +- fix: bug [`#5009`](https://github.com/nocobase/nocobase/pull/5009) +- feat: adapt desktop blocks to mobile [`#4945`](https://github.com/nocobase/nocobase/pull/4945) +- fix(CI): continue on error [`#4999`](https://github.com/nocobase/nocobase/pull/4999) +- fix: markdown block should supports the markdown syntax [`#5003`](https://github.com/nocobase/nocobase/pull/5003) +- fix: disabled action to maintain font color on mouse hover (#4988) [`#5000`](https://github.com/nocobase/nocobase/pull/5000) +- fix: disabled action to maintain font color on mouse hover (#4988) [`#4998`](https://github.com/nocobase/nocobase/pull/4998) +- refactor: support dynamic field component [`#4932`](https://github.com/nocobase/nocobase/pull/4932) +- feat: mobile modal bug [`#4976`](https://github.com/nocobase/nocobase/pull/4976) +- fix(T-4927): table performance bug [`#4978`](https://github.com/nocobase/nocobase/pull/4978) +- refactor: pc block & action compatible with mobile devices [`#4935`](https://github.com/nocobase/nocobase/pull/4935) +- feat: markdown & iframe html support handlebars as rendering engin [`#4946`](https://github.com/nocobase/nocobase/pull/4946) +- fix(data-vi): issue of fixed height setting has no effect [`#4960`](https://github.com/nocobase/nocobase/pull/4960) +- fix(client): fix variable input value type [`#4955`](https://github.com/nocobase/nocobase/pull/4955) +- fix: remove theme token [`#4947`](https://github.com/nocobase/nocobase/pull/4947) +- fix: ignore pro [`#4928`](https://github.com/nocobase/nocobase/pull/4928) +- fix: prevent URL change on clicking unconfigured association field [`#4919`](https://github.com/nocobase/nocobase/pull/4919) +- feat(data-vi): optimize style settings for chart blocks [`#4940`](https://github.com/nocobase/nocobase/pull/4940) +- chore: skip app supervisor [`#4937`](https://github.com/nocobase/nocobase/pull/4937) +- fix: mobile style bug [`#4934`](https://github.com/nocobase/nocobase/pull/4934) +- fix: build image ci [`#4929`](https://github.com/nocobase/nocobase/pull/4929) +- feat: plugin mobile v2 [`#4777`](https://github.com/nocobase/nocobase/pull/4777) +- refactor(test): change mock cluster constructor arguments [`#4917`](https://github.com/nocobase/nocobase/pull/4917) +- fix: fix custom request linkage rules problem [`#4913`](https://github.com/nocobase/nocobase/pull/4913) +- refactor(server): simplify api for publishing sync message [`#4912`](https://github.com/nocobase/nocobase/pull/4912) +- chore: data source api [`#4588`](https://github.com/nocobase/nocobase/pull/4588) +- feat(server): add cluster mode for starting app [`#4895`](https://github.com/nocobase/nocobase/pull/4895) +- Revert "fix(client): sub application name (#4886)" [`#4887`](https://github.com/nocobase/nocobase/pull/4887) +- fix(client): sub application name [`#4886`](https://github.com/nocobase/nocobase/pull/4886) +- refactor: optimize e2e workflow [`#4883`](https://github.com/nocobase/nocobase/pull/4883) +- refactor(client): allow to select null value explicitly in variable input [`#4869`](https://github.com/nocobase/nocobase/pull/4869) +- chore: next release ci [`#4861`](https://github.com/nocobase/nocobase/pull/4861) +- test: add locator for approval workflow to enable the withdraw button [`#4859`](https://github.com/nocobase/nocobase/pull/4859) +- refactor(server): sync manager and ci [`#4858`](https://github.com/nocobase/nocobase/pull/4858) +- fix(Table): fix styling issue with fixed columns [`#4857`](https://github.com/nocobase/nocobase/pull/4857) +- feat(database): new field type many to many (array) [`#4708`](https://github.com/nocobase/nocobase/pull/4708) +- feat(server): add sync-manager [`#4780`](https://github.com/nocobase/nocobase/pull/4780) +- chore(router): disable using replace strategy when closing popups or subpages [`#4838`](https://github.com/nocobase/nocobase/pull/4838) +- fix(plugin-manager): fix issue with inability to scroll on plugin management page [`#4837`](https://github.com/nocobase/nocobase/pull/4837) +- fix: adjust the margin of the Add block button in the grid layout [`#4820`](https://github.com/nocobase/nocobase/pull/4820) +- fix: base ref [`#4829`](https://github.com/nocobase/nocobase/pull/4829) +- feat: open subpages within the main page [`#4797`](https://github.com/nocobase/nocobase/pull/4797) +- feat(client): add `disabled` option to props of SchemaSettingsItem [`#4817`](https://github.com/nocobase/nocobase/pull/4817) +- fix(popups): correct value for filterByTk [`#4792`](https://github.com/nocobase/nocobase/pull/4792) +- refactor: include sourceId in popup URL [`#4788`](https://github.com/nocobase/nocobase/pull/4788) +- Merge branch 'main' into next [`#4791`](https://github.com/nocobase/nocobase/pull/4791) +- feat(client): support linkage style in table and form [`#4467`](https://github.com/nocobase/nocobase/pull/4467) +- feat: enable direct dialog opening via URL and support for page mode [`#4706`](https://github.com/nocobase/nocobase/pull/4706) +- refactor: rewrite the UI of the code scanner. [`#4677`](https://github.com/nocobase/nocobase/pull/4677) +- feat(plugin-workflow): add date range options to system variables [`#4728`](https://github.com/nocobase/nocobase/pull/4728) + +### Commits + +- Revert "refactor: datetime field support timezone, defaultToCurrentTime, and onUpdateToCurrentTime (#5012)" [`ded5f26`](https://github.com/nocobase/nocobase/commit/ded5f26c09afed11d27652933ac8550375b3a34d) +- fix: remove schema [`f696c67`](https://github.com/nocobase/nocobase/commit/f696c67b5e5f47ce344e2691d970ec74f451d183) +- chore(versions): 😊 publish v1.3.0-beta [`dea6a58`](https://github.com/nocobase/nocobase/commit/dea6a58878acaf9220f7cf13868adc8cdf38f780) + +## [v1.2.39-alpha](https://github.com/nocobase/nocobase/compare/v1.2.38-alpha...v1.2.39-alpha) - 2024-08-25 + +### Merged + +- fix: the time zone defaults to the system time zone [`#5121`](https://github.com/nocobase/nocobase/pull/5121) +- fix(plugin-workflow-parallel): fix missed transaction causing dead lock in mysql [`#5118`](https://github.com/nocobase/nocobase/pull/5118) +- fix: action linkage rules not working correctly in tree table [`#5107`](https://github.com/nocobase/nocobase/pull/5107) +- fix(data-vi): allow to map integer enum value [`#5115`](https://github.com/nocobase/nocobase/pull/5115) +- fix: markdown test [`#5117`](https://github.com/nocobase/nocobase/pull/5117) +- chore(deps): bump tsconfig-paths from 3.15.0 to 4.2.0 [`#5051`](https://github.com/nocobase/nocobase/pull/5051) +- fix：markdown demo rendering failure [`#5114`](https://github.com/nocobase/nocobase/pull/5114) +- fix(filter): should not filter out zero [`#5106`](https://github.com/nocobase/nocobase/pull/5106) +- style: filter form block action bar style improve [`#5108`](https://github.com/nocobase/nocobase/pull/5108) +- refactor: description for simple pagination mode [`#5110`](https://github.com/nocobase/nocobase/pull/5110) + +### Commits + +- chore(versions): 😊 publish v1.2.39-alpha [`9e30752`](https://github.com/nocobase/nocobase/commit/9e3075218ade26c156b583af8d7166fd630c4d17) +- chore: update changelog [`2b34f3b`](https://github.com/nocobase/nocobase/commit/2b34f3b6bd09d9d8a83a23c6e701cee748460ad4) +- Update README.zh-CN.md [`75c7fd6`](https://github.com/nocobase/nocobase/commit/75c7fd67964d74d291c2f97efa0c458113b7870b) + +## [v1.2.38-alpha](https://github.com/nocobase/nocobase/compare/v1.2.37-alpha...v1.2.38-alpha) - 2024-08-22 + +### Merged + +- fix: issue where data couldn't be submitted after deleting a row with required field in the subform [`#5101`](https://github.com/nocobase/nocobase/pull/5101) +- refactor: collection support simplePaginate [`#5099`](https://github.com/nocobase/nocobase/pull/5099) +- fix: button field assignment to only update visible fields [`#5104`](https://github.com/nocobase/nocobase/pull/5104) +- fix(client): fix upload preview image [`#5102`](https://github.com/nocobase/nocobase/pull/5102) +- fix: column index calculation error in table block [`#5100`](https://github.com/nocobase/nocobase/pull/5100) +- chore: optimize translation [`#5092`](https://github.com/nocobase/nocobase/pull/5092) + +### Commits + +- chore(versions): 😊 publish v1.2.38-alpha [`ce19841`](https://github.com/nocobase/nocobase/commit/ce198410f9e49a842ca91bccf8100c2602f7acfe) +- chore: update changelog [`8d29a6e`](https://github.com/nocobase/nocobase/commit/8d29a6ee81436301bb03bcf39ead38ba084477bb) + ## [v1.2.37-alpha](https://github.com/nocobase/nocobase/compare/v1.2.36-alpha...v1.2.37-alpha) - 2024-08-21 ### Merged diff --git a/Dockerfile b/Dockerfile index 93f69a88a9..7b1bc2a943 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,14 +13,12 @@ RUN npx npm-cli-adduser --username test --password test -e test@nocobase.com -r RUN apt-get update && apt-get install -y jq WORKDIR /tmp COPY . /tmp -RUN cd /tmp && \ - NEWVERSION="$(cat lerna.json | jq '.version' | tr -d '"').$(date +'%Y%m%d%H%M%S')" \ - && tmp=$(mktemp) \ - && jq ".version = \"${NEWVERSION}\"" lerna.json > "$tmp" && mv "$tmp" lerna.json RUN yarn install && yarn build --no-dts -RUN git checkout -b release-$(date +'%Y%m%d%H%M%S') \ - && yarn version:alpha -y +RUN cd /tmp && \ + NEWVERSION="$(cat lerna.json | jq '.version' | tr -d '"').$(date +'%Y%m%d%H%M%S')" \ + && git checkout -b release-$(date +'%Y%m%d%H%M%S') \ + && yarn lerna version ${NEWVERSION} -y --no-git-tag-version RUN git config user.email "test@mail.com" \ && git config user.name "test" && git add . \ && git commit -m "chore(versions): test publish packages" diff --git a/README.zh-CN.md b/README.zh-CN.md index 733a5acc68..20dac826e7 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -2,11 +2,14 @@ https://github.com/nocobase/nocobase/assets/1267426/29623e45-9a48-4598-bb9e-9dd173ade553 -## 感谢你的支持！ +## 感谢支持 nocobase%2Fnocobase | Trendshift NocoBase - Scalability-first, open-source no-code platform | Product Hunt +## 加入我们 +我们正在招聘远程 **全栈开发工程师** 、 **测试工程师** 、 **技术培训与文档专家**。 欢迎对 NocoBase 有强烈兴趣的伙伴加入。[查看详情](https://www.nocobase.com/cn/recruitment) + ## 最近重要更新 - [v1.0.1-alpha.1：区块支持高度设置 - 2024/06/07](https://docs-cn.nocobase.com/welcome/changelog/20240607) - [v1.0.0-alpha.15：新增插件、改进「配置操作」交互 - 2024/05/19](https://docs-cn.nocobase.com/welcome/changelog/20240519) diff --git a/lerna.json b/lerna.json index 7001a85e01..9710afb03d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "npmClient": "yarn", "useWorkspaces": true, "npmClientArgs": ["--ignore-engines"], diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json index e58708fba6..607220f2a3 100644 --- a/packages/core/acl/package.json +++ b/packages/core/acl/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/acl", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/resourcer": "1.3.0-alpha", - "@nocobase/utils": "1.3.0-alpha", + "@nocobase/resourcer": "1.4.0-alpha", + "@nocobase/utils": "1.4.0-alpha", "minimatch": "^5.1.1" }, "repository": { diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json index 9248e74567..bd259c9bb2 100644 --- a/packages/core/actions/package.json +++ b/packages/core/actions/package.json @@ -1,14 +1,14 @@ { "name": "@nocobase/actions", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/cache": "1.3.0-alpha", - "@nocobase/database": "1.3.0-alpha", - "@nocobase/resourcer": "1.3.0-alpha" + "@nocobase/cache": "1.4.0-alpha", + "@nocobase/database": "1.4.0-alpha", + "@nocobase/resourcer": "1.4.0-alpha" }, "repository": { "type": "git", diff --git a/packages/core/actions/src/actions/list.ts b/packages/core/actions/src/actions/list.ts index 93d415b82a..0ad05cccec 100644 --- a/packages/core/actions/src/actions/list.ts +++ b/packages/core/actions/src/actions/list.ts @@ -30,10 +30,12 @@ function findArgs(ctx: Context) { } async function listWithPagination(ctx: Context) { - const { page = DEFAULT_PAGE, pageSize = DEFAULT_PER_PAGE, simplePaginate } = ctx.action.params; + const { page = DEFAULT_PAGE, pageSize = DEFAULT_PER_PAGE } = ctx.action.params; const repository = getRepositoryFromParams(ctx); + const { simplePaginate } = repository.collection?.options || {}; + const options = { context: ctx, ...findArgs(ctx), diff --git a/packages/core/app/package.json b/packages/core/app/package.json index b064c619c5..8efe8f61f2 100644 --- a/packages/core/app/package.json +++ b/packages/core/app/package.json @@ -1,17 +1,17 @@ { "name": "@nocobase/app", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/database": "1.3.0-alpha", - "@nocobase/preset-nocobase": "1.3.0-alpha", - "@nocobase/server": "1.3.0-alpha" + "@nocobase/database": "1.4.0-alpha", + "@nocobase/preset-nocobase": "1.4.0-alpha", + "@nocobase/server": "1.4.0-alpha" }, "devDependencies": { - "@nocobase/client": "1.3.0-alpha" + "@nocobase/client": "1.4.0-alpha" }, "repository": { "type": "git", diff --git a/packages/core/auth/package.json b/packages/core/auth/package.json index ee8328cbac..af0e356596 100644 --- a/packages/core/auth/package.json +++ b/packages/core/auth/package.json @@ -1,16 +1,16 @@ { "name": "@nocobase/auth", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/actions": "1.3.0-alpha", - "@nocobase/cache": "1.3.0-alpha", - "@nocobase/database": "1.3.0-alpha", - "@nocobase/resourcer": "1.3.0-alpha", - "@nocobase/utils": "1.3.0-alpha", + "@nocobase/actions": "1.4.0-alpha", + "@nocobase/cache": "1.4.0-alpha", + "@nocobase/database": "1.4.0-alpha", + "@nocobase/resourcer": "1.4.0-alpha", + "@nocobase/utils": "1.4.0-alpha", "@types/jsonwebtoken": "^8.5.8", "jsonwebtoken": "^8.5.1" }, diff --git a/packages/core/build/package.json b/packages/core/build/package.json index 06d8e2897e..4d937611b1 100644 --- a/packages/core/build/package.json +++ b/packages/core/build/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/build", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "description": "Library build tool based on rollup.", "main": "lib/index.js", "types": "./lib/index.d.ts", diff --git a/packages/core/cache/package.json b/packages/core/cache/package.json index d72b460351..1350f24464 100644 --- a/packages/core/cache/package.json +++ b/packages/core/cache/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cache", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json index f504f9329c..ebc7b0eb5e 100644 --- a/packages/core/cli/package.json +++ b/packages/core/cli/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cli", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "description": "", "license": "AGPL-3.0", "main": "./src/index.js", @@ -8,7 +8,7 @@ "nocobase": "./bin/index.js" }, "dependencies": { - "@nocobase/app": "1.3.0-alpha", + "@nocobase/app": "1.4.0-alpha", "@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": "1.3.0-alpha" + "@nocobase/devtools": "1.4.0-alpha" }, "repository": { "type": "git", diff --git a/packages/core/cli/src/util.js b/packages/core/cli/src/util.js index b02e2c9b43..c18ad659d0 100644 --- a/packages/core/cli/src/util.js +++ b/packages/core/cli/src/util.js @@ -16,6 +16,7 @@ const { readFile, writeFile } = require('fs').promises; const { existsSync, mkdirSync, cpSync, writeFileSync } = require('fs'); const dotenv = require('dotenv'); const fs = require('fs'); +const moment = require('moment-timezone'); exports.isPackageValid = (pkg) => { try { @@ -296,6 +297,25 @@ function buildIndexHtml(force = false) { exports.buildIndexHtml = buildIndexHtml; +function getTimezonesByOffset(offset) { + if (!/^[+-]\d{1,2}:\d{2}$/.test(offset)) { + return offset; + } + const offsetMinutes = moment.duration(offset).asMinutes(); + return moment.tz.names().find((timezone) => { + return moment.tz(timezone).utcOffset() === offsetMinutes; + }); +} + +function areTimeZonesEqual(timeZone1, timeZone2) { + if (timeZone1 === timeZone2) { + return true; + } + timeZone1 = getTimezonesByOffset(timeZone1); + timeZone2 = getTimezonesByOffset(timeZone2); + return moment.tz(timeZone1).format() === moment.tz(timeZone2).format(); +} + exports.initEnv = function initEnv() { const env = { APP_ENV: 'development', @@ -305,7 +325,7 @@ exports.initEnv = function initEnv() { API_CLIENT_STORAGE_PREFIX: 'NOCOBASE_', DB_DIALECT: 'sqlite', DB_STORAGE: 'storage/db/nocobase.sqlite', - DB_TIMEZONE: '+00:00', + // DB_TIMEZONE: '+00:00', DB_UNDERSCORED: parseEnv('DB_UNDERSCORED'), DEFAULT_STORAGE_TYPE: 'local', LOCAL_STORAGE_DEST: 'storage/uploads', @@ -376,4 +396,19 @@ exports.initEnv = function initEnv() { process.env.API_BASE_URL = process.env.APP_SERVER_BASE_URL + process.env.API_BASE_PATH; process.env.__env_modified__ = true; } + + if (!process.env.TZ) { + const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone; + process.env.TZ = getTimezonesByOffset(process.env.DB_TIMEZONE || timeZone); + } + + if (!process.env.DB_TIMEZONE) { + process.env.DB_TIMEZONE = process.env.TZ; + } + + if (!areTimeZonesEqual(process.env.DB_TIMEZONE, process.env.TZ)) { + throw new Error( + `process.env.DB_TIMEZONE="${process.env.DB_TIMEZONE}" and process.env.TZ="${process.env.TZ}" are different`, + ); + } }; diff --git a/packages/core/client/package.json b/packages/core/client/package.json index dc541a276d..c8f6d826e5 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/client", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.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": "1.3.0-alpha", - "@nocobase/sdk": "1.3.0-alpha", - "@nocobase/utils": "1.3.0-alpha", + "@nocobase/evaluators": "1.4.0-alpha", + "@nocobase/sdk": "1.4.0-alpha", + "@nocobase/utils": "1.4.0-alpha", "ahooks": "^3.7.2", "antd": "^5.12.8", "antd-style": "3.4.5", @@ -78,6 +78,5 @@ "axios-mock-adapter": "^1.20.0", "dumi": "2.2.14", "dumi-theme-nocobase": "^0.2.28" - }, - "gitHead": "d0b4efe4be55f8c79a98a331d99d9f8cf99021a1" + } } diff --git a/packages/core/client/src/block-provider/FilterFormBlockProvider.tsx b/packages/core/client/src/block-provider/FilterFormBlockProvider.tsx index b2fb092fed..99d983810c 100644 --- a/packages/core/client/src/block-provider/FilterFormBlockProvider.tsx +++ b/packages/core/client/src/block-provider/FilterFormBlockProvider.tsx @@ -26,8 +26,9 @@ export const FilterFormBlockProvider = withDynamicSchemaProps((props) => { diff --git a/packages/core/client/src/block-provider/TableBlockProvider.tsx b/packages/core/client/src/block-provider/TableBlockProvider.tsx index c389c55922..0dc5506963 100644 --- a/packages/core/client/src/block-provider/TableBlockProvider.tsx +++ b/packages/core/client/src/block-provider/TableBlockProvider.tsx @@ -166,11 +166,6 @@ export const TableBlockProvider = withDynamicSchemaProps((props) => { params['tree'] = true; } } - if (pagingMode === 'simplePaginate') { - params['simplePaginate'] = true; - } else { - delete params?.['simplePaginate']; - } const form = useMemo(() => createForm(), [treeTable]); // 在解析变量的时候不渲染，避免因为重复请求数据导致的资源浪费 diff --git a/packages/core/client/src/collection-manager/templates/general.tsx b/packages/core/client/src/collection-manager/templates/general.tsx index 7d4c09e9cc..1043e38e32 100644 --- a/packages/core/client/src/collection-manager/templates/general.tsx +++ b/packages/core/client/src/collection-manager/templates/general.tsx @@ -24,6 +24,7 @@ export class GeneralCollectionTemplate extends CollectionTemplate { 'inherits', 'category', 'description', + 'simplePaginate', 'presetFields', ); } diff --git a/packages/core/client/src/collection-manager/templates/properties/index.ts b/packages/core/client/src/collection-manager/templates/properties/index.ts index 4902326c05..691f23ca49 100644 --- a/packages/core/client/src/collection-manager/templates/properties/index.ts +++ b/packages/core/client/src/collection-manager/templates/properties/index.ts @@ -60,6 +60,15 @@ export const defaultConfigurableProperties = { 'x-decorator': 'FormItem', 'x-component': 'Input.TextArea', }, + simplePaginate: { + 'x-content': '{{t("Use simple pagination mode")}}', + type: 'string', + name: 'simplePaginate', + 'x-decorator': 'FormItem', + 'x-component': 'Checkbox', + description: + '{{t("Skip getting the total number of table records during paging to speed up loading. It is recommended to enable this option for data tables with a large amount of data")}}', + }, presetFields: { title: '{{t("Preset fields")}}', type: 'void', @@ -92,6 +101,7 @@ export type DefaultConfigurableKeys = | 'updatedAt' | 'sortable' | 'description' + | 'simplePaginate' | 'presetFields'; export const getConfigurableProperties = (...keys: DefaultConfigurableKeys[]) => { diff --git a/packages/core/client/src/filter-provider/__tests__/utiles.test.ts b/packages/core/client/src/filter-provider/__tests__/utiles.test.ts index 7da0fc2a42..1d6c886f9b 100644 --- a/packages/core/client/src/filter-provider/__tests__/utiles.test.ts +++ b/packages/core/client/src/filter-provider/__tests__/utiles.test.ts @@ -196,6 +196,32 @@ describe('transformToFilter', () => { expect(filter).toEqual(expectedFilter); }); + it('should keep 0 value', () => { + const valuesWithZero = { + field1: 0, + field2: 'value2', + }; + + const expectedFilter = { + $and: [ + { + field1: { + $eq: 0, + }, + }, + { + field2: { + $ne: 'value2', + }, + }, + ], + }; + + const filter = transformToFilter(valuesWithZero, operators, getCollectionJoinField, collectionName); + + expect(filter).toEqual(expectedFilter); + }); + it('should handle null values', () => { const valuesWithNull = { field1: null, diff --git a/packages/core/client/src/filter-provider/utils.ts b/packages/core/client/src/filter-provider/utils.ts index 212cc8c3a3..627635367c 100644 --- a/packages/core/client/src/filter-provider/utils.ts +++ b/packages/core/client/src/filter-provider/utils.ts @@ -144,7 +144,7 @@ export const transformToFilter = ( key = `${key}.${collectionField.targetKey || 'id'}`; } - if (!value) { + if (!value && value !== 0 && value !== false) { return null; } diff --git a/packages/core/client/src/locale/zh-CN.json b/packages/core/client/src/locale/zh-CN.json index ba72abd3db..c3645dfdd8 100644 --- a/packages/core/client/src/locale/zh-CN.json +++ b/packages/core/client/src/locale/zh-CN.json @@ -968,8 +968,8 @@ "Open in new window": "新窗口打开", "is none of": "不包含任何一个", "is any of": "包含任何一个", - "Paging mode": "分页模式", - "Simple Paginate": "简单分页", + "Use simple pagination mode": "使用简单分页模式", "Sorry, the page you visited does not exist.": "抱歉，你访问的页面不存在。", - "Set Template Engine": "设置模板引擎" + "Set Template Engine": "设置模板引擎", + "Skip getting the total number of table records during paging to speed up loading. It is recommended to enable this option for data tables with a large amount of data": "在分页时跳过获取表记录总数，以加快加载速度，建议对有大量数据的数据表开启此选项" } diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx b/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx index 0ae847cd1e..f7d70ff2b1 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx @@ -25,7 +25,6 @@ import { setDefaultSortingRulesSchemaSettingsItem } from '../../../../schema-set import { setTheDataScopeSchemaSettingsItem } from '../../../../schema-settings/setTheDataScopeSchemaSettingsItem'; import { useBlockTemplateContext } from '../../../../schema-templates/BlockTemplateProvider'; import { setDataLoadingModeSettingsItem } from '../details-multi/setDataLoadingModeSettingsItem'; -import { SchemaSettingsPagingMode } from '../../../../schema-settings/SchemaSettingsPagingMode'; export const tableBlockSettings = new SchemaSettings({ name: 'blockSettings:table', @@ -187,10 +186,6 @@ export const tableBlockSettings = new SchemaSettings({ }; }, }, - { - name: 'pagingMode', - Component: SchemaSettingsPagingMode, - }, { name: 'ConnectDataBlocks', Component: SchemaSettingsConnectDataBlocks, diff --git a/packages/core/client/src/schema-component/antd/action/Action.tsx b/packages/core/client/src/schema-component/antd/action/Action.tsx index 072f8f17f2..773c996623 100644 --- a/packages/core/client/src/schema-component/antd/action/Action.tsx +++ b/packages/core/client/src/schema-component/antd/action/Action.tsx @@ -100,7 +100,7 @@ export const Action: ComposedAction = withDynamicSchemaProps( const tarComponent = useComponent(component) || component; const { modal } = App.useApp(); const variables = useVariables(); - const localVariables = useLocalVariables({ currentForm: { values: recordData } as any }); + const localVariables = useLocalVariables({ currentForm: { values: recordData, readPretty: false } as any }); const { getAriaLabel } = useGetAriaLabelOfAction(title); const service = useDataBlockRequest(); diff --git a/packages/core/client/src/schema-component/antd/association-field/Nester.tsx b/packages/core/client/src/schema-component/antd/association-field/Nester.tsx index fb12bec82f..e05880a826 100644 --- a/packages/core/client/src/schema-component/antd/association-field/Nester.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/Nester.tsx @@ -15,6 +15,7 @@ import { action } from '@formily/reactive'; import { each } from '@formily/shared'; import { Button, Card, Divider, Tooltip } from 'antd'; import React, { useCallback, useContext } from 'react'; +import { spliceArrayState } from '@formily/core/esm/shared/internals'; import { useTranslation } from 'react-i18next'; import { FormActiveFieldsProvider } from '../../../block-provider/hooks/useFormActiveFields'; import { useCollection } from '../../../data-source'; @@ -186,6 +187,10 @@ const ToManyNester = observer( style={{ zIndex: 1000, color: '#a8a3a3' }} onClick={() => { action(() => { + spliceArrayState(field as any, { + startIndex: index, + deleteCount: 1, + }); field.value.splice(index, 1); return field.onInput(field.value); }); diff --git a/packages/core/client/src/schema-component/antd/filter/__tests__/useFilterActionProps.test.ts b/packages/core/client/src/schema-component/antd/filter/__tests__/useFilterActionProps.test.ts index 2880aeec5c..27a28cdbb0 100644 --- a/packages/core/client/src/schema-component/antd/filter/__tests__/useFilterActionProps.test.ts +++ b/packages/core/client/src/schema-component/antd/filter/__tests__/useFilterActionProps.test.ts @@ -65,4 +65,17 @@ describe('removeNullCondition', () => { const result = removeNullCondition(filter); expect(result).toEqual(expected); }); + + it('should keep 0 value', () => { + const filter = { + field1: 0, + field2: 'value2', + }; + const expected = { + field1: 0, + field2: 'value2', + }; + const result = removeNullCondition(filter); + expect(result).toEqual(expected); + }); }); diff --git a/packages/core/client/src/schema-component/antd/markdown/__tests__/markdown.test.tsx b/packages/core/client/src/schema-component/antd/markdown/__tests__/markdown.test.tsx index d81bbe45aa..dd09833bed 100644 --- a/packages/core/client/src/schema-component/antd/markdown/__tests__/markdown.test.tsx +++ b/packages/core/client/src/schema-component/antd/markdown/__tests__/markdown.test.tsx @@ -30,11 +30,7 @@ describe('Markdown', () => { describe('Markdown.Void', function () { it('should display the value of user input', async () => { - const { container } = render( - - - , - ); + const { container } = render(); const button = container.querySelector('.ant-btn') as HTMLButtonElement; expect(button).not.toBeNull(); diff --git a/packages/core/client/src/schema-component/antd/markdown/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/markdown/demos/demo2.tsx index 3aecf7e090..20357462ad 100644 --- a/packages/core/client/src/schema-component/antd/markdown/demos/demo2.tsx +++ b/packages/core/client/src/schema-component/antd/markdown/demos/demo2.tsx @@ -1,5 +1,3 @@ - - /** * title: Markdown.Void */ @@ -8,6 +6,7 @@ import { observer, useField } from '@formily/react'; import { Markdown, SchemaComponent, SchemaComponentProvider } from '@nocobase/client'; import { Button } from 'antd'; import React from 'react'; +import { Router } from 'react-router-dom'; const schema = { type: 'object', @@ -49,8 +48,10 @@ const Editable = observer( export default () => { return ( - - - + + + + + ); }; diff --git a/packages/core/client/src/schema-component/antd/page/PagePopups.tsx b/packages/core/client/src/schema-component/antd/page/PagePopups.tsx index 96c59bd0b6..3ac5ba667c 100644 --- a/packages/core/client/src/schema-component/antd/page/PagePopups.tsx +++ b/packages/core/client/src/schema-component/antd/page/PagePopups.tsx @@ -292,7 +292,7 @@ export const PagePopups = (props: { paramsList?: PopupParams[] }) => { setRootSchema(rootSchema); }; run(); - }, [fieldSchema.root, getPopupSchemaFromSchema, popupParams, requestSchema, savePopupSchemaToSchema]); + }, [fieldSchema, getPopupSchemaFromSchema, popupParams, requestSchema, savePopupSchemaToSchema]); const components = useMemo(() => ({ PagePopupsItemProvider }), []); @@ -444,7 +444,7 @@ function findSchemaByUid(uid: string, rootSchema: Schema, resultRef: { value: Sc resultRef = resultRef || { value: null, }; - rootSchema.mapProperties((schema) => { + rootSchema?.mapProperties?.((schema) => { if (schema['x-uid'] === uid) { resultRef.value = schema; } else { diff --git a/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx b/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx index 93467f244b..83a75537e8 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx @@ -30,7 +30,6 @@ import { } from '../../../schema-settings'; import { SchemaSettingsBlockHeightItem } from '../../../schema-settings/SchemaSettingsBlockHeightItem'; import { SchemaSettingsBlockTitleItem } from '../../../schema-settings/SchemaSettingsBlockTitleItem'; -import { SchemaSettingsPagingMode } from '../../../schema-settings/SchemaSettingsPagingMode'; import { SchemaSettingsConnectDataBlocks } from '../../../schema-settings/SchemaSettingsConnectDataBlocks'; import { SchemaSettingsDataScope } from '../../../schema-settings/SchemaSettingsDataScope'; import { SchemaSettingsTemplate } from '../../../schema-settings/SchemaSettingsTemplate'; @@ -303,7 +302,6 @@ export const TableBlockDesigner = () => { }); }} /> - {supportTemplate && } {supportTemplate && ( diff --git a/packages/core/client/src/schema-component/antd/table-v2/__tests__/Table.settings.test.tsx b/packages/core/client/src/schema-component/antd/table-v2/__tests__/Table.settings.test.tsx index 92d16a9924..729a7cc4f8 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/__tests__/Table.settings.test.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/__tests__/Table.settings.test.tsx @@ -219,10 +219,6 @@ describe('Table.settings', () => { }, ], }, - { - title: 'Paging mode', - type: 'select', - }, { title: 'Save as template', type: 'modal', diff --git a/packages/core/client/src/schema-component/antd/upload/shared.ts b/packages/core/client/src/schema-component/antd/upload/shared.ts index 4a04520882..c979136edc 100644 --- a/packages/core/client/src/schema-component/antd/upload/shared.ts +++ b/packages/core/client/src/schema-component/antd/upload/shared.ts @@ -26,51 +26,7 @@ export const isPdf = (file) => { return match(file.mimetype || file.type, 'application/pdf'); }; -export const toMap = (fileList: any) => { - if (!fileList) { - return []; - } - if (typeof fileList !== 'object') { - return []; - } - let list = fileList; - if (!Array.isArray(fileList)) { - if (Object.keys({ ...fileList }).length === 0) { - return []; - } - list = [fileList]; - } - return list.map((item) => { - return [item.id || item.uid, toItem(item)]; - }); -}; - -export const toImages = (fileList) => { - if (!fileList) { - return []; - } - if (typeof fileList !== 'object') { - return []; - } - if (Object.keys(fileList).length === 0) { - return []; - } - let list = fileList; - if (!Array.isArray(fileList) && typeof fileList === 'object') { - list = [fileList]; - } - return list.map((item) => { - return { - ...item, - title: item.title || item.name, - imageUrl: getImageByUrl(item.url, { - exclude: ['.png', '.jpg', '.jpeg', '.gif'], - }), - }; - }); -}; - -export const toArr = (value) => { +const toArr = (value) => { if (!isValid(value)) { return []; } @@ -210,9 +166,11 @@ export const toItem = (file) => { ...file, id: file.id || file.uid, title: file.title || file.name, - imageUrl: getImageByUrl(file.url, { - exclude: ['.png', '.jpg', '.jpeg', '.gif'], - }), + imageUrl: isImage(file) + ? file.url + : getImageByUrl(file.url, { + exclude: ['.png', '.jpg', '.jpeg', '.gif', '.svg', '.webp', '.bmp', '.ico'], + }), }; }; diff --git a/packages/core/client/src/schema-component/antd/variable/Input.tsx b/packages/core/client/src/schema-component/antd/variable/Input.tsx index 96da418384..b75aa81e59 100644 --- a/packages/core/client/src/schema-component/antd/variable/Input.tsx +++ b/packages/core/client/src/schema-component/antd/variable/Input.tsx @@ -118,10 +118,19 @@ const ConstantTypes = { }, }; -function getTypedConstantOption(type: string, types: true | string[], fieldNames) { +type UseTypeConstantType = true | (string | [string, Record])[]; + +function getTypedConstantOption(type: string, types: UseTypeConstantType, fieldNames) { const allTypes = Object.values(ConstantTypes).filter((item) => item.value !== 'null'); const children = ( - types ? allTypes.filter((item) => (Array.isArray(types) && types.includes(item.value)) || types === true) : allTypes + types + ? allTypes.filter( + (item) => + (Array.isArray(types) && + types.filter((t) => (Array.isArray(t) ? t[0] === item.value : t === item.value)).length) || + types === true, + ) + : allTypes ).map((item) => Object.keys(item).reduce( (result, key) => @@ -150,7 +159,7 @@ export type VariableInputProps = { onChange: (value: string, optionPath?: any[]) => void; children?: any; button?: React.ReactElement; - useTypedConstant?: true | string[]; + useTypedConstant?: UseTypeConstantType; changeOnSelect?: CascaderProps['changeOnSelect']; fieldNames?: CascaderProps['fieldNames']; disabled?: boolean; @@ -214,6 +223,9 @@ export function Input(props: VariableInputProps) { }, [type, useTypedConstant]); const ConstantComponent = constantOption && !children ? constantOption.component : NullComponent; + const constantComponentProps = Array.isArray(useTypedConstant) + ? (useTypedConstant.find((item) => Array.isArray(item) && item[0] === type)?.[1] as Record) ?? {} + : {}; let cValue; if (value == null) { if (children && isFieldValue) { @@ -403,7 +415,13 @@ export function Input(props: VariableInputProps) { {children && isFieldValue ? ( children ) : ConstantComponent ? ( - + ) : null} )} diff --git a/packages/core/client/src/schema-settings/SchemaSettings.tsx b/packages/core/client/src/schema-settings/SchemaSettings.tsx index 70cde8940c..c8afc6a68b 100644 --- a/packages/core/client/src/schema-settings/SchemaSettings.tsx +++ b/packages/core/client/src/schema-settings/SchemaSettings.tsx @@ -653,7 +653,15 @@ export const SchemaSettingsActionModalItem: FC { await form.submit(); try { - await onSubmit?.(cloneDeep(form.values)); + const allValues = form.values; + // 过滤掉那些在表单 Schema 中未定义的字段 + const visibleValues = Object.keys(allValues).reduce((result, key) => { + if (form.query(key).take()) { + result[key] = allValues[key]; + } + return result; + }, {}); + await onSubmit?.(cloneDeep(visibleValues)); setVisible(false); } catch (err) { console.error(err); diff --git a/packages/core/client/src/schema-settings/SchemaSettingsPagingMode.tsx b/packages/core/client/src/schema-settings/SchemaSettingsPagingMode.tsx deleted file mode 100644 index 35fe1b6c01..0000000000 --- a/packages/core/client/src/schema-settings/SchemaSettingsPagingMode.tsx +++ /dev/null @@ -1,61 +0,0 @@ -/** - * This file is part of the NocoBase (R) project. - * Copyright (c) 2020-2024 NocoBase Co., Ltd. - * Authors: NocoBase Team. - * - * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License. - * For more information, please refer to: https://www.nocobase.com/agreement. - */ - -import { Field } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; -import React from 'react'; -import { useTranslation } from 'react-i18next'; -import { useTableBlockContext } from '../block-provider'; -import { useDesignable } from '../schema-component/hooks/useDesignable'; -import { SchemaSettingsSelectItem } from './SchemaSettings'; - -export function SchemaSettingsPagingMode() { - const field = useField(); - const fieldSchema = useFieldSchema(); - const { t } = useTranslation(); - const { dn } = useDesignable(); - const { service } = useTableBlockContext(); - const options = [ - { - value: 'default', - label: t('Default'), - }, - { - value: 'simplePaginate', - label: t('Simple Paginate'), - }, - ]; - - return ( - { - fieldSchema['x-decorator-props'].pagingMode = pagingMode; - const params = { ...service.params?.[0] }; - if (pagingMode === 'simplePaginate') { - params['simplePaginate'] = true; - } else { - delete params['simplePaginate']; - } - service.run({ params }); - field.decoratorProps.pagingMode = pagingMode; - dn.emit('patch', { - schema: { - ['x-uid']: fieldSchema['x-uid'], - 'x-decorator-props': fieldSchema['x-decorator-props'], - }, - }); - dn.refresh(); - }} - /> - ); -} diff --git a/packages/core/client/src/schema-settings/index.ts b/packages/core/client/src/schema-settings/index.ts index 1e13637e86..1a67832736 100644 --- a/packages/core/client/src/schema-settings/index.ts +++ b/packages/core/client/src/schema-settings/index.ts @@ -21,7 +21,6 @@ export * from './SchemaSettingsSortingRule'; export * from './SchemaSettingsTemplate'; export * from './SchemaSettingsBlockHeightItem'; export * from './setDefaultSortingRulesSchemaSettingsItem'; -export * from './SchemaSettingsPagingMode'; export * from './setTheDataScopeSchemaSettingsItem'; export * from './SchemaSettingsRenderEngine'; export * from './hooks/useGetAriaLabelOfDesigner'; diff --git a/packages/core/create-nocobase-app/package.json b/packages/core/create-nocobase-app/package.json index 8131eab09e..d038578542 100755 --- a/packages/core/create-nocobase-app/package.json +++ b/packages/core/create-nocobase-app/package.json @@ -1,6 +1,6 @@ { "name": "create-nocobase-app", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "src/index.js", "license": "AGPL-3.0", "dependencies": { diff --git a/packages/core/data-source-manager/package.json b/packages/core/data-source-manager/package.json index 02775977ad..f1b37c4978 100644 --- a/packages/core/data-source-manager/package.json +++ b/packages/core/data-source-manager/package.json @@ -1,16 +1,16 @@ { "name": "@nocobase/data-source-manager", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/actions": "1.3.0-alpha", - "@nocobase/cache": "1.3.0-alpha", - "@nocobase/database": "1.3.0-alpha", - "@nocobase/resourcer": "1.3.0-alpha", - "@nocobase/utils": "1.3.0-alpha", + "@nocobase/actions": "1.4.0-alpha", + "@nocobase/cache": "1.4.0-alpha", + "@nocobase/database": "1.4.0-alpha", + "@nocobase/resourcer": "1.4.0-alpha", + "@nocobase/utils": "1.4.0-alpha", "@types/jsonwebtoken": "^8.5.8", "jsonwebtoken": "^8.5.1" }, diff --git a/packages/core/data-source-manager/src/default-actions/list.ts b/packages/core/data-source-manager/src/default-actions/list.ts index 310cdbef7c..a1de82d7ea 100644 --- a/packages/core/data-source-manager/src/default-actions/list.ts +++ b/packages/core/data-source-manager/src/default-actions/list.ts @@ -38,10 +38,12 @@ function findArgs(ctx: Context) { } async function listWithPagination(ctx: Context) { - const { page = 1, pageSize = 50, simplePaginate } = ctx.action.params; + const { page = 1, pageSize = 50 } = ctx.action.params; const repository = ctx.getCurrentRepository(); + const { simplePaginate } = repository.collection?.options || {}; + const options = { context: ctx, ...findArgs(ctx), diff --git a/packages/core/database/package.json b/packages/core/database/package.json index f2c7ad79ae..acd51010c6 100644 --- a/packages/core/database/package.json +++ b/packages/core/database/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/database", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { - "@nocobase/logger": "1.3.0-alpha", - "@nocobase/utils": "1.3.0-alpha", + "@nocobase/logger": "1.4.0-alpha", + "@nocobase/utils": "1.4.0-alpha", "async-mutex": "^0.3.2", "chalk": "^4.1.1", "cron-parser": "4.4.0", diff --git a/packages/core/database/src/collection.ts b/packages/core/database/src/collection.ts index b466c0a46d..afd9571323 100644 --- a/packages/core/database/src/collection.ts +++ b/packages/core/database/src/collection.ts @@ -114,6 +114,8 @@ export interface CollectionOptions extends Omit tree?: string; template?: string; + simplePaginate?: boolean; + /** * where is the collection from * diff --git a/packages/core/devtools/package.json b/packages/core/devtools/package.json index be2fde708b..9b2ffea102 100644 --- a/packages/core/devtools/package.json +++ b/packages/core/devtools/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/devtools", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "description": "", "license": "AGPL-3.0", "main": "./src/index.js", "dependencies": { - "@nocobase/build": "1.3.0-alpha", - "@nocobase/client": "1.3.0-alpha", - "@nocobase/test": "1.3.0-alpha", + "@nocobase/build": "1.4.0-alpha", + "@nocobase/client": "1.4.0-alpha", + "@nocobase/test": "1.4.0-alpha", "@types/koa": "^2.13.4", "@types/koa-bodyparser": "^4.3.4", "@types/lodash": "^4.14.177", @@ -39,7 +39,7 @@ "ts-loader": "^7.0.4", "ts-node": "9.1.1", "ts-node-dev": "1.1.8", - "tsconfig-paths": "^3.12.0", + "tsconfig-paths": "^4.2.0", "tsx": "^4.6.2", "typescript": "5.1.3", "umi": "^4.0.69" diff --git a/packages/core/evaluators/package.json b/packages/core/evaluators/package.json index 5aed1d2c08..fdaf6ac29f 100644 --- a/packages/core/evaluators/package.json +++ b/packages/core/evaluators/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/evaluators", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { "@formulajs/formulajs": "4.2.0", - "@nocobase/utils": "1.3.0-alpha", + "@nocobase/utils": "1.4.0-alpha", "mathjs": "^10.6.0" }, "repository": { diff --git a/packages/core/logger/package.json b/packages/core/logger/package.json index a0fac60b20..86417b9675 100644 --- a/packages/core/logger/package.json +++ b/packages/core/logger/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/logger", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "description": "nocobase logging library", "license": "AGPL-3.0", "main": "./lib/index.js", diff --git a/packages/core/resourcer/package.json b/packages/core/resourcer/package.json index 166947603e..2ca490b9cb 100644 --- a/packages/core/resourcer/package.json +++ b/packages/core/resourcer/package.json @@ -1,12 +1,12 @@ { "name": "@nocobase/resourcer", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { - "@nocobase/utils": "1.3.0-alpha", + "@nocobase/utils": "1.4.0-alpha", "deepmerge": "^4.2.2", "koa-compose": "^4.1.0", "lodash": "^4.17.21", diff --git a/packages/core/sdk/package.json b/packages/core/sdk/package.json index 7f88e4d424..e88a5c0f8e 100644 --- a/packages/core/sdk/package.json +++ b/packages/core/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/sdk", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/core/server/package.json b/packages/core/server/package.json index d4830ca7e0..d353adeb32 100644 --- a/packages/core/server/package.json +++ b/packages/core/server/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/server", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", @@ -10,18 +10,18 @@ "@koa/cors": "^3.1.0", "@koa/multer": "^3.0.2", "@koa/router": "^9.4.0", - "@nocobase/acl": "1.3.0-alpha", - "@nocobase/actions": "1.3.0-alpha", - "@nocobase/auth": "1.3.0-alpha", - "@nocobase/cache": "1.3.0-alpha", - "@nocobase/data-source-manager": "1.3.0-alpha", - "@nocobase/database": "1.3.0-alpha", - "@nocobase/evaluators": "1.3.0-alpha", - "@nocobase/logger": "1.3.0-alpha", - "@nocobase/resourcer": "1.3.0-alpha", - "@nocobase/sdk": "1.3.0-alpha", - "@nocobase/telemetry": "1.3.0-alpha", - "@nocobase/utils": "1.3.0-alpha", + "@nocobase/acl": "1.4.0-alpha", + "@nocobase/actions": "1.4.0-alpha", + "@nocobase/auth": "1.4.0-alpha", + "@nocobase/cache": "1.4.0-alpha", + "@nocobase/data-source-manager": "1.4.0-alpha", + "@nocobase/database": "1.4.0-alpha", + "@nocobase/evaluators": "1.4.0-alpha", + "@nocobase/logger": "1.4.0-alpha", + "@nocobase/resourcer": "1.4.0-alpha", + "@nocobase/sdk": "1.4.0-alpha", + "@nocobase/telemetry": "1.4.0-alpha", + "@nocobase/utils": "1.4.0-alpha", "@types/decompress": "4.2.4", "@types/ini": "^1.3.31", "@types/koa-send": "^4.1.3", diff --git a/packages/core/telemetry/package.json b/packages/core/telemetry/package.json index d53008967c..197890a26c 100644 --- a/packages/core/telemetry/package.json +++ b/packages/core/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/telemetry", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "description": "nocobase telemetry library", "license": "AGPL-3.0", "main": "./lib/index.js", @@ -11,7 +11,7 @@ "directory": "packages/telemetry" }, "dependencies": { - "@nocobase/utils": "1.3.0-alpha", + "@nocobase/utils": "1.4.0-alpha", "@opentelemetry/api": "^1.7.0", "@opentelemetry/instrumentation": "^0.46.0", "@opentelemetry/resources": "^1.19.0", diff --git a/packages/core/test/package.json b/packages/core/test/package.json index 52f686e401..11642c491e 100644 --- a/packages/core/test/package.json +++ b/packages/core/test/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/test", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "lib/index.js", "module": "./src/index.ts", "types": "./lib/index.d.ts", @@ -51,7 +51,7 @@ }, "dependencies": { "@faker-js/faker": "8.1.0", - "@nocobase/server": "1.3.0-alpha", + "@nocobase/server": "1.4.0-alpha", "@playwright/test": "^1.45.3", "@testing-library/jest-dom": "^6.4.2", "@testing-library/react": "^14.0.0", diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json index 8c772d9981..83f3327ad5 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/utils", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", diff --git a/packages/plugins/@nocobase/plugin-acl/package.json b/packages/plugins/@nocobase/plugin-acl/package.json index afe65ad850..2795a3b584 100644 --- a/packages/plugins/@nocobase/plugin-acl/package.json +++ b/packages/plugins/@nocobase/plugin-acl/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/acl", @@ -33,6 +33,5 @@ "type": "git", "url": "git+https://github.com/nocobase/nocobase.git", "directory": "packages/plugins/acl" - }, - "gitHead": "d0b4efe4be55f8c79a98a331d99d9f8cf99021a1" + } } diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json index 3dbaa77963..06eea94861 100644 --- a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json +++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-action-bulk-edit", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "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", diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/package.json b/packages/plugins/@nocobase/plugin-action-bulk-update/package.json index ecac7049d3..f511dd6f66 100644 --- a/packages/plugins/@nocobase/plugin-action-bulk-update/package.json +++ b/packages/plugins/@nocobase/plugin-action-bulk-update/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-action-bulk-update", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "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", diff --git a/packages/plugins/@nocobase/plugin-action-custom-request/package.json b/packages/plugins/@nocobase/plugin-action-custom-request/package.json index ac58f92665..9467e68bce 100644 --- a/packages/plugins/@nocobase/plugin-action-custom-request/package.json +++ b/packages/plugins/@nocobase/plugin-action-custom-request/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-action-custom-request", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "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", diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/package.json b/packages/plugins/@nocobase/plugin-action-duplicate/package.json index fbec73b07d..d21fe9a365 100644 --- a/packages/plugins/@nocobase/plugin-action-duplicate/package.json +++ b/packages/plugins/@nocobase/plugin-action-duplicate/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-action-duplicate", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/action-duplicate", "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-duplicate", diff --git a/packages/plugins/@nocobase/plugin-action-export/package.json b/packages/plugins/@nocobase/plugin-action-export/package.json index ec47524b62..72d0672d28 100644 --- a/packages/plugins/@nocobase/plugin-action-export/package.json +++ b/packages/plugins/@nocobase/plugin-action-export/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/action-export", diff --git a/packages/plugins/@nocobase/plugin-action-import/package.json b/packages/plugins/@nocobase/plugin-action-import/package.json index 36a4a356ee..eb27d8035e 100644 --- a/packages/plugins/@nocobase/plugin-action-import/package.json +++ b/packages/plugins/@nocobase/plugin-action-import/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/action-import", diff --git a/packages/plugins/@nocobase/plugin-action-print/package.json b/packages/plugins/@nocobase/plugin-action-print/package.json index d8880b1c94..cf6fff5038 100644 --- a/packages/plugins/@nocobase/plugin-action-print/package.json +++ b/packages/plugins/@nocobase/plugin-action-print/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-action-print", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/action-print", "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-print", diff --git a/packages/plugins/@nocobase/plugin-api-doc/package.json b/packages/plugins/@nocobase/plugin-api-doc/package.json index cca00fa22f..900fdcc674 100644 --- a/packages/plugins/@nocobase/plugin-api-doc/package.json +++ b/packages/plugins/@nocobase/plugin-api-doc/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-api-doc", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "displayName": "API documentation", "displayName.zh-CN": "API 文档", "description": "An OpenAPI documentation generator for NocoBase HTTP API.", diff --git a/packages/plugins/@nocobase/plugin-api-keys/package.json b/packages/plugins/@nocobase/plugin-api-keys/package.json index 51af1c753e..9562263bab 100644 --- a/packages/plugins/@nocobase/plugin-api-keys/package.json +++ b/packages/plugins/@nocobase/plugin-api-keys/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/api-keys", diff --git a/packages/plugins/@nocobase/plugin-audit-logs/package.json b/packages/plugins/@nocobase/plugin-audit-logs/package.json index 792e559a4a..6412b18151 100644 --- a/packages/plugins/@nocobase/plugin-audit-logs/package.json +++ b/packages/plugins/@nocobase/plugin-audit-logs/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-audit-logs", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "displayName": "Audit logs (deprecated)", "displayName.zh-CN": "审计日志（废弃）", "description": "This plugin is deprecated. There will be a new audit log plugin in the future.", diff --git a/packages/plugins/@nocobase/plugin-auth-sms/package.json b/packages/plugins/@nocobase/plugin-auth-sms/package.json index 83c6dd35cc..cd90bfead4 100644 --- a/packages/plugins/@nocobase/plugin-auth-sms/package.json +++ b/packages/plugins/@nocobase/plugin-auth-sms/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "认证：短信", "description": "SMS authentication.", "description.zh-CN": "通过短信验证码认证身份。", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/auth-sms", "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/auth-sms", diff --git a/packages/plugins/@nocobase/plugin-auth/package.json b/packages/plugins/@nocobase/plugin-auth/package.json index 1b3903443e..3a35767cc7 100644 --- a/packages/plugins/@nocobase/plugin-auth/package.json +++ b/packages/plugins/@nocobase/plugin-auth/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-auth", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/auth", "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/auth", diff --git a/packages/plugins/@nocobase/plugin-backup-restore/package.json b/packages/plugins/@nocobase/plugin-backup-restore/package.json index 93cc950c0e..835006764a 100644 --- a/packages/plugins/@nocobase/plugin-backup-restore/package.json +++ b/packages/plugins/@nocobase/plugin-backup-restore/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/backup-restore", diff --git a/packages/plugins/@nocobase/plugin-block-iframe/package.json b/packages/plugins/@nocobase/plugin-block-iframe/package.json index 03987fbf54..df9f349994 100644 --- a/packages/plugins/@nocobase/plugin-block-iframe/package.json +++ b/packages/plugins/@nocobase/plugin-block-iframe/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/block-iframe", diff --git a/packages/plugins/@nocobase/plugin-block-workbench/package.json b/packages/plugins/@nocobase/plugin-block-workbench/package.json index 685bf701f2..83d51ecfcf 100644 --- a/packages/plugins/@nocobase/plugin-block-workbench/package.json +++ b/packages/plugins/@nocobase/plugin-block-workbench/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-block-workbench", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "displayName": "Block: Workbench", "displayName.zh-CN": "区块：工作台", "description": "Add buttons for actions, links, etc. in the workbench block to quickly initiate actions and jump pages.", diff --git a/packages/plugins/@nocobase/plugin-calendar/package.json b/packages/plugins/@nocobase/plugin-calendar/package.json index fbd9d1d54a..bf81ad8eab 100644 --- a/packages/plugins/@nocobase/plugin-calendar/package.json +++ b/packages/plugins/@nocobase/plugin-calendar/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-calendar", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "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.", diff --git a/packages/plugins/@nocobase/plugin-charts/package.json b/packages/plugins/@nocobase/plugin-charts/package.json index c8bbd9fff9..d2a85c28ce 100644 --- a/packages/plugins/@nocobase/plugin-charts/package.json +++ b/packages/plugins/@nocobase/plugin-charts/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "图表（废弃）", "description": "The plugin has been deprecated, please use the data visualization plugin instead.", "description.zh-CN": "已废弃插件，请使用数据可视化插件代替。", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "./dist/server/index.js", "license": "AGPL-3.0", "devDependencies": { diff --git a/packages/plugins/@nocobase/plugin-client/package.json b/packages/plugins/@nocobase/plugin-client/package.json index 57ed3c12c8..d60529c745 100644 --- a/packages/plugins/@nocobase/plugin-client/package.json +++ b/packages/plugins/@nocobase/plugin-client/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "WEB 客户端", "description": "Provides a client interface for the NocoBase server", "description.zh-CN": "为 NocoBase 服务端提供客户端界面", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "./dist/server/index.js", "license": "AGPL-3.0", "devDependencies": { diff --git a/packages/plugins/@nocobase/plugin-collection-sql/package.json b/packages/plugins/@nocobase/plugin-collection-sql/package.json index 8e609112b0..2975d65496 100644 --- a/packages/plugins/@nocobase/plugin-collection-sql/package.json +++ b/packages/plugins/@nocobase/plugin-collection-sql/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "数据表: SQL", "description": "Provides SQL collection template", "description.zh-CN": "提供 SQL 数据表模板", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "homepage": "https://docs-cn.nocobase.com/handbook/collection-sql", "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/collection-sql", "main": "dist/server/index.js", diff --git a/packages/plugins/@nocobase/plugin-collection-tree/package.json b/packages/plugins/@nocobase/plugin-collection-tree/package.json index 1e0c75ea71..05406659b2 100644 --- a/packages/plugins/@nocobase/plugin-collection-tree/package.json +++ b/packages/plugins/@nocobase/plugin-collection-tree/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-collection-tree", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "displayName": "Collection: Tree", "displayName.zh-CN": "数据表：树", "description": "Provides tree collection template", @@ -9,7 +9,6 @@ "Collections" ], "main": "dist/server/index.js", - "dependencies": {}, "peerDependencies": { "@nocobase/client": "1.x", "@nocobase/server": "1.x", diff --git a/packages/plugins/@nocobase/plugin-collection-tree/src/server/migrations/20240802141435-collection-tree.ts b/packages/plugins/@nocobase/plugin-collection-tree/src/server/migrations/20240802141435-collection-tree.ts index ef2fb3d90b..e3e233b430 100644 --- a/packages/plugins/@nocobase/plugin-collection-tree/src/server/migrations/20240802141435-collection-tree.ts +++ b/packages/plugins/@nocobase/plugin-collection-tree/src/server/migrations/20240802141435-collection-tree.ts @@ -14,7 +14,7 @@ import lodash from 'lodash'; export default class extends Migration { on = 'afterLoad'; // 'beforeLoad' or 'afterLoad' - appVersion = '<=1.3.0-alpha'; + appVersion = '<=1.3.0-beta'; async up() { await this.db.sequelize.transaction(async (transaction) => { diff --git a/packages/plugins/@nocobase/plugin-data-source-main/package.json b/packages/plugins/@nocobase/plugin-data-source-main/package.json index e6212be61c..7b51d7eb01 100644 --- a/packages/plugins/@nocobase/plugin-data-source-main/package.json +++ b/packages/plugins/@nocobase/plugin-data-source-main/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "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", diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/package.json b/packages/plugins/@nocobase/plugin-data-source-manager/package.json index 8f1c641be6..a2e72d6ce7 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/package.json +++ b/packages/plugins/@nocobase/plugin-data-source-manager/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-data-source-manager", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "dist/server/index.js", "displayName": "Data source manager", "displayName.zh-CN": "数据源管理", diff --git a/packages/plugins/@nocobase/plugin-data-visualization/package.json b/packages/plugins/@nocobase/plugin-data-visualization/package.json index 5ff5033484..ee1af88378 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/package.json +++ b/packages/plugins/@nocobase/plugin-data-visualization/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-data-visualization", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "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.", diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/__tests__/utils.test.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/__tests__/utils.test.ts new file mode 100644 index 0000000000..b862bedd63 --- /dev/null +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/__tests__/utils.test.ts @@ -0,0 +1,44 @@ +/** + * This file is part of the NocoBase (R) project. + * Copyright (c) 2020-2024 NocoBase Co., Ltd. + * Authors: NocoBase Team. + * + * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License. + * For more information, please refer to: https://www.nocobase.com/agreement. + */ + +import { processData } from '../utils'; + +describe('utils', () => { + it('processFields', () => { + expect( + processData( + [ + { + name: 'tag', + type: 'bigInt', + interface: 'select', + uiSchema: { + type: 'string', + enum: [ + { + value: '1', + label: 'Yes', + }, + { + value: '2', + label: 'No', + }, + ], + }, + label: 'Tag', + value: 'tag', + key: 'tag', + }, + ], + [{ tag: 1 }], + {}, + ), + ).toEqual([{ tag: 'Yes' }]); + }); +}); diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/g2plot/bar.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/g2plot/bar.ts index b8972f6d89..9b03a4a8ac 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/g2plot/bar.ts +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/g2plot/bar.ts @@ -13,7 +13,12 @@ import { ChartType } from '../chart'; export class Bar extends G2PlotChart { constructor() { - super({ name: 'bar', title: 'Bar Chart', Component: G2PlotBar, config: ['isGroup', 'isStack', 'isPercent'] }); + super({ + name: 'bar', + title: 'Bar Chart', + Component: G2PlotBar, + config: ['isGroup', 'isStack', 'isPercent', 'size'], + }); } init: ChartType['init'] = (fields, { measures, dimensions }) => { diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/g2plot/dualAxes.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/g2plot/dualAxes.ts index 39022feba7..a538440bfc 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/g2plot/dualAxes.ts +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/g2plot/dualAxes.ts @@ -61,6 +61,7 @@ export class DualAxes extends G2PlotChart { }, }, }, + 'size', ]; } diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/g2plot/pie.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/g2plot/pie.ts index 01de83535c..109940890e 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/g2plot/pie.ts +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/g2plot/pie.ts @@ -27,6 +27,7 @@ export class Pie extends G2PlotChart { title: 'colorField', required: true, }, + 'size', ]; } diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/utils.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/utils.ts index e1a098c983..a823640fa5 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/utils.ts +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/utils.ts @@ -93,7 +93,7 @@ export const processData = (selectedFields: FieldOption[], data: any[], scope: a if (Array.isArray(value)) { return value.map((v) => parseEnum(field, v)); } - const option = options.find((option) => option.value === value); + const option = options.find((option) => option.value === (value?.toString?.() || value)); return Schema.compile(option?.label || value, scope); }; return data.map((record) => { diff --git a/packages/plugins/@nocobase/plugin-disable-pm-add/package.json b/packages/plugins/@nocobase/plugin-disable-pm-add/package.json index 150e548f34..b1f6d352ae 100644 --- a/packages/plugins/@nocobase/plugin-disable-pm-add/package.json +++ b/packages/plugins/@nocobase/plugin-disable-pm-add/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-disable-pm-add", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "./dist/server/index.js", "peerDependencies": { "@nocobase/client": "1.x", diff --git a/packages/plugins/@nocobase/plugin-error-handler/package.json b/packages/plugins/@nocobase/plugin-error-handler/package.json index e1d00fed23..2ec5237125 100644 --- a/packages/plugins/@nocobase/plugin-error-handler/package.json +++ b/packages/plugins/@nocobase/plugin-error-handler/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "错误处理器", "description": "Handling application errors and exceptions.", "description.zh-CN": "处理应用程序中的错误和异常。", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { diff --git a/packages/plugins/@nocobase/plugin-field-china-region/package.json b/packages/plugins/@nocobase/plugin-field-china-region/package.json index 7d031f18d7..dd7846d4d8 100644 --- a/packages/plugins/@nocobase/plugin-field-china-region/package.json +++ b/packages/plugins/@nocobase/plugin-field-china-region/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-field-china-region", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "displayName": "Administrative divisions of China", "displayName.zh-CN": "中国行政区划", "description": "Provides data and field type for administrative divisions of China.", diff --git a/packages/plugins/@nocobase/plugin-field-formula/package.json b/packages/plugins/@nocobase/plugin-field-formula/package.json index 58fdc1844b..c1bee2cc8f 100644 --- a/packages/plugins/@nocobase/plugin-field-formula/package.json +++ b/packages/plugins/@nocobase/plugin-field-formula/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/field-formula", diff --git a/packages/plugins/@nocobase/plugin-field-m2m-array/package.json b/packages/plugins/@nocobase/plugin-field-m2m-array/package.json index 63db4e9d10..150fb553f7 100644 --- a/packages/plugins/@nocobase/plugin-field-m2m-array/package.json +++ b/packages/plugins/@nocobase/plugin-field-m2m-array/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "数据表字段：多对多 (数组)", "description": "Allows to create many to many relationships between two models by storing an array of unique keys of the target model.", "description.zh-CN": "支持通过在数组中存储目标表唯一键的方式建立多对多关系。", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "dist/server/index.js", "peerDependencies": { "@nocobase/client": "1.x", diff --git a/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json b/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json index 7537d8a2fc..bc3b98ee84 100644 --- a/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json +++ b/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "数据表字段：Markdown(Vditor)", "description": "Used to store Markdown and render it using Vditor editor, supports common Markdown syntax such as list, code, quote, etc., and supports uploading images, recordings, etc.It also allows for instant rendering, where what you see is what you get.", "description.zh-CN": "用于存储 Markdown，并使用 Vditor 编辑器渲染，支持常见 Markdown 语法，如列表，代码，引用等，并支持上传图片，录音等。同时可以做到即时渲染，所见即所得。", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/field-markdown-vditor", diff --git a/packages/plugins/@nocobase/plugin-field-sequence/package.json b/packages/plugins/@nocobase/plugin-field-sequence/package.json index e9cfadc178..43d0a5e7ce 100644 --- a/packages/plugins/@nocobase/plugin-field-sequence/package.json +++ b/packages/plugins/@nocobase/plugin-field-sequence/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/field-sequence", diff --git a/packages/plugins/@nocobase/plugin-file-manager/package.json b/packages/plugins/@nocobase/plugin-file-manager/package.json index a68bbf8d55..e040c4edd8 100644 --- a/packages/plugins/@nocobase/plugin-file-manager/package.json +++ b/packages/plugins/@nocobase/plugin-file-manager/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-file-manager", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "displayName": "File manager", "displayName.zh-CN": "文件管理器", "description": "Provides files storage services with files collection template and attachment field.", diff --git a/packages/plugins/@nocobase/plugin-gantt/package.json b/packages/plugins/@nocobase/plugin-gantt/package.json index 527e977da9..c727dc0393 100644 --- a/packages/plugins/@nocobase/plugin-gantt/package.json +++ b/packages/plugins/@nocobase/plugin-gantt/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-gantt", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "displayName": "Block: Gantt", "displayName.zh-CN": "区块：甘特图", "description": "Provides Gantt block.", diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json b/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json index 9ae3cf1f28..cdaffd49fb 100644 --- a/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json +++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/graph-collection-manager", diff --git a/packages/plugins/@nocobase/plugin-kanban/package.json b/packages/plugins/@nocobase/plugin-kanban/package.json index d838d8fb6a..76dd671ae2 100644 --- a/packages/plugins/@nocobase/plugin-kanban/package.json +++ b/packages/plugins/@nocobase/plugin-kanban/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-kanban", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/block-kanban", "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/block-kanban", diff --git a/packages/plugins/@nocobase/plugin-localization/package.json b/packages/plugins/@nocobase/plugin-localization/package.json index 86fb1058d9..e9193d9170 100644 --- a/packages/plugins/@nocobase/plugin-localization/package.json +++ b/packages/plugins/@nocobase/plugin-localization/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-localization", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/localization-management", "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/localization-management", diff --git a/packages/plugins/@nocobase/plugin-logger/package.json b/packages/plugins/@nocobase/plugin-logger/package.json index 95be05e54c..b4430b410e 100644 --- a/packages/plugins/@nocobase/plugin-logger/package.json +++ b/packages/plugins/@nocobase/plugin-logger/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/logger", diff --git a/packages/plugins/@nocobase/plugin-map/package.json b/packages/plugins/@nocobase/plugin-map/package.json index acf00f08f5..77b4249cd2 100644 --- a/packages/plugins/@nocobase/plugin-map/package.json +++ b/packages/plugins/@nocobase/plugin-map/package.json @@ -2,7 +2,7 @@ "name": "@nocobase/plugin-map", "displayName": "Block: Map", "displayName.zh-CN": "区块：地图", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "description": "Map block, support Gaode map and Google map, you can also extend more map types.", "description.zh-CN": "地图区块，支持高德地图和 Google 地图，你也可以扩展更多地图类型。", "license": "AGPL-3.0", diff --git a/packages/plugins/@nocobase/plugin-mobile-client/package.json b/packages/plugins/@nocobase/plugin-mobile-client/package.json index 41ef3af3a7..4a3dedbd6a 100644 --- a/packages/plugins/@nocobase/plugin-mobile-client/package.json +++ b/packages/plugins/@nocobase/plugin-mobile-client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-mobile-client", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/mobile-client", "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/mobile-client", diff --git a/packages/plugins/@nocobase/plugin-mobile/package.json b/packages/plugins/@nocobase/plugin-mobile/package.json index 1cc47f91a9..869253975c 100644 --- a/packages/plugins/@nocobase/plugin-mobile/package.json +++ b/packages/plugins/@nocobase/plugin-mobile/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-mobile", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/mobile", "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/mobile", diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/header/tabs/MobilePageTabs.tsx b/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/header/tabs/MobilePageTabs.tsx index 7e08e9cd35..b3ee591ead 100644 --- a/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/header/tabs/MobilePageTabs.tsx +++ b/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/header/tabs/MobilePageTabs.tsx @@ -7,16 +7,16 @@ * For more information, please refer to: https://www.nocobase.com/agreement. */ -import React, { FC, useCallback } from 'react'; import { Space, Tabs, TabsProps } from 'antd-mobile'; -import { useParams, useNavigate, Navigate } from 'react-router-dom'; +import React, { FC, useCallback } from 'react'; +import { Navigate, useNavigate, useParams } from 'react-router-dom'; -import { useMobileRoutes } from '../../../../mobile-providers'; import { DndContext, DndContextProps, Icon, SortableItem } from '@nocobase/client'; -import { useStyles } from './styles'; -import { MobilePageTabsSettings } from './settings'; -import { MobilePageTabInitializer } from './initializer'; +import { useMobileRoutes } from '../../../../mobile-providers'; import { useMobilePage } from '../../context'; +import { MobilePageTabInitializer } from './initializer'; +import { MobilePageTabsSettings } from './settings'; +import { useStyles } from './styles'; export const MobilePageTabs: FC = () => { const { activeTabBarItem, resource, refresh } = useMobileRoutes(); @@ -26,7 +26,7 @@ export const MobilePageTabs: FC = () => { const { styles } = useStyles(); const { tabSchemaUid } = useParams<{ tabSchemaUid: string }>(); const [activeKey, setActiveKey] = React.useState(() => { - return tabSchemaUid || activeTabBarItem?.children[0]?.schemaUid; + return tabSchemaUid || activeTabBarItem?.children?.[0]?.schemaUid; }); const handleChange: TabsProps['onChange'] = (schemaUid) => { setActiveKey(schemaUid); diff --git a/packages/plugins/@nocobase/plugin-mock-collections/package.json b/packages/plugins/@nocobase/plugin-mock-collections/package.json index 88407d721f..fb5e033d77 100644 --- a/packages/plugins/@nocobase/plugin-mock-collections/package.json +++ b/packages/plugins/@nocobase/plugin-mock-collections/package.json @@ -2,7 +2,7 @@ "name": "@nocobase/plugin-mock-collections", "displayName": "mock-collections", "description": "mock-collections", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "./dist/server/index.js", "license": "AGPL-3.0", "peerDependencies": { diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/package.json b/packages/plugins/@nocobase/plugin-multi-app-manager/package.json index f2ecbec54d..af14f04dfb 100644 --- a/packages/plugins/@nocobase/plugin-multi-app-manager/package.json +++ b/packages/plugins/@nocobase/plugin-multi-app-manager/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "多应用管理器", "description": "Dynamically create multiple apps without separate deployments.", "description.zh-CN": "无需单独部署即可动态创建多个应用。", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/multi-app-manager", diff --git a/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json b/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json index 49971ad888..cfc6f33d90 100644 --- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json +++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "多应用数据表共享", "description": "", "description.zh-CN": "", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "./dist/server/index.js", "devDependencies": { "@formily/react": "2.x", diff --git a/packages/plugins/@nocobase/plugin-notifications/package.json b/packages/plugins/@nocobase/plugin-notifications/package.json index 824c764469..c1b7e0e084 100644 --- a/packages/plugins/@nocobase/plugin-notifications/package.json +++ b/packages/plugins/@nocobase/plugin-notifications/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-notifications", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "description": "", "license": "AGPL-3.0", "main": "./dist/server/index.js", diff --git a/packages/plugins/@nocobase/plugin-sample-hello/package.json b/packages/plugins/@nocobase/plugin-sample-hello/package.json index 32bd69c7b0..5e1c4ec23c 100644 --- a/packages/plugins/@nocobase/plugin-sample-hello/package.json +++ b/packages/plugins/@nocobase/plugin-sample-hello/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-sample-hello", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "./dist/server/index.js", "displayName": "Hello", "displayName.zh-CN": "Hello", diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/package.json b/packages/plugins/@nocobase/plugin-snapshot-field/package.json index d66fa2a552..30a9010033 100644 --- a/packages/plugins/@nocobase/plugin-snapshot-field/package.json +++ b/packages/plugins/@nocobase/plugin-snapshot-field/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/field-snapshot", diff --git a/packages/plugins/@nocobase/plugin-system-settings/package.json b/packages/plugins/@nocobase/plugin-system-settings/package.json index 60967108bf..f3b05fd5ea 100644 --- a/packages/plugins/@nocobase/plugin-system-settings/package.json +++ b/packages/plugins/@nocobase/plugin-system-settings/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "系统设置", "description": "Used to adjust the system title, logo, language, etc.", "description.zh-CN": "用于调整系统的标题、LOGO、语言等。", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/system-settings", diff --git a/packages/plugins/@nocobase/plugin-theme-editor/package.json b/packages/plugins/@nocobase/plugin-theme-editor/package.json index 160501cfee..6a0a0172ac 100644 --- a/packages/plugins/@nocobase/plugin-theme-editor/package.json +++ b/packages/plugins/@nocobase/plugin-theme-editor/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-theme-editor", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "main": "dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/theme-editor", "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/theme-editor", diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json b/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json index 9fe1c31c7f..0f03f503a5 100644 --- a/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json +++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "UI schema 存储服务", "description": "Provides centralized UI schema storage service.", "description.zh-CN": "提供中心化的 UI schema 存储服务。", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/ui-schema-storage", diff --git a/packages/plugins/@nocobase/plugin-users/package.json b/packages/plugins/@nocobase/plugin-users/package.json index 3ca3dddc81..de694f975f 100644 --- a/packages/plugins/@nocobase/plugin-users/package.json +++ b/packages/plugins/@nocobase/plugin-users/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/users", diff --git a/packages/plugins/@nocobase/plugin-verification/package.json b/packages/plugins/@nocobase/plugin-verification/package.json index 68ea58c9c7..ee6af902f7 100644 --- a/packages/plugins/@nocobase/plugin-verification/package.json +++ b/packages/plugins/@nocobase/plugin-verification/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "验证码", "description": "verification setting.", "description.zh-CN": "验证码配置。", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/verification", diff --git a/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json b/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json index f7dcee430d..e28708cfe6 100644 --- a/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "工作流：操作后事件", "description": "Triggered after the completion of a request initiated through an action button or API, such as after adding, updating, deleting data, or \"submit to workflow\". Suitable for data processing, sending notifications, etc., after actions are completed.", "description.zh-CN": "通过操作按钮或 API 发起请求并在执行完成后触发，比如新增、更新、删除数据或者“提交至工作流”之后。适用于在操作完成后进行数据处理、发送通知等。", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/plugins/workflow-action-trigger", diff --git a/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json b/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json index f6b7492910..8e85d598f3 100644 --- a/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/workflow-aggregate", diff --git a/packages/plugins/@nocobase/plugin-workflow-delay/package.json b/packages/plugins/@nocobase/plugin-workflow-delay/package.json index 10739cf0e0..d27b5efc88 100644 --- a/packages/plugins/@nocobase/plugin-workflow-delay/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-delay/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "工作流：延时节点", "description": "Could be used in workflow parallel branch for waiting other branches.", "description.zh-CN": "可用于工作流并行分支中等待其他分支执行完成。", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/workflow-delay", diff --git a/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json b/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json index 8efde06650..431a9f48e0 100644 --- a/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/workflow-dynamic-calculation", diff --git a/packages/plugins/@nocobase/plugin-workflow-loop/package.json b/packages/plugins/@nocobase/plugin-workflow-loop/package.json index 78a487a431..0c03dfd8b7 100644 --- a/packages/plugins/@nocobase/plugin-workflow-loop/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-loop/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/workflow-loop", diff --git a/packages/plugins/@nocobase/plugin-workflow-mailer/package.json b/packages/plugins/@nocobase/plugin-workflow-mailer/package.json index bd9012d105..e18835910b 100644 --- a/packages/plugins/@nocobase/plugin-workflow-mailer/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-mailer/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "工作流：邮件发送节点", "description": "Send email in workflow.", "description.zh-CN": "可用于在工作流中发送电子邮件。", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/workflow-smtp-mailer", diff --git a/packages/plugins/@nocobase/plugin-workflow-mailer/src/client/MailerInstruction.tsx b/packages/plugins/@nocobase/plugin-workflow-mailer/src/client/MailerInstruction.tsx index a27fc28f54..0bd60a376f 100644 --- a/packages/plugins/@nocobase/plugin-workflow-mailer/src/client/MailerInstruction.tsx +++ b/packages/plugins/@nocobase/plugin-workflow-mailer/src/client/MailerInstruction.tsx @@ -53,7 +53,7 @@ export default class extends Instruction { 'x-component': 'Grid.Col', 'x-component-props': { // flex: 'auto', - width: 64, + width: 50, }, properties: { host: { @@ -61,7 +61,10 @@ export default class extends Instruction { required: true, title: `{{t("SMTP host", { ns: "${NAMESPACE}" })}}`, 'x-decorator': 'FormItem', - 'x-component': 'Input', + 'x-component': 'WorkflowVariableInput', + 'x-component-props': { + useTypedConstant: ['string'], + }, }, }, }, @@ -70,7 +73,7 @@ export default class extends Instruction { 'x-component': 'Grid.Col', 'x-component-props': { // flex: '6em', - width: 16, + width: 25, }, properties: { port: { @@ -78,11 +81,18 @@ export default class extends Instruction { required: true, title: `{{t("Port", { ns: "${NAMESPACE}" })}}`, 'x-decorator': 'FormItem', - 'x-component': 'InputNumber', + 'x-component': 'WorkflowVariableInput', 'x-component-props': { - min: 1, - max: 65535, - step: 1, + useTypedConstant: [ + [ + 'number', + { + min: 1, + max: 65535, + step: 1, + }, + ], + ], }, default: 465, }, @@ -93,14 +103,17 @@ export default class extends Instruction { 'x-component': 'Grid.Col', 'x-component-props': { // flex: '4em', - width: 16, + width: 25, }, properties: { secure: { type: 'boolean', title: `{{t("Secure", { ns: "${NAMESPACE}" })}}`, 'x-decorator': 'FormItem', - 'x-component': 'Checkbox', + 'x-component': 'WorkflowVariableInput', + 'x-component-props': { + useTypedConstant: [['boolean', { style: { width: '100%' } }]], + }, default: true, }, }, @@ -130,7 +143,10 @@ export default class extends Instruction { required: true, title: `{{t("User", { ns: "${NAMESPACE}" })}}`, 'x-decorator': 'FormItem', - 'x-component': 'Input', + 'x-component': 'WorkflowVariableInput', + 'x-component-props': { + useTypedConstant: ['string'], + }, }, }, }, @@ -143,7 +159,10 @@ export default class extends Instruction { required: true, title: `{{t("Password", { ns: "${NAMESPACE}" })}}`, 'x-decorator': 'FormItem', - 'x-component': 'Password', + 'x-component': 'WorkflowVariableInput', + 'x-component-props': { + useTypedConstant: [['string', { type: 'password' }]], + }, }, }, }, diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/package.json b/packages/plugins/@nocobase/plugin-workflow-manual/package.json index 8f2b11f3cc..05a40dd5b5 100644 --- a/packages/plugins/@nocobase/plugin-workflow-manual/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-manual/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/workflow-manual", diff --git a/packages/plugins/@nocobase/plugin-workflow-parallel/package.json b/packages/plugins/@nocobase/plugin-workflow-parallel/package.json index 584d099667..4493bff682 100644 --- a/packages/plugins/@nocobase/plugin-workflow-parallel/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-parallel/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "工作流：并行分支节点", "description": "Could be used for parallel execution of branch processes in the workflow.", "description.zh-CN": "用于在工作流中需要并行执行的分支流程。", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/workflow-parallel", diff --git a/packages/plugins/@nocobase/plugin-workflow-parallel/src/server/ParallelInstruction.ts b/packages/plugins/@nocobase/plugin-workflow-parallel/src/server/ParallelInstruction.ts index 5c0b7144d1..812ad58d8d 100644 --- a/packages/plugins/@nocobase/plugin-workflow-parallel/src/server/ParallelInstruction.ts +++ b/packages/plugins/@nocobase/plugin-workflow-parallel/src/server/ParallelInstruction.ts @@ -120,7 +120,7 @@ export default class extends Instruction { }); if (job.status === JOB_STATUS.PENDING) { - await job.save(); + await job.save({ transaction: processor.transaction }); return processor.exit(); } diff --git a/packages/plugins/@nocobase/plugin-workflow-request/package.json b/packages/plugins/@nocobase/plugin-workflow-request/package.json index 8f3502c7e4..f864fb0630 100644 --- a/packages/plugins/@nocobase/plugin-workflow-request/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-request/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/workflow-request", diff --git a/packages/plugins/@nocobase/plugin-workflow-sql/package.json b/packages/plugins/@nocobase/plugin-workflow-sql/package.json index 1a1a63d80e..facbdd3e88 100644 --- a/packages/plugins/@nocobase/plugin-workflow-sql/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-sql/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "工作流：SQL 节点", "description": "Execute SQL statements in workflow.", "description.zh-CN": "可用于在工作流中对数据库执行任意 SQL 语句。", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/workflow-sql", diff --git a/packages/plugins/@nocobase/plugin-workflow-test/package.json b/packages/plugins/@nocobase/plugin-workflow-test/package.json index 07bf8dee4a..456be85a5f 100644 --- a/packages/plugins/@nocobase/plugin-workflow-test/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-test/package.json @@ -2,7 +2,7 @@ "name": "@nocobase/plugin-workflow-test", "displayName": "Workflow: test kit", "displayName.zh-CN": "工作流：测试工具包", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "dist/server/index.js", "types": "./dist/server/index.d.ts", diff --git a/packages/plugins/@nocobase/plugin-workflow/package.json b/packages/plugins/@nocobase/plugin-workflow/package.json index d6dcca4aaf..b3ee220cf1 100644 --- a/packages/plugins/@nocobase/plugin-workflow/package.json +++ b/packages/plugins/@nocobase/plugin-workflow/package.json @@ -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": "1.3.0-alpha", + "version": "1.4.0-alpha", "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": "1.3.0-alpha" + "@nocobase/plugin-workflow-test": "1.4.0-alpha" }, "devDependencies": { "@ant-design/icons": "5.x", diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json index 18c7d275c4..5b89f1b465 100644 --- a/packages/presets/nocobase/package.json +++ b/packages/presets/nocobase/package.json @@ -1,70 +1,70 @@ { "name": "@nocobase/preset-nocobase", - "version": "1.3.0-alpha", + "version": "1.4.0-alpha", "license": "AGPL-3.0", "main": "./lib/server/index.js", "dependencies": { "@formily/json-schema": "2.x", - "@nocobase/plugin-acl": "1.3.0-alpha", - "@nocobase/plugin-action-bulk-edit": "1.3.0-alpha", - "@nocobase/plugin-action-bulk-update": "1.3.0-alpha", - "@nocobase/plugin-action-custom-request": "1.3.0-alpha", - "@nocobase/plugin-action-duplicate": "1.3.0-alpha", - "@nocobase/plugin-action-export": "1.3.0-alpha", - "@nocobase/plugin-action-import": "1.3.0-alpha", - "@nocobase/plugin-action-print": "1.3.0-alpha", - "@nocobase/plugin-api-doc": "1.3.0-alpha", - "@nocobase/plugin-api-keys": "1.3.0-alpha", - "@nocobase/plugin-audit-logs": "1.3.0-alpha", - "@nocobase/plugin-auth": "1.3.0-alpha", - "@nocobase/plugin-auth-sms": "1.3.0-alpha", - "@nocobase/plugin-backup-restore": "1.3.0-alpha", - "@nocobase/plugin-block-iframe": "1.3.0-alpha", - "@nocobase/plugin-block-workbench": "1.3.0-alpha", - "@nocobase/plugin-calendar": "1.3.0-alpha", - "@nocobase/plugin-charts": "1.3.0-alpha", - "@nocobase/plugin-client": "1.3.0-alpha", - "@nocobase/plugin-collection-tree": "1.3.0-alpha", - "@nocobase/plugin-collection-sql": "1.3.0-alpha", - "@nocobase/plugin-data-source-main": "1.3.0-alpha", - "@nocobase/plugin-data-source-manager": "1.3.0-alpha", - "@nocobase/plugin-data-visualization": "1.3.0-alpha", - "@nocobase/plugin-error-handler": "1.3.0-alpha", - "@nocobase/plugin-field-china-region": "1.3.0-alpha", - "@nocobase/plugin-field-formula": "1.3.0-alpha", - "@nocobase/plugin-field-m2m-array": "1.3.0-alpha", - "@nocobase/plugin-field-markdown-vditor": "1.3.0-alpha", - "@nocobase/plugin-field-sequence": "1.3.0-alpha", - "@nocobase/plugin-file-manager": "1.3.0-alpha", - "@nocobase/plugin-gantt": "1.3.0-alpha", - "@nocobase/plugin-graph-collection-manager": "1.3.0-alpha", - "@nocobase/plugin-kanban": "1.3.0-alpha", - "@nocobase/plugin-localization": "1.3.0-alpha", - "@nocobase/plugin-logger": "1.3.0-alpha", - "@nocobase/plugin-map": "1.3.0-alpha", - "@nocobase/plugin-mobile": "1.3.0-alpha", - "@nocobase/plugin-mobile-client": "1.3.0-alpha", - "@nocobase/plugin-mock-collections": "1.3.0-alpha", - "@nocobase/plugin-multi-app-manager": "1.3.0-alpha", - "@nocobase/plugin-multi-app-share-collection": "1.3.0-alpha", - "@nocobase/plugin-snapshot-field": "1.3.0-alpha", - "@nocobase/plugin-system-settings": "1.3.0-alpha", - "@nocobase/plugin-theme-editor": "1.3.0-alpha", - "@nocobase/plugin-ui-schema-storage": "1.3.0-alpha", - "@nocobase/plugin-users": "1.3.0-alpha", - "@nocobase/plugin-verification": "1.3.0-alpha", - "@nocobase/plugin-workflow": "1.3.0-alpha", - "@nocobase/plugin-workflow-action-trigger": "1.3.0-alpha", - "@nocobase/plugin-workflow-aggregate": "1.3.0-alpha", - "@nocobase/plugin-workflow-delay": "1.3.0-alpha", - "@nocobase/plugin-workflow-dynamic-calculation": "1.3.0-alpha", - "@nocobase/plugin-workflow-loop": "1.3.0-alpha", - "@nocobase/plugin-workflow-mailer": "1.3.0-alpha", - "@nocobase/plugin-workflow-manual": "1.3.0-alpha", - "@nocobase/plugin-workflow-parallel": "1.3.0-alpha", - "@nocobase/plugin-workflow-request": "1.3.0-alpha", - "@nocobase/plugin-workflow-sql": "1.3.0-alpha", - "@nocobase/server": "1.3.0-alpha", + "@nocobase/plugin-acl": "1.4.0-alpha", + "@nocobase/plugin-action-bulk-edit": "1.4.0-alpha", + "@nocobase/plugin-action-bulk-update": "1.4.0-alpha", + "@nocobase/plugin-action-custom-request": "1.4.0-alpha", + "@nocobase/plugin-action-duplicate": "1.4.0-alpha", + "@nocobase/plugin-action-export": "1.4.0-alpha", + "@nocobase/plugin-action-import": "1.4.0-alpha", + "@nocobase/plugin-action-print": "1.4.0-alpha", + "@nocobase/plugin-api-doc": "1.4.0-alpha", + "@nocobase/plugin-api-keys": "1.4.0-alpha", + "@nocobase/plugin-audit-logs": "1.4.0-alpha", + "@nocobase/plugin-auth": "1.4.0-alpha", + "@nocobase/plugin-auth-sms": "1.4.0-alpha", + "@nocobase/plugin-backup-restore": "1.4.0-alpha", + "@nocobase/plugin-block-iframe": "1.4.0-alpha", + "@nocobase/plugin-block-workbench": "1.4.0-alpha", + "@nocobase/plugin-calendar": "1.4.0-alpha", + "@nocobase/plugin-charts": "1.4.0-alpha", + "@nocobase/plugin-client": "1.4.0-alpha", + "@nocobase/plugin-collection-sql": "1.4.0-alpha", + "@nocobase/plugin-collection-tree": "1.4.0-alpha", + "@nocobase/plugin-data-source-main": "1.4.0-alpha", + "@nocobase/plugin-data-source-manager": "1.4.0-alpha", + "@nocobase/plugin-data-visualization": "1.4.0-alpha", + "@nocobase/plugin-error-handler": "1.4.0-alpha", + "@nocobase/plugin-field-china-region": "1.4.0-alpha", + "@nocobase/plugin-field-formula": "1.4.0-alpha", + "@nocobase/plugin-field-m2m-array": "1.4.0-alpha", + "@nocobase/plugin-field-markdown-vditor": "1.4.0-alpha", + "@nocobase/plugin-field-sequence": "1.4.0-alpha", + "@nocobase/plugin-file-manager": "1.4.0-alpha", + "@nocobase/plugin-gantt": "1.4.0-alpha", + "@nocobase/plugin-graph-collection-manager": "1.4.0-alpha", + "@nocobase/plugin-kanban": "1.4.0-alpha", + "@nocobase/plugin-localization": "1.4.0-alpha", + "@nocobase/plugin-logger": "1.4.0-alpha", + "@nocobase/plugin-map": "1.4.0-alpha", + "@nocobase/plugin-mobile": "1.4.0-alpha", + "@nocobase/plugin-mobile-client": "1.4.0-alpha", + "@nocobase/plugin-mock-collections": "1.4.0-alpha", + "@nocobase/plugin-multi-app-manager": "1.4.0-alpha", + "@nocobase/plugin-multi-app-share-collection": "1.4.0-alpha", + "@nocobase/plugin-snapshot-field": "1.4.0-alpha", + "@nocobase/plugin-system-settings": "1.4.0-alpha", + "@nocobase/plugin-theme-editor": "1.4.0-alpha", + "@nocobase/plugin-ui-schema-storage": "1.4.0-alpha", + "@nocobase/plugin-users": "1.4.0-alpha", + "@nocobase/plugin-verification": "1.4.0-alpha", + "@nocobase/plugin-workflow": "1.4.0-alpha", + "@nocobase/plugin-workflow-action-trigger": "1.4.0-alpha", + "@nocobase/plugin-workflow-aggregate": "1.4.0-alpha", + "@nocobase/plugin-workflow-delay": "1.4.0-alpha", + "@nocobase/plugin-workflow-dynamic-calculation": "1.4.0-alpha", + "@nocobase/plugin-workflow-loop": "1.4.0-alpha", + "@nocobase/plugin-workflow-mailer": "1.4.0-alpha", + "@nocobase/plugin-workflow-manual": "1.4.0-alpha", + "@nocobase/plugin-workflow-parallel": "1.4.0-alpha", + "@nocobase/plugin-workflow-request": "1.4.0-alpha", + "@nocobase/plugin-workflow-sql": "1.4.0-alpha", + "@nocobase/server": "1.4.0-alpha", "cronstrue": "^2.11.0" }, "repository": { diff --git a/release.sh b/release.sh index 17640555a6..e8e6753047 100755 --- a/release.sh +++ b/release.sh @@ -2,8 +2,7 @@ current_version=$(jq -r '.version' lerna.json) IFS='.-' read -r major minor patch label <<< "$current_version" if [ "$1" == '--is-feat' ]; then - new_minor=$((minor + 1)) - new_version="$major.$new_minor.0-$label" + new_version="$major.$minor.0-beta" echo $new_version; else new_patch=$((patch + 1)) diff --git a/yarn.lock b/yarn.lock index 6f68248d40..d8d2560727 100644 --- a/yarn.lock +++ b/yarn.lock @@ -25533,7 +25533,7 @@ ts-toolbelt@^9.6.0: resolved "https://registry.npmmirror.com/ts-toolbelt/-/ts-toolbelt-9.6.0.tgz#50a25426cfed500d4a09bd1b3afb6f28879edfd5" integrity sha512-nsZd8ZeNUzukXPlJmTBwUAuABDe/9qtVDelJeT/qW0ow3ZS3BsQJtNkan1802aM9Uf68/Y8ljw86Hu0h5IUW3w== -tsconfig-paths@^3.12.0, tsconfig-paths@^3.15.0: +tsconfig-paths@^3.15.0: version "3.15.0" resolved "https://registry.npmmirror.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4" integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg== @@ -25543,6 +25543,15 @@ tsconfig-paths@^3.12.0, tsconfig-paths@^3.15.0: minimist "^1.2.6" strip-bom "^3.0.0" +tsconfig-paths@^4.2.0: + version "4.2.0" + resolved "https://registry.npmmirror.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c" + integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg== + dependencies: + json5 "^2.2.2" + minimist "^1.2.6" + strip-bom "^3.0.0" + tsconfig@^7.0.0: version "7.0.0" resolved "https://registry.npmmirror.com/tsconfig/-/tsconfig-7.0.0.tgz#84538875a4dc216e5c4a5432b3a4dec3d54e91b7"