From c4e4d900bac2be54deb06dd68ba66a38bd49e2ce Mon Sep 17 00:00:00 2001 From: skie1997 Date: Mon, 1 Apr 2024 15:31:57 +0800 Subject: [PATCH 01/19] fix(event): event pos error when scale --- .../__tests__/browser/examples/data-zoom.ts | 8 +++++--- packages/vrender-components/src/brush/brush.ts | 6 ++++-- packages/vrender-components/src/data-zoom/data-zoom.ts | 7 +++++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/packages/vrender-components/__tests__/browser/examples/data-zoom.ts b/packages/vrender-components/__tests__/browser/examples/data-zoom.ts index 917b1443a..d7165eb48 100644 --- a/packages/vrender-components/__tests__/browser/examples/data-zoom.ts +++ b/packages/vrender-components/__tests__/browser/examples/data-zoom.ts @@ -37,7 +37,7 @@ export function run() { const dataZoomdisableTriggerEvent = new DataZoom({ start: 0.2, end: 0.5, - maxSpan: 0.4, + // maxSpan: 0.4, position: { x: 50, y: 75 @@ -57,13 +57,15 @@ export function run() { }, middleHandlerStyle: { visible: true - } - // disableTriggerEvent: true + }, + disableTriggerEvent: false }); vglobal.supportsPointerEvents = false; const stage = render([dataZoom, dataZoomdisableTriggerEvent], 'main'); + stage.defaultLayer.scale(1.5, 1.5); + stage.x = 10; // stage.addEventListener('pointermove', e => { // dataZoom.setLocation({ diff --git a/packages/vrender-components/src/brush/brush.ts b/packages/vrender-components/src/brush/brush.ts index 0b189445a..cbbfd9a7b 100644 --- a/packages/vrender-components/src/brush/brush.ts +++ b/packages/vrender-components/src/brush/brush.ts @@ -392,9 +392,11 @@ export class Brush extends AbstractComponent> { /** 事件系统坐标转换为stage坐标 */ protected eventPosToStagePos(e: FederatedPointerEvent) { const { x, y } = vglobal.mapToCanvasPoint(e, this.stage.window.getContext().canvas.nativeCanvas); + const layerPosition = { x, y }; + this.parent.globalTransMatrix.transformPoint({ x, y }, layerPosition); return { - x: x - (this.stage?.x || 0), - y: y - (this.stage?.y || 0) + x: layerPosition.x, + y: layerPosition.y }; } diff --git a/packages/vrender-components/src/data-zoom/data-zoom.ts b/packages/vrender-components/src/data-zoom/data-zoom.ts index 452d5b1c1..0107045dc 100644 --- a/packages/vrender-components/src/data-zoom/data-zoom.ts +++ b/packages/vrender-components/src/data-zoom/data-zoom.ts @@ -129,6 +129,7 @@ export class DataZoom extends AbstractComponent> { protected bindEvents(): void { if (this.attribute.disableTriggerEvent) { + this.setAttribute('childrenPickable', false); return; } const { showDetail, brushSelect } = this.attribute as DataZoomAttributes; @@ -221,9 +222,11 @@ export class DataZoom extends AbstractComponent> { /** 事件系统坐标转换为stage坐标 */ protected eventPosToStagePos(e: FederatedPointerEvent) { const { x, y } = vglobal.mapToCanvasPoint(e, this.stage?.window?.getContext()?.canvas?.nativeCanvas); + const layerPosition = { x, y }; + this.parent.globalTransMatrix.transformPoint({ x, y }, layerPosition); return { - x: x - (this.stage?.x || 0), - y: y - (this.stage?.y || 0) + x: layerPosition.x, + y: layerPosition.y }; } From 711864a95d95df967b9a609d5b5083ce2d7667c7 Mon Sep 17 00:00:00 2001 From: skie1997 Date: Mon, 1 Apr 2024 15:43:24 +0800 Subject: [PATCH 02/19] chore: change log --- .../fix-event-pos-to-layer_2024-04-01-07-43.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 common/changes/@visactor/vrender-components/fix-event-pos-to-layer_2024-04-01-07-43.json diff --git a/common/changes/@visactor/vrender-components/fix-event-pos-to-layer_2024-04-01-07-43.json b/common/changes/@visactor/vrender-components/fix-event-pos-to-layer_2024-04-01-07-43.json new file mode 100644 index 000000000..57b8cf7e4 --- /dev/null +++ b/common/changes/@visactor/vrender-components/fix-event-pos-to-layer_2024-04-01-07-43.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vrender-components", + "comment": "fix(event): event pos error when scale", + "type": "none" + } + ], + "packageName": "@visactor/vrender-components" +} \ No newline at end of file From b6c687ba4dcf28e695f0868eaa4b9bfc818b1f77 Mon Sep 17 00:00:00 2001 From: xile611 Date: Tue, 16 Apr 2024 15:18:32 +0800 Subject: [PATCH 03/19] fix: when clear states, the animations of state should clear --- packages/vrender-core/src/graphic/graphic.ts | 45 ++++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/packages/vrender-core/src/graphic/graphic.ts b/packages/vrender-core/src/graphic/graphic.ts index f8862882d..78317afb4 100644 --- a/packages/vrender-core/src/graphic/graphic.ts +++ b/packages/vrender-core/src/graphic/graphic.ts @@ -776,32 +776,20 @@ export abstract class Graphic = Partial, stateNames: string[], hasAnimation?: boolean, isClear?: boolean) { if (hasAnimation) { const keys = Object.keys(attrs); - const noWorkAAttr = this.getNoWorkAnimateAttr(); + const noWorkAttrs = this.getNoWorkAnimateAttr(); const animateAttrs: Partial = {}; let noAnimateAttrs: Partial | undefined; - if (isClear) { - keys.forEach(key => { - if (!noWorkAAttr[key]) { - animateAttrs[key] = attrs[key] === undefined ? this.getDefaultAttribute(key) : attrs[key]; - } else { - if (!noAnimateAttrs) { - noAnimateAttrs = {}; - } - noAnimateAttrs[key] = attrs[key]; - } - }); - } else { - keys.forEach(key => { - if (!noWorkAAttr[key]) { - animateAttrs[key] = attrs[key]; - } else { - if (!noAnimateAttrs) { - noAnimateAttrs = {}; - } - noAnimateAttrs[key] = attrs[key]; + + keys.forEach(key => { + if (!noWorkAttrs[key]) { + animateAttrs[key] = isClear && attrs[key] === undefined ? this.getDefaultAttribute(key) : attrs[key]; + } else { + if (!noAnimateAttrs) { + noAnimateAttrs = {}; } - }); - } + noAnimateAttrs[key] = attrs[key]; + } + }); const animate = this.animate(); (animate as any).stateNames = stateNames; @@ -812,6 +800,7 @@ export abstract class Graphic = Partial = Partial { + if ((animate as any).stateNames) { + animate.stop(type); + } + }); + } + } + private getNormalAttribute(key: string) { let value = this.attribute[key]; From 61b5004e675b2f8063b007b7e45b32fdb39ba44e Mon Sep 17 00:00:00 2001 From: xile611 Date: Tue, 16 Apr 2024 15:18:46 +0800 Subject: [PATCH 04/19] docs: update changlog of rush --- .../fix-clear-state-animation_2024-04-16-07-18.json | 11 +++++++++++ .../fix-clear-state-animation_2024-04-16-07-18.json | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 common/changes/@visactor/vrender-components/fix-clear-state-animation_2024-04-16-07-18.json create mode 100644 common/changes/@visactor/vrender-core/fix-clear-state-animation_2024-04-16-07-18.json diff --git a/common/changes/@visactor/vrender-components/fix-clear-state-animation_2024-04-16-07-18.json b/common/changes/@visactor/vrender-components/fix-clear-state-animation_2024-04-16-07-18.json new file mode 100644 index 000000000..e7ffc6185 --- /dev/null +++ b/common/changes/@visactor/vrender-components/fix-clear-state-animation_2024-04-16-07-18.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "fix: when clear states, the animations of state should clear\n\n", + "type": "none", + "packageName": "@visactor/vrender-components" + } + ], + "packageName": "@visactor/vrender-components", + "email": "dingling112@gmail.com" +} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-core/fix-clear-state-animation_2024-04-16-07-18.json b/common/changes/@visactor/vrender-core/fix-clear-state-animation_2024-04-16-07-18.json new file mode 100644 index 000000000..64b870bd2 --- /dev/null +++ b/common/changes/@visactor/vrender-core/fix-clear-state-animation_2024-04-16-07-18.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "fix: when clear states, the animations of state should clear\n\n", + "type": "none", + "packageName": "@visactor/vrender-core" + } + ], + "packageName": "@visactor/vrender-core", + "email": "dingling112@gmail.com" +} \ No newline at end of file From e559dae873eef4446597f690a2b0bf467870652c Mon Sep 17 00:00:00 2001 From: skie1997 Date: Tue, 16 Apr 2024 16:05:34 +0800 Subject: [PATCH 05/19] fix(brush): state not correctly when operating mask bounds is not right. fix@VisActor/VChart#2555 --- .../fix-brush-state_2024-04-16-08-05.json | 10 +++++ .../__tests__/browser/examples/brush.ts | 43 ++++++++++++++----- .../vrender-components/src/brush/brush.ts | 24 +++++++---- 3 files changed, 58 insertions(+), 19 deletions(-) create mode 100644 common/changes/@visactor/vrender-components/fix-brush-state_2024-04-16-08-05.json diff --git a/common/changes/@visactor/vrender-components/fix-brush-state_2024-04-16-08-05.json b/common/changes/@visactor/vrender-components/fix-brush-state_2024-04-16-08-05.json new file mode 100644 index 000000000..1979b50b7 --- /dev/null +++ b/common/changes/@visactor/vrender-components/fix-brush-state_2024-04-16-08-05.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vrender-components", + "comment": "fix(brush): state not correctly when operating mask bounds is not right. fix@VisActor/VChart#2555", + "type": "none" + } + ], + "packageName": "@visactor/vrender-components" +} \ No newline at end of file diff --git a/packages/vrender-components/__tests__/browser/examples/brush.ts b/packages/vrender-components/__tests__/browser/examples/brush.ts index a469d885e..d9258fd57 100644 --- a/packages/vrender-components/__tests__/browser/examples/brush.ts +++ b/packages/vrender-components/__tests__/browser/examples/brush.ts @@ -7,8 +7,8 @@ export function run() { const guiObject = { name: 'Brush', - brushMode: 'multiple', - brushType: 'x', + brushMode: 'single', + brushType: 'rect', brushMoved: true, removeOnClick: true, xRange0: 0, @@ -16,7 +16,7 @@ export function run() { yRange0: 0, yRange1: 500, delayType: 'throttle', - delayTime: 100, + delayTime: 0, interactiveRangeY1: 0, interactiveRangeY2: 5000, interactiveRangeX1: 0, @@ -43,22 +43,22 @@ export function run() { const brush = new Brush({ ...attr, - hasMask: false, + hasMask: true, interactiveRange: { minX: 0, minY: 0, - maxX: 250, - maxY: 250 + maxX: 500, + maxY: 500 }, - xRange: [0, 250], - yRange: [0, 250], + xRange: [0, 500], + yRange: [0, 500], brushStyle: { fill: 'red', - fillOpacity: 0.2, + fillOpacity: 1, stroke: '#B0C8F9', strokeWidth: 2 }, - delayTime: 100 + delayTime: 0 }); const brush2 = new Brush({ @@ -73,8 +73,29 @@ export function run() { } }); // brush.setUpdateDragMaskCallback((...parmas) => console.log('parmas', parmas)); + brush.addEventListener('drawStart', () => { + console.log('drawStart'); + }); + brush.addEventListener('moveStart', () => { + console.log('moveStart'); + }); + brush.addEventListener('moveEnd', () => { + console.log('moveEnd'); + }); + brush.addEventListener('drawEnd', () => { + console.log('drawEnd'); + }); + brush.addEventListener('drawing', () => { + console.log('drawing'); + }); + brush.addEventListener('moving', () => { + console.log('moving'); + }); + brush.addEventListener('brushClear', () => { + console.log('brushClear'); + }); - const stage = render([brush, brush2], 'main'); + const stage = render([brush], 'main'); const gui = new GUI(); gui.add(guiObject, 'name'); diff --git a/packages/vrender-components/src/brush/brush.ts b/packages/vrender-components/src/brush/brush.ts index 0b189445a..1d76532ba 100644 --- a/packages/vrender-components/src/brush/brush.ts +++ b/packages/vrender-components/src/brush/brush.ts @@ -229,11 +229,9 @@ export class Brush extends AbstractComponent> { */ private _drawing(e: FederatedPointerEvent) { const pos = this.eventPosToStagePos(e); - const { x1 = 0, x2 = 0, y1 = 0, y2 = 0 } = this._operatingMask?._AABBBounds; const { sizeThreshold = DEFAULT_SIZE_THRESHOLD, brushType } = this.attribute as BrushAttributes; const cacheLength = this._cacheDrawPoints.length; - this._isDrawedBeforeEnd = !!(Math.abs(x2 - x1) > sizeThreshold || Math.abs(y1 - y2) > sizeThreshold); // 如果当前点的位置和上一次点的位置一致,则无需更新 if (cacheLength > 0) { @@ -251,12 +249,22 @@ export class Brush extends AbstractComponent> { // 更新mask形状 const maskPoints = this._computeMaskPoints(); this._operatingMask.setAttribute('points', maskPoints); - this._brushMaskAABBBoundsDict[this._operatingMask.name] = this._operatingMask.AABBBounds; - this._dispatchEvent(IOperateType.drawing, { - operateMask: this._operatingMask as any, - operatedMaskAABBBounds: this._brushMaskAABBBoundsDict, - event: e - }); + + // 更新形状之后再判断是否需要正在绘制 + // if not, 则_isDrawedBeforeEnd false + // then: 1. 不暴露drawing状态 2. 在brushEnd时该形状会被清空 + const { x1 = 0, x2 = 0, y1 = 0, y2 = 0 } = this._operatingMask?._AABBBounds; + this._isDrawedBeforeEnd = + !this._operatingMask._AABBBounds.empty() && + !!(Math.abs(x2 - x1) > sizeThreshold || Math.abs(y1 - y2) > sizeThreshold); + if (this._isDrawedBeforeEnd) { + this._brushMaskAABBBoundsDict[this._operatingMask.name] = this._operatingMask.AABBBounds; + this._dispatchEvent(IOperateType.drawing, { + operateMask: this._operatingMask as any, + operatedMaskAABBBounds: this._brushMaskAABBBoundsDict, + event: e + }); + } } /** From 5c09ea53b5a7b845641a98a6b9ce23a04547e93e Mon Sep 17 00:00:00 2001 From: skie1997 Date: Tue, 16 Apr 2024 17:34:01 +0800 Subject: [PATCH 06/19] fix(brush): reduce brush clear --- packages/vrender-components/src/brush/brush.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/vrender-components/src/brush/brush.ts b/packages/vrender-components/src/brush/brush.ts index 1d76532ba..ad4b2eae8 100644 --- a/packages/vrender-components/src/brush/brush.ts +++ b/packages/vrender-components/src/brush/brush.ts @@ -138,13 +138,15 @@ export class Brush extends AbstractComponent> { e.preventDefault(); const { removeOnClick = true } = this.attribute as BrushAttributes; if (this._activeDrawState && !this._isDrawedBeforeEnd && removeOnClick) { + if (this._operatingMask?._AABBBounds.empty()) { + this._dispatchEvent(IOperateType.brushClear, { + operateMask: this._operatingMask as any, + operatedMaskAABBBounds: this._brushMaskAABBBoundsDict, + event: e + }); + } this._container.incrementalClearChild(); this._brushMaskAABBBoundsDict = {}; - this._dispatchEvent(IOperateType.brushClear, { - operateMask: this._operatingMask as any, - operatedMaskAABBBounds: this._brushMaskAABBBoundsDict, - event: e - }); } else { if (this._activeDrawState) { this._dispatchEvent(IOperateType.drawEnd, { From f62c3310599cffaa6845e7ffd97d1fafab437894 Mon Sep 17 00:00:00 2001 From: xile611 Date: Tue, 16 Apr 2024 17:37:34 +0800 Subject: [PATCH 07/19] fix: fix the issue of update selected value of slider --- .../vrender-components/src/slider/slider.ts | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/packages/vrender-components/src/slider/slider.ts b/packages/vrender-components/src/slider/slider.ts index c3e791c8a..f3e84c4f6 100644 --- a/packages/vrender-components/src/slider/slider.ts +++ b/packages/vrender-components/src/slider/slider.ts @@ -1084,21 +1084,27 @@ export class Slider extends AbstractComponent> { } private _getHandlers() { + const { inverse } = this.attribute as SliderAttributes; let startHandler = this._startHandler; let endHandler = this._endHandler; - let temp; + + if (!endHandler) { + return { startHandler, endHandler }; + } if (this._isHorizontal) { - if (endHandler && (endHandler.attribute.x as number) < (startHandler?.attribute.x as number)) { - temp = startHandler; - startHandler = endHandler; - endHandler = temp; + if ( + (!inverse && (endHandler.attribute.x as number) < (startHandler?.attribute.x as number)) || + (inverse && (endHandler.attribute.x as number) > (startHandler?.attribute.x as number)) + ) { + [startHandler, endHandler] = [endHandler, startHandler]; } } else { - if (endHandler && (endHandler.attribute.y as number) < (startHandler?.attribute.y as number)) { - temp = startHandler; - startHandler = endHandler; - endHandler = temp; + if ( + (!inverse && (endHandler.attribute.y as number) < (startHandler?.attribute.y as number)) || + (inverse && (endHandler.attribute.y as number) > (startHandler?.attribute.y as number)) + ) { + [startHandler, endHandler] = [endHandler, startHandler]; } } From b9cf1fa7e8a3801bd8b395ef3804b5d849a5caeb Mon Sep 17 00:00:00 2001 From: xile611 Date: Tue, 16 Apr 2024 17:39:15 +0800 Subject: [PATCH 08/19] docs: update changlog of rush --- .../fix-slider-inverse-update_2024-04-16-09-39.json | 11 +++++++++++ .../fix-slider-inverse-update_2024-04-16-09-39.json | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 common/changes/@visactor/vrender-components/fix-slider-inverse-update_2024-04-16-09-39.json create mode 100644 common/changes/@visactor/vrender-core/fix-slider-inverse-update_2024-04-16-09-39.json diff --git a/common/changes/@visactor/vrender-components/fix-slider-inverse-update_2024-04-16-09-39.json b/common/changes/@visactor/vrender-components/fix-slider-inverse-update_2024-04-16-09-39.json new file mode 100644 index 000000000..26d9b30e8 --- /dev/null +++ b/common/changes/@visactor/vrender-components/fix-slider-inverse-update_2024-04-16-09-39.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "fix: fix the issue of update selected value of slider\n\n", + "type": "none", + "packageName": "@visactor/vrender-components" + } + ], + "packageName": "@visactor/vrender-components", + "email": "dingling112@gmail.com" +} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-core/fix-slider-inverse-update_2024-04-16-09-39.json b/common/changes/@visactor/vrender-core/fix-slider-inverse-update_2024-04-16-09-39.json new file mode 100644 index 000000000..d2ee35c3a --- /dev/null +++ b/common/changes/@visactor/vrender-core/fix-slider-inverse-update_2024-04-16-09-39.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "fix: fix the issue of update selected value of slider\n\n", + "type": "none", + "packageName": "@visactor/vrender-core" + } + ], + "packageName": "@visactor/vrender-core", + "email": "dingling112@gmail.com" +} \ No newline at end of file From 81029289bea66e064e04b07225e0266f5eff8aeb Mon Sep 17 00:00:00 2001 From: skie1997 Date: Tue, 16 Apr 2024 17:52:31 +0800 Subject: [PATCH 09/19] chore: add notes --- packages/vrender-components/src/brush/brush.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/vrender-components/src/brush/brush.ts b/packages/vrender-components/src/brush/brush.ts index ad4b2eae8..0560eef8c 100644 --- a/packages/vrender-components/src/brush/brush.ts +++ b/packages/vrender-components/src/brush/brush.ts @@ -138,6 +138,10 @@ export class Brush extends AbstractComponent> { e.preventDefault(); const { removeOnClick = true } = this.attribute as BrushAttributes; if (this._activeDrawState && !this._isDrawedBeforeEnd && removeOnClick) { + // _isDrawedBeforeEnd有两种情况: + // 1. 没有绘制mask + // 2. 绘制了mask但没有超过阈值 + // 只有第2种情况才会触发clear, 可以理解为双击才触发clear if (this._operatingMask?._AABBBounds.empty()) { this._dispatchEvent(IOperateType.brushClear, { operateMask: this._operatingMask as any, From b2f4506f005726e984fed45c9571145c6f3f1c20 Mon Sep 17 00:00:00 2001 From: xile611 Date: Tue, 16 Apr 2024 18:13:08 +0800 Subject: [PATCH 10/19] docs: update changlog of rush --- .../fix-slider-inverse-update_2024-04-16-10-13.json | 11 +++++++++++ .../fix-slider-inverse-update_2024-04-16-10-13.json | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 common/changes/@visactor/vrender-components/fix-slider-inverse-update_2024-04-16-10-13.json create mode 100644 common/changes/@visactor/vrender-core/fix-slider-inverse-update_2024-04-16-10-13.json diff --git a/common/changes/@visactor/vrender-components/fix-slider-inverse-update_2024-04-16-10-13.json b/common/changes/@visactor/vrender-components/fix-slider-inverse-update_2024-04-16-10-13.json new file mode 100644 index 000000000..2bcf645ad --- /dev/null +++ b/common/changes/@visactor/vrender-components/fix-slider-inverse-update_2024-04-16-10-13.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "docs: update changlog of rush\n\n", + "type": "none", + "packageName": "@visactor/vrender-components" + } + ], + "packageName": "@visactor/vrender-components", + "email": "dingling112@gmail.com" +} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-core/fix-slider-inverse-update_2024-04-16-10-13.json b/common/changes/@visactor/vrender-core/fix-slider-inverse-update_2024-04-16-10-13.json new file mode 100644 index 000000000..adb7f8118 --- /dev/null +++ b/common/changes/@visactor/vrender-core/fix-slider-inverse-update_2024-04-16-10-13.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "docs: update changlog of rush\n\n", + "type": "none", + "packageName": "@visactor/vrender-core" + } + ], + "packageName": "@visactor/vrender-core", + "email": "dingling112@gmail.com" +} \ No newline at end of file From 6fa9a3c8ee08a970b7a565621d316e1e5d9f0a2d Mon Sep 17 00:00:00 2001 From: "jiangtao.yang" Date: Tue, 16 Apr 2024 21:55:51 +0800 Subject: [PATCH 11/19] refactor: replace wrap text with text --- packages/vrender-components/src/checkbox/checkbox.ts | 6 +++--- packages/vrender-components/src/checkbox/register.ts | 4 ++-- packages/vrender-components/src/checkbox/type.ts | 4 ++-- packages/vrender-components/src/poptip/poptip.ts | 6 ++++-- packages/vrender-components/src/poptip/register.ts | 4 ++-- packages/vrender-components/src/title/register.ts | 4 ++-- packages/vrender-components/src/title/title.ts | 6 ++++-- 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/packages/vrender-components/src/checkbox/checkbox.ts b/packages/vrender-components/src/checkbox/checkbox.ts index 0748605c0..aa4ec8212 100644 --- a/packages/vrender-components/src/checkbox/checkbox.ts +++ b/packages/vrender-components/src/checkbox/checkbox.ts @@ -1,7 +1,7 @@ import { merge } from '@visactor/vutils'; import { AbstractComponent } from '../core/base'; import type { CheckboxAttributes } from './type'; -import { Image, Rect, WrapText } from '@visactor/vrender-core'; +import { Image, Rect, Text } from '@visactor/vrender-core'; import type { ComponentOptions } from '../interface'; import { loadCheckBoxComponent } from './register'; @@ -53,7 +53,7 @@ export class CheckBox extends AbstractComponent> { _box: Rect; _checkIcon: Image; _indeterminateIcon: Image; - _text: WrapText; + _text: Text; constructor(attributes: CheckboxAttributes, options?: ComponentOptions) { super(options?.skipDefault ? attributes : merge({}, CheckBox.defaultAttributes, attributes)); @@ -124,7 +124,7 @@ export class CheckBox extends AbstractComponent> { } renderText() { - this._text = new WrapText(merge({}, this.attribute.text)); + this._text = new Text(merge({ wrap: true }, this.attribute.text)); if (this.attribute.disabled) { this._text.setAttribute('fill', this.attribute.text.disableFill); } diff --git a/packages/vrender-components/src/checkbox/register.ts b/packages/vrender-components/src/checkbox/register.ts index f639df7eb..93bcd8271 100644 --- a/packages/vrender-components/src/checkbox/register.ts +++ b/packages/vrender-components/src/checkbox/register.ts @@ -1,8 +1,8 @@ -import { registerGroup, registerImage, registerRect, registerWrapText } from '@visactor/vrender-kits'; +import { registerGroup, registerImage, registerRect, registerText } from '@visactor/vrender-kits'; export function loadCheckBoxComponent() { registerGroup(); registerRect(); - registerWrapText(); + registerText(); registerImage(); } diff --git a/packages/vrender-components/src/checkbox/type.ts b/packages/vrender-components/src/checkbox/type.ts index 8474ccd66..41e88f586 100644 --- a/packages/vrender-components/src/checkbox/type.ts +++ b/packages/vrender-components/src/checkbox/type.ts @@ -4,12 +4,12 @@ import type { IGroupGraphicAttribute, IImageGraphicAttribute, IRectGraphicAttribute, - IWrapTextGraphicAttribute + ITextGraphicAttribute } from '@visactor/vrender-core'; export type CheckboxText = { disableFill?: IColor; -} & IWrapTextGraphicAttribute; +} & ITextGraphicAttribute; export type CheckboxIcon = { checkIconImage?: string | HTMLImageElement | HTMLCanvasElement; diff --git a/packages/vrender-components/src/poptip/poptip.ts b/packages/vrender-components/src/poptip/poptip.ts index c4d669d05..8845b6b78 100644 --- a/packages/vrender-components/src/poptip/poptip.ts +++ b/packages/vrender-components/src/poptip/poptip.ts @@ -94,6 +94,7 @@ export class PopTip extends AbstractComponent> { const titleAttrs = { text: isArray(title) ? title : ([title] as any), visible: titleVisible, + wrap: true, ...titleStyle, x: parsedPadding[3], y: parsedPadding[0], @@ -102,7 +103,7 @@ export class PopTip extends AbstractComponent> { textBaseline: 'top' as TextBaselineType }; - const titleShape = group.createOrUpdateChild('poptip-title', titleAttrs, 'wrapText') as IText; + const titleShape = group.createOrUpdateChild('poptip-title', titleAttrs, 'text') as IText; if (!isEmpty(state?.title)) { titleShape.states = state.title; } @@ -119,6 +120,7 @@ export class PopTip extends AbstractComponent> { const contentAttrs = { text: isArray(content) ? content : ([content] as any), visible: contentVisible, + wrap: true, ...contentStyle, x: parsedPadding[3], y: parsedPadding[0] + height, @@ -127,7 +129,7 @@ export class PopTip extends AbstractComponent> { textBaseline: 'top' as TextBaselineType }; - const contentShape = group.createOrUpdateChild('poptip-content', contentAttrs, 'wrapText') as IText; + const contentShape = group.createOrUpdateChild('poptip-content', contentAttrs, 'text') as IText; if (!isEmpty(state?.content)) { contentShape.states = state.content; } diff --git a/packages/vrender-components/src/poptip/register.ts b/packages/vrender-components/src/poptip/register.ts index c50701fef..9e91d66a9 100644 --- a/packages/vrender-components/src/poptip/register.ts +++ b/packages/vrender-components/src/poptip/register.ts @@ -2,11 +2,11 @@ import { container } from '@visactor/vrender-core'; import { merge } from '@visactor/vutils'; import type { PopTipAttributes } from './type'; import { DEFAULT_THEME, theme } from './theme'; -import { registerGroup, registerRect, registerSymbol, registerWrapText } from '@visactor/vrender-kits'; +import { registerGroup, registerRect, registerSymbol, registerText } from '@visactor/vrender-kits'; export function loadPoptipComponent() { registerGroup(); - registerWrapText(); + registerText(); registerSymbol(); registerRect(); } diff --git a/packages/vrender-components/src/title/register.ts b/packages/vrender-components/src/title/register.ts index f4b4571e2..ab088a14c 100644 --- a/packages/vrender-components/src/title/register.ts +++ b/packages/vrender-components/src/title/register.ts @@ -1,7 +1,7 @@ -import { registerGroup, registerWrapText, registerRichtext } from '@visactor/vrender-kits'; +import { registerGroup, registerRichtext, registerText } from '@visactor/vrender-kits'; export function loadTitleComponent() { registerGroup(); - registerWrapText(); + registerText(); registerRichtext(); } diff --git a/packages/vrender-components/src/title/title.ts b/packages/vrender-components/src/title/title.ts index eadc18915..f719e24a5 100644 --- a/packages/vrender-components/src/title/title.ts +++ b/packages/vrender-components/src/title/title.ts @@ -106,6 +106,7 @@ export class Title extends AbstractComponent> { 'mainTitle', { text: isArray(text) ? (text as any) : [text as string], + wrap: true, ...textStyle, maxLineWidth: textStyle.maxLineWidth ?? width, heightLimit: textStyle.heightLimit, @@ -114,7 +115,7 @@ export class Title extends AbstractComponent> { x: 0, y: 0 }, - 'wrapText' + 'text' ) as IText; } } @@ -162,6 +163,7 @@ export class Title extends AbstractComponent> { 'subTitle', { text: isArray(subtext) ? (subtext as any) : [subtext as string], + wrap: true, ...subtextStyle, maxLineWidth: subtextStyle.maxLineWidth ?? width, heightLimit: subtextStyle.heightLimit, @@ -170,7 +172,7 @@ export class Title extends AbstractComponent> { x: 0, y: maintextHeight }, - 'wrapText' + 'text' ) as IText; } } From 7174590ca4f3cea794e5f513dc5ca7e693e8f8ec Mon Sep 17 00:00:00 2001 From: "jiangtao.yang" Date: Tue, 16 Apr 2024 21:56:49 +0800 Subject: [PATCH 12/19] docs: add change log --- ...r-replace-wrap-text-with-text_2024-04-16-13-56.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 common/changes/@visactor/vrender-components/refactor-replace-wrap-text-with-text_2024-04-16-13-56.json diff --git a/common/changes/@visactor/vrender-components/refactor-replace-wrap-text-with-text_2024-04-16-13-56.json b/common/changes/@visactor/vrender-components/refactor-replace-wrap-text-with-text_2024-04-16-13-56.json new file mode 100644 index 000000000..9f28c2f8a --- /dev/null +++ b/common/changes/@visactor/vrender-components/refactor-replace-wrap-text-with-text_2024-04-16-13-56.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vrender-components", + "comment": "refactor: replace wrapText with text", + "type": "none" + } + ], + "packageName": "@visactor/vrender-components" +} \ No newline at end of file From 0c12086174cfe2a93f5179887f162eb112d023f7 Mon Sep 17 00:00:00 2001 From: Rui-Sun Date: Wed, 17 Apr 2024 17:10:44 +0800 Subject: [PATCH 13/19] fix: add ellipsis in height limit --- ...height-limit-ellipsis_2024-04-17-09-10.json | 10 ++++++++++ .../contributions/textMeasure/AtextMeasure.ts | 12 +++++++++--- packages/vrender-core/src/graphic/text.ts | 5 +++-- .../__tests__/browser/src/pages/text.ts | 18 ++++++++++++++++++ 4 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 common/changes/@visactor/vrender-core/fix-text-height-limit-ellipsis_2024-04-17-09-10.json diff --git a/common/changes/@visactor/vrender-core/fix-text-height-limit-ellipsis_2024-04-17-09-10.json b/common/changes/@visactor/vrender-core/fix-text-height-limit-ellipsis_2024-04-17-09-10.json new file mode 100644 index 000000000..a04a11be9 --- /dev/null +++ b/common/changes/@visactor/vrender-core/fix-text-height-limit-ellipsis_2024-04-17-09-10.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vrender-core", + "comment": "fix: add ellipsis in height limit", + "type": "none" + } + ], + "packageName": "@visactor/vrender-core" +} \ No newline at end of file diff --git a/packages/vrender-core/src/core/contributions/textMeasure/AtextMeasure.ts b/packages/vrender-core/src/core/contributions/textMeasure/AtextMeasure.ts index 4cc2a7e48..a1f14b287 100644 --- a/packages/vrender-core/src/core/contributions/textMeasure/AtextMeasure.ts +++ b/packages/vrender-core/src/core/contributions/textMeasure/AtextMeasure.ts @@ -431,7 +431,8 @@ export class ATextMeasure implements ITextMeasure { width: number, suffix: string, wordBreak: boolean, - position: 'start' | 'end' | 'middle' + position: 'start' | 'end' | 'middle', + forceSuffix: boolean = false ): { str: string; width: number; @@ -443,13 +444,16 @@ export class ATextMeasure implements ITextMeasure { return { str: '', width: 0 }; } const length = this.measureTextWidth(text, options); - if (length <= width) { + if (!forceSuffix && length <= width) { return { str: text, width: length }; } const suffixWidth = this.measureTextWidth(suffix, options); if (suffixWidth > width) { return { str: '', width: 0 }; } + if (forceSuffix && length + suffixWidth <= width) { + return { str: text + suffix, width: length + suffixWidth }; + } width -= suffixWidth; const data = this._clipText(text, options, width, 0, text.length - 1, position, suffix); @@ -457,9 +461,11 @@ export class ATextMeasure implements ITextMeasure { if (wordBreak && data.str !== text) { const index = testLetter(text, data.str.length); if (index !== data.str.length) { - data.str = text.substring(0, index); + data.result = text.substring(0, index); data.width = this.measureTextWidth(data.str, options); } + } else if (forceSuffix && data.str === text) { + data.result = text + suffix; } data.str = data.result!; data.width += suffixWidth; diff --git a/packages/vrender-core/src/graphic/text.ts b/packages/vrender-core/src/graphic/text.ts index 4b20ed9cf..67f1dedbf 100644 --- a/packages/vrender-core/src/graphic/text.ts +++ b/packages/vrender-core/src/graphic/text.ts @@ -216,14 +216,15 @@ export class Text extends Graphic implements IText { // 判断是否超过高度限制 if (i === lineCountLimit - 1) { - // 当前行为最后一行 + // 当前行为最后一行,如果后面还有行,需要显示省略号 const clip = layoutObj.textMeasure.clipTextWithSuffix( str, layoutObj.textOptions, maxLineWidth, ellipsis, false, - suffixPosition + suffixPosition, + i !== lines.length - 1 ); linesLayout.push({ str: clip.str, diff --git a/packages/vrender/__tests__/browser/src/pages/text.ts b/packages/vrender/__tests__/browser/src/pages/text.ts index 1ef8b0353..2556e25a9 100644 --- a/packages/vrender/__tests__/browser/src/pages/text.ts +++ b/packages/vrender/__tests__/browser/src/pages/text.ts @@ -176,6 +176,24 @@ export const page = () => { }); graphics.push(rect); + const textLimit = createText({ + x: 800, + y: 500, + fill: colorPools[5], + // text: ['Tffg'], + text: ['这是textabc这aaaaa是什么', '这是阿萨姆abcaaaaabcdef', '这是textabc这aaaaa是什么', '这是阿萨姆abcaaaaa'], + // text: '这是textabc这aaaaa是什么这是阿萨姆abcaaaaabcdef这是textabc这aaaaa是什么这是阿萨姆abcaaaaa', + heightLimit: 40, + wordBreak: 'break-word', + maxLineWidth: 200, + stroke: 'green', + textAlign: 'left', + textBaseline: 'middle', + whiteSpace: 'normal' + // wrap: true + }); + graphics.push(textLimit); + const stage = createStage({ canvas: 'main', autoRender: true From f6bcc8276364ebfe544343bd95a7ecf0500a8e05 Mon Sep 17 00:00:00 2001 From: neuqzxy Date: Thu, 18 Apr 2024 03:22:22 +0000 Subject: [PATCH 14/19] docs: generate changelog of release v0.18.11 --- docs/assets/changelog/en/changelog.md | 24 ++++++++++++++++++++++++ docs/assets/changelog/zh/changelog.md | 24 ++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/docs/assets/changelog/en/changelog.md b/docs/assets/changelog/en/changelog.md index 748c786e8..4e4d2d2e3 100644 --- a/docs/assets/changelog/en/changelog.md +++ b/docs/assets/changelog/en/changelog.md @@ -1,3 +1,27 @@ +# v0.18.11 + +2024-04-18 + + +**🆕 New feature** + +- **@visactor/vrender-core**: 支持background-opacity配置 + +**🐛 Bug fix** + +- **@visactor/vrender-components**: change click into pointup in checkbox +- **@visactor/vrender-components**: player click event not working +- **@visactor/vrender-components**: player slider value error after resize +- **@visactor/vrender-kits**: fix for dragenter triggering error in drag event +- **@visactor/vrender-core**: fix issue with wh changed by flex layout, closed [#1088](https://github.com/VisActor/VRender/issues/1088) +- **@visactor/vrender-core**: pointerenter and pointerleave do not bubble, fixed [#1132](https://github.com/VisActor/VRender/issues/1132) +- **@visactor/vrender-core**: fix for dragenter triggering error in drag event +- **@visactor/vrender-core**: fix memory issue with stage timeline and DefaultRenderService + + + +[more detail about v0.18.11](https://github.com/VisActor/VRender/releases/tag/v0.18.11) + # v0.18.10 2024-03-29 diff --git a/docs/assets/changelog/zh/changelog.md b/docs/assets/changelog/zh/changelog.md index bcabf3a9d..fd7dc1469 100644 --- a/docs/assets/changelog/zh/changelog.md +++ b/docs/assets/changelog/zh/changelog.md @@ -1,3 +1,27 @@ +# v0.18.11 + +2024-04-18 + + +**🆕 新增功能** + +- **@visactor/vrender-core**: 支持background-opacity配置 + +**🐛 功能修复** + +- **@visactor/vrender-components**: change click into pointup in checkbox +- **@visactor/vrender-components**: player click event not working +- **@visactor/vrender-components**: player slider value error after resize +- **@visactor/vrender-kits**: fix for dragenter triggering error in drag event +- **@visactor/vrender-core**: fix issue with wh changed by flex layout, closed [#1088](https://github.com/VisActor/VRender/issues/1088) +- **@visactor/vrender-core**: pointerenter and pointerleave do not bubble, fixed [#1132](https://github.com/VisActor/VRender/issues/1132) +- **@visactor/vrender-core**: fix for dragenter triggering error in drag event +- **@visactor/vrender-core**: fix memory issue with stage timeline and DefaultRenderService + + + +[更多详情请查看 v0.18.11](https://github.com/VisActor/VRender/releases/tag/v0.18.11) + # v0.18.10 2024-03-29 From 853e9c842fce4712ef284af651d6c730a33b8399 Mon Sep 17 00:00:00 2001 From: Rui-Sun Date: Thu, 18 Apr 2024 21:11:31 +0800 Subject: [PATCH 15/19] fix: fix bounds update in updateGroupAABBBounds() --- .../src/graphic/graphic-service/graphic-service.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/vrender-core/src/graphic/graphic-service/graphic-service.ts b/packages/vrender-core/src/graphic/graphic-service/graphic-service.ts index 374cca4eb..a76b48c58 100644 --- a/packages/vrender-core/src/graphic/graphic-service/graphic-service.ts +++ b/packages/vrender-core/src/graphic/graphic-service/graphic-service.ts @@ -750,6 +750,9 @@ export class DefaultGraphicService implements IGraphicService { aabbBounds: IAABBBounds, graphic?: IGroup ) { + const originalAABBBounds = aabbBounds; // fix aabbbounds update error in flex layout + aabbBounds = aabbBounds.clone(); + const { width, height, path, clip = groupTheme.clip } = attribute; // 添加自身的fill或者clip if (path && path.length) { @@ -757,7 +760,7 @@ export class DefaultGraphicService implements IGraphicService { aabbBounds.union(g.AABBBounds); }); } else if (width != null && height != null) { - aabbBounds.set(0, 0, width, height); + aabbBounds.set(0, 0, Math.max(0, width), Math.max(0, height)); // fix bounds set when auto size in vtable } if (!clip) { // 添加子节点 @@ -771,7 +774,9 @@ export class DefaultGraphicService implements IGraphicService { tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2); tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2); this.transformAABBBounds(attribute, aabbBounds, groupTheme, false, graphic); - return aabbBounds; + + originalAABBBounds.copy(aabbBounds); + return originalAABBBounds; } updateGlyphAABBBounds( From c19af2e1d2fece9389c695ab791cd342007e9490 Mon Sep 17 00:00:00 2001 From: Rui-Sun Date: Thu, 11 Apr 2024 11:29:18 +0800 Subject: [PATCH 16/19] fix: fix radio bound box --- .../feat-radio_2024-04-08-07-05.json | 10 ++++++++++ packages/vrender-components/src/checkbox/checkbox.ts | 2 ++ packages/vrender-components/src/radio/radio.ts | 12 ++++++++---- 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 common/changes/@visactor/vrender-components/feat-radio_2024-04-08-07-05.json diff --git a/common/changes/@visactor/vrender-components/feat-radio_2024-04-08-07-05.json b/common/changes/@visactor/vrender-components/feat-radio_2024-04-08-07-05.json new file mode 100644 index 000000000..768a6f85e --- /dev/null +++ b/common/changes/@visactor/vrender-components/feat-radio_2024-04-08-07-05.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vrender-components", + "comment": "feat: add radio component", + "type": "none" + } + ], + "packageName": "@visactor/vrender-components" +} \ No newline at end of file diff --git a/packages/vrender-components/src/checkbox/checkbox.ts b/packages/vrender-components/src/checkbox/checkbox.ts index 0748605c0..89db87856 100644 --- a/packages/vrender-components/src/checkbox/checkbox.ts +++ b/packages/vrender-components/src/checkbox/checkbox.ts @@ -189,5 +189,7 @@ export class CheckBox extends AbstractComponent> { eventType: 'checkbox_state_change', checked: this.attribute.checked }); + + this.stage.renderNextFrame(); }; } diff --git a/packages/vrender-components/src/radio/radio.ts b/packages/vrender-components/src/radio/radio.ts index 9f131582c..f21023916 100644 --- a/packages/vrender-components/src/radio/radio.ts +++ b/packages/vrender-components/src/radio/radio.ts @@ -27,6 +27,7 @@ export class Radio extends AbstractComponent> { innerRadius: 3, startAngle: 0, endAngle: 2 * Math.PI, + lineWidth: 1, fill: '#fff', stroke: 'rgb(229,230,235)', disableFill: 'rgb(242,243,245)', @@ -100,14 +101,15 @@ export class Radio extends AbstractComponent> { } layout() { - const circleHeight = this.attribute.circle.outerRadius * 2; + const circleHeight = (this.attribute.circle.outerRadius + this.attribute.circle.lineWidth) * 2; const textHeight = this._text.AABBBounds.height(); const maxHeight = Math.max(circleHeight, textHeight); - const circleY = maxHeight / 2 - circleHeight / 2 + this.attribute.circle.outerRadius; + const circleY = + maxHeight / 2 - circleHeight / 2 + this.attribute.circle.outerRadius + this.attribute.circle.lineWidth; const textY = maxHeight / 2 - textHeight / 2; - const circleWidth = this.attribute.circle.outerRadius * 2; - const circleX = this.attribute.circle.outerRadius; + const circleWidth = (this.attribute.circle.outerRadius + this.attribute.circle.lineWidth) * 2; + const circleX = this.attribute.circle.outerRadius + this.attribute.circle.lineWidth; const textX = circleWidth + this.attribute.spaceBetweenTextAndIcon; this._circle.setAttributes({ @@ -131,5 +133,7 @@ export class Radio extends AbstractComponent> { eventType: 'radio_checked', target: this }); + + this.stage.renderNextFrame(); }; } From 2db858cb83382ecd4b875fac8434b3ea07ec8dc6 Mon Sep 17 00:00:00 2001 From: zhouxinyu Date: Fri, 19 Apr 2024 14:56:16 +0800 Subject: [PATCH 17/19] fix: fix issue with render html --- .../vrender-core/fix-html-memory_2024-04-19-06-56.json | 10 ++++++++++ packages/vrender-core/src/core/stage.ts | 1 + packages/vrender-core/src/render/render-service.ts | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 common/changes/@visactor/vrender-core/fix-html-memory_2024-04-19-06-56.json diff --git a/common/changes/@visactor/vrender-core/fix-html-memory_2024-04-19-06-56.json b/common/changes/@visactor/vrender-core/fix-html-memory_2024-04-19-06-56.json new file mode 100644 index 000000000..d8e61dddd --- /dev/null +++ b/common/changes/@visactor/vrender-core/fix-html-memory_2024-04-19-06-56.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vrender-core", + "comment": "fix: fix issue with render html", + "type": "none" + } + ], + "packageName": "@visactor/vrender-core" +} \ No newline at end of file diff --git a/packages/vrender-core/src/core/stage.ts b/packages/vrender-core/src/core/stage.ts index b8af44fc7..5f69ceaa8 100644 --- a/packages/vrender-core/src/core/stage.ts +++ b/packages/vrender-core/src/core/stage.ts @@ -883,6 +883,7 @@ export class Stage extends Group implements IStage { this.interactiveLayer && this.interactiveLayer.release(); this.window.release(); this.ticker.remTimeline(this.timeline); + this.renderService.renderTreeRoots = []; } setStage(stage?: IStage) { diff --git a/packages/vrender-core/src/render/render-service.ts b/packages/vrender-core/src/render/render-service.ts index 604aab5c7..f6239386a 100644 --- a/packages/vrender-core/src/render/render-service.ts +++ b/packages/vrender-core/src/render/render-service.ts @@ -69,6 +69,6 @@ export class DefaultRenderService implements IRenderService { this.draw(params); this.afterDraw(params); this.drawParams = null; - this.renderTreeRoots = []; + // this.renderTreeRoots = []; } } From 44ee8d3c51b307932bc6b3eaf931722e2e15ec1d Mon Sep 17 00:00:00 2001 From: zhouxinyu Date: Fri, 19 Apr 2024 15:12:22 +0800 Subject: [PATCH 18/19] fix: fix issue with richtext background --- ...-richtext-background_2024-04-19-07-12.json | 10 +++++++++ .../contributions/text-contribution-render.ts | 21 ++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 common/changes/@visactor/vrender-core/fix-richtext-background_2024-04-19-07-12.json diff --git a/common/changes/@visactor/vrender-core/fix-richtext-background_2024-04-19-07-12.json b/common/changes/@visactor/vrender-core/fix-richtext-background_2024-04-19-07-12.json new file mode 100644 index 000000000..1ccecd2d4 --- /dev/null +++ b/common/changes/@visactor/vrender-core/fix-richtext-background_2024-04-19-07-12.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vrender-core", + "comment": "fix: fix issue with richtext background", + "type": "none" + } + ], + "packageName": "@visactor/vrender-core" +} \ No newline at end of file diff --git a/packages/vrender-core/src/render/contributions/render/contributions/text-contribution-render.ts b/packages/vrender-core/src/render/contributions/render/contributions/text-contribution-render.ts index d1a3b3248..2dbbe4958 100644 --- a/packages/vrender-core/src/render/contributions/render/contributions/text-contribution-render.ts +++ b/packages/vrender-core/src/render/contributions/render/contributions/text-contribution-render.ts @@ -1,4 +1,4 @@ -import type { IAABBBounds } from '@visactor/vutils'; +import type { IAABBBounds, IMatrix, IMatrixLike } from '@visactor/vutils'; import { isObject } from '@visactor/vutils'; import { BaseRenderContributionTime } from '../../../../common/enums'; import type { @@ -40,6 +40,23 @@ export class DefaultTextBackgroundRenderContribution if (!background) { return; } + let matrix: IMatrix; + const save = () => { + if (graphic.type === 'richtext') { + matrix = context.currentMatrix.clone(); + context.restore(); + context.save(); + context.setTransformForCurrent(); + } + }; + const restore = () => { + if (graphic.type === 'richtext') { + context.restore(); + context.save(); + matrix && context.setTransformFromMatrix(matrix, true, 1); + } + }; + save(); let b: IAABBBounds; const shouldReCalBounds = isObject(background) && (background as any).background; const onlyTranslate = graphic.transMatrix.onlyTranslate(); @@ -71,6 +88,7 @@ export class DefaultTextBackgroundRenderContribution if (graphic.backgroundImg && graphic.resources) { const res = graphic.resources.get(background as any); if (res.state !== 'success' || !res.data) { + restore(); return; } @@ -106,6 +124,7 @@ export class DefaultTextBackgroundRenderContribution if (shouldReCalBounds) { boundsAllocate.free(b); } + restore(); } } From d4dcb5bc38be0e0f0ae3c509908a5b106491159b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 19 Apr 2024 07:56:05 +0000 Subject: [PATCH 19/19] build: prelease version 0.18.12 --- .../feat-radio_2024-04-08-07-05.json | 10 ------- .../fix-brush-state_2024-04-16-08-05.json | 10 ------- ...lear-state-animation_2024-04-16-07-18.json | 11 ------- ...x-event-pos-to-layer_2024-04-01-07-43.json | 10 ------- ...lider-inverse-update_2024-04-16-09-39.json | 11 ------- ...lider-inverse-update_2024-04-16-10-13.json | 11 ------- ...-wrap-text-with-text_2024-04-16-13-56.json | 10 ------- ...lear-state-animation_2024-04-16-07-18.json | 11 ------- .../fix-html-memory_2024-04-19-06-56.json | 10 ------- ...-richtext-background_2024-04-19-07-12.json | 10 ------- ...lider-inverse-update_2024-04-16-09-39.json | 11 ------- ...lider-inverse-update_2024-04-16-10-13.json | 11 ------- ...eight-limit-ellipsis_2024-04-17-09-10.json | 10 ------- common/config/rush/pnpm-lock.yaml | 26 ++++++++-------- 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-components/CHANGELOG.json | 30 +++++++++++++++++++ packages/vrender-components/CHANGELOG.md | 21 ++++++++++++- packages/vrender-components/package.json | 6 ++-- packages/vrender-core/CHANGELOG.json | 27 +++++++++++++++++ packages/vrender-core/CHANGELOG.md | 20 ++++++++++++- 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 | 6 ++-- tools/bugserver-trigger/package.json | 8 ++--- 35 files changed, 177 insertions(+), 175 deletions(-) delete mode 100644 common/changes/@visactor/vrender-components/feat-radio_2024-04-08-07-05.json delete mode 100644 common/changes/@visactor/vrender-components/fix-brush-state_2024-04-16-08-05.json delete mode 100644 common/changes/@visactor/vrender-components/fix-clear-state-animation_2024-04-16-07-18.json delete mode 100644 common/changes/@visactor/vrender-components/fix-event-pos-to-layer_2024-04-01-07-43.json delete mode 100644 common/changes/@visactor/vrender-components/fix-slider-inverse-update_2024-04-16-09-39.json delete mode 100644 common/changes/@visactor/vrender-components/fix-slider-inverse-update_2024-04-16-10-13.json delete mode 100644 common/changes/@visactor/vrender-components/refactor-replace-wrap-text-with-text_2024-04-16-13-56.json delete mode 100644 common/changes/@visactor/vrender-core/fix-clear-state-animation_2024-04-16-07-18.json delete mode 100644 common/changes/@visactor/vrender-core/fix-html-memory_2024-04-19-06-56.json delete mode 100644 common/changes/@visactor/vrender-core/fix-richtext-background_2024-04-19-07-12.json delete mode 100644 common/changes/@visactor/vrender-core/fix-slider-inverse-update_2024-04-16-09-39.json delete mode 100644 common/changes/@visactor/vrender-core/fix-slider-inverse-update_2024-04-16-10-13.json delete mode 100644 common/changes/@visactor/vrender-core/fix-text-height-limit-ellipsis_2024-04-17-09-10.json diff --git a/common/changes/@visactor/vrender-components/feat-radio_2024-04-08-07-05.json b/common/changes/@visactor/vrender-components/feat-radio_2024-04-08-07-05.json deleted file mode 100644 index 768a6f85e..000000000 --- a/common/changes/@visactor/vrender-components/feat-radio_2024-04-08-07-05.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vrender-components", - "comment": "feat: add radio component", - "type": "none" - } - ], - "packageName": "@visactor/vrender-components" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-components/fix-brush-state_2024-04-16-08-05.json b/common/changes/@visactor/vrender-components/fix-brush-state_2024-04-16-08-05.json deleted file mode 100644 index 1979b50b7..000000000 --- a/common/changes/@visactor/vrender-components/fix-brush-state_2024-04-16-08-05.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vrender-components", - "comment": "fix(brush): state not correctly when operating mask bounds is not right. fix@VisActor/VChart#2555", - "type": "none" - } - ], - "packageName": "@visactor/vrender-components" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-components/fix-clear-state-animation_2024-04-16-07-18.json b/common/changes/@visactor/vrender-components/fix-clear-state-animation_2024-04-16-07-18.json deleted file mode 100644 index e7ffc6185..000000000 --- a/common/changes/@visactor/vrender-components/fix-clear-state-animation_2024-04-16-07-18.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "comment": "fix: when clear states, the animations of state should clear\n\n", - "type": "none", - "packageName": "@visactor/vrender-components" - } - ], - "packageName": "@visactor/vrender-components", - "email": "dingling112@gmail.com" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-components/fix-event-pos-to-layer_2024-04-01-07-43.json b/common/changes/@visactor/vrender-components/fix-event-pos-to-layer_2024-04-01-07-43.json deleted file mode 100644 index 57b8cf7e4..000000000 --- a/common/changes/@visactor/vrender-components/fix-event-pos-to-layer_2024-04-01-07-43.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vrender-components", - "comment": "fix(event): event pos error when scale", - "type": "none" - } - ], - "packageName": "@visactor/vrender-components" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-components/fix-slider-inverse-update_2024-04-16-09-39.json b/common/changes/@visactor/vrender-components/fix-slider-inverse-update_2024-04-16-09-39.json deleted file mode 100644 index 26d9b30e8..000000000 --- a/common/changes/@visactor/vrender-components/fix-slider-inverse-update_2024-04-16-09-39.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "comment": "fix: fix the issue of update selected value of slider\n\n", - "type": "none", - "packageName": "@visactor/vrender-components" - } - ], - "packageName": "@visactor/vrender-components", - "email": "dingling112@gmail.com" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-components/fix-slider-inverse-update_2024-04-16-10-13.json b/common/changes/@visactor/vrender-components/fix-slider-inverse-update_2024-04-16-10-13.json deleted file mode 100644 index 2bcf645ad..000000000 --- a/common/changes/@visactor/vrender-components/fix-slider-inverse-update_2024-04-16-10-13.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "comment": "docs: update changlog of rush\n\n", - "type": "none", - "packageName": "@visactor/vrender-components" - } - ], - "packageName": "@visactor/vrender-components", - "email": "dingling112@gmail.com" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-components/refactor-replace-wrap-text-with-text_2024-04-16-13-56.json b/common/changes/@visactor/vrender-components/refactor-replace-wrap-text-with-text_2024-04-16-13-56.json deleted file mode 100644 index 9f28c2f8a..000000000 --- a/common/changes/@visactor/vrender-components/refactor-replace-wrap-text-with-text_2024-04-16-13-56.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vrender-components", - "comment": "refactor: replace wrapText with text", - "type": "none" - } - ], - "packageName": "@visactor/vrender-components" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-core/fix-clear-state-animation_2024-04-16-07-18.json b/common/changes/@visactor/vrender-core/fix-clear-state-animation_2024-04-16-07-18.json deleted file mode 100644 index 64b870bd2..000000000 --- a/common/changes/@visactor/vrender-core/fix-clear-state-animation_2024-04-16-07-18.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "comment": "fix: when clear states, the animations of state should clear\n\n", - "type": "none", - "packageName": "@visactor/vrender-core" - } - ], - "packageName": "@visactor/vrender-core", - "email": "dingling112@gmail.com" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-core/fix-html-memory_2024-04-19-06-56.json b/common/changes/@visactor/vrender-core/fix-html-memory_2024-04-19-06-56.json deleted file mode 100644 index d8e61dddd..000000000 --- a/common/changes/@visactor/vrender-core/fix-html-memory_2024-04-19-06-56.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vrender-core", - "comment": "fix: fix issue with render html", - "type": "none" - } - ], - "packageName": "@visactor/vrender-core" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-core/fix-richtext-background_2024-04-19-07-12.json b/common/changes/@visactor/vrender-core/fix-richtext-background_2024-04-19-07-12.json deleted file mode 100644 index 1ccecd2d4..000000000 --- a/common/changes/@visactor/vrender-core/fix-richtext-background_2024-04-19-07-12.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vrender-core", - "comment": "fix: fix issue with richtext background", - "type": "none" - } - ], - "packageName": "@visactor/vrender-core" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-core/fix-slider-inverse-update_2024-04-16-09-39.json b/common/changes/@visactor/vrender-core/fix-slider-inverse-update_2024-04-16-09-39.json deleted file mode 100644 index d2ee35c3a..000000000 --- a/common/changes/@visactor/vrender-core/fix-slider-inverse-update_2024-04-16-09-39.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "comment": "fix: fix the issue of update selected value of slider\n\n", - "type": "none", - "packageName": "@visactor/vrender-core" - } - ], - "packageName": "@visactor/vrender-core", - "email": "dingling112@gmail.com" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-core/fix-slider-inverse-update_2024-04-16-10-13.json b/common/changes/@visactor/vrender-core/fix-slider-inverse-update_2024-04-16-10-13.json deleted file mode 100644 index adb7f8118..000000000 --- a/common/changes/@visactor/vrender-core/fix-slider-inverse-update_2024-04-16-10-13.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "comment": "docs: update changlog of rush\n\n", - "type": "none", - "packageName": "@visactor/vrender-core" - } - ], - "packageName": "@visactor/vrender-core", - "email": "dingling112@gmail.com" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-core/fix-text-height-limit-ellipsis_2024-04-17-09-10.json b/common/changes/@visactor/vrender-core/fix-text-height-limit-ellipsis_2024-04-17-09-10.json deleted file mode 100644 index a04a11be9..000000000 --- a/common/changes/@visactor/vrender-core/fix-text-height-limit-ellipsis_2024-04-17-09-10.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "changes": [ - { - "packageName": "@visactor/vrender-core", - "comment": "fix: add ellipsis in height limit", - "type": "none" - } - ], - "packageName": "@visactor/vrender-core" -} \ No newline at end of file diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 0b3223edf..e2947ec21 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -14,7 +14,7 @@ importers: '@types/react-dom': ^18.0.0 '@visactor/vchart': 1.3.0 '@visactor/vgrammar': ~0.5.7 - '@visactor/vrender': workspace:0.18.11 + '@visactor/vrender': workspace:0.18.12 '@visactor/vutils': ~0.18.1 '@vitejs/plugin-react': 3.1.0 axios: ^1.4.0 @@ -71,7 +71,7 @@ importers: '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 '@types/react-reconciler': ^0.28.2 - '@visactor/vrender': workspace:0.18.11 + '@visactor/vrender': workspace:0.18.12 '@visactor/vutils': ~0.18.1 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 @@ -109,8 +109,8 @@ importers: '@rushstack/eslint-patch': ~1.1.4 '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 - '@visactor/react-vrender': workspace:0.18.11 - '@visactor/vrender': workspace:0.18.11 + '@visactor/react-vrender': workspace:0.18.12 + '@visactor/vrender': workspace:0.18.12 '@visactor/vutils': ~0.18.1 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 @@ -149,8 +149,8 @@ importers: '@types/jest': ^26.0.0 '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 - '@visactor/vrender-core': workspace:0.18.11 - '@visactor/vrender-kits': workspace:0.18.11 + '@visactor/vrender-core': workspace:0.18.12 + '@visactor/vrender-kits': workspace:0.18.12 '@visactor/vutils': ~0.18.1 '@vitejs/plugin-react': 3.1.0 canvas: 2.11.2 @@ -194,8 +194,8 @@ importers: '@internal/ts-config': workspace:* '@rushstack/eslint-patch': ~1.1.4 '@types/jest': ^26.0.0 - '@visactor/vrender-core': workspace:0.18.11 - '@visactor/vrender-kits': workspace:0.18.11 + '@visactor/vrender-core': workspace:0.18.12 + '@visactor/vrender-kits': workspace:0.18.12 '@visactor/vscale': ~0.17.3 '@visactor/vutils': ~0.18.1 eslint: ~8.18.0 @@ -277,7 +277,7 @@ importers: '@types/node-fetch': 2.6.4 '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 - '@visactor/vrender-core': workspace:0.18.11 + '@visactor/vrender-core': workspace:0.18.12 '@visactor/vutils': ~0.18.1 '@vitejs/plugin-react': 3.1.0 canvas: 2.11.2 @@ -357,10 +357,10 @@ importers: '@rushstack/eslint-patch': ~1.1.4 '@types/node': '*' '@types/node-fetch': 2.6.4 - '@visactor/vrender': workspace:0.18.11 - '@visactor/vrender-components': workspace:0.18.11 - '@visactor/vrender-core': workspace:0.18.11 - '@visactor/vrender-kits': workspace:0.18.11 + '@visactor/vrender': workspace:0.18.12 + '@visactor/vrender-components': workspace:0.18.12 + '@visactor/vrender-core': workspace:0.18.12 + '@visactor/vrender-kits': workspace:0.18.12 eslint: ~8.18.0 form-data: ~4.0.0 node-fetch: 2.6.6 diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json index 254ff223c..9d69b92e9 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -1 +1 @@ -[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.18.11","nextBump":"patch"}] +[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.18.12","nextBump":"patch"}] diff --git a/docs/package.json b/docs/package.json index 15e892934..755611626 100644 --- a/docs/package.json +++ b/docs/package.json @@ -13,7 +13,7 @@ "@visactor/vchart": "1.3.0", "@visactor/vutils": "~0.18.1", "@visactor/vgrammar": "~0.5.7", - "@visactor/vrender": "workspace:0.18.11", + "@visactor/vrender": "workspace:0.18.12", "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 8772e0985..b853196a5 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": "0.18.12", + "tag": "@visactor/react-vrender-utils_v0.18.12", + "date": "Fri, 19 Apr 2024 07:48:17 GMT", + "comments": {} + }, { "version": "0.18.11", "tag": "@visactor/react-vrender-utils_v0.18.11", diff --git a/packages/react-vrender-utils/CHANGELOG.md b/packages/react-vrender-utils/CHANGELOG.md index 5400e510f..274c6e031 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, 17 Apr 2024 03:02:22 GMT and should not be manually modified. +This log was last generated on Fri, 19 Apr 2024 07:48:17 GMT and should not be manually modified. + +## 0.18.12 +Fri, 19 Apr 2024 07:48:17 GMT + +_Version update only_ ## 0.18.11 Wed, 17 Apr 2024 03:02:22 GMT diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json index e76c7e5c3..5d5af13f4 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": "0.18.11", + "version": "0.18.12", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -24,8 +24,8 @@ "react-dom": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:0.18.11", - "@visactor/react-vrender": "workspace:0.18.11", + "@visactor/vrender": "workspace:0.18.12", + "@visactor/react-vrender": "workspace:0.18.12", "@visactor/vutils": "~0.18.1", "react-reconciler": "^0.29.0", "tslib": "^2.3.1" diff --git a/packages/react-vrender/CHANGELOG.json b/packages/react-vrender/CHANGELOG.json index 95a8ddcf6..439f01c15 100644 --- a/packages/react-vrender/CHANGELOG.json +++ b/packages/react-vrender/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/react-vrender", "entries": [ + { + "version": "0.18.12", + "tag": "@visactor/react-vrender_v0.18.12", + "date": "Fri, 19 Apr 2024 07:48:17 GMT", + "comments": {} + }, { "version": "0.18.11", "tag": "@visactor/react-vrender_v0.18.11", diff --git a/packages/react-vrender/CHANGELOG.md b/packages/react-vrender/CHANGELOG.md index 1649c3df2..bd1725a06 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, 17 Apr 2024 03:02:22 GMT and should not be manually modified. +This log was last generated on Fri, 19 Apr 2024 07:48:17 GMT and should not be manually modified. + +## 0.18.12 +Fri, 19 Apr 2024 07:48:17 GMT + +_Version update only_ ## 0.18.11 Wed, 17 Apr 2024 03:02:22 GMT diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json index 50a51ba0b..e7999a8fd 100644 --- a/packages/react-vrender/package.json +++ b/packages/react-vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/react-vrender", - "version": "0.18.11", + "version": "0.18.12", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -23,7 +23,7 @@ "react": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:0.18.11", + "@visactor/vrender": "workspace:0.18.12", "@visactor/vutils": "~0.18.1", "react-reconciler": "^0.29.0", "tslib": "^2.3.1" diff --git a/packages/vrender-components/CHANGELOG.json b/packages/vrender-components/CHANGELOG.json index eb54f12a8..74b3798a6 100644 --- a/packages/vrender-components/CHANGELOG.json +++ b/packages/vrender-components/CHANGELOG.json @@ -1,6 +1,36 @@ { "name": "@visactor/vrender-components", "entries": [ + { + "version": "0.18.12", + "tag": "@visactor/vrender-components_v0.18.12", + "date": "Fri, 19 Apr 2024 07:48:17 GMT", + "comments": { + "none": [ + { + "comment": "feat: add radio component" + }, + { + "comment": "fix(brush): state not correctly when operating mask bounds is not right. fix@VisActor/VChart#2555" + }, + { + "comment": "fix: when clear states, the animations of state should clear\n\n" + }, + { + "comment": "fix(event): event pos error when scale" + }, + { + "comment": "fix: fix the issue of update selected value of slider\n\n" + }, + { + "comment": "docs: update changlog of rush\n\n" + }, + { + "comment": "refactor: replace wrapText with text" + } + ] + } + }, { "version": "0.18.11", "tag": "@visactor/vrender-components_v0.18.11", diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md index d5306af4a..6208f1264 100644 --- a/packages/vrender-components/CHANGELOG.md +++ b/packages/vrender-components/CHANGELOG.md @@ -1,6 +1,25 @@ # Change Log - @visactor/vrender-components -This log was last generated on Wed, 17 Apr 2024 03:02:22 GMT and should not be manually modified. +This log was last generated on Fri, 19 Apr 2024 07:48:17 GMT and should not be manually modified. + +## 0.18.12 +Fri, 19 Apr 2024 07:48:17 GMT + +### Updates + +- feat: add radio component +- fix(brush): state not correctly when operating mask bounds is not right. fix@VisActor/VChart#2555 +- fix: when clear states, the animations of state should clear + + +- fix(event): event pos error when scale +- fix: fix the issue of update selected value of slider + + +- docs: update changlog of rush + + +- refactor: replace wrapText with text ## 0.18.11 Wed, 17 Apr 2024 03:02:22 GMT diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json index 41e31f892..a7984f75b 100644 --- a/packages/vrender-components/package.json +++ b/packages/vrender-components/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-components", - "version": "0.18.11", + "version": "0.18.12", "description": "components library for dp visualization", "sideEffects": false, "main": "cjs/index.js", @@ -24,8 +24,8 @@ "analysis-core": "bundle -f umd -a -i core.ts" }, "dependencies": { - "@visactor/vrender-core": "workspace:0.18.11", - "@visactor/vrender-kits": "workspace:0.18.11", + "@visactor/vrender-core": "workspace:0.18.12", + "@visactor/vrender-kits": "workspace:0.18.12", "@visactor/vutils": "~0.18.1", "@visactor/vscale": "~0.17.3" }, diff --git a/packages/vrender-core/CHANGELOG.json b/packages/vrender-core/CHANGELOG.json index 159814d10..4c6d66af8 100644 --- a/packages/vrender-core/CHANGELOG.json +++ b/packages/vrender-core/CHANGELOG.json @@ -1,6 +1,33 @@ { "name": "@visactor/vrender-core", "entries": [ + { + "version": "0.18.12", + "tag": "@visactor/vrender-core_v0.18.12", + "date": "Fri, 19 Apr 2024 07:48:17 GMT", + "comments": { + "none": [ + { + "comment": "fix: when clear states, the animations of state should clear\n\n" + }, + { + "comment": "fix: fix issue with render html" + }, + { + "comment": "fix: fix issue with richtext background" + }, + { + "comment": "fix: fix the issue of update selected value of slider\n\n" + }, + { + "comment": "docs: update changlog of rush\n\n" + }, + { + "comment": "fix: add ellipsis in height limit" + } + ] + } + }, { "version": "0.18.11", "tag": "@visactor/vrender-core_v0.18.11", diff --git a/packages/vrender-core/CHANGELOG.md b/packages/vrender-core/CHANGELOG.md index c7a492794..af035e515 100644 --- a/packages/vrender-core/CHANGELOG.md +++ b/packages/vrender-core/CHANGELOG.md @@ -1,6 +1,24 @@ # Change Log - @visactor/vrender-core -This log was last generated on Wed, 17 Apr 2024 03:02:22 GMT and should not be manually modified. +This log was last generated on Fri, 19 Apr 2024 07:48:17 GMT and should not be manually modified. + +## 0.18.12 +Fri, 19 Apr 2024 07:48:17 GMT + +### Updates + +- fix: when clear states, the animations of state should clear + + +- fix: fix issue with render html +- fix: fix issue with richtext background +- fix: fix the issue of update selected value of slider + + +- docs: update changlog of rush + + +- fix: add ellipsis in height limit ## 0.18.11 Wed, 17 Apr 2024 03:02:22 GMT diff --git a/packages/vrender-core/package.json b/packages/vrender-core/package.json index 357b42eba..dbba8ac07 100644 --- a/packages/vrender-core/package.json +++ b/packages/vrender-core/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-core", - "version": "0.18.11", + "version": "0.18.12", "description": "", "sideEffects": [ "./src/modules.ts", diff --git a/packages/vrender-kits/CHANGELOG.json b/packages/vrender-kits/CHANGELOG.json index 12597e2fa..633765e9a 100644 --- a/packages/vrender-kits/CHANGELOG.json +++ b/packages/vrender-kits/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender-kits", "entries": [ + { + "version": "0.18.12", + "tag": "@visactor/vrender-kits_v0.18.12", + "date": "Fri, 19 Apr 2024 07:48:17 GMT", + "comments": {} + }, { "version": "0.18.11", "tag": "@visactor/vrender-kits_v0.18.11", diff --git a/packages/vrender-kits/CHANGELOG.md b/packages/vrender-kits/CHANGELOG.md index 4d23f2802..435b01103 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, 17 Apr 2024 03:02:22 GMT and should not be manually modified. +This log was last generated on Fri, 19 Apr 2024 07:48:17 GMT and should not be manually modified. + +## 0.18.12 +Fri, 19 Apr 2024 07:48:17 GMT + +_Version update only_ ## 0.18.11 Wed, 17 Apr 2024 03:02:22 GMT diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json index f551c472f..cb508acaa 100644 --- a/packages/vrender-kits/package.json +++ b/packages/vrender-kits/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-kits", - "version": "0.18.11", + "version": "0.18.12", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -20,7 +20,7 @@ "test": "" }, "dependencies": { - "@visactor/vrender-core": "workspace:0.18.11", + "@visactor/vrender-core": "workspace:0.18.12", "@visactor/vutils": "~0.18.1", "@resvg/resvg-js": "2.4.1", "roughjs": "4.5.2" diff --git a/packages/vrender/CHANGELOG.json b/packages/vrender/CHANGELOG.json index 1f8231dca..ddd982a0f 100644 --- a/packages/vrender/CHANGELOG.json +++ b/packages/vrender/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender", "entries": [ + { + "version": "0.18.12", + "tag": "@visactor/vrender_v0.18.12", + "date": "Fri, 19 Apr 2024 07:48:17 GMT", + "comments": {} + }, { "version": "0.18.11", "tag": "@visactor/vrender_v0.18.11", diff --git a/packages/vrender/CHANGELOG.md b/packages/vrender/CHANGELOG.md index d768b4c17..623e7cd1b 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, 17 Apr 2024 03:02:22 GMT and should not be manually modified. +This log was last generated on Fri, 19 Apr 2024 07:48:17 GMT and should not be manually modified. + +## 0.18.12 +Fri, 19 Apr 2024 07:48:17 GMT + +_Version update only_ ## 0.18.11 Wed, 17 Apr 2024 03:02:22 GMT diff --git a/packages/vrender/package.json b/packages/vrender/package.json index 3236e44d0..f7b961e9a 100644 --- a/packages/vrender/package.json +++ b/packages/vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender", - "version": "0.18.11", + "version": "0.18.12", "description": "", "sideEffects": true, "main": "cjs/index.js", @@ -24,8 +24,8 @@ "test-watch": "DEBUG_MODE=1 jest --watch" }, "dependencies": { - "@visactor/vrender-core": "workspace:0.18.11", - "@visactor/vrender-kits": "workspace:0.18.11" + "@visactor/vrender-core": "workspace:0.18.12", + "@visactor/vrender-kits": "workspace:0.18.12" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/tools/bugserver-trigger/package.json b/tools/bugserver-trigger/package.json index 051f4b464..f407d93ae 100644 --- a/tools/bugserver-trigger/package.json +++ b/tools/bugserver-trigger/package.json @@ -8,10 +8,10 @@ "ci": "ts-node --transpileOnly --skipProject ./scripts/trigger-test.ts" }, "dependencies": { - "@visactor/vrender": "workspace:0.18.11", - "@visactor/vrender-core": "workspace:0.18.11", - "@visactor/vrender-kits": "workspace:0.18.11", - "@visactor/vrender-components": "workspace:0.18.11" + "@visactor/vrender": "workspace:0.18.12", + "@visactor/vrender-core": "workspace:0.18.12", + "@visactor/vrender-kits": "workspace:0.18.12", + "@visactor/vrender-components": "workspace:0.18.12" }, "devDependencies": { "@rushstack/eslint-patch": "~1.1.4",