Merge pull request #89 from VisActor/feat/text-editor

fix: fix issue with text and mark edit
VisActor · Oct 12, 2024 · f8388f4 · f8388f4
2 parents 1619659 + 9a16fb1
commit f8388f4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/packages/vstory/demo/src/demos/API.tsx b/packages/vstory/demo/src/demos/API.tsx
@@ -126,12 +126,18 @@ export const API = () => {
  fill: 'black',
  text: 'black',
  symbolType: 'circle'
+ },
+ group: {
+ fill: 'red',
+ visible: true
  }
  }
  });
 
  text.setConfig({ options: { graphic: { text: '这是普通文本' } } });
- console.log(text);
+ setTimeout(() => {
+ text.setConfig({ options: { group: { visible: false } } });
+ }, 1000);
 
  chart.setConfig({ zIndex: 100 });
 

diff --git a/packages/vstory/demo/src/demos/VChartGraphic.tsx b/packages/vstory/demo/src/demos/VChartGraphic.tsx
@@ -13,7 +13,7 @@ loadAllSelection();
 Edit.registerEditComponent('text', TextSelection);
 // Edit.registerEditComponent('richtext', RichTextSelection);
 Edit.registerEditComponent('box-selection', BoxSelection);
-Edit.registerEditComponent('series-mark-selection', SeriesMarkSelection);
+// Edit.registerEditComponent('series-mark-selection', SeriesMarkSelection);
 
 const spec = {
  direction: 'vertical',

diff --git a/packages/vstory/src/edit/edit-component/index.ts b/packages/vstory/src/edit/edit-component/index.ts
@@ -6,6 +6,7 @@ import { ChartSelection } from './chart-selection';
 import { Edit } from '../edit';
 import { ShapeSelection } from './shape-selection';
 import { TextSelection } from './text-selection';
+import { SeriesMarkSelection } from './series-mark/series-mark-selection';
 // import { RichTextSelection } from './richtext-selection';
 
 export function loadAllSelection() {
@@ -17,4 +18,5 @@ export function loadAllSelection() {
  Edit.registerEditComponent('shape', ShapeSelection);
  Edit.registerEditComponent('chart', ChartSelection);
  Edit.registerEditComponent('box-selection', BoxSelection);
+ Edit.registerEditComponent('series-mark-selection', SeriesMarkSelection);
 }
diff --git a/packages/vstory/src/index.ts b/packages/vstory/src/index.ts
@@ -11,3 +11,4 @@ export * from './story/interface/index';
 export * from './story/character';
 export * from './template/unit';
 export * from './edit/edit-component';
+export { RichTextEditPlugin } from '@visactor/vrender-core';
diff --git a/packages/vstory/src/story/character/component/characters/character-text.ts b/packages/vstory/src/story/character/component/characters/character-text.ts
@@ -19,7 +19,8 @@ export class CharacterComponentText extends CharacterComponent {
  this._group = new ComponentGroup({
  ...getLayoutFromWidget(this._config.position),
  // angle: this._config.options.angle,
- zIndex: this._config.zIndex
+ zIndex: this._config.zIndex,
+ ...(this._config.options.group || {})
  });
  this.option.graphicParent.add(this._group);
 

diff --git a/packages/vstory/src/story/character/dsl-interface.ts b/packages/vstory/src/story/character/dsl-interface.ts
@@ -39,6 +39,7 @@ export type IEditorTextGraphicAttribute = {
 export interface IComponentCharacterConfig extends ICharacterConfigBase {
  options: {
  graphic: any;
+ group?: any;
  text?: IEditorTextGraphicAttribute;
  isResized?: boolean;
  // angle?: number;