Merge pull request #240 from VisActor/fix/marker-format

Fix/marker format
VisActor · Aug 3, 2023 · 18d0df5 · 18d0df5
2 parents 95ee374 + 791852e
commit 18d0df5
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 19 deletions.
diff --git a/common/changes/@visactor/vrender-components/fix-marker-format_2023-08-01-08-00.json b/common/changes/@visactor/vrender-components/fix-marker-format_2023-08-01-08-00.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vrender-components",
+      "comment": "chore: trigger publish alpha version",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@visactor/vrender-components"
+}
diff --git a/common/changes/@visactor/vrender-components/fix-marker-format_2023-08-01-08-56.json b/common/changes/@visactor/vrender-components/fix-marker-format_2023-08-01-08-56.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vrender-components",
+      "comment": "fix(marker): formatMethod logic should not in vrender",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@visactor/vrender-components"
+}
diff --git a/common/changes/@visactor/vrender-components/fix-marker-format_2023-08-01-12-39.json b/common/changes/@visactor/vrender-components/fix-marker-format_2023-08-01-12-39.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vrender-components",
+      "comment": "fix(marker): formatMethod logic should not in vrender",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@visactor/vrender-components"
+}
diff --git a/common/changes/@visactor/vrender-components/pre-release-0.13.7-alpha.1_2023-08-01-08-59.json b/common/changes/@visactor/vrender-components/pre-release-0.13.7-alpha.1_2023-08-01-08-59.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vrender-components",
+      "comment": "fix(marker): formatMethod logic should not in vrender",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@visactor/vrender-components"
+}
diff --git a/packages/vrender-components/__tests__/browser/examples/mark-area.ts b/packages/vrender-components/__tests__/browser/examples/mark-area.ts
@@ -19,9 +19,6 @@ export function run() {
       position: guiObject.labelPos,
       dx: guiObject.labelDx,
       dy: guiObject.labelDy,
-      formatMethod: text => {
-        return text + '格式化';
-      },
       areaStyle: {
         cornerRadius: guiObject.cornerRadius
       }

diff --git a/packages/vrender-components/__tests__/browser/examples/mark-line.ts b/packages/vrender-components/__tests__/browser/examples/mark-line.ts
@@ -29,10 +29,7 @@ export function run() {
       autoRotate: guiObject.labelAutoRotate,
       refX: guiObject.labelRefX,
       refY: guiObject.labelRefY,
-      refAngle: degreeToRadian(guiObject.labelRefAngle),
-      formatMethod: text => {
-        return text + '格式化';
-      }
+      refAngle: degreeToRadian(guiObject.labelRefAngle)
     }
   };
   const markLine = new MarkLine({

diff --git a/packages/vrender-components/__tests__/browser/examples/mark-point.ts b/packages/vrender-components/__tests__/browser/examples/mark-point.ts
@@ -34,10 +34,7 @@ export function run() {
       refY: guiObject.itemRefY,
       refAngle: guiObject.itemRefAngle,
       textStyle: {
-        text: 'mark point label text',
-        formatMethod: text => {
-          return text + '格式化';
-        }
+        text: 'mark point label text'
       },
       richTextStyle: {
         textConfig: [

diff --git a/packages/vrender-components/src/marker/type.ts b/packages/vrender-components/src/marker/type.ts
@@ -64,10 +64,6 @@ export interface IMarkLabel extends Omit<TagAttributes, 'x' | 'y' | 'panel'> {
    * 标签的背景面板配置
    */
   panel?: IMarkBackgroundAttributes;
-  /**
-   * 标签自定义格式
-   */
-  formatMethod?: (text: string | number | string[] | number[]) => string;
 }
 
 export interface IMarkRef {

diff --git a/packages/vrender-components/src/tag/tag.ts b/packages/vrender-components/src/tag/tag.ts
@@ -42,8 +42,7 @@ export class Tag extends AbstractComponent<Required<TagAttributes>> {
       maxWidth,
       padding = 4,
       visible,
-      state,
-      formatMethod
+      state
     } = this.attribute as TagAttributes;
     const parsedPadding = normalizePadding(padding);
 
@@ -85,7 +84,7 @@ export class Tag extends AbstractComponent<Required<TagAttributes>> {
     textX += symbolPlaceWidth;
 
     const textAttrs = {
-      text: formatMethod ? formatMethod(text) : text,
+      text,
       visible: isValid(text) && visible !== false,
       lineHeight: textStyle?.fontSize,
       ...textStyle,

diff --git a/packages/vrender-components/src/tag/type.ts b/packages/vrender-components/src/tag/type.ts
@@ -54,7 +54,6 @@ export type TagAttributes = {
   maxWidth?: number;
   visible?: boolean;
   state?: StateStyle;
-  formatMethod?: (text: string | number | string[] | number[]) => string;
 } & Omit<IGroupGraphicAttribute, 'background'>;
 
 export type TagShapeAttributes = {