Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/config/rush/version-policies.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.16","nextBump":"patch"}]
[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.17","nextBump":"patch"}]
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@visactor/vchart": "1.3.0",
"@visactor/vutils": "1.0.6",
"@visactor/vgrammar": "~0.5.7",
"@visactor/vrender": "workspace:1.0.16",
"@visactor/vrender": "workspace:1.0.17",
"markdown-it": "^13.0.0",
"highlight.js": "^11.8.0",
"axios": "^1.4.0",
Expand Down
6 changes: 6 additions & 0 deletions packages/react-vrender-utils/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"name": "@visactor/react-vrender-utils",
"entries": [
{
"version": "1.0.17",
"tag": "@visactor/react-vrender-utils_v1.0.17",
"date": "Wed, 24 Sep 2025 07:38:57 GMT",
"comments": {}
},
{
"version": "1.0.16",
"tag": "@visactor/react-vrender-utils_v1.0.16",
Expand Down
7 changes: 6 additions & 1 deletion packages/react-vrender-utils/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Change Log - @visactor/react-vrender-utils

This log was last generated on Tue, 16 Sep 2025 09:57:05 GMT and should not be manually modified.
This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified.

## 1.0.17
Wed, 24 Sep 2025 07:38:57 GMT

_Version update only_

## 1.0.16
Tue, 16 Sep 2025 09:57:05 GMT
Expand Down
6 changes: 3 additions & 3 deletions packages/react-vrender-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/react-vrender-utils",
"version": "1.0.16",
"version": "1.0.17",
"description": "",
"sideEffects": false,
"main": "cjs/index.js",
Expand All @@ -24,8 +24,8 @@
"react-dom": "^18.2.0"
},
"dependencies": {
"@visactor/vrender": "workspace:1.0.16",
"@visactor/react-vrender": "workspace:1.0.16",
"@visactor/vrender": "workspace:1.0.17",
"@visactor/react-vrender": "workspace:1.0.17",
"@visactor/vutils": "1.0.6",
"react-reconciler": "^0.29.0",
"tslib": "^2.3.1"
Expand Down
6 changes: 6 additions & 0 deletions packages/react-vrender/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"name": "@visactor/react-vrender",
"entries": [
{
"version": "1.0.17",
"tag": "@visactor/react-vrender_v1.0.17",
"date": "Wed, 24 Sep 2025 07:38:57 GMT",
"comments": {}
},
{
"version": "1.0.16",
"tag": "@visactor/react-vrender_v1.0.16",
Expand Down
7 changes: 6 additions & 1 deletion packages/react-vrender/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Change Log - @visactor/react-vrender

This log was last generated on Tue, 16 Sep 2025 09:57:05 GMT and should not be manually modified.
This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified.

## 1.0.17
Wed, 24 Sep 2025 07:38:57 GMT

_Version update only_

## 1.0.16
Tue, 16 Sep 2025 09:57:05 GMT
Expand Down
4 changes: 2 additions & 2 deletions packages/react-vrender/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/react-vrender",
"version": "1.0.16",
"version": "1.0.17",
"description": "",
"sideEffects": false,
"main": "cjs/index.js",
Expand All @@ -23,7 +23,7 @@
"react": "^18.2.0"
},
"dependencies": {
"@visactor/vrender": "workspace:1.0.16",
"@visactor/vrender": "workspace:1.0.17",
"@visactor/vutils": "1.0.6",
"react-reconciler": "^0.29.0",
"tslib": "^2.3.1"
Expand Down
6 changes: 6 additions & 0 deletions packages/vrender-animate/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"name": "@visactor/vrender-animate",
"entries": [
{
"version": "1.0.17",
"tag": "@visactor/vrender-animate_v1.0.17",
"date": "Wed, 24 Sep 2025 07:38:57 GMT",
"comments": {}
},
{
"version": "1.0.16",
"tag": "@visactor/vrender-animate_v1.0.16",
Expand Down
7 changes: 6 additions & 1 deletion packages/vrender-animate/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Change Log - @visactor/vrender-animate

This log was last generated on Tue, 16 Sep 2025 09:57:05 GMT and should not be manually modified.
This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified.

## 1.0.17
Wed, 24 Sep 2025 07:38:57 GMT

_Version update only_

## 1.0.16
Tue, 16 Sep 2025 09:57:05 GMT
Expand Down
4 changes: 2 additions & 2 deletions packages/vrender-animate/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vrender-animate",
"version": "1.0.16",
"version": "1.0.17",
"description": "",
"sideEffects": false,
"main": "cjs/index.js",
Expand All @@ -21,7 +21,7 @@
},
"dependencies": {
"@visactor/vutils": "1.0.6",
"@visactor/vrender-core": "workspace:1.0.16"
"@visactor/vrender-core": "workspace:1.0.17"
},
"devDependencies": {
"@internal/bundler": "workspace:*",
Expand Down
12 changes: 12 additions & 0 deletions packages/vrender-components/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
{
"name": "@visactor/vrender-components",
"entries": [
{
"version": "1.0.17",
"tag": "@visactor/vrender-components_v1.0.17",
"date": "Wed, 24 Sep 2025 07:38:57 GMT",
"comments": {
"none": [
{
"comment": "fix: fix the issue of legend pager\n\n"
}
]
}
},
{
"version": "1.0.16",
"tag": "@visactor/vrender-components_v1.0.16",
Expand Down
11 changes: 10 additions & 1 deletion packages/vrender-components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
# Change Log - @visactor/vrender-components

This log was last generated on Tue, 16 Sep 2025 09:57:05 GMT and should not be manually modified.
This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified.

## 1.0.17
Wed, 24 Sep 2025 07:38:57 GMT

### Updates

- fix: fix the issue of legend pager



## 1.0.16
Tue, 16 Sep 2025 09:57:05 GMT
Expand Down
8 changes: 4 additions & 4 deletions packages/vrender-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vrender-components",
"version": "1.0.16",
"version": "1.0.17",
"description": "components library for dp visualization",
"sideEffects": false,
"main": "cjs/index.js",
Expand All @@ -27,9 +27,9 @@
"dependencies": {
"@visactor/vutils": "1.0.6",
"@visactor/vscale": "1.0.6",
"@visactor/vrender-core": "workspace:1.0.16",
"@visactor/vrender-kits": "workspace:1.0.16",
"@visactor/vrender-animate": "workspace:1.0.16"
"@visactor/vrender-core": "workspace:1.0.17",
"@visactor/vrender-kits": "workspace:1.0.17",
"@visactor/vrender-animate": "workspace:1.0.17"
},
"devDependencies": {
"@internal/bundler": "workspace:*",
Expand Down
8 changes: 5 additions & 3 deletions packages/vrender-components/src/legend/discrete/discrete.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1014,7 +1014,8 @@ export class DiscreteLegend extends LegendBase<DiscreteLegendAttrs> {
(itemsContainer.getChildren() as unknown as IGroup[]).forEach((item, index) => {
const { width, height } = item.attribute;

if (contentWidth < startX + (width as number)) {
// 第一个元素不能换行
if (contentWidth < startX + (width as number) && index > 0) {
// 超出了,则换行
startX = 0;
startY += (height as number) + spaceRow;
Expand Down Expand Up @@ -1058,8 +1059,9 @@ export class DiscreteLegend extends LegendBase<DiscreteLegendAttrs> {
// 重新进行布局

(itemsContainer.getChildren() as unknown as IGroup[]).forEach((item, index) => {
const { height } = item.attribute;
if (contentHeight < startY + (height as number)) {
const { width, height } = item.attribute;
// 第一个元素不能换行
if (contentHeight < startY + (height as number) && index > 0) {
startY = 0;
startX += this._itemMaxWidth + spaceCol;
pages += 1;
Expand Down
12 changes: 12 additions & 0 deletions packages/vrender-core/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
{
"name": "@visactor/vrender-core",
"entries": [
{
"version": "1.0.17",
"tag": "@visactor/vrender-core_v1.0.17",
"date": "Wed, 24 Sep 2025 07:38:57 GMT",
"comments": {
"none": [
{
"comment": "fix: fix the issue of legend pager\n\n"
}
]
}
},
{
"version": "1.0.16",
"tag": "@visactor/vrender-core_v1.0.16",
Expand Down
11 changes: 10 additions & 1 deletion packages/vrender-core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
# Change Log - @visactor/vrender-core

This log was last generated on Tue, 16 Sep 2025 09:57:05 GMT and should not be manually modified.
This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified.

## 1.0.17
Wed, 24 Sep 2025 07:38:57 GMT

### Updates

- fix: fix the issue of legend pager



## 1.0.16
Tue, 16 Sep 2025 09:57:05 GMT
Expand Down
2 changes: 1 addition & 1 deletion packages/vrender-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vrender-core",
"version": "1.0.16",
"version": "1.0.17",
"description": "",
"sideEffects": [
"./src/modules.ts",
Expand Down
6 changes: 6 additions & 0 deletions packages/vrender-kits/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"name": "@visactor/vrender-kits",
"entries": [
{
"version": "1.0.17",
"tag": "@visactor/vrender-kits_v1.0.17",
"date": "Wed, 24 Sep 2025 07:38:57 GMT",
"comments": {}
},
{
"version": "1.0.16",
"tag": "@visactor/vrender-kits_v1.0.16",
Expand Down
7 changes: 6 additions & 1 deletion packages/vrender-kits/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Change Log - @visactor/vrender-kits

This log was last generated on Tue, 16 Sep 2025 09:57:05 GMT and should not be manually modified.
This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified.

## 1.0.17
Wed, 24 Sep 2025 07:38:57 GMT

_Version update only_

## 1.0.16
Tue, 16 Sep 2025 09:57:05 GMT
Expand Down
Loading
Loading