Skip to content

Commit

Permalink
Merge pull request #1195 from VisActor/release/0.19.1
Browse files Browse the repository at this point in the history
[Auto release] release 0.19.1
  • Loading branch information
neuqzxy authored May 8, 2024
2 parents a96cd18 + 5c42d18 commit 6cf17b0
Show file tree
Hide file tree
Showing 31 changed files with 201 additions and 56 deletions.
26 changes: 13 additions & 13 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":"0.19.0","nextBump":"minor"}]
[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.19.1","nextBump":"patch"}]
23 changes: 23 additions & 0 deletions docs/assets/changelog/en/changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
# v0.19.0

2024-04-30


**🆕 New feature**

- **@visactor/vrender-components**: support style callback in html and react, fix 1102
- **@visactor/vrender-kits**: support style callback in html and react, fix 1102
- **@visactor/vrender-core**: draw-contribution support check appName, closed [#1122](https://github.com/VisActor/VRender/issues/1122)
- **@visactor/vrender-core**: set renderService to multi-instance
- **@visactor/vrender-core**: support `opacity`/`fillOpacity`/`strokeOpacity` in richtext
- **@visactor/vrender-core**: support style callback in html and react, fix 1102

**🐛 Bug fix**

- **@visactor/vrender-components**: fix point of event when stage has transform
- **@visactor/vrender-core**: fix point of event when stage has transform



[more detail about v0.19.0](https://github.com/VisActor/VRender/releases/tag/v0.19.0)

# v0.18.17

2024-04-30
Expand Down
23 changes: 23 additions & 0 deletions docs/assets/changelog/zh/changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
# v0.19.0

2024-04-30


**🆕 新增功能**

- **@visactor/vrender-components**: support style callback in html and react, fix 1102
- **@visactor/vrender-kits**: support style callback in html and react, fix 1102
- **@visactor/vrender-core**: draw-contribution support check appName, closed [#1122](https://github.com/VisActor/VRender/issues/1122)
- **@visactor/vrender-core**: set renderService to multi-instance
- **@visactor/vrender-core**: support `opacity`/`fillOpacity`/`strokeOpacity` in richtext
- **@visactor/vrender-core**: support style callback in html and react, fix 1102

**🐛 功能修复**

- **@visactor/vrender-components**: fix point of event when stage has transform
- **@visactor/vrender-core**: fix point of event when stage has transform



[更多详情请查看 v0.19.0](https://github.com/VisActor/VRender/releases/tag/v0.19.0)

# v0.18.17

2024-04-30
Expand Down
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": "~0.18.4",
"@visactor/vgrammar": "~0.5.7",
"@visactor/vrender": "workspace:0.19.0",
"@visactor/vrender": "workspace:0.19.1",
"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": "0.19.1",
"tag": "@visactor/react-vrender-utils_v0.19.1",
"date": "Wed, 08 May 2024 08:47:35 GMT",
"comments": {}
},
{
"version": "0.19.0",
"tag": "@visactor/react-vrender-utils_v0.19.0",
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, 30 Apr 2024 08:40:53 GMT and should not be manually modified.
This log was last generated on Wed, 08 May 2024 08:47:35 GMT and should not be manually modified.

## 0.19.1
Wed, 08 May 2024 08:47:35 GMT

_Version update only_

## 0.19.0
Tue, 30 Apr 2024 08:40:52 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": "0.19.0",
"version": "0.19.1",
"description": "",
"sideEffects": false,
"main": "cjs/index.js",
Expand All @@ -24,8 +24,8 @@
"react-dom": "^18.2.0"
},
"dependencies": {
"@visactor/vrender": "workspace:0.19.0",
"@visactor/react-vrender": "workspace:0.19.0",
"@visactor/vrender": "workspace:0.19.1",
"@visactor/react-vrender": "workspace:0.19.1",
"@visactor/vutils": "~0.18.4",
"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": "0.19.1",
"tag": "@visactor/react-vrender_v0.19.1",
"date": "Wed, 08 May 2024 08:47:35 GMT",
"comments": {}
},
{
"version": "0.19.0",
"tag": "@visactor/react-vrender_v0.19.0",
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, 30 Apr 2024 08:40:53 GMT and should not be manually modified.
This log was last generated on Wed, 08 May 2024 08:47:35 GMT and should not be manually modified.

## 0.19.1
Wed, 08 May 2024 08:47:35 GMT

_Version update only_

## 0.19.0
Tue, 30 Apr 2024 08:40:53 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": "0.19.0",
"version": "0.19.1",
"description": "",
"sideEffects": false,
"main": "cjs/index.js",
Expand All @@ -23,7 +23,7 @@
"react": "^18.2.0"
},
"dependencies": {
"@visactor/vrender": "workspace:0.19.0",
"@visactor/vrender": "workspace:0.19.1",
"@visactor/vutils": "~0.18.4",
"react-reconciler": "^0.29.0",
"tslib": "^2.3.1"
Expand Down
6 changes: 6 additions & 0 deletions packages/vrender-components/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"name": "@visactor/vrender-components",
"entries": [
{
"version": "0.19.1",
"tag": "@visactor/vrender-components_v0.19.1",
"date": "Wed, 08 May 2024 08:47:35 GMT",
"comments": {}
},
{
"version": "0.19.0",
"tag": "@visactor/vrender-components_v0.19.0",
Expand Down
7 changes: 6 additions & 1 deletion packages/vrender-components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Change Log - @visactor/vrender-components

This log was last generated on Tue, 30 Apr 2024 08:40:53 GMT and should not be manually modified.
This log was last generated on Wed, 08 May 2024 08:47:35 GMT and should not be manually modified.

## 0.19.1
Wed, 08 May 2024 08:47:35 GMT

_Version update only_

## 0.19.0
Tue, 30 Apr 2024 08:40:53 GMT
Expand Down
6 changes: 3 additions & 3 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": "0.19.0",
"version": "0.19.1",
"description": "components library for dp visualization",
"sideEffects": false,
"main": "cjs/index.js",
Expand All @@ -24,8 +24,8 @@
"analysis-core": "bundle -f umd -a -i core.ts"
},
"dependencies": {
"@visactor/vrender-core": "workspace:0.19.0",
"@visactor/vrender-kits": "workspace:0.19.0",
"@visactor/vrender-core": "workspace:0.19.1",
"@visactor/vrender-kits": "workspace:0.19.1",
"@visactor/vutils": "~0.18.4",
"@visactor/vscale": "~0.17.3"
},
Expand Down
18 changes: 18 additions & 0 deletions packages/vrender-core/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
{
"name": "@visactor/vrender-core",
"entries": [
{
"version": "0.19.1",
"tag": "@visactor/vrender-core_v0.19.1",
"date": "Wed, 08 May 2024 08:47:35 GMT",
"comments": {
"none": [
{
"comment": "feat: rename forceBreakLine to disableAutoWrapLine"
},
{
"comment": "fix: fix issue with disableAutoWrapLine ellipsis"
},
{
"comment": "fix: fix issue with interactive graphic while base graphic is removed"
}
]
}
},
{
"version": "0.19.0",
"tag": "@visactor/vrender-core_v0.19.0",
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, 30 Apr 2024 08:40:53 GMT and should not be manually modified.
This log was last generated on Wed, 08 May 2024 08:47:35 GMT and should not be manually modified.

## 0.19.1
Wed, 08 May 2024 08:47:35 GMT

### Updates

- feat: rename forceBreakLine to disableAutoWrapLine
- fix: fix issue with disableAutoWrapLine ellipsis
- fix: fix issue with interactive graphic while base graphic is removed

## 0.19.0
Tue, 30 Apr 2024 08:40:53 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": "0.19.0",
"version": "0.19.1",
"description": "",
"sideEffects": [
"./src/modules.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/vrender-core/src/graphic/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ export const DefaultRichTextAttribute: Required<IRichTextGraphicAttribute> = {
textBaseline: 'top' as RichTextGlobalBaselineType,
layoutDirection: 'horizontal',
textConfig: [],
forceBreakLine: false,
disableAutoWrapLine: false,
maxHeight: undefined,
maxWidth: undefined,
singleLine: false
Expand Down
5 changes: 3 additions & 2 deletions packages/vrender-core/src/graphic/richtext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ export class RichText extends Graphic<IRichTextGraphicAttribute> implements IRic
textBaseline,
layoutDirection,
singleLine,
forceBreakLine
disableAutoWrapLine
} = this.attribute;
const paragraphs: (Paragraph | RichTextIcon)[] = [];

Expand Down Expand Up @@ -338,7 +338,7 @@ export class RichText extends Graphic<IRichTextGraphicAttribute> implements IRic
);
const wrapper = new Wrapper(frame);
// debugger;
if (forceBreakLine) {
if (disableAutoWrapLine) {
let lineCount = 0;
let skip = false;
for (let i = 0; i < paragraphs.length; i++) {
Expand All @@ -362,6 +362,7 @@ export class RichText extends Graphic<IRichTextGraphicAttribute> implements IRic
}
if ((p as Paragraph).newLine) {
skip = false;
wrapper.lineWidth = 0;
}
}
} else {
Expand Down
9 changes: 6 additions & 3 deletions packages/vrender-core/src/graphic/richtext/frame.ts
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,8 @@ export default class Frame {
this.lines[i + 1] &&
this.lines[i + 1].top + this.lines[i + 1].height > this[this.directionKey.top] + frameHeight
) {
const lineWidth = this.lines[i].getWidthWithEllips();
const ellipsis = this.ellipsis === true ? '...' : this.ellipsis || '';
const lineWidth = this.lines[i].getWidthWithEllips(ellipsis);
if (lineWidth > widthBound) {
widthBound = lineWidth;
}
Expand Down Expand Up @@ -363,7 +364,8 @@ export default class Frame {
// 判断需要显示省略号且是展示范围内的最后一行
const lastLine = false;
if (this.ellipsis && this.lines[i + 1] && y - this.lines[i + 1].height < this[this.directionKey.top]) {
const lineWidth = this.lines[i].getWidthWithEllips();
const ellipsis = this.ellipsis === true ? '...' : this.ellipsis || '';
const lineWidth = this.lines[i].getWidthWithEllips(ellipsis);
if (lineWidth > widthBound) {
widthBound = lineWidth;
}
Expand Down Expand Up @@ -397,7 +399,8 @@ export default class Frame {
this.lines[i + 1] &&
this.lines[i + 1].top + this.lines[i + 1].height > this[this.directionKey.top] + frameHeight
) {
const lineWidth = this.lines[i].getWidthWithEllips();
const ellipsis = this.ellipsis === true ? '...' : this.ellipsis || '';
const lineWidth = this.lines[i].getWidthWithEllips(ellipsis);
if (lineWidth > widthBound) {
widthBound = lineWidth;
}
Expand Down
Loading

0 comments on commit 6cf17b0

Please sign in to comment.