From ffcc60cadf24e0e327d941809c2a0325eeb68b98 Mon Sep 17 00:00:00 2001 From: chenos Date: Mon, 26 Aug 2024 15:40:22 +0800 Subject: [PATCH 001/133] fix: cannot access 'ActionPage' before initialization (#5125) --- .../antd/action/Action.Page.tsx | 64 +++++++++---------- 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/packages/core/client/src/schema-component/antd/action/Action.Page.tsx b/packages/core/client/src/schema-component/antd/action/Action.Page.tsx index e06898c3e..885d1e93e 100644 --- a/packages/core/client/src/schema-component/antd/action/Action.Page.tsx +++ b/packages/core/client/src/schema-component/antd/action/Action.Page.tsx @@ -15,45 +15,41 @@ import { BackButtonUsedInSubPage } from '../page/BackButtonUsedInSubPage'; import { TabsContextProvider, useTabsContext } from '../tabs/context'; import { useActionPageStyle } from './Action.Page.style'; import { usePopupOrSubpagesContainerDOM } from './hooks/usePopupSlotDOM'; -import { ComposedActionDrawer } from './types'; -export const ActionPage: ComposedActionDrawer = observer( - ({ level }) => { - const filedSchema = useFieldSchema(); - const ctx = useActionContext(); - const { getContainerDOM } = usePopupOrSubpagesContainerDOM(); - const { styles } = useActionPageStyle(); - const tabContext = useTabsContext(); - - const style = useMemo(() => { - return { - // 20 is the z-index value of the main page - zIndex: 20 + level, - }; - }, [level]); - - if (!ctx.visible) { - return null; - } +export function ActionPage({ level }) { + const filedSchema = useFieldSchema(); + const ctx = useActionContext(); + const { getContainerDOM } = usePopupOrSubpagesContainerDOM(); + const { styles } = useActionPageStyle(); + const tabContext = useTabsContext(); + + const style = useMemo(() => { + return { + // 20 is the z-index value of the main page + zIndex: 20 + level, + }; + }, [level]); + + if (!ctx.visible) { + return null; + } - const actionPageNode = ( -
- }> - - -
- ); + const actionPageNode = ( +
+ }> + + +
+ ); - const container = getContainerDOM(); + const container = getContainerDOM(); - if (container) { - return createPortal(actionPageNode, container); - } + if (container) { + return createPortal(actionPageNode, container); + } - return actionPageNode; - }, - { displayName: 'ActionPage' }, -); + return actionPageNode; +} ActionPage.Footer = observer( () => { From eaf23766c749f7bc2159e306ccdb95242dd60157 Mon Sep 17 00:00:00 2001 From: Junyi Date: Mon, 26 Aug 2024 15:43:26 +0800 Subject: [PATCH 002/133] fix(client): fix field names of variable input (#5128) --- .../client/src/schema-component/antd/variable/Input.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 b75aa81e5..47e2dbc6f 100644 --- a/packages/core/client/src/schema-component/antd/variable/Input.tsx +++ b/packages/core/client/src/schema-component/antd/variable/Input.tsx @@ -132,14 +132,14 @@ function getTypedConstantOption(type: string, types: UseTypeConstantType, fieldN ) : allTypes ).map((item) => - Object.keys(item).reduce( + Object.keys(fieldNames).reduce( (result, key) => - fieldNames[key] in item + key in item ? Object.assign(result, { [fieldNames[key]]: item[key], }) : result, - item, + { ...item }, ), ); return { From da966813ee1dc4af03d378c587de7b6eb95d9f5a Mon Sep 17 00:00:00 2001 From: chenos Date: Mon, 26 Aug 2024 15:51:12 +0800 Subject: [PATCH 003/133] fix(cli): support upgrade to next (#5130) --- packages/core/cli/src/commands/upgrade.js | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/packages/core/cli/src/commands/upgrade.js b/packages/core/cli/src/commands/upgrade.js index 4dc501b84..a36c0ef1f 100644 --- a/packages/core/cli/src/commands/upgrade.js +++ b/packages/core/cli/src/commands/upgrade.js @@ -23,6 +23,7 @@ module.exports = (cli) => { .command('upgrade') .allowUnknownOption() .option('--raw') + .option('--next') .option('-S|--skip-code-update') .action(async (options) => { if (hasTsNode()) promptForTs(); @@ -40,26 +41,32 @@ module.exports = (cli) => { await runAppCommand('upgrade'); return; } - // If ts-node is not installed, do not do the following - const appDevDir = resolve(process.cwd(), './storage/.app-dev'); - if (existsSync(appDevDir)) { - rmSync(appDevDir, { recursive: true, force: true }); - } + const rmAppDir = () => { + // If ts-node is not installed, do not do the following + const appDevDir = resolve(process.cwd(), './storage/.app-dev'); + if (existsSync(appDevDir)) { + rmSync(appDevDir, { recursive: true, force: true }); + } + }; const pkg = require('../../package.json'); // get latest version - const { stdout } = await run('npm', ['info', '@nocobase/cli', 'version'], { stdio: 'pipe' }); + const { stdout } = await run('npm', ['info', options.next ? '@nocobase/cli@next' : '@nocobase/cli', 'version'], { + stdio: 'pipe', + }); if (pkg.version === stdout) { await runAppCommand('upgrade'); + rmAppDir(); return; } const currentY = 1 * pkg.version.split('.')[1]; const latestY = 1 * stdout.split('.')[1]; - if (currentY > latestY) { + if (options.next || currentY > latestY) { await run('yarn', ['add', '@nocobase/cli@next', '@nocobase/devtools@next', '-W']); } else { await run('yarn', ['add', '@nocobase/cli', '@nocobase/devtools', '-W']); } await run('yarn', ['install']); await runAppCommand('upgrade'); + rmAppDir(); }); }; From 1a85719657fa0e1985839792880b07e6ec4a4780 Mon Sep 17 00:00:00 2001 From: chenos Date: Mon, 26 Aug 2024 17:49:32 +0800 Subject: [PATCH 004/133] fix(tree): missing collection schema (#5131) --- .../migrations/20240802141435-collection-tree.ts | 6 ++++-- .../plugin-collection-tree/src/server/plugin.ts | 15 ++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) 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 e3e233b43..371e22af9 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 @@ -7,10 +7,10 @@ * For more information, please refer to: https://www.nocobase.com/agreement. */ -import { Migration } from '@nocobase/server'; import { Model, SyncOptions } from '@nocobase/database'; -import { Transaction } from 'sequelize'; +import { Migration } from '@nocobase/server'; import lodash from 'lodash'; +import { Transaction } from 'sequelize'; export default class extends Migration { on = 'afterLoad'; // 'beforeLoad' or 'afterLoad' @@ -30,6 +30,7 @@ export default class extends Migration { const name = `main_${treeCollection.name}_path`; this.app.db.collection({ name, + schema: treeCollection.options.schema, autoGenId: false, timestamps: false, fields: [ @@ -48,6 +49,7 @@ export default class extends Migration { await this.app.db.getCollection(name).sync({ transaction } as SyncOptions); this.app.db.collection({ name: treeCollection.name, + schema: treeCollection.options.schema, autoGenId: false, timestamps: false, fields: [ diff --git a/packages/plugins/@nocobase/plugin-collection-tree/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-collection-tree/src/server/plugin.ts index 93faf0f44..7fce8610e 100644 --- a/packages/plugins/@nocobase/plugin-collection-tree/src/server/plugin.ts +++ b/packages/plugins/@nocobase/plugin-collection-tree/src/server/plugin.ts @@ -7,11 +7,11 @@ * For more information, please refer to: https://www.nocobase.com/agreement. */ -import { Plugin } from '@nocobase/server'; -import { Collection, Model, SyncOptions, DestroyOptions } from '@nocobase/database'; import { DataSource, SequelizeCollectionManager } from '@nocobase/data-source-manager'; -import { Transaction } from 'sequelize'; +import { Collection, DestroyOptions, Model, SyncOptions } from '@nocobase/database'; +import { Plugin } from '@nocobase/server'; import lodash from 'lodash'; +import { Transaction } from 'sequelize'; import { TreeCollection } from './tree-collection'; const getFilterTargetKey = (model: Model) => { @@ -40,7 +40,11 @@ class PluginCollectionTreeServer extends Plugin { const parentForeignKey = collection.treeParentField?.foreignKey || 'parentId'; //always define tree path collection - this.defineTreePathCollection(name); + const options = {}; + if (collection.options.schema) { + options['schema'] = collection.options.schema; + } + this.defineTreePathCollection(name, options); //afterSync collectionManager.db.on(`${collection.name}.afterSync`, async ({ transaction }) => { @@ -134,7 +138,7 @@ class PluginCollectionTreeServer extends Plugin { }); } - private async defineTreePathCollection(name: string) { + private async defineTreePathCollection(name: string, options: { schema?: string }) { this.db.collection({ name, autoGenId: false, @@ -149,6 +153,7 @@ class PluginCollectionTreeServer extends Plugin { fields: [{ name: 'path', length: 191 }], }, ], + ...options, }); } From c4b819528a15f3f7294ce4027ea64342742881f3 Mon Sep 17 00:00:00 2001 From: chenos Date: Mon, 26 Aug 2024 18:42:59 +0800 Subject: [PATCH 005/133] fix: missing schema --- .../20240802141435-collection-tree.ts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) 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 371e22af9..480ed9651 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 @@ -28,9 +28,8 @@ export default class extends Migration { for (const treeCollection of treeCollections) { const name = `main_${treeCollection.name}_path`; - this.app.db.collection({ + const collectionOptions = { name, - schema: treeCollection.options.schema, autoGenId: false, timestamps: false, fields: [ @@ -43,20 +42,27 @@ export default class extends Migration { fields: [{ name: 'path', length: 191 }], }, ], - }); + }; + if (treeCollection.options.schema) { + collectionOptions['schema'] = treeCollection.options.schema; + } + this.app.db.collection(collectionOptions); const treeExistsInDb = await this.app.db.getCollection(name).existsInDb({ transaction }); if (!treeExistsInDb) { await this.app.db.getCollection(name).sync({ transaction } as SyncOptions); - this.app.db.collection({ + const opts = { name: treeCollection.name, - schema: treeCollection.options.schema, autoGenId: false, timestamps: false, fields: [ { type: 'integer', name: 'id' }, { type: 'integer', name: 'parentId' }, ], - }); + }; + if (treeCollection.options.schema) { + opts['schema'] = treeCollection.options.schema; + } + this.app.db.collection(opts); const chunkSize = 1000; await this.app.db.getRepository(treeCollection.name).chunk({ chunkSize: chunkSize, From 97096f8a6afe04762af3c8a264533143661ef5e2 Mon Sep 17 00:00:00 2001 From: chenos Date: Mon, 26 Aug 2024 19:18:05 +0800 Subject: [PATCH 006/133] fix: test env file --- .env.test.example | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.env.test.example b/.env.test.example index 1b79c4c9e..67cbb7de2 100644 --- a/.env.test.example +++ b/.env.test.example @@ -19,6 +19,8 @@ DB_STORAGE=storage/db/nocobase-test.sqlite # DB_USER=nocobase # DB_PASSWORD=nocobase # DB_LOGGING=on +TZ=UTC +ENCRYPTION_FIELD_KEY="2DKJ)P+u(9bP5eF#MTdhy8ZJdfa(xT)K" ################# CACHE ################# # default is memory cache, when develop mode,code's change will be clear memory cache, so can use 'cache-manager-fs-hash' From c069fbebd467e418eacfa403a98f7c9e0751c4d6 Mon Sep 17 00:00:00 2001 From: YANG QIA <2013xile@gmail.com> Date: Mon, 26 Aug 2024 23:40:48 +0800 Subject: [PATCH 007/133] feat(publish): publish pro repos (#5129) * feat(publish): publish pro repos * feat: use app token * chore: add trigger branch * chore: ref main * chore: add owner * chore: change owner * chore: set repos * chore: get repo name * chore: update * chore: update * chore: update * chore: update * chore: update branch * fix: bug * fix: bug * fix: private key * feat: encrypt github app token * fix: bug * fix: token * fix: output * fix: base64 * fix: error * fix: token cut * fix: base64 * fix: repo name * chore: print token * chore: skip token revoke * fix: clone * fix: clone * fix: job * chore: shell bash * fix: ignore * fix: ignore * fix: invalid * fix: branch * fix: bug * fix: jq * fix: jq * fix: jq * fix: remove quotes * fix: directory * fix: directory * chore: update * chore: update * fix: invalid * fix: branch --- .github/workflows/get-nocobase-app-token.yml | 40 +++++ .github/workflows/manual-release.yml | 175 +++++++++++-------- .github/workflows/release-next.yml | 20 ++- .github/workflows/release.yml | 20 ++- release.sh | 7 + 5 files changed, 191 insertions(+), 71 deletions(-) create mode 100644 .github/workflows/get-nocobase-app-token.yml diff --git a/.github/workflows/get-nocobase-app-token.yml b/.github/workflows/get-nocobase-app-token.yml new file mode 100644 index 000000000..abfc2b1b2 --- /dev/null +++ b/.github/workflows/get-nocobase-app-token.yml @@ -0,0 +1,40 @@ +name: Get nocobase app github token + +on: + workflow_call: + outputs: + token: + value: ${{ jobs.get-app-token.outputs.token }} + user-id: + value: ${{ jobs.get-app-token.outputs.user-id }} + app-slug: + value: ${{ jobs.get-app-token.outputs.app-slug }} + +jobs: + get-app-token: + runs-on: ubuntu-latest + outputs: + token: ${{ steps.encrypt-token.outputs.token }} + app-slug: ${{ steps.app-token.outputs.app-slug }} + user-id: ${{ steps.get-user-id.outputs.user-id }} + steps: + - uses: actions/create-github-app-token@v1 + id: app-token + with: + app-id: ${{ vars.NOCOBASE_APP_ID }} + private-key: ${{ secrets.NOCOBASE_APP_PRIVATE_KEY }} + repositories: nocobase,pro-plugins,${{ join(fromJSON(vars.PRO_PLUGIN_REPOS), ',') }} + skip-token-revoke: true + - name: Encrypt token + id: encrypt-token + shell: bash + run: | + APP_TOKEN=${{ steps.app-token.outputs.token }}; + BINARY_ENCRYPTED_SECRET=$(echo -n "$APP_TOKEN" | openssl enc -aes-256-cbc -pbkdf2 -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); + ENCRYPTED_SECRET=$(echo -n "$BINARY_ENCRYPTED_SECRET" | base64 -w 0); + echo "token=$ENCRYPTED_SECRET" >> $GITHUB_OUTPUT + - name: Get GitHub App User ID + id: get-user-id + run: echo "user-id=$(gh api "/users/${{ steps.app-token.outputs.app-slug }}[bot]" --jq .id)" >> "$GITHUB_OUTPUT" + env: + GH_TOKEN: ${{ steps.app-token.outputs.token }} diff --git a/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml index 2c5378b21..f7565d4ce 100644 --- a/.github/workflows/manual-release.yml +++ b/.github/workflows/manual-release.yml @@ -12,14 +12,62 @@ on: type: boolean jobs: - push-commit: + app-token: + uses: nocobase/nocobase/.github/workflows/get-nocobase-app-token.yml@main + secrets: inherit + pre-merge-main-into-next: runs-on: ubuntu-latest + needs: app-token + strategy: + matrix: + repo: + - 'nocobase' + - 'pro-plugins' + - ${{ fromJSON(vars.PRO_PLUGIN_REPOS) }} steps: + - name: Decrypt app token + id: app-token + shell: bash + run: | + ENCRYPTED_SECRET=${{ needs.app-token.outputs.token }}; + BINARY_ENCRYPTED_SECRET=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode); + APP_TOKEN=$(echo -n "$BINARY_ENCRYPTED_SECRET" | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); + echo "token=$APP_TOKEN" >> $GITHUB_OUTPUT + - name: Checkout + uses: actions/checkout@v4 + with: + # ref: 'main' + repository: nocobase/${{ matrix.repo }} + fetch-depth: 0 + token: ${{ steps.app-token.outputs.token }} + - name: main -> next (nocobase/${{ matrix.repo }}) + run: | + git config --global user.name '${{ needs.app-token.outputs.app-slug }}[bot]' + git config --global user.email '${{ needs.app-token.outputs.user-id }}+${{ needs.app-token.outputs.app-slug }}[bot]@users.noreply.github.com>' + git checkout main + git pull origin main + git checkout next + git merge main + git push origin next --tags --atomic + update-version: + needs: + - app-token + - pre-merge-main-into-next + runs-on: ubuntu-latest + steps: + - name: Decrypt app token + id: app-token + shell: bash + run: | + ENCRYPTED_SECRET=${{ needs.app-token.outputs.token }}; + BINARY_ENCRYPTED_SECRET=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode); + APP_TOKEN=$(echo -n "$BINARY_ENCRYPTED_SECRET" | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); + echo "token=$APP_TOKEN" >> $GITHUB_OUTPUT - name: Checkout uses: actions/checkout@v4 with: repository: nocobase/nocobase - ssh-key: ${{ secrets.NOCOBASE_DEPLOY_KEY }} + token: ${{ steps.app-token.outputs.token }} persist-credentials: true fetch-depth: 0 - name: Checkout pro-plugins @@ -28,43 +76,15 @@ jobs: repository: nocobase/pro-plugins path: packages/pro-plugins fetch-depth: 0 - ssh-key: ${{ secrets.PRO_PLUGINS_DEPLOY_KEY }} + token: ${{ steps.app-token.outputs.token }} persist-credentials: true - - name: main -> next(nocobase) - run: | - git config --global user.email "actions@github.com" - git config --global user.name "GitHub Actions Bot" - git checkout main - git pull origin main - git checkout next - git merge main - git push origin next - - name: main -> next(pro-plugins) + - name: Clone pro repos + shell: bash run: | - cd ./packages/pro-plugins - git checkout main - git pull origin main - git checkout next - git merge main - git push origin next - - name: push pro plugins(next) - continue-on-error: true - uses: ad-m/github-push-action@master - with: - ssh: true - branch: next - directory: packages/pro-plugins - repository: nocobase/pro-plugins - tags: true - atomic: true - - name: push nocobase(next) - uses: ad-m/github-push-action@master - with: - branch: next - ssh: true - repository: nocobase/nocobase - tags: true - atomic: true + for repo in ${{ join(fromJSON(vars.PRO_PLUGIN_REPOS), ' ') }} + do + git clone -b main https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/nocobase/$repo.git packages/pro-plugins/@nocobase/$repo + done - name: Set Node.js 18 uses: actions/setup-node@v3 with: @@ -72,17 +92,33 @@ jobs: - name: Install Lerna run: npm install -g lerna@4 auto-changelog@2 - name: Run release.sh + shell: bash run: | cd ./packages/pro-plugins git checkout main + git rm -rf --cached . + for repo in ${{ join(fromJSON(vars.PRO_PLUGIN_REPOS), ' ') }} + do + echo "@nocobase/$repo" >> .git/info/exclude + done + echo "$(<.git/info/exclude )" cd ./../.. git checkout main - git config --global user.email "actions@github.com" - git config --global user.name "GitHub Actions Bot" - echo "packages/pro-plugins/" >> .git/info/exclude + git config --global user.name '${{ needs.app-token.outputs.app-slug }}[bot]' + git config --global user.email '${{ needs.app-token.outputs.user-id }}+${{ needs.app-token.outputs.app-slug }}[bot]@users.noreply.github.com>' + echo "packages/pro-plugins" >> .git/info/exclude bash release.sh $IS_FEAT env: IS_FEAT: ${{ inputs.is_feat && '--is-feat' || '' }} + PRO_PLUGIN_REPOS: ${{ vars.PRO_PLUGIN_REPOS }} + - name: push pro repos + run: | + for repo in ${{ join(fromJSON(vars.PRO_PLUGIN_REPOS), ' ') }} + do + cd ./packages/pro-plugins/@nocobase/$repo + git push origin main --atomic --tags + cd ../../../../ + done - name: push pro plugins continue-on-error: true uses: ad-m/github-push-action@master @@ -101,38 +137,39 @@ jobs: repository: nocobase/nocobase tags: true atomic: true - - name: main -> next + post-merge-main-into-next: + needs: + - app-token + - pre-merge-main-into-next + - update-version + runs-on: ubuntu-latest + strategy: + matrix: + repo: + - 'nocobase' + - 'pro-plugins' + - ${{ fromJSON(vars.PRO_PLUGIN_REPOS) }} + steps: + - name: Decrypt app token + id: app-token + shell: bash run: | - git config --global user.email "actions@github.com" - git config --global user.name "GitHub Actions Bot" - git checkout main - git pull origin main - git checkout next - git merge -X ours main --no-edit - git push origin next - - name: main -> next + ENCRYPTED_SECRET=${{ needs.app-token.outputs.token }}; + BINARY_ENCRYPTED_SECRET=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode); + APP_TOKEN=$(echo -n "$BINARY_ENCRYPTED_SECRET" | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); + echo "token=$APP_TOKEN" >> $GITHUB_OUTPUT + - name: Checkout + uses: actions/checkout@v4 + with: + repository: nocobase/${{ matrix.repo }} + fetch-depth: 0 + token: ${{ steps.app-token.outputs.token }} + - name: main -> next (nocobase/${{ matrix.repo }}) run: | - cd ./packages/pro-plugins + git config --global user.name '${{ needs.app-token.outputs.app-slug }}[bot]' + git config --global user.email '${{ needs.app-token.outputs.user-id }}+${{ needs.app-token.outputs.app-slug }}[bot]@users.noreply.github.com>' git checkout main git pull origin main git checkout next git merge -X ours main --no-edit - git push origin next - - name: push pro plugins - continue-on-error: true - uses: ad-m/github-push-action@master - with: - ssh: true - branch: next - directory: packages/pro-plugins - repository: nocobase/pro-plugins - tags: true - atomic: true - - name: push nocobase - uses: ad-m/github-push-action@master - with: - branch: next - ssh: true - repository: nocobase/nocobase - tags: true - atomic: true \ No newline at end of file + git push origin next --tags --atomic diff --git a/.github/workflows/release-next.yml b/.github/workflows/release-next.yml index 1638cf45f..0040206bf 100644 --- a/.github/workflows/release-next.yml +++ b/.github/workflows/release-next.yml @@ -8,6 +8,9 @@ on: workflow_dispatch: jobs: + app-token: + uses: nocobase/nocobase/.github/workflows/get-nocobase-app-token.yml@main + secrets: inherit publish-npm: runs-on: ubuntu-latest container: node:18 @@ -81,13 +84,28 @@ jobs: git commit -m "chore(versions): test publish packages xxx" cat lerna.json yarn release:force --no-verify-access --no-git-reset --registry https://registry.npmjs.org/ --dist-tag=next + - name: Decrypt app token + id: app-token + shell: bash + run: | + ENCRYPTED_SECRET=${{ needs.app-token.outputs.token }}; + BINARY_ENCRYPTED_SECRET=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode); + APP_TOKEN=$(echo -n "$BINARY_ENCRYPTED_SECRET" | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); + echo "token=$APP_TOKEN" >> $GITHUB_OUTPUT - name: Checkout pro-plugins uses: actions/checkout@v3 with: repository: nocobase/pro-plugins path: packages/pro-plugins ref: next - ssh-key: ${{ secrets.SUBMODULE_SSH_KEY }} + token: ${{ steps.app-token.outputs.token }} + - name: Clone pro repos + shell: bash + run: | + for repo in ${{ join(fromJSON(vars.PRO_PLUGIN_REPOS), ' ') }} + do + git clone -b next https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/nocobase/$repo.git packages/pro-plugins/@nocobase/$repo + done - name: Build Pro plugins continue-on-error: true run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9c102d6a2..f9fc38012 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,6 +10,9 @@ on: - 'v*' jobs: + app-token: + uses: nocobase/nocobase/.github/workflows/get-nocobase-app-token.yml@main + secrets: inherit publish-npm: runs-on: ubuntu-latest container: node:18 @@ -55,12 +58,27 @@ jobs: yarn config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }} npm whoami yarn release:force --no-verify-access --no-git-reset --registry https://registry.npmjs.org/ + - name: Decrypt app token + id: app-token + shell: bash + run: | + ENCRYPTED_SECRET=${{ needs.app-token.outputs.token }}; + BINARY_ENCRYPTED_SECRET=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode); + APP_TOKEN=$(echo -n "$BINARY_ENCRYPTED_SECRET" | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); + echo "token=$APP_TOKEN" >> $GITHUB_OUTPUT - name: Checkout pro-plugins uses: actions/checkout@v3 with: repository: nocobase/pro-plugins path: packages/pro-plugins - ssh-key: ${{ secrets.SUBMODULE_SSH_KEY }} + token: ${{ steps.app-token.outputs.token }} + - name: Clone pro repos + shell: bash + run: | + for repo in ${{ join(fromJSON(vars.PRO_PLUGIN_REPOS), ' ') }} + do + git clone -b main https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/nocobase/$repo.git packages/pro-plugins/@nocobase/$repo + done - name: Build Pro plugins continue-on-error: true run: | diff --git a/release.sh b/release.sh index e8e675304..323c82a3a 100755 --- a/release.sh +++ b/release.sh @@ -12,6 +12,13 @@ fi lerna version $new_version --preid alpha --force-publish=* --no-git-tag-version -y +echo $PRO_PLUGIN_REPOS | jq -r '.[]' | while read i; do + cd ./packages/pro-plugins/@nocobase/$i + git add . + git commit -m "chore(versions): 😊 publish v$(jq -r '.version' ../../../../lerna.json)" + git tag v$(jq -r '.version' ../../../../lerna.json) + cd ../../../../ +done cd ./packages/pro-plugins git add . git commit -m "chore(versions): 😊 publish v$(jq -r '.version' ../../lerna.json)" From 90967c77de9f2a1dfb279de85398248d5d50f7a2 Mon Sep 17 00:00:00 2001 From: xilesun <2013xile@gmail.com> Date: Mon, 26 Aug 2024 23:48:14 +0800 Subject: [PATCH 008/133] fix(release): token --- .github/workflows/manual-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml index f7565d4ce..7fb5ef504 100644 --- a/.github/workflows/manual-release.yml +++ b/.github/workflows/manual-release.yml @@ -123,7 +123,7 @@ jobs: continue-on-error: true uses: ad-m/github-push-action@master with: - ssh: true + github_token: ${{ steps.app-token.outputs.token }} branch: main directory: packages/pro-plugins repository: nocobase/pro-plugins @@ -133,7 +133,7 @@ jobs: uses: ad-m/github-push-action@master with: branch: main - ssh: true + github_token: ${{ steps.app-token.outputs.token }} repository: nocobase/nocobase tags: true atomic: true From 4aff92ad3bf338a8f798b3cc7460b32316f83d65 Mon Sep 17 00:00:00 2001 From: "nocobase[bot]" <179432756+nocobase[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 16:07:23 +0000 Subject: [PATCH 009/133] =?UTF-8?q?chore(versions):=20=F0=9F=98=8A=20publi?= =?UTF-8?q?sh=20v1.3.1-beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lerna.json | 2 +- packages/core/acl/package.json | 6 +- packages/core/actions/package.json | 8 +- packages/core/app/package.json | 10 +- packages/core/auth/package.json | 12 +- packages/core/build/package.json | 2 +- packages/core/cache/package.json | 2 +- packages/core/cli/package.json | 6 +- packages/core/client/package.json | 8 +- .../core/create-nocobase-app/package.json | 2 +- .../core/data-source-manager/package.json | 12 +- packages/core/database/package.json | 6 +- packages/core/devtools/package.json | 8 +- packages/core/evaluators/package.json | 4 +- packages/core/logger/package.json | 2 +- packages/core/resourcer/package.json | 4 +- packages/core/sdk/package.json | 2 +- packages/core/server/package.json | 26 ++-- packages/core/telemetry/package.json | 4 +- packages/core/test/package.json | 4 +- packages/core/utils/package.json | 2 +- .../plugins/@nocobase/plugin-acl/package.json | 2 +- .../plugin-action-bulk-edit/package.json | 2 +- .../plugin-action-bulk-update/package.json | 2 +- .../plugin-action-custom-request/package.json | 2 +- .../plugin-action-duplicate/package.json | 2 +- .../plugin-action-export/package.json | 2 +- .../plugin-action-import/package.json | 2 +- .../plugin-action-print/package.json | 2 +- .../@nocobase/plugin-api-doc/package.json | 2 +- .../@nocobase/plugin-api-keys/package.json | 2 +- .../@nocobase/plugin-audit-logs/package.json | 2 +- .../@nocobase/plugin-auth-sms/package.json | 2 +- .../@nocobase/plugin-auth/package.json | 2 +- .../plugin-backup-restore/package.json | 2 +- .../plugin-block-iframe/package.json | 2 +- .../plugin-block-workbench/package.json | 2 +- .../@nocobase/plugin-calendar/package.json | 2 +- .../@nocobase/plugin-charts/package.json | 2 +- .../@nocobase/plugin-client/package.json | 2 +- .../plugin-collection-sql/package.json | 2 +- .../plugin-collection-tree/package.json | 2 +- .../plugin-data-source-main/package.json | 2 +- .../plugin-data-source-manager/package.json | 2 +- .../plugin-data-visualization/package.json | 2 +- .../plugin-disable-pm-add/package.json | 2 +- .../plugin-error-handler/package.json | 2 +- .../plugin-field-china-region/package.json | 2 +- .../plugin-field-formula/package.json | 2 +- .../plugin-field-m2m-array/package.json | 2 +- .../plugin-field-markdown-vditor/package.json | 2 +- .../plugin-field-sequence/package.json | 2 +- .../plugin-file-manager/package.json | 2 +- .../@nocobase/plugin-gantt/package.json | 2 +- .../package.json | 2 +- .../@nocobase/plugin-kanban/package.json | 2 +- .../plugin-localization/package.json | 2 +- .../@nocobase/plugin-logger/package.json | 2 +- .../plugins/@nocobase/plugin-map/package.json | 2 +- .../plugin-mobile-client/package.json | 2 +- .../@nocobase/plugin-mobile/package.json | 2 +- .../plugin-mock-collections/package.json | 2 +- .../plugin-multi-app-manager/package.json | 2 +- .../package.json | 2 +- .../plugin-notifications/package.json | 2 +- .../plugin-sample-hello/package.json | 2 +- .../plugin-snapshot-field/package.json | 2 +- .../plugin-system-settings/package.json | 2 +- .../plugin-theme-editor/package.json | 2 +- .../plugin-ui-schema-storage/package.json | 2 +- .../@nocobase/plugin-users/package.json | 2 +- .../plugin-verification/package.json | 2 +- .../package.json | 2 +- .../plugin-workflow-aggregate/package.json | 2 +- .../plugin-workflow-delay/package.json | 2 +- .../package.json | 2 +- .../plugin-workflow-loop/package.json | 2 +- .../plugin-workflow-mailer/package.json | 2 +- .../plugin-workflow-manual/package.json | 2 +- .../plugin-workflow-parallel/package.json | 2 +- .../plugin-workflow-request/package.json | 2 +- .../plugin-workflow-sql/package.json | 2 +- .../plugin-workflow-test/package.json | 2 +- .../@nocobase/plugin-workflow/package.json | 4 +- packages/presets/nocobase/package.json | 122 +++++++++--------- 85 files changed, 191 insertions(+), 191 deletions(-) diff --git a/lerna.json b/lerna.json index 8d8b32d30..e2d2dc2eb 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.3.0-beta", + "version": "1.3.1-beta", "npmClient": "yarn", "useWorkspaces": true, "npmClientArgs": [ diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json index ce5d6db72..ab7e6e84c 100644 --- a/packages/core/acl/package.json +++ b/packages/core/acl/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/acl", - "version": "1.3.0-beta", + "version": "1.3.1-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/resourcer": "1.3.0-beta", - "@nocobase/utils": "1.3.0-beta", + "@nocobase/resourcer": "1.3.1-beta", + "@nocobase/utils": "1.3.1-beta", "minimatch": "^5.1.1" }, "repository": { diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json index a3f405be5..1155a1e41 100644 --- a/packages/core/actions/package.json +++ b/packages/core/actions/package.json @@ -1,14 +1,14 @@ { "name": "@nocobase/actions", - "version": "1.3.0-beta", + "version": "1.3.1-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/cache": "1.3.0-beta", - "@nocobase/database": "1.3.0-beta", - "@nocobase/resourcer": "1.3.0-beta" + "@nocobase/cache": "1.3.1-beta", + "@nocobase/database": "1.3.1-beta", + "@nocobase/resourcer": "1.3.1-beta" }, "repository": { "type": "git", diff --git a/packages/core/app/package.json b/packages/core/app/package.json index f6ddf9ada..f9433d0c9 100644 --- a/packages/core/app/package.json +++ b/packages/core/app/package.json @@ -1,17 +1,17 @@ { "name": "@nocobase/app", - "version": "1.3.0-beta", + "version": "1.3.1-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/database": "1.3.0-beta", - "@nocobase/preset-nocobase": "1.3.0-beta", - "@nocobase/server": "1.3.0-beta" + "@nocobase/database": "1.3.1-beta", + "@nocobase/preset-nocobase": "1.3.1-beta", + "@nocobase/server": "1.3.1-beta" }, "devDependencies": { - "@nocobase/client": "1.3.0-beta" + "@nocobase/client": "1.3.1-beta" }, "repository": { "type": "git", diff --git a/packages/core/auth/package.json b/packages/core/auth/package.json index 8063b9809..864ab0257 100644 --- a/packages/core/auth/package.json +++ b/packages/core/auth/package.json @@ -1,16 +1,16 @@ { "name": "@nocobase/auth", - "version": "1.3.0-beta", + "version": "1.3.1-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/actions": "1.3.0-beta", - "@nocobase/cache": "1.3.0-beta", - "@nocobase/database": "1.3.0-beta", - "@nocobase/resourcer": "1.3.0-beta", - "@nocobase/utils": "1.3.0-beta", + "@nocobase/actions": "1.3.1-beta", + "@nocobase/cache": "1.3.1-beta", + "@nocobase/database": "1.3.1-beta", + "@nocobase/resourcer": "1.3.1-beta", + "@nocobase/utils": "1.3.1-beta", "@types/jsonwebtoken": "^8.5.8", "jsonwebtoken": "^8.5.1" }, diff --git a/packages/core/build/package.json b/packages/core/build/package.json index 9c6a76227..e23849727 100644 --- a/packages/core/build/package.json +++ b/packages/core/build/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/build", - "version": "1.3.0-beta", + "version": "1.3.1-beta", "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 2da0bc0c7..a9e29ebbd 100644 --- a/packages/core/cache/package.json +++ b/packages/core/cache/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cache", - "version": "1.3.0-beta", + "version": "1.3.1-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json index 83a18015a..bd8e820fb 100644 --- a/packages/core/cli/package.json +++ b/packages/core/cli/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cli", - "version": "1.3.0-beta", + "version": "1.3.1-beta", "description": "", "license": "AGPL-3.0", "main": "./src/index.js", @@ -8,7 +8,7 @@ "nocobase": "./bin/index.js" }, "dependencies": { - "@nocobase/app": "1.3.0-beta", + "@nocobase/app": "1.3.1-beta", "@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-beta" + "@nocobase/devtools": "1.3.1-beta" }, "repository": { "type": "git", diff --git a/packages/core/client/package.json b/packages/core/client/package.json index 3571fb3b5..30f7968e0 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/client", - "version": "1.3.0-beta", + "version": "1.3.1-beta", "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-beta", - "@nocobase/sdk": "1.3.0-beta", - "@nocobase/utils": "1.3.0-beta", + "@nocobase/evaluators": "1.3.1-beta", + "@nocobase/sdk": "1.3.1-beta", + "@nocobase/utils": "1.3.1-beta", "ahooks": "^3.7.2", "antd": "^5.12.8", "antd-style": "3.4.5", diff --git a/packages/core/create-nocobase-app/package.json b/packages/core/create-nocobase-app/package.json index 08daa8274..5962c2a8b 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-beta", + "version": "1.3.1-beta", "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 bf06b066b..846ea557c 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-beta", + "version": "1.3.1-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/actions": "1.3.0-beta", - "@nocobase/cache": "1.3.0-beta", - "@nocobase/database": "1.3.0-beta", - "@nocobase/resourcer": "1.3.0-beta", - "@nocobase/utils": "1.3.0-beta", + "@nocobase/actions": "1.3.1-beta", + "@nocobase/cache": "1.3.1-beta", + "@nocobase/database": "1.3.1-beta", + "@nocobase/resourcer": "1.3.1-beta", + "@nocobase/utils": "1.3.1-beta", "@types/jsonwebtoken": "^8.5.8", "jsonwebtoken": "^8.5.1" }, diff --git a/packages/core/database/package.json b/packages/core/database/package.json index b2453e1e6..621dc23ec 100644 --- a/packages/core/database/package.json +++ b/packages/core/database/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/database", - "version": "1.3.0-beta", + "version": "1.3.1-beta", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { - "@nocobase/logger": "1.3.0-beta", - "@nocobase/utils": "1.3.0-beta", + "@nocobase/logger": "1.3.1-beta", + "@nocobase/utils": "1.3.1-beta", "async-mutex": "^0.3.2", "chalk": "^4.1.1", "cron-parser": "4.4.0", diff --git a/packages/core/devtools/package.json b/packages/core/devtools/package.json index d2ba64814..7e6afb1da 100644 --- a/packages/core/devtools/package.json +++ b/packages/core/devtools/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/devtools", - "version": "1.3.0-beta", + "version": "1.3.1-beta", "description": "", "license": "AGPL-3.0", "main": "./src/index.js", "dependencies": { - "@nocobase/build": "1.3.0-beta", - "@nocobase/client": "1.3.0-beta", - "@nocobase/test": "1.3.0-beta", + "@nocobase/build": "1.3.1-beta", + "@nocobase/client": "1.3.1-beta", + "@nocobase/test": "1.3.1-beta", "@types/koa": "^2.13.4", "@types/koa-bodyparser": "^4.3.4", "@types/lodash": "^4.14.177", diff --git a/packages/core/evaluators/package.json b/packages/core/evaluators/package.json index ec97d62e5..3968123a4 100644 --- a/packages/core/evaluators/package.json +++ b/packages/core/evaluators/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/evaluators", - "version": "1.3.0-beta", + "version": "1.3.1-beta", "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-beta", + "@nocobase/utils": "1.3.1-beta", "mathjs": "^10.6.0" }, "repository": { diff --git a/packages/core/logger/package.json b/packages/core/logger/package.json index 44840788a..a9705ff8b 100644 --- a/packages/core/logger/package.json +++ b/packages/core/logger/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/logger", - "version": "1.3.0-beta", + "version": "1.3.1-beta", "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 c004e2a3f..616347343 100644 --- a/packages/core/resourcer/package.json +++ b/packages/core/resourcer/package.json @@ -1,12 +1,12 @@ { "name": "@nocobase/resourcer", - "version": "1.3.0-beta", + "version": "1.3.1-beta", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { - "@nocobase/utils": "1.3.0-beta", + "@nocobase/utils": "1.3.1-beta", "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 34fe30c7d..267854051 100644 --- a/packages/core/sdk/package.json +++ b/packages/core/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/sdk", - "version": "1.3.0-beta", + "version": "1.3.1-beta", "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 939139320..c00d8c0dc 100644 --- a/packages/core/server/package.json +++ b/packages/core/server/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/server", - "version": "1.3.0-beta", + "version": "1.3.1-beta", "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-beta", - "@nocobase/actions": "1.3.0-beta", - "@nocobase/auth": "1.3.0-beta", - "@nocobase/cache": "1.3.0-beta", - "@nocobase/data-source-manager": "1.3.0-beta", - "@nocobase/database": "1.3.0-beta", - "@nocobase/evaluators": "1.3.0-beta", - "@nocobase/logger": "1.3.0-beta", - "@nocobase/resourcer": "1.3.0-beta", - "@nocobase/sdk": "1.3.0-beta", - "@nocobase/telemetry": "1.3.0-beta", - "@nocobase/utils": "1.3.0-beta", + "@nocobase/acl": "1.3.1-beta", + "@nocobase/actions": "1.3.1-beta", + "@nocobase/auth": "1.3.1-beta", + "@nocobase/cache": "1.3.1-beta", + "@nocobase/data-source-manager": "1.3.1-beta", + "@nocobase/database": "1.3.1-beta", + "@nocobase/evaluators": "1.3.1-beta", + "@nocobase/logger": "1.3.1-beta", + "@nocobase/resourcer": "1.3.1-beta", + "@nocobase/sdk": "1.3.1-beta", + "@nocobase/telemetry": "1.3.1-beta", + "@nocobase/utils": "1.3.1-beta", "@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 25e206e5f..acfc3ba98 100644 --- a/packages/core/telemetry/package.json +++ b/packages/core/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/telemetry", - "version": "1.3.0-beta", + "version": "1.3.1-beta", "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-beta", + "@nocobase/utils": "1.3.1-beta", "@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 6956382a5..3f2127248 100644 --- a/packages/core/test/package.json +++ b/packages/core/test/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/test", - "version": "1.3.0-beta", + "version": "1.3.1-beta", "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-beta", + "@nocobase/server": "1.3.1-beta", "@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 e17344121..b6e0aa552 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/utils", - "version": "1.3.0-beta", + "version": "1.3.1-beta", "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 f7c3cff5a..77bb5d80e 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-beta", + "version": "1.3.1-beta", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/acl", diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json index 069aaf436..3c32eeb91 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-beta", + "version": "1.3.1-beta", "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 562f1b20d..b1e02bd7b 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-beta", + "version": "1.3.1-beta", "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 cd7678a7a..d6eab9901 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-beta", + "version": "1.3.1-beta", "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 489754b2b..d98dc022c 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-beta", + "version": "1.3.1-beta", "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 e2f6a8c3f..48bcc3de0 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-beta", + "version": "1.3.1-beta", "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 0af786a5e..f2090a5a9 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-beta", + "version": "1.3.1-beta", "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 adfab2255..3811d283f 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-beta", + "version": "1.3.1-beta", "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 06a1f0ed2..338ad0dc6 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-beta", + "version": "1.3.1-beta", "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 e59e79c99..aff543e5d 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-beta", + "version": "1.3.1-beta", "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 b7ec07bb8..87e057347 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-beta", + "version": "1.3.1-beta", "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 04cf3202b..a849b3e11 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-beta", + "version": "1.3.1-beta", "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 ac931a000..20f961eaa 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-beta", + "version": "1.3.1-beta", "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 c42222b80..d768307d3 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-beta", + "version": "1.3.1-beta", "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 b9e2a0e5d..4a2300000 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-beta", + "version": "1.3.1-beta", "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 05921ae1a..ac7a05163 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-beta", + "version": "1.3.1-beta", "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 4315dec8d..43686b543 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-beta", + "version": "1.3.1-beta", "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 8784601af..b32497cd7 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-beta", + "version": "1.3.1-beta", "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 b1d0bbbfd..c9b0b6ab5 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-beta", + "version": "1.3.1-beta", "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 8cf1f91ea..2b8e7622f 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-beta", + "version": "1.3.1-beta", "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 d948bc0a8..ac1577fa4 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-beta", + "version": "1.3.1-beta", "displayName": "Collection: Tree", "displayName.zh-CN": "数据表：树", "description": "Provides tree collection template", diff --git a/packages/plugins/@nocobase/plugin-data-source-main/package.json b/packages/plugins/@nocobase/plugin-data-source-main/package.json index 8f52ebb40..b8305ba1c 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-beta", + "version": "1.3.1-beta", "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 3271228b7..855407002 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-beta", + "version": "1.3.1-beta", "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 be41e3a3e..699309230 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-beta", + "version": "1.3.1-beta", "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-disable-pm-add/package.json b/packages/plugins/@nocobase/plugin-disable-pm-add/package.json index 9aee732a0..de4dc9acb 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-beta", + "version": "1.3.1-beta", "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 b2d5899b2..5badcf38e 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-beta", + "version": "1.3.1-beta", "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 ddf8a8d45..ac102ead0 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-beta", + "version": "1.3.1-beta", "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 4e4646175..7e50c8eeb 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-beta", + "version": "1.3.1-beta", "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 503be69a1..a76753782 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-beta", + "version": "1.3.1-beta", "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 ad8085cf9..2ac3fb77c 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-beta", + "version": "1.3.1-beta", "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 3581932e0..c2b7eb4b9 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-beta", + "version": "1.3.1-beta", "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 439627ffc..66b500bce 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-beta", + "version": "1.3.1-beta", "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 b50dced1b..1407eb467 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-beta", + "version": "1.3.1-beta", "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 20763f7d4..aa9ebfc51 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-beta", + "version": "1.3.1-beta", "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 717e59d15..84bfff194 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-beta", + "version": "1.3.1-beta", "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 76f9659aa..aa4fc9cf5 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-beta", + "version": "1.3.1-beta", "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 23646ffbd..90a0ed89a 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-beta", + "version": "1.3.1-beta", "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 13a33fb53..e20c13c28 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-beta", + "version": "1.3.1-beta", "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 82bf4429c..f9baeb0b6 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-beta", + "version": "1.3.1-beta", "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 4bffed207..7a52cc738 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-beta", + "version": "1.3.1-beta", "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-mock-collections/package.json b/packages/plugins/@nocobase/plugin-mock-collections/package.json index 493a31c79..720ef8459 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-beta", + "version": "1.3.1-beta", "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 8c50eab22..6e2ea46bf 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-beta", + "version": "1.3.1-beta", "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 03b6b8ae9..6f7088512 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-beta", + "version": "1.3.1-beta", "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 690f5f902..758f6b3bd 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-beta", + "version": "1.3.1-beta", "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 a63809cde..0b1379532 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-beta", + "version": "1.3.1-beta", "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 d2d424aa1..bd922431d 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-beta", + "version": "1.3.1-beta", "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 a506eaa86..7c7014c09 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-beta", + "version": "1.3.1-beta", "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 54a87780e..f2900fe80 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-beta", + "version": "1.3.1-beta", "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 733208a37..308ad5d39 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-beta", + "version": "1.3.1-beta", "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 3913a7f1f..ff6a4dfe4 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-beta", + "version": "1.3.1-beta", "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 eb5070dac..d22bbd808 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-beta", + "version": "1.3.1-beta", "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 a7749f193..14bcd2d99 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-beta", + "version": "1.3.1-beta", "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 aeca81a7a..83accba0a 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-beta", + "version": "1.3.1-beta", "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 badefe6cf..af6bf4f98 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-beta", + "version": "1.3.1-beta", "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 9d55a2d57..35b2649fa 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-beta", + "version": "1.3.1-beta", "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 aa92a382f..fd3b64aa1 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-beta", + "version": "1.3.1-beta", "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 c6506f4f2..1830fcdd5 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-beta", + "version": "1.3.1-beta", "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-manual/package.json b/packages/plugins/@nocobase/plugin-workflow-manual/package.json index bb30aeee7..ca91d77be 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-beta", + "version": "1.3.1-beta", "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 9cb3827a0..3c2a3d323 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-beta", + "version": "1.3.1-beta", "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-request/package.json b/packages/plugins/@nocobase/plugin-workflow-request/package.json index 3ea639dfa..7d1b302a0 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-beta", + "version": "1.3.1-beta", "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 d7d7541c2..acef69d30 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-beta", + "version": "1.3.1-beta", "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 63e681c3a..b0486d7ba 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-beta", + "version": "1.3.1-beta", "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 1100c4cec..ee675ff18 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-beta", + "version": "1.3.1-beta", "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-beta" + "@nocobase/plugin-workflow-test": "1.3.1-beta" }, "devDependencies": { "@ant-design/icons": "5.x", diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json index fd4bb872b..e05b59cbe 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-beta", + "version": "1.3.1-beta", "license": "AGPL-3.0", "main": "./lib/server/index.js", "dependencies": { "@formily/json-schema": "2.x", - "@nocobase/plugin-acl": "1.3.0-beta", - "@nocobase/plugin-action-bulk-edit": "1.3.0-beta", - "@nocobase/plugin-action-bulk-update": "1.3.0-beta", - "@nocobase/plugin-action-custom-request": "1.3.0-beta", - "@nocobase/plugin-action-duplicate": "1.3.0-beta", - "@nocobase/plugin-action-export": "1.3.0-beta", - "@nocobase/plugin-action-import": "1.3.0-beta", - "@nocobase/plugin-action-print": "1.3.0-beta", - "@nocobase/plugin-api-doc": "1.3.0-beta", - "@nocobase/plugin-api-keys": "1.3.0-beta", - "@nocobase/plugin-audit-logs": "1.3.0-beta", - "@nocobase/plugin-auth": "1.3.0-beta", - "@nocobase/plugin-auth-sms": "1.3.0-beta", - "@nocobase/plugin-backup-restore": "1.3.0-beta", - "@nocobase/plugin-block-iframe": "1.3.0-beta", - "@nocobase/plugin-block-workbench": "1.3.0-beta", - "@nocobase/plugin-calendar": "1.3.0-beta", - "@nocobase/plugin-charts": "1.3.0-beta", - "@nocobase/plugin-client": "1.3.0-beta", - "@nocobase/plugin-collection-sql": "1.3.0-beta", - "@nocobase/plugin-collection-tree": "1.3.0-beta", - "@nocobase/plugin-data-source-main": "1.3.0-beta", - "@nocobase/plugin-data-source-manager": "1.3.0-beta", - "@nocobase/plugin-data-visualization": "1.3.0-beta", - "@nocobase/plugin-error-handler": "1.3.0-beta", - "@nocobase/plugin-field-china-region": "1.3.0-beta", - "@nocobase/plugin-field-formula": "1.3.0-beta", - "@nocobase/plugin-field-m2m-array": "1.3.0-beta", - "@nocobase/plugin-field-markdown-vditor": "1.3.0-beta", - "@nocobase/plugin-field-sequence": "1.3.0-beta", - "@nocobase/plugin-file-manager": "1.3.0-beta", - "@nocobase/plugin-gantt": "1.3.0-beta", - "@nocobase/plugin-graph-collection-manager": "1.3.0-beta", - "@nocobase/plugin-kanban": "1.3.0-beta", - "@nocobase/plugin-localization": "1.3.0-beta", - "@nocobase/plugin-logger": "1.3.0-beta", - "@nocobase/plugin-map": "1.3.0-beta", - "@nocobase/plugin-mobile": "1.3.0-beta", - "@nocobase/plugin-mobile-client": "1.3.0-beta", - "@nocobase/plugin-mock-collections": "1.3.0-beta", - "@nocobase/plugin-multi-app-manager": "1.3.0-beta", - "@nocobase/plugin-multi-app-share-collection": "1.3.0-beta", - "@nocobase/plugin-snapshot-field": "1.3.0-beta", - "@nocobase/plugin-system-settings": "1.3.0-beta", - "@nocobase/plugin-theme-editor": "1.3.0-beta", - "@nocobase/plugin-ui-schema-storage": "1.3.0-beta", - "@nocobase/plugin-users": "1.3.0-beta", - "@nocobase/plugin-verification": "1.3.0-beta", - "@nocobase/plugin-workflow": "1.3.0-beta", - "@nocobase/plugin-workflow-action-trigger": "1.3.0-beta", - "@nocobase/plugin-workflow-aggregate": "1.3.0-beta", - "@nocobase/plugin-workflow-delay": "1.3.0-beta", - "@nocobase/plugin-workflow-dynamic-calculation": "1.3.0-beta", - "@nocobase/plugin-workflow-loop": "1.3.0-beta", - "@nocobase/plugin-workflow-mailer": "1.3.0-beta", - "@nocobase/plugin-workflow-manual": "1.3.0-beta", - "@nocobase/plugin-workflow-parallel": "1.3.0-beta", - "@nocobase/plugin-workflow-request": "1.3.0-beta", - "@nocobase/plugin-workflow-sql": "1.3.0-beta", - "@nocobase/server": "1.3.0-beta", + "@nocobase/plugin-acl": "1.3.1-beta", + "@nocobase/plugin-action-bulk-edit": "1.3.1-beta", + "@nocobase/plugin-action-bulk-update": "1.3.1-beta", + "@nocobase/plugin-action-custom-request": "1.3.1-beta", + "@nocobase/plugin-action-duplicate": "1.3.1-beta", + "@nocobase/plugin-action-export": "1.3.1-beta", + "@nocobase/plugin-action-import": "1.3.1-beta", + "@nocobase/plugin-action-print": "1.3.1-beta", + "@nocobase/plugin-api-doc": "1.3.1-beta", + "@nocobase/plugin-api-keys": "1.3.1-beta", + "@nocobase/plugin-audit-logs": "1.3.1-beta", + "@nocobase/plugin-auth": "1.3.1-beta", + "@nocobase/plugin-auth-sms": "1.3.1-beta", + "@nocobase/plugin-backup-restore": "1.3.1-beta", + "@nocobase/plugin-block-iframe": "1.3.1-beta", + "@nocobase/plugin-block-workbench": "1.3.1-beta", + "@nocobase/plugin-calendar": "1.3.1-beta", + "@nocobase/plugin-charts": "1.3.1-beta", + "@nocobase/plugin-client": "1.3.1-beta", + "@nocobase/plugin-collection-sql": "1.3.1-beta", + "@nocobase/plugin-collection-tree": "1.3.1-beta", + "@nocobase/plugin-data-source-main": "1.3.1-beta", + "@nocobase/plugin-data-source-manager": "1.3.1-beta", + "@nocobase/plugin-data-visualization": "1.3.1-beta", + "@nocobase/plugin-error-handler": "1.3.1-beta", + "@nocobase/plugin-field-china-region": "1.3.1-beta", + "@nocobase/plugin-field-formula": "1.3.1-beta", + "@nocobase/plugin-field-m2m-array": "1.3.1-beta", + "@nocobase/plugin-field-markdown-vditor": "1.3.1-beta", + "@nocobase/plugin-field-sequence": "1.3.1-beta", + "@nocobase/plugin-file-manager": "1.3.1-beta", + "@nocobase/plugin-gantt": "1.3.1-beta", + "@nocobase/plugin-graph-collection-manager": "1.3.1-beta", + "@nocobase/plugin-kanban": "1.3.1-beta", + "@nocobase/plugin-localization": "1.3.1-beta", + "@nocobase/plugin-logger": "1.3.1-beta", + "@nocobase/plugin-map": "1.3.1-beta", + "@nocobase/plugin-mobile": "1.3.1-beta", + "@nocobase/plugin-mobile-client": "1.3.1-beta", + "@nocobase/plugin-mock-collections": "1.3.1-beta", + "@nocobase/plugin-multi-app-manager": "1.3.1-beta", + "@nocobase/plugin-multi-app-share-collection": "1.3.1-beta", + "@nocobase/plugin-snapshot-field": "1.3.1-beta", + "@nocobase/plugin-system-settings": "1.3.1-beta", + "@nocobase/plugin-theme-editor": "1.3.1-beta", + "@nocobase/plugin-ui-schema-storage": "1.3.1-beta", + "@nocobase/plugin-users": "1.3.1-beta", + "@nocobase/plugin-verification": "1.3.1-beta", + "@nocobase/plugin-workflow": "1.3.1-beta", + "@nocobase/plugin-workflow-action-trigger": "1.3.1-beta", + "@nocobase/plugin-workflow-aggregate": "1.3.1-beta", + "@nocobase/plugin-workflow-delay": "1.3.1-beta", + "@nocobase/plugin-workflow-dynamic-calculation": "1.3.1-beta", + "@nocobase/plugin-workflow-loop": "1.3.1-beta", + "@nocobase/plugin-workflow-mailer": "1.3.1-beta", + "@nocobase/plugin-workflow-manual": "1.3.1-beta", + "@nocobase/plugin-workflow-parallel": "1.3.1-beta", + "@nocobase/plugin-workflow-request": "1.3.1-beta", + "@nocobase/plugin-workflow-sql": "1.3.1-beta", + "@nocobase/server": "1.3.1-beta", "cronstrue": "^2.11.0" }, "repository": { From 388b0e2a8869862c86cc365ae5f347b74a372e7e Mon Sep 17 00:00:00 2001 From: "nocobase[bot]" <179432756+nocobase[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 16:07:28 +0000 Subject: [PATCH 010/133] chore: update changelog --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f75b7f629..e86d96343 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,22 @@ 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.1-beta](https://github.com/nocobase/nocobase/compare/v1.3.0-beta...v1.3.1-beta) - 2024-08-26 + +### Merged + +- feat(publish): publish pro repos [`#5129`](https://github.com/nocobase/nocobase/pull/5129) +- fix(tree): missing collection schema [`#5131`](https://github.com/nocobase/nocobase/pull/5131) +- fix(cli): support upgrade to next [`#5130`](https://github.com/nocobase/nocobase/pull/5130) +- fix(client): fix field names of variable input [`#5128`](https://github.com/nocobase/nocobase/pull/5128) +- fix: cannot access 'ActionPage' before initialization [`#5125`](https://github.com/nocobase/nocobase/pull/5125) + +### Commits + +- chore(versions): 😊 publish v1.3.1-beta [`4aff92a`](https://github.com/nocobase/nocobase/commit/4aff92ad3bf338a8f798b3cc7460b32316f83d65) +- chore: update changelog [`4515f02`](https://github.com/nocobase/nocobase/commit/4515f0220f2b5854d5b3abbbdab8d116ba818669) +- fix: missing schema [`c4b8195`](https://github.com/nocobase/nocobase/commit/c4b819528a15f3f7294ce4027ea64342742881f3) + ## [v1.3.0-beta](https://github.com/nocobase/nocobase/compare/v1.2.39-alpha...v1.3.0-beta) - 2024-08-25 ### Merged From dd247edba2d717afcc6e7df08ac7fa7cd028bc01 Mon Sep 17 00:00:00 2001 From: xilesun <2013xile@gmail.com> Date: Tue, 27 Aug 2024 00:18:43 +0800 Subject: [PATCH 011/133] fix(release): job dependency --- .github/workflows/release-next.yml | 1 + .github/workflows/release.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/release-next.yml b/.github/workflows/release-next.yml index 0040206bf..94630afd7 100644 --- a/.github/workflows/release-next.yml +++ b/.github/workflows/release-next.yml @@ -14,6 +14,7 @@ jobs: publish-npm: runs-on: ubuntu-latest container: node:18 + needs: app-token steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f9fc38012..dd301f0e2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,6 +16,7 @@ jobs: publish-npm: runs-on: ubuntu-latest container: node:18 + needs: app-token steps: - name: Checkout uses: actions/checkout@v3 From 6987d46b3eb5d928f7fc3e1d3226578913b68820 Mon Sep 17 00:00:00 2001 From: xilesun <2013xile@gmail.com> Date: Tue, 27 Aug 2024 04:56:27 +0800 Subject: [PATCH 012/133] chore(release): optimize release workflow --- .github/workflows/manual-release.yml | 64 +++++----------------------- 1 file changed, 11 insertions(+), 53 deletions(-) diff --git a/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml index 7fb5ef504..f0ed8a67c 100644 --- a/.github/workflows/manual-release.yml +++ b/.github/workflows/manual-release.yml @@ -96,7 +96,6 @@ jobs: run: | cd ./packages/pro-plugins git checkout main - git rm -rf --cached . for repo in ${{ join(fromJSON(vars.PRO_PLUGIN_REPOS), ' ') }} do echo "@nocobase/$repo" >> .git/info/exclude @@ -111,65 +110,24 @@ jobs: env: IS_FEAT: ${{ inputs.is_feat && '--is-feat' || '' }} PRO_PLUGIN_REPOS: ${{ vars.PRO_PLUGIN_REPOS }} - - name: push pro repos + - name: Push and merge into next run: | for repo in ${{ join(fromJSON(vars.PRO_PLUGIN_REPOS), ' ') }} do cd ./packages/pro-plugins/@nocobase/$repo git push origin main --atomic --tags + git checkout next + git merge -X ours main --no-edit + git push origin next --tags --atomic cd ../../../../ done - - name: push pro plugins - continue-on-error: true - uses: ad-m/github-push-action@master - with: - github_token: ${{ steps.app-token.outputs.token }} - branch: main - directory: packages/pro-plugins - repository: nocobase/pro-plugins - tags: true - atomic: true - - name: push nocobase - uses: ad-m/github-push-action@master - with: - branch: main - github_token: ${{ steps.app-token.outputs.token }} - repository: nocobase/nocobase - tags: true - atomic: true - post-merge-main-into-next: - needs: - - app-token - - pre-merge-main-into-next - - update-version - runs-on: ubuntu-latest - strategy: - matrix: - repo: - - 'nocobase' - - 'pro-plugins' - - ${{ fromJSON(vars.PRO_PLUGIN_REPOS) }} - steps: - - name: Decrypt app token - id: app-token - shell: bash - run: | - ENCRYPTED_SECRET=${{ needs.app-token.outputs.token }}; - BINARY_ENCRYPTED_SECRET=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode); - APP_TOKEN=$(echo -n "$BINARY_ENCRYPTED_SECRET" | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); - echo "token=$APP_TOKEN" >> $GITHUB_OUTPUT - - name: Checkout - uses: actions/checkout@v4 - with: - repository: nocobase/${{ matrix.repo }} - fetch-depth: 0 - token: ${{ steps.app-token.outputs.token }} - - name: main -> next (nocobase/${{ matrix.repo }}) - run: | - git config --global user.name '${{ needs.app-token.outputs.app-slug }}[bot]' - git config --global user.email '${{ needs.app-token.outputs.user-id }}+${{ needs.app-token.outputs.app-slug }}[bot]@users.noreply.github.com>' - git checkout main - git pull origin main + cd ./packages/pro-plugins + git push origin main --atomic --tags + git checkout next + git merge -X ours main --no-edit + git push origin next --tags --atomic + cd ../../ + git push origin main --atomic --tags git checkout next git merge -X ours main --no-edit git push origin next --tags --atomic From dcadaa666583b3fdc8e7caa6befd37ad442f56e6 Mon Sep 17 00:00:00 2001 From: "nocobase[bot]" <179432756+nocobase[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 20:58:26 +0000 Subject: [PATCH 013/133] =?UTF-8?q?chore(versions):=20=F0=9F=98=8A=20publi?= =?UTF-8?q?sh=20v1.3.2-beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lerna.json | 2 +- packages/core/acl/package.json | 6 +- packages/core/actions/package.json | 8 +- packages/core/app/package.json | 10 +- packages/core/auth/package.json | 12 +- packages/core/build/package.json | 2 +- packages/core/cache/package.json | 2 +- packages/core/cli/package.json | 6 +- packages/core/client/package.json | 8 +- .../core/create-nocobase-app/package.json | 2 +- .../core/data-source-manager/package.json | 12 +- packages/core/database/package.json | 6 +- packages/core/devtools/package.json | 8 +- packages/core/evaluators/package.json | 4 +- packages/core/logger/package.json | 2 +- packages/core/resourcer/package.json | 4 +- packages/core/sdk/package.json | 2 +- packages/core/server/package.json | 26 ++-- packages/core/telemetry/package.json | 4 +- packages/core/test/package.json | 4 +- packages/core/utils/package.json | 2 +- .../plugins/@nocobase/plugin-acl/package.json | 2 +- .../plugin-action-bulk-edit/package.json | 2 +- .../plugin-action-bulk-update/package.json | 2 +- .../plugin-action-custom-request/package.json | 2 +- .../plugin-action-duplicate/package.json | 2 +- .../plugin-action-export/package.json | 2 +- .../plugin-action-import/package.json | 2 +- .../plugin-action-print/package.json | 2 +- .../@nocobase/plugin-api-doc/package.json | 2 +- .../@nocobase/plugin-api-keys/package.json | 2 +- .../@nocobase/plugin-audit-logs/package.json | 2 +- .../@nocobase/plugin-auth-sms/package.json | 2 +- .../@nocobase/plugin-auth/package.json | 2 +- .../plugin-backup-restore/package.json | 2 +- .../plugin-block-iframe/package.json | 2 +- .../plugin-block-workbench/package.json | 2 +- .../@nocobase/plugin-calendar/package.json | 2 +- .../@nocobase/plugin-charts/package.json | 2 +- .../@nocobase/plugin-client/package.json | 2 +- .../plugin-collection-sql/package.json | 2 +- .../plugin-collection-tree/package.json | 2 +- .../plugin-data-source-main/package.json | 2 +- .../plugin-data-source-manager/package.json | 2 +- .../plugin-data-visualization/package.json | 2 +- .../plugin-disable-pm-add/package.json | 2 +- .../plugin-error-handler/package.json | 2 +- .../plugin-field-china-region/package.json | 2 +- .../plugin-field-formula/package.json | 2 +- .../plugin-field-m2m-array/package.json | 2 +- .../plugin-field-markdown-vditor/package.json | 2 +- .../plugin-field-sequence/package.json | 2 +- .../plugin-file-manager/package.json | 2 +- .../@nocobase/plugin-gantt/package.json | 2 +- .../package.json | 2 +- .../@nocobase/plugin-kanban/package.json | 2 +- .../plugin-localization/package.json | 2 +- .../@nocobase/plugin-logger/package.json | 2 +- .../plugins/@nocobase/plugin-map/package.json | 2 +- .../plugin-mobile-client/package.json | 2 +- .../@nocobase/plugin-mobile/package.json | 2 +- .../plugin-mock-collections/package.json | 2 +- .../plugin-multi-app-manager/package.json | 2 +- .../package.json | 2 +- .../plugin-notifications/package.json | 2 +- .../plugin-sample-hello/package.json | 2 +- .../plugin-snapshot-field/package.json | 2 +- .../plugin-system-settings/package.json | 2 +- .../plugin-theme-editor/package.json | 2 +- .../plugin-ui-schema-storage/package.json | 2 +- .../@nocobase/plugin-users/package.json | 2 +- .../plugin-verification/package.json | 2 +- .../package.json | 2 +- .../plugin-workflow-aggregate/package.json | 2 +- .../plugin-workflow-delay/package.json | 2 +- .../package.json | 2 +- .../plugin-workflow-loop/package.json | 2 +- .../plugin-workflow-mailer/package.json | 2 +- .../plugin-workflow-manual/package.json | 2 +- .../plugin-workflow-parallel/package.json | 2 +- .../plugin-workflow-request/package.json | 2 +- .../plugin-workflow-sql/package.json | 2 +- .../plugin-workflow-test/package.json | 2 +- .../@nocobase/plugin-workflow/package.json | 4 +- packages/presets/nocobase/package.json | 122 +++++++++--------- 85 files changed, 191 insertions(+), 191 deletions(-) diff --git a/lerna.json b/lerna.json index e2d2dc2eb..00dad4cc3 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.3.1-beta", + "version": "1.3.2-beta", "npmClient": "yarn", "useWorkspaces": true, "npmClientArgs": [ diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json index ab7e6e84c..4c40611c6 100644 --- a/packages/core/acl/package.json +++ b/packages/core/acl/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/acl", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/resourcer": "1.3.1-beta", - "@nocobase/utils": "1.3.1-beta", + "@nocobase/resourcer": "1.3.2-beta", + "@nocobase/utils": "1.3.2-beta", "minimatch": "^5.1.1" }, "repository": { diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json index 1155a1e41..5ebcde9ed 100644 --- a/packages/core/actions/package.json +++ b/packages/core/actions/package.json @@ -1,14 +1,14 @@ { "name": "@nocobase/actions", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/cache": "1.3.1-beta", - "@nocobase/database": "1.3.1-beta", - "@nocobase/resourcer": "1.3.1-beta" + "@nocobase/cache": "1.3.2-beta", + "@nocobase/database": "1.3.2-beta", + "@nocobase/resourcer": "1.3.2-beta" }, "repository": { "type": "git", diff --git a/packages/core/app/package.json b/packages/core/app/package.json index f9433d0c9..e1f5bebf5 100644 --- a/packages/core/app/package.json +++ b/packages/core/app/package.json @@ -1,17 +1,17 @@ { "name": "@nocobase/app", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/database": "1.3.1-beta", - "@nocobase/preset-nocobase": "1.3.1-beta", - "@nocobase/server": "1.3.1-beta" + "@nocobase/database": "1.3.2-beta", + "@nocobase/preset-nocobase": "1.3.2-beta", + "@nocobase/server": "1.3.2-beta" }, "devDependencies": { - "@nocobase/client": "1.3.1-beta" + "@nocobase/client": "1.3.2-beta" }, "repository": { "type": "git", diff --git a/packages/core/auth/package.json b/packages/core/auth/package.json index 864ab0257..a4cd87646 100644 --- a/packages/core/auth/package.json +++ b/packages/core/auth/package.json @@ -1,16 +1,16 @@ { "name": "@nocobase/auth", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/actions": "1.3.1-beta", - "@nocobase/cache": "1.3.1-beta", - "@nocobase/database": "1.3.1-beta", - "@nocobase/resourcer": "1.3.1-beta", - "@nocobase/utils": "1.3.1-beta", + "@nocobase/actions": "1.3.2-beta", + "@nocobase/cache": "1.3.2-beta", + "@nocobase/database": "1.3.2-beta", + "@nocobase/resourcer": "1.3.2-beta", + "@nocobase/utils": "1.3.2-beta", "@types/jsonwebtoken": "^8.5.8", "jsonwebtoken": "^8.5.1" }, diff --git a/packages/core/build/package.json b/packages/core/build/package.json index e23849727..4dedb8e99 100644 --- a/packages/core/build/package.json +++ b/packages/core/build/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/build", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "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 a9e29ebbd..25e7a494f 100644 --- a/packages/core/cache/package.json +++ b/packages/core/cache/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cache", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json index bd8e820fb..db3a12903 100644 --- a/packages/core/cli/package.json +++ b/packages/core/cli/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cli", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "description": "", "license": "AGPL-3.0", "main": "./src/index.js", @@ -8,7 +8,7 @@ "nocobase": "./bin/index.js" }, "dependencies": { - "@nocobase/app": "1.3.1-beta", + "@nocobase/app": "1.3.2-beta", "@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.1-beta" + "@nocobase/devtools": "1.3.2-beta" }, "repository": { "type": "git", diff --git a/packages/core/client/package.json b/packages/core/client/package.json index 30f7968e0..03ea8db7e 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/client", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "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.1-beta", - "@nocobase/sdk": "1.3.1-beta", - "@nocobase/utils": "1.3.1-beta", + "@nocobase/evaluators": "1.3.2-beta", + "@nocobase/sdk": "1.3.2-beta", + "@nocobase/utils": "1.3.2-beta", "ahooks": "^3.7.2", "antd": "^5.12.8", "antd-style": "3.4.5", diff --git a/packages/core/create-nocobase-app/package.json b/packages/core/create-nocobase-app/package.json index 5962c2a8b..401557186 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.1-beta", + "version": "1.3.2-beta", "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 846ea557c..6d4587863 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.1-beta", + "version": "1.3.2-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/actions": "1.3.1-beta", - "@nocobase/cache": "1.3.1-beta", - "@nocobase/database": "1.3.1-beta", - "@nocobase/resourcer": "1.3.1-beta", - "@nocobase/utils": "1.3.1-beta", + "@nocobase/actions": "1.3.2-beta", + "@nocobase/cache": "1.3.2-beta", + "@nocobase/database": "1.3.2-beta", + "@nocobase/resourcer": "1.3.2-beta", + "@nocobase/utils": "1.3.2-beta", "@types/jsonwebtoken": "^8.5.8", "jsonwebtoken": "^8.5.1" }, diff --git a/packages/core/database/package.json b/packages/core/database/package.json index 621dc23ec..973ca200d 100644 --- a/packages/core/database/package.json +++ b/packages/core/database/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/database", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { - "@nocobase/logger": "1.3.1-beta", - "@nocobase/utils": "1.3.1-beta", + "@nocobase/logger": "1.3.2-beta", + "@nocobase/utils": "1.3.2-beta", "async-mutex": "^0.3.2", "chalk": "^4.1.1", "cron-parser": "4.4.0", diff --git a/packages/core/devtools/package.json b/packages/core/devtools/package.json index 7e6afb1da..241ae6925 100644 --- a/packages/core/devtools/package.json +++ b/packages/core/devtools/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/devtools", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "description": "", "license": "AGPL-3.0", "main": "./src/index.js", "dependencies": { - "@nocobase/build": "1.3.1-beta", - "@nocobase/client": "1.3.1-beta", - "@nocobase/test": "1.3.1-beta", + "@nocobase/build": "1.3.2-beta", + "@nocobase/client": "1.3.2-beta", + "@nocobase/test": "1.3.2-beta", "@types/koa": "^2.13.4", "@types/koa-bodyparser": "^4.3.4", "@types/lodash": "^4.14.177", diff --git a/packages/core/evaluators/package.json b/packages/core/evaluators/package.json index 3968123a4..8a16dc2fa 100644 --- a/packages/core/evaluators/package.json +++ b/packages/core/evaluators/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/evaluators", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { "@formulajs/formulajs": "4.2.0", - "@nocobase/utils": "1.3.1-beta", + "@nocobase/utils": "1.3.2-beta", "mathjs": "^10.6.0" }, "repository": { diff --git a/packages/core/logger/package.json b/packages/core/logger/package.json index a9705ff8b..356f38b01 100644 --- a/packages/core/logger/package.json +++ b/packages/core/logger/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/logger", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "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 616347343..2ddf3b179 100644 --- a/packages/core/resourcer/package.json +++ b/packages/core/resourcer/package.json @@ -1,12 +1,12 @@ { "name": "@nocobase/resourcer", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { - "@nocobase/utils": "1.3.1-beta", + "@nocobase/utils": "1.3.2-beta", "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 267854051..d1412df57 100644 --- a/packages/core/sdk/package.json +++ b/packages/core/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/sdk", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "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 c00d8c0dc..1e2db3a4a 100644 --- a/packages/core/server/package.json +++ b/packages/core/server/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/server", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "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.1-beta", - "@nocobase/actions": "1.3.1-beta", - "@nocobase/auth": "1.3.1-beta", - "@nocobase/cache": "1.3.1-beta", - "@nocobase/data-source-manager": "1.3.1-beta", - "@nocobase/database": "1.3.1-beta", - "@nocobase/evaluators": "1.3.1-beta", - "@nocobase/logger": "1.3.1-beta", - "@nocobase/resourcer": "1.3.1-beta", - "@nocobase/sdk": "1.3.1-beta", - "@nocobase/telemetry": "1.3.1-beta", - "@nocobase/utils": "1.3.1-beta", + "@nocobase/acl": "1.3.2-beta", + "@nocobase/actions": "1.3.2-beta", + "@nocobase/auth": "1.3.2-beta", + "@nocobase/cache": "1.3.2-beta", + "@nocobase/data-source-manager": "1.3.2-beta", + "@nocobase/database": "1.3.2-beta", + "@nocobase/evaluators": "1.3.2-beta", + "@nocobase/logger": "1.3.2-beta", + "@nocobase/resourcer": "1.3.2-beta", + "@nocobase/sdk": "1.3.2-beta", + "@nocobase/telemetry": "1.3.2-beta", + "@nocobase/utils": "1.3.2-beta", "@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 acfc3ba98..602dc32fa 100644 --- a/packages/core/telemetry/package.json +++ b/packages/core/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/telemetry", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "description": "nocobase telemetry library", "license": "AGPL-3.0", "main": "./lib/index.js", @@ -11,7 +11,7 @@ "directory": "packages/telemetry" }, "dependencies": { - "@nocobase/utils": "1.3.1-beta", + "@nocobase/utils": "1.3.2-beta", "@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 3f2127248..bd4b92c9f 100644 --- a/packages/core/test/package.json +++ b/packages/core/test/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/test", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "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.1-beta", + "@nocobase/server": "1.3.2-beta", "@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 b6e0aa552..72fdd24b6 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/utils", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "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 77bb5d80e..c42413866 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.1-beta", + "version": "1.3.2-beta", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/acl", diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json index 3c32eeb91..64ba0c665 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.1-beta", + "version": "1.3.2-beta", "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 b1e02bd7b..e0ccaa56e 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.1-beta", + "version": "1.3.2-beta", "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 d6eab9901..7f7775958 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.1-beta", + "version": "1.3.2-beta", "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 d98dc022c..cb986b633 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.1-beta", + "version": "1.3.2-beta", "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 48bcc3de0..99391d062 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.1-beta", + "version": "1.3.2-beta", "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 f2090a5a9..4b48f0f31 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.1-beta", + "version": "1.3.2-beta", "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 3811d283f..4ce8de9f7 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.1-beta", + "version": "1.3.2-beta", "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 338ad0dc6..e7f5ff57b 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.1-beta", + "version": "1.3.2-beta", "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 aff543e5d..f7225a4a5 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.1-beta", + "version": "1.3.2-beta", "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 87e057347..2ed261c6a 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.1-beta", + "version": "1.3.2-beta", "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 a849b3e11..3306dfebf 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.1-beta", + "version": "1.3.2-beta", "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 20f961eaa..4c0c4fc6a 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.1-beta", + "version": "1.3.2-beta", "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 d768307d3..1ce842546 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.1-beta", + "version": "1.3.2-beta", "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 4a2300000..cca42bbf8 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.1-beta", + "version": "1.3.2-beta", "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 ac7a05163..101697f4c 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.1-beta", + "version": "1.3.2-beta", "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 43686b543..7a4fac7ca 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.1-beta", + "version": "1.3.2-beta", "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 b32497cd7..c8a36559f 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.1-beta", + "version": "1.3.2-beta", "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 c9b0b6ab5..eb69cdc18 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.1-beta", + "version": "1.3.2-beta", "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 2b8e7622f..c0d67a0c3 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.1-beta", + "version": "1.3.2-beta", "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 ac1577fa4..bc7ab38a2 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.1-beta", + "version": "1.3.2-beta", "displayName": "Collection: Tree", "displayName.zh-CN": "数据表：树", "description": "Provides tree collection template", diff --git a/packages/plugins/@nocobase/plugin-data-source-main/package.json b/packages/plugins/@nocobase/plugin-data-source-main/package.json index b8305ba1c..f7e8d05de 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.1-beta", + "version": "1.3.2-beta", "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 855407002..d797f484f 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.1-beta", + "version": "1.3.2-beta", "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 699309230..a02fbff9d 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.1-beta", + "version": "1.3.2-beta", "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-disable-pm-add/package.json b/packages/plugins/@nocobase/plugin-disable-pm-add/package.json index de4dc9acb..dbf8d4cc8 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.1-beta", + "version": "1.3.2-beta", "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 5badcf38e..2ef805a3e 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.1-beta", + "version": "1.3.2-beta", "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 ac102ead0..bc9b0f653 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.1-beta", + "version": "1.3.2-beta", "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 7e50c8eeb..c80940678 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.1-beta", + "version": "1.3.2-beta", "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 a76753782..816a7c66f 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.1-beta", + "version": "1.3.2-beta", "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 2ac3fb77c..427aa776f 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.1-beta", + "version": "1.3.2-beta", "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 c2b7eb4b9..7333c20bc 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.1-beta", + "version": "1.3.2-beta", "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 66b500bce..48660576b 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.1-beta", + "version": "1.3.2-beta", "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 1407eb467..529da3e2e 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.1-beta", + "version": "1.3.2-beta", "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 aa9ebfc51..1aa93d5ce 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.1-beta", + "version": "1.3.2-beta", "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 84bfff194..e83ae15b8 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.1-beta", + "version": "1.3.2-beta", "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 aa4fc9cf5..dd19dd2ff 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.1-beta", + "version": "1.3.2-beta", "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 90a0ed89a..12d8322c2 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.1-beta", + "version": "1.3.2-beta", "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 e20c13c28..87b379f71 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.1-beta", + "version": "1.3.2-beta", "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 f9baeb0b6..49d93ee5a 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.1-beta", + "version": "1.3.2-beta", "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 7a52cc738..871ddcb72 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.1-beta", + "version": "1.3.2-beta", "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-mock-collections/package.json b/packages/plugins/@nocobase/plugin-mock-collections/package.json index 720ef8459..bb1c38b84 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.1-beta", + "version": "1.3.2-beta", "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 6e2ea46bf..d113f3f7c 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.1-beta", + "version": "1.3.2-beta", "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 6f7088512..35426fde1 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.1-beta", + "version": "1.3.2-beta", "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 758f6b3bd..6baf8ab14 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.1-beta", + "version": "1.3.2-beta", "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 0b1379532..ac97d30f9 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.1-beta", + "version": "1.3.2-beta", "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 bd922431d..ca0ff8ecb 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.1-beta", + "version": "1.3.2-beta", "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 7c7014c09..2ad8b9e66 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.1-beta", + "version": "1.3.2-beta", "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 f2900fe80..1d8fb973b 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.1-beta", + "version": "1.3.2-beta", "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 308ad5d39..4fbcfd070 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.1-beta", + "version": "1.3.2-beta", "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 ff6a4dfe4..d16269b79 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.1-beta", + "version": "1.3.2-beta", "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 d22bbd808..033e7a199 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.1-beta", + "version": "1.3.2-beta", "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 14bcd2d99..36940c105 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.1-beta", + "version": "1.3.2-beta", "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 83accba0a..315015086 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.1-beta", + "version": "1.3.2-beta", "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 af6bf4f98..a8158c659 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.1-beta", + "version": "1.3.2-beta", "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 35b2649fa..5d0a74fc6 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.1-beta", + "version": "1.3.2-beta", "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 fd3b64aa1..1192f961a 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.1-beta", + "version": "1.3.2-beta", "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 1830fcdd5..0629c914e 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.1-beta", + "version": "1.3.2-beta", "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-manual/package.json b/packages/plugins/@nocobase/plugin-workflow-manual/package.json index ca91d77be..040d84c16 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.1-beta", + "version": "1.3.2-beta", "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 3c2a3d323..f66ff6c47 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.1-beta", + "version": "1.3.2-beta", "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-request/package.json b/packages/plugins/@nocobase/plugin-workflow-request/package.json index 7d1b302a0..bb35e6316 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.1-beta", + "version": "1.3.2-beta", "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 acef69d30..87ca20122 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.1-beta", + "version": "1.3.2-beta", "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 b0486d7ba..3f24e02e7 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.1-beta", + "version": "1.3.2-beta", "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 ee675ff18..23fdbc226 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.1-beta", + "version": "1.3.2-beta", "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.1-beta" + "@nocobase/plugin-workflow-test": "1.3.2-beta" }, "devDependencies": { "@ant-design/icons": "5.x", diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json index e05b59cbe..90487cfad 100644 --- a/packages/presets/nocobase/package.json +++ b/packages/presets/nocobase/package.json @@ -1,70 +1,70 @@ { "name": "@nocobase/preset-nocobase", - "version": "1.3.1-beta", + "version": "1.3.2-beta", "license": "AGPL-3.0", "main": "./lib/server/index.js", "dependencies": { "@formily/json-schema": "2.x", - "@nocobase/plugin-acl": "1.3.1-beta", - "@nocobase/plugin-action-bulk-edit": "1.3.1-beta", - "@nocobase/plugin-action-bulk-update": "1.3.1-beta", - "@nocobase/plugin-action-custom-request": "1.3.1-beta", - "@nocobase/plugin-action-duplicate": "1.3.1-beta", - "@nocobase/plugin-action-export": "1.3.1-beta", - "@nocobase/plugin-action-import": "1.3.1-beta", - "@nocobase/plugin-action-print": "1.3.1-beta", - "@nocobase/plugin-api-doc": "1.3.1-beta", - "@nocobase/plugin-api-keys": "1.3.1-beta", - "@nocobase/plugin-audit-logs": "1.3.1-beta", - "@nocobase/plugin-auth": "1.3.1-beta", - "@nocobase/plugin-auth-sms": "1.3.1-beta", - "@nocobase/plugin-backup-restore": "1.3.1-beta", - "@nocobase/plugin-block-iframe": "1.3.1-beta", - "@nocobase/plugin-block-workbench": "1.3.1-beta", - "@nocobase/plugin-calendar": "1.3.1-beta", - "@nocobase/plugin-charts": "1.3.1-beta", - "@nocobase/plugin-client": "1.3.1-beta", - "@nocobase/plugin-collection-sql": "1.3.1-beta", - "@nocobase/plugin-collection-tree": "1.3.1-beta", - "@nocobase/plugin-data-source-main": "1.3.1-beta", - "@nocobase/plugin-data-source-manager": "1.3.1-beta", - "@nocobase/plugin-data-visualization": "1.3.1-beta", - "@nocobase/plugin-error-handler": "1.3.1-beta", - "@nocobase/plugin-field-china-region": "1.3.1-beta", - "@nocobase/plugin-field-formula": "1.3.1-beta", - "@nocobase/plugin-field-m2m-array": "1.3.1-beta", - "@nocobase/plugin-field-markdown-vditor": "1.3.1-beta", - "@nocobase/plugin-field-sequence": "1.3.1-beta", - "@nocobase/plugin-file-manager": "1.3.1-beta", - "@nocobase/plugin-gantt": "1.3.1-beta", - "@nocobase/plugin-graph-collection-manager": "1.3.1-beta", - "@nocobase/plugin-kanban": "1.3.1-beta", - "@nocobase/plugin-localization": "1.3.1-beta", - "@nocobase/plugin-logger": "1.3.1-beta", - "@nocobase/plugin-map": "1.3.1-beta", - "@nocobase/plugin-mobile": "1.3.1-beta", - "@nocobase/plugin-mobile-client": "1.3.1-beta", - "@nocobase/plugin-mock-collections": "1.3.1-beta", - "@nocobase/plugin-multi-app-manager": "1.3.1-beta", - "@nocobase/plugin-multi-app-share-collection": "1.3.1-beta", - "@nocobase/plugin-snapshot-field": "1.3.1-beta", - "@nocobase/plugin-system-settings": "1.3.1-beta", - "@nocobase/plugin-theme-editor": "1.3.1-beta", - "@nocobase/plugin-ui-schema-storage": "1.3.1-beta", - "@nocobase/plugin-users": "1.3.1-beta", - "@nocobase/plugin-verification": "1.3.1-beta", - "@nocobase/plugin-workflow": "1.3.1-beta", - "@nocobase/plugin-workflow-action-trigger": "1.3.1-beta", - "@nocobase/plugin-workflow-aggregate": "1.3.1-beta", - "@nocobase/plugin-workflow-delay": "1.3.1-beta", - "@nocobase/plugin-workflow-dynamic-calculation": "1.3.1-beta", - "@nocobase/plugin-workflow-loop": "1.3.1-beta", - "@nocobase/plugin-workflow-mailer": "1.3.1-beta", - "@nocobase/plugin-workflow-manual": "1.3.1-beta", - "@nocobase/plugin-workflow-parallel": "1.3.1-beta", - "@nocobase/plugin-workflow-request": "1.3.1-beta", - "@nocobase/plugin-workflow-sql": "1.3.1-beta", - "@nocobase/server": "1.3.1-beta", + "@nocobase/plugin-acl": "1.3.2-beta", + "@nocobase/plugin-action-bulk-edit": "1.3.2-beta", + "@nocobase/plugin-action-bulk-update": "1.3.2-beta", + "@nocobase/plugin-action-custom-request": "1.3.2-beta", + "@nocobase/plugin-action-duplicate": "1.3.2-beta", + "@nocobase/plugin-action-export": "1.3.2-beta", + "@nocobase/plugin-action-import": "1.3.2-beta", + "@nocobase/plugin-action-print": "1.3.2-beta", + "@nocobase/plugin-api-doc": "1.3.2-beta", + "@nocobase/plugin-api-keys": "1.3.2-beta", + "@nocobase/plugin-audit-logs": "1.3.2-beta", + "@nocobase/plugin-auth": "1.3.2-beta", + "@nocobase/plugin-auth-sms": "1.3.2-beta", + "@nocobase/plugin-backup-restore": "1.3.2-beta", + "@nocobase/plugin-block-iframe": "1.3.2-beta", + "@nocobase/plugin-block-workbench": "1.3.2-beta", + "@nocobase/plugin-calendar": "1.3.2-beta", + "@nocobase/plugin-charts": "1.3.2-beta", + "@nocobase/plugin-client": "1.3.2-beta", + "@nocobase/plugin-collection-sql": "1.3.2-beta", + "@nocobase/plugin-collection-tree": "1.3.2-beta", + "@nocobase/plugin-data-source-main": "1.3.2-beta", + "@nocobase/plugin-data-source-manager": "1.3.2-beta", + "@nocobase/plugin-data-visualization": "1.3.2-beta", + "@nocobase/plugin-error-handler": "1.3.2-beta", + "@nocobase/plugin-field-china-region": "1.3.2-beta", + "@nocobase/plugin-field-formula": "1.3.2-beta", + "@nocobase/plugin-field-m2m-array": "1.3.2-beta", + "@nocobase/plugin-field-markdown-vditor": "1.3.2-beta", + "@nocobase/plugin-field-sequence": "1.3.2-beta", + "@nocobase/plugin-file-manager": "1.3.2-beta", + "@nocobase/plugin-gantt": "1.3.2-beta", + "@nocobase/plugin-graph-collection-manager": "1.3.2-beta", + "@nocobase/plugin-kanban": "1.3.2-beta", + "@nocobase/plugin-localization": "1.3.2-beta", + "@nocobase/plugin-logger": "1.3.2-beta", + "@nocobase/plugin-map": "1.3.2-beta", + "@nocobase/plugin-mobile": "1.3.2-beta", + "@nocobase/plugin-mobile-client": "1.3.2-beta", + "@nocobase/plugin-mock-collections": "1.3.2-beta", + "@nocobase/plugin-multi-app-manager": "1.3.2-beta", + "@nocobase/plugin-multi-app-share-collection": "1.3.2-beta", + "@nocobase/plugin-snapshot-field": "1.3.2-beta", + "@nocobase/plugin-system-settings": "1.3.2-beta", + "@nocobase/plugin-theme-editor": "1.3.2-beta", + "@nocobase/plugin-ui-schema-storage": "1.3.2-beta", + "@nocobase/plugin-users": "1.3.2-beta", + "@nocobase/plugin-verification": "1.3.2-beta", + "@nocobase/plugin-workflow": "1.3.2-beta", + "@nocobase/plugin-workflow-action-trigger": "1.3.2-beta", + "@nocobase/plugin-workflow-aggregate": "1.3.2-beta", + "@nocobase/plugin-workflow-delay": "1.3.2-beta", + "@nocobase/plugin-workflow-dynamic-calculation": "1.3.2-beta", + "@nocobase/plugin-workflow-loop": "1.3.2-beta", + "@nocobase/plugin-workflow-mailer": "1.3.2-beta", + "@nocobase/plugin-workflow-manual": "1.3.2-beta", + "@nocobase/plugin-workflow-parallel": "1.3.2-beta", + "@nocobase/plugin-workflow-request": "1.3.2-beta", + "@nocobase/plugin-workflow-sql": "1.3.2-beta", + "@nocobase/server": "1.3.2-beta", "cronstrue": "^2.11.0" }, "repository": { From 7c28f4d06690d6b36701f773a933287c0a395a6d Mon Sep 17 00:00:00 2001 From: "nocobase[bot]" <179432756+nocobase[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 20:58:31 +0000 Subject: [PATCH 014/133] chore: update changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e86d96343..34d8758e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,14 @@ 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.2-beta](https://github.com/nocobase/nocobase/compare/v1.3.1-beta...v1.3.2-beta) - 2024-08-26 + +### Commits + +- chore(versions): 😊 publish v1.3.2-beta [`dcadaa6`](https://github.com/nocobase/nocobase/commit/dcadaa666583b3fdc8e7caa6befd37ad442f56e6) +- chore(release): optimize release workflow [`6987d46`](https://github.com/nocobase/nocobase/commit/6987d46b3eb5d928f7fc3e1d3226578913b68820) +- chore: update changelog [`388b0e2`](https://github.com/nocobase/nocobase/commit/388b0e2a8869862c86cc365ae5f347b74a372e7e) + ## [v1.3.1-beta](https://github.com/nocobase/nocobase/compare/v1.3.0-beta...v1.3.1-beta) - 2024-08-26 ### Merged From 685f0764f17d2f5ade1428ad4d70b57939cfefa0 Mon Sep 17 00:00:00 2001 From: YANG QIA <2013xile@gmail.com> Date: Tue, 27 Aug 2024 06:46:25 +0800 Subject: [PATCH 015/133] chore: optimize pro image build ci (#5140) * chore: optimize pro image build ci * chore: update * chore: update * fix: branch --- .github/workflows/build-pro-image.yml | 49 ++++++++++++++++++-- .github/workflows/manual-build-pro-image.yml | 34 ++++++++++++-- .github/workflows/release-next.yml | 16 +++---- .github/workflows/release.yml | 16 +++---- 4 files changed, 91 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build-pro-image.yml b/.github/workflows/build-pro-image.yml index de5761a3a..a1deadc82 100644 --- a/.github/workflows/build-pro-image.yml +++ b/.github/workflows/build-pro-image.yml @@ -15,8 +15,12 @@ on: - '.github/workflows/build-pro-image.yml' jobs: - build-and-push: + app-token: if: github.event.pull_request.head.repo.fork != true + uses: nocobase/nocobase/.github/workflows/get-nocobase-app-token.yml@main + secrets: inherit + build-and-push: + needs: app-token runs-on: ubuntu-latest services: verdaccio: @@ -24,10 +28,18 @@ jobs: ports: - 4873:4873 steps: + - name: Decrypt app token + id: app-token + shell: bash + run: | + ENCRYPTED_SECRET=${{ needs.app-token.outputs.token }}; + BINARY_ENCRYPTED_SECRET=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode); + APP_TOKEN=$(echo -n "$BINARY_ENCRYPTED_SECRET" | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); + echo "token=$APP_TOKEN" >> $GITHUB_OUTPUT - name: Checkout uses: actions/checkout@v3 with: - ssh-key: ${{ secrets.SUBMODULE_SSH_KEY }} + token: ${{ steps.app-token.outputs.token }} submodules: true - name: Checkout pro-plugins uses: actions/checkout@v3 @@ -36,7 +48,14 @@ jobs: ref: main path: packages/pro-plugins fetch-depth: 0 - ssh-key: ${{ secrets.SUBMODULE_SSH_KEY }} + token: ${{ steps.app-token.outputs.token }} + - name: Clone pro repos + shell: bash + run: | + for repo in ${{ join(fromJSON(vars.PRO_PLUGIN_REPOS), ' ') }} + do + git clone -b main https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/nocobase/$repo.git packages/pro-plugins/@nocobase/$repo + done - run: | cd packages/pro-plugins && if git show-ref --quiet refs/remotes/origin/${{ github.head_ref || github.ref_name }}; then @@ -48,8 +67,30 @@ jobs: git checkout main fi fi + - run: | + for repo in ${{ join(fromJSON(vars.PRO_PLUGIN_REPOS), ' ') }} + do + cd ./packages/pro-plugins/@nocobase/$repo + if git show-ref --quiet refs/remotes/origin/${{ github.head_ref || github.ref_name }}; then + git checkout ${{ github.head_ref || github.ref_name }} + else + if git show-ref --quiet refs/remotes/origin/${{ github.event.pull_request.base.ref }}; then + git checkout ${{ github.event.pull_request.base.ref }} + else + git checkout main + fi + fi + cd ../../../../ + done - name: rm .git - run: rm -rf packages/pro-plugins/.git && git config --global user.email "you@example.com" && git config --global user.name "Your Name" && git add -A && git commit -m "tmp commit" + run: | + rm -rf packages/pro-plugins/.git + for repo in ${{ join(fromJSON(vars.PRO_PLUGIN_REPOS), ' ') }} + do + rm -rf packages/pro-plugins/@nocobase/$repo/.git + done + git config --global user.email "you@example.com" + git config --global user.name "Your Name" && git add -A && git commit -m "tmp commit" - name: Set up QEMU uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx diff --git a/.github/workflows/manual-build-pro-image.yml b/.github/workflows/manual-build-pro-image.yml index fbddf5f7a..b23c8be2f 100644 --- a/.github/workflows/manual-build-pro-image.yml +++ b/.github/workflows/manual-build-pro-image.yml @@ -16,8 +16,12 @@ on: required: true jobs: - build-and-push: + app-token: if: github.event.pull_request.head.repo.fork != true + uses: nocobase/nocobase/.github/workflows/get-nocobase-app-token.yml@main + secrets: inherit + build-and-push: + needs: app-token runs-on: ubuntu-latest services: verdaccio: @@ -25,11 +29,19 @@ jobs: ports: - 4873:4873 steps: + - name: Decrypt app token + id: app-token + shell: bash + run: | + ENCRYPTED_SECRET=${{ needs.app-token.outputs.token }}; + BINARY_ENCRYPTED_SECRET=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode); + APP_TOKEN=$(echo -n "$BINARY_ENCRYPTED_SECRET" | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); + echo "token=$APP_TOKEN" >> $GITHUB_OUTPUT - name: Checkout uses: actions/checkout@v3 with: ref: ${{ github.event.inputs.base_branch }} - ssh-key: ${{ secrets.SUBMODULE_SSH_KEY }} + token: ${{ steps.app-token.outputs.token }} submodules: true - name: Set PR branch id: set_pro_pr_branch @@ -43,9 +55,23 @@ jobs: repository: nocobase/pro-plugins path: packages/pro-plugins ref: ${{ steps.set_pro_pr_branch.outputs.pr_branch || 'main' }} - ssh-key: ${{ secrets.SUBMODULE_SSH_KEY }} + token: ${{ steps.app-token.outputs.token }} + - name: Clone pro repos + shell: bash + run: | + for repo in ${{ join(fromJSON(vars.PRO_PLUGIN_REPOS), ' ') }} + do + git clone -b ${{ steps.set_pro_pr_branch.outputs.pr_branch || 'main' }} https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/nocobase/$repo.git packages/pro-plugins/@nocobase/$repo + done - name: rm .git - run: rm -rf packages/pro-plugins/.git && git config --global user.email "you@example.com" && git config --global user.name "Your Name" && git add -A && git commit -m "tmp commit" + run: | + rm -rf packages/pro-plugins/.git + for repo in ${{ join(fromJSON(vars.PRO_PLUGIN_REPOS), ' ') }} + do + rm -rf packages/pro-plugins/@nocobase/$repo/.git + done + git config --global user.email "you@example.com" + git config --global user.name "Your Name" && git add -A && git commit -m "tmp commit" - name: Set up QEMU uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx diff --git a/.github/workflows/release-next.yml b/.github/workflows/release-next.yml index 94630afd7..cd05b0d36 100644 --- a/.github/workflows/release-next.yml +++ b/.github/workflows/release-next.yml @@ -16,6 +16,14 @@ jobs: container: node:18 needs: app-token steps: + - name: Decrypt app token + id: app-token + shell: bash + run: | + ENCRYPTED_SECRET=${{ needs.app-token.outputs.token }}; + BINARY_ENCRYPTED_SECRET=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode); + APP_TOKEN=$(echo -n "$BINARY_ENCRYPTED_SECRET" | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); + echo "token=$APP_TOKEN" >> $GITHUB_OUTPUT - name: Checkout uses: actions/checkout@v4 with: @@ -85,14 +93,6 @@ jobs: git commit -m "chore(versions): test publish packages xxx" cat lerna.json yarn release:force --no-verify-access --no-git-reset --registry https://registry.npmjs.org/ --dist-tag=next - - name: Decrypt app token - id: app-token - shell: bash - run: | - ENCRYPTED_SECRET=${{ needs.app-token.outputs.token }}; - BINARY_ENCRYPTED_SECRET=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode); - APP_TOKEN=$(echo -n "$BINARY_ENCRYPTED_SECRET" | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); - echo "token=$APP_TOKEN" >> $GITHUB_OUTPUT - name: Checkout pro-plugins uses: actions/checkout@v3 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dd301f0e2..de07b0f00 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,6 +18,14 @@ jobs: container: node:18 needs: app-token steps: + - name: Decrypt app token + id: app-token + shell: bash + run: | + ENCRYPTED_SECRET=${{ needs.app-token.outputs.token }}; + BINARY_ENCRYPTED_SECRET=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode); + APP_TOKEN=$(echo -n "$BINARY_ENCRYPTED_SECRET" | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); + echo "token=$APP_TOKEN" >> $GITHUB_OUTPUT - name: Checkout uses: actions/checkout@v3 - name: Send curl request and parse response @@ -59,14 +67,6 @@ jobs: yarn config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }} npm whoami yarn release:force --no-verify-access --no-git-reset --registry https://registry.npmjs.org/ - - name: Decrypt app token - id: app-token - shell: bash - run: | - ENCRYPTED_SECRET=${{ needs.app-token.outputs.token }}; - BINARY_ENCRYPTED_SECRET=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode); - APP_TOKEN=$(echo -n "$BINARY_ENCRYPTED_SECRET" | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); - echo "token=$APP_TOKEN" >> $GITHUB_OUTPUT - name: Checkout pro-plugins uses: actions/checkout@v3 with: From 1de0ce5e1a28640a3faee6ced4f163f1e9ddd660 Mon Sep 17 00:00:00 2001 From: chenos Date: Tue, 27 Aug 2024 07:15:54 +0800 Subject: [PATCH 016/133] fix: use the built-in logo file (#5032) * fix: logo url * fix: logo with internal url * fix: tz * fix: improve code * fix: tz * fix: tz * fix: test case * fix: tz --- packages/core/app/client/public/nocobase.png | Bin 0 -> 11186 bytes packages/core/cli/src/util.js | 6 +- .../src/server/__tests__/sync.test.ts | 55 ++++-------------- .../src/server/logo.png | Bin 0 -> 11186 bytes .../src/server/server.ts | 27 ++++++--- 5 files changed, 36 insertions(+), 52 deletions(-) create mode 100644 packages/core/app/client/public/nocobase.png create mode 100644 packages/plugins/@nocobase/plugin-system-settings/src/server/logo.png diff --git a/packages/core/app/client/public/nocobase.png b/packages/core/app/client/public/nocobase.png new file mode 100644 index 0000000000000000000000000000000000000000..6f6625caaa7b324dfec0b85a60ac2aad30a1f649 GIT binary patch literal 11186 zcmaKSby!v3+U=%WKvHr`H=FM6Mp_ZcP4}j|JEajM4G@r0q)U)akq`lCkOt|vlk=V5 z`R*V0-1YFlWk z&m#{7BM)5{YY%U8cQ{1G%EbZ>RdF)6f$PA{t$f}3;o=Yo3Z0#vk%y6nx~Qd#6PNjY z8!jIwSI`>*5ts6DHMewtdq6GVHg?Vubo!+z_ z>E~c6Vnrt<2^IGd1p_$2J-^&CRjN8ZDm79kPcK=BKG}O@e z|2K7V`cG?whYtLI=llO07@_Cu3g^~=BV0V)Ey2cF)8F69RaDL$ZtmgYuIJ+7_|Gb8 z+q!tTAZ%S+p>n!{P!>ZwXDb(P1na-rYiNk7I3qmFoh{)i@)C4l1TH%}D^XcNVP082 z1qA_^91jnVf~>57oUj56CMO6J=93o`5&EaEyo;r$6WrP3pT1WA+gI_w_Pq}UCs%N1 zdAPfs7u-tG-Ngy|uSXWO`|op+`>*5uyRX%MpNsr|?aK`&!+pQ8|JO$U^A(7m`;Y$# zTky|+0w3-SqTL;Y^+)|xItYY?Nkv{p&u4DO1j9&AiOhuHp+6ZRVNV#{X%%!PrZ^1k zr%Pv5O|f!1W?T%l_V<}YqZ;oDvmP!|ZJ8(96@>mhBf%rqSuQ3GEu4iar$LKXq+W}! za)j3A5jK1CJgQn+Wbh~kX6AS{g9;YEyW7^T#aDt(bGH328RONVG&D5r%W*runj89{ z=sYnpwW{j8?B?|J^pT5X>;^-Q6QwFduLK;{#T|ZBj3v`b1wjZ#FbI^AAMy2aKYsi> zXe3WWp|`i!RN~vdtgNj3#nBpHeXb0y1;GvGBQxvgRv}V%*9b*PRDLb3(Z}BV3$34= ze>Dj(s%3IKz8RjFsGV8viSMp@(VENay3|3~V$zluaN8MO^;K9*Oh_NSH<41vDjd3CvoNDuY~c*Mp_b?&&HMHM(;$4kPXFWxC9s$urCLQ0SKY^KtZ7Ytb1; zU#N(ma+jmtTu#Q5aleplyz@L>A5OO!ef`VR+na2yFST2{( z&d#oQz7av`>*Is_six);nzZot%F6LozL@u(-OK36$jA$DE3DVUDW(Jvx1fN4>kY6> zHt?I2NSd+L(3qGQxvHuvi&J|iCr;}w`v|5x4kVT6m2KU3>&Cfrtw;iWDTtvSZfna7b$*!>Exu_q4<9~U-QSm@X=r7JbUl1{b26zFm3zAo57pGvTr9N& z%U0v}cY6&|PRz~Ct;JtaQw68TdH%)qH!Td$8M;XJB@TW_6>8Z;>JH-2$kNhMw+RWW z&$7D1>W+VC_Ik`vO7LZTyc*6$(9YHtYZzMT30?KL&JtRr-Rk=KkCT(FN#-1yYLDQm z=Z)@`0kI|nxPL1a)ofDe#z6SlN0fHTd;a-RDTP=cnk~FGt=Ax0GDp=A-5JW^dpCC8 z_^iQs_wwL(_s^ldfw4up4kVe1D&M9EOHN>ZU1C7vOa_SUeTc6^&2(wV?1%qK$N0z{Sxc zlr{`99*@@^4ioZ@vIyr=G6pubZ5RxeT%7cm9!DdKQpnj+`d7=#GdupiV6`y}{wA^; z6I7ye%f+_9t1NEQg||w{G$t~zt^YW0^^_mqZwCuw2RAiPmJ$8?~&@N2jMWx0in%-FQY<~}Po|N${5BNX z;W)ZjZ#P+!H>&5Qb#wU_?Tx|`z=)QKMRVu)*~SXi9ul-Lk&rkpwD|H3pJ`^@#vQ#w1W~V)*mQ=WsV#pH zR?yXPl)Lci5Q}TK$#-X@@Ps=12YmA;YnK}Ay-YPV$!uD*wP=zGywrP6DyhWx`l86W zt|tG@Ukz{QTMgQ$MRB2{2PVXU-%c%O8TYep_O~^I?@o7(51WsL*59#ke{Syo-5rfa z($&-RhPFQCX12~|dI3aICKq+rz`%g}<;j*VrJ&;`0d5YT&4{??F~fumhf`i~T!+Wj z-9|z1NOQnNt?W0IB9s>Q|0>XV#2~R(;&30b9mtcbctPG+*Ke4 zD3G`ZU(O1@FKfwa<_Wv80g{!mMTlFPZ~ddb28-6C8x-cA#Cn&YqOVU*8aJY4yv zP-in*wGFN?$&Hxnfyb5CFRw%N_i0dss*0BX)L7RncwcR*w%V*D{-H5hkJV!&7U$RXzPJ|HYZ^J z-8TA4VYEQ19iO@yZ@-NoZt3A5lbCQBWNf2djkYWM3d+bC7i9BOn^pOZN*dEJlPn~} z;&^!=gMHd-Z{8Oxjwxe>WPpbovPc10-CJE<<+1o0Lk7Yd_cdS)9`!3qcELJK`~da- zFgqh^ufZ0G(j|s~w5)jj;KBp|t-rW;Lr76zDJA|56}x`<>gMk5FQl`$LZ2@GlTDrn ze%w!KvWaW6Cl^=J03W)+1ihC6pQz5|Si1;7{Ya)8Dk7qyqF_$2O3}F2p&6-e z+}S@F7I374<7A|oK+gR!aEUX=DMhTpOb*F99|Am(zO&-%?@Usz=kMzi%n~2jg;1d# zJPkRZCr3y^1>haGUkBu{?XOE^Sq&;?MxC9V@w`Ad=Z->*X~H=L3FA;$TtWdiaayi3 z>*?=~!lOiW(AoL{Got=+dwbjVzQNFE73Wa>)SE!K2OqhRf(m5g>VS=qD9n`BWUR0s zOfCR+QPepiNrvBZC){>j8JRf^g$AQQY9&cpo7*5`)6?Gklp-d{$V99(){cyioltvc zDGUE{nT#S=|IAD~onM^9!bT!s@=Iwuh95kbjZrWoTEv6kQwdiWWEuh(Yb>^TPtIcI z#%F{M8F~OSLlmvxT)?Bdj0bGIcjrFkqa$ZmPw*CtFK+;L-A6uoxRVR=9+{@PIDo=peC7F%5=F1kq5~LFAr+6u?D6qHCIo&fct7 z$*T&1{Z>NjC@n2TRs5^%P0N4ISQa)$25ACZF zrTg48*nELzQ+1WSSD9`pZq4=Iaf<8G?$Thq$BU z;88+d+e`P;@1C7&V8v4bG2iO@P#VXZX&zL)L#kTfFkT#K05JmbhOO=ZIMWA`jOgRB zywTM>TH^4LAk{o}>maaoG@F0^u=DoD)6_OJcu!2bOA-X48RmZ}3Gaj)gcSo)@V+%Y zvgzGZ8VU;0!HJ0piUPjFV5}&-%hZSu9vrVy{J$kp|6$Iz{V}D4YbJ^*ZC2LLmsimS zu!cHaM5DV!e2qEJZesfVlaeH+trT-@oI0vpal^`I0>&5^(Q`WOLVGDoq$(N{J|~;w zrq91$0Re!a@%s4qm=fa;ee&ns(!NT?j8V!f`2xv6zpz+pWD#Z5tDUfYDOD4_RWt)b z{+ZvhEG5I`r&MH|&-9#bF`yhSXfd_^F!aiEtRFdre`aEnliPdI8rBB0K5CzcNw-o~ z7j@jL$X4HDCXMN9LC2YDG^=gV^exN;IiggiTV=9-FYYTUT0^TNni!xzAQ$ZQ@% zst+B>PCnAz>te2x#yAyYssLwykA|5&m!B<^ zuC7J0zx~ypNj)2;X^8$l%Jq?(D&GEIWTz}c(+K$d7q|Ah>y6QZj~~VjzMQDfhdmzT zdL&D`erlE7gtxXIPRd6q?7HM=+gk-_01YJ}p_{g7I}3@BkdS>6hh+$C9O1UO-r{?_ zK9bEN=j5sjJcv{n?X6X*1Ej;>>Bw=cP)4Hqp~K^|mpr?(b?;oVxJ*t@c4l>(>eiXi zhx;>Cc5!fnV~IHAhZ7I-9xgDc~$f zlD=hbsG186E{mN&5$}|Ai)SYxKE7y0%}?r)YcMNEPDxL%&tmtl?b`K}l$4B*K!#@P!kePz!PW?Ne5A>5i4<4rzWFdBU&=XuM)VV9m@fSzg{w8N;x+R;AtO!EnpNc4E=BydK{YN|r_?2jWgO@I z>9M{AdzJ_%-9J2gKyT66cP05jynhiTpKLYV4 zPA|p6en?d$4zag*;n3xseiL%q9&6DX@}A#rs(gz3e!B}Et(51kD&WhW8GvPiVezN8kqOq{9$HhX6`xnc)}*0^@^y|Tz$V! zkfcU=#R6NjH?hq*fR_#2m3#Z3ar-qA(I1pF-laEeS^h}*axo#>1^(CPZcWHu@~#PT zlr1GHm0Z-wG#gQvA-Svg2O8)O@%sFb&Q;yQYvtrG8yQtJ&7uCOCwt7U12v31llQ`0 zzsR>h-1jKGb`hx85iE^wK%e0PITKutdpJxD1Kj3(;0YnN;&)&-yeUP#nM&s%Sb8zv z+xs>tCnx6$7&$_czDEpGqobqVzq=yU;D4ZeYn&LRewpWtfbQ=AF?tpq9qqCS0IZ?D zzTPBvwZu_USM#?)I_#AFGC+wbu5qr_bt$kjV?QAt7N8jFEV1GP9ZA2tYb0J1(^1L?y)N$?xu#S5{WO;A!HemDUbL zdc@fs?6D36tr&2!3^iz**=vwg4Tar2D?{nv4jwe@_;pWFob=WIw66N$Mv>vvxv2ES zk+8eAUjzFk6LRq9WPdTZFrdk=-b|f?gCht^bc{nUix0|LQdB9ChUD~PO7A)C3n zOfcpd`3FAlNL3)=9QY!9+}(K_S~!N;ApDuWPi?!r&Ae919!*JL6jBXE5@{TFn_Y`Y zol#YPKB0KRjS#=60)|-MQ1$Tjf*$Z=f}h(8G*MNyQ~ zPWKnv_hAfzf`UoT&lobFJ$xnm(mh~28Yf{so$?)N0zb0!%=NID;McLC@J5m3-|6+^ zg5+oIm*6rdAej;(uPGW#XVsNCp@sv(@Jca(+^twMUli|qw*HRz$mf7nf;UKn9zRY=gj_YAQ=LIZL#GS*XB4K=fy)pG}E05`Hjl zI~pv4W%SwKb}^xLPqYxbxM)$3U2Xa;oX6ENN+ zIu6)W)JHJP=6KBDln@rO5dUejXA5iBA03}Pk0rH0p4?S10OG>?_G~d&YBUHxgu|rr z*{5=W$5uHV`)q&zOnZ|HI+7=cyb&867XameX8_+>@9ZghZWZs0(88#lC)LU0mfw%P+woJ(Efi11AN_9^gsY%ow z8OSoKOqw%UzFG`2S$WDvJ{^)ogK4gRvYUKc`LaMmEuG~_?Tc1FPac|Qo%P@`g>)Ry9U;%2%ZfNEL~3Smis7SAqik{2n9h z{ZDMqeG(P>1Ov_w9*^O+Z3NYPo_mUv@hhpE&I)MVD zPje7UKx3U~Uj@0YGu;n*@(2e9NA1#%jn`6`yXO`~Ixy&HwSTgFS?wW&hvmgYg=}tE zN=#76KoGljp>$BuaV!UOvfw!lMEN&X>^}v!T(OXN1 zzSTKrbw(?BAK^QI0N_dfG#o)NkuO<+7l;L6!MxrreWFJ)3eQl?4I{^wKKnKNN+`{j zX84R?Gym$Eql-_l{q@VG0UyombYrBTPmP12Bim0+B&!l-Qn6YkNUZH$wY9ZT=lq#D z`eJQenxq5QT085sOLrNFAp#_=nzpW{o4}R)QPTdi5=6o;Z&axgS~OH<%{=lxjjKz| zEW(}01@J=s617dE!yckmGT^7ta4y1hF0wfPXNl*wKdNYA7Kt{#A?=$YDiRD1pUWW7Ew} zkvZkdcHOtuYcI@lsmix~K+GUDwWVCYFthD>31daYfF>p3h~ z6TUq(&Fx()>F^jTQ(>ThHTVx^aerI}Rg#yPk3n@o%xKCPi3e*xT;-#r*N%}%?va_; zCxHYjzNbjAx$d1HPX0uCrKF*lq@*8g6u1p{TMr2`c!7H|`%;mOUt}ac13W9219p2~E)GtJ|C>?c=79{z7OL5Q%UBMJ6Y; z3^sj}4k~LNMYK*c;pn5+ReEI;B74hA=325x0OC)K=8bWnUfDP-pk7mN89}0t!{Cl^ z+yZjx`L7yFB`1|A$%+rT;={YZ#cgPu(q()5_U-!nL3i8f*7vme-3%FACQZarLQZq? z=%kXO82)0WsE5bup{6`xH4B@*x3#I?2GE4~MrpDAdiNPfsZWL_Du9l!-1~E0KwfFp6;K?t){jJX)$D&g zD#L16_1tc+v@h;@ysTffyxIhyJo9n@!k|@bW+U_V=E{K@U)vD9ua0x`BPKdUC6q2f z`1OLj1a*2M#{-^LV8gMW%!HJg6fmC)*p4lI$TuDt8F|JhUBBUc*~Nyvj=l7OH8!E{ z>81yYT(BEaY%LBp>VJKNcPReQ;=FV?x^XrFz;1 z%OoBv`!<3Y)$$-dZ(Z{N5CN}A{$hOghu|(fyt8I_SUsBPbN7B|M2M4f7tch^Bj?*> z2GUU3Q|_ z>sM6RjEfgXKJZ@Vlc>c6n;RQHeOsd|ttylMviWYu{^#dPp^#5Fd!KapMRJnIgP)AM z;Nofr>+$L5%br;zkqWe~J21&=N)w39N|yL%{|kWy^4Fn19X$1aUWiA@DuSev-K&714%FG|9JJk zChl!C-67Q`2t+XiCDSZz{+fOU;m$|KLC=kmeB#fIg8NwTAI7y%AGE;FnCa!v9}`Hp z^uKA*Lmo@fK~xQBsZa1ih}F~vEfNNbK4J%4o$fl&D3-|F4ct?Yo@%O-A2GP*i;akl z(+S+(BUIH|Q+*iN`S_$naq1@!`>S;@(GjwhL^=(@#0+ z_;GZ^P|qQRvM9E=#IdWxYq}JAUnCK5U6RH}dRBGsh6R;qgxLa^F-tD15e_Sz?E9c4Xlv!B*~P77|y%wEnxj(99Ceo zG=CDj2vcb@X%D)Y1BDa~^z$H+TpUksNsi}{2h|@U^XiI!CS4Dd)dF4Z&`6iWW03xM z#K%WCbQg@E1dd2hQxFo?=sRmBbYvV#$*mpEQ}3N3%~V8$dA?s3~k8qRShbq((ZT6>iI6;}V%uV9x=%e+IM?WknBJ z{?amS@O2TsIOCK-a}#=Hz(99*NjuXqr#Q!pwD(LPb{CL!znRYN=ZU?Hwa=iwsqpp3 zG~BJIs89`Mbp5$+sM)CJ>S*YZw;_%q#Ky+DHbsGT}NQe7-i{QUjn@$1&tgD+wh zQB9q(x}}HzY;VtD-;{A~H#|7vL<;He)i|o%AGylm4%y@J-jN>PSD8zhJyLL%+yZ5y-07=!4Adp9VqomTFCb&CSiN zxLluaxtpSBr1=ip9F<&h@DfgWoVNe9K17WcQp!ADpQr(Nj~I*!9F) z(3aSXpCU)W`oR$=16_HfB_`G7waTn_4WXf-Y4zq@d8nsnXSB(x59`_%gRV4ChfBG2 zSZyz~(#$d($@?LbwsueSX{;3ZldU>KP-t>bnR|mRVOq7gwRj#Wj$bw;k||e7KNzO~ zdM;jiM=T~9s!GZs+#dd!R8Ns+q`i@GN1JC)mrvmk2j7oD0`Jhh=g}I$9-%4`h6U0B;xpALO}nuk+V^J1YU7v*t}P zR&AQ(94_T2nI|M7XdMbPJZh`VgOxiG@(N*ReGrTXL7yLoegxHJMr~8U_g4=S1T|=7 zS^BXGr!!9`UrjB;a23u#XVceix~+IpgE2HBiXU4H0;3gvN8!df=BrM}J} zitS=YeVY|)c>xlCu#bi>lN@HfX+FcPmYl`91$rEmT3RQ5fq^-}K- zw1vMfSrRpc^)yaQt%H&}8T`@QJ&Q+4m~V_!p5zC`gKqv`DNzBrhGs$DOL-Ns5lV$mUP)^FbDO)u`q%phZY8h?)0yL|3X(W)qD%2&ynh5a7^_zO$` literal 0 HcmV?d00001 diff --git a/packages/core/cli/src/util.js b/packages/core/cli/src/util.js index c18ad659d..eb3acd54f 100644 --- a/packages/core/cli/src/util.js +++ b/packages/core/cli/src/util.js @@ -313,7 +313,7 @@ function areTimeZonesEqual(timeZone1, timeZone2) { } timeZone1 = getTimezonesByOffset(timeZone1); timeZone2 = getTimezonesByOffset(timeZone2); - return moment.tz(timeZone1).format() === moment.tz(timeZone2).format(); + return moment.tz(timeZone1).format('Z') === moment.tz(timeZone2).format('Z'); } exports.initEnv = function initEnv() { @@ -406,6 +406,10 @@ exports.initEnv = function initEnv() { process.env.DB_TIMEZONE = process.env.TZ; } + if (!/^[+-]\d{1,2}:\d{2}$/.test(process.env.DB_TIMEZONE)) { + process.env.DB_TIMEZONE = moment.tz(process.env.DB_TIMEZONE).format('Z'); + } + 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/plugins/@nocobase/plugin-collection-tree/src/server/__tests__/sync.test.ts b/packages/plugins/@nocobase/plugin-collection-tree/src/server/__tests__/sync.test.ts index 2a1aae504..2291fc041 100644 --- a/packages/plugins/@nocobase/plugin-collection-tree/src/server/__tests__/sync.test.ts +++ b/packages/plugins/@nocobase/plugin-collection-tree/src/server/__tests__/sync.test.ts @@ -7,9 +7,9 @@ * For more information, please refer to: https://www.nocobase.com/agreement. */ +import { Repository } from '@nocobase/database'; import { MockDatabase, MockServer, createMockServer } from '@nocobase/test'; import Migration from '../migrations/20240802141435-collection-tree'; -import { Repository } from '@nocobase/database'; describe('tree collection sync', async () => { let app: MockServer; @@ -77,38 +77,25 @@ describe('collection tree migrate test', () => { { type: 'belongsTo', name: 'parent', + foreignKey: 'parentId', + target: 'test_tree', treeParent: true, }, { type: 'hasMany', name: 'children', + foreignKey: 'parentId', + target: 'test_tree', treeChildren: true, }, ], }, + context: {}, }); - const collection = db.collection({ - name: 'test_tree', - tree: 'adjacency-list', - fields: [ - { - type: 'string', - name: 'name', - }, - { - type: 'belongsTo', - name: 'parent', - treeParent: true, - }, - { - type: 'hasMany', - name: 'children', - treeChildren: true, - }, - ], - }); - await collection.sync(); - await collection.repository.create({ + await app.db.getCollection('test_tree').model.truncate(); + await app.db.getCollection('main_test_tree_path').model.truncate(); + const repository = app.db.getRepository('test_tree'); + await repository.create({ values: [ { name: 'c1', @@ -131,7 +118,6 @@ describe('collection tree migrate test', () => { }); afterEach(async () => { - await app.db.clean({ drop: true }); await app.destroy(); }); @@ -164,26 +150,7 @@ describe('collection tree migrate test', () => { }, }); expect(p.name).toBe('collection-tree'); - const collection1 = db.collection({ - name: 'test_tree', - tree: 'adjacency-list', - fields: [ - { - type: 'string', - name: 'name', - }, - { - type: 'belongsTo', - name: 'parent', - treeParent: true, - }, - { - type: 'hasMany', - name: 'children', - treeChildren: true, - }, - ], - }); + const collection1 = db.getCollection('test_tree'); const pathCollection1 = db.getCollection(name); expect(pathCollection1).toBeTruthy(); expect(await pathCollection1.existsInDb()).toBeTruthy(); diff --git a/packages/plugins/@nocobase/plugin-system-settings/src/server/logo.png b/packages/plugins/@nocobase/plugin-system-settings/src/server/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..6f6625caaa7b324dfec0b85a60ac2aad30a1f649 GIT binary patch literal 11186 zcmaKSby!v3+U=%WKvHr`H=FM6Mp_ZcP4}j|JEajM4G@r0q)U)akq`lCkOt|vlk=V5 z`R*V0-1YFlWk z&m#{7BM)5{YY%U8cQ{1G%EbZ>RdF)6f$PA{t$f}3;o=Yo3Z0#vk%y6nx~Qd#6PNjY z8!jIwSI`>*5ts6DHMewtdq6GVHg?Vubo!+z_ z>E~c6Vnrt<2^IGd1p_$2J-^&CRjN8ZDm79kPcK=BKG}O@e z|2K7V`cG?whYtLI=llO07@_Cu3g^~=BV0V)Ey2cF)8F69RaDL$ZtmgYuIJ+7_|Gb8 z+q!tTAZ%S+p>n!{P!>ZwXDb(P1na-rYiNk7I3qmFoh{)i@)C4l1TH%}D^XcNVP082 z1qA_^91jnVf~>57oUj56CMO6J=93o`5&EaEyo;r$6WrP3pT1WA+gI_w_Pq}UCs%N1 zdAPfs7u-tG-Ngy|uSXWO`|op+`>*5uyRX%MpNsr|?aK`&!+pQ8|JO$U^A(7m`;Y$# zTky|+0w3-SqTL;Y^+)|xItYY?Nkv{p&u4DO1j9&AiOhuHp+6ZRVNV#{X%%!PrZ^1k zr%Pv5O|f!1W?T%l_V<}YqZ;oDvmP!|ZJ8(96@>mhBf%rqSuQ3GEu4iar$LKXq+W}! za)j3A5jK1CJgQn+Wbh~kX6AS{g9;YEyW7^T#aDt(bGH328RONVG&D5r%W*runj89{ z=sYnpwW{j8?B?|J^pT5X>;^-Q6QwFduLK;{#T|ZBj3v`b1wjZ#FbI^AAMy2aKYsi> zXe3WWp|`i!RN~vdtgNj3#nBpHeXb0y1;GvGBQxvgRv}V%*9b*PRDLb3(Z}BV3$34= ze>Dj(s%3IKz8RjFsGV8viSMp@(VENay3|3~V$zluaN8MO^;K9*Oh_NSH<41vDjd3CvoNDuY~c*Mp_b?&&HMHM(;$4kPXFWxC9s$urCLQ0SKY^KtZ7Ytb1; zU#N(ma+jmtTu#Q5aleplyz@L>A5OO!ef`VR+na2yFST2{( z&d#oQz7av`>*Is_six);nzZot%F6LozL@u(-OK36$jA$DE3DVUDW(Jvx1fN4>kY6> zHt?I2NSd+L(3qGQxvHuvi&J|iCr;}w`v|5x4kVT6m2KU3>&Cfrtw;iWDTtvSZfna7b$*!>Exu_q4<9~U-QSm@X=r7JbUl1{b26zFm3zAo57pGvTr9N& z%U0v}cY6&|PRz~Ct;JtaQw68TdH%)qH!Td$8M;XJB@TW_6>8Z;>JH-2$kNhMw+RWW z&$7D1>W+VC_Ik`vO7LZTyc*6$(9YHtYZzMT30?KL&JtRr-Rk=KkCT(FN#-1yYLDQm z=Z)@`0kI|nxPL1a)ofDe#z6SlN0fHTd;a-RDTP=cnk~FGt=Ax0GDp=A-5JW^dpCC8 z_^iQs_wwL(_s^ldfw4up4kVe1D&M9EOHN>ZU1C7vOa_SUeTc6^&2(wV?1%qK$N0z{Sxc zlr{`99*@@^4ioZ@vIyr=G6pubZ5RxeT%7cm9!DdKQpnj+`d7=#GdupiV6`y}{wA^; z6I7ye%f+_9t1NEQg||w{G$t~zt^YW0^^_mqZwCuw2RAiPmJ$8?~&@N2jMWx0in%-FQY<~}Po|N${5BNX z;W)ZjZ#P+!H>&5Qb#wU_?Tx|`z=)QKMRVu)*~SXi9ul-Lk&rkpwD|H3pJ`^@#vQ#w1W~V)*mQ=WsV#pH zR?yXPl)Lci5Q}TK$#-X@@Ps=12YmA;YnK}Ay-YPV$!uD*wP=zGywrP6DyhWx`l86W zt|tG@Ukz{QTMgQ$MRB2{2PVXU-%c%O8TYep_O~^I?@o7(51WsL*59#ke{Syo-5rfa z($&-RhPFQCX12~|dI3aICKq+rz`%g}<;j*VrJ&;`0d5YT&4{??F~fumhf`i~T!+Wj z-9|z1NOQnNt?W0IB9s>Q|0>XV#2~R(;&30b9mtcbctPG+*Ke4 zD3G`ZU(O1@FKfwa<_Wv80g{!mMTlFPZ~ddb28-6C8x-cA#Cn&YqOVU*8aJY4yv zP-in*wGFN?$&Hxnfyb5CFRw%N_i0dss*0BX)L7RncwcR*w%V*D{-H5hkJV!&7U$RXzPJ|HYZ^J z-8TA4VYEQ19iO@yZ@-NoZt3A5lbCQBWNf2djkYWM3d+bC7i9BOn^pOZN*dEJlPn~} z;&^!=gMHd-Z{8Oxjwxe>WPpbovPc10-CJE<<+1o0Lk7Yd_cdS)9`!3qcELJK`~da- zFgqh^ufZ0G(j|s~w5)jj;KBp|t-rW;Lr76zDJA|56}x`<>gMk5FQl`$LZ2@GlTDrn ze%w!KvWaW6Cl^=J03W)+1ihC6pQz5|Si1;7{Ya)8Dk7qyqF_$2O3}F2p&6-e z+}S@F7I374<7A|oK+gR!aEUX=DMhTpOb*F99|Am(zO&-%?@Usz=kMzi%n~2jg;1d# zJPkRZCr3y^1>haGUkBu{?XOE^Sq&;?MxC9V@w`Ad=Z->*X~H=L3FA;$TtWdiaayi3 z>*?=~!lOiW(AoL{Got=+dwbjVzQNFE73Wa>)SE!K2OqhRf(m5g>VS=qD9n`BWUR0s zOfCR+QPepiNrvBZC){>j8JRf^g$AQQY9&cpo7*5`)6?Gklp-d{$V99(){cyioltvc zDGUE{nT#S=|IAD~onM^9!bT!s@=Iwuh95kbjZrWoTEv6kQwdiWWEuh(Yb>^TPtIcI z#%F{M8F~OSLlmvxT)?Bdj0bGIcjrFkqa$ZmPw*CtFK+;L-A6uoxRVR=9+{@PIDo=peC7F%5=F1kq5~LFAr+6u?D6qHCIo&fct7 z$*T&1{Z>NjC@n2TRs5^%P0N4ISQa)$25ACZF zrTg48*nELzQ+1WSSD9`pZq4=Iaf<8G?$Thq$BU z;88+d+e`P;@1C7&V8v4bG2iO@P#VXZX&zL)L#kTfFkT#K05JmbhOO=ZIMWA`jOgRB zywTM>TH^4LAk{o}>maaoG@F0^u=DoD)6_OJcu!2bOA-X48RmZ}3Gaj)gcSo)@V+%Y zvgzGZ8VU;0!HJ0piUPjFV5}&-%hZSu9vrVy{J$kp|6$Iz{V}D4YbJ^*ZC2LLmsimS zu!cHaM5DV!e2qEJZesfVlaeH+trT-@oI0vpal^`I0>&5^(Q`WOLVGDoq$(N{J|~;w zrq91$0Re!a@%s4qm=fa;ee&ns(!NT?j8V!f`2xv6zpz+pWD#Z5tDUfYDOD4_RWt)b z{+ZvhEG5I`r&MH|&-9#bF`yhSXfd_^F!aiEtRFdre`aEnliPdI8rBB0K5CzcNw-o~ z7j@jL$X4HDCXMN9LC2YDG^=gV^exN;IiggiTV=9-FYYTUT0^TNni!xzAQ$ZQ@% zst+B>PCnAz>te2x#yAyYssLwykA|5&m!B<^ zuC7J0zx~ypNj)2;X^8$l%Jq?(D&GEIWTz}c(+K$d7q|Ah>y6QZj~~VjzMQDfhdmzT zdL&D`erlE7gtxXIPRd6q?7HM=+gk-_01YJ}p_{g7I}3@BkdS>6hh+$C9O1UO-r{?_ zK9bEN=j5sjJcv{n?X6X*1Ej;>>Bw=cP)4Hqp~K^|mpr?(b?;oVxJ*t@c4l>(>eiXi zhx;>Cc5!fnV~IHAhZ7I-9xgDc~$f zlD=hbsG186E{mN&5$}|Ai)SYxKE7y0%}?r)YcMNEPDxL%&tmtl?b`K}l$4B*K!#@P!kePz!PW?Ne5A>5i4<4rzWFdBU&=XuM)VV9m@fSzg{w8N;x+R;AtO!EnpNc4E=BydK{YN|r_?2jWgO@I z>9M{AdzJ_%-9J2gKyT66cP05jynhiTpKLYV4 zPA|p6en?d$4zag*;n3xseiL%q9&6DX@}A#rs(gz3e!B}Et(51kD&WhW8GvPiVezN8kqOq{9$HhX6`xnc)}*0^@^y|Tz$V! zkfcU=#R6NjH?hq*fR_#2m3#Z3ar-qA(I1pF-laEeS^h}*axo#>1^(CPZcWHu@~#PT zlr1GHm0Z-wG#gQvA-Svg2O8)O@%sFb&Q;yQYvtrG8yQtJ&7uCOCwt7U12v31llQ`0 zzsR>h-1jKGb`hx85iE^wK%e0PITKutdpJxD1Kj3(;0YnN;&)&-yeUP#nM&s%Sb8zv z+xs>tCnx6$7&$_czDEpGqobqVzq=yU;D4ZeYn&LRewpWtfbQ=AF?tpq9qqCS0IZ?D zzTPBvwZu_USM#?)I_#AFGC+wbu5qr_bt$kjV?QAt7N8jFEV1GP9ZA2tYb0J1(^1L?y)N$?xu#S5{WO;A!HemDUbL zdc@fs?6D36tr&2!3^iz**=vwg4Tar2D?{nv4jwe@_;pWFob=WIw66N$Mv>vvxv2ES zk+8eAUjzFk6LRq9WPdTZFrdk=-b|f?gCht^bc{nUix0|LQdB9ChUD~PO7A)C3n zOfcpd`3FAlNL3)=9QY!9+}(K_S~!N;ApDuWPi?!r&Ae919!*JL6jBXE5@{TFn_Y`Y zol#YPKB0KRjS#=60)|-MQ1$Tjf*$Z=f}h(8G*MNyQ~ zPWKnv_hAfzf`UoT&lobFJ$xnm(mh~28Yf{so$?)N0zb0!%=NID;McLC@J5m3-|6+^ zg5+oIm*6rdAej;(uPGW#XVsNCp@sv(@Jca(+^twMUli|qw*HRz$mf7nf;UKn9zRY=gj_YAQ=LIZL#GS*XB4K=fy)pG}E05`Hjl zI~pv4W%SwKb}^xLPqYxbxM)$3U2Xa;oX6ENN+ zIu6)W)JHJP=6KBDln@rO5dUejXA5iBA03}Pk0rH0p4?S10OG>?_G~d&YBUHxgu|rr z*{5=W$5uHV`)q&zOnZ|HI+7=cyb&867XameX8_+>@9ZghZWZs0(88#lC)LU0mfw%P+woJ(Efi11AN_9^gsY%ow z8OSoKOqw%UzFG`2S$WDvJ{^)ogK4gRvYUKc`LaMmEuG~_?Tc1FPac|Qo%P@`g>)Ry9U;%2%ZfNEL~3Smis7SAqik{2n9h z{ZDMqeG(P>1Ov_w9*^O+Z3NYPo_mUv@hhpE&I)MVD zPje7UKx3U~Uj@0YGu;n*@(2e9NA1#%jn`6`yXO`~Ixy&HwSTgFS?wW&hvmgYg=}tE zN=#76KoGljp>$BuaV!UOvfw!lMEN&X>^}v!T(OXN1 zzSTKrbw(?BAK^QI0N_dfG#o)NkuO<+7l;L6!MxrreWFJ)3eQl?4I{^wKKnKNN+`{j zX84R?Gym$Eql-_l{q@VG0UyombYrBTPmP12Bim0+B&!l-Qn6YkNUZH$wY9ZT=lq#D z`eJQenxq5QT085sOLrNFAp#_=nzpW{o4}R)QPTdi5=6o;Z&axgS~OH<%{=lxjjKz| zEW(}01@J=s617dE!yckmGT^7ta4y1hF0wfPXNl*wKdNYA7Kt{#A?=$YDiRD1pUWW7Ew} zkvZkdcHOtuYcI@lsmix~K+GUDwWVCYFthD>31daYfF>p3h~ z6TUq(&Fx()>F^jTQ(>ThHTVx^aerI}Rg#yPk3n@o%xKCPi3e*xT;-#r*N%}%?va_; zCxHYjzNbjAx$d1HPX0uCrKF*lq@*8g6u1p{TMr2`c!7H|`%;mOUt}ac13W9219p2~E)GtJ|C>?c=79{z7OL5Q%UBMJ6Y; z3^sj}4k~LNMYK*c;pn5+ReEI;B74hA=325x0OC)K=8bWnUfDP-pk7mN89}0t!{Cl^ z+yZjx`L7yFB`1|A$%+rT;={YZ#cgPu(q()5_U-!nL3i8f*7vme-3%FACQZarLQZq? z=%kXO82)0WsE5bup{6`xH4B@*x3#I?2GE4~MrpDAdiNPfsZWL_Du9l!-1~E0KwfFp6;K?t){jJX)$D&g zD#L16_1tc+v@h;@ysTffyxIhyJo9n@!k|@bW+U_V=E{K@U)vD9ua0x`BPKdUC6q2f z`1OLj1a*2M#{-^LV8gMW%!HJg6fmC)*p4lI$TuDt8F|JhUBBUc*~Nyvj=l7OH8!E{ z>81yYT(BEaY%LBp>VJKNcPReQ;=FV?x^XrFz;1 z%OoBv`!<3Y)$$-dZ(Z{N5CN}A{$hOghu|(fyt8I_SUsBPbN7B|M2M4f7tch^Bj?*> z2GUU3Q|_ z>sM6RjEfgXKJZ@Vlc>c6n;RQHeOsd|ttylMviWYu{^#dPp^#5Fd!KapMRJnIgP)AM z;Nofr>+$L5%br;zkqWe~J21&=N)w39N|yL%{|kWy^4Fn19X$1aUWiA@DuSev-K&714%FG|9JJk zChl!C-67Q`2t+XiCDSZz{+fOU;m$|KLC=kmeB#fIg8NwTAI7y%AGE;FnCa!v9}`Hp z^uKA*Lmo@fK~xQBsZa1ih}F~vEfNNbK4J%4o$fl&D3-|F4ct?Yo@%O-A2GP*i;akl z(+S+(BUIH|Q+*iN`S_$naq1@!`>S;@(GjwhL^=(@#0+ z_;GZ^P|qQRvM9E=#IdWxYq}JAUnCK5U6RH}dRBGsh6R;qgxLa^F-tD15e_Sz?E9c4Xlv!B*~P77|y%wEnxj(99Ceo zG=CDj2vcb@X%D)Y1BDa~^z$H+TpUksNsi}{2h|@U^XiI!CS4Dd)dF4Z&`6iWW03xM z#K%WCbQg@E1dd2hQxFo?=sRmBbYvV#$*mpEQ}3N3%~V8$dA?s3~k8qRShbq((ZT6>iI6;}V%uV9x=%e+IM?WknBJ z{?amS@O2TsIOCK-a}#=Hz(99*NjuXqr#Q!pwD(LPb{CL!znRYN=ZU?Hwa=iwsqpp3 zG~BJIs89`Mbp5$+sM)CJ>S*YZw;_%q#Ky+DHbsGT}NQe7-i{QUjn@$1&tgD+wh zQB9q(x}}HzY;VtD-;{A~H#|7vL<;He)i|o%AGylm4%y@J-jN>PSD8zhJyLL%+yZ5y-07=!4Adp9VqomTFCb&CSiN zxLluaxtpSBr1=ip9F<&h@DfgWoVNe9K17WcQp!ADpQr(Nj~I*!9F) z(3aSXpCU)W`oR$=16_HfB_`G7waTn_4WXf-Y4zq@d8nsnXSB(x59`_%gRV4ChfBG2 zSZyz~(#$d($@?LbwsueSX{;3ZldU>KP-t>bnR|mRVOq7gwRj#Wj$bw;k||e7KNzO~ zdM;jiM=T~9s!GZs+#dd!R8Ns+q`i@GN1JC)mrvmk2j7oD0`Jhh=g}I$9-%4`h6U0B;xpALO}nuk+V^J1YU7v*t}P zR&AQ(94_T2nI|M7XdMbPJZh`VgOxiG@(N*ReGrTXL7yLoegxHJMr~8U_g4=S1T|=7 zS^BXGr!!9`UrjB;a23u#XVceix~+IpgE2HBiXU4H0;3gvN8!df=BrM}J} zitS=YeVY|)c>xlCu#bi>lN@HfX+FcPmYl`91$rEmT3RQ5fq^-}K- zw1vMfSrRpc^)yaQt%H&}8T`@QJ&Q+4m~V_!p5zC`gKqv`DNzBrhGs$DOL-Ns5lV$mUP)^FbDO)u`q%phZY8h?)0yL|3X(W)qD%2&ynh5a7^_zO$` literal 0 HcmV?d00001 diff --git a/packages/plugins/@nocobase/plugin-system-settings/src/server/server.ts b/packages/plugins/@nocobase/plugin-system-settings/src/server/server.ts index 326271631..87d51fb5e 100644 --- a/packages/plugins/@nocobase/plugin-system-settings/src/server/server.ts +++ b/packages/plugins/@nocobase/plugin-system-settings/src/server/server.ts @@ -7,6 +7,7 @@ * For more information, please refer to: https://www.nocobase.com/agreement. */ +import PluginFileManagerServer from '@nocobase/plugin-file-manager'; import { InstallOptions, Plugin } from '@nocobase/server'; import { resolve } from 'path'; @@ -16,18 +17,30 @@ export class PluginSystemSettingsServer extends Plugin { } async install(options?: InstallOptions) { + const plugin = this.pm.get('file-manager') as PluginFileManagerServer; + const logo = plugin + ? await plugin.createFileRecord({ + filePath: resolve(__dirname, './logo.png'), + collectionName: 'attachments', + values: { + title: 'nocobase-logo', + extname: '.png', + mimetype: 'image/png', + }, + }) + : { + title: 'nocobase-logo', + filename: '682e5ad037dd02a0fe4800a3e91c283b.png', + extname: '.png', + mimetype: 'image/png', + url: '/nocobase.png', + }; await this.db.getRepository('systemSettings').create({ values: { title: 'NocoBase', appLang: this.getInitAppLang(options), enabledLanguages: [this.getInitAppLang(options)], - logo: { - title: 'nocobase-logo', - filename: '682e5ad037dd02a0fe4800a3e91c283b.png', - extname: '.png', - mimetype: 'image/png', - url: 'https://nocobase.oss-cn-beijing.aliyuncs.com/682e5ad037dd02a0fe4800a3e91c283b.png', - }, + logo, }, }); } From 5a41ab063c8eea8bb0240cc6baf5d485b4fe9f84 Mon Sep 17 00:00:00 2001 From: xilesun <2013xile@gmail.com> Date: Tue, 27 Aug 2024 08:25:43 +0800 Subject: [PATCH 017/133] fix(release): remove continue-on-error for build step --- .github/workflows/release-next.yml | 1 - .github/workflows/release.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/release-next.yml b/.github/workflows/release-next.yml index cd05b0d36..004f01065 100644 --- a/.github/workflows/release-next.yml +++ b/.github/workflows/release-next.yml @@ -108,7 +108,6 @@ jobs: git clone -b next https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/nocobase/$repo.git packages/pro-plugins/@nocobase/$repo done - name: Build Pro plugins - continue-on-error: true run: | yarn config set registry https://registry.npmjs.org/ yarn install diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index de07b0f00..9eba8a0b2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -81,7 +81,6 @@ jobs: git clone -b main https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/nocobase/$repo.git packages/pro-plugins/@nocobase/$repo done - name: Build Pro plugins - continue-on-error: true run: | yarn config set registry https://registry.npmjs.org/ yarn install From 9dffefb90a662789f9c4e12d2a088a73363c89db Mon Sep 17 00:00:00 2001 From: "nocobase[bot]" <179432756+nocobase[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 00:37:42 +0000 Subject: [PATCH 018/133] =?UTF-8?q?chore(versions):=20=F0=9F=98=8A=20publi?= =?UTF-8?q?sh=20v1.3.3-beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lerna.json | 2 +- packages/core/acl/package.json | 6 +- packages/core/actions/package.json | 8 +- packages/core/app/package.json | 10 +- packages/core/auth/package.json | 12 +- packages/core/build/package.json | 2 +- packages/core/cache/package.json | 2 +- packages/core/cli/package.json | 6 +- packages/core/client/package.json | 8 +- .../core/create-nocobase-app/package.json | 2 +- .../core/data-source-manager/package.json | 12 +- packages/core/database/package.json | 6 +- packages/core/devtools/package.json | 8 +- packages/core/evaluators/package.json | 4 +- packages/core/logger/package.json | 2 +- packages/core/resourcer/package.json | 4 +- packages/core/sdk/package.json | 2 +- packages/core/server/package.json | 26 ++-- packages/core/telemetry/package.json | 4 +- packages/core/test/package.json | 4 +- packages/core/utils/package.json | 2 +- .../plugins/@nocobase/plugin-acl/package.json | 2 +- .../plugin-action-bulk-edit/package.json | 2 +- .../plugin-action-bulk-update/package.json | 2 +- .../plugin-action-custom-request/package.json | 2 +- .../plugin-action-duplicate/package.json | 2 +- .../plugin-action-export/package.json | 2 +- .../plugin-action-import/package.json | 2 +- .../plugin-action-print/package.json | 2 +- .../@nocobase/plugin-api-doc/package.json | 2 +- .../@nocobase/plugin-api-keys/package.json | 2 +- .../@nocobase/plugin-audit-logs/package.json | 2 +- .../@nocobase/plugin-auth-sms/package.json | 2 +- .../@nocobase/plugin-auth/package.json | 2 +- .../plugin-backup-restore/package.json | 2 +- .../plugin-block-iframe/package.json | 2 +- .../plugin-block-workbench/package.json | 2 +- .../@nocobase/plugin-calendar/package.json | 2 +- .../@nocobase/plugin-charts/package.json | 2 +- .../@nocobase/plugin-client/package.json | 2 +- .../plugin-collection-sql/package.json | 2 +- .../plugin-collection-tree/package.json | 2 +- .../plugin-data-source-main/package.json | 2 +- .../plugin-data-source-manager/package.json | 2 +- .../plugin-data-visualization/package.json | 2 +- .../plugin-disable-pm-add/package.json | 2 +- .../plugin-error-handler/package.json | 2 +- .../plugin-field-china-region/package.json | 2 +- .../plugin-field-formula/package.json | 2 +- .../plugin-field-m2m-array/package.json | 2 +- .../plugin-field-markdown-vditor/package.json | 2 +- .../plugin-field-sequence/package.json | 2 +- .../plugin-file-manager/package.json | 2 +- .../@nocobase/plugin-gantt/package.json | 2 +- .../package.json | 2 +- .../@nocobase/plugin-kanban/package.json | 2 +- .../plugin-localization/package.json | 2 +- .../@nocobase/plugin-logger/package.json | 2 +- .../plugins/@nocobase/plugin-map/package.json | 2 +- .../plugin-mobile-client/package.json | 2 +- .../@nocobase/plugin-mobile/package.json | 2 +- .../plugin-mock-collections/package.json | 2 +- .../plugin-multi-app-manager/package.json | 2 +- .../package.json | 2 +- .../plugin-notifications/package.json | 2 +- .../plugin-sample-hello/package.json | 2 +- .../plugin-snapshot-field/package.json | 2 +- .../plugin-system-settings/package.json | 2 +- .../plugin-theme-editor/package.json | 2 +- .../plugin-ui-schema-storage/package.json | 2 +- .../@nocobase/plugin-users/package.json | 2 +- .../plugin-verification/package.json | 2 +- .../package.json | 2 +- .../plugin-workflow-aggregate/package.json | 2 +- .../plugin-workflow-delay/package.json | 2 +- .../package.json | 2 +- .../plugin-workflow-loop/package.json | 2 +- .../plugin-workflow-mailer/package.json | 2 +- .../plugin-workflow-manual/package.json | 2 +- .../plugin-workflow-parallel/package.json | 2 +- .../plugin-workflow-request/package.json | 2 +- .../plugin-workflow-sql/package.json | 2 +- .../plugin-workflow-test/package.json | 2 +- .../@nocobase/plugin-workflow/package.json | 4 +- packages/presets/nocobase/package.json | 122 +++++++++--------- 85 files changed, 191 insertions(+), 191 deletions(-) diff --git a/lerna.json b/lerna.json index 00dad4cc3..5be907ece 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.3.2-beta", + "version": "1.3.3-beta", "npmClient": "yarn", "useWorkspaces": true, "npmClientArgs": [ diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json index 4c40611c6..dc4f660f7 100644 --- a/packages/core/acl/package.json +++ b/packages/core/acl/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/acl", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/resourcer": "1.3.2-beta", - "@nocobase/utils": "1.3.2-beta", + "@nocobase/resourcer": "1.3.3-beta", + "@nocobase/utils": "1.3.3-beta", "minimatch": "^5.1.1" }, "repository": { diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json index 5ebcde9ed..df82f09e7 100644 --- a/packages/core/actions/package.json +++ b/packages/core/actions/package.json @@ -1,14 +1,14 @@ { "name": "@nocobase/actions", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/cache": "1.3.2-beta", - "@nocobase/database": "1.3.2-beta", - "@nocobase/resourcer": "1.3.2-beta" + "@nocobase/cache": "1.3.3-beta", + "@nocobase/database": "1.3.3-beta", + "@nocobase/resourcer": "1.3.3-beta" }, "repository": { "type": "git", diff --git a/packages/core/app/package.json b/packages/core/app/package.json index e1f5bebf5..3266c4c79 100644 --- a/packages/core/app/package.json +++ b/packages/core/app/package.json @@ -1,17 +1,17 @@ { "name": "@nocobase/app", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/database": "1.3.2-beta", - "@nocobase/preset-nocobase": "1.3.2-beta", - "@nocobase/server": "1.3.2-beta" + "@nocobase/database": "1.3.3-beta", + "@nocobase/preset-nocobase": "1.3.3-beta", + "@nocobase/server": "1.3.3-beta" }, "devDependencies": { - "@nocobase/client": "1.3.2-beta" + "@nocobase/client": "1.3.3-beta" }, "repository": { "type": "git", diff --git a/packages/core/auth/package.json b/packages/core/auth/package.json index a4cd87646..40259f814 100644 --- a/packages/core/auth/package.json +++ b/packages/core/auth/package.json @@ -1,16 +1,16 @@ { "name": "@nocobase/auth", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/actions": "1.3.2-beta", - "@nocobase/cache": "1.3.2-beta", - "@nocobase/database": "1.3.2-beta", - "@nocobase/resourcer": "1.3.2-beta", - "@nocobase/utils": "1.3.2-beta", + "@nocobase/actions": "1.3.3-beta", + "@nocobase/cache": "1.3.3-beta", + "@nocobase/database": "1.3.3-beta", + "@nocobase/resourcer": "1.3.3-beta", + "@nocobase/utils": "1.3.3-beta", "@types/jsonwebtoken": "^8.5.8", "jsonwebtoken": "^8.5.1" }, diff --git a/packages/core/build/package.json b/packages/core/build/package.json index 4dedb8e99..4cb941df6 100644 --- a/packages/core/build/package.json +++ b/packages/core/build/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/build", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "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 25e7a494f..c94774471 100644 --- a/packages/core/cache/package.json +++ b/packages/core/cache/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cache", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json index db3a12903..790fbe80e 100644 --- a/packages/core/cli/package.json +++ b/packages/core/cli/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cli", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "description": "", "license": "AGPL-3.0", "main": "./src/index.js", @@ -8,7 +8,7 @@ "nocobase": "./bin/index.js" }, "dependencies": { - "@nocobase/app": "1.3.2-beta", + "@nocobase/app": "1.3.3-beta", "@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.2-beta" + "@nocobase/devtools": "1.3.3-beta" }, "repository": { "type": "git", diff --git a/packages/core/client/package.json b/packages/core/client/package.json index 03ea8db7e..7a6732313 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/client", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "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.2-beta", - "@nocobase/sdk": "1.3.2-beta", - "@nocobase/utils": "1.3.2-beta", + "@nocobase/evaluators": "1.3.3-beta", + "@nocobase/sdk": "1.3.3-beta", + "@nocobase/utils": "1.3.3-beta", "ahooks": "^3.7.2", "antd": "^5.12.8", "antd-style": "3.4.5", diff --git a/packages/core/create-nocobase-app/package.json b/packages/core/create-nocobase-app/package.json index 401557186..594755708 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.2-beta", + "version": "1.3.3-beta", "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 6d4587863..63e0aa861 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.2-beta", + "version": "1.3.3-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/actions": "1.3.2-beta", - "@nocobase/cache": "1.3.2-beta", - "@nocobase/database": "1.3.2-beta", - "@nocobase/resourcer": "1.3.2-beta", - "@nocobase/utils": "1.3.2-beta", + "@nocobase/actions": "1.3.3-beta", + "@nocobase/cache": "1.3.3-beta", + "@nocobase/database": "1.3.3-beta", + "@nocobase/resourcer": "1.3.3-beta", + "@nocobase/utils": "1.3.3-beta", "@types/jsonwebtoken": "^8.5.8", "jsonwebtoken": "^8.5.1" }, diff --git a/packages/core/database/package.json b/packages/core/database/package.json index 973ca200d..12b3d0b1a 100644 --- a/packages/core/database/package.json +++ b/packages/core/database/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/database", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { - "@nocobase/logger": "1.3.2-beta", - "@nocobase/utils": "1.3.2-beta", + "@nocobase/logger": "1.3.3-beta", + "@nocobase/utils": "1.3.3-beta", "async-mutex": "^0.3.2", "chalk": "^4.1.1", "cron-parser": "4.4.0", diff --git a/packages/core/devtools/package.json b/packages/core/devtools/package.json index 241ae6925..37ce4aaa3 100644 --- a/packages/core/devtools/package.json +++ b/packages/core/devtools/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/devtools", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "description": "", "license": "AGPL-3.0", "main": "./src/index.js", "dependencies": { - "@nocobase/build": "1.3.2-beta", - "@nocobase/client": "1.3.2-beta", - "@nocobase/test": "1.3.2-beta", + "@nocobase/build": "1.3.3-beta", + "@nocobase/client": "1.3.3-beta", + "@nocobase/test": "1.3.3-beta", "@types/koa": "^2.13.4", "@types/koa-bodyparser": "^4.3.4", "@types/lodash": "^4.14.177", diff --git a/packages/core/evaluators/package.json b/packages/core/evaluators/package.json index 8a16dc2fa..814dc494c 100644 --- a/packages/core/evaluators/package.json +++ b/packages/core/evaluators/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/evaluators", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { "@formulajs/formulajs": "4.2.0", - "@nocobase/utils": "1.3.2-beta", + "@nocobase/utils": "1.3.3-beta", "mathjs": "^10.6.0" }, "repository": { diff --git a/packages/core/logger/package.json b/packages/core/logger/package.json index 356f38b01..244334582 100644 --- a/packages/core/logger/package.json +++ b/packages/core/logger/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/logger", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "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 2ddf3b179..a7848e293 100644 --- a/packages/core/resourcer/package.json +++ b/packages/core/resourcer/package.json @@ -1,12 +1,12 @@ { "name": "@nocobase/resourcer", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { - "@nocobase/utils": "1.3.2-beta", + "@nocobase/utils": "1.3.3-beta", "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 d1412df57..59a2c5011 100644 --- a/packages/core/sdk/package.json +++ b/packages/core/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/sdk", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "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 1e2db3a4a..931a4feaf 100644 --- a/packages/core/server/package.json +++ b/packages/core/server/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/server", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "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.2-beta", - "@nocobase/actions": "1.3.2-beta", - "@nocobase/auth": "1.3.2-beta", - "@nocobase/cache": "1.3.2-beta", - "@nocobase/data-source-manager": "1.3.2-beta", - "@nocobase/database": "1.3.2-beta", - "@nocobase/evaluators": "1.3.2-beta", - "@nocobase/logger": "1.3.2-beta", - "@nocobase/resourcer": "1.3.2-beta", - "@nocobase/sdk": "1.3.2-beta", - "@nocobase/telemetry": "1.3.2-beta", - "@nocobase/utils": "1.3.2-beta", + "@nocobase/acl": "1.3.3-beta", + "@nocobase/actions": "1.3.3-beta", + "@nocobase/auth": "1.3.3-beta", + "@nocobase/cache": "1.3.3-beta", + "@nocobase/data-source-manager": "1.3.3-beta", + "@nocobase/database": "1.3.3-beta", + "@nocobase/evaluators": "1.3.3-beta", + "@nocobase/logger": "1.3.3-beta", + "@nocobase/resourcer": "1.3.3-beta", + "@nocobase/sdk": "1.3.3-beta", + "@nocobase/telemetry": "1.3.3-beta", + "@nocobase/utils": "1.3.3-beta", "@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 602dc32fa..95f72f819 100644 --- a/packages/core/telemetry/package.json +++ b/packages/core/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/telemetry", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "description": "nocobase telemetry library", "license": "AGPL-3.0", "main": "./lib/index.js", @@ -11,7 +11,7 @@ "directory": "packages/telemetry" }, "dependencies": { - "@nocobase/utils": "1.3.2-beta", + "@nocobase/utils": "1.3.3-beta", "@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 bd4b92c9f..2f17c4553 100644 --- a/packages/core/test/package.json +++ b/packages/core/test/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/test", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "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.2-beta", + "@nocobase/server": "1.3.3-beta", "@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 72fdd24b6..e65a63b78 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/utils", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "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 c42413866..dac1fc7b4 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.2-beta", + "version": "1.3.3-beta", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/acl", diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json index 64ba0c665..b65fbeec9 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.2-beta", + "version": "1.3.3-beta", "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 e0ccaa56e..0e6834bf9 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.2-beta", + "version": "1.3.3-beta", "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 7f7775958..6186b3e4a 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.2-beta", + "version": "1.3.3-beta", "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 cb986b633..592d35bb3 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.2-beta", + "version": "1.3.3-beta", "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 99391d062..f81842da5 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.2-beta", + "version": "1.3.3-beta", "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 4b48f0f31..0b219de2a 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.2-beta", + "version": "1.3.3-beta", "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 4ce8de9f7..53ad9d1dd 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.2-beta", + "version": "1.3.3-beta", "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 e7f5ff57b..fdbc0df6c 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.2-beta", + "version": "1.3.3-beta", "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 f7225a4a5..a0b1159af 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.2-beta", + "version": "1.3.3-beta", "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 2ed261c6a..d964bfd47 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.2-beta", + "version": "1.3.3-beta", "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 3306dfebf..403481a60 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.2-beta", + "version": "1.3.3-beta", "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 4c0c4fc6a..350ebee1c 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.2-beta", + "version": "1.3.3-beta", "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 1ce842546..20ade1ab8 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.2-beta", + "version": "1.3.3-beta", "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 cca42bbf8..4b8744419 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.2-beta", + "version": "1.3.3-beta", "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 101697f4c..3246b62a7 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.2-beta", + "version": "1.3.3-beta", "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 7a4fac7ca..250e40e50 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.2-beta", + "version": "1.3.3-beta", "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 c8a36559f..7038bec4d 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.2-beta", + "version": "1.3.3-beta", "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 eb69cdc18..30819a4f4 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.2-beta", + "version": "1.3.3-beta", "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 c0d67a0c3..03f3126e4 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.2-beta", + "version": "1.3.3-beta", "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 bc7ab38a2..a93568b38 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.2-beta", + "version": "1.3.3-beta", "displayName": "Collection: Tree", "displayName.zh-CN": "数据表：树", "description": "Provides tree collection template", diff --git a/packages/plugins/@nocobase/plugin-data-source-main/package.json b/packages/plugins/@nocobase/plugin-data-source-main/package.json index f7e8d05de..d74e23b98 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.2-beta", + "version": "1.3.3-beta", "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 d797f484f..e90bce102 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.2-beta", + "version": "1.3.3-beta", "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 a02fbff9d..189d9fa39 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.2-beta", + "version": "1.3.3-beta", "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-disable-pm-add/package.json b/packages/plugins/@nocobase/plugin-disable-pm-add/package.json index dbf8d4cc8..bd4ec3373 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.2-beta", + "version": "1.3.3-beta", "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 2ef805a3e..29cc6c718 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.2-beta", + "version": "1.3.3-beta", "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 bc9b0f653..5782cb176 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.2-beta", + "version": "1.3.3-beta", "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 c80940678..728efda22 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.2-beta", + "version": "1.3.3-beta", "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 816a7c66f..e8ee0db6d 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.2-beta", + "version": "1.3.3-beta", "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 427aa776f..4d115967c 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.2-beta", + "version": "1.3.3-beta", "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 7333c20bc..98d541dd6 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.2-beta", + "version": "1.3.3-beta", "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 48660576b..fcb446662 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.2-beta", + "version": "1.3.3-beta", "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 529da3e2e..9dc325dc5 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.2-beta", + "version": "1.3.3-beta", "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 1aa93d5ce..c6e531255 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.2-beta", + "version": "1.3.3-beta", "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 e83ae15b8..4d3d49b33 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.2-beta", + "version": "1.3.3-beta", "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 dd19dd2ff..a78cfc22e 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.2-beta", + "version": "1.3.3-beta", "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 12d8322c2..10be23909 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.2-beta", + "version": "1.3.3-beta", "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 87b379f71..aef05d909 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.2-beta", + "version": "1.3.3-beta", "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 49d93ee5a..30981fb49 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.2-beta", + "version": "1.3.3-beta", "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 871ddcb72..0f39992ae 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.2-beta", + "version": "1.3.3-beta", "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-mock-collections/package.json b/packages/plugins/@nocobase/plugin-mock-collections/package.json index bb1c38b84..ef559b82f 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.2-beta", + "version": "1.3.3-beta", "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 d113f3f7c..464caf510 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.2-beta", + "version": "1.3.3-beta", "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 35426fde1..f9e166e8c 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.2-beta", + "version": "1.3.3-beta", "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 6baf8ab14..0366c25fe 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.2-beta", + "version": "1.3.3-beta", "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 ac97d30f9..dbc877a27 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.2-beta", + "version": "1.3.3-beta", "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 ca0ff8ecb..730d12cb4 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.2-beta", + "version": "1.3.3-beta", "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 2ad8b9e66..d3450a44b 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.2-beta", + "version": "1.3.3-beta", "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 1d8fb973b..3ea2fb609 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.2-beta", + "version": "1.3.3-beta", "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 4fbcfd070..ef069a2b9 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.2-beta", + "version": "1.3.3-beta", "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 d16269b79..bb8c04104 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.2-beta", + "version": "1.3.3-beta", "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 033e7a199..e2a729667 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.2-beta", + "version": "1.3.3-beta", "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 36940c105..4bb6d2400 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.2-beta", + "version": "1.3.3-beta", "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 315015086..779efcc89 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.2-beta", + "version": "1.3.3-beta", "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 a8158c659..cc275f832 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.2-beta", + "version": "1.3.3-beta", "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 5d0a74fc6..501dd99ff 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.2-beta", + "version": "1.3.3-beta", "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 1192f961a..d96ff02db 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.2-beta", + "version": "1.3.3-beta", "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 0629c914e..ae7b2e348 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.2-beta", + "version": "1.3.3-beta", "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-manual/package.json b/packages/plugins/@nocobase/plugin-workflow-manual/package.json index 040d84c16..f8aa37518 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.2-beta", + "version": "1.3.3-beta", "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 f66ff6c47..36dfb9d71 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.2-beta", + "version": "1.3.3-beta", "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-request/package.json b/packages/plugins/@nocobase/plugin-workflow-request/package.json index bb35e6316..94173901d 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.2-beta", + "version": "1.3.3-beta", "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 87ca20122..80622e790 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.2-beta", + "version": "1.3.3-beta", "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 3f24e02e7..bd7e582ac 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.2-beta", + "version": "1.3.3-beta", "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 23fdbc226..bc379f12c 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.2-beta", + "version": "1.3.3-beta", "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.2-beta" + "@nocobase/plugin-workflow-test": "1.3.3-beta" }, "devDependencies": { "@ant-design/icons": "5.x", diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json index 90487cfad..46a1a560d 100644 --- a/packages/presets/nocobase/package.json +++ b/packages/presets/nocobase/package.json @@ -1,70 +1,70 @@ { "name": "@nocobase/preset-nocobase", - "version": "1.3.2-beta", + "version": "1.3.3-beta", "license": "AGPL-3.0", "main": "./lib/server/index.js", "dependencies": { "@formily/json-schema": "2.x", - "@nocobase/plugin-acl": "1.3.2-beta", - "@nocobase/plugin-action-bulk-edit": "1.3.2-beta", - "@nocobase/plugin-action-bulk-update": "1.3.2-beta", - "@nocobase/plugin-action-custom-request": "1.3.2-beta", - "@nocobase/plugin-action-duplicate": "1.3.2-beta", - "@nocobase/plugin-action-export": "1.3.2-beta", - "@nocobase/plugin-action-import": "1.3.2-beta", - "@nocobase/plugin-action-print": "1.3.2-beta", - "@nocobase/plugin-api-doc": "1.3.2-beta", - "@nocobase/plugin-api-keys": "1.3.2-beta", - "@nocobase/plugin-audit-logs": "1.3.2-beta", - "@nocobase/plugin-auth": "1.3.2-beta", - "@nocobase/plugin-auth-sms": "1.3.2-beta", - "@nocobase/plugin-backup-restore": "1.3.2-beta", - "@nocobase/plugin-block-iframe": "1.3.2-beta", - "@nocobase/plugin-block-workbench": "1.3.2-beta", - "@nocobase/plugin-calendar": "1.3.2-beta", - "@nocobase/plugin-charts": "1.3.2-beta", - "@nocobase/plugin-client": "1.3.2-beta", - "@nocobase/plugin-collection-sql": "1.3.2-beta", - "@nocobase/plugin-collection-tree": "1.3.2-beta", - "@nocobase/plugin-data-source-main": "1.3.2-beta", - "@nocobase/plugin-data-source-manager": "1.3.2-beta", - "@nocobase/plugin-data-visualization": "1.3.2-beta", - "@nocobase/plugin-error-handler": "1.3.2-beta", - "@nocobase/plugin-field-china-region": "1.3.2-beta", - "@nocobase/plugin-field-formula": "1.3.2-beta", - "@nocobase/plugin-field-m2m-array": "1.3.2-beta", - "@nocobase/plugin-field-markdown-vditor": "1.3.2-beta", - "@nocobase/plugin-field-sequence": "1.3.2-beta", - "@nocobase/plugin-file-manager": "1.3.2-beta", - "@nocobase/plugin-gantt": "1.3.2-beta", - "@nocobase/plugin-graph-collection-manager": "1.3.2-beta", - "@nocobase/plugin-kanban": "1.3.2-beta", - "@nocobase/plugin-localization": "1.3.2-beta", - "@nocobase/plugin-logger": "1.3.2-beta", - "@nocobase/plugin-map": "1.3.2-beta", - "@nocobase/plugin-mobile": "1.3.2-beta", - "@nocobase/plugin-mobile-client": "1.3.2-beta", - "@nocobase/plugin-mock-collections": "1.3.2-beta", - "@nocobase/plugin-multi-app-manager": "1.3.2-beta", - "@nocobase/plugin-multi-app-share-collection": "1.3.2-beta", - "@nocobase/plugin-snapshot-field": "1.3.2-beta", - "@nocobase/plugin-system-settings": "1.3.2-beta", - "@nocobase/plugin-theme-editor": "1.3.2-beta", - "@nocobase/plugin-ui-schema-storage": "1.3.2-beta", - "@nocobase/plugin-users": "1.3.2-beta", - "@nocobase/plugin-verification": "1.3.2-beta", - "@nocobase/plugin-workflow": "1.3.2-beta", - "@nocobase/plugin-workflow-action-trigger": "1.3.2-beta", - "@nocobase/plugin-workflow-aggregate": "1.3.2-beta", - "@nocobase/plugin-workflow-delay": "1.3.2-beta", - "@nocobase/plugin-workflow-dynamic-calculation": "1.3.2-beta", - "@nocobase/plugin-workflow-loop": "1.3.2-beta", - "@nocobase/plugin-workflow-mailer": "1.3.2-beta", - "@nocobase/plugin-workflow-manual": "1.3.2-beta", - "@nocobase/plugin-workflow-parallel": "1.3.2-beta", - "@nocobase/plugin-workflow-request": "1.3.2-beta", - "@nocobase/plugin-workflow-sql": "1.3.2-beta", - "@nocobase/server": "1.3.2-beta", + "@nocobase/plugin-acl": "1.3.3-beta", + "@nocobase/plugin-action-bulk-edit": "1.3.3-beta", + "@nocobase/plugin-action-bulk-update": "1.3.3-beta", + "@nocobase/plugin-action-custom-request": "1.3.3-beta", + "@nocobase/plugin-action-duplicate": "1.3.3-beta", + "@nocobase/plugin-action-export": "1.3.3-beta", + "@nocobase/plugin-action-import": "1.3.3-beta", + "@nocobase/plugin-action-print": "1.3.3-beta", + "@nocobase/plugin-api-doc": "1.3.3-beta", + "@nocobase/plugin-api-keys": "1.3.3-beta", + "@nocobase/plugin-audit-logs": "1.3.3-beta", + "@nocobase/plugin-auth": "1.3.3-beta", + "@nocobase/plugin-auth-sms": "1.3.3-beta", + "@nocobase/plugin-backup-restore": "1.3.3-beta", + "@nocobase/plugin-block-iframe": "1.3.3-beta", + "@nocobase/plugin-block-workbench": "1.3.3-beta", + "@nocobase/plugin-calendar": "1.3.3-beta", + "@nocobase/plugin-charts": "1.3.3-beta", + "@nocobase/plugin-client": "1.3.3-beta", + "@nocobase/plugin-collection-sql": "1.3.3-beta", + "@nocobase/plugin-collection-tree": "1.3.3-beta", + "@nocobase/plugin-data-source-main": "1.3.3-beta", + "@nocobase/plugin-data-source-manager": "1.3.3-beta", + "@nocobase/plugin-data-visualization": "1.3.3-beta", + "@nocobase/plugin-error-handler": "1.3.3-beta", + "@nocobase/plugin-field-china-region": "1.3.3-beta", + "@nocobase/plugin-field-formula": "1.3.3-beta", + "@nocobase/plugin-field-m2m-array": "1.3.3-beta", + "@nocobase/plugin-field-markdown-vditor": "1.3.3-beta", + "@nocobase/plugin-field-sequence": "1.3.3-beta", + "@nocobase/plugin-file-manager": "1.3.3-beta", + "@nocobase/plugin-gantt": "1.3.3-beta", + "@nocobase/plugin-graph-collection-manager": "1.3.3-beta", + "@nocobase/plugin-kanban": "1.3.3-beta", + "@nocobase/plugin-localization": "1.3.3-beta", + "@nocobase/plugin-logger": "1.3.3-beta", + "@nocobase/plugin-map": "1.3.3-beta", + "@nocobase/plugin-mobile": "1.3.3-beta", + "@nocobase/plugin-mobile-client": "1.3.3-beta", + "@nocobase/plugin-mock-collections": "1.3.3-beta", + "@nocobase/plugin-multi-app-manager": "1.3.3-beta", + "@nocobase/plugin-multi-app-share-collection": "1.3.3-beta", + "@nocobase/plugin-snapshot-field": "1.3.3-beta", + "@nocobase/plugin-system-settings": "1.3.3-beta", + "@nocobase/plugin-theme-editor": "1.3.3-beta", + "@nocobase/plugin-ui-schema-storage": "1.3.3-beta", + "@nocobase/plugin-users": "1.3.3-beta", + "@nocobase/plugin-verification": "1.3.3-beta", + "@nocobase/plugin-workflow": "1.3.3-beta", + "@nocobase/plugin-workflow-action-trigger": "1.3.3-beta", + "@nocobase/plugin-workflow-aggregate": "1.3.3-beta", + "@nocobase/plugin-workflow-delay": "1.3.3-beta", + "@nocobase/plugin-workflow-dynamic-calculation": "1.3.3-beta", + "@nocobase/plugin-workflow-loop": "1.3.3-beta", + "@nocobase/plugin-workflow-mailer": "1.3.3-beta", + "@nocobase/plugin-workflow-manual": "1.3.3-beta", + "@nocobase/plugin-workflow-parallel": "1.3.3-beta", + "@nocobase/plugin-workflow-request": "1.3.3-beta", + "@nocobase/plugin-workflow-sql": "1.3.3-beta", + "@nocobase/server": "1.3.3-beta", "cronstrue": "^2.11.0" }, "repository": { From 3403e8d76684950d6962a6110a4440eb95856a35 Mon Sep 17 00:00:00 2001 From: "nocobase[bot]" <179432756+nocobase[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 00:37:47 +0000 Subject: [PATCH 019/133] chore: update changelog --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34d8758e7..daaabad26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,19 @@ 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.3-beta](https://github.com/nocobase/nocobase/compare/v1.3.2-beta...v1.3.3-beta) - 2024-08-27 + +### Merged + +- fix: use the built-in logo file [`#5032`](https://github.com/nocobase/nocobase/pull/5032) +- chore: optimize pro image build ci [`#5140`](https://github.com/nocobase/nocobase/pull/5140) + +### Commits + +- chore(versions): 😊 publish v1.3.3-beta [`9dffefb`](https://github.com/nocobase/nocobase/commit/9dffefb90a662789f9c4e12d2a088a73363c89db) +- chore: update changelog [`7c28f4d`](https://github.com/nocobase/nocobase/commit/7c28f4d06690d6b36701f773a933287c0a395a6d) +- fix(release): remove continue-on-error for build step [`5a41ab0`](https://github.com/nocobase/nocobase/commit/5a41ab063c8eea8bb0240cc6baf5d485b4fe9f84) + ## [v1.3.2-beta](https://github.com/nocobase/nocobase/compare/v1.3.1-beta...v1.3.2-beta) - 2024-08-26 ### Commits From 2eaa0b80816a698c08841549b7e831b6733e3364 Mon Sep 17 00:00:00 2001 From: Katherine Date: Tue, 27 Aug 2024 14:54:02 +0800 Subject: [PATCH 020/133] refactor: set remainsTheSame as the default value for field editing in bulk editing action (#5124) * refactor: bulk edit set remainsTheSame as default value * fix: test --- .../form/__e2e__/form-edit/bulkEditForm.test.ts | 10 ++++++++-- .../src/client/component/BulkEditField.tsx | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/core/client/src/modules/blocks/data-blocks/form/__e2e__/form-edit/bulkEditForm.test.ts b/packages/core/client/src/modules/blocks/data-blocks/form/__e2e__/form-edit/bulkEditForm.test.ts index ab3a45655..d4d5c9435 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/form/__e2e__/form-edit/bulkEditForm.test.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/form/__e2e__/form-edit/bulkEditForm.test.ts @@ -26,7 +26,10 @@ test.describe('bulk edit form', () => { // 2. 打开弹窗，显示出批量编辑表单 await page.getByLabel('action-Action-Bulk edit-').click(); - // 默认为 "Changed to" 模式，此时应该显示字段是必填的 + await page.getByLabel('block-item-BulkEditField-').click(); + await page.getByRole('option', { name: 'Changed to' }).click(); + + // "Changed to" 模式，此时应该显示字段是必填的 await expect(page.getByLabel('block-item-BulkEditField-').getByText('*')).toBeVisible(); // 3. 输入值，点击提交 @@ -45,7 +48,10 @@ test.describe('bulk edit form', () => { // 1. 打开弹窗，显示出批量编辑表单 await page.getByLabel('action-Action-Bulk edit-').click(); - // 默认为 "Changed to" 模式，此时应该显示字段是必填的 + await page.getByLabel('block-item-BulkEditField-').click(); + await page.getByRole('option', { name: 'Changed to' }).click(); + + // "Changed to" 模式，此时应该显示字段是必填的 await expect(page.getByLabel('block-item-BulkEditField-').getByText('*')).toBeVisible(); // 2. 切换为其它模式，此时应该不显示字段是必填的 diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/component/BulkEditField.tsx b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/component/BulkEditField.tsx index 35f0fbfea..1d4c4cdfa 100644 --- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/component/BulkEditField.tsx +++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/component/BulkEditField.tsx @@ -95,7 +95,7 @@ export const BulkEditField = (props: any) => { const { t } = useTranslation(); const fieldSchema = useFieldSchema(); const field = useField(); - const [type, setType] = useState(BulkEditFormItemValueType.ChangedTo); + const [type, setType] = useState(BulkEditFormItemValueType.RemainsTheSame); const [value, setValue] = useState(null); const { getField } = useCollection_deprecated(); const collectionField = getField(fieldSchema.name) || {}; From a0117480e037e48a23f59921110003047a1a174b Mon Sep 17 00:00:00 2001 From: "nocobase[bot]" <179432756+nocobase[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 10:27:55 +0000 Subject: [PATCH 021/133] =?UTF-8?q?chore(versions):=20=F0=9F=98=8A=20publi?= =?UTF-8?q?sh=20v1.3.4-beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lerna.json | 2 +- packages/core/acl/package.json | 6 +- packages/core/actions/package.json | 8 +- packages/core/app/package.json | 10 +- packages/core/auth/package.json | 12 +- packages/core/build/package.json | 2 +- packages/core/cache/package.json | 2 +- packages/core/cli/package.json | 6 +- packages/core/client/package.json | 8 +- .../core/create-nocobase-app/package.json | 2 +- .../core/data-source-manager/package.json | 12 +- packages/core/database/package.json | 6 +- packages/core/devtools/package.json | 8 +- packages/core/evaluators/package.json | 4 +- packages/core/logger/package.json | 2 +- packages/core/resourcer/package.json | 4 +- packages/core/sdk/package.json | 2 +- packages/core/server/package.json | 26 ++-- packages/core/telemetry/package.json | 4 +- packages/core/test/package.json | 4 +- packages/core/utils/package.json | 2 +- .../plugins/@nocobase/plugin-acl/package.json | 2 +- .../plugin-action-bulk-edit/package.json | 2 +- .../plugin-action-bulk-update/package.json | 2 +- .../plugin-action-custom-request/package.json | 2 +- .../plugin-action-duplicate/package.json | 2 +- .../plugin-action-export/package.json | 2 +- .../plugin-action-import/package.json | 2 +- .../plugin-action-print/package.json | 2 +- .../@nocobase/plugin-api-doc/package.json | 2 +- .../@nocobase/plugin-api-keys/package.json | 2 +- .../@nocobase/plugin-audit-logs/package.json | 2 +- .../@nocobase/plugin-auth-sms/package.json | 2 +- .../@nocobase/plugin-auth/package.json | 2 +- .../plugin-backup-restore/package.json | 2 +- .../plugin-block-iframe/package.json | 2 +- .../plugin-block-workbench/package.json | 2 +- .../@nocobase/plugin-calendar/package.json | 2 +- .../@nocobase/plugin-charts/package.json | 2 +- .../@nocobase/plugin-client/package.json | 2 +- .../plugin-collection-sql/package.json | 2 +- .../plugin-collection-tree/package.json | 2 +- .../plugin-data-source-main/package.json | 2 +- .../plugin-data-source-manager/package.json | 2 +- .../plugin-data-visualization/package.json | 2 +- .../plugin-disable-pm-add/package.json | 2 +- .../plugin-error-handler/package.json | 2 +- .../plugin-field-china-region/package.json | 2 +- .../plugin-field-formula/package.json | 2 +- .../plugin-field-m2m-array/package.json | 2 +- .../plugin-field-markdown-vditor/package.json | 2 +- .../plugin-field-sequence/package.json | 2 +- .../plugin-file-manager/package.json | 2 +- .../@nocobase/plugin-gantt/package.json | 2 +- .../package.json | 2 +- .../@nocobase/plugin-kanban/package.json | 2 +- .../plugin-localization/package.json | 2 +- .../@nocobase/plugin-logger/package.json | 2 +- .../plugins/@nocobase/plugin-map/package.json | 2 +- .../plugin-mobile-client/package.json | 2 +- .../@nocobase/plugin-mobile/package.json | 2 +- .../plugin-mock-collections/package.json | 2 +- .../plugin-multi-app-manager/package.json | 2 +- .../package.json | 2 +- .../plugin-notifications/package.json | 2 +- .../plugin-sample-hello/package.json | 2 +- .../plugin-snapshot-field/package.json | 2 +- .../plugin-system-settings/package.json | 2 +- .../plugin-theme-editor/package.json | 2 +- .../plugin-ui-schema-storage/package.json | 2 +- .../@nocobase/plugin-users/package.json | 2 +- .../plugin-verification/package.json | 2 +- .../package.json | 2 +- .../plugin-workflow-aggregate/package.json | 2 +- .../plugin-workflow-delay/package.json | 2 +- .../package.json | 2 +- .../plugin-workflow-loop/package.json | 2 +- .../plugin-workflow-mailer/package.json | 2 +- .../plugin-workflow-manual/package.json | 2 +- .../plugin-workflow-parallel/package.json | 2 +- .../plugin-workflow-request/package.json | 2 +- .../plugin-workflow-sql/package.json | 2 +- .../plugin-workflow-test/package.json | 2 +- .../@nocobase/plugin-workflow/package.json | 4 +- packages/presets/nocobase/package.json | 122 +++++++++--------- 85 files changed, 191 insertions(+), 191 deletions(-) diff --git a/lerna.json b/lerna.json index 5be907ece..da0c23ead 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.3.3-beta", + "version": "1.3.4-beta", "npmClient": "yarn", "useWorkspaces": true, "npmClientArgs": [ diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json index dc4f660f7..36f729288 100644 --- a/packages/core/acl/package.json +++ b/packages/core/acl/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/acl", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/resourcer": "1.3.3-beta", - "@nocobase/utils": "1.3.3-beta", + "@nocobase/resourcer": "1.3.4-beta", + "@nocobase/utils": "1.3.4-beta", "minimatch": "^5.1.1" }, "repository": { diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json index df82f09e7..a8f2a2aa6 100644 --- a/packages/core/actions/package.json +++ b/packages/core/actions/package.json @@ -1,14 +1,14 @@ { "name": "@nocobase/actions", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/cache": "1.3.3-beta", - "@nocobase/database": "1.3.3-beta", - "@nocobase/resourcer": "1.3.3-beta" + "@nocobase/cache": "1.3.4-beta", + "@nocobase/database": "1.3.4-beta", + "@nocobase/resourcer": "1.3.4-beta" }, "repository": { "type": "git", diff --git a/packages/core/app/package.json b/packages/core/app/package.json index 3266c4c79..568213d8a 100644 --- a/packages/core/app/package.json +++ b/packages/core/app/package.json @@ -1,17 +1,17 @@ { "name": "@nocobase/app", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/database": "1.3.3-beta", - "@nocobase/preset-nocobase": "1.3.3-beta", - "@nocobase/server": "1.3.3-beta" + "@nocobase/database": "1.3.4-beta", + "@nocobase/preset-nocobase": "1.3.4-beta", + "@nocobase/server": "1.3.4-beta" }, "devDependencies": { - "@nocobase/client": "1.3.3-beta" + "@nocobase/client": "1.3.4-beta" }, "repository": { "type": "git", diff --git a/packages/core/auth/package.json b/packages/core/auth/package.json index 40259f814..82d52f0b1 100644 --- a/packages/core/auth/package.json +++ b/packages/core/auth/package.json @@ -1,16 +1,16 @@ { "name": "@nocobase/auth", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/actions": "1.3.3-beta", - "@nocobase/cache": "1.3.3-beta", - "@nocobase/database": "1.3.3-beta", - "@nocobase/resourcer": "1.3.3-beta", - "@nocobase/utils": "1.3.3-beta", + "@nocobase/actions": "1.3.4-beta", + "@nocobase/cache": "1.3.4-beta", + "@nocobase/database": "1.3.4-beta", + "@nocobase/resourcer": "1.3.4-beta", + "@nocobase/utils": "1.3.4-beta", "@types/jsonwebtoken": "^8.5.8", "jsonwebtoken": "^8.5.1" }, diff --git a/packages/core/build/package.json b/packages/core/build/package.json index 4cb941df6..79d0cbc1f 100644 --- a/packages/core/build/package.json +++ b/packages/core/build/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/build", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "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 c94774471..df49b1abe 100644 --- a/packages/core/cache/package.json +++ b/packages/core/cache/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cache", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json index 790fbe80e..099ba8ad6 100644 --- a/packages/core/cli/package.json +++ b/packages/core/cli/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cli", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "description": "", "license": "AGPL-3.0", "main": "./src/index.js", @@ -8,7 +8,7 @@ "nocobase": "./bin/index.js" }, "dependencies": { - "@nocobase/app": "1.3.3-beta", + "@nocobase/app": "1.3.4-beta", "@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.3-beta" + "@nocobase/devtools": "1.3.4-beta" }, "repository": { "type": "git", diff --git a/packages/core/client/package.json b/packages/core/client/package.json index 7a6732313..4c881efa4 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/client", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "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.3-beta", - "@nocobase/sdk": "1.3.3-beta", - "@nocobase/utils": "1.3.3-beta", + "@nocobase/evaluators": "1.3.4-beta", + "@nocobase/sdk": "1.3.4-beta", + "@nocobase/utils": "1.3.4-beta", "ahooks": "^3.7.2", "antd": "^5.12.8", "antd-style": "3.4.5", diff --git a/packages/core/create-nocobase-app/package.json b/packages/core/create-nocobase-app/package.json index 594755708..ee20ef998 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.3-beta", + "version": "1.3.4-beta", "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 63e0aa861..abfc3869a 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.3-beta", + "version": "1.3.4-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/actions": "1.3.3-beta", - "@nocobase/cache": "1.3.3-beta", - "@nocobase/database": "1.3.3-beta", - "@nocobase/resourcer": "1.3.3-beta", - "@nocobase/utils": "1.3.3-beta", + "@nocobase/actions": "1.3.4-beta", + "@nocobase/cache": "1.3.4-beta", + "@nocobase/database": "1.3.4-beta", + "@nocobase/resourcer": "1.3.4-beta", + "@nocobase/utils": "1.3.4-beta", "@types/jsonwebtoken": "^8.5.8", "jsonwebtoken": "^8.5.1" }, diff --git a/packages/core/database/package.json b/packages/core/database/package.json index 12b3d0b1a..41b3b2dfe 100644 --- a/packages/core/database/package.json +++ b/packages/core/database/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/database", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { - "@nocobase/logger": "1.3.3-beta", - "@nocobase/utils": "1.3.3-beta", + "@nocobase/logger": "1.3.4-beta", + "@nocobase/utils": "1.3.4-beta", "async-mutex": "^0.3.2", "chalk": "^4.1.1", "cron-parser": "4.4.0", diff --git a/packages/core/devtools/package.json b/packages/core/devtools/package.json index 37ce4aaa3..6027a5038 100644 --- a/packages/core/devtools/package.json +++ b/packages/core/devtools/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/devtools", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "description": "", "license": "AGPL-3.0", "main": "./src/index.js", "dependencies": { - "@nocobase/build": "1.3.3-beta", - "@nocobase/client": "1.3.3-beta", - "@nocobase/test": "1.3.3-beta", + "@nocobase/build": "1.3.4-beta", + "@nocobase/client": "1.3.4-beta", + "@nocobase/test": "1.3.4-beta", "@types/koa": "^2.13.4", "@types/koa-bodyparser": "^4.3.4", "@types/lodash": "^4.14.177", diff --git a/packages/core/evaluators/package.json b/packages/core/evaluators/package.json index 814dc494c..93c285654 100644 --- a/packages/core/evaluators/package.json +++ b/packages/core/evaluators/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/evaluators", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { "@formulajs/formulajs": "4.2.0", - "@nocobase/utils": "1.3.3-beta", + "@nocobase/utils": "1.3.4-beta", "mathjs": "^10.6.0" }, "repository": { diff --git a/packages/core/logger/package.json b/packages/core/logger/package.json index 244334582..b31a64810 100644 --- a/packages/core/logger/package.json +++ b/packages/core/logger/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/logger", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "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 a7848e293..de8a7f8aa 100644 --- a/packages/core/resourcer/package.json +++ b/packages/core/resourcer/package.json @@ -1,12 +1,12 @@ { "name": "@nocobase/resourcer", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { - "@nocobase/utils": "1.3.3-beta", + "@nocobase/utils": "1.3.4-beta", "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 59a2c5011..d642b8849 100644 --- a/packages/core/sdk/package.json +++ b/packages/core/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/sdk", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "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 931a4feaf..3839e29a3 100644 --- a/packages/core/server/package.json +++ b/packages/core/server/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/server", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "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.3-beta", - "@nocobase/actions": "1.3.3-beta", - "@nocobase/auth": "1.3.3-beta", - "@nocobase/cache": "1.3.3-beta", - "@nocobase/data-source-manager": "1.3.3-beta", - "@nocobase/database": "1.3.3-beta", - "@nocobase/evaluators": "1.3.3-beta", - "@nocobase/logger": "1.3.3-beta", - "@nocobase/resourcer": "1.3.3-beta", - "@nocobase/sdk": "1.3.3-beta", - "@nocobase/telemetry": "1.3.3-beta", - "@nocobase/utils": "1.3.3-beta", + "@nocobase/acl": "1.3.4-beta", + "@nocobase/actions": "1.3.4-beta", + "@nocobase/auth": "1.3.4-beta", + "@nocobase/cache": "1.3.4-beta", + "@nocobase/data-source-manager": "1.3.4-beta", + "@nocobase/database": "1.3.4-beta", + "@nocobase/evaluators": "1.3.4-beta", + "@nocobase/logger": "1.3.4-beta", + "@nocobase/resourcer": "1.3.4-beta", + "@nocobase/sdk": "1.3.4-beta", + "@nocobase/telemetry": "1.3.4-beta", + "@nocobase/utils": "1.3.4-beta", "@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 95f72f819..31eebd004 100644 --- a/packages/core/telemetry/package.json +++ b/packages/core/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/telemetry", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "description": "nocobase telemetry library", "license": "AGPL-3.0", "main": "./lib/index.js", @@ -11,7 +11,7 @@ "directory": "packages/telemetry" }, "dependencies": { - "@nocobase/utils": "1.3.3-beta", + "@nocobase/utils": "1.3.4-beta", "@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 2f17c4553..eae388866 100644 --- a/packages/core/test/package.json +++ b/packages/core/test/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/test", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "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.3-beta", + "@nocobase/server": "1.3.4-beta", "@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 e65a63b78..a1629a4b8 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/utils", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "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 dac1fc7b4..001d2a481 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.3-beta", + "version": "1.3.4-beta", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/acl", diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json index b65fbeec9..2a532ed0c 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.3-beta", + "version": "1.3.4-beta", "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 0e6834bf9..c97c10811 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.3-beta", + "version": "1.3.4-beta", "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 6186b3e4a..dc5974fec 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.3-beta", + "version": "1.3.4-beta", "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 592d35bb3..b9c72566d 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.3-beta", + "version": "1.3.4-beta", "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 f81842da5..aa5f54577 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.3-beta", + "version": "1.3.4-beta", "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 0b219de2a..35c1da12d 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.3-beta", + "version": "1.3.4-beta", "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 53ad9d1dd..945dd0906 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.3-beta", + "version": "1.3.4-beta", "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 fdbc0df6c..65556e405 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.3-beta", + "version": "1.3.4-beta", "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 a0b1159af..6f65bf14f 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.3-beta", + "version": "1.3.4-beta", "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 d964bfd47..63c47352c 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.3-beta", + "version": "1.3.4-beta", "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 403481a60..86a4ff933 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.3-beta", + "version": "1.3.4-beta", "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 350ebee1c..100d88ba2 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.3-beta", + "version": "1.3.4-beta", "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 20ade1ab8..500ec9718 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.3-beta", + "version": "1.3.4-beta", "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 4b8744419..55be23e1d 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.3-beta", + "version": "1.3.4-beta", "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 3246b62a7..a3df6bd97 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.3-beta", + "version": "1.3.4-beta", "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 250e40e50..765ca7ef0 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.3-beta", + "version": "1.3.4-beta", "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 7038bec4d..763e0ff74 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.3-beta", + "version": "1.3.4-beta", "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 30819a4f4..460ddc8e6 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.3-beta", + "version": "1.3.4-beta", "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 03f3126e4..13de87c96 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.3-beta", + "version": "1.3.4-beta", "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 a93568b38..c2dddbcd0 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.3-beta", + "version": "1.3.4-beta", "displayName": "Collection: Tree", "displayName.zh-CN": "数据表：树", "description": "Provides tree collection template", diff --git a/packages/plugins/@nocobase/plugin-data-source-main/package.json b/packages/plugins/@nocobase/plugin-data-source-main/package.json index d74e23b98..5f8bc89d2 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.3-beta", + "version": "1.3.4-beta", "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 e90bce102..84c92a79b 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.3-beta", + "version": "1.3.4-beta", "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 189d9fa39..ca93163c3 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.3-beta", + "version": "1.3.4-beta", "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-disable-pm-add/package.json b/packages/plugins/@nocobase/plugin-disable-pm-add/package.json index bd4ec3373..b7db62803 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.3-beta", + "version": "1.3.4-beta", "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 29cc6c718..d0e32997f 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.3-beta", + "version": "1.3.4-beta", "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 5782cb176..0481c32be 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.3-beta", + "version": "1.3.4-beta", "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 728efda22..75abce933 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.3-beta", + "version": "1.3.4-beta", "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 e8ee0db6d..4d8247507 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.3-beta", + "version": "1.3.4-beta", "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 4d115967c..ea1caae67 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.3-beta", + "version": "1.3.4-beta", "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 98d541dd6..9a22730cc 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.3-beta", + "version": "1.3.4-beta", "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 fcb446662..81e5d076f 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.3-beta", + "version": "1.3.4-beta", "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 9dc325dc5..c4f3c185d 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.3-beta", + "version": "1.3.4-beta", "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 c6e531255..fa46c0366 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.3-beta", + "version": "1.3.4-beta", "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 4d3d49b33..2f7ca0a52 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.3-beta", + "version": "1.3.4-beta", "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 a78cfc22e..187595a26 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.3-beta", + "version": "1.3.4-beta", "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 10be23909..2ac2e52c0 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.3-beta", + "version": "1.3.4-beta", "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 aef05d909..972b4d639 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.3-beta", + "version": "1.3.4-beta", "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 30981fb49..24405d25c 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.3-beta", + "version": "1.3.4-beta", "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 0f39992ae..efcbd284f 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.3-beta", + "version": "1.3.4-beta", "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-mock-collections/package.json b/packages/plugins/@nocobase/plugin-mock-collections/package.json index ef559b82f..ac24260df 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.3-beta", + "version": "1.3.4-beta", "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 464caf510..aed1eb5a6 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.3-beta", + "version": "1.3.4-beta", "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 f9e166e8c..d1f59d756 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.3-beta", + "version": "1.3.4-beta", "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 0366c25fe..ae568bf88 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.3-beta", + "version": "1.3.4-beta", "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 dbc877a27..b59fefc19 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.3-beta", + "version": "1.3.4-beta", "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 730d12cb4..f05feb5c1 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.3-beta", + "version": "1.3.4-beta", "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 d3450a44b..3782b490f 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.3-beta", + "version": "1.3.4-beta", "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 3ea2fb609..66d8c1b62 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.3-beta", + "version": "1.3.4-beta", "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 ef069a2b9..7cf42274a 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.3-beta", + "version": "1.3.4-beta", "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 bb8c04104..a0cef9389 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.3-beta", + "version": "1.3.4-beta", "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 e2a729667..e61f74af0 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.3-beta", + "version": "1.3.4-beta", "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 4bb6d2400..9f3ead335 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.3-beta", + "version": "1.3.4-beta", "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 779efcc89..5342eba84 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.3-beta", + "version": "1.3.4-beta", "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 cc275f832..a104afae5 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.3-beta", + "version": "1.3.4-beta", "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 501dd99ff..04fa5c8e7 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.3-beta", + "version": "1.3.4-beta", "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 d96ff02db..cad26b257 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.3-beta", + "version": "1.3.4-beta", "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 ae7b2e348..a554145f3 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.3-beta", + "version": "1.3.4-beta", "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-manual/package.json b/packages/plugins/@nocobase/plugin-workflow-manual/package.json index f8aa37518..2eb5cb0bd 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.3-beta", + "version": "1.3.4-beta", "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 36dfb9d71..713b4cbee 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.3-beta", + "version": "1.3.4-beta", "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-request/package.json b/packages/plugins/@nocobase/plugin-workflow-request/package.json index 94173901d..7faabf9f0 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.3-beta", + "version": "1.3.4-beta", "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 80622e790..79ab55062 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.3-beta", + "version": "1.3.4-beta", "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 bd7e582ac..5f255be89 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.3-beta", + "version": "1.3.4-beta", "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 bc379f12c..904edd5e6 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.3-beta", + "version": "1.3.4-beta", "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.3-beta" + "@nocobase/plugin-workflow-test": "1.3.4-beta" }, "devDependencies": { "@ant-design/icons": "5.x", diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json index 46a1a560d..33a007484 100644 --- a/packages/presets/nocobase/package.json +++ b/packages/presets/nocobase/package.json @@ -1,70 +1,70 @@ { "name": "@nocobase/preset-nocobase", - "version": "1.3.3-beta", + "version": "1.3.4-beta", "license": "AGPL-3.0", "main": "./lib/server/index.js", "dependencies": { "@formily/json-schema": "2.x", - "@nocobase/plugin-acl": "1.3.3-beta", - "@nocobase/plugin-action-bulk-edit": "1.3.3-beta", - "@nocobase/plugin-action-bulk-update": "1.3.3-beta", - "@nocobase/plugin-action-custom-request": "1.3.3-beta", - "@nocobase/plugin-action-duplicate": "1.3.3-beta", - "@nocobase/plugin-action-export": "1.3.3-beta", - "@nocobase/plugin-action-import": "1.3.3-beta", - "@nocobase/plugin-action-print": "1.3.3-beta", - "@nocobase/plugin-api-doc": "1.3.3-beta", - "@nocobase/plugin-api-keys": "1.3.3-beta", - "@nocobase/plugin-audit-logs": "1.3.3-beta", - "@nocobase/plugin-auth": "1.3.3-beta", - "@nocobase/plugin-auth-sms": "1.3.3-beta", - "@nocobase/plugin-backup-restore": "1.3.3-beta", - "@nocobase/plugin-block-iframe": "1.3.3-beta", - "@nocobase/plugin-block-workbench": "1.3.3-beta", - "@nocobase/plugin-calendar": "1.3.3-beta", - "@nocobase/plugin-charts": "1.3.3-beta", - "@nocobase/plugin-client": "1.3.3-beta", - "@nocobase/plugin-collection-sql": "1.3.3-beta", - "@nocobase/plugin-collection-tree": "1.3.3-beta", - "@nocobase/plugin-data-source-main": "1.3.3-beta", - "@nocobase/plugin-data-source-manager": "1.3.3-beta", - "@nocobase/plugin-data-visualization": "1.3.3-beta", - "@nocobase/plugin-error-handler": "1.3.3-beta", - "@nocobase/plugin-field-china-region": "1.3.3-beta", - "@nocobase/plugin-field-formula": "1.3.3-beta", - "@nocobase/plugin-field-m2m-array": "1.3.3-beta", - "@nocobase/plugin-field-markdown-vditor": "1.3.3-beta", - "@nocobase/plugin-field-sequence": "1.3.3-beta", - "@nocobase/plugin-file-manager": "1.3.3-beta", - "@nocobase/plugin-gantt": "1.3.3-beta", - "@nocobase/plugin-graph-collection-manager": "1.3.3-beta", - "@nocobase/plugin-kanban": "1.3.3-beta", - "@nocobase/plugin-localization": "1.3.3-beta", - "@nocobase/plugin-logger": "1.3.3-beta", - "@nocobase/plugin-map": "1.3.3-beta", - "@nocobase/plugin-mobile": "1.3.3-beta", - "@nocobase/plugin-mobile-client": "1.3.3-beta", - "@nocobase/plugin-mock-collections": "1.3.3-beta", - "@nocobase/plugin-multi-app-manager": "1.3.3-beta", - "@nocobase/plugin-multi-app-share-collection": "1.3.3-beta", - "@nocobase/plugin-snapshot-field": "1.3.3-beta", - "@nocobase/plugin-system-settings": "1.3.3-beta", - "@nocobase/plugin-theme-editor": "1.3.3-beta", - "@nocobase/plugin-ui-schema-storage": "1.3.3-beta", - "@nocobase/plugin-users": "1.3.3-beta", - "@nocobase/plugin-verification": "1.3.3-beta", - "@nocobase/plugin-workflow": "1.3.3-beta", - "@nocobase/plugin-workflow-action-trigger": "1.3.3-beta", - "@nocobase/plugin-workflow-aggregate": "1.3.3-beta", - "@nocobase/plugin-workflow-delay": "1.3.3-beta", - "@nocobase/plugin-workflow-dynamic-calculation": "1.3.3-beta", - "@nocobase/plugin-workflow-loop": "1.3.3-beta", - "@nocobase/plugin-workflow-mailer": "1.3.3-beta", - "@nocobase/plugin-workflow-manual": "1.3.3-beta", - "@nocobase/plugin-workflow-parallel": "1.3.3-beta", - "@nocobase/plugin-workflow-request": "1.3.3-beta", - "@nocobase/plugin-workflow-sql": "1.3.3-beta", - "@nocobase/server": "1.3.3-beta", + "@nocobase/plugin-acl": "1.3.4-beta", + "@nocobase/plugin-action-bulk-edit": "1.3.4-beta", + "@nocobase/plugin-action-bulk-update": "1.3.4-beta", + "@nocobase/plugin-action-custom-request": "1.3.4-beta", + "@nocobase/plugin-action-duplicate": "1.3.4-beta", + "@nocobase/plugin-action-export": "1.3.4-beta", + "@nocobase/plugin-action-import": "1.3.4-beta", + "@nocobase/plugin-action-print": "1.3.4-beta", + "@nocobase/plugin-api-doc": "1.3.4-beta", + "@nocobase/plugin-api-keys": "1.3.4-beta", + "@nocobase/plugin-audit-logs": "1.3.4-beta", + "@nocobase/plugin-auth": "1.3.4-beta", + "@nocobase/plugin-auth-sms": "1.3.4-beta", + "@nocobase/plugin-backup-restore": "1.3.4-beta", + "@nocobase/plugin-block-iframe": "1.3.4-beta", + "@nocobase/plugin-block-workbench": "1.3.4-beta", + "@nocobase/plugin-calendar": "1.3.4-beta", + "@nocobase/plugin-charts": "1.3.4-beta", + "@nocobase/plugin-client": "1.3.4-beta", + "@nocobase/plugin-collection-sql": "1.3.4-beta", + "@nocobase/plugin-collection-tree": "1.3.4-beta", + "@nocobase/plugin-data-source-main": "1.3.4-beta", + "@nocobase/plugin-data-source-manager": "1.3.4-beta", + "@nocobase/plugin-data-visualization": "1.3.4-beta", + "@nocobase/plugin-error-handler": "1.3.4-beta", + "@nocobase/plugin-field-china-region": "1.3.4-beta", + "@nocobase/plugin-field-formula": "1.3.4-beta", + "@nocobase/plugin-field-m2m-array": "1.3.4-beta", + "@nocobase/plugin-field-markdown-vditor": "1.3.4-beta", + "@nocobase/plugin-field-sequence": "1.3.4-beta", + "@nocobase/plugin-file-manager": "1.3.4-beta", + "@nocobase/plugin-gantt": "1.3.4-beta", + "@nocobase/plugin-graph-collection-manager": "1.3.4-beta", + "@nocobase/plugin-kanban": "1.3.4-beta", + "@nocobase/plugin-localization": "1.3.4-beta", + "@nocobase/plugin-logger": "1.3.4-beta", + "@nocobase/plugin-map": "1.3.4-beta", + "@nocobase/plugin-mobile": "1.3.4-beta", + "@nocobase/plugin-mobile-client": "1.3.4-beta", + "@nocobase/plugin-mock-collections": "1.3.4-beta", + "@nocobase/plugin-multi-app-manager": "1.3.4-beta", + "@nocobase/plugin-multi-app-share-collection": "1.3.4-beta", + "@nocobase/plugin-snapshot-field": "1.3.4-beta", + "@nocobase/plugin-system-settings": "1.3.4-beta", + "@nocobase/plugin-theme-editor": "1.3.4-beta", + "@nocobase/plugin-ui-schema-storage": "1.3.4-beta", + "@nocobase/plugin-users": "1.3.4-beta", + "@nocobase/plugin-verification": "1.3.4-beta", + "@nocobase/plugin-workflow": "1.3.4-beta", + "@nocobase/plugin-workflow-action-trigger": "1.3.4-beta", + "@nocobase/plugin-workflow-aggregate": "1.3.4-beta", + "@nocobase/plugin-workflow-delay": "1.3.4-beta", + "@nocobase/plugin-workflow-dynamic-calculation": "1.3.4-beta", + "@nocobase/plugin-workflow-loop": "1.3.4-beta", + "@nocobase/plugin-workflow-mailer": "1.3.4-beta", + "@nocobase/plugin-workflow-manual": "1.3.4-beta", + "@nocobase/plugin-workflow-parallel": "1.3.4-beta", + "@nocobase/plugin-workflow-request": "1.3.4-beta", + "@nocobase/plugin-workflow-sql": "1.3.4-beta", + "@nocobase/server": "1.3.4-beta", "cronstrue": "^2.11.0" }, "repository": { From b315174c2124f6027825c950f6d7967a745a67b2 Mon Sep 17 00:00:00 2001 From: "nocobase[bot]" <179432756+nocobase[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 10:28:00 +0000 Subject: [PATCH 022/133] chore: update changelog --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index daaabad26..a6852cb0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,17 @@ 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.4-beta](https://github.com/nocobase/nocobase/compare/v1.3.3-beta...v1.3.4-beta) - 2024-08-27 + +### Merged + +- refactor: set remainsTheSame as the default value for field editing in bulk editing action [`#5124`](https://github.com/nocobase/nocobase/pull/5124) + +### Commits + +- chore(versions): 😊 publish v1.3.4-beta [`a011748`](https://github.com/nocobase/nocobase/commit/a0117480e037e48a23f59921110003047a1a174b) +- chore: update changelog [`3403e8d`](https://github.com/nocobase/nocobase/commit/3403e8d76684950d6962a6110a4440eb95856a35) + ## [v1.3.3-beta](https://github.com/nocobase/nocobase/compare/v1.3.2-beta...v1.3.3-beta) - 2024-08-27 ### Merged From ce3d6ac233e8d204b4bcdeaabe59089eeb73af7a Mon Sep 17 00:00:00 2001 From: YANG QIA <2013xile@gmail.com> Date: Tue, 27 Aug 2024 19:50:01 +0800 Subject: [PATCH 023/133] fix(release): decrypt token error occasionally (#5143) * fix(release): decrypt token error occasionally * chore: update --- .github/workflows/build-pro-image.yml | 3 +-- .github/workflows/get-nocobase-app-token.yml | 3 +-- .github/workflows/manual-build-pro-image.yml | 3 +-- .github/workflows/manual-release.yml | 6 ++---- .github/workflows/release-next.yml | 3 +-- .github/workflows/release.yml | 3 +-- 6 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-pro-image.yml b/.github/workflows/build-pro-image.yml index a1deadc82..72edb5ea6 100644 --- a/.github/workflows/build-pro-image.yml +++ b/.github/workflows/build-pro-image.yml @@ -33,8 +33,7 @@ jobs: shell: bash run: | ENCRYPTED_SECRET=${{ needs.app-token.outputs.token }}; - BINARY_ENCRYPTED_SECRET=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode); - APP_TOKEN=$(echo -n "$BINARY_ENCRYPTED_SECRET" | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); + APP_TOKEN=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); echo "token=$APP_TOKEN" >> $GITHUB_OUTPUT - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/get-nocobase-app-token.yml b/.github/workflows/get-nocobase-app-token.yml index abfc2b1b2..1c3b51dc9 100644 --- a/.github/workflows/get-nocobase-app-token.yml +++ b/.github/workflows/get-nocobase-app-token.yml @@ -30,8 +30,7 @@ jobs: shell: bash run: | APP_TOKEN=${{ steps.app-token.outputs.token }}; - BINARY_ENCRYPTED_SECRET=$(echo -n "$APP_TOKEN" | openssl enc -aes-256-cbc -pbkdf2 -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); - ENCRYPTED_SECRET=$(echo -n "$BINARY_ENCRYPTED_SECRET" | base64 -w 0); + ENCRYPTED_SECRET=$(echo -n "$APP_TOKEN" | openssl enc -aes-256-cbc -pbkdf2 -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}" | base64 -w 0); echo "token=$ENCRYPTED_SECRET" >> $GITHUB_OUTPUT - name: Get GitHub App User ID id: get-user-id diff --git a/.github/workflows/manual-build-pro-image.yml b/.github/workflows/manual-build-pro-image.yml index b23c8be2f..78c7fb98d 100644 --- a/.github/workflows/manual-build-pro-image.yml +++ b/.github/workflows/manual-build-pro-image.yml @@ -34,8 +34,7 @@ jobs: shell: bash run: | ENCRYPTED_SECRET=${{ needs.app-token.outputs.token }}; - BINARY_ENCRYPTED_SECRET=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode); - APP_TOKEN=$(echo -n "$BINARY_ENCRYPTED_SECRET" | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); + APP_TOKEN=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); echo "token=$APP_TOKEN" >> $GITHUB_OUTPUT - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml index f0ed8a67c..2dee6668b 100644 --- a/.github/workflows/manual-release.yml +++ b/.github/workflows/manual-release.yml @@ -30,8 +30,7 @@ jobs: shell: bash run: | ENCRYPTED_SECRET=${{ needs.app-token.outputs.token }}; - BINARY_ENCRYPTED_SECRET=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode); - APP_TOKEN=$(echo -n "$BINARY_ENCRYPTED_SECRET" | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); + APP_TOKEN=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); echo "token=$APP_TOKEN" >> $GITHUB_OUTPUT - name: Checkout uses: actions/checkout@v4 @@ -60,8 +59,7 @@ jobs: shell: bash run: | ENCRYPTED_SECRET=${{ needs.app-token.outputs.token }}; - BINARY_ENCRYPTED_SECRET=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode); - APP_TOKEN=$(echo -n "$BINARY_ENCRYPTED_SECRET" | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); + APP_TOKEN=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); echo "token=$APP_TOKEN" >> $GITHUB_OUTPUT - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/release-next.yml b/.github/workflows/release-next.yml index 004f01065..5ba6d7b8a 100644 --- a/.github/workflows/release-next.yml +++ b/.github/workflows/release-next.yml @@ -21,8 +21,7 @@ jobs: shell: bash run: | ENCRYPTED_SECRET=${{ needs.app-token.outputs.token }}; - BINARY_ENCRYPTED_SECRET=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode); - APP_TOKEN=$(echo -n "$BINARY_ENCRYPTED_SECRET" | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); + APP_TOKEN=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); echo "token=$APP_TOKEN" >> $GITHUB_OUTPUT - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9eba8a0b2..75d6b0b74 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,8 +23,7 @@ jobs: shell: bash run: | ENCRYPTED_SECRET=${{ needs.app-token.outputs.token }}; - BINARY_ENCRYPTED_SECRET=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode); - APP_TOKEN=$(echo -n "$BINARY_ENCRYPTED_SECRET" | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); + APP_TOKEN=$(echo -n "$ENCRYPTED_SECRET" | base64 --decode | openssl enc -aes-256-cbc -pbkdf2 -d -salt -k "${{ secrets.APP_TOKEN_ENCRYPTION_PASSWORD }}"); echo "token=$APP_TOKEN" >> $GITHUB_OUTPUT - name: Checkout uses: actions/checkout@v3 From dec3c838a375b778c44bb41c76af21a44b2e0366 Mon Sep 17 00:00:00 2001 From: Zeke Zhang <958414905@qq.com> Date: Tue, 27 Aug 2024 21:58:55 +0800 Subject: [PATCH 024/133] feat: add support for opening via URL (#5098) * feat(map): add support for opening via URL * feat(calendar): add support for opening via URL * feat(gantt): add support for opening via URL * fix(duplicate,bulk-edit): resolve issues with popups * fix: useDetailsBlockProps --------- Co-authored-by: katherinehhh --- .../block-provider/DetailsBlockProvider.tsx | 1 + .../modules/popup/PopupContextProvider.tsx | 10 +- .../schema-component/antd/page/PagePopups.tsx | 2 +- .../antd/page/PopupSettingsProvider.tsx | 24 ++- .../src/schema-component/antd/page/index.ts | 1 + .../antd/page/pagePopupUtils.tsx | 26 +++- ...ePopupContextInActionOrAssociationField.ts | 9 +- .../src/client/BulkEditActionDecorator.tsx | 19 +++ .../src/client/index.tsx | 5 +- .../src/client/DuplicateAction.tsx | 5 +- .../src/client/DuplicateActionDecorator.tsx | 15 ++ .../src/client/DuplicateActionInitializer.tsx | 2 +- .../src/client/index.ts | 4 +- .../src/client/calendar/Calendar.tsx | 144 ++++++++---------- .../client/calendar/CalendarRecordViewer.tsx | 35 +++++ .../src/client/calendar/Event.tsx | 28 +++- .../src/client/components/gantt/Event.tsx | 19 ++- .../components/gantt/GanttRecordViewer.tsx | 23 +++ .../src/client/components/gantt/gantt.tsx | 140 ++++++++--------- .../plugin-map/src/client/block/MapBlock.tsx | 14 ++ .../src/client/components/AMap/Block.tsx | 58 +++---- .../client/components/GoogleMaps/Block.tsx | 47 ++---- .../src/client/components/MapBlock.tsx | 7 +- .../src/client/components/MapBlockDrawer.tsx | 38 +++++ 24 files changed, 419 insertions(+), 257 deletions(-) create mode 100644 packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditActionDecorator.tsx create mode 100644 packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateActionDecorator.tsx create mode 100644 packages/plugins/@nocobase/plugin-calendar/src/client/calendar/CalendarRecordViewer.tsx create mode 100644 packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/GanttRecordViewer.tsx create mode 100644 packages/plugins/@nocobase/plugin-map/src/client/components/MapBlockDrawer.tsx diff --git a/packages/core/client/src/block-provider/DetailsBlockProvider.tsx b/packages/core/client/src/block-provider/DetailsBlockProvider.tsx index 42450701b..908bcd9e6 100644 --- a/packages/core/client/src/block-provider/DetailsBlockProvider.tsx +++ b/packages/core/client/src/block-provider/DetailsBlockProvider.tsx @@ -141,6 +141,7 @@ export const useDetailsBlockProps = () => { ctx.form .reset() .then(() => { + ctx.form.setInitialValues(data || {}); ctx.form.setValues(data || {}); }) .catch(console.error); diff --git a/packages/core/client/src/modules/popup/PopupContextProvider.tsx b/packages/core/client/src/modules/popup/PopupContextProvider.tsx index 4aead6956..488aa5abd 100644 --- a/packages/core/client/src/modules/popup/PopupContextProvider.tsx +++ b/packages/core/client/src/modules/popup/PopupContextProvider.tsx @@ -17,7 +17,10 @@ import { PopupVisibleProvider, PopupVisibleProviderContext } from '../../schema- * @param props * @returns */ -export const PopupContextProvider: React.FC = (props) => { +export const PopupContextProvider: React.FC<{ + visible?: boolean; + setVisible?: (visible: boolean) => void; +}> = (props) => { const [visible, setVisible] = useState(false); const { visible: visibleWithURL, setVisible: setVisibleWithURL } = useContext(PopupVisibleProviderContext) || { visible: false, @@ -26,10 +29,11 @@ export const PopupContextProvider: React.FC = (props) => { const fieldSchema = useFieldSchema(); const _setVisible = useCallback( (value: boolean): void => { + props.setVisible?.(value); setVisible?.(value); setVisibleWithURL?.(value); }, - [setVisibleWithURL], + [props, setVisibleWithURL], ); const openMode = fieldSchema['x-component-props']?.['openMode'] || 'drawer'; const openSize = fieldSchema['x-component-props']?.['openSize']; @@ -37,7 +41,7 @@ export const PopupContextProvider: React.FC = (props) => { return ( void; } -interface PopupProps { +export interface PopupProps { params: PopupParams; context: PopupContext; /** diff --git a/packages/core/client/src/schema-component/antd/page/PopupSettingsProvider.tsx b/packages/core/client/src/schema-component/antd/page/PopupSettingsProvider.tsx index 36b8502f3..ea021fc25 100644 --- a/packages/core/client/src/schema-component/antd/page/PopupSettingsProvider.tsx +++ b/packages/core/client/src/schema-component/antd/page/PopupSettingsProvider.tsx @@ -7,13 +7,31 @@ * For more information, please refer to: https://www.nocobase.com/agreement. */ -import { useCallback } from 'react'; +import React, { FC, useCallback, useMemo } from 'react'; + +const PopupSettingsContext = React.createContext({ + enableURL: true, +}); + +export const PopupSettingsProvider: FC<{ + /** + * @default true + */ + enableURL?: boolean; +}> = (props) => { + const { enableURL = true } = props; + const value = useMemo(() => ({ enableURL }), [enableURL]); + + return {props.children}; +}; /** * Hook for accessing the popup settings. * @returns The popup settings. */ export const usePopupSettings = () => { + const { enableURL } = React.useContext(PopupSettingsContext); + const isPopupVisibleControlledByURL = useCallback(() => { const pathname = window.location.pathname; const hash = window.location.hash; @@ -21,8 +39,8 @@ export const usePopupSettings = () => { const isNewMobileMode = pathname?.includes('/m/'); const isPCMode = pathname?.includes('/admin/'); - return (isPCMode || isNewMobileMode) && !isOldMobileMode; - }, []); + return (isPCMode || isNewMobileMode) && !isOldMobileMode && enableURL; + }, [enableURL]); return { /** 弹窗窗口的显隐是否由 URL 控制 */ diff --git a/packages/core/client/src/schema-component/antd/page/index.ts b/packages/core/client/src/schema-component/antd/page/index.ts index db761fc2f..477ed6ef0 100644 --- a/packages/core/client/src/schema-component/antd/page/index.ts +++ b/packages/core/client/src/schema-component/antd/page/index.ts @@ -15,3 +15,4 @@ export * from './Page.Settings'; export { PagePopups } from './PagePopups'; export { storePopupContext } from './pagePopupUtils'; export * from './PageTab.Settings'; +export { PopupSettingsProvider } from './PopupSettingsProvider'; diff --git a/packages/core/client/src/schema-component/antd/page/pagePopupUtils.tsx b/packages/core/client/src/schema-component/antd/page/pagePopupUtils.tsx index 6e73c22aa..3a7242de7 100644 --- a/packages/core/client/src/schema-component/antd/page/pagePopupUtils.tsx +++ b/packages/core/client/src/schema-component/antd/page/pagePopupUtils.tsx @@ -127,7 +127,16 @@ export const getPopupPathFromParams = (params: PopupParams) => { * Note: use this hook in a plugin is not recommended * @returns */ -export const usePopupUtils = () => { +export const usePopupUtils = ( + options: { + /** + * when the popup does not support opening via URL, you can control the display status of the popup through this method + * @param visible + * @returns + */ + setVisible?: (visible: boolean) => void; + } = {}, +) => { const navigate = useNavigateNoUpdate(); const location = useLocationNoUpdate(); const fieldSchema = useFieldSchema(); @@ -141,14 +150,16 @@ export const usePopupUtils = () => { const { params: popupParams } = useCurrentPopupContext(); const service = useDataBlockRequest(); const { isPopupVisibleControlledByURL } = usePopupSettings(); - const { setVisible: setVisibleFromAction } = useContext(ActionContext); + const { setVisible: _setVisibleFromAction } = useContext(ActionContext); const { updatePopupContext } = usePopupContextInActionOrAssociationField(); + const currentPopupContext = useCurrentPopupContext(); const getSourceId = useCallback( (_parentRecordData?: Record) => (_parentRecordData || parentRecord?.data)?.[cm.getSourceKeyByAssociation(association)], [parentRecord, association], ); - const currentPopupUidWithoutOpened = fieldSchema?.['x-uid']; + + const setVisibleFromAction = options.setVisible || _setVisibleFromAction; const getNewPathname = useCallback( ({ @@ -199,6 +210,7 @@ export const usePopupUtils = () => { parentRecordData, collectionNameUsedInURL, popupUidUsedInURL, + customActionSchema, }: { recordData?: Record; parentRecordData?: Record; @@ -206,11 +218,13 @@ export const usePopupUtils = () => { collectionNameUsedInURL?: string; /** if this value exists, it will be saved in the URL */ popupUidUsedInURL?: string; + customActionSchema?: ISchema; } = {}) => { if (!isPopupVisibleControlledByURL()) { return setVisibleFromAction?.(true); } + const currentPopupUidWithoutOpened = customActionSchema?.['x-uid'] || fieldSchema?.['x-uid']; const sourceId = getSourceId(parentRecordData); recordData = recordData || record?.data; @@ -227,7 +241,7 @@ export const usePopupUtils = () => { } storePopupContext(currentPopupUidWithoutOpened, { - schema: fieldSchema, + schema: customActionSchema || fieldSchema, record: new CollectionRecord({ isNew: false, data: recordData }), parentRecord: parentRecordData ? new CollectionRecord({ isNew: false, data: parentRecordData }) : parentRecord, service, @@ -237,7 +251,7 @@ export const usePopupUtils = () => { sourceId, }); - updatePopupContext(getPopupContext()); + updatePopupContext(getPopupContext(), customActionSchema); navigate(withSearchParams(`${url}${pathname}`)); }, @@ -256,7 +270,6 @@ export const usePopupUtils = () => { isPopupVisibleControlledByURL, getSourceId, getPopupContext, - currentPopupUidWithoutOpened, ], ); @@ -317,6 +330,7 @@ export const usePopupUtils = () => { closePopup, savePopupSchemaToSchema, getPopupSchemaFromSchema, + context: currentPopupContext, /** * @deprecated * TODO: remove this diff --git a/packages/core/client/src/schema-component/antd/page/usePopupContextInActionOrAssociationField.ts b/packages/core/client/src/schema-component/antd/page/usePopupContextInActionOrAssociationField.ts index 200e6acdf..a854eab15 100644 --- a/packages/core/client/src/schema-component/antd/page/usePopupContextInActionOrAssociationField.ts +++ b/packages/core/client/src/schema-component/antd/page/usePopupContextInActionOrAssociationField.ts @@ -29,18 +29,19 @@ export const usePopupContextInActionOrAssociationField = () => { const { dn } = useDesignable(); const updatePopupContext = useCallback( - (context: PopupContext) => { + (context: PopupContext, customSchema?: ISchema) => { + customSchema = customSchema || fieldSchema; context = _.omitBy(context, _.isNil) as PopupContext; - if (_.isEqual(context, getPopupContextFromActionOrAssociationFieldSchema(fieldSchema))) { + if (_.isEqual(context, getPopupContextFromActionOrAssociationFieldSchema(customSchema))) { return; } - fieldSchema[CONTEXT_SCHEMA_KEY] = context; + customSchema[CONTEXT_SCHEMA_KEY] = context; return dn.emit('patch', { schema: { - 'x-uid': fieldSchema['x-uid'], + 'x-uid': customSchema['x-uid'], [CONTEXT_SCHEMA_KEY]: context, }, }); diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditActionDecorator.tsx b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditActionDecorator.tsx new file mode 100644 index 000000000..354fa1cfb --- /dev/null +++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditActionDecorator.tsx @@ -0,0 +1,19 @@ +/** + * 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 { ACLActionProvider, PopupSettingsProvider } from '@nocobase/client'; +import React, { FC } from 'react'; + +export const BulkEditActionDecorator: FC = (props) => { + return ( + + {props.children} + + ); +}; diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/index.tsx b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/index.tsx index c1f52a22b..83d214902 100644 --- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/index.tsx +++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/index.tsx @@ -9,6 +9,7 @@ import { Plugin, useActionAvailable } from '@nocobase/client'; import { bulkEditActionSettings, deprecatedBulkEditActionSettings } from './BulkEditAction.Settings'; +import { BulkEditActionDecorator } from './BulkEditActionDecorator'; import { BulkEditActionInitializer } from './BulkEditActionInitializer'; import { BulkEditBlockInitializers_deprecated, @@ -25,7 +26,7 @@ import { BulkEditField } from './component/BulkEditField'; import { useCustomizeBulkEditActionProps } from './utils'; export class PluginActionBulkEditClient extends Plugin { async load() { - this.app.addComponents({ BulkEditField }); + this.app.addComponents({ BulkEditField, BulkEditActionDecorator }); this.app.addScopes({ useCustomizeBulkEditActionProps }); this.app.schemaSettingsManager.add(deprecatedBulkEditActionSettings); this.app.schemaSettingsManager.add(bulkEditActionSettings); @@ -45,7 +46,7 @@ export class PluginActionBulkEditClient extends Plugin { Component: BulkEditActionInitializer, schema: { 'x-align': 'right', - 'x-decorator': 'ACLActionProvider', + 'x-decorator': 'BulkEditActionDecorator', 'x-action': 'customize:bulkEdit', 'x-toolbar': 'ActionSchemaToolbar', 'x-settings': 'actionSettings:bulkEdit', diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.tsx b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.tsx index 361ac3f4e..95907e04f 100644 --- a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.tsx +++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.tsx @@ -13,6 +13,7 @@ import { ActionContextProvider, CollectionProvider_deprecated, FormBlockContext, + PopupSettingsProvider, RecordProvider, fetchTemplateData, useACLActionParamsContext, @@ -203,7 +204,9 @@ export const DuplicateAction = observer( {/* 这里的 record 就是弹窗中创建表单的 sourceRecord */} - + + + diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateActionDecorator.tsx b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateActionDecorator.tsx new file mode 100644 index 000000000..dfe9a8539 --- /dev/null +++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateActionDecorator.tsx @@ -0,0 +1,15 @@ +/** + * 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 { ACLActionProvider } from '@nocobase/client'; +import React, { FC } from 'react'; + +export const DuplicateActionDecorator: FC = (props) => { + return {props.children}; +}; diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateActionInitializer.tsx b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateActionInitializer.tsx index fd18e8a8a..a145dc72d 100644 --- a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateActionInitializer.tsx +++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateActionInitializer.tsx @@ -19,7 +19,7 @@ export const DuplicateActionInitializer = (props) => { 'x-acl-action': 'create', title: '{{ t("Duplicate") }}', 'x-component': 'Action.Link', - 'x-decorator': 'ACLActionProvider', + 'x-decorator': 'DuplicateActionDecorator', 'x-component-props': { openMode: defaultOpenMode, component: 'DuplicateAction', diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/index.ts b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/index.ts index 882b100e6..af78cfde3 100644 --- a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/index.ts +++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/index.ts @@ -10,6 +10,7 @@ import { Plugin, useActionAvailable } from '@nocobase/client'; import { DuplicateAction } from './DuplicateAction'; import { deprecatedDuplicateActionSettings, duplicateActionSettings } from './DuplicateAction.Settings'; +import { DuplicateActionDecorator } from './DuplicateActionDecorator'; import { DuplicateActionInitializer } from './DuplicateActionInitializer'; import { DuplicatePluginProvider } from './DuplicatePluginProvider'; @@ -19,6 +20,7 @@ export class PluginActionDuplicateClient extends Plugin { this.app.addComponents({ DuplicateActionInitializer, DuplicateAction, + DuplicateActionDecorator, }); this.app.schemaSettingsManager.add(deprecatedDuplicateActionSettings); this.app.schemaSettingsManager.add(duplicateActionSettings); @@ -31,7 +33,7 @@ export class PluginActionDuplicateClient extends Plugin { 'x-action': 'duplicate', 'x-toolbar': 'ActionSchemaToolbar', 'x-settings': 'actionSettings:duplicate', - 'x-decorator': 'ACLActionProvider', + 'x-decorator': 'DuplicateActionDecorator', 'x-component-props': { type: 'primary', }, diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx index 7f8a13407..1e485890c 100644 --- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx @@ -10,12 +10,12 @@ import { LeftOutlined, RightOutlined } from '@ant-design/icons'; import { RecursionField, Schema, observer, useFieldSchema } from '@formily/react'; import { - ActionContextProvider, + PopupContextProvider, RecordProvider, - VariablePopupRecordProvider, getLabelFormatValue, useCollection, useCollectionParentRecordData, + usePopupUtils, useProps, withDynamicSchemaProps, } from '@nocobase/client'; @@ -23,10 +23,11 @@ import { parseExpression } from 'cron-parser'; import type { Dayjs } from 'dayjs'; import dayjs from 'dayjs'; import get from 'lodash/get'; -import React, { useCallback, useMemo, useState } from 'react'; +import React, { useMemo, useState } from 'react'; import { Calendar as BigCalendar, View, dayjsLocalizer } from 'react-big-calendar'; import * as dates from 'react-big-calendar/lib/utils/dates'; import { i18nt, useTranslation } from '../../locale'; +import { CalendarRecordViewer, findEventSchema } from './CalendarRecordViewer'; import Header from './components/Header'; import { CalendarToolbarContext } from './context'; import GlobalStyle from './global.style'; @@ -160,54 +161,24 @@ const useEvents = (dataSource: any, fieldNames: any, date: Date, view: (typeof W }, [dataSource, fieldNames.start, fieldNames.end, fieldNames.id, fieldNames.title, date, view, t]); }; -const CalendarRecordViewer = (props) => { - const { visible, setVisible, record } = props; - const { t } = useTranslation(); - const collection = useCollection(); - const parentRecordData = useCollectionParentRecordData(); - const fieldSchema = useFieldSchema(); - const eventSchema: Schema = useMemo( - () => - fieldSchema.reduceProperties((buf, current) => { - if (current['x-component'].endsWith('.Event')) { - return current; - } - return buf; - }, null), - [], - ); - - const close = useCallback(() => { - setVisible(false); - }, []); - - return ( - eventSchema && ( - - - - - - - - - - ) - ); -}; - export const Calendar: any = withDynamicSchemaProps( observer( (props: any) => { + const [visible, setVisible] = useState(false); + const { openPopup } = usePopupUtils({ + setVisible, + }); + // 新版 UISchema（1.0 之后）中已经废弃了 useProps，这里之所以继续保留是为了兼容旧版的 UISchema const { dataSource, fieldNames, showLunar } = useProps(props); const height = useCalenderHeight(); const [date, setDate] = useState(new Date()); const [view, setView] = useState('month'); const events = useEvents(dataSource, fieldNames, date, view); - const [visible, setVisible] = useState(false); const [record, setRecord] = useState({}); const { wrapSSR, hashId, componentCls: containerClassName } = useStyle(); + const parentRecordData = useCollectionParentRecordData(); + const fieldSchema = useFieldSchema(); const components = useMemo(() => { return { @@ -247,50 +218,57 @@ export const Calendar: any = withDynamicSchemaProps( }; return wrapSSR(
- - - { - console.log('onSelectSlot', slotInfo); - }} - onDoubleClickEvent={() => { - console.log('onDoubleClickEvent'); - }} - onSelectEvent={(event) => { - const record = dataSource?.find((item) => item[fieldNames.id] === event.id); - if (!record) { - return; - } - record.__event = { ...event, start: formatDate(dayjs(event.start)), end: formatDate(dayjs(event.end)) }; - - setRecord(record); - setVisible(true); - }} - formats={{ - monthHeaderFormat: 'YYYY-M', - agendaDateFormat: 'M-DD', - dayHeaderFormat: 'YYYY-M-DD', - dayRangeHeaderFormat: ({ start, end }, culture, local) => { - if (dates.eq(start, end, 'month')) { - return local.format(start, 'YYYY-M', culture); + + + + + + { + console.log('onSelectSlot', slotInfo); + }} + onDoubleClickEvent={() => { + console.log('onDoubleClickEvent'); + }} + onSelectEvent={(event) => { + const record = dataSource?.find((item) => item[fieldNames.id] === event.id); + if (!record) { + return; } - return `${local.format(start, 'YYYY-M', culture)} - ${local.format(end, 'YYYY-M', culture)}`; - }, - }} - components={components} - localizer={localizer} - /> + record.__event = { ...event, start: formatDate(dayjs(event.start)), end: formatDate(dayjs(event.end)) }; + + setRecord(record); + openPopup({ + recordData: record, + customActionSchema: findEventSchema(fieldSchema), + }); + }} + formats={{ + monthHeaderFormat: 'YYYY-M', + agendaDateFormat: 'M-DD', + dayHeaderFormat: 'YYYY-M-DD', + dayRangeHeaderFormat: ({ start, end }, culture, local) => { + if (dates.eq(start, end, 'month')) { + return local.format(start, 'YYYY-M', culture); + } + return `${local.format(start, 'YYYY-M', culture)} - ${local.format(end, 'YYYY-M', culture)}`; + }, + }} + components={components} + localizer={localizer} + /> +
, ); }, diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/CalendarRecordViewer.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/CalendarRecordViewer.tsx new file mode 100644 index 000000000..ebace0bdb --- /dev/null +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/CalendarRecordViewer.tsx @@ -0,0 +1,35 @@ +/** + * 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 { RecursionField, Schema, useFieldSchema } from '@formily/react'; +import React, { FC, useMemo } from 'react'; + +export const CalendarRecordViewer: FC = (props) => { + const fieldSchema = useFieldSchema(); + const eventSchema: Schema = useMemo(() => findEventSchema(fieldSchema), [fieldSchema]); + + if (!eventSchema) { + return null; + } + + return ; +}; + +export function findEventSchema(schema: Schema) { + if (schema['x-component'].endsWith('.Event')) { + return schema; + } + + return schema.reduceProperties((buf, current) => { + if (current['x-component'].endsWith('.Event')) { + return current; + } + return buf; + }, null); +} diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Event.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Event.tsx index 5e08c41e8..e9fbc4495 100644 --- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Event.tsx +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Event.tsx @@ -8,11 +8,35 @@ */ import { observer } from '@formily/react'; -import React from 'react'; +import { + PopupContextProvider, + useActionContext, + useCollection, + useCollectionRecordData, + VariablePopupRecordProvider, +} from '@nocobase/client'; +import React, { useCallback } from 'react'; +import { DeleteEventContext } from './Calendar'; export const Event = observer( (props) => { - return <>{props.children}; + const { visible, setVisible } = useActionContext(); + const recordData = useCollectionRecordData(); + const collection = useCollection(); + + const close = useCallback(() => { + setVisible(false); + }, [setVisible]); + + return ( + + + + {props.children} + + + + ); }, { displayName: 'Event' }, ); diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/Event.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/Event.tsx index 5e08c41e8..c41d86b4c 100644 --- a/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/Event.tsx +++ b/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/Event.tsx @@ -8,11 +8,28 @@ */ import { observer } from '@formily/react'; +import { + PopupContextProvider, + useActionContext, + useCollection, + useCollectionRecordData, + VariablePopupRecordProvider, +} from '@nocobase/client'; import React from 'react'; export const Event = observer( (props) => { - return <>{props.children}; + const { visible, setVisible } = useActionContext(); + const recordData = useCollectionRecordData(); + const collection = useCollection(); + + return ( + + + {props.children} + + + ); }, { displayName: 'Event' }, ); diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/GanttRecordViewer.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/GanttRecordViewer.tsx new file mode 100644 index 000000000..65b33a519 --- /dev/null +++ b/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/GanttRecordViewer.tsx @@ -0,0 +1,23 @@ +/** + * 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 { RecursionField, useFieldSchema } from '@formily/react'; +import { Schema } from '@nocobase/utils'; +import React, { FC } from 'react'; + +export const GanttRecordViewer: FC = (props) => { + const fieldSchema = useFieldSchema(); + const eventSchema: Schema = fieldSchema.properties.detail; + + if (!eventSchema) { + return null; + } + + return ; +}; diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/gantt.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/gantt.tsx index a656a6d08..3e495a47e 100644 --- a/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/gantt.tsx +++ b/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/gantt.tsx @@ -8,17 +8,16 @@ */ import { css, cx } from '@emotion/css'; -import { RecursionField, Schema, useFieldSchema } from '@formily/react'; +import { RecursionField, useFieldSchema } from '@formily/react'; import { - ActionContextProvider, + PopupContextProvider, RecordProvider, - VariablePopupRecordProvider, useAPIClient, useBlockRequestContext, - useCollection, useCollectionParentRecordData, useCurrentAppInfo, useDesignable, + usePopupUtils, useProps, useTableBlockContext, useToken, @@ -26,7 +25,7 @@ import { } from '@nocobase/client'; import { Spin, message } from 'antd'; import { debounce } from 'lodash'; -import React, { SyntheticEvent, useCallback, useEffect, useMemo, useRef, useState } from 'react'; +import React, { SyntheticEvent, useEffect, useMemo, useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useGanttBlockContext } from '../../GanttBlockProvider'; import { convertToBarTasks } from '../../helpers/bar-helper'; @@ -41,6 +40,7 @@ import { GridProps } from '../grid/grid'; import { HorizontalScroll } from '../other/horizontal-scroll'; import { StandardTooltipContent, Tooltip } from '../other/tooltip'; import { VerticalScroll } from '../other/vertical-scroll'; +import { GanttRecordViewer } from './GanttRecordViewer'; import useStyles from './style'; import { TaskGantt } from './task-gantt'; import { TaskGanttContentProps } from './task-gantt-content'; @@ -49,34 +49,7 @@ const getColumnWidth = (dataSetLength: any, clientWidth: any) => { const columnWidth = clientWidth / dataSetLength > 50 ? Math.floor(clientWidth / dataSetLength) + 20 : 50; return columnWidth; }; -export const DeleteEventContext = React.createContext({ - close: () => {}, -}); -const GanttRecordViewer = (props) => { - const { visible, setVisible, record } = props; - const { t } = useTranslation(); - const collection = useCollection(); - const parentRecordData = useCollectionParentRecordData(); - const fieldSchema = useFieldSchema(); - const eventSchema: Schema = fieldSchema.properties.detail; - const close = useCallback(() => { - setVisible(false); - }, []); - return ( - eventSchema && ( - - - - - - - - - - ) - ); -}; const debounceHandleTaskChange = debounce(async (task: Task, resource, fieldNames, service, t) => { await resource.update({ filterByTk: task.id, @@ -160,7 +133,11 @@ export const Gantt: any = withDynamicSchemaProps((props: any) => { return { viewMode, dates: seedDates(startDate, endDate, viewMode) }; }); const [visible, setVisible] = useState(false); + const { openPopup } = usePopupUtils({ + setVisible, + }); const [record, setRecord] = useState({}); + const parentRecordData = useCollectionParentRecordData(); const [currentViewDate, setCurrentViewDate] = useState(undefined); const [taskListWidth, setTaskListWidth] = useState(0); const [svgContainerWidth, setSvgContainerWidth] = useState(0); @@ -473,7 +450,10 @@ export const Gantt: any = withDynamicSchemaProps((props: any) => { return; } setRecord(recordData); - setVisible(true); + openPopup({ + recordData, + customActionSchema: fieldSchema.properties.detail, + }); }; const gridProps: GridProps = { columnWidth, @@ -536,55 +516,59 @@ export const Gantt: any = withDynamicSchemaProps((props: any) => { `)} ref={ganttRef} > - - - -
- - {ganttEvent.changedTask && ( - + + + + + +
+ - )} - - - + )} + - -
+ + + +
+ ); }); diff --git a/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlock.tsx b/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlock.tsx index 1915fa44a..52157ee42 100644 --- a/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlock.tsx +++ b/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlock.tsx @@ -8,15 +8,29 @@ */ import { + PopupContextProvider, useCollection_deprecated, useCollectionManager_deprecated, + usePopupUtils, useProps, withDynamicSchemaProps, } from '@nocobase/client'; import React, { useMemo } from 'react'; import { MapBlockComponent } from '../components'; +import { MapBlockDrawer } from '../components/MapBlockDrawer'; export const MapBlock = withDynamicSchemaProps((props) => { + const { context } = usePopupUtils(); + + // only render the popup + if (context.currentLevel) { + return ( + + + + ); + } + // 新版 UISchema（1.0 之后）中已经废弃了 useProps，这里之所以继续保留是为了兼容旧版的 UISchema const { fieldNames } = useProps(props); diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Block.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Block.tsx index 50e5d8ed7..7238c7e88 100644 --- a/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Block.tsx +++ b/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Block.tsx @@ -8,11 +8,8 @@ */ import { CheckOutlined, EnvironmentOutlined, ExpandOutlined } from '@ant-design/icons'; -import { RecursionField, useFieldSchema } from '@formily/react'; import { - ActionContextProvider, RecordProvider, - VariablePopupRecordProvider, css, getLabelFormatValue, useCollection, @@ -21,14 +18,16 @@ import { useCollection_deprecated, useCompile, useFilterAPI, + usePopupUtils, useProps, } from '@nocobase/client'; import { useMemoizedFn } from 'ahooks'; import { Button, Space } from 'antd'; -import React, { useEffect, useMemo, useRef, useState } from 'react'; +import React, { useEffect, useRef, useState } from 'react'; import { defaultImage, selectedImage } from '../../constants'; import { useMapTranslation } from '../../locale'; import { getSource } from '../../utils'; +import { MapBlockDrawer } from '../MapBlockDrawer'; import { AMapComponent, AMapForwardedRefProps } from './Map'; export const AMapBlock = (props) => { @@ -50,6 +49,9 @@ export const AMapBlock = (props) => { const selectingModeRef = useRef(selectingMode); selectingModeRef.current = selectingMode; const { fields } = useCollection(); + const parentRecordData = useCollectionParentRecordData(); + const { openPopup } = usePopupUtils(); + const labelUiSchema = fields.find((v) => v.name === fieldNames?.marker)?.uiSchema; const setOverlayOptions = (overlay: AMap.Polygon | AMap.Marker, state?: boolean) => { const extData = overlay.getExtData(); @@ -199,6 +201,9 @@ export const AMapBlock = (props) => { if (data) { setRecord(data); + openPopup({ + recordData: data, + }); } }; o.on('click', onClick); @@ -244,7 +249,17 @@ export const AMapBlock = (props) => { }); events.forEach((e) => e()); }; - }, [dataSource, isMapInitialization, fieldNames, name, primaryKey, collectionField.type, isConnected, lineSort]); + }, [ + dataSource, + isMapInitialization, + fieldNames, + name, + primaryKey, + collectionField.type, + isConnected, + lineSort, + openPopup, + ]); useEffect(() => { setTimeout(() => { @@ -307,7 +322,9 @@ export const AMapBlock = (props) => { ) : null} - + + + { ); }; -const MapBlockDrawer = (props) => { - const { setVisible, record } = props; - const collection = useCollection(); - const parentRecordData = useCollectionParentRecordData(); - const fieldSchema = useFieldSchema(); - const schema = useMemo( - () => - fieldSchema.reduceProperties((buf, current) => { - if (current.name === 'drawer') { - return current; - } - return buf; - }, null), - [fieldSchema], - ); - - return ( - schema && ( - - - - - - - - ) - ); -}; - function clearSelected(marker: AMap.Marker | AMap.Polygon | AMap.Polyline | AMap.Circle) { if ((marker as AMap.Marker).dom) { (marker as AMap.Marker).dom.style.filter = 'none'; diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Block.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Block.tsx index 716768183..41d6e6697 100644 --- a/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Block.tsx +++ b/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Block.tsx @@ -8,11 +8,8 @@ */ import { CheckOutlined, EnvironmentOutlined, ExpandOutlined } from '@ant-design/icons'; -import { RecursionField, Schema, useFieldSchema } from '@formily/react'; import { - ActionContextProvider, RecordProvider, - VariablePopupRecordProvider, css, getLabelFormatValue, useCollection, @@ -21,14 +18,16 @@ import { useCollection_deprecated, useCompile, useFilterAPI, + usePopupUtils, useProps, } from '@nocobase/client'; import { useMemoizedFn } from 'ahooks'; import { Button, Space } from 'antd'; -import React, { useEffect, useMemo, useRef, useState } from 'react'; +import React, { useEffect, useRef, useState } from 'react'; import { defaultImage, selectedImage } from '../../constants'; import { useMapTranslation } from '../../locale'; import { getSource } from '../../utils'; +import { MapBlockDrawer } from '../MapBlockDrawer'; import { GoogleMapForwardedRefProps, GoogleMapsComponent, OverlayOptions } from './Map'; import { getIcon } from './utils'; @@ -69,8 +68,10 @@ export const GoogleMapsBlock = (props) => { const overlaysRef = useRef([]); selectingModeRef.current = selectingMode; const { fields } = useCollection(); + const parentRecordData = useCollectionParentRecordData(); const labelUiSchema = fields.find((v) => v.name === fieldNames?.marker)?.uiSchema; const { getCollectionJoinField } = useCollectionManager_deprecated(); + const { openPopup } = usePopupUtils(); const setOverlayOptions = (overlay: google.maps.MVCObject, state?: boolean) => { const selected = typeof state !== 'undefined' ? !state : overlay.get(OVERLAY_SELECtED); @@ -234,6 +235,9 @@ export const GoogleMapsBlock = (props) => { if (data) { setRecord(data); + openPopup({ + recordData: data, + }); } }; o.addListener('click', onClick); @@ -291,7 +295,7 @@ export const GoogleMapsBlock = (props) => { }); events.forEach((e) => e()); }; - }, [dataSource, isMapInitialization, markerName, collectionField.type, isConnected]); + }, [dataSource, isMapInitialization, markerName, collectionField.type, isConnected, openPopup]); useEffect(() => { setTimeout(() => { @@ -354,7 +358,9 @@ export const GoogleMapsBlock = (props) => { ) : null} - + + + )} { ); }; -const MapBlockDrawer = (props) => { - const { setVisible, record } = props; - const collection = useCollection(); - const parentRecordData = useCollectionParentRecordData(); - const fieldSchema = useFieldSchema(); - const schema: Schema = useMemo( - () => - fieldSchema.reduceProperties((buf, current) => { - if (current.name === 'drawer') { - return current; - } - return buf; - }, null), - [fieldSchema], - ); - - return ( - schema && ( - - - - - - - - ) - ); -}; - function clearSelected(target: google.maps.Polygon) { if (target instanceof google.maps.Marker) { return target.setIcon(getIcon(defaultImage)); diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/MapBlock.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/MapBlock.tsx index 2fcc0d6fd..2bdbd650a 100644 --- a/packages/plugins/@nocobase/plugin-map/src/client/components/MapBlock.tsx +++ b/packages/plugins/@nocobase/plugin-map/src/client/components/MapBlock.tsx @@ -7,6 +7,7 @@ * For more information, please refer to: https://www.nocobase.com/agreement. */ +import { PopupContextProvider } from '@nocobase/client'; import React, { useMemo } from 'react'; import { useMapTranslation } from '../locale'; import { AMapBlock } from './AMap'; @@ -29,5 +30,9 @@ export const MapBlockComponent: React.FC = (props) => { return
{t(`The ${mapType} cannot found`)}
; } - return ; + return ( + + + + ); }; diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/MapBlockDrawer.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/MapBlockDrawer.tsx new file mode 100644 index 000000000..eae0a4c60 --- /dev/null +++ b/packages/plugins/@nocobase/plugin-map/src/client/components/MapBlockDrawer.tsx @@ -0,0 +1,38 @@ +/** + * 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 { RecursionField, useFieldSchema } from '@formily/react'; +import { useCollection, useCollectionRecordData, VariablePopupRecordProvider } from '@nocobase/client'; +import React, { FC, useMemo } from 'react'; + +export const MapBlockDrawer: FC = (props) => { + const recordData = useCollectionRecordData(); + const collection = useCollection(); + const fieldSchema = useFieldSchema(); + const schema = useMemo( + () => + fieldSchema.reduceProperties((buf, current) => { + if (current.name === 'drawer') { + return current; + } + return buf; + }, null), + [fieldSchema], + ); + + if (!schema) { + return null; + } + + return ( + + + + ); +}; From af77f3c4085855e305fa02b1bc2f2cd60caca54d Mon Sep 17 00:00:00 2001 From: Zeke Zhang <958414905@qq.com> Date: Wed, 28 Aug 2024 10:52:06 +0800 Subject: [PATCH 025/133] fix(template): fix error on form block submission (#5133) * fix(template): fix error on form block submission * fix(template): fix error on form block submission * fix: make unit tests pass * fix: make e2e tests pass --- .../src/block-provider/FormBlockProvider.tsx | 24 ++++++++----------- .../form/hooks/useEditFormBlockProps.ts | 2 +- .../form-item/hooks/useParseDefaultValue.ts | 11 ++++++++- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/packages/core/client/src/block-provider/FormBlockProvider.tsx b/packages/core/client/src/block-provider/FormBlockProvider.tsx index 6ec74f7cc..d2abb7427 100644 --- a/packages/core/client/src/block-provider/FormBlockProvider.tsx +++ b/packages/core/client/src/block-provider/FormBlockProvider.tsx @@ -87,7 +87,7 @@ const InternalFormBlockProvider = (props) => { updateAssociationValues, ]); - if (service.loading && Object.keys(form?.initialValues)?.length === 0 && action) { + if (service.loading && Object.keys(form?.initialValues || {})?.length === 0 && action) { return ; } @@ -151,9 +151,10 @@ export const useFormBlockContext = () => { /** * @internal */ -export const useFormBlockProps = (shouldClearInitialValues = false) => { +export const useFormBlockProps = () => { const ctx = useFormBlockContext(); const treeParentRecord = useTreeParentRecord(); + useEffect(() => { if (treeParentRecord) { ctx.form?.query('parent').take((field) => { @@ -164,19 +165,14 @@ export const useFormBlockProps = (shouldClearInitialValues = false) => { }); useEffect(() => { - if (!ctx?.service?.loading) { - const form: Form = ctx.form; - if (form) { - // form 字段中可能一开始就存在一些默认值（比如设置了字段默认值的模板区块）。在编辑表单中， - // 这些默认值是不需要的，需要清除掉，不然会导致一些问题。比如：https://github.com/nocobase/nocobase/issues/4868 - if (shouldClearInitialValues === true) { - form.initialValues = {}; - form.reset(); - } - form.setInitialValues(ctx.service?.data?.data); - } + const form: Form = ctx.form; + + if (!form || ctx.service?.loading) { + return; } - }, [ctx?.service?.loading]); + + form.setInitialValues(ctx.service?.data?.data); + }, [ctx.form, ctx.service?.data?.data, ctx.service?.loading]); return { form: ctx.form, }; diff --git a/packages/core/client/src/modules/blocks/data-blocks/form/hooks/useEditFormBlockProps.ts b/packages/core/client/src/modules/blocks/data-blocks/form/hooks/useEditFormBlockProps.ts index b5881055e..b14581d86 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/form/hooks/useEditFormBlockProps.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/form/hooks/useEditFormBlockProps.ts @@ -10,5 +10,5 @@ import { useFormBlockProps } from '../../../../../block-provider/FormBlockProvider'; export function useEditFormBlockProps() { - return useFormBlockProps(true); + return useFormBlockProps(); } diff --git a/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts b/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts index a9b50e010..ae2b9f8d1 100644 --- a/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts +++ b/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts @@ -14,6 +14,7 @@ import { getValuesByPath } from '@nocobase/utils/client'; import _ from 'lodash'; import { useCallback, useEffect } from 'react'; import { useRecordIndex } from '../../../../../src/record-provider'; +import { useFormBlockContext } from '../../../../block-provider/FormBlockProvider'; import { useCollection_deprecated } from '../../../../collection-manager'; import { useCollectionRecord } from '../../../../data-source/collection-record/CollectionRecordProvider'; import { useFlag } from '../../../../flag-provider'; @@ -39,6 +40,7 @@ const useParseDefaultValue = () => { const { getField } = useCollection_deprecated(); const { isSpecialCase, setDefaultValue } = useSpecialCase(); const index = useRecordIndex(); + const { type, form } = useFormBlockContext(); /** * name: 如 $user @@ -55,6 +57,13 @@ const useParseDefaultValue = () => { ); useEffect(() => { + // fix https://github.com/nocobase/nocobase/issues/4868 + // fix http://localhost:12000/admin/ugmnj2ycfgg/popups/1qlw5c38t3b/puid/dz42x7ffr7i/filterbytk/182 + // to clear the default value of the field + if (type === 'update' && fieldSchema.default && field.form === form) { + field.setValue?.(record?.data?.[fieldSchema.name]); + } + if ( fieldSchema.default == null || isInSetDefaultValueDialog || @@ -154,7 +163,7 @@ const useParseDefaultValue = () => { // 解决子表格（或子表单）中新增一行数据时，默认值不生效的问题 field.setValue(fieldSchema.default); } - }, [fieldSchema.default, localVariables]); + }, [fieldSchema.default, localVariables, type]); }; export default useParseDefaultValue; From f4b7a8d58b96bfa277f5e06e4dd47011146ca1d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 11:07:45 +0800 Subject: [PATCH 026/133] chore(deps): bump @ant-design/pro-layout from 7.17.16 to 7.19.12 (#5137) Bumps [@ant-design/pro-layout](https://github.com/ant-design/pro-components) from 7.17.16 to 7.19.12. - [Release notes](https://github.com/ant-design/pro-components/releases) - [Changelog](https://github.com/ant-design/pro-components/blob/master/docs/changelog.md) - [Commits](https://github.com/ant-design/pro-components/compare/@ant-design/pro-layout@7.17.16...@ant-design/pro-layout@7.19.12) --- updated-dependencies: - dependency-name: "@ant-design/pro-layout" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 96 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 41 deletions(-) diff --git a/yarn.lock b/yarn.lock index d8d256072..d69c989dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -212,7 +212,7 @@ rc-util "^5.35.0" stylis "^4.0.13" -"@ant-design/icons-svg@^4.2.1", "@ant-design/icons-svg@^4.3.0": +"@ant-design/icons-svg@^4.2.1": version "4.3.1" resolved "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.3.1.tgz#4b2f65a17d4d32b526baa6414aca2117382bf8da" integrity sha512-4QBZg8ccyC6LPIRii7A0bZUk3+lEDCLnhB+FVsflGdcWPPmV+j3fire4AwwoqHV/BibgvBmR9ZIo4s867smv+g== @@ -222,18 +222,7 @@ resolved "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz#ed2be7fb4d82ac7e1d45a54a5b06d6cecf8be6f6" integrity sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA== -"@ant-design/icons@5.x", "@ant-design/icons@^5.0.0", "@ant-design/icons@^5.1.3", "@ant-design/icons@^5.1.4", "@ant-design/icons@^5.2.5", "@ant-design/icons@^5.2.6": - version "5.2.6" - resolved "https://registry.npmmirror.com/@ant-design/icons/-/icons-5.2.6.tgz#2d4a9a37f531eb2a20cebec01d6fb69cf593900d" - integrity sha512-4wn0WShF43TrggskBJPRqCD0fcHbzTYjnaoskdiJrVHg86yxoZ8ZUqsXvyn4WUqehRiFKnaclOhqk9w4Ui2KVw== - dependencies: - "@ant-design/colors" "^7.0.0" - "@ant-design/icons-svg" "^4.3.0" - "@babel/runtime" "^7.11.2" - classnames "^2.2.6" - rc-util "^5.31.1" - -"@ant-design/icons@^5.x": +"@ant-design/icons@5.x", "@ant-design/icons@^5.0.0", "@ant-design/icons@^5.1.3", "@ant-design/icons@^5.1.4", "@ant-design/icons@^5.2.5", "@ant-design/icons@^5.2.6", "@ant-design/icons@^5.x": version "5.3.7" resolved "https://registry.npmmirror.com/@ant-design/icons/-/icons-5.3.7.tgz#d9f3654bf7934ee5faba43f91b5a187f5309ec68" integrity sha512-bCPXTAg66f5bdccM4TT21SQBDO1Ek2gho9h3nO9DAKXJP4sq+5VBjrQMSxMVXSB3HyEz+cUbHQ5+6ogxCOpaew== @@ -256,18 +245,18 @@ "@antv/g2-extension-plot" "^0.1.1" "@ant-design/pro-layout@^7.16.11": - version "7.17.16" - resolved "https://registry.npmmirror.com/@ant-design/pro-layout/-/pro-layout-7.17.16.tgz#124d87d4b602994a395de34caf814304e2c4b72a" - integrity sha512-nBQbAJEUkGqQNBqT30FcbcNXHepxySj/O7est1+2iXPXeVeyQYLHBJXcdvCrUrMty6ev3loG8K+6L3DXQkJ/5Q== + version "7.19.12" + resolved "https://registry.npmmirror.com/@ant-design/pro-layout/-/pro-layout-7.19.12.tgz#48b37f744f6f5eaef2d04f27ec196f56ff86bc3d" + integrity sha512-JSWkhY/GcDKc+c8t7Pbzv1XdK2zhLxg/BupW/JfXk0FHpMs08J+yq64Gqu5fMo2bP1V/8xpwWR5Ik7LHj/Z31Q== dependencies: "@ant-design/icons" "^5.0.0" - "@ant-design/pro-provider" "2.13.5" - "@ant-design/pro-utils" "2.15.2" + "@ant-design/pro-provider" "2.14.9" + "@ant-design/pro-utils" "2.15.17" "@babel/runtime" "^7.18.0" "@umijs/route-utils" "^4.0.0" "@umijs/use-params" "^1.0.9" classnames "^2.3.2" - lodash.merge "^4.6.2" + lodash-es "^4.17.21" omit.js "^2.0.2" path-to-regexp "2.4.0" rc-resize-observer "^1.1.0" @@ -275,10 +264,10 @@ swr "^2.0.0" warning "^4.0.3" -"@ant-design/pro-provider@2.13.5": - version "2.13.5" - resolved "https://registry.npmmirror.com/@ant-design/pro-provider/-/pro-provider-2.13.5.tgz#4f2a14ec21a014fc334e8a56741433ff06b02be6" - integrity sha512-ZVmzY2cq4nUvgmAlfgyCAaSZYV2l3n/upIQPXPj8sYcT+N/Pt1CeSVkkgW6By3EqokF6apWdIFU7hZMK2rNhrg== +"@ant-design/pro-provider@2.14.9": + version "2.14.9" + resolved "https://registry.npmmirror.com/@ant-design/pro-provider/-/pro-provider-2.14.9.tgz#ca9c764a4eeda5ceacdd9cca817ce2764644db3a" + integrity sha512-4UJr6AHyWKsrhx2KfdkpRQCgjc75oDUDhMHGA2OWqQVI16sMQfeZf6KYfmeiG3Dal1QKFOtSibCdH5G2CDvWlg== dependencies: "@ant-design/cssinjs" "^1.11.1" "@babel/runtime" "^7.18.0" @@ -286,17 +275,17 @@ rc-util "^5.0.1" swr "^2.0.0" -"@ant-design/pro-utils@2.15.2": - version "2.15.2" - resolved "https://registry.npmmirror.com/@ant-design/pro-utils/-/pro-utils-2.15.2.tgz#d8a6cdd506842ea0d6d6cabb85e2e247bc096977" - integrity sha512-kzMT658CGrQqoihKPlZhbnRioovwMhM59vqqVXuT6A+IuyxJhs5pxN73C6sN2+ZoeYCo/Gewnfn9v1/2vHU2Zg== +"@ant-design/pro-utils@2.15.17": + version "2.15.17" + resolved "https://registry.npmmirror.com/@ant-design/pro-utils/-/pro-utils-2.15.17.tgz#7081ac788191ce2f055564639056c2cb0ddee60e" + integrity sha512-8uF1evCxI3YsEFugP5MY7Oy8HGIKL7tajXkpIRTOZmH9Az/yTX/7cAo1FnwJ1vliLm6aBPpfwNh5qRHjZQOj3g== dependencies: "@ant-design/icons" "^5.0.0" - "@ant-design/pro-provider" "2.13.5" + "@ant-design/pro-provider" "2.14.9" "@babel/runtime" "^7.18.0" classnames "^2.3.2" dayjs "^1.11.10" - lodash.merge "^4.6.2" + lodash-es "^4.17.21" rc-util "^5.0.6" safe-stable-stringify "^2.4.3" swr "^2.0.0" @@ -5493,10 +5482,10 @@ resolved "https://registry.npmmirror.com/@remix-run/router/-/router-1.14.0.tgz#9bc39a5a3a71b81bdb310eba6def5bc3966695b7" integrity sha512-WOHih+ClN7N8oHk9N4JUiMxQJmRVaOxcg8w7F/oHUXzJt920ekASLI/7cYX8XkntDWRhLZtsk6LbGrkgOAvi5A== -"@remix-run/router@1.19.0": - version "1.19.0" - resolved "https://registry.npmmirror.com/@remix-run/router/-/router-1.19.0.tgz#745dbffbce67f05386d57ca22c51dfd85c979593" - integrity sha512-zDICCLKEwbVYTS6TjYaWtHXxkdoUvD/QXvyVZjGCsWz5vyH7aFeONlPffPdW+Y/t6KT0MgXb2Mfjun9YpWN1dA== +"@remix-run/router@1.19.1": + version "1.19.1" + resolved "https://registry.npmmirror.com/@remix-run/router/-/router-1.19.1.tgz#984771bfd1de2715f42394c87fb716c1349e014f" + integrity sha512-S45oynt/WH19bHbIXjtli6QmwNYvaz+vtnubvNpNDvUOoA/OWh6j1OikIP3G+v5GHdxyC6EXoChG3HgYGEUfcg== "@restart/hooks@^0.4.7": version "0.4.15" @@ -17016,7 +17005,7 @@ json5@^1.0.1, json5@^1.0.2: dependencies: minimist "^1.2.0" -json5@^2.1.2, json5@^2.2.3: +json5@^2.1.2, json5@^2.2.2, json5@^2.2.3: version "2.2.3" resolved "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== @@ -22591,11 +22580,11 @@ react-router-dom@6.3.0, react-router-dom@6.x, react-router-dom@^6.11.2, react-ro react-router "6.21.0" react-router@6.21.0, react-router@6.3.0, react-router@^6.11.2: - version "6.26.0" - resolved "https://registry.npmmirror.com/react-router/-/react-router-6.26.0.tgz#d5af4c46835b202348ef2b7ddacd32a2db539fde" - integrity sha512-wVQq0/iFYd3iZ9H2l3N3k4PL8EEHcb0XlU2Na8nEwmiXgIUElEH6gaJDtUQxJ+JFzmIXaQjfdpcGWaM6IoQGxg== + version "6.26.1" + resolved "https://registry.npmmirror.com/react-router/-/react-router-6.26.1.tgz#88c64837e05ffab6899a49df2a1484a22471e4ce" + integrity sha512-kIwJveZNwp7teQRI5QmwWo39A5bXRyqpH0COKKmPnyD2vBvDwgFXSqDUYtt1h+FEyfnE8eXr7oe0MxRzVwCcvQ== dependencies: - "@remix-run/router" "1.19.0" + "@remix-run/router" "1.19.1" react-side-effect@^2.1.0: version "2.1.2" @@ -24512,7 +24501,7 @@ string-convert@^0.2.0: resolved "https://registry.npmmirror.com/string-convert/-/string-convert-0.2.1.tgz#6982cc3049fbb4cd85f8b24568b9d9bf39eeff97" integrity sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -24530,6 +24519,15 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.npmmirror.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" @@ -24625,7 +24623,7 @@ stringify-entities@^4.0.0: character-entities-html4 "^2.0.0" character-entities-legacy "^3.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -24653,6 +24651,13 @@ strip-ansi@^5.1.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -26965,7 +26970,7 @@ wordwrap@^1.0.0: resolved "https://registry.npmmirror.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -26991,6 +26996,15 @@ wrap-ansi@^6.0.1: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.0.1, wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 3f461ad8f079b4c2cf5975c1e26271f55021e08a Mon Sep 17 00:00:00 2001 From: Zeke Zhang <958414905@qq.com> Date: Wed, 28 Aug 2024 11:08:30 +0800 Subject: [PATCH 027/133] Revert "chore(deps): bump @ant-design/pro-layout from 7.17.16 to 7.19.12 (#5137)" This reverts commit f4b7a8d58b96bfa277f5e06e4dd47011146ca1d4. --- yarn.lock | 96 ++++++++++++++++++++++++------------------------------- 1 file changed, 41 insertions(+), 55 deletions(-) diff --git a/yarn.lock b/yarn.lock index d69c989dd..d8d256072 100644 --- a/yarn.lock +++ b/yarn.lock @@ -212,7 +212,7 @@ rc-util "^5.35.0" stylis "^4.0.13" -"@ant-design/icons-svg@^4.2.1": +"@ant-design/icons-svg@^4.2.1", "@ant-design/icons-svg@^4.3.0": version "4.3.1" resolved "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.3.1.tgz#4b2f65a17d4d32b526baa6414aca2117382bf8da" integrity sha512-4QBZg8ccyC6LPIRii7A0bZUk3+lEDCLnhB+FVsflGdcWPPmV+j3fire4AwwoqHV/BibgvBmR9ZIo4s867smv+g== @@ -222,7 +222,18 @@ resolved "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz#ed2be7fb4d82ac7e1d45a54a5b06d6cecf8be6f6" integrity sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA== -"@ant-design/icons@5.x", "@ant-design/icons@^5.0.0", "@ant-design/icons@^5.1.3", "@ant-design/icons@^5.1.4", "@ant-design/icons@^5.2.5", "@ant-design/icons@^5.2.6", "@ant-design/icons@^5.x": +"@ant-design/icons@5.x", "@ant-design/icons@^5.0.0", "@ant-design/icons@^5.1.3", "@ant-design/icons@^5.1.4", "@ant-design/icons@^5.2.5", "@ant-design/icons@^5.2.6": + version "5.2.6" + resolved "https://registry.npmmirror.com/@ant-design/icons/-/icons-5.2.6.tgz#2d4a9a37f531eb2a20cebec01d6fb69cf593900d" + integrity sha512-4wn0WShF43TrggskBJPRqCD0fcHbzTYjnaoskdiJrVHg86yxoZ8ZUqsXvyn4WUqehRiFKnaclOhqk9w4Ui2KVw== + dependencies: + "@ant-design/colors" "^7.0.0" + "@ant-design/icons-svg" "^4.3.0" + "@babel/runtime" "^7.11.2" + classnames "^2.2.6" + rc-util "^5.31.1" + +"@ant-design/icons@^5.x": version "5.3.7" resolved "https://registry.npmmirror.com/@ant-design/icons/-/icons-5.3.7.tgz#d9f3654bf7934ee5faba43f91b5a187f5309ec68" integrity sha512-bCPXTAg66f5bdccM4TT21SQBDO1Ek2gho9h3nO9DAKXJP4sq+5VBjrQMSxMVXSB3HyEz+cUbHQ5+6ogxCOpaew== @@ -245,18 +256,18 @@ "@antv/g2-extension-plot" "^0.1.1" "@ant-design/pro-layout@^7.16.11": - version "7.19.12" - resolved "https://registry.npmmirror.com/@ant-design/pro-layout/-/pro-layout-7.19.12.tgz#48b37f744f6f5eaef2d04f27ec196f56ff86bc3d" - integrity sha512-JSWkhY/GcDKc+c8t7Pbzv1XdK2zhLxg/BupW/JfXk0FHpMs08J+yq64Gqu5fMo2bP1V/8xpwWR5Ik7LHj/Z31Q== + version "7.17.16" + resolved "https://registry.npmmirror.com/@ant-design/pro-layout/-/pro-layout-7.17.16.tgz#124d87d4b602994a395de34caf814304e2c4b72a" + integrity sha512-nBQbAJEUkGqQNBqT30FcbcNXHepxySj/O7est1+2iXPXeVeyQYLHBJXcdvCrUrMty6ev3loG8K+6L3DXQkJ/5Q== dependencies: "@ant-design/icons" "^5.0.0" - "@ant-design/pro-provider" "2.14.9" - "@ant-design/pro-utils" "2.15.17" + "@ant-design/pro-provider" "2.13.5" + "@ant-design/pro-utils" "2.15.2" "@babel/runtime" "^7.18.0" "@umijs/route-utils" "^4.0.0" "@umijs/use-params" "^1.0.9" classnames "^2.3.2" - lodash-es "^4.17.21" + lodash.merge "^4.6.2" omit.js "^2.0.2" path-to-regexp "2.4.0" rc-resize-observer "^1.1.0" @@ -264,10 +275,10 @@ swr "^2.0.0" warning "^4.0.3" -"@ant-design/pro-provider@2.14.9": - version "2.14.9" - resolved "https://registry.npmmirror.com/@ant-design/pro-provider/-/pro-provider-2.14.9.tgz#ca9c764a4eeda5ceacdd9cca817ce2764644db3a" - integrity sha512-4UJr6AHyWKsrhx2KfdkpRQCgjc75oDUDhMHGA2OWqQVI16sMQfeZf6KYfmeiG3Dal1QKFOtSibCdH5G2CDvWlg== +"@ant-design/pro-provider@2.13.5": + version "2.13.5" + resolved "https://registry.npmmirror.com/@ant-design/pro-provider/-/pro-provider-2.13.5.tgz#4f2a14ec21a014fc334e8a56741433ff06b02be6" + integrity sha512-ZVmzY2cq4nUvgmAlfgyCAaSZYV2l3n/upIQPXPj8sYcT+N/Pt1CeSVkkgW6By3EqokF6apWdIFU7hZMK2rNhrg== dependencies: "@ant-design/cssinjs" "^1.11.1" "@babel/runtime" "^7.18.0" @@ -275,17 +286,17 @@ rc-util "^5.0.1" swr "^2.0.0" -"@ant-design/pro-utils@2.15.17": - version "2.15.17" - resolved "https://registry.npmmirror.com/@ant-design/pro-utils/-/pro-utils-2.15.17.tgz#7081ac788191ce2f055564639056c2cb0ddee60e" - integrity sha512-8uF1evCxI3YsEFugP5MY7Oy8HGIKL7tajXkpIRTOZmH9Az/yTX/7cAo1FnwJ1vliLm6aBPpfwNh5qRHjZQOj3g== +"@ant-design/pro-utils@2.15.2": + version "2.15.2" + resolved "https://registry.npmmirror.com/@ant-design/pro-utils/-/pro-utils-2.15.2.tgz#d8a6cdd506842ea0d6d6cabb85e2e247bc096977" + integrity sha512-kzMT658CGrQqoihKPlZhbnRioovwMhM59vqqVXuT6A+IuyxJhs5pxN73C6sN2+ZoeYCo/Gewnfn9v1/2vHU2Zg== dependencies: "@ant-design/icons" "^5.0.0" - "@ant-design/pro-provider" "2.14.9" + "@ant-design/pro-provider" "2.13.5" "@babel/runtime" "^7.18.0" classnames "^2.3.2" dayjs "^1.11.10" - lodash-es "^4.17.21" + lodash.merge "^4.6.2" rc-util "^5.0.6" safe-stable-stringify "^2.4.3" swr "^2.0.0" @@ -5482,10 +5493,10 @@ resolved "https://registry.npmmirror.com/@remix-run/router/-/router-1.14.0.tgz#9bc39a5a3a71b81bdb310eba6def5bc3966695b7" integrity sha512-WOHih+ClN7N8oHk9N4JUiMxQJmRVaOxcg8w7F/oHUXzJt920ekASLI/7cYX8XkntDWRhLZtsk6LbGrkgOAvi5A== -"@remix-run/router@1.19.1": - version "1.19.1" - resolved "https://registry.npmmirror.com/@remix-run/router/-/router-1.19.1.tgz#984771bfd1de2715f42394c87fb716c1349e014f" - integrity sha512-S45oynt/WH19bHbIXjtli6QmwNYvaz+vtnubvNpNDvUOoA/OWh6j1OikIP3G+v5GHdxyC6EXoChG3HgYGEUfcg== +"@remix-run/router@1.19.0": + version "1.19.0" + resolved "https://registry.npmmirror.com/@remix-run/router/-/router-1.19.0.tgz#745dbffbce67f05386d57ca22c51dfd85c979593" + integrity sha512-zDICCLKEwbVYTS6TjYaWtHXxkdoUvD/QXvyVZjGCsWz5vyH7aFeONlPffPdW+Y/t6KT0MgXb2Mfjun9YpWN1dA== "@restart/hooks@^0.4.7": version "0.4.15" @@ -17005,7 +17016,7 @@ json5@^1.0.1, json5@^1.0.2: dependencies: minimist "^1.2.0" -json5@^2.1.2, json5@^2.2.2, json5@^2.2.3: +json5@^2.1.2, json5@^2.2.3: version "2.2.3" resolved "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== @@ -22580,11 +22591,11 @@ react-router-dom@6.3.0, react-router-dom@6.x, react-router-dom@^6.11.2, react-ro react-router "6.21.0" react-router@6.21.0, react-router@6.3.0, react-router@^6.11.2: - version "6.26.1" - resolved "https://registry.npmmirror.com/react-router/-/react-router-6.26.1.tgz#88c64837e05ffab6899a49df2a1484a22471e4ce" - integrity sha512-kIwJveZNwp7teQRI5QmwWo39A5bXRyqpH0COKKmPnyD2vBvDwgFXSqDUYtt1h+FEyfnE8eXr7oe0MxRzVwCcvQ== + version "6.26.0" + resolved "https://registry.npmmirror.com/react-router/-/react-router-6.26.0.tgz#d5af4c46835b202348ef2b7ddacd32a2db539fde" + integrity sha512-wVQq0/iFYd3iZ9H2l3N3k4PL8EEHcb0XlU2Na8nEwmiXgIUElEH6gaJDtUQxJ+JFzmIXaQjfdpcGWaM6IoQGxg== dependencies: - "@remix-run/router" "1.19.1" + "@remix-run/router" "1.19.0" react-side-effect@^2.1.0: version "2.1.2" @@ -24501,7 +24512,7 @@ string-convert@^0.2.0: resolved "https://registry.npmmirror.com/string-convert/-/string-convert-0.2.1.tgz#6982cc3049fbb4cd85f8b24568b9d9bf39eeff97" integrity sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A== -"string-width-cjs@npm:string-width@^4.2.0": +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -24519,15 +24530,6 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.npmmirror.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" @@ -24623,7 +24625,7 @@ stringify-entities@^4.0.0: character-entities-html4 "^2.0.0" character-entities-legacy "^3.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -24651,13 +24653,6 @@ strip-ansi@^5.1.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -26970,7 +26965,7 @@ wordwrap@^1.0.0: resolved "https://registry.npmmirror.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -26996,15 +26991,6 @@ wrap-ansi@^6.0.1: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.0.1, wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 77281af61d5b0167be611023fef7d7b601ec3b99 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 11:14:35 +0800 Subject: [PATCH 028/133] chore(deps-dev): bump eslint-plugin-jest-dom from 5.1.0 to 5.4.0 (#5138) Bumps [eslint-plugin-jest-dom](https://github.com/testing-library/eslint-plugin-jest-dom) from 5.1.0 to 5.4.0. - [Release notes](https://github.com/testing-library/eslint-plugin-jest-dom/releases) - [Commits](https://github.com/testing-library/eslint-plugin-jest-dom/compare/v5.1.0...v5.4.0) --- updated-dependencies: - dependency-name: eslint-plugin-jest-dom dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/yarn.lock b/yarn.lock index d8d256072..2e0105ffc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13231,9 +13231,9 @@ eslint-plugin-import@^2.27.5: tsconfig-paths "^3.15.0" eslint-plugin-jest-dom@^5.0.1: - version "5.1.0" - resolved "https://registry.npmmirror.com/eslint-plugin-jest-dom/-/eslint-plugin-jest-dom-5.1.0.tgz#b285cd1cc71c084c8ee897f0f85599758d7cb933" - integrity sha512-JIXZp+E/h/aGlP/rQc4tuOejiHlZXg65qw8JAJMIJA5VsdjOkss/SYcRSqBrQuEOytEM8JvngUjcz31d1RrCrA== + version "5.4.0" + resolved "https://registry.npmmirror.com/eslint-plugin-jest-dom/-/eslint-plugin-jest-dom-5.4.0.tgz#03a5ea600f8af63f4fcd5de49ae83dc0e6aca325" + integrity sha512-yBqvFsnpS5Sybjoq61cJiUsenRkC9K32hYQBFS9doBR7nbQZZ5FyO+X7MlmfM1C48Ejx/qTuOCgukDUNyzKZ7A== dependencies: "@babel/runtime" "^7.16.3" requireindex "^1.2.0" @@ -17016,7 +17016,7 @@ json5@^1.0.1, json5@^1.0.2: dependencies: minimist "^1.2.0" -json5@^2.1.2, json5@^2.2.3: +json5@^2.1.2, json5@^2.2.2, json5@^2.2.3: version "2.2.3" resolved "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== @@ -24512,7 +24512,7 @@ string-convert@^0.2.0: resolved "https://registry.npmmirror.com/string-convert/-/string-convert-0.2.1.tgz#6982cc3049fbb4cd85f8b24568b9d9bf39eeff97" integrity sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -24530,6 +24530,15 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.npmmirror.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" @@ -24625,7 +24634,7 @@ stringify-entities@^4.0.0: character-entities-html4 "^2.0.0" character-entities-legacy "^3.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -24653,6 +24662,13 @@ strip-ansi@^5.1.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -26965,7 +26981,7 @@ wordwrap@^1.0.0: resolved "https://registry.npmmirror.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -26991,6 +27007,15 @@ wrap-ansi@^6.0.1: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.0.1, wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 67d2f85a9984c967f2f9aac1557ae0e7766ff84a Mon Sep 17 00:00:00 2001 From: Zeke Zhang <958414905@qq.com> Date: Wed, 28 Aug 2024 11:53:52 +0800 Subject: [PATCH 029/133] fix(defaultValue): ignores variable values that do not match the current field (#5122) * refactor(variable): refactor parseVariable to support return more context * fix(defaultValue): ignore no matching value * fix: make unit tests pass * chore: fix unit test --- .../__tests__/hooks/index.test.ts | 2 +- .../client/src/block-provider/hooks/index.ts | 34 ++--- ...eLazyLoadDisplayAssociationFieldsOfForm.ts | 4 +- .../form-item/hooks/useParseDefaultValue.ts | 13 +- .../schema-component/antd/form-v2/utils.tsx | 6 +- .../schema-component/common/utils/uitls.tsx | 14 +- .../hooks/useParseDataScopeFilter.ts | 2 +- .../src/variables/VariablesProvider.tsx | 31 ++++- .../variables/__tests__/useVariables.test.tsx | 123 +++++++++++++----- packages/core/client/src/variables/types.ts | 9 +- .../src/client/utils.tsx | 2 +- .../src/client/hooks/filter.ts | 18 ++- 12 files changed, 177 insertions(+), 81 deletions(-) diff --git a/packages/core/client/src/block-provider/__tests__/hooks/index.test.ts b/packages/core/client/src/block-provider/__tests__/hooks/index.test.ts index 7500de347..fda48baea 100644 --- a/packages/core/client/src/block-provider/__tests__/hooks/index.test.ts +++ b/packages/core/client/src/block-provider/__tests__/hooks/index.test.ts @@ -24,7 +24,7 @@ describe('parseVariablesAndChangeParamsToQueryString', () => { { name: 'param3', value: 'value3' }, ]; const variables: any = { - parseVariable: vi.fn().mockResolvedValue('parsedValue'), + parseVariable: vi.fn().mockResolvedValue({ value: 'parsedValue' }), }; const localVariables: any = [ { name: '$var1', ctx: { value: 'localValue1' } }, diff --git a/packages/core/client/src/block-provider/hooks/index.ts b/packages/core/client/src/block-provider/hooks/index.ts index e66d10fcb..29dbc288a 100644 --- a/packages/core/client/src/block-provider/hooks/index.ts +++ b/packages/core/client/src/block-provider/hooks/index.ts @@ -163,9 +163,9 @@ export function useCollectValuesToSubmit() { } if (isVariable(value)) { - const result = await variables?.parseVariable(value, localVariables); - if (result) { - assignedValues[key] = transformVariableValue(result, { targetCollectionField: collectionField }); + const { value: parsedValue } = (await variables?.parseVariable(value, localVariables)) || {}; + if (parsedValue) { + assignedValues[key] = transformVariableValue(parsedValue, { targetCollectionField: collectionField }); } } else if (value != null && value !== '') { assignedValues[key] = value; @@ -324,9 +324,9 @@ export const useAssociationCreateActionProps = () => { } if (isVariable(value)) { - const result = await variables?.parseVariable(value, localVariables); - if (result) { - assignedValues[key] = transformVariableValue(result, { targetCollectionField: collectionField }); + const { value: parsedValue } = (await variables?.parseVariable(value, localVariables)) || {}; + if (parsedValue) { + assignedValues[key] = transformVariableValue(parsedValue, { targetCollectionField: collectionField }); } } else if (value != null && value !== '') { assignedValues[key] = value; @@ -582,9 +582,9 @@ export const useCustomizeUpdateActionProps = () => { } if (isVariable(value)) { - const result = await variables?.parseVariable(value, localVariables); - if (result) { - assignedValues[key] = transformVariableValue(result, { targetCollectionField: collectionField }); + const { value: parsedValue } = (await variables?.parseVariable(value, localVariables)) || {}; + if (parsedValue) { + assignedValues[key] = transformVariableValue(parsedValue, { targetCollectionField: collectionField }); } } else if (value != null && value !== '') { assignedValues[key] = value; @@ -680,9 +680,9 @@ export const useCustomizeBulkUpdateActionProps = () => { } if (isVariable(value)) { - const result = await variables?.parseVariable(value, localVariables); - if (result) { - assignedValues[key] = transformVariableValue(result, { targetCollectionField: collectionField }); + const { value: parsedValue } = (await variables?.parseVariable(value, localVariables)) || {}; + if (parsedValue) { + assignedValues[key] = transformVariableValue(parsedValue, { targetCollectionField: collectionField }); } } else if (value != null && value !== '') { assignedValues[key] = value; @@ -888,9 +888,9 @@ export const useUpdateActionProps = () => { } if (isVariable(value)) { - const result = await variables?.parseVariable(value, localVariables); - if (result) { - assignedValues[key] = transformVariableValue(result, { targetCollectionField: collectionField }); + const { value: parsedValue } = (await variables?.parseVariable(value, localVariables)) || {}; + if (parsedValue) { + assignedValues[key] = transformVariableValue(parsedValue, { targetCollectionField: collectionField }); } } else if (value != null && value !== '') { assignedValues[key] = value; @@ -1661,8 +1661,8 @@ export async function parseVariablesAndChangeParamsToQueryString({ searchParams.map(async ({ name, value }) => { if (typeof value === 'string') { if (isVariable(value)) { - const result = await variables.parseVariable(value, localVariables); - return { name, value: result }; + const { value: parsedValue } = (await variables.parseVariable(value, localVariables)) || {}; + return { name, value: parsedValue }; } const result = await replaceVariableValue(value, variables, localVariables); return { name, value: result }; diff --git a/packages/core/client/src/schema-component/antd/form-item/hooks/useLazyLoadDisplayAssociationFieldsOfForm.ts b/packages/core/client/src/schema-component/antd/form-item/hooks/useLazyLoadDisplayAssociationFieldsOfForm.ts index 170a09049..a4f26348d 100644 --- a/packages/core/client/src/schema-component/antd/form-item/hooks/useLazyLoadDisplayAssociationFieldsOfForm.ts +++ b/packages/core/client/src/schema-component/antd/form-item/hooks/useLazyLoadDisplayAssociationFieldsOfForm.ts @@ -9,6 +9,7 @@ import { Field } from '@formily/core'; import { useField, useFieldSchema, useForm } from '@formily/react'; +import { untracked } from '@formily/reactive'; import { nextTick } from '@nocobase/utils/client'; import _ from 'lodash'; import { useEffect, useMemo, useRef } from 'react'; @@ -20,7 +21,6 @@ import { useVariables } from '../../../../variables'; import { transformVariableValue } from '../../../../variables/utils/transformVariableValue'; import { useSubFormValue } from '../../association-field/hooks'; import { isDisplayField } from '../utils'; -import { untracked } from '@formily/reactive'; /** * 用于懒加载 Form 区块中只用于展示的关联字段的值 @@ -97,7 +97,7 @@ const useLazyLoadDisplayAssociationFieldsOfForm = () => { variables .parseVariable(variableString, formVariable, { appends }) - .then((value) => { + .then(({ value }) => { nextTick(() => { const result = transformVariableValue(value, { targetCollectionField: collectionFieldRef.current }); // fix https://nocobase.height.app/T-2608 diff --git a/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts b/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts index ae2b9f8d1..d4f28748a 100644 --- a/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts +++ b/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts @@ -95,7 +95,18 @@ const useParseDefaultValue = () => { } } - const value = transformVariableValue(await variables.parseVariable(fieldSchema.default, localVariables), { + const { value: parsedValue, collectionName: collectionNameOfVariable } = await variables.parseVariable( + fieldSchema.default, + localVariables, + ); + + // fix https://tasks.aliyun.nocobase.com/admin/ugmnj2ycfgg/popups/1qlw5c38t3b/puid/dz42x7ffr7i/filterbytk/199 + if (collectionField.target && collectionField.target !== collectionNameOfVariable) { + field.loading = false; + return; + } + + const value = transformVariableValue(parsedValue, { targetCollectionField: collectionField, }); diff --git a/packages/core/client/src/schema-component/antd/form-v2/utils.tsx b/packages/core/client/src/schema-component/antd/form-v2/utils.tsx index 052586487..a69e53030 100644 --- a/packages/core/client/src/schema-component/antd/form-v2/utils.tsx +++ b/packages/core/client/src/schema-component/antd/form-v2/utils.tsx @@ -156,14 +156,14 @@ export async function replaceVariables( } const waitForParsing = value.match(REGEX_OF_VARIABLE_IN_EXPRESSION)?.map(async (item) => { - const result = await variables.parseVariable(item, localVariables); + const { value: parsedValue } = await variables.parseVariable(item, localVariables); // 在开头加 `_` 是为了保证 id 不能以数字开头，否则在解析表达式的时候（不是解析变量）会报错 const id = `_${uid()}`; - scope[id] = result; + scope[id] = parsedValue; store[item] = id; - return result; + return parsedValue; }); if (waitForParsing) { diff --git a/packages/core/client/src/schema-component/common/utils/uitls.tsx b/packages/core/client/src/schema-component/common/utils/uitls.tsx index f02e5e175..788cc1214 100644 --- a/packages/core/client/src/schema-component/common/utils/uitls.tsx +++ b/packages/core/client/src/schema-component/common/utils/uitls.tsx @@ -7,13 +7,13 @@ * For more information, please refer to: https://www.nocobase.com/agreement. */ -import _, { every, findIndex, some } from 'lodash'; import Handlebars from 'handlebars'; +import _, { every, findIndex, some } from 'lodash'; +import { replaceVariableValue } from '../../../block-provider/hooks'; import { VariableOption, VariablesContextType } from '../../../variables/types'; import { isVariable } from '../../../variables/utils/isVariable'; import { transformVariableValue } from '../../../variables/utils/transformVariableValue'; import { getJsonLogic } from '../../common/utils/logic'; -import { replaceVariableValue } from '../../../block-provider/hooks'; type VariablesCtx = { /** 当前登录的用户 */ @@ -102,12 +102,14 @@ export const conditionAnalyses = async ({ } const targetVariableName = targetFieldToVariableString(getTargetField(condition)); - const targetValue = variables.parseVariable(targetVariableName, localVariables, { - doNotRequest: true, - }); + const targetValue = variables + .parseVariable(targetVariableName, localVariables, { + doNotRequest: true, + }) + .then(({ value }) => value); const parsingResult = isVariable(jsonlogic?.value) - ? [variables.parseVariable(jsonlogic?.value, localVariables), targetValue] + ? [variables.parseVariable(jsonlogic?.value, localVariables).then(({ value }) => value), targetValue] : [jsonlogic?.value, targetValue]; try { diff --git a/packages/core/client/src/schema-settings/hooks/useParseDataScopeFilter.ts b/packages/core/client/src/schema-settings/hooks/useParseDataScopeFilter.ts index 369984156..dfc29cae0 100644 --- a/packages/core/client/src/schema-settings/hooks/useParseDataScopeFilter.ts +++ b/packages/core/client/src/schema-settings/hooks/useParseDataScopeFilter.ts @@ -55,7 +55,7 @@ const useParseDataScopeFilter = ({ exclude = defaultExclude }: Props = {}) => { if (exclude.includes(getVariableName(value))) { return value; } - const result = variables?.parseVariable(value, localVariables); + const result = variables?.parseVariable(value, localVariables).then(({ value }) => value); return result; }, }); diff --git a/packages/core/client/src/variables/VariablesProvider.tsx b/packages/core/client/src/variables/VariablesProvider.tsx index 93cd3be3f..7cc56b0d1 100644 --- a/packages/core/client/src/variables/VariablesProvider.tsx +++ b/packages/core/client/src/variables/VariablesProvider.tsx @@ -69,7 +69,7 @@ const VariablesProvider = ({ children }) => { * 2. 如果某个 `key` 不存在，且 `key` 是一个关联字段，则从 api 中获取数据，并缓存到 `ctx` 中 * 3. 如果某个 `key` 不存在，且 `key` 不是一个关联字段，则返回当前值 */ - const getValue = useCallback( + const getResult = useCallback( async ( variablePath: string, localVariables?: VariableOption[], @@ -87,13 +87,23 @@ const VariablesProvider = ({ children }) => { const { fieldPath, dataSource, variableOption } = getFieldPath(variableName, _variableToCollectionName); let collectionName = fieldPath; + const { fieldPath: fieldPathOfVariable } = getFieldPath(variablePath, _variableToCollectionName); + const collectionNameOfVariable = + list.length === 1 + ? variableOption.collectionName + : getCollectionJoinField(fieldPathOfVariable, dataSource)?.target; + if (!(variableName in current)) { throw new Error(`VariablesProvider: ${variableName} is not found`); } for (let index = 0; index < list.length; index++) { if (current == null) { - return current === undefined ? variableOption.defaultValue : current; + return { + value: current === undefined ? variableOption.defaultValue : current, + dataSource, + collectionName: collectionNameOfVariable, + }; } const key = list[index]; @@ -171,8 +181,12 @@ const VariablesProvider = ({ children }) => { } } - const result = compile(_.isFunction(current) ? current() : current); - return result === undefined ? variableOption.defaultValue : result; + const _value = compile(_.isFunction(current) ? current() : current); + return { + value: _value === undefined ? variableOption.defaultValue : _value, + dataSource, + collectionName: collectionNameOfVariable, + }; }, [getCollectionJoinField], ); @@ -248,11 +262,14 @@ const VariablesProvider = ({ children }) => { } const path = getPath(str); - const value = await getValue(path, localVariables as VariableOption[], options); + const result = await getResult(path, localVariables as VariableOption[], options); - return uniq(filterEmptyValues(value)); + return { + ...result, + value: uniq(filterEmptyValues(result.value)), + }; }, - [getValue], + [getResult], ); const getCollectionField = useCallback( diff --git a/packages/core/client/src/variables/__tests__/useVariables.test.tsx b/packages/core/client/src/variables/__tests__/useVariables.test.tsx index 69c016e74..459da4ba7 100644 --- a/packages/core/client/src/variables/__tests__/useVariables.test.tsx +++ b/packages/core/client/src/variables/__tests__/useVariables.test.tsx @@ -276,7 +276,7 @@ describe('useVariables', () => { }); await waitFor(async () => { - expect(await result.current.parseVariable('{{ $user.nickname }}')).toBe('test'); + expect(await result.current.parseVariable('{{ $user.nickname }}').then(({ value }) => value)).toBe('test'); }); }); @@ -286,7 +286,9 @@ describe('useVariables', () => { }); await waitFor(async () => { - expect(await result.current.parseVariable('{{ $user.nickname }}')).toBe('from request'); + expect(await result.current.parseVariable('{{ $user.nickname }}').then(({ value }) => value)).toBe( + 'from request', + ); }); }); @@ -296,7 +298,7 @@ describe('useVariables', () => { }); await waitFor(async () => { - expect(await result.current.parseVariable('{{ $user.belongsToField }}')).toEqual({ + expect(await result.current.parseVariable('{{ $user.belongsToField }}').then(({ value }) => value)).toEqual({ id: 0, name: '$user.belongsToField', }); @@ -309,9 +311,11 @@ describe('useVariables', () => { }); await waitFor(async () => { - expect(await result.current.parseVariable('{{ $user.belongsToField }}', undefined, { doNotRequest: true })).toBe( - null, - ); + expect( + await result.current + .parseVariable('{{ $user.belongsToField }}', undefined, { doNotRequest: true }) + .then(({ value }) => value), + ).toBe(null); }); }); @@ -321,7 +325,9 @@ describe('useVariables', () => { }); await waitFor(async () => { - expect(await result.current.parseVariable('{{ $user.belongsToField.name }}')).toBe('$user.belongsToField'); + expect(await result.current.parseVariable('{{ $user.belongsToField.name }}').then(({ value }) => value)).toBe( + '$user.belongsToField', + ); }); }); @@ -331,7 +337,7 @@ describe('useVariables', () => { }); await waitFor(async () => { - expect(await result.current.parseVariable('{{ $user.hasManyField }}')).toEqual([ + expect(await result.current.parseVariable('{{ $user.hasManyField }}').then(({ value }) => value)).toEqual([ { id: 0, name: '$user.hasManyField', @@ -340,7 +346,9 @@ describe('useVariables', () => { }); await waitFor(async () => { - expect(await result.current.parseVariable('{{ $user.hasManyField.name }}')).toEqual(['$user.hasManyField']); + expect(await result.current.parseVariable('{{ $user.hasManyField.name }}').then(({ value }) => value)).toEqual([ + '$user.hasManyField', + ]); }); }); @@ -350,7 +358,9 @@ describe('useVariables', () => { }); await waitFor(async () => { - expect(await result.current.parseVariable('{{ $user.hasManyField.hasManyField }}')).toEqual([ + expect( + await result.current.parseVariable('{{ $user.hasManyField.hasManyField }}').then(({ value }) => value), + ).toEqual([ { id: 0, name: '$user.hasManyField.hasManyField', @@ -359,15 +369,34 @@ describe('useVariables', () => { }); }); + it('$user.hasManyField', async () => { + const { result } = renderHook(() => useVariables(), { + wrapper: Providers, + }); + + await waitFor(async () => { + expect(await result.current.parseVariable('{{ $user.hasManyField }}')).toEqual({ + collectionName: 'test', + dataSource: 'main', + value: [ + { + id: 0, + name: '$user.hasManyField', + }, + ], + }); + }); + }); + it('$user.hasManyField.hasManyField.name', async () => { const { result } = renderHook(() => useVariables(), { wrapper: Providers, }); await waitFor(async () => { - expect(await result.current.parseVariable('{{ $user.hasManyField.hasManyField.name }}')).toEqual([ - '$user.hasManyField.hasManyField', - ]); + expect( + await result.current.parseVariable('{{ $user.hasManyField.hasManyField.name }}').then(({ value }) => value), + ).toEqual(['$user.hasManyField.hasManyField']); }); }); @@ -393,7 +422,7 @@ describe('useVariables', () => { }); await waitFor(async () => { - expect(await result.current.parseVariable('{{ $user.hasManyField }}')).toEqual([ + expect(await result.current.parseVariable('{{ $user.hasManyField }}').then(({ value }) => value)).toEqual([ { id: 0, name: '$user.hasManyField', @@ -402,7 +431,9 @@ describe('useVariables', () => { }); await waitFor(async () => { - expect(await result.current.parseVariable('{{ $user.hasManyField.hasManyField }}')).toEqual([ + expect( + await result.current.parseVariable('{{ $user.hasManyField.hasManyField }}').then(({ value }) => value), + ).toEqual([ { id: 0, name: '$user.hasManyField.hasManyField', @@ -417,7 +448,7 @@ describe('useVariables', () => { }); await waitFor(async () => { - expect(await result.current.parseVariable('{{ $user.belongsToManyField }}')).toEqual([ + expect(await result.current.parseVariable('{{ $user.belongsToManyField }}').then(({ value }) => value)).toEqual([ { id: 0, name: '$user.belongsToManyField', @@ -608,7 +639,7 @@ describe('useVariables', () => { }); await waitFor(async () => { - expect(await result.current.parseVariable('{{ $new.name }}')).toBe('new variable'); + expect(await result.current.parseVariable('{{ $new.name }}').then(({ value }) => value)).toBe('new variable'); }); }); @@ -627,7 +658,7 @@ describe('useVariables', () => { }); await waitFor(async () => { - expect(await result.current.parseVariable('{{ $new.noExist }}')).toBe(null); + expect(await result.current.parseVariable('{{ $new.noExist }}').then(({ value }) => value)).toBe(null); }); }); @@ -647,7 +678,7 @@ describe('useVariables', () => { }); await waitFor(async () => { - expect(await result.current.parseVariable('{{ $new.noExist }}')).toBe('default value'); + expect(await result.current.parseVariable('{{ $new.noExist }}').then(({ value }) => value)).toBe('default value'); }); }); @@ -667,7 +698,7 @@ describe('useVariables', () => { }); await waitFor(async () => { - expect(await result.current.parseVariable('{{ $new.noExist }}')).toBe(undefined); + expect(await result.current.parseVariable('{{ $new.noExist }}').then(({ value }) => value)).toBe(undefined); }); }); @@ -686,8 +717,30 @@ describe('useVariables', () => { ctx: { name: 'local variable', }, + collectionName: 'local', + dataSource: 'local', }), - ).toBe('local variable'); + ).toEqual({ + value: 'local variable', + dataSource: 'local', + }); + + expect( + await result.current.parseVariable('{{ $local }}', { + name: '$local', + ctx: { + name: 'local variable', + }, + collectionName: 'local', + dataSource: 'local', + }), + ).toEqual({ + value: { + name: 'local variable', + }, + collectionName: 'local', + dataSource: 'local', + }); // 由于 $local 是一个局部变量，所以不会被缓存到 ctx 中 expect(result.current.getVariable('$local')).toBe(null); @@ -703,14 +756,16 @@ describe('useVariables', () => { }); expect( - await result.current.parseVariable('{{ $local.name }}', [ - { - name: '$local', - ctx: { - name: 'local variable', + await result.current + .parseVariable('{{ $local.name }}', [ + { + name: '$local', + ctx: { + name: 'local variable', + }, }, - }, - ]), + ]) + .then(({ value }) => value), ).toBe('local variable'); // 由于 $local 是一个局部变量，所以不会被缓存到 ctx 中 @@ -764,7 +819,9 @@ describe('useVariables', () => { }); await waitFor(async () => { - expect(await result.current.parseVariable('{{ $some.belongsToField.belongsToField }}')).toEqual({ + expect( + await result.current.parseVariable('{{ $some.belongsToField.belongsToField }}').then(({ value }) => value), + ).toEqual({ id: 0, name: '$some.belongsToField.belongsToField', }); @@ -783,7 +840,9 @@ describe('useVariables', () => { await waitFor(async () => { // 只有解析后的值是 undefined 才会使用默认值 - expect(await result.current.parseVariable('{{ $some.belongsToField.belongsToField }}')).toBe(null); + expect( + await result.current.parseVariable('{{ $some.belongsToField.belongsToField }}').then(({ value }) => value), + ).toBe(null); }); // 会覆盖之前的 $some @@ -798,7 +857,9 @@ describe('useVariables', () => { await waitFor(async () => { // 解析后的值是 undefined 所以会返回上面设置的默认值 - expect(await result.current.parseVariable('{{ $some.belongsToField.belongsToField }}')).toBe('default value'); + expect( + await result.current.parseVariable('{{ $some.belongsToField.belongsToField }}').then(({ value }) => value), + ).toBe('default value'); }); }); diff --git a/packages/core/client/src/variables/types.ts b/packages/core/client/src/variables/types.ts index 7387a2806..d02f42fb5 100644 --- a/packages/core/client/src/variables/types.ts +++ b/packages/core/client/src/variables/types.ts @@ -47,7 +47,14 @@ export interface VariablesContextType { /** do not request when the association field is empty */ doNotRequest?: boolean; }, - ) => Promise; + ) => Promise<{ + value: any; + /** + * 当前变量所对应的数据表的名称，如果为空，则表示当前变量是一个普通类型的变量（字符串、数字等） + */ + collectionName?: string; + dataSource?: string; + }>; /** * 注册变量 * @param variableOption 新变量的配置 diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx index 9ca8917bf..181ef1d2b 100644 --- a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx +++ b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx @@ -64,7 +64,7 @@ export const useCustomizeBulkUpdateActionProps = () => { } if (isVariable(value)) { - const result = await variables?.parseVariable(value, localVariables); + const result = await variables?.parseVariable(value, localVariables).then(({ value }) => value); if (result) { assignedValues[key] = transformVariableValue(result, { targetCollectionField: collectionField }); } diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts index 846291c0e..4439919b7 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts @@ -7,10 +7,10 @@ * For more information, please refer to: https://www.nocobase.com/agreement. */ +import { Schema } from '@formily/react'; import { Collection, CollectionFieldInterfaceManager, - CollectionFieldOptions, CollectionManager, SchemaInitializerItemType, i18n, @@ -19,18 +19,16 @@ import { useDataSourceManager, useVariables, } from '@nocobase/client'; +import { flatten, parse, unflatten } from '@nocobase/utils/client'; +import { useMemoizedFn } from 'ahooks'; +import deepmerge from 'deepmerge'; +import { default as _, default as lodash } from 'lodash'; import { useCallback, useContext, useMemo } from 'react'; import { ChartDataContext } from '../block/ChartDataProvider'; -import { Schema } from '@formily/react'; -import { useChartsTranslation } from '../locale'; import { ChartFilterContext } from '../filter/FilterProvider'; -import { useMemoizedFn } from 'ahooks'; -import { flatten, parse, unflatten } from '@nocobase/utils/client'; -import lodash from 'lodash'; -import { getFormulaComponent, getValuesByPath } from '../utils'; -import deepmerge from 'deepmerge'; import { findSchema, getFilterFieldPrefix, parseFilterFieldName } from '../filter/utils'; -import _ from 'lodash'; +import { useChartsTranslation } from '../locale'; +import { getFormulaComponent, getValuesByPath } from '../utils'; export const useCustomFieldInterface = () => { const { getInterface } = useCollectionManager_deprecated(); @@ -420,7 +418,7 @@ export const useChartFilter = () => { if (['$user', '$date', '$nDate', '$nRole', '$nFilter'].some((n) => value.includes(n))) { return value; } - const result = variables?.parseVariable(value); + const result = variables?.parseVariable(value).then(({ value }) => value); return result; }, }); From 3809108afa0ce9fa065b8f7f62d9f2fa4ee9d53e Mon Sep 17 00:00:00 2001 From: Junyi Date: Wed, 28 Aug 2024 14:43:40 +0800 Subject: [PATCH 030/133] feat(plugin-workflow): allow to delete execution in list (#5135) * refactor(plugin-workflow): allow to delete execution in list * fix(plugin-workflow): fix mistake import --- .../src/client/schemas/executions.tsx | 42 ++++++++++++++++++- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/schemas/executions.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/schemas/executions.tsx index 7951fbea4..ef35b4a4c 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/schemas/executions.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/schemas/executions.tsx @@ -13,9 +13,9 @@ import { Link } from 'react-router-dom'; import { useTranslation } from 'react-i18next'; import { message } from 'antd'; -import { useActionContext, useRecord, useResourceActionContext, useResourceContext } from '@nocobase/client'; +import { useActionContext, useResourceActionContext, useResourceContext } from '@nocobase/client'; -import { ExecutionStatusOptions } from '../constants'; +import { ExecutionStatusOptions, EXECUTION_STATUS } from '../constants'; import { NAMESPACE } from '../locale'; import { getWorkflowDetailPath } from '../utils'; @@ -116,6 +116,19 @@ export const executionSchema = { icon: 'ReloadOutlined', }, }, + delete: { + type: 'void', + title: '{{t("Delete")}}', + 'x-component': 'Action', + 'x-component-props': { + icon: 'DeleteOutlined', + useAction: '{{ cm.useBulkDestroyAction }}', + confirm: { + title: "{{t('Delete record')}}", + content: "{{t('Are you sure you want to delete it?')}}", + }, + }, + }, clear: { type: 'void', title: '{{t("Clear")}}', @@ -148,6 +161,9 @@ export const executionSchema = { 'x-component': 'Table.Void', 'x-component-props': { rowKey: 'id', + rowSelection: { + type: 'checkbox', + }, useDataSource: '{{ cm.useDataSourceFromRAC }}', }, properties: { @@ -220,6 +236,28 @@ export const executionSchema = { type: 'void', 'x-component': 'ExecutionLink', }, + delete: { + type: 'void', + title: '{{ t("Delete") }}', + 'x-component': 'Action.Link', + 'x-component-props': { + confirm: { + title: "{{t('Delete record')}}", + content: "{{t('Are you sure you want to delete it?')}}", + }, + useAction: '{{ cm.useDestroyActionAndRefreshCM }}', + }, + 'x-reactions': [ + { + dependencies: ['..status'], + fulfill: { + state: { + visible: `{{ $deps[0] !== ${EXECUTION_STATUS.STARTED} }}`, + }, + }, + }, + ], + }, }, }, }, From fae2205ce14317f331f3d783003ad791a8bc977d Mon Sep 17 00:00:00 2001 From: Zeke Zhang <958414905@qq.com> Date: Wed, 28 Aug 2024 14:50:49 +0800 Subject: [PATCH 031/133] fix(mobile): resovle redirect issue (#5145) * fix(mobile): resovle redirect issue * test: add e2e tests --- .../src/client/__e2e__/redirect.test.ts | 36 +++++++++++++++++++ .../plugin-mobile/src/client/index.tsx | 12 ++++--- 2 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 packages/plugins/@nocobase/plugin-mobile/src/client/__e2e__/redirect.test.ts diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/__e2e__/redirect.test.ts b/packages/plugins/@nocobase/plugin-mobile/src/client/__e2e__/redirect.test.ts new file mode 100644 index 000000000..49a32e01a --- /dev/null +++ b/packages/plugins/@nocobase/plugin-mobile/src/client/__e2e__/redirect.test.ts @@ -0,0 +1,36 @@ +/** + * 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 { devices, expect, test } from '@nocobase/test/e2e'; + +test.use({ + ...devices['Galaxy S9+'], +}); + +test.describe('redirect to other page from mobile', () => { + test('redirect to signin page', async ({ page }) => { + const baseURL = process.env.APP_BASE_URL || `http://localhost:${process.env.APP_PORT || 20000}`; + + await page.goto('/m/signin'); + await page.waitForURL(`${baseURL}/signin`); + expect(page.url()).toBe(`${baseURL}/signin`); + + // do not redirect to mobile page + await page.waitForTimeout(5000); + expect(page.url()).toBe(`${baseURL}/signin`); + }); + + test('redirect to admin page', async ({ page }) => { + const baseURL = process.env.APP_BASE_URL || `http://localhost:${process.env.APP_PORT || 20000}`; + + await page.goto('/m/admin/settings/@nocobase/plugin-api-keys'); + await page.waitForURL(`${baseURL}/admin/settings/@nocobase/plugin-api-keys`); + expect(page.url()).toBe(`${baseURL}/admin/settings/@nocobase/plugin-api-keys`); + }); +}); diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/index.tsx b/packages/plugins/@nocobase/plugin-mobile/src/client/index.tsx index 9c485a5b8..701faf0d6 100644 --- a/packages/plugins/@nocobase/plugin-mobile/src/client/index.tsx +++ b/packages/plugins/@nocobase/plugin-mobile/src/client/index.tsx @@ -179,22 +179,26 @@ export class PluginMobileClient extends Plugin { Component: 'MobileHomePage', }); - // 跳转到主应用的登录页 + // redirect to main app signin page + // e.g. /m/signin => /signin this.mobileRouter.add('signin', { path: '/signin', Component: () => { window.location.href = window.location.href - .replace(this.mobilePath, '') + .replace(this.mobilePath + '/', '/') .replace('redirect=', `redirect=${this.mobilePath}`); return null; }, }); - // 跳转到主应用的页面 + // redirect to main app admin page + // e.g. /m/admin/xxx => /admin/xxx this.mobileRouter.add('admin', { path: `/admin/*`, Component: () => { - window.location.replace(window.location.href.replace(this.mobilePath, '')); + if (window.location.pathname.startsWith(this.mobilePath + '/')) { + window.location.replace(window.location.href.replace(this.mobilePath + '/', '/')); + } return null; }, }); From e45d45015792138e7378741bdaf488de714b365d Mon Sep 17 00:00:00 2001 From: xilesun <2013xile@gmail.com> Date: Wed, 28 Aug 2024 16:13:56 +0800 Subject: [PATCH 032/133] fix(release): pro image ci --- .github/workflows/build-pro-image.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-pro-image.yml b/.github/workflows/build-pro-image.yml index 72edb5ea6..b0f9fe29f 100644 --- a/.github/workflows/build-pro-image.yml +++ b/.github/workflows/build-pro-image.yml @@ -48,13 +48,6 @@ jobs: path: packages/pro-plugins fetch-depth: 0 token: ${{ steps.app-token.outputs.token }} - - name: Clone pro repos - shell: bash - run: | - for repo in ${{ join(fromJSON(vars.PRO_PLUGIN_REPOS), ' ') }} - do - git clone -b main https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/nocobase/$repo.git packages/pro-plugins/@nocobase/$repo - done - run: | cd packages/pro-plugins && if git show-ref --quiet refs/remotes/origin/${{ github.head_ref || github.ref_name }}; then @@ -66,6 +59,13 @@ jobs: git checkout main fi fi + - name: Clone pro repos + shell: bash + run: | + for repo in ${{ join(fromJSON(vars.PRO_PLUGIN_REPOS), ' ') }} + do + git clone -b main https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/nocobase/$repo.git packages/pro-plugins/@nocobase/$repo + done - run: | for repo in ${{ join(fromJSON(vars.PRO_PLUGIN_REPOS), ' ') }} do From e883985c4de5897e264e56d0d08aed020adc5c32 Mon Sep 17 00:00:00 2001 From: Katherine Date: Wed, 28 Aug 2024 16:36:43 +0800 Subject: [PATCH 033/133] fix: association select data scope linkage should be supported in sub-form (#5146) * fix: association select data scope linkage support sub-form * fix: bug --- .../antd/association-field/AssociationSelect.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx b/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx index dee73be25..ee3f7c5ba 100644 --- a/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx @@ -41,7 +41,7 @@ export const filterAnalyses = (filters): any[] => { if (!operator) { return true; } - const regex = /\{\{\$(?:[a-zA-Z_]\w*)\.([a-zA-Z_]\w*)(?:\.id)?\}\}/; + const regex = /\{\{\$[a-zA-Z_]\w*(?:\.[a-zA-Z_]\w*)*\.(\w+)\.id\}\}/; const fieldName = jsonlogic?.value?.match?.(regex)?.[1]; if (fieldName) { results.push(fieldName); From 35e8f89c75800a612db27485c96196555f922273 Mon Sep 17 00:00:00 2001 From: "nocobase[bot]" <179432756+nocobase[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 09:28:11 +0000 Subject: [PATCH 034/133] =?UTF-8?q?chore(versions):=20=F0=9F=98=8A=20publi?= =?UTF-8?q?sh=20v1.3.5-beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lerna.json | 2 +- packages/core/acl/package.json | 6 +- packages/core/actions/package.json | 8 +- packages/core/app/package.json | 10 +- packages/core/auth/package.json | 12 +- packages/core/build/package.json | 2 +- packages/core/cache/package.json | 2 +- packages/core/cli/package.json | 6 +- packages/core/client/package.json | 8 +- .../core/create-nocobase-app/package.json | 2 +- .../core/data-source-manager/package.json | 12 +- packages/core/database/package.json | 6 +- packages/core/devtools/package.json | 8 +- packages/core/evaluators/package.json | 4 +- packages/core/logger/package.json | 2 +- packages/core/resourcer/package.json | 4 +- packages/core/sdk/package.json | 2 +- packages/core/server/package.json | 26 ++-- packages/core/telemetry/package.json | 4 +- packages/core/test/package.json | 4 +- packages/core/utils/package.json | 2 +- .../plugins/@nocobase/plugin-acl/package.json | 2 +- .../plugin-action-bulk-edit/package.json | 2 +- .../plugin-action-bulk-update/package.json | 2 +- .../plugin-action-custom-request/package.json | 2 +- .../plugin-action-duplicate/package.json | 2 +- .../plugin-action-export/package.json | 2 +- .../plugin-action-import/package.json | 2 +- .../plugin-action-print/package.json | 2 +- .../@nocobase/plugin-api-doc/package.json | 2 +- .../@nocobase/plugin-api-keys/package.json | 2 +- .../@nocobase/plugin-audit-logs/package.json | 2 +- .../@nocobase/plugin-auth-sms/package.json | 2 +- .../@nocobase/plugin-auth/package.json | 2 +- .../plugin-backup-restore/package.json | 2 +- .../plugin-block-iframe/package.json | 2 +- .../plugin-block-workbench/package.json | 2 +- .../@nocobase/plugin-calendar/package.json | 2 +- .../@nocobase/plugin-charts/package.json | 2 +- .../@nocobase/plugin-client/package.json | 2 +- .../plugin-collection-sql/package.json | 2 +- .../plugin-collection-tree/package.json | 2 +- .../plugin-data-source-main/package.json | 2 +- .../plugin-data-source-manager/package.json | 2 +- .../plugin-data-visualization/package.json | 2 +- .../plugin-disable-pm-add/package.json | 2 +- .../plugin-error-handler/package.json | 2 +- .../plugin-field-china-region/package.json | 2 +- .../plugin-field-formula/package.json | 2 +- .../plugin-field-m2m-array/package.json | 2 +- .../plugin-field-markdown-vditor/package.json | 2 +- .../plugin-field-sequence/package.json | 2 +- .../plugin-file-manager/package.json | 2 +- .../@nocobase/plugin-gantt/package.json | 2 +- .../package.json | 2 +- .../@nocobase/plugin-kanban/package.json | 2 +- .../plugin-localization/package.json | 2 +- .../@nocobase/plugin-logger/package.json | 2 +- .../plugins/@nocobase/plugin-map/package.json | 2 +- .../plugin-mobile-client/package.json | 2 +- .../@nocobase/plugin-mobile/package.json | 2 +- .../plugin-mock-collections/package.json | 2 +- .../plugin-multi-app-manager/package.json | 2 +- .../package.json | 2 +- .../plugin-notifications/package.json | 2 +- .../plugin-sample-hello/package.json | 2 +- .../plugin-snapshot-field/package.json | 2 +- .../plugin-system-settings/package.json | 2 +- .../plugin-theme-editor/package.json | 2 +- .../plugin-ui-schema-storage/package.json | 2 +- .../@nocobase/plugin-users/package.json | 2 +- .../plugin-verification/package.json | 2 +- .../package.json | 2 +- .../plugin-workflow-aggregate/package.json | 2 +- .../plugin-workflow-delay/package.json | 2 +- .../package.json | 2 +- .../plugin-workflow-loop/package.json | 2 +- .../plugin-workflow-mailer/package.json | 2 +- .../plugin-workflow-manual/package.json | 2 +- .../plugin-workflow-parallel/package.json | 2 +- .../plugin-workflow-request/package.json | 2 +- .../plugin-workflow-sql/package.json | 2 +- .../plugin-workflow-test/package.json | 2 +- .../@nocobase/plugin-workflow/package.json | 4 +- packages/presets/nocobase/package.json | 122 +++++++++--------- 85 files changed, 191 insertions(+), 191 deletions(-) diff --git a/lerna.json b/lerna.json index da0c23ead..48d222585 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.3.4-beta", + "version": "1.3.5-beta", "npmClient": "yarn", "useWorkspaces": true, "npmClientArgs": [ diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json index 36f729288..45d7a7a83 100644 --- a/packages/core/acl/package.json +++ b/packages/core/acl/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/acl", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/resourcer": "1.3.4-beta", - "@nocobase/utils": "1.3.4-beta", + "@nocobase/resourcer": "1.3.5-beta", + "@nocobase/utils": "1.3.5-beta", "minimatch": "^5.1.1" }, "repository": { diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json index a8f2a2aa6..458614776 100644 --- a/packages/core/actions/package.json +++ b/packages/core/actions/package.json @@ -1,14 +1,14 @@ { "name": "@nocobase/actions", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/cache": "1.3.4-beta", - "@nocobase/database": "1.3.4-beta", - "@nocobase/resourcer": "1.3.4-beta" + "@nocobase/cache": "1.3.5-beta", + "@nocobase/database": "1.3.5-beta", + "@nocobase/resourcer": "1.3.5-beta" }, "repository": { "type": "git", diff --git a/packages/core/app/package.json b/packages/core/app/package.json index 568213d8a..54f473e72 100644 --- a/packages/core/app/package.json +++ b/packages/core/app/package.json @@ -1,17 +1,17 @@ { "name": "@nocobase/app", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/database": "1.3.4-beta", - "@nocobase/preset-nocobase": "1.3.4-beta", - "@nocobase/server": "1.3.4-beta" + "@nocobase/database": "1.3.5-beta", + "@nocobase/preset-nocobase": "1.3.5-beta", + "@nocobase/server": "1.3.5-beta" }, "devDependencies": { - "@nocobase/client": "1.3.4-beta" + "@nocobase/client": "1.3.5-beta" }, "repository": { "type": "git", diff --git a/packages/core/auth/package.json b/packages/core/auth/package.json index 82d52f0b1..3ef7f04ba 100644 --- a/packages/core/auth/package.json +++ b/packages/core/auth/package.json @@ -1,16 +1,16 @@ { "name": "@nocobase/auth", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/actions": "1.3.4-beta", - "@nocobase/cache": "1.3.4-beta", - "@nocobase/database": "1.3.4-beta", - "@nocobase/resourcer": "1.3.4-beta", - "@nocobase/utils": "1.3.4-beta", + "@nocobase/actions": "1.3.5-beta", + "@nocobase/cache": "1.3.5-beta", + "@nocobase/database": "1.3.5-beta", + "@nocobase/resourcer": "1.3.5-beta", + "@nocobase/utils": "1.3.5-beta", "@types/jsonwebtoken": "^8.5.8", "jsonwebtoken": "^8.5.1" }, diff --git a/packages/core/build/package.json b/packages/core/build/package.json index 79d0cbc1f..ce9138df4 100644 --- a/packages/core/build/package.json +++ b/packages/core/build/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/build", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "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 df49b1abe..d65de4ce7 100644 --- a/packages/core/cache/package.json +++ b/packages/core/cache/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cache", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json index 099ba8ad6..50157387f 100644 --- a/packages/core/cli/package.json +++ b/packages/core/cli/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cli", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "description": "", "license": "AGPL-3.0", "main": "./src/index.js", @@ -8,7 +8,7 @@ "nocobase": "./bin/index.js" }, "dependencies": { - "@nocobase/app": "1.3.4-beta", + "@nocobase/app": "1.3.5-beta", "@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.4-beta" + "@nocobase/devtools": "1.3.5-beta" }, "repository": { "type": "git", diff --git a/packages/core/client/package.json b/packages/core/client/package.json index 4c881efa4..e928b81bf 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/client", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "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.4-beta", - "@nocobase/sdk": "1.3.4-beta", - "@nocobase/utils": "1.3.4-beta", + "@nocobase/evaluators": "1.3.5-beta", + "@nocobase/sdk": "1.3.5-beta", + "@nocobase/utils": "1.3.5-beta", "ahooks": "^3.7.2", "antd": "^5.12.8", "antd-style": "3.4.5", diff --git a/packages/core/create-nocobase-app/package.json b/packages/core/create-nocobase-app/package.json index ee20ef998..7979b9c40 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.4-beta", + "version": "1.3.5-beta", "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 abfc3869a..046ab1dc8 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.4-beta", + "version": "1.3.5-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/actions": "1.3.4-beta", - "@nocobase/cache": "1.3.4-beta", - "@nocobase/database": "1.3.4-beta", - "@nocobase/resourcer": "1.3.4-beta", - "@nocobase/utils": "1.3.4-beta", + "@nocobase/actions": "1.3.5-beta", + "@nocobase/cache": "1.3.5-beta", + "@nocobase/database": "1.3.5-beta", + "@nocobase/resourcer": "1.3.5-beta", + "@nocobase/utils": "1.3.5-beta", "@types/jsonwebtoken": "^8.5.8", "jsonwebtoken": "^8.5.1" }, diff --git a/packages/core/database/package.json b/packages/core/database/package.json index 41b3b2dfe..5d12d24d7 100644 --- a/packages/core/database/package.json +++ b/packages/core/database/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/database", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { - "@nocobase/logger": "1.3.4-beta", - "@nocobase/utils": "1.3.4-beta", + "@nocobase/logger": "1.3.5-beta", + "@nocobase/utils": "1.3.5-beta", "async-mutex": "^0.3.2", "chalk": "^4.1.1", "cron-parser": "4.4.0", diff --git a/packages/core/devtools/package.json b/packages/core/devtools/package.json index 6027a5038..5d99829a3 100644 --- a/packages/core/devtools/package.json +++ b/packages/core/devtools/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/devtools", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "description": "", "license": "AGPL-3.0", "main": "./src/index.js", "dependencies": { - "@nocobase/build": "1.3.4-beta", - "@nocobase/client": "1.3.4-beta", - "@nocobase/test": "1.3.4-beta", + "@nocobase/build": "1.3.5-beta", + "@nocobase/client": "1.3.5-beta", + "@nocobase/test": "1.3.5-beta", "@types/koa": "^2.13.4", "@types/koa-bodyparser": "^4.3.4", "@types/lodash": "^4.14.177", diff --git a/packages/core/evaluators/package.json b/packages/core/evaluators/package.json index 93c285654..1ecd2a52e 100644 --- a/packages/core/evaluators/package.json +++ b/packages/core/evaluators/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/evaluators", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { "@formulajs/formulajs": "4.2.0", - "@nocobase/utils": "1.3.4-beta", + "@nocobase/utils": "1.3.5-beta", "mathjs": "^10.6.0" }, "repository": { diff --git a/packages/core/logger/package.json b/packages/core/logger/package.json index b31a64810..6aa618577 100644 --- a/packages/core/logger/package.json +++ b/packages/core/logger/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/logger", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "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 de8a7f8aa..2a9aa5e4f 100644 --- a/packages/core/resourcer/package.json +++ b/packages/core/resourcer/package.json @@ -1,12 +1,12 @@ { "name": "@nocobase/resourcer", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { - "@nocobase/utils": "1.3.4-beta", + "@nocobase/utils": "1.3.5-beta", "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 d642b8849..fdcae56dc 100644 --- a/packages/core/sdk/package.json +++ b/packages/core/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/sdk", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "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 3839e29a3..162f9ae8e 100644 --- a/packages/core/server/package.json +++ b/packages/core/server/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/server", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "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.4-beta", - "@nocobase/actions": "1.3.4-beta", - "@nocobase/auth": "1.3.4-beta", - "@nocobase/cache": "1.3.4-beta", - "@nocobase/data-source-manager": "1.3.4-beta", - "@nocobase/database": "1.3.4-beta", - "@nocobase/evaluators": "1.3.4-beta", - "@nocobase/logger": "1.3.4-beta", - "@nocobase/resourcer": "1.3.4-beta", - "@nocobase/sdk": "1.3.4-beta", - "@nocobase/telemetry": "1.3.4-beta", - "@nocobase/utils": "1.3.4-beta", + "@nocobase/acl": "1.3.5-beta", + "@nocobase/actions": "1.3.5-beta", + "@nocobase/auth": "1.3.5-beta", + "@nocobase/cache": "1.3.5-beta", + "@nocobase/data-source-manager": "1.3.5-beta", + "@nocobase/database": "1.3.5-beta", + "@nocobase/evaluators": "1.3.5-beta", + "@nocobase/logger": "1.3.5-beta", + "@nocobase/resourcer": "1.3.5-beta", + "@nocobase/sdk": "1.3.5-beta", + "@nocobase/telemetry": "1.3.5-beta", + "@nocobase/utils": "1.3.5-beta", "@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 31eebd004..f212f23c7 100644 --- a/packages/core/telemetry/package.json +++ b/packages/core/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/telemetry", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "description": "nocobase telemetry library", "license": "AGPL-3.0", "main": "./lib/index.js", @@ -11,7 +11,7 @@ "directory": "packages/telemetry" }, "dependencies": { - "@nocobase/utils": "1.3.4-beta", + "@nocobase/utils": "1.3.5-beta", "@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 eae388866..9102f0c68 100644 --- a/packages/core/test/package.json +++ b/packages/core/test/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/test", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "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.4-beta", + "@nocobase/server": "1.3.5-beta", "@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 a1629a4b8..4229d0519 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/utils", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "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 001d2a481..2749a0de0 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.4-beta", + "version": "1.3.5-beta", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/acl", diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json index 2a532ed0c..f721177cb 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.4-beta", + "version": "1.3.5-beta", "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 c97c10811..fe134cded 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.4-beta", + "version": "1.3.5-beta", "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 dc5974fec..f453dbdda 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.4-beta", + "version": "1.3.5-beta", "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 b9c72566d..1cddc23a0 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.4-beta", + "version": "1.3.5-beta", "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 aa5f54577..b6da38c11 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.4-beta", + "version": "1.3.5-beta", "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 35c1da12d..5cd0edd7f 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.4-beta", + "version": "1.3.5-beta", "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 945dd0906..a300c97d7 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.4-beta", + "version": "1.3.5-beta", "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 65556e405..9daa27048 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.4-beta", + "version": "1.3.5-beta", "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 6f65bf14f..f4418bff6 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.4-beta", + "version": "1.3.5-beta", "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 63c47352c..ad5fba825 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.4-beta", + "version": "1.3.5-beta", "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 86a4ff933..6e1fc3d82 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.4-beta", + "version": "1.3.5-beta", "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 100d88ba2..63ee915fd 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.4-beta", + "version": "1.3.5-beta", "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 500ec9718..a8e6327ad 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.4-beta", + "version": "1.3.5-beta", "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 55be23e1d..8a460f882 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.4-beta", + "version": "1.3.5-beta", "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 a3df6bd97..e2b1d9952 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.4-beta", + "version": "1.3.5-beta", "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 765ca7ef0..c7554527b 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.4-beta", + "version": "1.3.5-beta", "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 763e0ff74..8b7bc3f80 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.4-beta", + "version": "1.3.5-beta", "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 460ddc8e6..6b8b64915 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.4-beta", + "version": "1.3.5-beta", "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 13de87c96..459a1f1e4 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.4-beta", + "version": "1.3.5-beta", "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 c2dddbcd0..aa4fd2cca 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.4-beta", + "version": "1.3.5-beta", "displayName": "Collection: Tree", "displayName.zh-CN": "数据表：树", "description": "Provides tree collection template", diff --git a/packages/plugins/@nocobase/plugin-data-source-main/package.json b/packages/plugins/@nocobase/plugin-data-source-main/package.json index 5f8bc89d2..4b0d55f0a 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.4-beta", + "version": "1.3.5-beta", "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 84c92a79b..18bffd16b 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.4-beta", + "version": "1.3.5-beta", "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 ca93163c3..566fc12c5 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.4-beta", + "version": "1.3.5-beta", "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-disable-pm-add/package.json b/packages/plugins/@nocobase/plugin-disable-pm-add/package.json index b7db62803..54ca137a9 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.4-beta", + "version": "1.3.5-beta", "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 d0e32997f..cbbb0ad65 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.4-beta", + "version": "1.3.5-beta", "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 0481c32be..a4f651eb5 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.4-beta", + "version": "1.3.5-beta", "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 75abce933..e770dce50 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.4-beta", + "version": "1.3.5-beta", "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 4d8247507..3e2fb3c4b 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.4-beta", + "version": "1.3.5-beta", "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 ea1caae67..1990628ab 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.4-beta", + "version": "1.3.5-beta", "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 9a22730cc..d08742261 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.4-beta", + "version": "1.3.5-beta", "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 81e5d076f..d1ff06967 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.4-beta", + "version": "1.3.5-beta", "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 c4f3c185d..98d432807 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.4-beta", + "version": "1.3.5-beta", "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 fa46c0366..47ecb64b1 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.4-beta", + "version": "1.3.5-beta", "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 2f7ca0a52..44250caaf 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.4-beta", + "version": "1.3.5-beta", "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 187595a26..f21845f83 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.4-beta", + "version": "1.3.5-beta", "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 2ac2e52c0..7e3a600a4 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.4-beta", + "version": "1.3.5-beta", "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 972b4d639..026128f7d 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.4-beta", + "version": "1.3.5-beta", "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 24405d25c..33d29918e 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.4-beta", + "version": "1.3.5-beta", "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 efcbd284f..cce451be6 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.4-beta", + "version": "1.3.5-beta", "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-mock-collections/package.json b/packages/plugins/@nocobase/plugin-mock-collections/package.json index ac24260df..7db24747f 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.4-beta", + "version": "1.3.5-beta", "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 aed1eb5a6..dcfbef726 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.4-beta", + "version": "1.3.5-beta", "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 d1f59d756..2c750f788 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.4-beta", + "version": "1.3.5-beta", "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 ae568bf88..f65811e46 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.4-beta", + "version": "1.3.5-beta", "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 b59fefc19..4bd25d970 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.4-beta", + "version": "1.3.5-beta", "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 f05feb5c1..984d5da4f 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.4-beta", + "version": "1.3.5-beta", "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 3782b490f..93d5a66a2 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.4-beta", + "version": "1.3.5-beta", "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 66d8c1b62..6d9e5eee8 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.4-beta", + "version": "1.3.5-beta", "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 7cf42274a..f7ce1d364 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.4-beta", + "version": "1.3.5-beta", "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 a0cef9389..0a6397923 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.4-beta", + "version": "1.3.5-beta", "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 e61f74af0..1e2327ef1 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.4-beta", + "version": "1.3.5-beta", "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 9f3ead335..49b26560e 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.4-beta", + "version": "1.3.5-beta", "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 5342eba84..3fd928335 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.4-beta", + "version": "1.3.5-beta", "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 a104afae5..bee5963b0 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.4-beta", + "version": "1.3.5-beta", "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 04fa5c8e7..5bafc12c3 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.4-beta", + "version": "1.3.5-beta", "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 cad26b257..13fdb5d30 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.4-beta", + "version": "1.3.5-beta", "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 a554145f3..e1d1f4ad6 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.4-beta", + "version": "1.3.5-beta", "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-manual/package.json b/packages/plugins/@nocobase/plugin-workflow-manual/package.json index 2eb5cb0bd..6726eedb2 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.4-beta", + "version": "1.3.5-beta", "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 713b4cbee..ae79b51c0 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.4-beta", + "version": "1.3.5-beta", "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-request/package.json b/packages/plugins/@nocobase/plugin-workflow-request/package.json index 7faabf9f0..97683119b 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.4-beta", + "version": "1.3.5-beta", "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 79ab55062..b40754b1a 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.4-beta", + "version": "1.3.5-beta", "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 5f255be89..752ca2e67 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.4-beta", + "version": "1.3.5-beta", "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 904edd5e6..42e8f3b8a 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.4-beta", + "version": "1.3.5-beta", "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.4-beta" + "@nocobase/plugin-workflow-test": "1.3.5-beta" }, "devDependencies": { "@ant-design/icons": "5.x", diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json index 33a007484..49a148237 100644 --- a/packages/presets/nocobase/package.json +++ b/packages/presets/nocobase/package.json @@ -1,70 +1,70 @@ { "name": "@nocobase/preset-nocobase", - "version": "1.3.4-beta", + "version": "1.3.5-beta", "license": "AGPL-3.0", "main": "./lib/server/index.js", "dependencies": { "@formily/json-schema": "2.x", - "@nocobase/plugin-acl": "1.3.4-beta", - "@nocobase/plugin-action-bulk-edit": "1.3.4-beta", - "@nocobase/plugin-action-bulk-update": "1.3.4-beta", - "@nocobase/plugin-action-custom-request": "1.3.4-beta", - "@nocobase/plugin-action-duplicate": "1.3.4-beta", - "@nocobase/plugin-action-export": "1.3.4-beta", - "@nocobase/plugin-action-import": "1.3.4-beta", - "@nocobase/plugin-action-print": "1.3.4-beta", - "@nocobase/plugin-api-doc": "1.3.4-beta", - "@nocobase/plugin-api-keys": "1.3.4-beta", - "@nocobase/plugin-audit-logs": "1.3.4-beta", - "@nocobase/plugin-auth": "1.3.4-beta", - "@nocobase/plugin-auth-sms": "1.3.4-beta", - "@nocobase/plugin-backup-restore": "1.3.4-beta", - "@nocobase/plugin-block-iframe": "1.3.4-beta", - "@nocobase/plugin-block-workbench": "1.3.4-beta", - "@nocobase/plugin-calendar": "1.3.4-beta", - "@nocobase/plugin-charts": "1.3.4-beta", - "@nocobase/plugin-client": "1.3.4-beta", - "@nocobase/plugin-collection-sql": "1.3.4-beta", - "@nocobase/plugin-collection-tree": "1.3.4-beta", - "@nocobase/plugin-data-source-main": "1.3.4-beta", - "@nocobase/plugin-data-source-manager": "1.3.4-beta", - "@nocobase/plugin-data-visualization": "1.3.4-beta", - "@nocobase/plugin-error-handler": "1.3.4-beta", - "@nocobase/plugin-field-china-region": "1.3.4-beta", - "@nocobase/plugin-field-formula": "1.3.4-beta", - "@nocobase/plugin-field-m2m-array": "1.3.4-beta", - "@nocobase/plugin-field-markdown-vditor": "1.3.4-beta", - "@nocobase/plugin-field-sequence": "1.3.4-beta", - "@nocobase/plugin-file-manager": "1.3.4-beta", - "@nocobase/plugin-gantt": "1.3.4-beta", - "@nocobase/plugin-graph-collection-manager": "1.3.4-beta", - "@nocobase/plugin-kanban": "1.3.4-beta", - "@nocobase/plugin-localization": "1.3.4-beta", - "@nocobase/plugin-logger": "1.3.4-beta", - "@nocobase/plugin-map": "1.3.4-beta", - "@nocobase/plugin-mobile": "1.3.4-beta", - "@nocobase/plugin-mobile-client": "1.3.4-beta", - "@nocobase/plugin-mock-collections": "1.3.4-beta", - "@nocobase/plugin-multi-app-manager": "1.3.4-beta", - "@nocobase/plugin-multi-app-share-collection": "1.3.4-beta", - "@nocobase/plugin-snapshot-field": "1.3.4-beta", - "@nocobase/plugin-system-settings": "1.3.4-beta", - "@nocobase/plugin-theme-editor": "1.3.4-beta", - "@nocobase/plugin-ui-schema-storage": "1.3.4-beta", - "@nocobase/plugin-users": "1.3.4-beta", - "@nocobase/plugin-verification": "1.3.4-beta", - "@nocobase/plugin-workflow": "1.3.4-beta", - "@nocobase/plugin-workflow-action-trigger": "1.3.4-beta", - "@nocobase/plugin-workflow-aggregate": "1.3.4-beta", - "@nocobase/plugin-workflow-delay": "1.3.4-beta", - "@nocobase/plugin-workflow-dynamic-calculation": "1.3.4-beta", - "@nocobase/plugin-workflow-loop": "1.3.4-beta", - "@nocobase/plugin-workflow-mailer": "1.3.4-beta", - "@nocobase/plugin-workflow-manual": "1.3.4-beta", - "@nocobase/plugin-workflow-parallel": "1.3.4-beta", - "@nocobase/plugin-workflow-request": "1.3.4-beta", - "@nocobase/plugin-workflow-sql": "1.3.4-beta", - "@nocobase/server": "1.3.4-beta", + "@nocobase/plugin-acl": "1.3.5-beta", + "@nocobase/plugin-action-bulk-edit": "1.3.5-beta", + "@nocobase/plugin-action-bulk-update": "1.3.5-beta", + "@nocobase/plugin-action-custom-request": "1.3.5-beta", + "@nocobase/plugin-action-duplicate": "1.3.5-beta", + "@nocobase/plugin-action-export": "1.3.5-beta", + "@nocobase/plugin-action-import": "1.3.5-beta", + "@nocobase/plugin-action-print": "1.3.5-beta", + "@nocobase/plugin-api-doc": "1.3.5-beta", + "@nocobase/plugin-api-keys": "1.3.5-beta", + "@nocobase/plugin-audit-logs": "1.3.5-beta", + "@nocobase/plugin-auth": "1.3.5-beta", + "@nocobase/plugin-auth-sms": "1.3.5-beta", + "@nocobase/plugin-backup-restore": "1.3.5-beta", + "@nocobase/plugin-block-iframe": "1.3.5-beta", + "@nocobase/plugin-block-workbench": "1.3.5-beta", + "@nocobase/plugin-calendar": "1.3.5-beta", + "@nocobase/plugin-charts": "1.3.5-beta", + "@nocobase/plugin-client": "1.3.5-beta", + "@nocobase/plugin-collection-sql": "1.3.5-beta", + "@nocobase/plugin-collection-tree": "1.3.5-beta", + "@nocobase/plugin-data-source-main": "1.3.5-beta", + "@nocobase/plugin-data-source-manager": "1.3.5-beta", + "@nocobase/plugin-data-visualization": "1.3.5-beta", + "@nocobase/plugin-error-handler": "1.3.5-beta", + "@nocobase/plugin-field-china-region": "1.3.5-beta", + "@nocobase/plugin-field-formula": "1.3.5-beta", + "@nocobase/plugin-field-m2m-array": "1.3.5-beta", + "@nocobase/plugin-field-markdown-vditor": "1.3.5-beta", + "@nocobase/plugin-field-sequence": "1.3.5-beta", + "@nocobase/plugin-file-manager": "1.3.5-beta", + "@nocobase/plugin-gantt": "1.3.5-beta", + "@nocobase/plugin-graph-collection-manager": "1.3.5-beta", + "@nocobase/plugin-kanban": "1.3.5-beta", + "@nocobase/plugin-localization": "1.3.5-beta", + "@nocobase/plugin-logger": "1.3.5-beta", + "@nocobase/plugin-map": "1.3.5-beta", + "@nocobase/plugin-mobile": "1.3.5-beta", + "@nocobase/plugin-mobile-client": "1.3.5-beta", + "@nocobase/plugin-mock-collections": "1.3.5-beta", + "@nocobase/plugin-multi-app-manager": "1.3.5-beta", + "@nocobase/plugin-multi-app-share-collection": "1.3.5-beta", + "@nocobase/plugin-snapshot-field": "1.3.5-beta", + "@nocobase/plugin-system-settings": "1.3.5-beta", + "@nocobase/plugin-theme-editor": "1.3.5-beta", + "@nocobase/plugin-ui-schema-storage": "1.3.5-beta", + "@nocobase/plugin-users": "1.3.5-beta", + "@nocobase/plugin-verification": "1.3.5-beta", + "@nocobase/plugin-workflow": "1.3.5-beta", + "@nocobase/plugin-workflow-action-trigger": "1.3.5-beta", + "@nocobase/plugin-workflow-aggregate": "1.3.5-beta", + "@nocobase/plugin-workflow-delay": "1.3.5-beta", + "@nocobase/plugin-workflow-dynamic-calculation": "1.3.5-beta", + "@nocobase/plugin-workflow-loop": "1.3.5-beta", + "@nocobase/plugin-workflow-mailer": "1.3.5-beta", + "@nocobase/plugin-workflow-manual": "1.3.5-beta", + "@nocobase/plugin-workflow-parallel": "1.3.5-beta", + "@nocobase/plugin-workflow-request": "1.3.5-beta", + "@nocobase/plugin-workflow-sql": "1.3.5-beta", + "@nocobase/server": "1.3.5-beta", "cronstrue": "^2.11.0" }, "repository": { From cfbc2a6c15a5dfb8c0684051df1cf01499ff30ac Mon Sep 17 00:00:00 2001 From: "nocobase[bot]" <179432756+nocobase[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 09:28:17 +0000 Subject: [PATCH 035/133] chore: update changelog --- CHANGELOG.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6852cb0e..5999af93d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,26 @@ 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.5-beta](https://github.com/nocobase/nocobase/compare/v1.3.4-beta...v1.3.5-beta) - 2024-08-28 + +### Merged + +- fix: association select data scope linkage should be supported in sub-form [`#5146`](https://github.com/nocobase/nocobase/pull/5146) +- fix(mobile): resovle redirect issue [`#5145`](https://github.com/nocobase/nocobase/pull/5145) +- feat(plugin-workflow): allow to delete execution in list [`#5135`](https://github.com/nocobase/nocobase/pull/5135) +- fix(defaultValue): ignores variable values that do not match the current field [`#5122`](https://github.com/nocobase/nocobase/pull/5122) +- chore(deps-dev): bump eslint-plugin-jest-dom from 5.1.0 to 5.4.0 [`#5138`](https://github.com/nocobase/nocobase/pull/5138) +- chore(deps): bump @ant-design/pro-layout from 7.17.16 to 7.19.12 [`#5137`](https://github.com/nocobase/nocobase/pull/5137) +- fix(template): fix error on form block submission [`#5133`](https://github.com/nocobase/nocobase/pull/5133) +- feat: add support for opening via URL [`#5098`](https://github.com/nocobase/nocobase/pull/5098) +- fix(release): decrypt token error occasionally [`#5143`](https://github.com/nocobase/nocobase/pull/5143) + +### Commits + +- chore(versions): 😊 publish v1.3.5-beta [`35e8f89`](https://github.com/nocobase/nocobase/commit/35e8f89c75800a612db27485c96196555f922273) +- Revert "chore(deps): bump @ant-design/pro-layout from 7.17.16 to 7.19.12 (#5137)" [`3f461ad`](https://github.com/nocobase/nocobase/commit/3f461ad8f079b4c2cf5975c1e26271f55021e08a) +- fix(release): pro image ci [`e45d450`](https://github.com/nocobase/nocobase/commit/e45d45015792138e7378741bdaf488de714b365d) + ## [v1.3.4-beta](https://github.com/nocobase/nocobase/compare/v1.3.3-beta...v1.3.4-beta) - 2024-08-27 ### Merged From 8beb8dbc3e6407ca13be4b2ddc6dcc1e8c5c5a2c Mon Sep 17 00:00:00 2001 From: Katherine Date: Thu, 29 Aug 2024 11:54:20 +0800 Subject: [PATCH 036/133] fix: association select data scope linkage should support edit form (#5149) --- .../antd/association-field/AssociationSelect.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx b/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx index ee3f7c5ba..89bb046ad 100644 --- a/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx @@ -80,8 +80,8 @@ const InternalAssociationSelect = observer( onFieldInputValueChange('*', (fieldPath: any) => { const linkageFields = filterAnalyses(field.componentProps?.service?.params?.filter) || []; if (linkageFields.includes(fieldPath?.props?.name) && field.value) { - field.setValue(field.initialValue); - setInnerValue(field.initialValue); + field.setValue(undefined); + setInnerValue(undefined); } }); }); From 39c7ce4741801819b98970b95c1663915a8c3bff Mon Sep 17 00:00:00 2001 From: "nocobase[bot]" <179432756+nocobase[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 06:01:24 +0000 Subject: [PATCH 037/133] =?UTF-8?q?chore(versions):=20=F0=9F=98=8A=20publi?= =?UTF-8?q?sh=20v1.3.6-beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lerna.json | 2 +- packages/core/acl/package.json | 6 +- packages/core/actions/package.json | 8 +- packages/core/app/package.json | 10 +- packages/core/auth/package.json | 12 +- packages/core/build/package.json | 2 +- packages/core/cache/package.json | 2 +- packages/core/cli/package.json | 6 +- packages/core/client/package.json | 8 +- .../core/create-nocobase-app/package.json | 2 +- .../core/data-source-manager/package.json | 12 +- packages/core/database/package.json | 6 +- packages/core/devtools/package.json | 8 +- packages/core/evaluators/package.json | 4 +- packages/core/logger/package.json | 2 +- packages/core/resourcer/package.json | 4 +- packages/core/sdk/package.json | 2 +- packages/core/server/package.json | 26 ++-- packages/core/telemetry/package.json | 4 +- packages/core/test/package.json | 4 +- packages/core/utils/package.json | 2 +- .../plugins/@nocobase/plugin-acl/package.json | 2 +- .../plugin-action-bulk-edit/package.json | 2 +- .../plugin-action-bulk-update/package.json | 2 +- .../plugin-action-custom-request/package.json | 2 +- .../plugin-action-duplicate/package.json | 2 +- .../plugin-action-export/package.json | 2 +- .../plugin-action-import/package.json | 2 +- .../plugin-action-print/package.json | 2 +- .../@nocobase/plugin-api-doc/package.json | 2 +- .../@nocobase/plugin-api-keys/package.json | 2 +- .../@nocobase/plugin-audit-logs/package.json | 2 +- .../@nocobase/plugin-auth-sms/package.json | 2 +- .../@nocobase/plugin-auth/package.json | 2 +- .../plugin-backup-restore/package.json | 2 +- .../plugin-block-iframe/package.json | 2 +- .../plugin-block-workbench/package.json | 2 +- .../@nocobase/plugin-calendar/package.json | 2 +- .../@nocobase/plugin-charts/package.json | 2 +- .../@nocobase/plugin-client/package.json | 2 +- .../plugin-collection-sql/package.json | 2 +- .../plugin-collection-tree/package.json | 2 +- .../plugin-data-source-main/package.json | 2 +- .../plugin-data-source-manager/package.json | 2 +- .../plugin-data-visualization/package.json | 2 +- .../plugin-disable-pm-add/package.json | 2 +- .../plugin-error-handler/package.json | 2 +- .../plugin-field-china-region/package.json | 2 +- .../plugin-field-formula/package.json | 2 +- .../plugin-field-m2m-array/package.json | 2 +- .../plugin-field-markdown-vditor/package.json | 2 +- .../plugin-field-sequence/package.json | 2 +- .../plugin-file-manager/package.json | 2 +- .../@nocobase/plugin-gantt/package.json | 2 +- .../package.json | 2 +- .../@nocobase/plugin-kanban/package.json | 2 +- .../plugin-localization/package.json | 2 +- .../@nocobase/plugin-logger/package.json | 2 +- .../plugins/@nocobase/plugin-map/package.json | 2 +- .../plugin-mobile-client/package.json | 2 +- .../@nocobase/plugin-mobile/package.json | 2 +- .../plugin-mock-collections/package.json | 2 +- .../plugin-multi-app-manager/package.json | 2 +- .../package.json | 2 +- .../plugin-notifications/package.json | 2 +- .../plugin-sample-hello/package.json | 2 +- .../plugin-snapshot-field/package.json | 2 +- .../plugin-system-settings/package.json | 2 +- .../plugin-theme-editor/package.json | 2 +- .../plugin-ui-schema-storage/package.json | 2 +- .../@nocobase/plugin-users/package.json | 2 +- .../plugin-verification/package.json | 2 +- .../package.json | 2 +- .../plugin-workflow-aggregate/package.json | 2 +- .../plugin-workflow-delay/package.json | 2 +- .../package.json | 2 +- .../plugin-workflow-loop/package.json | 2 +- .../plugin-workflow-mailer/package.json | 2 +- .../plugin-workflow-manual/package.json | 2 +- .../plugin-workflow-parallel/package.json | 2 +- .../plugin-workflow-request/package.json | 2 +- .../plugin-workflow-sql/package.json | 2 +- .../plugin-workflow-test/package.json | 2 +- .../@nocobase/plugin-workflow/package.json | 4 +- packages/presets/nocobase/package.json | 122 +++++++++--------- 85 files changed, 191 insertions(+), 191 deletions(-) diff --git a/lerna.json b/lerna.json index 48d222585..89432919f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.3.5-beta", + "version": "1.3.6-beta", "npmClient": "yarn", "useWorkspaces": true, "npmClientArgs": [ diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json index 45d7a7a83..6ae66f0f1 100644 --- a/packages/core/acl/package.json +++ b/packages/core/acl/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/acl", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/resourcer": "1.3.5-beta", - "@nocobase/utils": "1.3.5-beta", + "@nocobase/resourcer": "1.3.6-beta", + "@nocobase/utils": "1.3.6-beta", "minimatch": "^5.1.1" }, "repository": { diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json index 458614776..2656cf46a 100644 --- a/packages/core/actions/package.json +++ b/packages/core/actions/package.json @@ -1,14 +1,14 @@ { "name": "@nocobase/actions", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/cache": "1.3.5-beta", - "@nocobase/database": "1.3.5-beta", - "@nocobase/resourcer": "1.3.5-beta" + "@nocobase/cache": "1.3.6-beta", + "@nocobase/database": "1.3.6-beta", + "@nocobase/resourcer": "1.3.6-beta" }, "repository": { "type": "git", diff --git a/packages/core/app/package.json b/packages/core/app/package.json index 54f473e72..596cf9691 100644 --- a/packages/core/app/package.json +++ b/packages/core/app/package.json @@ -1,17 +1,17 @@ { "name": "@nocobase/app", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/database": "1.3.5-beta", - "@nocobase/preset-nocobase": "1.3.5-beta", - "@nocobase/server": "1.3.5-beta" + "@nocobase/database": "1.3.6-beta", + "@nocobase/preset-nocobase": "1.3.6-beta", + "@nocobase/server": "1.3.6-beta" }, "devDependencies": { - "@nocobase/client": "1.3.5-beta" + "@nocobase/client": "1.3.6-beta" }, "repository": { "type": "git", diff --git a/packages/core/auth/package.json b/packages/core/auth/package.json index 3ef7f04ba..224828090 100644 --- a/packages/core/auth/package.json +++ b/packages/core/auth/package.json @@ -1,16 +1,16 @@ { "name": "@nocobase/auth", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/actions": "1.3.5-beta", - "@nocobase/cache": "1.3.5-beta", - "@nocobase/database": "1.3.5-beta", - "@nocobase/resourcer": "1.3.5-beta", - "@nocobase/utils": "1.3.5-beta", + "@nocobase/actions": "1.3.6-beta", + "@nocobase/cache": "1.3.6-beta", + "@nocobase/database": "1.3.6-beta", + "@nocobase/resourcer": "1.3.6-beta", + "@nocobase/utils": "1.3.6-beta", "@types/jsonwebtoken": "^8.5.8", "jsonwebtoken": "^8.5.1" }, diff --git a/packages/core/build/package.json b/packages/core/build/package.json index ce9138df4..b2d195f01 100644 --- a/packages/core/build/package.json +++ b/packages/core/build/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/build", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "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 d65de4ce7..1b60d0c62 100644 --- a/packages/core/cache/package.json +++ b/packages/core/cache/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cache", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json index 50157387f..134003998 100644 --- a/packages/core/cli/package.json +++ b/packages/core/cli/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cli", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "description": "", "license": "AGPL-3.0", "main": "./src/index.js", @@ -8,7 +8,7 @@ "nocobase": "./bin/index.js" }, "dependencies": { - "@nocobase/app": "1.3.5-beta", + "@nocobase/app": "1.3.6-beta", "@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.5-beta" + "@nocobase/devtools": "1.3.6-beta" }, "repository": { "type": "git", diff --git a/packages/core/client/package.json b/packages/core/client/package.json index e928b81bf..03a3f7638 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/client", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "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.5-beta", - "@nocobase/sdk": "1.3.5-beta", - "@nocobase/utils": "1.3.5-beta", + "@nocobase/evaluators": "1.3.6-beta", + "@nocobase/sdk": "1.3.6-beta", + "@nocobase/utils": "1.3.6-beta", "ahooks": "^3.7.2", "antd": "^5.12.8", "antd-style": "3.4.5", diff --git a/packages/core/create-nocobase-app/package.json b/packages/core/create-nocobase-app/package.json index 7979b9c40..2c0bf9009 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.5-beta", + "version": "1.3.6-beta", "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 046ab1dc8..c9ec67cf5 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.5-beta", + "version": "1.3.6-beta", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/actions": "1.3.5-beta", - "@nocobase/cache": "1.3.5-beta", - "@nocobase/database": "1.3.5-beta", - "@nocobase/resourcer": "1.3.5-beta", - "@nocobase/utils": "1.3.5-beta", + "@nocobase/actions": "1.3.6-beta", + "@nocobase/cache": "1.3.6-beta", + "@nocobase/database": "1.3.6-beta", + "@nocobase/resourcer": "1.3.6-beta", + "@nocobase/utils": "1.3.6-beta", "@types/jsonwebtoken": "^8.5.8", "jsonwebtoken": "^8.5.1" }, diff --git a/packages/core/database/package.json b/packages/core/database/package.json index 5d12d24d7..987d5c3e3 100644 --- a/packages/core/database/package.json +++ b/packages/core/database/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/database", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { - "@nocobase/logger": "1.3.5-beta", - "@nocobase/utils": "1.3.5-beta", + "@nocobase/logger": "1.3.6-beta", + "@nocobase/utils": "1.3.6-beta", "async-mutex": "^0.3.2", "chalk": "^4.1.1", "cron-parser": "4.4.0", diff --git a/packages/core/devtools/package.json b/packages/core/devtools/package.json index 5d99829a3..afe2e068f 100644 --- a/packages/core/devtools/package.json +++ b/packages/core/devtools/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/devtools", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "description": "", "license": "AGPL-3.0", "main": "./src/index.js", "dependencies": { - "@nocobase/build": "1.3.5-beta", - "@nocobase/client": "1.3.5-beta", - "@nocobase/test": "1.3.5-beta", + "@nocobase/build": "1.3.6-beta", + "@nocobase/client": "1.3.6-beta", + "@nocobase/test": "1.3.6-beta", "@types/koa": "^2.13.4", "@types/koa-bodyparser": "^4.3.4", "@types/lodash": "^4.14.177", diff --git a/packages/core/evaluators/package.json b/packages/core/evaluators/package.json index 1ecd2a52e..7cad3c1f1 100644 --- a/packages/core/evaluators/package.json +++ b/packages/core/evaluators/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/evaluators", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { "@formulajs/formulajs": "4.2.0", - "@nocobase/utils": "1.3.5-beta", + "@nocobase/utils": "1.3.6-beta", "mathjs": "^10.6.0" }, "repository": { diff --git a/packages/core/logger/package.json b/packages/core/logger/package.json index 6aa618577..7b3179f28 100644 --- a/packages/core/logger/package.json +++ b/packages/core/logger/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/logger", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "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 2a9aa5e4f..2747ed548 100644 --- a/packages/core/resourcer/package.json +++ b/packages/core/resourcer/package.json @@ -1,12 +1,12 @@ { "name": "@nocobase/resourcer", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", "license": "AGPL-3.0", "dependencies": { - "@nocobase/utils": "1.3.5-beta", + "@nocobase/utils": "1.3.6-beta", "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 fdcae56dc..d6cc7376c 100644 --- a/packages/core/sdk/package.json +++ b/packages/core/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/sdk", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "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 162f9ae8e..40d49c17c 100644 --- a/packages/core/server/package.json +++ b/packages/core/server/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/server", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "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.5-beta", - "@nocobase/actions": "1.3.5-beta", - "@nocobase/auth": "1.3.5-beta", - "@nocobase/cache": "1.3.5-beta", - "@nocobase/data-source-manager": "1.3.5-beta", - "@nocobase/database": "1.3.5-beta", - "@nocobase/evaluators": "1.3.5-beta", - "@nocobase/logger": "1.3.5-beta", - "@nocobase/resourcer": "1.3.5-beta", - "@nocobase/sdk": "1.3.5-beta", - "@nocobase/telemetry": "1.3.5-beta", - "@nocobase/utils": "1.3.5-beta", + "@nocobase/acl": "1.3.6-beta", + "@nocobase/actions": "1.3.6-beta", + "@nocobase/auth": "1.3.6-beta", + "@nocobase/cache": "1.3.6-beta", + "@nocobase/data-source-manager": "1.3.6-beta", + "@nocobase/database": "1.3.6-beta", + "@nocobase/evaluators": "1.3.6-beta", + "@nocobase/logger": "1.3.6-beta", + "@nocobase/resourcer": "1.3.6-beta", + "@nocobase/sdk": "1.3.6-beta", + "@nocobase/telemetry": "1.3.6-beta", + "@nocobase/utils": "1.3.6-beta", "@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 f212f23c7..5c15a667f 100644 --- a/packages/core/telemetry/package.json +++ b/packages/core/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/telemetry", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "description": "nocobase telemetry library", "license": "AGPL-3.0", "main": "./lib/index.js", @@ -11,7 +11,7 @@ "directory": "packages/telemetry" }, "dependencies": { - "@nocobase/utils": "1.3.5-beta", + "@nocobase/utils": "1.3.6-beta", "@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 9102f0c68..c3c83b319 100644 --- a/packages/core/test/package.json +++ b/packages/core/test/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/test", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "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.5-beta", + "@nocobase/server": "1.3.6-beta", "@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 4229d0519..cde870ad9 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/utils", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "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 2749a0de0..c898fab8d 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.5-beta", + "version": "1.3.6-beta", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/acl", diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json index f721177cb..179d2bdac 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.5-beta", + "version": "1.3.6-beta", "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 fe134cded..342b162a6 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.5-beta", + "version": "1.3.6-beta", "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 f453dbdda..45d514a34 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.5-beta", + "version": "1.3.6-beta", "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 1cddc23a0..389bec2e6 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.5-beta", + "version": "1.3.6-beta", "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 b6da38c11..dc312d591 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.5-beta", + "version": "1.3.6-beta", "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 5cd0edd7f..8eb499b7a 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.5-beta", + "version": "1.3.6-beta", "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 a300c97d7..0cce2af94 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.5-beta", + "version": "1.3.6-beta", "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 9daa27048..ae1f2befa 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.5-beta", + "version": "1.3.6-beta", "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 f4418bff6..7ee74bee7 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.5-beta", + "version": "1.3.6-beta", "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 ad5fba825..6ecfa4e13 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.5-beta", + "version": "1.3.6-beta", "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 6e1fc3d82..9b52ed1cf 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.5-beta", + "version": "1.3.6-beta", "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 63ee915fd..d1d957dbf 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.5-beta", + "version": "1.3.6-beta", "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 a8e6327ad..cab76868d 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.5-beta", + "version": "1.3.6-beta", "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 8a460f882..f8346bba8 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.5-beta", + "version": "1.3.6-beta", "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 e2b1d9952..a6a2ae7e2 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.5-beta", + "version": "1.3.6-beta", "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 c7554527b..71b8616d9 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.5-beta", + "version": "1.3.6-beta", "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 8b7bc3f80..20c92e763 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.5-beta", + "version": "1.3.6-beta", "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 6b8b64915..bb8cefb85 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.5-beta", + "version": "1.3.6-beta", "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 459a1f1e4..fd81b1e33 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.5-beta", + "version": "1.3.6-beta", "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 aa4fd2cca..e4d4ab996 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.5-beta", + "version": "1.3.6-beta", "displayName": "Collection: Tree", "displayName.zh-CN": "数据表：树", "description": "Provides tree collection template", diff --git a/packages/plugins/@nocobase/plugin-data-source-main/package.json b/packages/plugins/@nocobase/plugin-data-source-main/package.json index 4b0d55f0a..dffd6c636 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.5-beta", + "version": "1.3.6-beta", "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 18bffd16b..6d465b2ce 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.5-beta", + "version": "1.3.6-beta", "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 566fc12c5..4136d118d 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.5-beta", + "version": "1.3.6-beta", "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-disable-pm-add/package.json b/packages/plugins/@nocobase/plugin-disable-pm-add/package.json index 54ca137a9..ccf364c3c 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.5-beta", + "version": "1.3.6-beta", "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 cbbb0ad65..a39076051 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.5-beta", + "version": "1.3.6-beta", "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 a4f651eb5..7272ee590 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.5-beta", + "version": "1.3.6-beta", "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 e770dce50..f5d2be58a 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.5-beta", + "version": "1.3.6-beta", "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 3e2fb3c4b..28f63979c 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.5-beta", + "version": "1.3.6-beta", "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 1990628ab..e51facac4 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.5-beta", + "version": "1.3.6-beta", "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 d08742261..cb6128a94 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.5-beta", + "version": "1.3.6-beta", "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 d1ff06967..17ecedef7 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.5-beta", + "version": "1.3.6-beta", "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 98d432807..5ceeea795 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.5-beta", + "version": "1.3.6-beta", "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 47ecb64b1..d292b4f01 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.5-beta", + "version": "1.3.6-beta", "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 44250caaf..63f5b7f11 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.5-beta", + "version": "1.3.6-beta", "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 f21845f83..4c6f90c8a 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.5-beta", + "version": "1.3.6-beta", "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 7e3a600a4..587bee47e 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.5-beta", + "version": "1.3.6-beta", "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 026128f7d..2662f621a 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.5-beta", + "version": "1.3.6-beta", "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 33d29918e..7bfdf557d 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.5-beta", + "version": "1.3.6-beta", "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 cce451be6..e13b38e50 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.5-beta", + "version": "1.3.6-beta", "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-mock-collections/package.json b/packages/plugins/@nocobase/plugin-mock-collections/package.json index 7db24747f..5c1594a35 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.5-beta", + "version": "1.3.6-beta", "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 dcfbef726..60edaa941 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.5-beta", + "version": "1.3.6-beta", "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 2c750f788..19ae2d399 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.5-beta", + "version": "1.3.6-beta", "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 f65811e46..35a4a1ac1 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.5-beta", + "version": "1.3.6-beta", "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 4bd25d970..1e7f069f4 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.5-beta", + "version": "1.3.6-beta", "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 984d5da4f..693eacab2 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.5-beta", + "version": "1.3.6-beta", "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 93d5a66a2..663abaa20 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.5-beta", + "version": "1.3.6-beta", "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 6d9e5eee8..8975e451c 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.5-beta", + "version": "1.3.6-beta", "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 f7ce1d364..95ab94d54 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.5-beta", + "version": "1.3.6-beta", "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 0a6397923..862938c28 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.5-beta", + "version": "1.3.6-beta", "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 1e2327ef1..fdfd0e011 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.5-beta", + "version": "1.3.6-beta", "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 49b26560e..6e1b48bc5 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.5-beta", + "version": "1.3.6-beta", "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 3fd928335..28b6fe3fc 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.5-beta", + "version": "1.3.6-beta", "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 bee5963b0..6a68fd13e 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.5-beta", + "version": "1.3.6-beta", "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 5bafc12c3..67d63c5dc 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.5-beta", + "version": "1.3.6-beta", "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 13fdb5d30..a5e97a38e 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.5-beta", + "version": "1.3.6-beta", "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 e1d1f4ad6..323432bfb 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.5-beta", + "version": "1.3.6-beta", "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-manual/package.json b/packages/plugins/@nocobase/plugin-workflow-manual/package.json index 6726eedb2..e1d6f1f85 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.5-beta", + "version": "1.3.6-beta", "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 ae79b51c0..cf14c14e5 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.5-beta", + "version": "1.3.6-beta", "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-request/package.json b/packages/plugins/@nocobase/plugin-workflow-request/package.json index 97683119b..fecbff53e 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.5-beta", + "version": "1.3.6-beta", "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 b40754b1a..6a211a8db 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.5-beta", + "version": "1.3.6-beta", "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 752ca2e67..706bd10a0 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.5-beta", + "version": "1.3.6-beta", "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 42e8f3b8a..b8436ab27 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.5-beta", + "version": "1.3.6-beta", "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.5-beta" + "@nocobase/plugin-workflow-test": "1.3.6-beta" }, "devDependencies": { "@ant-design/icons": "5.x", diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json index 49a148237..94524d31c 100644 --- a/packages/presets/nocobase/package.json +++ b/packages/presets/nocobase/package.json @@ -1,70 +1,70 @@ { "name": "@nocobase/preset-nocobase", - "version": "1.3.5-beta", + "version": "1.3.6-beta", "license": "AGPL-3.0", "main": "./lib/server/index.js", "dependencies": { "@formily/json-schema": "2.x", - "@nocobase/plugin-acl": "1.3.5-beta", - "@nocobase/plugin-action-bulk-edit": "1.3.5-beta", - "@nocobase/plugin-action-bulk-update": "1.3.5-beta", - "@nocobase/plugin-action-custom-request": "1.3.5-beta", - "@nocobase/plugin-action-duplicate": "1.3.5-beta", - "@nocobase/plugin-action-export": "1.3.5-beta", - "@nocobase/plugin-action-import": "1.3.5-beta", - "@nocobase/plugin-action-print": "1.3.5-beta", - "@nocobase/plugin-api-doc": "1.3.5-beta", - "@nocobase/plugin-api-keys": "1.3.5-beta", - "@nocobase/plugin-audit-logs": "1.3.5-beta", - "@nocobase/plugin-auth": "1.3.5-beta", - "@nocobase/plugin-auth-sms": "1.3.5-beta", - "@nocobase/plugin-backup-restore": "1.3.5-beta", - "@nocobase/plugin-block-iframe": "1.3.5-beta", - "@nocobase/plugin-block-workbench": "1.3.5-beta", - "@nocobase/plugin-calendar": "1.3.5-beta", - "@nocobase/plugin-charts": "1.3.5-beta", - "@nocobase/plugin-client": "1.3.5-beta", - "@nocobase/plugin-collection-sql": "1.3.5-beta", - "@nocobase/plugin-collection-tree": "1.3.5-beta", - "@nocobase/plugin-data-source-main": "1.3.5-beta", - "@nocobase/plugin-data-source-manager": "1.3.5-beta", - "@nocobase/plugin-data-visualization": "1.3.5-beta", - "@nocobase/plugin-error-handler": "1.3.5-beta", - "@nocobase/plugin-field-china-region": "1.3.5-beta", - "@nocobase/plugin-field-formula": "1.3.5-beta", - "@nocobase/plugin-field-m2m-array": "1.3.5-beta", - "@nocobase/plugin-field-markdown-vditor": "1.3.5-beta", - "@nocobase/plugin-field-sequence": "1.3.5-beta", - "@nocobase/plugin-file-manager": "1.3.5-beta", - "@nocobase/plugin-gantt": "1.3.5-beta", - "@nocobase/plugin-graph-collection-manager": "1.3.5-beta", - "@nocobase/plugin-kanban": "1.3.5-beta", - "@nocobase/plugin-localization": "1.3.5-beta", - "@nocobase/plugin-logger": "1.3.5-beta", - "@nocobase/plugin-map": "1.3.5-beta", - "@nocobase/plugin-mobile": "1.3.5-beta", - "@nocobase/plugin-mobile-client": "1.3.5-beta", - "@nocobase/plugin-mock-collections": "1.3.5-beta", - "@nocobase/plugin-multi-app-manager": "1.3.5-beta", - "@nocobase/plugin-multi-app-share-collection": "1.3.5-beta", - "@nocobase/plugin-snapshot-field": "1.3.5-beta", - "@nocobase/plugin-system-settings": "1.3.5-beta", - "@nocobase/plugin-theme-editor": "1.3.5-beta", - "@nocobase/plugin-ui-schema-storage": "1.3.5-beta", - "@nocobase/plugin-users": "1.3.5-beta", - "@nocobase/plugin-verification": "1.3.5-beta", - "@nocobase/plugin-workflow": "1.3.5-beta", - "@nocobase/plugin-workflow-action-trigger": "1.3.5-beta", - "@nocobase/plugin-workflow-aggregate": "1.3.5-beta", - "@nocobase/plugin-workflow-delay": "1.3.5-beta", - "@nocobase/plugin-workflow-dynamic-calculation": "1.3.5-beta", - "@nocobase/plugin-workflow-loop": "1.3.5-beta", - "@nocobase/plugin-workflow-mailer": "1.3.5-beta", - "@nocobase/plugin-workflow-manual": "1.3.5-beta", - "@nocobase/plugin-workflow-parallel": "1.3.5-beta", - "@nocobase/plugin-workflow-request": "1.3.5-beta", - "@nocobase/plugin-workflow-sql": "1.3.5-beta", - "@nocobase/server": "1.3.5-beta", + "@nocobase/plugin-acl": "1.3.6-beta", + "@nocobase/plugin-action-bulk-edit": "1.3.6-beta", + "@nocobase/plugin-action-bulk-update": "1.3.6-beta", + "@nocobase/plugin-action-custom-request": "1.3.6-beta", + "@nocobase/plugin-action-duplicate": "1.3.6-beta", + "@nocobase/plugin-action-export": "1.3.6-beta", + "@nocobase/plugin-action-import": "1.3.6-beta", + "@nocobase/plugin-action-print": "1.3.6-beta", + "@nocobase/plugin-api-doc": "1.3.6-beta", + "@nocobase/plugin-api-keys": "1.3.6-beta", + "@nocobase/plugin-audit-logs": "1.3.6-beta", + "@nocobase/plugin-auth": "1.3.6-beta", + "@nocobase/plugin-auth-sms": "1.3.6-beta", + "@nocobase/plugin-backup-restore": "1.3.6-beta", + "@nocobase/plugin-block-iframe": "1.3.6-beta", + "@nocobase/plugin-block-workbench": "1.3.6-beta", + "@nocobase/plugin-calendar": "1.3.6-beta", + "@nocobase/plugin-charts": "1.3.6-beta", + "@nocobase/plugin-client": "1.3.6-beta", + "@nocobase/plugin-collection-sql": "1.3.6-beta", + "@nocobase/plugin-collection-tree": "1.3.6-beta", + "@nocobase/plugin-data-source-main": "1.3.6-beta", + "@nocobase/plugin-data-source-manager": "1.3.6-beta", + "@nocobase/plugin-data-visualization": "1.3.6-beta", + "@nocobase/plugin-error-handler": "1.3.6-beta", + "@nocobase/plugin-field-china-region": "1.3.6-beta", + "@nocobase/plugin-field-formula": "1.3.6-beta", + "@nocobase/plugin-field-m2m-array": "1.3.6-beta", + "@nocobase/plugin-field-markdown-vditor": "1.3.6-beta", + "@nocobase/plugin-field-sequence": "1.3.6-beta", + "@nocobase/plugin-file-manager": "1.3.6-beta", + "@nocobase/plugin-gantt": "1.3.6-beta", + "@nocobase/plugin-graph-collection-manager": "1.3.6-beta", + "@nocobase/plugin-kanban": "1.3.6-beta", + "@nocobase/plugin-localization": "1.3.6-beta", + "@nocobase/plugin-logger": "1.3.6-beta", + "@nocobase/plugin-map": "1.3.6-beta", + "@nocobase/plugin-mobile": "1.3.6-beta", + "@nocobase/plugin-mobile-client": "1.3.6-beta", + "@nocobase/plugin-mock-collections": "1.3.6-beta", + "@nocobase/plugin-multi-app-manager": "1.3.6-beta", + "@nocobase/plugin-multi-app-share-collection": "1.3.6-beta", + "@nocobase/plugin-snapshot-field": "1.3.6-beta", + "@nocobase/plugin-system-settings": "1.3.6-beta", + "@nocobase/plugin-theme-editor": "1.3.6-beta", + "@nocobase/plugin-ui-schema-storage": "1.3.6-beta", + "@nocobase/plugin-users": "1.3.6-beta", + "@nocobase/plugin-verification": "1.3.6-beta", + "@nocobase/plugin-workflow": "1.3.6-beta", + "@nocobase/plugin-workflow-action-trigger": "1.3.6-beta", + "@nocobase/plugin-workflow-aggregate": "1.3.6-beta", + "@nocobase/plugin-workflow-delay": "1.3.6-beta", + "@nocobase/plugin-workflow-dynamic-calculation": "1.3.6-beta", + "@nocobase/plugin-workflow-loop": "1.3.6-beta", + "@nocobase/plugin-workflow-mailer": "1.3.6-beta", + "@nocobase/plugin-workflow-manual": "1.3.6-beta", + "@nocobase/plugin-workflow-parallel": "1.3.6-beta", + "@nocobase/plugin-workflow-request": "1.3.6-beta", + "@nocobase/plugin-workflow-sql": "1.3.6-beta", + "@nocobase/server": "1.3.6-beta", "cronstrue": "^2.11.0" }, "repository": { From b41e47757ec0d1f7b0af917e25ff5b4a436042aa Mon Sep 17 00:00:00 2001 From: "nocobase[bot]" <179432756+nocobase[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 06:01:29 +0000 Subject: [PATCH 038/133] chore: update changelog --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5999af93d..2037e888b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,17 @@ 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.6-beta](https://github.com/nocobase/nocobase/compare/v1.3.5-beta...v1.3.6-beta) - 2024-08-29 + +### Merged + +- fix: association select data scope linkage should support edit form [`#5149`](https://github.com/nocobase/nocobase/pull/5149) + +### Commits + +- chore(versions): 😊 publish v1.3.6-beta [`39c7ce4`](https://github.com/nocobase/nocobase/commit/39c7ce4741801819b98970b95c1663915a8c3bff) +- chore: update changelog [`cfbc2a6`](https://github.com/nocobase/nocobase/commit/cfbc2a6c15a5dfb8c0684051df1cf01499ff30ac) + ## [v1.3.5-beta](https://github.com/nocobase/nocobase/compare/v1.3.4-beta...v1.3.5-beta) - 2024-08-28 ### Merged From ae8f5c797ff696dc702bdb31edaf9501442a98b0 Mon Sep 17 00:00:00 2001 From: Katherine Date: Thu, 29 Aug 2024 15:42:15 +0800 Subject: [PATCH 039/133] fix: add text support handlebars (#5150) --- .../details-single/ReadPrettyFormItemInitializers.tsx | 3 +++ .../other-blocks/markdown/MarkdownFormItemInitializer.tsx | 3 +++ .../src/schema-component/antd/markdown/Markdown.Void.tsx | 2 +- .../client/src/schema-settings/SchemaSettingsRenderEngine.tsx | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/core/client/src/modules/blocks/data-blocks/details-single/ReadPrettyFormItemInitializers.tsx b/packages/core/client/src/modules/blocks/data-blocks/details-single/ReadPrettyFormItemInitializers.tsx index b47af5d54..1386471f3 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/details-single/ReadPrettyFormItemInitializers.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/details-single/ReadPrettyFormItemInitializers.tsx @@ -85,6 +85,9 @@ const commonOptions = { type: 'void', 'x-editable': false, 'x-decorator': 'FormItem', + 'x-decorator-props': { + engine: 'handlebars', + }, // 'x-designer': 'Markdown.Void.Designer', 'x-toolbar': 'FormItemSchemaToolbar', 'x-settings': 'blockSettings:markdown', diff --git a/packages/core/client/src/modules/blocks/other-blocks/markdown/MarkdownFormItemInitializer.tsx b/packages/core/client/src/modules/blocks/other-blocks/markdown/MarkdownFormItemInitializer.tsx index 18f2be306..3766d7e2d 100644 --- a/packages/core/client/src/modules/blocks/other-blocks/markdown/MarkdownFormItemInitializer.tsx +++ b/packages/core/client/src/modules/blocks/other-blocks/markdown/MarkdownFormItemInitializer.tsx @@ -23,6 +23,9 @@ export const MarkdownFormItemInitializer = () => { type: 'void', 'x-editable': false, 'x-decorator': 'FormItem', + 'x-decorator-props': { + engine: 'handlebars', + }, // 'x-designer': 'Markdown.Void.Designer', 'x-toolbar': 'FormItemSchemaToolbar', 'x-settings': 'blockSettings:markdown', diff --git a/packages/core/client/src/schema-component/antd/markdown/Markdown.Void.tsx b/packages/core/client/src/schema-component/antd/markdown/Markdown.Void.tsx index 989827988..93f4ee100 100644 --- a/packages/core/client/src/schema-component/antd/markdown/Markdown.Void.tsx +++ b/packages/core/client/src/schema-component/antd/markdown/Markdown.Void.tsx @@ -95,7 +95,7 @@ const MarkdownEditor = (props: MarkdownEditorProps) => { - +
- + {allowConfigUI ? : null}