From 99154793546ec461f082f9737027e5cacbe5f397 Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Wed, 18 Oct 2023 14:02:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=850.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 4 +-- simple-mind-map/package.json | 4 +-- simple-mind-map/types/index.d.ts | 32 +++++++++++++------ .../types/src/constants/defaultOptions.d.ts | 6 +++- .../types/src/core/render/Render.d.ts | 27 +++++++++------- .../types/src/core/render/node/Node.d.ts | 5 ++- simple-mind-map/types/src/layouts/Base.d.ts | 1 + simple-mind-map/types/src/utils/index.d.ts | 9 +++++- 8 files changed, 59 insertions(+), 29 deletions(-) diff --git a/index.html b/index.html index 11ebd742..5b2b6cb8 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ 思绪思维导图
\ No newline at end of file + } \ No newline at end of file diff --git a/simple-mind-map/package.json b/simple-mind-map/package.json index ccd877b1..03828fbe 100644 --- a/simple-mind-map/package.json +++ b/simple-mind-map/package.json @@ -1,6 +1,6 @@ { "name": "simple-mind-map", - "version": "0.7.3-fix.2", + "version": "0.8.0", "description": "一个简单的web在线思维导图", "authors": [ { @@ -22,7 +22,7 @@ "scripts": { "lint": "eslint src/", "format": "prettier --write .", - "types": "npx -p typescript tsc index.js --declaration --allowJs --emitDeclarationOnly --outDir types --target es2017", + "types": "npx -p typescript tsc index.js --declaration --allowJs --emitDeclarationOnly --outDir types --target es2017 --skipLibCheck", "wsServe": "node ./bin/wsServer.mjs" }, "module": "index.js", diff --git a/simple-mind-map/types/index.d.ts b/simple-mind-map/types/index.d.ts index 2b75cd02..e357d95b 100644 --- a/simple-mind-map/types/index.d.ts +++ b/simple-mind-map/types/index.d.ts @@ -76,7 +76,7 @@ declare class MindMap { disableMouseWheelZoom: boolean; errorHandler: (code: any, error: any) => void; resetCss: string; - enableDblclickReset: boolean; + enableDblclickBackToRootNode: boolean; minExportImgCanvasScale: number; hoverRectColor: string; hoverRectPadding: number; @@ -99,15 +99,14 @@ declare class MindMap { avatarSize: number; fontSize: number; }; + associativeLineIsAlwaysAboveNode: boolean; + defaultGeneralizationText: string; + handleIsSplitByWrapOnPasteCreateNewNode: any; + addHistoryTime: number; }); opt: any; el: any; - elRect: any; - width: any; - height: any; cssEl: HTMLStyleElement; - svg: any; - draw: any; event: Event; keyCommand: KeyCommand; command: Command; @@ -115,10 +114,22 @@ declare class MindMap { view: View; batchExecution: BatchExecution; handleOpt(opt: any): any; + initContainer(): void; + associativeLineDraw: any; + svg: any; + draw: any; + lineDraw: any; + nodeDraw: any; + otherDraw: any; + clearDraw(): void; addCss(): void; removeCss(): void; render(callback: any, source?: string): void; reRender(callback: any, source?: string): void; + getElRectInfo(): void; + elRect: any; + width: any; + height: any; resize(): void; on(event: any, fn: any): void; emit(event: any, ...args: any[]): void; @@ -126,15 +137,15 @@ declare class MindMap { initCache(): void; initTheme(): void; themeConfig: any; - setTheme(theme: any): void; + setTheme(theme: any, notRender?: boolean): void; getTheme(): any; - setThemeConfig(config: any): void; + setThemeConfig(config: any, notRender?: boolean): void; getCustomThemeConfig(): any; getThemeConfig(prop: any): any; getConfig(prop: any): any; updateConfig(opt?: {}): void; getLayout(): any; - setLayout(layout: any): void; + setLayout(layout: any, notRender?: boolean): void; execCommand(...args: any[]): void; setData(data: any): void; setFullData(data: any): void; @@ -145,9 +156,10 @@ declare class MindMap { y: number; }; setMode(mode: any): void; - getSvgData({ paddingX, paddingY }?: { + getSvgData({ paddingX, paddingY, ignoreWatermark }?: { paddingX?: number; paddingY?: number; + ignoreWatermark?: boolean; }): { svg: any; svgHTML: any; diff --git a/simple-mind-map/types/src/constants/defaultOptions.d.ts b/simple-mind-map/types/src/constants/defaultOptions.d.ts index 8a3bcc77..2541f2a6 100644 --- a/simple-mind-map/types/src/constants/defaultOptions.d.ts +++ b/simple-mind-map/types/src/constants/defaultOptions.d.ts @@ -72,7 +72,7 @@ export namespace defaultOpt { const disableMouseWheelZoom: boolean; function errorHandler(code: any, error: any): void; const resetCss: string; - const enableDblclickReset: boolean; + const enableDblclickBackToRootNode: boolean; const minExportImgCanvasScale: number; const hoverRectColor: string; const hoverRectPadding: number; @@ -97,4 +97,8 @@ export namespace defaultOpt { const fontSize_2: number; export { fontSize_2 as fontSize }; } + const associativeLineIsAlwaysAboveNode: boolean; + const defaultGeneralizationText: string; + const handleIsSplitByWrapOnPasteCreateNewNode: any; + const addHistoryTime: number; } diff --git a/simple-mind-map/types/src/core/render/Render.d.ts b/simple-mind-map/types/src/core/render/Render.d.ts index 120a0ffd..fe0bf10f 100644 --- a/simple-mind-map/types/src/core/render/Render.d.ts +++ b/simple-mind-map/types/src/core/render/Render.d.ts @@ -4,11 +4,11 @@ declare class Render { opt: {}; mindMap: any; themeConfig: any; - draw: any; renderTree: any; reRender: boolean; isRendering: boolean; hasWaitRendering: boolean; + waitRenderingParams: any[]; nodeCache: {}; lastNodeCache: {}; renderSource: string; @@ -32,18 +32,20 @@ declare class Render { insertMultiNode(appointNodes: any, nodeList: any): void; insertChildNode(openEdit?: boolean, appointNodes?: any[], appointData?: any, appointChildren?: any[]): void; insertMultiChildNode(appointNodes: any, childList: any): void; + insertParentNode(openEdit: boolean, appointNodes: any, appointData: any): void; upNode(): void; downNode(): void; insertAfter(node: any, exist: any): void; insertBefore(node: any, exist: any): void; moveNodeTo(node: any, toNode: any): void; removeNode(appointNodes?: any[]): void; + removeCurrentNode(appointNodes?: any[]): void; pasteNode(data: any): void; cutNode(callback: any): void; setNodeStyle(node: any, prop: any, value: any): void; setNodeStyles(node: any, style: any): void; setNodeActive(node: any, active: any): void; - clearAllActive(): void; + clearActiveNode(): void; setNodeExpand(node: any, expand: any): void; expandAllNode(): void; unexpandAllNode(): void; @@ -63,30 +65,31 @@ declare class Render { setNodeShape(node: any, shape: any): void; goTargetNode(node: any, callback?: () => void): void; registerShortcutKeys(): void; - insertNodeWrap: () => void; toggleActiveExpand(): void; - removeNodeWrap: () => void; - copy(): void; - cut(): void; + clearActiveNodeListOnDrawClick(e: any, eventType: any): void; startTextEdit(): void; endTextEdit(): void; render(callback: () => void, source: any): void; - clearActive(): void; - addActiveNode(node: any): void; - removeActiveNode(node: any): void; - findActiveNodeIndex(node: any): number; - setCopyDataToClipboard(data: any): void; + clearActiveNodeList(): void; + addNodeToActiveList(node: any): void; + removeNodeFromActiveList(node: any): void; + findActiveNodeIndex(node: any): any; + backForward(type: any, step: any): void; + copy(): void; + cut(): void; paste(): void; onPaste(): Promise; insertTo(node: any, exist: any, dir?: string): void; checkNodeLayerChange(node: any, toNode: any): void; - removeOneNode(node: any): void; + getNextActiveNode(): any; copyNode(): any; toggleNodeExpand(node: any): void; setNodeDataRender(node: any, data: any, notRender?: boolean): void; moveNodeToCenter(node: any): void; + setRootNodeCenter(): void; expandToNodeUid(uid: any, callback?: () => void): void; findNodeByUid(uid: any): any; + emitNodeActiveEvent(): void; } import TextEdit from "./TextEdit"; import MindMap from "../../layouts/MindMap"; diff --git a/simple-mind-map/types/src/core/render/node/Node.d.ts b/simple-mind-map/types/src/core/render/node/Node.d.ts index 69a1f5f7..332fc6b8 100644 --- a/simple-mind-map/types/src/core/render/node/Node.d.ts +++ b/simple-mind-map/types/src/core/render/node/Node.d.ts @@ -6,6 +6,8 @@ declare class Node { mindMap: any; renderer: any; draw: any; + nodeDraw: any; + lineDraw: any; style: Style; shapeInstance: Shape; shapePadding: { @@ -84,7 +86,8 @@ declare class Node { top: any; }; reRender(): boolean; - updateNodeActive(): void; + updateNodeActiveClass(): void; + updateNodeByActive(active: any): void; render(callback?: () => void): void; remove(): void; destroy(): void; diff --git a/simple-mind-map/types/src/layouts/Base.d.ts b/simple-mind-map/types/src/layouts/Base.d.ts index 0da0113c..8919b4be 100644 --- a/simple-mind-map/types/src/layouts/Base.d.ts +++ b/simple-mind-map/types/src/layouts/Base.d.ts @@ -4,6 +4,7 @@ declare class Base { renderer: any; mindMap: any; draw: any; + lineDraw: any; root: any; lru: Lru; doLayout(): void; diff --git a/simple-mind-map/types/src/utils/index.d.ts b/simple-mind-map/types/src/utils/index.d.ts index 5eacba05..dc06f807 100644 --- a/simple-mind-map/types/src/utils/index.d.ts +++ b/simple-mind-map/types/src/utils/index.d.ts @@ -64,7 +64,14 @@ export function selectAllInput(el: any): void; export function addDataToAppointNodes(appointNodes: any, data?: {}): any; export function createUidForAppointNodes(appointNodes: any, createNewId?: boolean): any; export function formatDataToArray(data: any): any[]; -export function getNodeIndex(node: any): any; +export function getNodeDataIndex(node: any): any; +export function getNodeIndexInNodeList(node: any, nodeList: any): any; export function generateColorByContent(str: any): string; export function htmlEscape(str: any): any; export function isSameObject(a: any, b: any): boolean; +export function setDataToClipboard(data: any): void; +export function getDataFromClipboard(): Promise<{ + text: string; + img: any; +}>; +export function removeFromParentNodeData(node: any): void;