VisActor · neuqzxy · Mar 29, 2024 · Mar 25, 2024 · Mar 25, 2024 · Mar 25, 2024
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
@@ -1 +1 @@
-[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.18.9","nextBump":"patch"}]
+[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.18.10","nextBump":"patch"}]
diff --git 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.9",
+    "@visactor/vrender": "workspace:0.18.10",
     "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
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/react-vrender-utils",
   "entries": [
+    {
+      "version": "0.18.10",
+      "tag": "@visactor/react-vrender-utils_v0.18.10",
+      "date": "Fri, 29 Mar 2024 08:02:16 GMT",
+      "comments": {}
+    },
     {
       "version": "0.18.9",
       "tag": "@visactor/react-vrender-utils_v0.18.9",

diff --git 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 Thu, 28 Mar 2024 10:13:24 GMT and should not be manually modified.
+This log was last generated on Fri, 29 Mar 2024 08:02:16 GMT and should not be manually modified.
+
+## 0.18.10
+Fri, 29 Mar 2024 08:02:16 GMT
+
+_Version update only_
 
 ## 0.18.9
 Thu, 28 Mar 2024 10:13:24 GMT

diff --git 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.9",
+  "version": "0.18.10",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -24,8 +24,8 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@visactor/vrender": "workspace:0.18.9",
-    "@visactor/react-vrender": "workspace:0.18.9",
+    "@visactor/vrender": "workspace:0.18.10",
+    "@visactor/react-vrender": "workspace:0.18.10",
     "@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
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/react-vrender",
   "entries": [
+    {
+      "version": "0.18.10",
+      "tag": "@visactor/react-vrender_v0.18.10",
+      "date": "Fri, 29 Mar 2024 08:02:16 GMT",
+      "comments": {}
+    },
     {
       "version": "0.18.9",
       "tag": "@visactor/react-vrender_v0.18.9",

diff --git 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 Thu, 28 Mar 2024 10:13:24 GMT and should not be manually modified.
+This log was last generated on Fri, 29 Mar 2024 08:02:16 GMT and should not be manually modified.
+
+## 0.18.10
+Fri, 29 Mar 2024 08:02:16 GMT
+
+_Version update only_
 
 ## 0.18.9
 Thu, 28 Mar 2024 10:13:24 GMT

diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/react-vrender",
-  "version": "0.18.9",
+  "version": "0.18.10",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -23,7 +23,7 @@
     "react": "^18.2.0"
   },
   "dependencies": {
-    "@visactor/vrender": "workspace:0.18.9",
+    "@visactor/vrender": "workspace:0.18.10",
     "@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
@@ -1,6 +1,24 @@
 {
   "name": "@visactor/vrender-components",
   "entries": [
+    {
+      "version": "0.18.10",
+      "tag": "@visactor/vrender-components_v0.18.10",
+      "date": "Fri, 29 Mar 2024 08:02:16 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "fix: when user set `defaultSelected` value to be [], all legend's items should be unselected, fixed https://github.com/VisActor/VChart/issues/2445"
+          },
+          {
+            "comment": "fix: when user set `defaultSelected` value to be [], all legend's items should be unselected, fixed https://github.com/VisActor/VChart/issues/2445"
+          },
+          {
+            "comment": "fix: fix alignment calculation for line axis axis text, fixed https://github.com/VisActor/VChart/issues/2449"
+          }
+        ]
+      }
+    },
     {
       "version": "0.18.9",
       "tag": "@visactor/vrender-components_v0.18.9",

diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md
@@ -1,6 +1,15 @@
 # Change Log - @visactor/vrender-components
 
-This log was last generated on Thu, 28 Mar 2024 10:13:24 GMT and should not be manually modified.
+This log was last generated on Fri, 29 Mar 2024 08:02:16 GMT and should not be manually modified.
+
+## 0.18.10
+Fri, 29 Mar 2024 08:02:16 GMT
+
+### Updates
+
+- fix: when user set `defaultSelected` value to be [], all legend's items should be unselected, fixed https://github.com/VisActor/VChart/issues/2445
+- fix: when user set `defaultSelected` value to be [], all legend's items should be unselected, fixed https://github.com/VisActor/VChart/issues/2445
+- fix: fix alignment calculation for line axis axis text, fixed https://github.com/VisActor/VChart/issues/2449
 
 ## 0.18.9
 Thu, 28 Mar 2024 10:13:24 GMT

diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-components",
-  "version": "0.18.9",
+  "version": "0.18.10",
   "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.9",
-    "@visactor/vrender-kits": "workspace:0.18.9",
+    "@visactor/vrender-core": "workspace:0.18.10",
+    "@visactor/vrender-kits": "workspace:0.18.10",
     "@visactor/vutils": "~0.18.1",
     "@visactor/vscale": "~0.17.3"
   },

diff --git a/packages/vrender-components/src/axis/line.ts b/packages/vrender-components/src/axis/line.ts
@@ -311,12 +311,14 @@ export class LineAxis extends AxisBase<LineAxisAttributes> {
     angle?: number
   ): { textAlign: TextAlignType; textBaseline: TextBaselineType } {
     const orient = this.attribute.orient;
-    if (isValidNumber(angle) || (vector[0] === 0 && vector[1] === 0)) {
+    const isCartesian = ['top', 'bottom', 'right', 'left'].includes(orient);
+    // 目前的向量方法暂无法返回正确的笛卡尔坐标轴下文本旋转后的问题，所以通过这种方法判断，保证旋转后 textAlign 和 textBaseline 也正确
+    if (isCartesian || (vector[0] === 0 && vector[1] === 0)) {
       if (orient === 'top' || orient === 'bottom') {
-        return getXAxisLabelAlign(orient, angle);
+        return getXAxisLabelAlign(inside ? (orient === 'bottom' ? 'top' : 'bottom') : orient, angle);
       }
       if (orient === 'left' || orient === 'right') {
-        return getYAxisLabelAlign(orient, angle);
+        return getYAxisLabelAlign(inside ? (orient === 'left' ? 'right' : 'left') : orient, angle);
       }
     }
 
@@ -558,7 +560,7 @@ export class LineAxis extends AxisBase<LineAxisAttributes> {
     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.fontFamily).height;
+      titleHeight = measureTextSize(title.text, title.textStyle, this.stage?.getTheme()?.text).height;
       const padding = normalizePadding(title.padding);
       titleSpacing = title.space + padding[0] + padding[2];
     }

diff --git a/packages/vrender-components/src/indicator/indicator.ts b/packages/vrender-components/src/indicator/indicator.ts
@@ -153,7 +153,7 @@ export class Indicator extends AbstractComponent<Required<IndicatorAttributes>>
     const originWidth = measureTextSize(
       (indicatorItemSpec.style?.text ?? '') as string | number | number[] | string[],
       (indicatorItemSpec.style ?? {}) as Partial<ITextGraphicAttribute>,
-      this.stage?.getTheme().text.fontFamily
+      this.stage?.getTheme()?.text
     ).width;
     if (originWidth > 0) {
       const ratio = (limit * (indicatorItemSpec.fitPercent ?? 0.5)) / originWidth;

diff --git a/packages/vrender-components/src/label/base.ts b/packages/vrender-components/src/label/base.ts
@@ -302,10 +302,14 @@ export class LabelBase<T extends BaseLabelAttrs> extends AbstractComponent<T> {
   };
 
   protected _createLabelText(attributes: LabelItem) {
+    const textAttrs = {
+      ...this.stage?.getTheme()?.text,
+      ...attributes
+    };
     if (isRichText(attributes as any, 'textType')) {
-      return graphicCreator.richtext(richTextAttributeTransform(attributes as any));
+      return graphicCreator.richtext(richTextAttributeTransform(textAttrs as any));
     }
-    return graphicCreator.text(attributes as ITextGraphicAttribute);
+    return graphicCreator.text(textAttrs as ITextGraphicAttribute);
   }
 
   private _prepare() {

diff --git a/packages/vrender-components/src/legend/discrete/discrete.ts b/packages/vrender-components/src/legend/discrete/discrete.ts
@@ -211,7 +211,7 @@ export class DiscreteLegend extends LegendBase<DiscreteLegendAttrs> {
       maxRow = 2,
       maxWidth,
       maxHeight,
-      defaultSelected = [],
+      defaultSelected,
       lazyload,
       autoPage
     } = this.attribute as DiscreteLegendAttrs;
@@ -239,12 +239,12 @@ export class DiscreteLegend extends LegendBase<DiscreteLegendAttrs> {
       }
       item.index = index; // 用于维护图例的顺序
 
-      const itemGroup = this._renderEachItem(
-        item,
-        isEmpty(defaultSelected) ? true : defaultSelected?.includes(item.label),
-        index,
-        legendItems
-      );
+      let isSelected = true;
+      if (isArray(defaultSelected)) {
+        isSelected = defaultSelected.includes(item.label);
+      }
+
+      const itemGroup = this._renderEachItem(item, isSelected, index, legendItems);
 
       const itemWidth = itemGroup.attribute.width;
       const itemHeight = itemGroup.attribute.height;

diff --git a/packages/vrender-components/src/pager/pager.ts b/packages/vrender-components/src/pager/pager.ts
@@ -109,7 +109,7 @@ export class Pager extends AbstractComponent<Required<PagerAttributes>> {
         textBaseline: 'middle',
         ...textStyle
       },
-      this.stage?.getTheme().text.fontFamily
+      this.stage?.getTheme()?.text
     );
 
     const handlerSizeX = isNumber(handlerSize) ? handlerSize : handlerSize[0];

diff --git a/packages/vrender-components/src/tag/tag.ts b/packages/vrender-components/src/tag/tag.ts
@@ -146,7 +146,7 @@ export class Tag extends AbstractComponent<Required<TagAttributes>> {
       }
 
       // 因为文本可能发生旋转，所以需要使用 measureTextSize 方法
-      const textBounds = measureTextSize(textAttrs.text as string, textStyle, this.stage?.getTheme().text.fontFamily);
+      const textBounds = measureTextSize(textAttrs.text as string, textStyle, this.stage?.getTheme()?.text);
       const textWidth = textBounds.width;
       const textHeight = textBounds.height;
       tagWidth += textWidth;

diff --git a/packages/vrender-components/src/util/text.ts b/packages/vrender-components/src/util/text.ts
@@ -30,21 +30,21 @@ export const initTextMeasure = (
 export function measureTextSize(
   text: string | number | string[] | number[],
   textSpec: Partial<ITextGraphicAttribute>,
-  fontFamily: string = DEFAULT_TEXT_FONT_FAMILY
+  defaultTextTheme: Partial<ITextGraphicAttribute> = {}
 ) {
   if (!text) {
     return { width: 0, height: 0 };
   }
   const bounds = getTextBounds({
     text,
-    fontFamily: textSpec.fontFamily ?? fontFamily,
-    fontSize: textSpec.fontSize || 12,
-    fontWeight: textSpec.fontWeight as any,
-    textAlign: textSpec.textAlign ?? 'center',
+    fontFamily: textSpec.fontFamily || defaultTextTheme.fontFamily || DEFAULT_TEXT_FONT_FAMILY,
+    fontSize: textSpec.fontSize || defaultTextTheme.fontSize || 12,
+    fontWeight: textSpec.fontWeight || defaultTextTheme.fontWeight,
+    textAlign: textSpec.textAlign || 'center',
     textBaseline: textSpec.textBaseline,
     ellipsis: !!textSpec.ellipsis,
     maxLineWidth: textSpec.maxLineWidth || Infinity,
-    lineHeight: textSpec.fontSize || 12
+    lineHeight: textSpec.fontSize || defaultTextTheme.fontSize || 12
   });
 
   return { width: bounds.width(), height: bounds.height() };

diff --git a/packages/vrender-core/CHANGELOG.json b/packages/vrender-core/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/vrender-core",
   "entries": [
+    {
+      "version": "0.18.10",
+      "tag": "@visactor/vrender-core_v0.18.10",
+      "date": "Fri, 29 Mar 2024 08:02:16 GMT",
+      "comments": {}
+    },
     {
       "version": "0.18.9",
       "tag": "@visactor/vrender-core_v0.18.9",

diff --git a/packages/vrender-core/CHANGELOG.md b/packages/vrender-core/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @visactor/vrender-core
 
-This log was last generated on Thu, 28 Mar 2024 10:13:24 GMT and should not be manually modified.
+This log was last generated on Fri, 29 Mar 2024 08:02:16 GMT and should not be manually modified.
+
+## 0.18.10
+Fri, 29 Mar 2024 08:02:16 GMT
+
+_Version update only_
 
 ## 0.18.9
 Thu, 28 Mar 2024 10:13:24 GMT

diff --git a/packages/vrender-core/package.json b/packages/vrender-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-core",
-  "version": "0.18.9",
+  "version": "0.18.10",
   "description": "",
   "sideEffects": [
     "./src/modules.ts",

diff --git a/packages/vrender-kits/CHANGELOG.json b/packages/vrender-kits/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/vrender-kits",
   "entries": [
+    {
+      "version": "0.18.10",
+      "tag": "@visactor/vrender-kits_v0.18.10",
+      "date": "Fri, 29 Mar 2024 08:02:16 GMT",
+      "comments": {}
+    },
     {
       "version": "0.18.9",
       "tag": "@visactor/vrender-kits_v0.18.9",

diff --git 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 Thu, 28 Mar 2024 10:13:24 GMT and should not be manually modified.
+This log was last generated on Fri, 29 Mar 2024 08:02:16 GMT and should not be manually modified.
+
+## 0.18.10
+Fri, 29 Mar 2024 08:02:16 GMT
+
+_Version update only_
 
 ## 0.18.9
 Thu, 28 Mar 2024 10:13:24 GMT

diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-kits",
-  "version": "0.18.9",
+  "version": "0.18.10",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -20,7 +20,7 @@
     "test": ""
   },
   "dependencies": {
-    "@visactor/vrender-core": "workspace:0.18.9",
+    "@visactor/vrender-core": "workspace:0.18.10",
     "@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
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/vrender",
   "entries": [
+    {
+      "version": "0.18.10",
+      "tag": "@visactor/vrender_v0.18.10",
+      "date": "Fri, 29 Mar 2024 08:02:16 GMT",
+      "comments": {}
+    },
     {
       "version": "0.18.9",
       "tag": "@visactor/vrender_v0.18.9",

diff --git a/packages/vrender/CHANGELOG.md b/packages/vrender/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @visactor/vrender
 
-This log was last generated on Thu, 28 Mar 2024 10:13:24 GMT and should not be manually modified.
+This log was last generated on Fri, 29 Mar 2024 08:02:16 GMT and should not be manually modified.
+
+## 0.18.10
+Fri, 29 Mar 2024 08:02:16 GMT
+
+_Version update only_
 
 ## 0.18.9
 Thu, 28 Mar 2024 10:13:24 GMT
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.18.9","nextBump":"patch"}]
		[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.18.10","nextBump":"patch"}]