VisActor · skie1997 · Apr 23, 2025 · May 6, 2025 · May 21, 2025 · May 26, 2025
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/packages/vrender-animate/src/custom/morphing.ts b/packages/vrender-animate/src/custom/morphing.ts
@@ -377,7 +377,7 @@ export const >
   }
 
   const childGraphics: IGraphic[] = (
-    animationConfig?.splitPath === 'clone' ? cloneGraphic : animationConfig?.splitPath ?? splitGraphic
+    animationConfig?.splitPath === 'clone' ? cloneGraphic : (animationConfig?.splitPath ?? splitGraphic)
   )(fromGraphic, validateToGraphics.length, false);
 
   const oldOnEnd = animationConfig?.onEnd;
@@ -687,7 +687,7 @@ export const multiToOneMorph = (
   }
 
   const childGraphics: IGraphic[] = (
-    animationConfig?.splitPath === 'clone' ? cloneGraphic : animationConfig?.splitPath ?? splitGraphic
+    animationConfig?.splitPath === 'clone' ? cloneGraphic : (animationConfig?.splitPath ?? splitGraphic)
   )(toGraphic, validateFromGraphics.length, true);
 
   const toAttrs = toGraphic.attribute;

diff --git a/packages/vrender-animate/src/step.ts b/packages/vrender-animate/src/step.ts
@@ -54,7 +54,7 @@ export class Step implements IStep {
     this.duration = duration;
     // 设置缓动函数
     if (easing) {
-      this.easing = typeof easing === 'function' ? easing : Easing[easing] ?? Easing.linear;
+      this.easing = typeof easing === 'function' ? easing : (Easing[easing] ?? Easing.linear);
     } else {
       this.easing = Easing.linear;
     }

diff --git a/packages/vrender-animate/src/timeline.ts b/packages/vrender-animate/src/timeline.ts
@@ -14,7 +14,7 @@ export class DefaultTimeline extends EventEmitter implements ITimeline {
   protected tail: AnimateNode | null = null;
   protected animateMap: Map<IAnimate, AnimateNode> = new Map();
   protected _animateCount: number = 0;
-  protected declare paused: boolean;
+  declare protected paused: boolean;
 
   // 添加必要的属性
   protected _playSpeed: number = 1;

diff --git a/packages/vrender-animate/src/utils/easing.ts b/packages/vrender-animate/src/utils/easing.ts
@@ -242,10 +242,10 @@ export class Easing {
     return x === 0
       ? 0
       : x === 1
-      ? 1
-      : x < 0.5
-      ? -(Math.pow(2, 20 * x - 10) * Math.sin((20 * x - 11.125) * c5)) / 2
-      : (Math.pow(2, -20 * x + 10) * Math.sin((20 * x - 11.125) * c5)) / 2 + 1;
+        ? 1
+        : x < 0.5
+          ? -(Math.pow(2, 20 * x - 10) * Math.sin((20 * x - 11.125) * c5)) / 2
+          : (Math.pow(2, -20 * x + 10) * Math.sin((20 * x - 11.125) * c5)) / 2 + 1;
   };
   static registerFunc(name: string, func: (t: number) => number) {
     (Easing as any)[name] = func;

diff --git a/packages/vrender-components/__tests__/browser/examples/data-zoom-preview-set-state.ts b/packages/vrender-components/__tests__/browser/examples/data-zoom-preview-set-state.ts
@@ -26,18 +26,23 @@ export function run() {
       height: 30
     },
     realTime: false,
-    brushSelect: false,
+    brushSelect: true,
+    middleHandlerStyle: {
+      visible: true
+    },
+    showDetail: 'auto',
     
9E7A
updateStateCallback: (start, end) => {
       console.log('setCallback', start, end);
     }
   });
 
-  // dataZoom.setStartAndEnd(0, 1);
+  dataZoom.setStartAndEnd(0, 1);
   dataZoom.setPreviewData(data);
   dataZoom.setPreviewPointsX(d => d.x);
   dataZoom.setPreviewPointsY(d => d.y);
   dataZoom.setPreviewPointsX1(d => d.x);
   dataZoom.setPreviewPointsY1(d => 265);
 
   const stage = render([dataZoom], 'main');
+  console.log('stage', stage);
 }
diff --git a/packages/vrender-components/__tests__/browser/examples/data-zoom.ts b/packages/vrender-components/__tests__/browser/examples/data-zoom.ts
@@ -5,21 +5,18 @@ import render from '../../util/render';
 import { DataZoom } from '../../../src';
 
 export function run() {
-  console.log('RectCrosshair');
-
-  const dataZoom = new DataZoom({
+  const dataZoomdisableTriggerEvent = new DataZoom({
     start: 0.2,
     end: 0.5,
+    // maxSpan: 0.4,
     position: {
       x: 50,
-      y: 235
+      y: 75
     },
     size: {
       width: 400,
       height: 30
     },
-    showDetail: false,
-    delayTime: 1000,
     // brushSelect: false,
     backgroundChartStyle: {
       line: {
@@ -31,22 +28,25 @@ export function run() {
     },
     middleHandlerStyle: {
       visible: true
-    }
+    },
+    disableTriggerEvent: false,
+    showDetail: 'auto'
   });
 
-  const dataZoomdisableTriggerEvent = new DataZoom({
+  const dataZoom = new DataZoom({
     start: 0.2,
     end: 0.5,
-    // maxSpan: 0.4,
     position: {
       x: 50,
-      y: 75
+      y: 235
     },
     size: {
       width: 400,
       height: 30
     },
-    // brushSelect: false,
+    showDetail: 'auto',
+    delayTime: 100,
+    brushSelect: true,
     backgroundChartStyle: {
       line: {
         visible: false
@@ -57,15 +57,14 @@ export function run() {
     },
     middleHandlerStyle: {
       visible: true
-    },
-    disableTriggerEvent: false
+    }
   });
+  console.log('dataZoom', dataZoom);
 
-  vglobal.supportsPointerEvents = false;
+  // vglobal.supportsPointerEvents = false;
 
-  const stage = render([dataZoom, dataZoomdisableTriggerEvent], 'main');
+  const stage = render([dataZoomdisableTriggerEvent, dataZoom], 'main');
   stage.defaultLayer.scale(1.5, 1.5);
-  stage.x = 10;
 
   // stage.addEventListener('pointermove', e => {
   //   dataZoom.setLocation({

diff --git a/packages/vrender-components/src/axis/line.ts b/packages/vrender-components/src/axis/line.ts
@@ -241,8 +241,8 @@ export class LineAxis extends AxisBase<LineAxisAttributes> {
                   ? Math.min(bounds.x2 - baseX, bounds.width())
                   : 0
                 : bounds.x1 < baseX
-                ? Math.min(baseX - bounds.x1, bounds.width())
-                : 0) +
+                  ? Math.min(baseX - bounds.x1, bounds.width())
+                  : 0) +
               (layerCount - 1) * space;
           } else {
             labelLength = 0;
@@ -552,8 +552,8 @@ export class LineAxis extends AxisBase<LineAxisAttributes> {
         const verticalLimitLength = isVertical
           ? 
C4FE
axisLength / labelShapes.length
           : !autoHide && !autoRotate
-          ? axisLength / labelShapes.length
-          : Infinity;
+            ? axisLength / labelShapes.length
+            : Infinity;
 
         autoLimitFunc(labelShapes, {
           limitLength,
@@ -646,8 +646,8 @@ export class LineAxis extends AxisBase<LineAxisAttributes> {
     let limitLength = limitSize;
     let titleHeight = 0;
     let titleSpacing = 0;
-    const axisLineWidth = line && line.visible ? line.style.lineWidth ?? 1 : 0;
-    const tickLength = tick && tick.visible ? tick.length ?? 4 : 0;
+    const axisLineWidth = line && line.visible ? (line.style.lineWidth ?? 1) : 0;
+    const tickLength = tick && tick.visible ? (tick.length ?? 4) : 0;
     if (title && title.visible && typeof title.text === 'string') {
       titleHeight = measureTextSize(title.text, title.textStyle, this.stage?.getTheme()?.text).height;
       const padding = normalizePadding(title.padding);

diff --git a/packages/vrender-components/src/axis/tick-data/continuous.ts b/packages/vrender-components/src/axis/tick-data/continuous.ts
@@ -171,15 +171,15 @@ export const continuousTicks = (scale: ContinuousScale, op: ITickDataOpt): ITick
             ({
               AABBBounds: bounds,
               value: samplingScaleTicks[i]
-            } as ILabelItem<number>)
+            }) as ILabelItem<number>
         );
       } else {
         items = getCartesianLabelBounds(scale, scaleTicks, op as ICartesianTickDataOpt)?.map(
           (bounds, i) =>
             ({
               AABBBounds: bounds,
               value: scaleTicks[i]
-            } as ILabelItem<number>)
+            }) as ILabelItem<number>
         );
       }
 

diff --git a/packages/vrender-components/src/axis/tick-data/util.ts b/packages/vrender-components/src/axis/tick-data/util.ts
@@ -46,10 +46,10 @@ const calculateFlushPos = (basePosition: number, size: number, rangePosition: nu
   return rangePosition < basePosition
     ? Math.max(basePosition - size / 2, rangePosition)
     : rangePosition > basePosition
-    ? Math.min(basePosition - size / 2, rangePosition - size)
-    : rangePosition < otherEnd
-    ? rangePosition
-    : rangePosition - size;
+      ? Math.min(basePosition - size / 2, rangePosition - size)
+      : rangePosition < otherEnd
+        ? rangePosition
+        : rangePosition - size;
 };
 
 export const getCartesianLabelBounds = (scale: IBaseScale, domain: any[], op: ICartesianTickDataOpt): AABBBounds[] => {

diff --git a/packages/vrender-components/src/brush/brush.ts b/packages/vrender-components/src/brush/brush.ts
@@ -398,7 +398,7 @@ export class Brush extends AbstractComponent<Required<BrushAttributes>> {
       cursor: 'move',
       pickable: false,
       ...brushStyle,
-      opacity: hasMask ? brushStyle.opacity ?? 1 : 0
+      opacity: hasMask ? (brushStyle.opacity ?? 1) : 0
     });
     brushMask.name = `brush-${Date.now()}`; // 用Date给mask唯一标记
     this._operatingMask = brushMask;