From a58a4d3668ab86206a9ee6f52bdfc0790dd89d84 Mon Sep 17 00:00:00 2001 From: "lixuefei.1313" Date: Tue, 9 Dec 2025 16:01:29 +0800 Subject: [PATCH 1/7] feat: optimiza label overlap --- .../src/axis/overlap/auto-rotate.ts | 22 ++++++++-- .../src/label/overlap/place.ts | 44 ++++++++++++++----- 2 files changed, 53 insertions(+), 13 deletions(-) diff --git a/packages/vrender-components/src/axis/overlap/auto-rotate.ts b/packages/vrender-components/src/axis/overlap/auto-rotate.ts index 8f4440e2c..665f2e5df 100644 --- a/packages/vrender-components/src/axis/overlap/auto-rotate.ts +++ b/packages/vrender-components/src/axis/overlap/auto-rotate.ts @@ -28,12 +28,28 @@ export function autoRotate(items: IText[], rotateConfig: RotateConfig) { let i = 0; let n = 0; - if (labelRotateAngle && labelRotateAngle.length > 0) { - n = labelRotateAngle.length; + + let testAngle = labelRotateAngle; + if (items.length > 2) { + // 大量数据下性能优化 + // 标签过多时无论如何旋转都无法展示全部标签,通过逻辑减少尝试次数 + if (orient === 'bottom' || orient === 'top') { + if (Math.abs(items[1].attribute.x - items[0].attribute.x) < items[0].attribute.fontSize / 2) { + testAngle = [labelRotateAngle[labelRotateAngle.length - 1]]; + } + } else { + if (Math.abs(items[1].attribute.y - items[0].attribute.y) < items[0].attribute.fontSize / 2) { + testAngle = [labelRotateAngle[labelRotateAngle.length - 1]]; + } + } + } + + if (testAngle && testAngle.length > 0) { + n = testAngle.length; } while (i < n) { - const angle = labelRotateAngle[i++]; + const angle = testAngle[i++]; items.forEach(item => { // item.angle = angle; item.attribute.angle = degreeToRadian(angle); diff --git a/packages/vrender-components/src/label/overlap/place.ts b/packages/vrender-components/src/label/overlap/place.ts index aa9f3260f..d848949ac 100644 --- a/packages/vrender-components/src/label/overlap/place.ts +++ b/packages/vrender-components/src/label/overlap/place.ts @@ -78,6 +78,9 @@ export function canPlaceInside(textBound: IBoundsLike, shapeBound: IAABBBounds) return shapeBound.encloses(textBound); } +/** + * 通过预先获取一次文本的 AABB 边界,按候选坐标计算平移后的边界进行碰撞判定,避免反复更新文本属性。 + */ export function placeToCandidates( $: BitmapTool, bitmap: Bitmap, @@ -88,19 +91,40 @@ export function placeToCandidates( changePosition = false ): PointLocationCfg | false { const validCandidates = candidates.filter(candidate => isValid(candidate)); + + const curX = (text.attribute.x as number) ?? 0; + const curY = (text.attribute.y as number) ?? 0; + const base = text.AABBBounds; + const candidateBounds = { + x1: base.x1, + x2: base.x2, + y1: base.y1, + y2: base.y2 + }; + + let lastCandidate: PointLocationCfg | undefined; for (let i = 0; i < validCandidates.length; i++) { - let measureText; - if (changePosition) { - measureText = text; - } else { - measureText = text.clone(); + const c = validCandidates[i]; + lastCandidate = c; + const nx = (c.x as number) ?? curX; + const ny = (c.y as number) ?? curY; + const dx = nx - curX; + const dy = ny - curY; + + candidateBounds.x1 = base.x1 + dx; + candidateBounds.x2 = base.x2 + dx; + candidateBounds.y1 = base.y1 + dy; + candidateBounds.y2 = base.y2 + dy; + + if (canPlace($, bitmap, candidateBounds, clampForce, pad)) { + bitmap.setRange(boundToRange($, candidateBounds, true)); + // 成功时外部会设置位置,不需要在这里设置 + return c; } - measureText.setAttributes(validCandidates[i]); + } - if (canPlace($, bitmap, measureText.AABBBounds, clampForce, pad)) { - bitmap.setRange(boundToRange($, measureText.AABBBounds, true)); - return validCandidates[i]; - } + if (changePosition && lastCandidate) { + text.setAttributes(lastCandidate); } return false; } From 6377d62655736c57c86bee1880fd8fb7ea19f74e Mon Sep 17 00:00:00 2001 From: "lixuefei.1313" Date: Tue, 9 Dec 2025 16:06:30 +0800 Subject: [PATCH 2/7] docs: update changlog of rush --- .../feat-otimize-label-overlap_2025-12-09-08-06.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/@visactor/vrender-components/feat-otimize-label-overlap_2025-12-09-08-06.json diff --git a/common/changes/@visactor/vrender-components/feat-otimize-label-overlap_2025-12-09-08-06.json b/common/changes/@visactor/vrender-components/feat-otimize-label-overlap_2025-12-09-08-06.json new file mode 100644 index 000000000..8b79034d2 --- /dev/null +++ b/common/changes/@visactor/vrender-components/feat-otimize-label-overlap_2025-12-09-08-06.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "feat: optimiza label overlap\n\n", + "type": "none", + "packageName": "@visactor/vrender-components" + } + ], + "packageName": "@visactor/vrender-components", + "email": "lixuef1313@163.com" +} \ No newline at end of file From d1b45ce92c47b932c70c73c27928e9121cc81cc5 Mon Sep 17 00:00:00 2001 From: "lixuefei.1313" Date: Tue, 9 Dec 2025 16:51:16 +0800 Subject: [PATCH 3/7] fix: fix bug of overlap is undefiend --- packages/vrender-components/src/label/base.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vrender-components/src/label/base.ts b/packages/vrender-components/src/label/base.ts index d70d759f7..e9201f4ed 100644 --- a/packages/vrender-components/src/label/base.ts +++ b/packages/vrender-components/src/label/base.ts @@ -215,7 +215,7 @@ export class LabelBase extends AnimateComponent { const filteredLabels: (IText | IRichText)[] = []; const overlapLabels: (IText | IRichText)[] = labels; - if (!isBoolean(overlap) && isFunction(overlap.filterBeforeOverlap)) { + if (!isBoolean(overlap) && isFunction(overlap?.filterBeforeOverlap)) { const getRelatedGraphic = this.getRelatedGraphic.bind(this); labels.forEach(label => { if (overlap.filterBeforeOverlap(label, getRelatedGraphic, this)) { From 5505d9a9800a0bc286d1d5723e136a60d98f017d Mon Sep 17 00:00:00 2001 From: "lixuefei.1313" Date: Wed, 10 Dec 2025 11:21:52 +0800 Subject: [PATCH 4/7] chore: upgrade workflow runs on --- .github/workflows/hotfix-release.yml | 2 +- .github/workflows/pre-release.yml | 2 +- .github/workflows/release-changelog.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/sync-main-to-develop.yml | 2 +- .github/workflows/unit-test.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/hotfix-release.yml b/.github/workflows/hotfix-release.yml index 886f6608c..7d58f3417 100644 --- a/.github/workflows/hotfix-release.yml +++ b/.github/workflows/hotfix-release.yml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: macOS-13 # 如果用了electron,记得改成 macOS-latest + runs-on: macos-latest # 如果用了electron,记得改成 macOS-latest permissions: contents: write pull-requests: write diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index b2a20d764..b012cdf7a 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: macOS-13 # 如果用了electron,记得改成 macOS-latest + runs-on: macos-latest # 如果用了electron,记得改成 macOS-latest permissions: contents: write diff --git a/.github/workflows/release-changelog.yml b/.github/workflows/release-changelog.yml index 4d5dd5294..80fe007a8 100644 --- a/.github/workflows/release-changelog.yml +++ b/.github/workflows/release-changelog.yml @@ -7,7 +7,7 @@ on: jobs: update-changelog-after-publish-a-release: name: GitHub Actions Test - runs-on: macOS-13 + runs-on: macos-latest strategy: matrix: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 279ca8c14..82598d4a1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: macOS-13 # 如果用了electron,记得改成 macOS-latest + runs-on: macos-latest # 如果用了electron,记得改成 macOS-latest permissions: contents: write pull-requests: write diff --git a/.github/workflows/sync-main-to-develop.yml b/.github/workflows/sync-main-to-develop.yml index 8b84b6160..e4de28650 100644 --- a/.github/workflows/sync-main-to-develop.yml +++ b/.github/workflows/sync-main-to-develop.yml @@ -11,7 +11,7 @@ jobs: if_merged: if: github.event.pull_request.merged == true - runs-on: macOS-13 + runs-on: macos-latest permissions: contents: write diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 4b8271e2b..940edbc51 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -10,7 +10,7 @@ on: jobs: build: runs-on: - - macOS-13 + - macos-latest strategy: matrix: From d114b91a113817d723625321dbd4a516397c44a2 Mon Sep 17 00:00:00 2001 From: "lixuefei.1313" Date: Wed, 10 Dec 2025 14:09:48 +0800 Subject: [PATCH 5/7] chore: add native deps for canvas --- .github/workflows/bug-server.yml | 11 +++++++++++ .github/workflows/hotfix-release.yml | 11 +++++++++-- .github/workflows/pre-release.yml | 10 ++++++++++ .github/workflows/release-changelog.yml | 10 ++++++++++ .github/workflows/release.yml | 10 ++++++++++ .github/workflows/sync-main-to-develop.yml | 10 ++++++++++ .github/workflows/unit-test.yml | 10 ++++++++++ 7 files changed, 70 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bug-server.yml b/.github/workflows/bug-server.yml index d2ab21c1c..db01316e4 100644 --- a/.github/workflows/bug-server.yml +++ b/.github/workflows/bug-server.yml @@ -28,6 +28,17 @@ jobs: - name: Print All Github Environment Variables run: env + - name: Install native deps for node-canvas (macOS) + if: runner.os == 'macOS' + run: | + brew update + brew install pkg-config cairo pango libpng jpeg giflib librsvg + - name: Install native deps for node-canvas (Linux) + if: runner.os == 'Linux' + run: | + sudo apt-get update + sudo apt-get install -y build-essential pkg-config libcairo2-dev libpango1.0-dev libpng-dev libjpeg-dev libgif-dev librsvg2-dev + - name: Update rush run: node common/scripts/install-run-rush.js update --bypass-policy diff --git a/.github/workflows/hotfix-release.yml b/.github/workflows/hotfix-release.yml index 7d58f3417..be7ccce92 100644 --- a/.github/workflows/hotfix-release.yml +++ b/.github/workflows/hotfix-release.yml @@ -32,9 +32,16 @@ jobs: - name: Print All Github Environment Variables run: env - - name: Preparation of node-canvas - run: + - name: Install native deps for node-canvas (macOS) + if: runner.os == 'macOS' + run: | + brew update brew install pkg-config cairo pango libpng jpeg giflib librsvg + - name: Install native deps for node-canvas (Linux) + if: runner.os == 'Linux' + run: | + sudo apt-get update + sudo apt-get install -y build-essential pkg-config libcairo2-dev libpango1.0-dev libpng-dev libjpeg-dev libgif-dev librsvg2-dev # Install rush - name: Install rush diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index b012cdf7a..657c05461 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -29,6 +29,16 @@ jobs: cache-dependency-path: './common/config/rush/pnpm-lock.yaml' # Install rush + - name: Install native deps for node-canvas (macOS) + if: runner.os == 'macOS' + run: | + brew update + brew install pkg-config cairo pango libpng jpeg giflib librsvg + - name: Install native deps for node-canvas (Linux) + if: runner.os == 'Linux' + run: | + sudo apt-get update + sudo apt-get install -y build-essential pkg-config libcairo2-dev libpango1.0-dev libpng-dev libjpeg-dev libgif-dev librsvg2-dev - name: Install rush run: node common/scripts/install-run-rush.js install --bypass-policy diff --git a/.github/workflows/release-changelog.yml b/.github/workflows/release-changelog.yml index 80fe007a8..1c1164e44 100644 --- a/.github/workflows/release-changelog.yml +++ b/.github/workflows/release-changelog.yml @@ -29,6 +29,16 @@ jobs: cache-dependency-path: './common/config/rush/pnpm-lock.yaml' # Install rush + - name: Install native deps for node-canvas (macOS) + if: runner.os == 'macOS' + run: | + brew update + brew install pkg-config cairo pango libpng jpeg giflib librsvg + - name: Install native deps for node-canvas (Linux) + if: runner.os == 'Linux' + run: | + sudo apt-get update + sudo apt-get install -y build-essential pkg-config libcairo2-dev libpango1.0-dev libpng-dev libjpeg-dev libgif-dev librsvg2-dev - name: Install rush run: node common/scripts/install-run-rush.js install --bypass-policy diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 82598d4a1..0e44c8fd8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,6 +34,16 @@ jobs: run: env # Install rush + - name: Install native deps for node-canvas (macOS) + if: runner.os == 'macOS' + run: | + brew update + brew install pkg-config cairo pango libpng jpeg giflib librsvg + - name: Install native deps for node-canvas (Linux) + if: runner.os == 'Linux' + run: | + sudo apt-get update + sudo apt-get install -y build-essential pkg-config libcairo2-dev libpango1.0-dev libpng-dev libjpeg-dev libgif-dev librsvg2-dev - name: Install rush run: node common/scripts/install-run-rush.js install --bypass-policy diff --git a/.github/workflows/sync-main-to-develop.yml b/.github/workflows/sync-main-to-develop.yml index e4de28650..b6f0e4414 100644 --- a/.github/workflows/sync-main-to-develop.yml +++ b/.github/workflows/sync-main-to-develop.yml @@ -35,6 +35,16 @@ jobs: cache-dependency-path: './common/config/rush/pnpm-lock.yaml' # Install rush + - name: Install native deps for node-canvas (macOS) + if: runner.os == 'macOS' + run: | + brew update + brew install pkg-config cairo pango libpng jpeg giflib librsvg + - name: Install native deps for node-canvas (Linux) + if: runner.os == 'Linux' + run: | + sudo apt-get update + sudo apt-get install -y build-essential pkg-config libcairo2-dev libpango1.0-dev libpng-dev libjpeg-dev libgif-dev librsvg2-dev - name: Install rush run: node common/scripts/install-run-rush.js install --bypass-policy diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 940edbc51..ba4ace86a 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -32,6 +32,16 @@ jobs: # fc-list # Install rush + - name: Install native deps for node-canvas (macOS) + if: runner.os == 'macOS' + run: | + brew update + brew install pkg-config cairo pango libpng jpeg giflib librsvg + - name: Install native deps for node-canvas (Linux) + if: runner.os == 'Linux' + run: | + sudo apt-get update + sudo apt-get install -y build-essential pkg-config libcairo2-dev libpango1.0-dev libpng-dev libjpeg-dev libgif-dev librsvg2-dev - name: Update rush run: node common/scripts/install-run-rush.js update --bypass-policy - name: Install rush From 40cc7440ae216a25b585ed2f13228d7fa0f5a13a Mon Sep 17 00:00:00 2001 From: "lixuefei.1313" Date: Wed, 10 Dec 2025 16:29:17 +0800 Subject: [PATCH 6/7] chore: support npm trust publisher --- .github/workflows/hotfix-release.yml | 133 --------------------- .github/workflows/pre-release.yml | 80 ------------- .github/workflows/release.yml | 171 +++++++++++++++++++++++---- 3 files changed, 151 insertions(+), 233 deletions(-) delete mode 100644 .github/workflows/hotfix-release.yml delete mode 100644 .github/workflows/pre-release.yml diff --git a/.github/workflows/hotfix-release.yml b/.github/workflows/hotfix-release.yml deleted file mode 100644 index be7ccce92..000000000 --- a/.github/workflows/hotfix-release.yml +++ /dev/null @@ -1,133 +0,0 @@ -name: hotfix release CI - -on: - push: - branches: - - 'hotfix/[0-9]+.[0-9]+.[0-9]+' - -jobs: - build: - runs-on: macos-latest # 如果用了electron,记得改成 macOS-latest - permissions: - contents: write - pull-requests: write - - strategy: - matrix: - node-version: [18.x] - # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ - - steps: - - uses: actions/checkout@v3 - - run: | - git config user.name ${{ github.actor }} - git config user.email ${{ github.actor }}@users.noreply.github.com - - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} - cache: 'npm' - cache-dependency-path: './common/config/rush/pnpm-lock.yaml' - - - name: Print All Github Environment Variables - run: env - - name: Install native deps for node-canvas (macOS) - if: runner.os == 'macOS' - run: | - brew update - brew install pkg-config cairo pango libpng jpeg giflib librsvg - - name: Install native deps for node-canvas (Linux) - if: runner.os == 'Linux' - run: | - sudo apt-get update - sudo apt-get install -y build-essential pkg-config libcairo2-dev libpango1.0-dev libpng-dev libjpeg-dev libgif-dev librsvg2-dev - - # Install rush - - name: Install rush - run: node common/scripts/install-run-rush.js install --bypass-policy - - - name: Parse semver version from branch name - id: semver_parser - uses: xile611/read-package-version-action@main - with: - path: packages/vrender - semver_string: ${{ github.ref_name }} - semver_pattern: '^hotfix/(.*)$' # ^v?(.*)$ by default - - - name: update nextBump of version policies - uses: xile611/set-next-bump-of-rush@main - with: - release_version: ${{ steps.semver_parser.outputs.full }} - write_next_bump: true - - - name: Update version - run: node common/scripts/install-run-rush.js version --bump - - - name: Build vrender-core - run: node common/scripts/install-run-rush.js build --only @visactor/vrender-core - - - name: Build vrender-kits - run: node common/scripts/install-run-rush.js build --only @visactor/vrender-kits - - - name: Build vrender-animate - run: node common/scripts/install-run-rush.js build --only @visactor/vrender-animate - - - name: Build vrender - run: node common/scripts/install-run-rush.js build --only @visactor/vrender - - - name: Build vrender-components - run: node common/scripts/install-run-rush.js build --only @visactor/vrender-components - - # - name: Run CI - # working-directory: ./tools/bugserver-trigger - # env: - # BUG_SERVER_TOKEN: ${{ secrets.BUG_SERVER_TOKEN }} - # run: node ../../common/scripts/install-run-rushx.js ci -t @internal/bugserver-trigger - - - name: Build react-vrender - run: node common/scripts/install-run-rush.js build --only @visactor/react-vrender - - - name: Build react-vrender-utils - run: node common/scripts/install-run-rush.js build --only @visactor/react-vrender-utils - - - name: Publish to npm - env: - NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} - NPM_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} - run: node common/scripts/install-run-rush.js publish --publish --include-all --tag hotfix - - - name: Update shrinkwrap - run: node common/scripts/install-run-rush.js update - - - name: Get npm version - id: package-version - uses: xile611/read-package-version-action@v2.1 - with: - path: packages/vrender - - - name: Commit & Push changes - uses: actions-js/push@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - message: 'build: prelease version ${{ steps.package-version.outputs.current_version }}' - branch: ${{ github.ref_name }} - - - name: Collect changelog of rush - uses: xile611/collect-rush-changlog@main - id: changelog - with: - version: ${{ steps.package-version.outputs.current_version }} - - - name: Create Release for Tag - id: release_tag - uses: ncipollo/release-action@v1.12.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag: v${{ steps.package-version.outputs.current_version }} - commit: ${{ github.ref_name }} - prerelease: false - body: | - ${{ steps.changelog.outputs.markdown }} - draft: true # diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml deleted file mode 100644 index 657c05461..000000000 --- a/.github/workflows/pre-release.yml +++ /dev/null @@ -1,80 +0,0 @@ -name: Pre-release CI - -on: - push: - branches: - - 'pre-release/[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+' - - 'pre-release/[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+' - - 'pre-release/[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+' - -jobs: - build: - runs-on: macos-latest # 如果用了electron,记得改成 macOS-latest - - permissions: - contents: write - - strategy: - matrix: - node-version: [18.x] - # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ - - steps: - - uses: actions/checkout@v3 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} - cache: 'npm' - cache-dependency-path: './common/config/rush/pnpm-lock.yaml' - - # Install rush - - name: Install native deps for node-canvas (macOS) - if: runner.os == 'macOS' - run: | - brew update - brew install pkg-config cairo pango libpng jpeg giflib librsvg - - name: Install native deps for node-canvas (Linux) - if: runner.os == 'Linux' - run: | - sudo apt-get update - sudo apt-get install -y build-essential pkg-config libcairo2-dev libpango1.0-dev libpng-dev libjpeg-dev libgif-dev librsvg2-dev - - name: Install rush - run: node common/scripts/install-run-rush.js install --bypass-policy - - - name: Parse semver version from branch name - id: semver_parser - uses: xile611/read-package-version-action@main - with: - path: packages/vrender - semver_string: ${{ github.ref_name }} - semver_pattern: '^pre-release/(.*)$' # ^v?(.*)$ by default - - - name: Apply prereleaseName - run: node common/scripts/apply-prerelease-version.js ${{ steps.semver_parser.outputs.pre_release_name }} ${{ steps.semver_parser.outputs.main }} - - - name: Build packages - run: node common/scripts/install-run-rush.js build --only tag:package - - - name: Publish to npm - env: - NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} - NPM_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} - run: node common/scripts/install-run-rush.js publish --publish --include-all --tag ${{ steps.semver_parser.outputs.pre_release_type }} - - - name: Update shrinkwrap - run: node common/scripts/install-run-rush.js update - - - name: Get npm version - id: package-version - uses: xile611/read-package-version-action@main - with: - path: packages/vrender - - - name: Commit & Push changes - uses: actions-js/push@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - message: 'build: prelease version ${{ steps.package-version.outputs.current_version }}' - branch: ${{ github.ref_name }} - author_name: ${{ github.actor }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0e44c8fd8..ee2fe1725 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,6 +4,10 @@ on: push: branches: - 'release/[0-9]+.[0-9]+.[0-9]+' + - 'hotfix/[0-9]+.[0-9]+.[0-9]+' + - 'pre-release/[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+' + - 'pre-release/[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+' + - 'pre-release/[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+' jobs: build: @@ -11,10 +15,11 @@ jobs: permissions: contents: write pull-requests: write + id-token: write strategy: matrix: - node-version: [18.x] + node-version: [20.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: @@ -24,16 +29,47 @@ jobs: git config user.email ${{ github.actor }}@users.noreply.github.com - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} cache: 'npm' cache-dependency-path: './common/config/rush/pnpm-lock.yaml' + registry-url: 'https://registry.npmjs.org' + + - name: Ensure npm >= 11.5.1 (conditional) + run: | + set -e + NPMV=$(npm -v) + echo "Current npm version: $NPMV" + REQ_MAJOR=11 + REQ_MINOR=5 + REQ_PATCH=1 + MAJOR=${NPMV%%.*} + REST=${NPMV#*.} + MINOR=${REST%%.*} + PATCH=${REST#*.} + needs_upgrade=false + if [ "$MAJOR" -lt "$REQ_MAJOR" ]; then + needs_upgrade=true + elif [ "$MAJOR" -eq "$REQ_MAJOR" ]; then + if [ "$MINOR" -lt "$REQ_MINOR" ]; then + needs_upgrade=true + elif [ "$MINOR" -eq "$REQ_MINOR" ] && [ "$PATCH" -lt "$REQ_PATCH" ]; then + needs_upgrade=true + fi + fi + if [ "$needs_upgrade" = true ]; then + echo "npm < 11.5.1 detected, installing pinned npm@11.5.1 for Trusted Publishing" + npm install -g npm@11.5.1 + echo "npm upgraded to: $(npm -v)" + else + echo "npm version satisfies requirement (>= 11.5.1)" + fi - name: Print All Github Environment Variables - run: - env - # Install rush + run: env + + # Install rush - name: Install native deps for node-canvas (macOS) if: runner.os == 'macOS' run: | @@ -47,39 +83,73 @@ jobs: - name: Install rush run: node common/scripts/install-run-rush.js install --bypass-policy - - name: Parse semver version from branch name - id: semver_parser + - name: Parse semver for release + if: startsWith(github.ref_name, 'release/') + id: semver_release uses: xile611/read-package-version-action@main with: path: packages/vrender semver_string: ${{ github.ref_name }} - semver_pattern: '^release/(.*)$' # ^v?(.*)$ by default + semver_pattern: '^release/(.*)$' - - name: update nextBump of version policies + - name: Parse semver for hotfix + if: startsWith(github.ref_name, 'hotfix/') + id: semver_hotfix + uses: xile611/read-package-version-action@main + with: + path: packages/vrender + semver_string: ${{ github.ref_name }} + semver_pattern: '^hotfix/(.*)$' + + - name: Parse semver for pre-release + if: startsWith(github.ref_name, 'pre-release/') + id: semver_prerelease + uses: xile611/read-package-version-action@main + with: + path: packages/vrender + semver_string: ${{ github.ref_name }} + semver_pattern: '^pre-release/(.*)$' + + - name: update nextBump of version policies (release) + if: startsWith(github.ref_name, 'release/') + uses: xile611/set-next-bump-of-rush@main + with: + release_version: ${{ steps.semver_release.outputs.full }} + write_next_bump: true + + - name: update nextBump of version policies (hotfix) + if: startsWith(github.ref_name, 'hotfix/') uses: xile611/set-next-bump-of-rush@main with: - release_version: ${{ steps.semver_parser.outputs.full }} + release_version: ${{ steps.semver_hotfix.outputs.full }} write_next_bump: true - name: Update version + if: startsWith(github.ref_name, 'release/') || startsWith(github.ref_name, 'hotfix/') run: node common/scripts/install-run-rush.js version --bump - name: Build vrender-core + if: startsWith(github.ref_name, 'release/') || startsWith(github.ref_name, 'hotfix/') run: node common/scripts/install-run-rush.js build --only @visactor/vrender-core - name: Build vrender-kits + if: startsWith(github.ref_name, 'release/') || startsWith(github.ref_name, 'hotfix/') run: node common/scripts/install-run-rush.js build --only @visactor/vrender-kits - name: Build vrender-animate + if: startsWith(github.ref_name, 'release/') || startsWith(github.ref_name, 'hotfix/') run: node common/scripts/install-run-rush.js build --only @visactor/vrender-animate - name: Build vrender-components + if: startsWith(github.ref_name, 'release/') || startsWith(github.ref_name, 'hotfix/') run: node common/scripts/install-run-rush.js build --only @visactor/vrender-components - name: Build vrender + if: startsWith(github.ref_name, 'release/') || startsWith(github.ref_name, 'hotfix/') run: node common/scripts/install-run-rush.js build --only @visactor/vrender - name: Build bugserver + if: startsWith(github.ref_name, 'release/') || startsWith(github.ref_name, 'hotfix/') run: node common/scripts/install-run-rush.js build --only @internal/bugserver-trigger # - name: Run CI @@ -89,40 +159,86 @@ jobs: # run: node ../../common/scripts/install-run-rushx.js ci -t @internal/bugserver-trigger - name: Build react-vrender + if: startsWith(github.ref_name, 'release/') || startsWith(github.ref_name, 'hotfix/') run: node common/scripts/install-run-rush.js build --only @visactor/react-vrender - name: Build react-vrender-utils + if: startsWith(github.ref_name, 'release/') || startsWith(github.ref_name, 'hotfix/') run: node common/scripts/install-run-rush.js build --only @visactor/react-vrender-utils - - name: Publish to npm - env: - NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} - NPM_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} + - name: Apply prereleaseName + if: startsWith(github.ref_name, 'pre-release/') + run: node common/scripts/apply-prerelease-version.js ${{ steps.semver_prerelease.outputs.pre_release_name }} ${{ steps.semver_prerelease.outputs.main }} + + - name: Build packages (pre-release) + if: startsWith(github.ref_name, 'pre-release/') + run: node common/scripts/install-run-rush.js build --only tag:package + + - name: Publish to npm (release) + if: startsWith(github.ref_name, 'release/') run: node common/scripts/install-run-rush.js publish --publish --include-all --tag latest + - name: Publish to npm (hotfix) + if: startsWith(github.ref_name, 'hotfix/') + run: node common/scripts/install-run-rush.js publish --publish --include-all --tag hotfix + + - name: Publish to npm (pre-release) + if: startsWith(github.ref_name, 'pre-release/') + run: node common/scripts/install-run-rush.js publish --publish --include-all --tag ${{ steps.semver_prerelease.outputs.pre_release_type }} + - name: Update shrinkwrap run: node common/scripts/install-run-rush.js update - - name: Get npm version + - name: Get npm version (release/hotfix) + if: startsWith(github.ref_name, 'release/') || startsWith(github.ref_name, 'hotfix/') id: package-version uses: xile611/read-package-version-action@v2.1 with: path: packages/vrender - - name: Commit & Push changes + - name: Get npm version (pre-release) + if: startsWith(github.ref_name, 'pre-release/') + id: package-version-pre + uses: xile611/read-package-version-action@main + with: + path: packages/vrender + + - name: Disable git hooks for CI (release/hotfix) + if: startsWith(github.ref_name, 'release/') || startsWith(github.ref_name, 'hotfix/') + run: git config core.hooksPath /dev/null + - name: Commit & Push changes (release/hotfix) + if: startsWith(github.ref_name, 'release/') || startsWith(github.ref_name, 'hotfix/') uses: actions-js/push@master + env: + HUSKY: 0 with: github_token: ${{ secrets.GITHUB_TOKEN }} message: 'build: prelease version ${{ steps.package-version.outputs.current_version }}' branch: ${{ github.ref_name }} + - name: Disable git hooks for CI (pre-release) + if: startsWith(github.ref_name, 'pre-release/') + run: git config core.hooksPath /dev/null + - name: Commit & Push changes (pre-release) + if: startsWith(github.ref_name, 'pre-release/') + uses: actions-js/push@master + env: + HUSKY: 0 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + message: 'build: prelease version ${{ steps.package-version-pre.outputs.current_version }}' + branch: ${{ github.ref_name }} + author_name: ${{ github.actor }} + - name: Collect changelog of rush + if: startsWith(github.ref_name, 'release/') || startsWith(github.ref_name, 'hotfix/') uses: xile611/collect-rush-changlog@main id: changelog with: version: ${{ steps.package-version.outputs.current_version }} - - name: Create Release for Tag + - name: Create Release for Tag (release) + if: startsWith(github.ref_name, 'release/') id: release_tag uses: ncipollo/release-action@v1.12.0 env: @@ -133,16 +249,31 @@ jobs: prerelease: false body: | ${{ steps.changelog.outputs.markdown }} - draft: true # + draft: true + + - name: Create Release for Tag (hotfix) + if: startsWith(github.ref_name, 'hotfix/') + id: release_tag_hotfix + uses: ncipollo/release-action@v1.12.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag: v${{ steps.package-version.outputs.current_version }} + commit: ${{ github.ref_name }} + prerelease: false + body: | + ${{ steps.changelog.outputs.markdown }} + draft: true - name: Create Pull Request + if: startsWith(github.ref_name, 'release/') uses: dustinirving/create-pr@v1.0.2 with: token: ${{ secrets.GITHUB_TOKEN }} title: '[Auto release] release ${{ steps.package-version.outputs.current_version }}' base: main head: ${{ github.ref_name }} - labels: release # default labels, the action will throw error if not specified - reviewers: xile611 # default reviewers, the action will throw error if not specified + labels: release + reviewers: xile611 body: | ${{ steps.changelog.outputs.markdown }} From 1aaf5f668cfb5d394ce67f0932331947efd3b985 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 10 Dec 2025 11:23:05 +0000 Subject: [PATCH 7/7] build: prelease version 1.0.32 --- ...timize-label-overlap_2025-12-09-08-06.json | 11 ------ common/config/rush/pnpm-lock.yaml | 36 +++++++++---------- common/config/rush/version-policies.json | 2 +- docs/package.json | 2 +- packages/react-vrender-utils/CHANGELOG.json | 6 ++++ packages/react-vrender-utils/CHANGELOG.md | 7 +++- packages/react-vrender-utils/package.json | 6 ++-- packages/react-vrender/CHANGELOG.json | 6 ++++ packages/react-vrender/CHANGELOG.md | 7 +++- packages/react-vrender/package.json | 4 +-- packages/vrender-animate/CHANGELOG.json | 6 ++++ packages/vrender-animate/CHANGELOG.md | 7 +++- packages/vrender-animate/package.json | 4 +-- packages/vrender-components/CHANGELOG.json | 12 +++++++ packages/vrender-components/CHANGELOG.md | 11 +++++- packages/vrender-components/package.json | 8 ++--- packages/vrender-core/CHANGELOG.json | 6 ++++ packages/vrender-core/CHANGELOG.md | 7 +++- packages/vrender-core/package.json | 2 +- packages/vrender-kits/CHANGELOG.json | 6 ++++ packages/vrender-kits/CHANGELOG.md | 7 +++- packages/vrender-kits/package.json | 4 +-- packages/vrender/CHANGELOG.json | 6 ++++ packages/vrender/CHANGELOG.md | 7 +++- packages/vrender/package.json | 10 +++--- tools/bugserver-trigger/package.json | 10 +++--- 26 files changed, 138 insertions(+), 62 deletions(-) delete mode 100644 common/changes/@visactor/vrender-components/feat-otimize-label-overlap_2025-12-09-08-06.json diff --git a/common/changes/@visactor/vrender-components/feat-otimize-label-overlap_2025-12-09-08-06.json b/common/changes/@visactor/vrender-components/feat-otimize-label-overlap_2025-12-09-08-06.json deleted file mode 100644 index 8b79034d2..000000000 --- a/common/changes/@visactor/vrender-components/feat-otimize-label-overlap_2025-12-09-08-06.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "comment": "feat: optimiza label overlap\n\n", - "type": "none", - "packageName": "@visactor/vrender-components" - } - ], - "packageName": "@visactor/vrender-components", - "email": "lixuef1313@163.com" -} \ No newline at end of file diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index fcda9962f..b9336de65 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -22,7 +22,7 @@ importers: specifier: ~0.5.7 version: 0.5.7 '@visactor/vrender': - specifier: workspace:1.0.31 + specifier: workspace:1.0.32 version: link:../packages/vrender '@visactor/vutils': specifier: ~1.0.12 @@ -95,7 +95,7 @@ importers: ../../packages/react-vrender: dependencies: '@visactor/vrender': - specifier: workspace:1.0.31 + specifier: workspace:1.0.32 version: link:../vrender '@visactor/vutils': specifier: ~1.0.12 @@ -153,10 +153,10 @@ importers: ../../packages/react-vrender-utils: dependencies: '@visactor/react-vrender': - specifier: workspace:1.0.31 + specifier: workspace:1.0.32 version: link:../react-vrender '@visactor/vrender': - specifier: workspace:1.0.31 + specifier: workspace:1.0.32 version: link:../vrender '@visactor/vutils': specifier: ~1.0.12 @@ -211,16 +211,16 @@ importers: ../../packages/vrender: dependencies: '@visactor/vrender-animate': - specifier: workspace:1.0.31 + specifier: workspace:1.0.32 version: link:../vrender-animate '@visactor/vrender-components': - specifier: workspace:1.0.31 + specifier: workspace:1.0.32 version: link:../vrender-components '@visactor/vrender-core': - specifier: workspace:1.0.31 + specifier: workspace:1.0.32 version: link:../vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.31 + specifier: workspace:1.0.32 version: link:../vrender-kits devDependencies: '@internal/bundler': @@ -287,7 +287,7 @@ importers: ../../packages/vrender-animate: dependencies: '@visactor/vrender-core': - specifier: workspace:1.0.31 + specifier: workspace:1.0.32 version: link:../vrender-core '@visactor/vutils': specifier: ~1.0.12 @@ -345,13 +345,13 @@ importers: ../../packages/vrender-components: dependencies: '@visactor/vrender-animate': - specifier: workspace:1.0.31 + specifier: workspace:1.0.32 version: link:../vrender-animate '@visactor/vrender-core': - specifier: workspace:1.0.31 + specifier: workspace:1.0.32 version: link:../vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.31 + specifier: workspace:1.0.32 version: link:../vrender-kits '@visactor/vscale': specifier: ~1.0.12 @@ -470,7 +470,7 @@ importers: specifier: 2.4.1 version: 2.4.1 '@visactor/vrender-core': - specifier: workspace:1.0.31 + specifier: workspace:1.0.32 version: link:../vrender-core '@visactor/vutils': specifier: ~1.0.12 @@ -586,19 +586,19 @@ importers: ../../tools/bugserver-trigger: dependencies: '@visactor/vrender': - specifier: workspace:1.0.31 + specifier: workspace:1.0.32 version: link:../../packages/vrender '@visactor/vrender-animate': - specifier: workspace:1.0.31 + specifier: workspace:1.0.32 version: link:../../packages/vrender-animate '@visactor/vrender-components': - specifier: workspace:1.0.31 + specifier: workspace:1.0.32 version: link:../../packages/vrender-components '@visactor/vrender-core': - specifier: workspace:1.0.31 + specifier: workspace:1.0.32 version: link:../../packages/vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.31 + specifier: workspace:1.0.32 version: link:../../packages/vrender-kits devDependencies: '@internal/bundler': diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json index 5c29ad7fa..8778b61a0 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -1 +1 @@ -[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.31","nextBump":"patch"}] +[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.32","nextBump":"patch"}] diff --git a/docs/package.json b/docs/package.json index a0064795c..07d4fcda8 100644 --- a/docs/package.json +++ b/docs/package.json @@ -13,7 +13,7 @@ "@visactor/vchart": "1.3.0", "@visactor/vutils": "~1.0.12", "@visactor/vgrammar": "~0.5.7", - "@visactor/vrender": "workspace:1.0.31", + "@visactor/vrender": "workspace:1.0.32", "markdown-it": "^13.0.0", "highlight.js": "^11.8.0", "axios": "^1.4.0", diff --git a/packages/react-vrender-utils/CHANGELOG.json b/packages/react-vrender-utils/CHANGELOG.json index 809d5f8d9..931c9b413 100644 --- a/packages/react-vrender-utils/CHANGELOG.json +++ b/packages/react-vrender-utils/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/react-vrender-utils", "entries": [ + { + "version": "1.0.32", + "tag": "@visactor/react-vrender-utils_v1.0.32", + "date": "Wed, 10 Dec 2025 11:19:35 GMT", + "comments": {} + }, { "version": "1.0.31", "tag": "@visactor/react-vrender-utils_v1.0.31", diff --git a/packages/react-vrender-utils/CHANGELOG.md b/packages/react-vrender-utils/CHANGELOG.md index 00e4e9062..a30f10610 100644 --- a/packages/react-vrender-utils/CHANGELOG.md +++ b/packages/react-vrender-utils/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/react-vrender-utils -This log was last generated on Wed, 03 Dec 2025 09:12:47 GMT and should not be manually modified. +This log was last generated on Wed, 10 Dec 2025 11:19:35 GMT and should not be manually modified. + +## 1.0.32 +Wed, 10 Dec 2025 11:19:35 GMT + +_Version update only_ ## 1.0.31 Wed, 03 Dec 2025 09:12:47 GMT diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json index 552d03761..1187bc9d6 100644 --- a/packages/react-vrender-utils/package.json +++ b/packages/react-vrender-utils/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/react-vrender-utils", - "version": "1.0.31", + "version": "1.0.32", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -24,8 +24,8 @@ "react-dom": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.31", - "@visactor/react-vrender": "workspace:1.0.31", + "@visactor/vrender": "workspace:1.0.32", + "@visactor/react-vrender": "workspace:1.0.32", "@visactor/vutils": "~1.0.12", "react-reconciler": "^0.29.0", "tslib": "^2.3.1" diff --git a/packages/react-vrender/CHANGELOG.json b/packages/react-vrender/CHANGELOG.json index ec7a116eb..49460129f 100644 --- a/packages/react-vrender/CHANGELOG.json +++ b/packages/react-vrender/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/react-vrender", "entries": [ + { + "version": "1.0.32", + "tag": "@visactor/react-vrender_v1.0.32", + "date": "Wed, 10 Dec 2025 11:19:35 GMT", + "comments": {} + }, { "version": "1.0.31", "tag": "@visactor/react-vrender_v1.0.31", diff --git a/packages/react-vrender/CHANGELOG.md b/packages/react-vrender/CHANGELOG.md index d57ca2ba0..b9543167e 100644 --- a/packages/react-vrender/CHANGELOG.md +++ b/packages/react-vrender/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/react-vrender -This log was last generated on Wed, 03 Dec 2025 09:12:47 GMT and should not be manually modified. +This log was last generated on Wed, 10 Dec 2025 11:19:35 GMT and should not be manually modified. + +## 1.0.32 +Wed, 10 Dec 2025 11:19:35 GMT + +_Version update only_ ## 1.0.31 Wed, 03 Dec 2025 09:12:47 GMT diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json index e5fe11608..722888add 100644 --- a/packages/react-vrender/package.json +++ b/packages/react-vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/react-vrender", - "version": "1.0.31", + "version": "1.0.32", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -23,7 +23,7 @@ "react": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.31", + "@visactor/vrender": "workspace:1.0.32", "@visactor/vutils": "~1.0.12", "react-reconciler": "^0.29.0", "tslib": "^2.3.1" diff --git a/packages/vrender-animate/CHANGELOG.json b/packages/vrender-animate/CHANGELOG.json index d4ffd04a9..297fdd6b4 100644 --- a/packages/vrender-animate/CHANGELOG.json +++ b/packages/vrender-animate/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender-animate", "entries": [ + { + "version": "1.0.32", + "tag": "@visactor/vrender-animate_v1.0.32", + "date": "Wed, 10 Dec 2025 11:19:35 GMT", + "comments": {} + }, { "version": "1.0.31", "tag": "@visactor/vrender-animate_v1.0.31", diff --git a/packages/vrender-animate/CHANGELOG.md b/packages/vrender-animate/CHANGELOG.md index bf13b4bbf..50c806fe2 100644 --- a/packages/vrender-animate/CHANGELOG.md +++ b/packages/vrender-animate/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/vrender-animate -This log was last generated on Wed, 03 Dec 2025 09:12:47 GMT and should not be manually modified. +This log was last generated on Wed, 10 Dec 2025 11:19:35 GMT and should not be manually modified. + +## 1.0.32 +Wed, 10 Dec 2025 11:19:35 GMT + +_Version update only_ ## 1.0.31 Wed, 03 Dec 2025 09:12:47 GMT diff --git a/packages/vrender-animate/package.json b/packages/vrender-animate/package.json index 3338f1fbd..c733ff0a1 100644 --- a/packages/vrender-animate/package.json +++ b/packages/vrender-animate/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-animate", - "version": "1.0.31", + "version": "1.0.32", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -21,7 +21,7 @@ }, "dependencies": { "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "workspace:1.0.31" + "@visactor/vrender-core": "workspace:1.0.32" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender-components/CHANGELOG.json b/packages/vrender-components/CHANGELOG.json index 0dcb051ca..b03be03a4 100644 --- a/packages/vrender-components/CHANGELOG.json +++ b/packages/vrender-components/CHANGELOG.json @@ -1,6 +1,18 @@ { "name": "@visactor/vrender-components", "entries": [ + { + "version": "1.0.32", + "tag": "@visactor/vrender-components_v1.0.32", + "date": "Wed, 10 Dec 2025 11:19:35 GMT", + "comments": { + "none": [ + { + "comment": "feat: optimiza label overlap\n\n" + } + ] + } + }, { "version": "1.0.31", "tag": "@visactor/vrender-components_v1.0.31", diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md index 96060fc35..535ec4528 100644 --- a/packages/vrender-components/CHANGELOG.md +++ b/packages/vrender-components/CHANGELOG.md @@ -1,6 +1,15 @@ # Change Log - @visactor/vrender-components -This log was last generated on Wed, 03 Dec 2025 09:12:47 GMT and should not be manually modified. +This log was last generated on Wed, 10 Dec 2025 11:19:35 GMT and should not be manually modified. + +## 1.0.32 +Wed, 10 Dec 2025 11:19:35 GMT + +### Updates + +- feat: optimiza label overlap + + ## 1.0.31 Wed, 03 Dec 2025 09:12:47 GMT diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json index 31bf38d64..e29065c49 100644 --- a/packages/vrender-components/package.json +++ b/packages/vrender-components/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-components", - "version": "1.0.31", + "version": "1.0.32", "description": "components library for dp visualization", "sideEffects": false, "main": "cjs/index.js", @@ -27,9 +27,9 @@ "dependencies": { "@visactor/vutils": "~1.0.12", "@visactor/vscale": "~1.0.12", - "@visactor/vrender-core": "workspace:1.0.31", - "@visactor/vrender-kits": "workspace:1.0.31", - "@visactor/vrender-animate": "workspace:1.0.31" + "@visactor/vrender-core": "workspace:1.0.32", + "@visactor/vrender-kits": "workspace:1.0.32", + "@visactor/vrender-animate": "workspace:1.0.32" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender-core/CHANGELOG.json b/packages/vrender-core/CHANGELOG.json index 37558cf25..f60bf97aa 100644 --- a/packages/vrender-core/CHANGELOG.json +++ b/packages/vrender-core/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender-core", "entries": [ + { + "version": "1.0.32", + "tag": "@visactor/vrender-core_v1.0.32", + "date": "Wed, 10 Dec 2025 11:19:35 GMT", + "comments": {} + }, { "version": "1.0.31", "tag": "@visactor/vrender-core_v1.0.31", diff --git a/packages/vrender-core/CHANGELOG.md b/packages/vrender-core/CHANGELOG.md index 3b6855663..f667faee4 100644 --- a/packages/vrender-core/CHANGELOG.md +++ b/packages/vrender-core/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/vrender-core -This log was last generated on Wed, 03 Dec 2025 09:12:47 GMT and should not be manually modified. +This log was last generated on Wed, 10 Dec 2025 11:19:35 GMT and should not be manually modified. + +## 1.0.32 +Wed, 10 Dec 2025 11:19:35 GMT + +_Version update only_ ## 1.0.31 Wed, 03 Dec 2025 09:12:47 GMT diff --git a/packages/vrender-core/package.json b/packages/vrender-core/package.json index 122fc68ca..a064ec10b 100644 --- a/packages/vrender-core/package.json +++ b/packages/vrender-core/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-core", - "version": "1.0.31", + "version": "1.0.32", "description": "", "sideEffects": [ "./src/modules.ts", diff --git a/packages/vrender-kits/CHANGELOG.json b/packages/vrender-kits/CHANGELOG.json index eb5320049..9a8e1d567 100644 --- a/packages/vrender-kits/CHANGELOG.json +++ b/packages/vrender-kits/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender-kits", "entries": [ + { + "version": "1.0.32", + "tag": "@visactor/vrender-kits_v1.0.32", + "date": "Wed, 10 Dec 2025 11:19:35 GMT", + "comments": {} + }, { "version": "1.0.31", "tag": "@visactor/vrender-kits_v1.0.31", diff --git a/packages/vrender-kits/CHANGELOG.md b/packages/vrender-kits/CHANGELOG.md index 393fd0bf7..2ff2111fa 100644 --- a/packages/vrender-kits/CHANGELOG.md +++ b/packages/vrender-kits/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/vrender-kits -This log was last generated on Wed, 03 Dec 2025 09:12:47 GMT and should not be manually modified. +This log was last generated on Wed, 10 Dec 2025 11:19:35 GMT and should not be manually modified. + +## 1.0.32 +Wed, 10 Dec 2025 11:19:35 GMT + +_Version update only_ ## 1.0.31 Wed, 03 Dec 2025 09:12:47 GMT diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json index 73ec0f75d..ad47864ad 100644 --- a/packages/vrender-kits/package.json +++ b/packages/vrender-kits/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-kits", - "version": "1.0.31", + "version": "1.0.32", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -21,7 +21,7 @@ }, "dependencies": { "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "workspace:1.0.31", + "@visactor/vrender-core": "workspace:1.0.32", "@resvg/resvg-js": "2.4.1", "roughjs": "4.6.6", "gifuct-js": "2.1.2", diff --git a/packages/vrender/CHANGELOG.json b/packages/vrender/CHANGELOG.json index 1f4044c87..6ebdcbcc9 100644 --- a/packages/vrender/CHANGELOG.json +++ b/packages/vrender/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender", "entries": [ + { + "version": "1.0.32", + "tag": "@visactor/vrender_v1.0.32", + "date": "Wed, 10 Dec 2025 11:19:35 GMT", + "comments": {} + }, { "version": "1.0.31", "tag": "@visactor/vrender_v1.0.31", diff --git a/packages/vrender/CHANGELOG.md b/packages/vrender/CHANGELOG.md index c3df82891..1b2133e03 100644 --- a/packages/vrender/CHANGELOG.md +++ b/packages/vrender/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/vrender -This log was last generated on Wed, 03 Dec 2025 09:12:47 GMT and should not be manually modified. +This log was last generated on Wed, 10 Dec 2025 11:19:35 GMT and should not be manually modified. + +## 1.0.32 +Wed, 10 Dec 2025 11:19:35 GMT + +_Version update only_ ## 1.0.31 Wed, 03 Dec 2025 09:12:47 GMT diff --git a/packages/vrender/package.json b/packages/vrender/package.json index 8ee4139c7..2dc265e43 100644 --- a/packages/vrender/package.json +++ b/packages/vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender", - "version": "1.0.31", + "version": "1.0.32", "description": "", "sideEffects": true, "main": "cjs/index.js", @@ -24,10 +24,10 @@ "test-watch": "cross-env DEBUG_MODE=1 jest --watch" }, "dependencies": { - "@visactor/vrender-core": "workspace:1.0.31", - "@visactor/vrender-kits": "workspace:1.0.31", - "@visactor/vrender-animate": "workspace:1.0.31", - "@visactor/vrender-components": "workspace:1.0.31" + "@visactor/vrender-core": "workspace:1.0.32", + "@visactor/vrender-kits": "workspace:1.0.32", + "@visactor/vrender-animate": "workspace:1.0.32", + "@visactor/vrender-components": "workspace:1.0.32" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/tools/bugserver-trigger/package.json b/tools/bugserver-trigger/package.json index 62759483d..9eb8e3a9e 100644 --- a/tools/bugserver-trigger/package.json +++ b/tools/bugserver-trigger/package.json @@ -8,11 +8,11 @@ "ci": "ts-node --transpileOnly --skipProject ./scripts/trigger-test.ts" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.31", - "@visactor/vrender-core": "workspace:1.0.31", - "@visactor/vrender-kits": "workspace:1.0.31", - "@visactor/vrender-components": "workspace:1.0.31", - "@visactor/vrender-animate": "workspace:1.0.31" + "@visactor/vrender": "workspace:1.0.32", + "@visactor/vrender-core": "workspace:1.0.32", + "@visactor/vrender-kits": "workspace:1.0.32", + "@visactor/vrender-components": "workspace:1.0.32", + "@visactor/vrender-animate": "workspace:1.0.32" }, "devDependencies": { "@rushstack/eslint-patch": "~1.1.4",