Skip to content

Commit d9529a3

Browse files
committed
fix: 修复打包报错
1 parent 1572510 commit d9529a3

File tree

10 files changed

+22
-15
lines changed

10 files changed

+22
-15
lines changed

packages/board-core/src/elements/baseElement/baseRender.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { EBoard } from '../../board'
2-
import { IShapeRectangle } from '../rectElement/type'
3-
import { IModel } from '@e-board/board-core'
2+
import { IModel } from '../../services/modelService/type'
43
class BaseRender<T extends Record<string, any>> {
54
protected board: EBoard
65
constructor(board: EBoard) {

packages/board-core/src/elements/lineElement/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ import { IElement } from "../../services";
22
import { LineCtrlElement } from "./ctrlElement";
33
import { Render } from "./render";
44
import SaveInfoProvider from "./saveInfoProvider";
5+
import { ILineModel } from "./type";
56

67
const lineElement = {
78
type: "line",
89
ctrlElement: LineCtrlElement,
910
saveInfoProvider: SaveInfoProvider,
1011
render: Render
11-
} satisfies IElement;
12+
} satisfies IElement<ILineModel>;
1213

1314
export default lineElement;

packages/board-core/src/elements/lineElement/render/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44

5-
import { IModel } from "@e-board/board-core";
5+
import { IModel } from "../../../services/modelService/type";
66

77
import { BaseRender } from "../../baseElement/baseRender";
88
import { ILineModel } from "../type";

packages/board-core/src/elements/pictureElement/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ import { IElement } from "../../services";
22
import { PictureCtrlElement } from "./ctrlElement";
33
import { Render } from "./render";
44
import SaveInfoProvider from "./saveInfoProvider";
5+
import { IPictureModel } from "./type";
56

67
const pictureElement = {
78
type: "picture",
89
ctrlElement: PictureCtrlElement,
910
saveInfoProvider: SaveInfoProvider,
1011
render: Render
11-
} satisfies IElement;
12+
} satisfies IElement<IPictureModel>;
1213

1314
export default pictureElement;

packages/board-core/src/elements/pictureElement/render/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { IModel } from "@e-board/board-core";
1+
import { IModel } from "../../../services/modelService/type";
22
import { BaseRender } from "../../baseElement/baseRender";
33
import { IPictureModel } from "../type";
44

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { IRectangleModel } from "src/plugins/drawShape/type";
21
import { IElement } from "../../services";
32
import { RectCtrlElement } from "./ctrlElement";
43
import { Render } from "./render";
54
import SaveInfoProvider from "./saveInfoProvider";
5+
import { IShapeRectangle } from "./type";
66

77
const rectElement = {
88
type: "rectangle",
99
ctrlElement: RectCtrlElement,
1010
saveInfoProvider: SaveInfoProvider,
1111
render: Render
12-
} satisfies IElement<IRectangleModel>
12+
} satisfies IElement<IShapeRectangle>
1313

1414
export default rectElement;

packages/board-core/src/elements/rectElement/render/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { IModel } from "@e-board/board-core";
1+
import { IModel } from "../../../services/modelService/type";
22

33
import { BaseRender } from "../../baseElement/baseRender";
44
import { IShapeRectangle } from "../type";
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
import { lineElement, pictureElement, rectElement } from '../../../elements'
2-
export const commonElements = [lineElement, rectElement, pictureElement]
2+
import type { IElement } from '../type'
3+
4+
export const commonElements: Array<IElement<any>> = [
5+
lineElement,
6+
rectElement,
7+
pictureElement
8+
]

packages/board-core/src/services/elementService/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { IElement, IElementService } from "./type";
44

55
class ElementService implements IElementService {
66
private board!: IBoard;
7-
private elementMap: Map<string, IElement> = new Map();
7+
private elementMap: Map<string, IElement<any>> = new Map();
88
init = ({ board }: IServiceInitParams) => {
99
this.board = board;
1010
this.registerCommonElements();
@@ -17,7 +17,7 @@ class ElementService implements IElementService {
1717
})
1818
}
1919

20-
public registerElement(shape: IElement) {
20+
public registerElement(shape: IElement<any>) {
2121
this.elementMap.set(shape.type, shape);
2222
}
2323

packages/board-core/src/services/elementService/type.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import type { IServiceInitParams } from "../../types";
33

44
export type IElementService = {
55
init: (params: IServiceInitParams) => void;
6-
registerElement: <T extends Record<string, any>>(shape: IElement<T>) => void;
7-
getElement: <T extends Record<string, any>>(type: string) => IElement<T> | undefined;
8-
getAllElement: <T extends Record<string, any>>() => IElement<T>[];
6+
registerElement: (shape: IElement<any>) => void;
7+
getElement: (type: string) => IElement<any> | undefined;
8+
getAllElement: () => IElement<any>[];
99
dispose: () => void;
1010
}
1111
export const IElementService = Symbol("IElementService");

0 commit comments

Comments
 (0)