Merge pull request #1647 from VisActor/release/0.21.6

[Auto release] release 0.21.6
VisActor · Dec 25, 2024 · 6f4b959 · 6f4b959
2 parents 059e1ea + 3f648cd
commit 6f4b959
Show file tree

Hide file tree

Showing 28 changed files with 188 additions and 51 deletions.
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.21.5","nextBump":"patch"}]
+[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.21.6","nextBump":"patch"}]
diff --git a/docs/assets/changelog/en/changelog.md b/docs/assets/changelog/en/changelog.md
@@ -1,3 +1,16 @@
+# v0.21.5
+
+2024-12-24
+
+
+**🐛 Bug fix**
+
+- **@visactor/vrender-core**: fix issue with image background stroke, closed [#1640](https://github.com/VisActor/VRender/issues/1640)
+
+
+
+[more detail about v0.21.5](https://github.com/VisActor/VRender/releases/tag/v0.21.5)
+
 # v0.21.4
 
 2024-12-23

diff --git a/docs/assets/changelog/zh/changelog.md b/docs/assets/changelog/zh/changelog.md
@@ -1,3 +1,16 @@
+# v0.21.5
+
+2024-12-24
+
+
+**🐛 功能修复**
+
+- **@visactor/vrender-core**: fix issue with image background stroke, closed [#1640](https://github.com/VisActor/VRender/issues/1640)
+
+
+
+[更多详情请查看 v0.21.5](https://github.com/VisActor/VRender/releases/tag/v0.21.5)
+
 # v0.21.4
 
 2024-12-23

diff --git a/docs/package.json b/docs/package.json
@@ -13,7 +13,7 @@
     "@visactor/vchart": "1.3.0",
     "@visactor/vutils": "~0.19.2",
     "@visactor/vgrammar": "~0.5.7",
-    "@visactor/vrender": "workspace:0.21.5",
+    "@visactor/vrender": "workspace:0.21.6",
     "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.21.6",
+      "tag": "@visactor/react-vrender-utils_v0.21.6",
+      "date": "Tue, 24 Dec 2024 12:46:37 GMT",
+      "comments": {}
+    },
     {
       "version": "0.21.5",
       "tag": "@visactor/react-vrender-utils_v0.21.5",

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 Tue, 24 Dec 2024 07:53:11 GMT and should not be manually modified.
+This log was last generated on Tue, 24 Dec 2024 12:46:37 GMT and should not be manually modified.
+
+## 0.21.6
+Tue, 24 Dec 2024 12:46:37 GMT
+
+_Version update only_
 
 ## 0.21.5
 Tue, 24 Dec 2024 07:53:11 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.21.5",
+  "version": "0.21.6",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -24,8 +24,8 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@visactor/vrender": "workspace:0.21.5",
-    "@visactor/react-vrender": "workspace:0.21.5",
+    "@visactor/vrender": "workspace:0.21.6",
+    "@visactor/react-vrender": "workspace:0.21.6",
     "@visactor/vutils": "~0.19.2",
     "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.21.6",
+      "tag": "@visactor/react-vrender_v0.21.6",
+      "date": "Tue, 24 Dec 2024 12:46:37 GMT",
+      "comments": {}
+    },
     {
       "version": "0.21.5",
       "tag": "@visactor/react-vrender_v0.21.5",

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 Tue, 24 Dec 2024 07:53:11 GMT and should not be manually modified.
+This log was last generated on Tue, 24 Dec 2024 12:46:37 GMT and should not be manually modified.
+
+## 0.21.6
+Tue, 24 Dec 2024 12:46:37 GMT
+
+_Version update only_
 
 ## 0.21.5
 Tue, 24 Dec 2024 07:53:11 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.21.5",
+  "version": "0.21.6",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -23,7 +23,7 @@
     "react": "^18.2.0"
   },
   "dependencies": {
-    "@visactor/vrender": "workspace:0.21.5",
+    "@visactor/vrender": "workspace:0.21.6",
     "@visactor/vutils": "~0.19.2",
     "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,21 @@
 {
   "name": "@visactor/vrender-components",
   "entries": [
+    {
+      "version": "0.21.6",
+      "tag": "@visactor/vrender-components_v0.21.6",
+      "date": "Tue, 24 Dec 2024 12:46:37 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "fix: add onBeforeAttributeUpdate in base-component"
+          },
+          {
+            "comment": "fix: fix the bug of axis pickable\n\n"
+          }
+        ]
+      }
+    },
     {
       "version": "0.21.5",
       "tag": "@visactor/vrender-components_v0.21.5",

diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Change Log - @visactor/vrender-components
 
-This log was last generated on Tue, 24 Dec 2024 07:53:11 GMT and should not be manually modified.
+This log was last generated on Tue, 24 Dec 2024 12:46:37 GMT and should not be manually modified.
+
+## 0.21.6
+Tue, 24 Dec 2024 12:46:37 GMT
+
+### Updates
+
+- fix: add onBeforeAttributeUpdate in base-component
+- fix: fix the bug of axis pickable
+
+
 
 ## 0.21.5
 Tue, 24 Dec 2024 07:53:11 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.21.5",
+  "version": "0.21.6",
   "description": "components library for dp visualization",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -27,8 +27,8 @@
   "dependencies": {
     "@visactor/vutils": "~0.19.2",
     "@visactor/vscale": "~0.19.2",
-    "@visactor/vrender-core": "workspace:0.21.5",
-    "@visactor/vrender-kits": "workspace:0.21.5"
+    "@visactor/vrender-core": "workspace:0.21.6",
+    "@visactor/vrender-kits": "workspace:0.21.6"
   },
   "devDependencies": {
     "@internal/bundler": "workspace:*",

diff --git a/packages/vrender-components/src/axis/base.ts b/packages/vrender-components/src/axis/base.ts
@@ -135,6 +135,7 @@ export abstract class AxisBase<T extends AxisBaseAttributes> extends AbstractCom
     this.add(this._innerView);
 
     this._renderInner(this._innerView);
+    this.setAttribute('pickable', false);
 
     this._bindEvent();
   }

diff --git a/packages/vrender-components/src/core/base.ts b/packages/vrender-components/src/core/base.ts
@@ -1,7 +1,7 @@
 /**
  * @description 组件基类
  */
-import type { IGroupGraphicAttribute } from '@visactor/vrender-core';
+import type { IGroupGraphicAttribute, ISetAttributeContext } from '@visactor/vrender-core';
 import { Group, CustomEvent } from '@visactor/vrender-core';
 import type { Dict } from '@visactor/vutils';
 import { merge, isFunction, isPlainObject, isNil } from '@visactor/vutils';
@@ -65,7 +65,13 @@ export abstract class AbstractComponent<T extends IGroupGraphicAttribute = IGrou
    * @param value
    * @param forceUpdateTag
    */
-  setAttribute(key: string, value: any, forceUpdateTag?: boolean | undefined): void {
+  setAttribute(key: string, value: any, forceUpdateTag?: boolean | undefined, context?: ISetAttributeContext): void {
+    const params =
+      this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate({ [key]: value }, this.attribute, key, context);
+    if (params) {
+      return this._setAttributes(params as Partial<T>, forceUpdateTag);
+    }
+
     // overwrite when previous or next attribute is function
     if (
       isPlainObject(this.attribute[key]) &&
@@ -93,8 +99,16 @@ export abstract class AbstractComponent<T extends IGroupGraphicAttribute = IGrou
     this.onAttributeUpdate();
   }
 
+  setAttributes(params: Partial<T>, forceUpdateTag?: boolean | undefined, context?: ISetAttributeContext): void {
+    params =
+      (this.onBeforeAttributeUpdate &&
+        (this.onBeforeAttributeUpdate(params, this.attribute, null, context) as Partial<T>)) ||
+      params;
+    return this._setAttributes(params, forceUpdateTag);
+  }
+
   // @ts-ignore
-  setAttributes(params: Partial<T>, forceUpdateTag?: boolean | undefined): void {
+  _setAttributes(params: Partial<T>, forceUpdateTag?: boolean | undefined): void {
     const keys = Object.keys(params) as (keyof T)[];
     this._mergeAttributes(params, keys);
 

diff --git a/packages/vrender-core/CHANGELOG.json b/packages/vrender-core/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@visactor/vrender-core",
   "entries": [
+    {
+      "version": "0.21.6",
+      "tag": "@visactor/vrender-core_v0.21.6",
+      "date": "Tue, 24 Dec 2024 12:46:37 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "fix: fix issue with stroke clip"
+          }
+        ]
+      }
+    },
     {
       "version": "0.21.5",
       "tag": "@visactor/vrender-core_v0.21.5",

diff --git a/packages/vrender-core/CHANGELOG.md b/packages/vrender-core/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @visactor/vrender-core
 
-This log was last generated on Tue, 24 Dec 2024 07:53:11 GMT and should not be manually modified.
+This log was last generated on Tue, 24 Dec 2024 12:46:37 GMT and should not be manually modified.
+
+## 0.21.6
+Tue, 24 Dec 2024 12:46:37 GMT
+
+### Updates
+
+- fix: fix issue with stroke clip
 
 ## 0.21.5
 Tue, 24 Dec 2024 07:53:11 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.21.5",
+  "version": "0.21.6",
   "description": "",
   "sideEffects": [
     "./src/modules.ts",

diff --git a/packages/vrender-core/src/plugins/builtin-plugin/html-attribute-plugin.ts b/packages/vrender-core/src/plugins/builtin-plugin/html-attribute-plugin.ts
@@ -220,7 +220,7 @@ export class HtmlAttributePlugin implements IPlugin {
     // 更新样式
     application.global.updateDom(wrapContainer, {
       width: options.width,
-      height: options.width,
+      height: options.height,
       style: calculateStyle
     });
   }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.21.5","nextBump":"patch"}]
		[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.21.6","nextBump":"patch"}]