vue-editify 0.2.18 → 0.2.20

package/lib/index.d.ts

@@ -107,10 +107,6 @@ declare const Editify: import('./core/tool').SFCWithInstall<import('vue').Define
         type: BooleanConstructor;
         default: boolean;
     };
-    tab: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     dark: {
         type: BooleanConstructor;
         default: boolean;
@@ -287,11 +283,156 @@ declare const Editify: import('./core/tool').SFCWithInstall<import('vue').Define
                     };
                 } | null;
             }[];
-            current: number;
-            push: (stack: AlexElement[], range?: import('alex-editor').AlexRange | null) => void;
-            get: (type: -1 | 1) => import('alex-editor').AlexHistoryResultType | null;
-            updateCurrentRange: (range: import('alex-editor').AlexRange) => void;
-            __cloneRange: (newStack: AlexElement[], range?: import('alex-editor').AlexRange | null) => import('alex-editor').AlexRange | null;
+            redoRecords: {
+                stack: {
+                    key: number;
+                    type: import('alex-editor').AlexElementType;
+                    parsedom: string | null;
+                    marks: import('alex-editor').ObjectType | null;
+                    styles: import('alex-editor').ObjectType | null;
+                    textContent: string | null;
+                    children: any[] | null;
+                    parent: any | null;
+                    behavior: "default" | "block";
+                    namespace: string | null;
+                    locked: boolean;
+                    elm: HTMLElement | null;
+                    isBlock: () => boolean;
+                    isInblock: () => boolean;
+                    isInline: () => boolean;
+                    isClosed: () => boolean;
+                    isText: () => boolean;
+                    isBreak: () => boolean;
+                    isEmpty: () => boolean;
+                    isSpaceText: () => boolean;
+                    getUneditableElement: () => AlexElement | null;
+                    isEqual: (element: AlexElement) => boolean;
+                    isContains: (element: AlexElement) => boolean;
+                    isOnlyHasBreak: () => boolean | 0;
+                    isPreStyle: () => boolean;
+                    hasMarks: () => boolean;
+                    hasStyles: () => boolean;
+                    hasChildren: () => boolean;
+                    hasContains: (element: AlexElement) => boolean;
+                    clone: (deep?: boolean | undefined) => AlexElement;
+                    convertToBlock: () => void;
+                    toEmpty: () => void;
+                    getBlock: () => AlexElement;
+                    getInblock: () => AlexElement | null;
+                    getInline: () => AlexElement | null;
+                    isEqualStyles: (element: AlexElement) => boolean;
+                    isEqualMarks: (element: AlexElement) => boolean;
+                    isFirst: (element: AlexElement) => boolean;
+                    isLast: (element: AlexElement) => boolean;
+                    __render: () => void;
+                    __fullClone: () => AlexElement;
+                }[];
+                range: {
+                    anchor: {
+                        element: {
+                            key: number;
+                            type: import('alex-editor').AlexElementType;
+                            parsedom: string | null;
+                            marks: import('alex-editor').ObjectType | null;
+                            styles: import('alex-editor').ObjectType | null;
+                            textContent: string | null;
+                            children: any[] | null;
+                            parent: any | null;
+                            behavior: "default" | "block";
+                            namespace: string | null;
+                            locked: boolean;
+                            elm: HTMLElement | null;
+                            isBlock: () => boolean;
+                            isInblock: () => boolean;
+                            isInline: () => boolean;
+                            isClosed: () => boolean;
+                            isText: () => boolean;
+                            isBreak: () => boolean;
+                            isEmpty: () => boolean;
+                            isSpaceText: () => boolean;
+                            getUneditableElement: () => AlexElement | null;
+                            isEqual: (element: AlexElement) => boolean;
+                            isContains: (element: AlexElement) => boolean;
+                            isOnlyHasBreak: () => boolean | 0;
+                            isPreStyle: () => boolean;
+                            hasMarks: () => boolean;
+                            hasStyles: () => boolean;
+                            hasChildren: () => boolean;
+                            hasContains: (element: AlexElement) => boolean;
+                            clone: (deep?: boolean | undefined) => AlexElement;
+                            convertToBlock: () => void;
+                            toEmpty: () => void;
+                            getBlock: () => AlexElement;
+                            getInblock: () => AlexElement | null;
+                            getInline: () => AlexElement | null;
+                            isEqualStyles: (element: AlexElement) => boolean;
+                            isEqualMarks: (element: AlexElement) => boolean;
+                            isFirst: (element: AlexElement) => boolean;
+                            isLast: (element: AlexElement) => boolean;
+                            __render: () => void;
+                            __fullClone: () => AlexElement;
+                        };
+                        offset: number;
+                        isEqual: (point: import('alex-editor').AlexPoint) => boolean;
+                        moveToEnd: (element: AlexElement) => void;
+                        moveToStart: (element: AlexElement) => void;
+                    };
+                    focus: {
+                        element: {
+                            key: number;
+                            type: import('alex-editor').AlexElementType;
+                            parsedom: string | null;
+                            marks: import('alex-editor').ObjectType | null;
+                            styles: import('alex-editor').ObjectType | null;
+                            textContent: string | null;
+                            children: any[] | null;
+                            parent: any | null;
+                            behavior: "default" | "block";
+                            namespace: string | null;
+                            locked: boolean;
+                            elm: HTMLElement | null;
+                            isBlock: () => boolean;
+                            isInblock: () => boolean;
+                            isInline: () => boolean;
+                            isClosed: () => boolean;
+                            isText: () => boolean;
+                            isBreak: () => boolean;
+                            isEmpty: () => boolean;
+                            isSpaceText: () => boolean;
+                            getUneditableElement: () => AlexElement | null;
+                            isEqual: (element: AlexElement) => boolean;
+                            isContains: (element: AlexElement) => boolean;
+                            isOnlyHasBreak: () => boolean | 0;
+                            isPreStyle: () => boolean;
+                            hasMarks: () => boolean;
+                            hasStyles: () => boolean;
+                            hasChildren: () => boolean;
+                            hasContains: (element: AlexElement) => boolean;
+                            clone: (deep?: boolean | undefined) => AlexElement;
+                            convertToBlock: () => void;
+                            toEmpty: () => void;
+                            getBlock: () => AlexElement;
+                            getInblock: () => AlexElement | null;
+                            getInline: () => AlexElement | null;
+                            isEqualStyles: (element: AlexElement) => boolean;
+                            isEqualMarks: (element: AlexElement) => boolean;
+                            isFirst: (element: AlexElement) => boolean;
+                            isLast: (element: AlexElement) => boolean;
+                            __render: () => void;
+                            __fullClone: () => AlexElement;
+                        };
+                        offset: number;
+                        isEqual: (point: import('alex-editor').AlexPoint) => boolean;
+                        moveToEnd: (element: AlexElement) => void;
+                        moveToStart: (element: AlexElement) => void;
+                    };
+                } | null;
+            }[];
+            cloneRange: (newStack: AlexElement[], range: import('alex-editor').AlexRange | null) => import('alex-editor').AlexRange | null;
+            setState: (stack: AlexElement[], range: import('alex-editor').AlexRange | null) => void;
+            undo: () => import('alex-editor').AlexHistoryRecordType | null;
+            redo: () => import('alex-editor').AlexHistoryRecordType | null;
+            updateRange: (range: import('alex-editor').AlexRange) => void;
         };
         stack: {
             key: number;
@@ -515,6 +656,8 @@ declare const Editify: import('./core/tool').SFCWithInstall<import('vue').Define
         collapseToEnd: (element?: AlexElement) => void;
         setDisabled: () => void;
         setEnabled: () => void;
+        undo: () => void;
+        redo: () => void;
         emit: (eventName: string, ...value: any) => boolean;
         on: (eventName: string, eventHandle: (...args: any) => void) => void;
         off: (eventName: string, eventHandle?: (...args: any) => void) => void;
@@ -739,10 +882,6 @@ declare const Editify: import('./core/tool').SFCWithInstall<import('vue').Define
         type: BooleanConstructor;
         default: boolean;
     };
-    tab: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     dark: {
         type: BooleanConstructor;
         default: boolean;
@@ -793,7 +932,6 @@ declare const Editify: import('./core/tool').SFCWithInstall<import('vue').Define
     extraKeepTags: string[];
     renderRules: ((el: AlexElement) => void)[];
     autoheight: boolean;
-    tab: boolean;
     dark: boolean;
     offset: number;
 }, {}>>;
@@ -813,7 +951,7 @@ export type * from './core/tool';
 export type * from './core/function';
 export type * from './editify/menu';
 export type * from './editify/toolbar';
-export { elementIsMatch, getMatchElementByElement, getMatchElementByRange, elementIsList, getListByElement, hasListInRange, rangeIsInList, elementIsTask, getTaskByElement, hasTaskInRange, rangeIsInTask, elementIsAttachment, hasAttachmentInRange, elementIsMathformula, getMathformulaByElement, hasMathformulaInRange, elementIsPanel, getPanelByElement, hasPanelInRange, elementIsInfoBlock, getInfoBlockByElement, hasInfoBlockInRange, rangeIsInInfoBlock, hasPreInRange, hasTableInRange, hasQuoteInRange, rangeIsInQuote, hasLinkInRange, hasImageInRange, hasVideoInRange, queryTextStyle, setTextStyle, removeTextStyle, queryTextMark, setTextMark, removeTextMark, getRangeText, addSpaceTextToBothSides, setHeading, setIndentIncrease, setIndentDecrease, setQuote, setAlign, setList, setTask, setLineHeight, insertLink, insertImage, insertVideo, insertTable, insertCodeBlock, insertSeparator, insertAttachment, insertMathformula, insertInfoBlock, insertPanel } from './core/function';
+export { elementIsMatch, getMatchElementByElement, getMatchElementByRange, elementIsList, getListByElement, hasListInRange, rangeIsInList, elementIsTask, getTaskByElement, hasTaskInRange, rangeIsInTask, elementIsAttachment, hasAttachmentInRange, elementIsMathformula, getMathformulaByElement, hasMathformulaInRange, elementIsInfoBlock, getInfoBlockByElement, hasInfoBlockInRange, rangeIsInInfoBlock, hasPreInRange, hasTableInRange, hasQuoteInRange, rangeIsInQuote, hasLinkInRange, hasImageInRange, hasVideoInRange, queryTextStyle, setTextStyle, removeTextStyle, queryTextMark, setTextMark, removeTextMark, getRangeText, addSpaceTextToBothSides, setHeading, setIndentIncrease, setIndentDecrease, setQuote, setAlign, setList, setTask, setLineHeight, insertLink, insertImage, insertVideo, insertTable, insertCodeBlock, insertSeparator, insertAttachment, insertMathformula, insertInfoBlock } from './core/function';
 declare const install: (app: App) => void;
-declare const version = "0.2.18";
+declare const version = "0.2.20";
 export { Editify as default, Editify, install, AlexElement, version };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-editify",
-	"version": "0.2.18",
+	"version": "0.2.20",
 	"private": false,
 	"sideEffects": [
 		"*.css"
@@ -17,7 +17,7 @@
 		"lib": "vue-tsc && vite build"
 	},
 	"dependencies": {
-		"alex-editor": "^1.4.30",
+		"alex-editor": "^1.4.34",
 		"dap-util": "^1.5.8",
 		"highlight.js": "^11.8.0",
 		"katex": "^0.16.10",

package/src/core/function.ts

@@ -763,54 +763,6 @@ export const hasMathformulaInRange = (editor: AlexEditor, dataRangeCaches: AlexE
 	})
 }
 
-/** --------------------------------面板判断函数--------------------------------------------------- */
-
-/**
- * Open API：判断元素是否面板，不做空元素判断
- * @param el
- * @returns
- */
-export const elementIsPanel = (element: AlexElement) => {
-	return elementIsMatch(element, {
-		parsedom: 'div',
-		marks: {
-			'data-editify-panel': true
-		}
-	})
-}
-
-/**
- * Open API：判断元素是否在面板内，是的话返回面板元素，否则返回null
- * @param el
- * @returns
- */
-export const getPanelByElement = (element: AlexElement): AlexElement | null => {
-	return getMatchElementByElement(element, {
-		parsedom: 'div',
-		marks: {
-			'data-editify-panel': true
-		}
-	})
-}
-
-/**
- * Open API：选区是否含有面板，不一定是同一个面板，只要含有面板即返回true
- * @param editor
- * @param dataRangeCaches
- * @returns
- */
-export const hasPanelInRange = (editor: AlexEditor, dataRangeCaches: AlexElementsRangeType) => {
-	if (!editor.range) {
-		return false
-	}
-	if (editor.range.anchor.isEqual(editor.range.focus)) {
-		return !!getPanelByElement(editor.range.anchor.element)
-	}
-	return dataRangeCaches.flatList.some(item => {
-		return !!getPanelByElement(item.element)
-	})
-}
-
 /** --------------------------------信息块判断函数---------------------------------------------- */
 
 /**
@@ -1507,7 +1459,7 @@ export const addSpaceTextToBothSides = (editor: AlexEditor, element: AlexElement
 /** --------------------------------菜单功能函数----------------------------------------------------- */
 
 /**
- * OpenAPI：设置标题，支持h1-h6和p
+ * Open API：设置标题，支持h1-h6和p
  * @param editor
  * @param dataRangeCaches
  * @param editTrans
@@ -2274,59 +2226,3 @@ export const insertInfoBlock = (editor: AlexEditor, dataRangeCaches: AlexElement
 		})
 	}
 }
-
-/**
- * Open API：插入面板
- * @param editor
- * @param panelTitle 面板标题
- * @param panelContent 面板内容
- */
-export const insertPanel = (editor: AlexEditor, panelTitle: string, panelContent: string) => {
-	const panelElement = AlexElement.create({
-		type: 'block',
-		parsedom: 'div',
-		marks: {
-			'data-editify-panel': 'true'
-		},
-		children: [
-			{
-				type: 'inblock',
-				parsedom: 'div',
-				behavior: 'block',
-				children: [
-					{
-						type: 'text',
-						textcontent: panelTitle
-					}
-				]
-			},
-			{
-				type: 'inblock',
-				parsedom: 'div',
-				behavior: 'block',
-				children: [
-					{
-						type: 'text',
-						textcontent: panelContent
-					}
-				]
-			}
-		]
-	})
-	editor.insertElement(panelElement)
-	//面板后面插入段落
-	const paragraph = AlexElement.create({
-		type: 'block',
-		parsedom: AlexElement.BLOCK_NODE,
-		children: [
-			{
-				type: 'closed',
-				parsedom: 'br'
-			}
-		]
-	})
-	editor.addElementAfter(paragraph, panelElement)
-	//移动光标到新插入的元素
-	editor.range!.anchor.moveToEnd(panelElement.children![0])
-	editor.range!.focus.moveToEnd(panelElement.children![0])
-}

package/src/core/rule.ts

@@ -1,7 +1,7 @@
 import { AlexEditor, AlexElement, AlexElementCreateConfigType } from 'alex-editor'
 import { common as DapCommon, color as DapColor } from 'dap-util'
 import { LanguagesItemType, getHljsHtml } from '@/hljs'
-import { getTableSize, getCellSpanNumber, elementIsList, elementIsTask, elementIsAttachment, elementIsMathformula, elementIsInfoBlock, elementIsPanel, autocompleteTableCells, autoHideMergedTableCells, updateRangeInPre, addSpaceTextToBothSides } from './function'
+import { getTableSize, getCellSpanNumber, elementIsList, elementIsTask, elementIsAttachment, elementIsMathformula, elementIsInfoBlock, autocompleteTableCells, autoHideMergedTableCells, updateRangeInPre, addSpaceTextToBothSides } from './function'
 
 /**
  * 有序列表和无序列表的格式化处理
@@ -434,7 +434,7 @@ export const infoBlockHandle = (_editor: AlexEditor, element: AlexElement, color
 export const specialInblockHandle = (editor: AlexEditor, element: AlexElement) => {
 	if (element.hasChildren()) {
 		element.children!.forEach(el => {
-			if (elementIsList(el, true) || elementIsList(el, false) || elementIsTask(el) || elementIsInfoBlock(el) || elementIsPanel(el) || ['blockquote', 'pre', 'table', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p'].includes(el.parsedom!)) {
+			if (elementIsList(el, true) || elementIsList(el, false) || elementIsTask(el) || elementIsInfoBlock(el) || ['blockquote', 'pre', 'table', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p'].includes(el.parsedom!)) {
 				const newEl = el.clone()
 				newEl.type = 'block'
 				const block = element.getBlock()