vue-editify 0.2.17 → 0.2.19

package/src/editify/editify.less

@@ -136,23 +136,92 @@
 		:deep(h6) {
 			font-size: 16px;
 		}
+
+		//不是有序列表元素则重置后面的有序列表序列
+		:deep(:not(div[data-editify-list='ol'])) + div[data-editify-list='ol'] {
+			counter-reset: item 0;
+		}
+
 		//有序列表样式
 		:deep(div[data-editify-list='ol']) {
 			margin-bottom: 15px;
 
+			//第一个元素重置序列
+			&:first-of-type {
+				counter-reset: item 0;
+			}
+
 			&::before {
-				content: attr(data-editify-value) '.';
+				counter-increment: item;
+				content: counter(item) '.';
 				margin-right: 10px;
 			}
+
+			&[data-editify-list-style='decimal'] {
+				&::before {
+					content: counter(item, decimal) '.';
+				}
+			}
+			&[data-editify-list-style='decimal-leading-zero'] {
+				&::before {
+					content: counter(item, decimal-leading-zero) '.';
+				}
+			}
+			&[data-editify-list-style='lower-roman'] {
+				&::before {
+					content: counter(item, lower-roman) '.';
+				}
+			}
+			&[data-editify-list-style='upper-roman'] {
+				&::before {
+					content: counter(item, upper-roman) '.';
+				}
+			}
+			&[data-editify-list-style='lower-alpha'] {
+				&::before {
+					content: counter(item, lower-alpha) '.';
+				}
+			}
+			&[data-editify-list-style='upper-alpha'] {
+				&::before {
+					content: counter(item, upper-alpha) '.';
+				}
+			}
+			&[data-editify-list-style='lower-greek'] {
+				&::before {
+					content: counter(item, lower-greek) '.';
+				}
+			}
+			&[data-editify-list-style='cjk-ideographic'] {
+				&::before {
+					content: counter(item, cjk-ideographic) '.';
+				}
+			}
 		}
 		//无序列表样式
 		:deep(div[data-editify-list='ul']) {
 			margin-bottom: 15px;
 
 			&::before {
-				content: '\2022';
+				content: counter(item, disc);
 				margin-right: 10px;
 			}
+
+			&[data-editify-list-style='disc'] {
+				&::before {
+					content: counter(item, disc);
+				}
+			}
+			&[data-editify-list-style='circle'] {
+				&::before {
+					content: counter(item, circle);
+				}
+			}
+			&[data-editify-list-style='square'] {
+				&::before {
+					content: counter(item, square);
+				}
+			}
 		}
 		//代码样式
 		:deep([data-editify-code]) {
@@ -309,15 +378,13 @@
 			padding-left: 26px;
 			font-size: var(--editify-font-size);
 			color: var(--editify-font-color-dark);
-			transition: all 300ms;
 
 			&::before {
 				display: block;
-				width: 16px;
-				height: 16px;
+				width: 14px;
+				height: 14px;
 				border-radius: 2px;
 				border: 1px solid var(--editify-font-color-light);
-				transition: all 300ms;
 				box-sizing: border-box;
 				user-select: none;
 				content: '';
@@ -332,29 +399,32 @@
 			&::after {
 				display: inline-block;
 				width: 10px;
-				height: 6px;
+				height: 5px;
 				position: absolute;
 				content: '';
-				left: 3px;
+				left: 2px;
 				top: 50%;
-				margin-top: -2px;
-				border: 1px solid var(--editify-font-color-light);
+				margin-top: -1px;
+				border: 2px solid transparent;
 				border-top: none;
 				border-right: none;
 				transform: translateY(-50%) rotate(-45deg);
 				transform-origin: center;
-				box-sizing: border-box;
 				z-index: 2;
 				cursor: pointer;
-				opacity: 0;
-				transition: all 300ms;
 			}
 
 			&[data-editify-task='checked'] {
 				text-decoration: line-through;
 				color: var(--editify-font-color-light);
+
+				&::before {
+					background-color: var(--editify-font-color-disabled);
+					border-color: var(--editify-font-color-disabled);
+				}
+
 				&::after {
-					opacity: 1;
+					border-color: #fff;
 				}
 			}
 		}
@@ -407,30 +477,6 @@
 				background: var(--editify-background-darker);
 			}
 		}
-		//面板样式
-		:deep(div[data-editify-panel]) {
-			display: block;
-			position: relative;
-			width: 100%;
-			background-color: var(--editify-background-dark);
-			color: var(--editify-font-color);
-			border-radius: 4px;
-			margin-bottom: 15px;
-			padding: 10px 10px 1px 10px;
-			border: 1px solid var(--editify-border-color);
-
-			& > div {
-				margin: 0 0 10px 0;
-				font-size: var(--editify-font-size);
-
-				&:first-child {
-					margin: 0 0 15px 0;
-					font-size: 18px;
-					border-bottom: 1px solid var(--editify-border-color);
-					padding-bottom: 8px;
-				}
-			}
-		}
 		//信息块样式
 		:deep(div[data-editify-info]) {
 			display: block;
@@ -452,7 +498,7 @@
 				display: flex;
 				justify-content: center;
 				align-items: center;
-				content: '\e610';
+				content: '\e600';
 				font-family: 'editify-icon' !important;
 				font-size: 1.25em;
 				padding: 0 20px;

package/src/editify/editify.vue

@@ -21,10 +21,10 @@
 <script setup lang="ts">
 import { computed, getCurrentInstance, nextTick, onBeforeUnmount, onMounted, provide, ref, watch } from 'vue'
 import { AlexEditor, AlexElement, AlexElementRangeType, AlexElementsRangeType } from 'alex-editor'
-import { element as DapElement, event as DapEvent, data as DapData, number as DapNumber, color as DapColor } from 'dap-util'
-import { mergeObject, getToolbarConfig, getMenuConfig, MenuConfigType, ObjectType, ToolbarConfigType, clickIsOut, cloneData } from '@/core/tool'
-import { parseList, orderdListHandle, commonElementHandle, tableThTdHandle, tableFormatHandle, tableRangeMergedHandle, preHandle, specialInblockHandle, attachmentHandle, mathformulaHandle, infoBlockHandle } from '@/core/rule'
-import { elementToParagraph, getMatchElementByRange, hasTableInRange, hasLinkInRange, hasPreInRange, hasImageInRange, hasVideoInRange, elementIsTask, elementIsAttachment, elementIsList, elementIsMathformula, getMathformulaByElement, elementIsPanel, elementIsInfoBlock } from '@/core/function'
+import { element as DapElement, event as DapEvent, data as DapData, number as DapNumber, color as DapColor, common as DapCommon } from 'dap-util'
+import { mergeObject, getToolbarConfig, getMenuConfig, MenuConfigType, ObjectType, ToolbarConfigType, clickIsOut, ShortcutType, MenuExtendType } from '@/core/tool'
+import { listHandle, imageHandle, videoHandle, separatorHandle, linkHandle, codeHandle, tableHandle, preHandle, attachmentHandle, mathformulaHandle, infoBlockHandle, specialInblockHandle } from '@/core/rule'
+import { elementToParagraph, getMatchElementByRange, elementIsTask, elementIsAttachment, elementIsList, elementIsMathformula, getMathformulaByElement, elementIsInfoBlock, getMatchElementByElement, hasTableInRange, hasPreInRange } from '@/core/function'
 import { trans } from '@/locale'
 import { LanguagesItemType } from '@/hljs'
 import { extraKeepTagsForMathformula } from '@/feature/mathformula'
@@ -125,7 +125,7 @@ const showBorder = computed<boolean>(() => {
 })
 //最终生效的工具栏配置
 const toolbarConfig = computed<ToolbarConfigType>(() => {
-	return mergeObject(getToolbarConfig($editTrans, props.locale), props.toolbar || {}) as ToolbarConfigType
+	return mergeObject(getToolbarConfig($editTrans), props.toolbar || {}) as ToolbarConfigType
 })
 //最终生效的菜单栏配置
 const menuConfig = computed<MenuConfigType>(() => {
@@ -163,9 +163,7 @@ const handleToolbar = () => {
 	}
 	hideToolbar()
 	nextTick(() => {
-		const table = getMatchElementByRange(editor.value!, dataRangeCaches.value, { parsedom: 'table' })
 		const codeBlock = getMatchElementByRange(editor.value!, dataRangeCaches.value, { parsedom: 'pre' })
-		const link = getMatchElementByRange(editor.value!, dataRangeCaches.value, { parsedom: 'a' })
 		const image = getMatchElementByRange(editor.value!, dataRangeCaches.value, { parsedom: 'img' })
 		const video = getMatchElementByRange(editor.value!, dataRangeCaches.value, { parsedom: 'video' })
 
@@ -189,26 +187,6 @@ const handleToolbar = () => {
 				toolbarOptions.value.show = true
 			}
 		}
-		//显示链接工具条
-		else if (link) {
-			toolbarOptions.value.type = 'link'
-			toolbarOptions.value.node = `[data-editify-uid="${instance.uid}"] [data-editify-element="${link.key}"]`
-			if (toolbarOptions.value.show) {
-				toolbarRef.value!.layerRef!.setPosition()
-			} else {
-				toolbarOptions.value.show = true
-			}
-		}
-		//显示表格工具条
-		else if (table) {
-			toolbarOptions.value.type = 'table'
-			toolbarOptions.value.node = `[data-editify-uid="${instance.uid}"] [data-editify-element="${table.key}"]`
-			if (toolbarOptions.value.show) {
-				toolbarRef.value!.layerRef!.setPosition()
-			} else {
-				toolbarOptions.value.show = true
-			}
-		}
 		//显示代码块工具条
 		else if (codeBlock) {
 			toolbarOptions.value.type = 'codeBlock'
@@ -219,10 +197,11 @@ const handleToolbar = () => {
 				toolbarOptions.value.show = true
 			}
 		}
-		//显示文本工具条
+		//以下是选区时显示文本工具条，非选区时显示其他工具条的情况
 		else {
 			const result = dataRangeCaches.value.flatList.filter((item: AlexElementRangeType) => item.element.isText())
-			if (result.length && !hasTableInRange(editor.value!, dataRangeCaches.value) && !hasPreInRange(editor.value!, dataRangeCaches.value) && !hasLinkInRange(editor.value!, dataRangeCaches.value) && !hasImageInRange(editor.value!, dataRangeCaches.value) && !hasVideoInRange(editor.value!, dataRangeCaches.value)) {
+			//显示文本工具条
+			if (result.length) {
 				toolbarOptions.value.type = 'text'
 				if (toolbarOptions.value.show) {
 					toolbarRef.value!.layerRef!.setPosition()
@@ -230,6 +209,63 @@ const handleToolbar = () => {
 					toolbarOptions.value.show = true
 				}
 			}
+			//显示其他工具条
+			else {
+				const table = getMatchElementByRange(editor.value!, dataRangeCaches.value, { parsedom: 'table' })
+				const link = getMatchElementByRange(editor.value!, dataRangeCaches.value, { parsedom: 'a' })
+				const orderList = getMatchElementByRange(editor.value!, dataRangeCaches.value, {
+					parsedom: 'div',
+					marks: {
+						'data-editify-list': 'ol'
+					}
+				})
+				const unorderList = getMatchElementByRange(editor.value!, dataRangeCaches.value, {
+					parsedom: 'div',
+					marks: {
+						'data-editify-list': 'ul'
+					}
+				})
+				//显示链接工具条
+				if (link) {
+					toolbarOptions.value.type = 'link'
+					toolbarOptions.value.node = `[data-editify-uid="${instance.uid}"] [data-editify-element="${link.key}"]`
+					if (toolbarOptions.value.show) {
+						toolbarRef.value!.layerRef!.setPosition()
+					} else {
+						toolbarOptions.value.show = true
+					}
+				}
+				//显示表格工具条
+				else if (table) {
+					toolbarOptions.value.type = 'table'
+					toolbarOptions.value.node = `[data-editify-uid="${instance.uid}"] [data-editify-element="${table.key}"]`
+					if (toolbarOptions.value.show) {
+						toolbarRef.value!.layerRef!.setPosition()
+					} else {
+						toolbarOptions.value.show = true
+					}
+				}
+				//显示有序列表工具条
+				else if (orderList) {
+					toolbarOptions.value.type = 'orderList'
+					toolbarOptions.value.node = `[data-editify-uid="${instance.uid}"] [data-editify-element="${orderList.key}"]`
+					if (toolbarOptions.value.show) {
+						toolbarRef.value!.layerRef!.setPosition()
+					} else {
+						toolbarOptions.value.show = true
+					}
+				}
+				//显示无序列表工具条
+				else if (unorderList) {
+					toolbarOptions.value.type = 'unorderList'
+					toolbarOptions.value.node = `[data-editify-uid="${instance.uid}"] [data-editify-element="${unorderList.key}"]`
+					if (toolbarOptions.value.show) {
+						toolbarRef.value!.layerRef!.setPosition()
+					} else {
+						toolbarOptions.value.show = true
+					}
+				}
+			}
 		}
 	})
 }
@@ -241,28 +277,28 @@ const createEditor = () => {
 		disabled: isDisabled.value,
 		renderRules: [
 			el => {
-				parseList(editor.value!, el)
+				listHandle(editor.value!, el)
 			},
 			el => {
-				orderdListHandle(editor.value!, el)
+				imageHandle(editor.value!, el)
 			},
 			el => {
-				commonElementHandle(editor.value!, el)
+				videoHandle(editor.value!, el)
 			},
 			el => {
-				tableThTdHandle(editor.value!, el)
+				separatorHandle(editor.value!, el)
 			},
 			el => {
-				tableFormatHandle(editor.value!, el)
+				linkHandle(editor.value!, el)
 			},
 			el => {
-				tableRangeMergedHandle(editor.value!, el)
+				codeHandle(editor.value!, el)
 			},
 			el => {
-				preHandle(editor.value!, el, !!(toolbarConfig.value?.use && toolbarConfig.value?.codeBlock?.languages?.show), toolbarConfig.value?.codeBlock?.languages?.options as (string | LanguagesItemType)[])
+				tableHandle(editor.value!, el)
 			},
 			el => {
-				specialInblockHandle(editor.value!, el)
+				preHandle(editor.value!, el, !!(toolbarConfig.value?.use && toolbarConfig.value?.codeBlock?.languages?.show), toolbarConfig.value?.codeBlock?.languages?.options as (string | LanguagesItemType)[])
 			},
 			el => {
 				attachmentHandle(editor.value!, el, $editTrans)
@@ -273,6 +309,9 @@ const createEditor = () => {
 			el => {
 				infoBlockHandle(editor.value!, el, props.color)
 			},
+			el => {
+				specialInblockHandle(editor.value!, el)
+			},
 			...props.renderRules
 		],
 		extraKeepTags: [...extraKeepTagsForMathformula, ...props.extraKeepTags],
@@ -473,7 +512,7 @@ const documentClick = (e: Event) => {
 		if (key) {
 			const element = editor.value!.getElementByKey(key)!
 			//如果是任务列表元素
-			if (elementIsTask(element)) {
+			if (element && elementIsTask(element)) {
 				const rect = DapElement.getElementBounding(elm)
 				//在复选框范围内
 				if (event.pageX >= Math.abs(rect.left) && event.pageX <= Math.abs(rect.left + 16) && event.pageY >= Math.abs(rect.top + elm.offsetHeight / 2 - 8) && event.pageY <= Math.abs(rect.top + elm.offsetHeight / 2 + 8)) {
@@ -499,7 +538,8 @@ const documentClick = (e: Event) => {
 }
 //重新定义编辑器粘贴html
 const handleCustomHtmlPaste = async (elements: AlexElement[]) => {
-	AlexElement.flatElements(elements).forEach(el => {
+	const flatElements = AlexElement.flatElements(elements)
+	flatElements.forEach(el => {
 		if (!el.isText()) {
 			let marks: ObjectType = {}
 			let styles: ObjectType = {}
@@ -552,10 +592,7 @@ const handleCustomHtmlPaste = async (elements: AlexElement[]) => {
 				//有序和无序列表属性保留
 				if (elementIsList(el, true) || elementIsList(el, false)) {
 					marks['data-editify-list'] = el.marks!['data-editify-list']
-					//有序列表保留序列号标记
-					if (el.marks!['data-editify-value']) {
-						marks['data-editify-value'] = el.marks!['data-editify-value']
-					}
+					marks['data-editify-list-style'] = el.marks!['data-editify-list-style']
 				}
 				//行内代码属性保留
 				if (el.parsedom == AlexElement.TEXT_NODE && el.marks!['data-editify-code']) {
@@ -590,11 +627,7 @@ const handleCustomHtmlPaste = async (elements: AlexElement[]) => {
 				}
 				//数学公式内的属性全部保留
 				if (!!getMathformulaByElement(el)) {
-					marks = mergeObject(marks, cloneData(el.marks!))!
-				}
-				//面板属性保留
-				if (elementIsPanel(el)) {
-					marks['data-editify-panel'] = el.marks!['data-editify-panel']
+					marks = mergeObject(marks, DapCommon.clone(el.marks!))!
 				}
 				//信息块属性保留
 				if (elementIsInfoBlock(el)) {
@@ -621,7 +654,7 @@ const handleCustomHtmlPaste = async (elements: AlexElement[]) => {
 				}
 				//数学公式内的样式全部保留
 				if (!!getMathformulaByElement(el)) {
-					styles = mergeObject(styles, cloneData(el.styles!))!
+					styles = mergeObject(styles, DapCommon.clone(el.styles!))!
 				}
 			}
 			//对外的自定义属性和样式保留
@@ -635,7 +668,24 @@ const handleCustomHtmlPaste = async (elements: AlexElement[]) => {
 			el.marks = marks
 			el.styles = styles
 		}
+		//对于不在table下的这些表格元素直接置空
+		if (el.parsedom && ['tbody', 'tr', 'th', 'td', 'thead', 'tfooter', 'colgroup', 'col'].includes(el.parsedom)) {
+			const flag = !!getMatchElementByElement(el, {
+				parsedom: 'table'
+			})
+			if (!flag) {
+				el.toEmpty()
+				if (el.parent) {
+					const index = el.parent.children!.findIndex(item => item.isEqual(el))
+					el.parent.children!.splice(index, 1)
+				}
+			}
+		}
 	})
+	elements = elements.filter(el => !el.isEmpty())
+	if (!elements.length) {
+		return
+	}
 	//如果使用了自定义粘贴html的功能
 	if (typeof props.customHtmlPaste == 'function') {
 		await props.customHtmlPaste(elements)
@@ -687,12 +737,94 @@ const handleCustomParseNode = (ele: AlexElement) => {
 	return ele
 }
 //编辑区域键盘按下
-const handleEditorKeydown = (val: string, e: Event) => {
+const handleEditorKeydown = (val: string, e: KeyboardEvent) => {
 	if (isDisabled.value) {
 		return
 	}
-	//单独按下tab键
-	if ((e as KeyboardEvent).key.toLocaleLowerCase() == 'tab' && !(e as KeyboardEvent).metaKey && !(e as KeyboardEvent).shiftKey && !(e as KeyboardEvent).ctrlKey && !(e as KeyboardEvent).altKey && props.tab) {
+	//遍历菜单栏配置，设置快捷键
+	for (let key in menuConfig.value) {
+		//如果是拓展菜单
+		if (key == 'extends') {
+			//获取拓展菜单列表
+			const extendMenus = (menuConfig.value as any)[key] as MenuExtendType
+			//遍历拓展菜单列表
+			Object.keys(extendMenus).forEach(extendKey => {
+				//获取拓展菜单配置
+				const item = extendMenus[extendKey]
+				//获取该菜单按钮的快捷键配置
+				const shortcut = item.shortcut as ShortcutType | undefined
+				//如果快捷键配置存在并且定义了define方法
+				if (shortcut && typeof shortcut.define == 'function') {
+					//获取define方法执行结果
+					const res = shortcut.define(e) as boolean | { [code: string]: boolean }
+					//如果执行结果是true，则表示该快捷键按下
+					if (res === true) {
+						//阻止默认行为
+						e.preventDefault()
+						//没有被禁用则执行对应的操作
+						if (!item.disabled) {
+							shortcut.operation?.(editor.value!, dataRangeCaches.value, isSourceView, isFullScreen)
+						}
+					}
+					//如果是对象，则表示有多个快捷键操作
+					else if (res && DapCommon.isObject(res)) {
+						//遍历
+						Object.keys(res).forEach(code => {
+							//如果是true，则执行对应的操作
+							if (!!res[code]) {
+								//阻止默认行为
+								e.preventDefault()
+								//没有被禁用则执行对应的操作
+								if (!item.disabled) {
+									shortcut.operation?.(editor.value!, dataRangeCaches.value, isSourceView, isFullScreen, code)
+								}
+							}
+						})
+					}
+				}
+			})
+		}
+		//如果是内置菜单
+		else if (!['use', 'tooltip', 'mode', 'style', 'sequence'].includes(key)) {
+			const item = (menuConfig.value as any)[key]
+			//这里多做一步判断：判断是否菜单并且是否有快捷键配置
+			if (DapCommon.isObject(item) && item.show === true && DapCommon.isObject(item.shortcut)) {
+				//获取该菜单按钮的快捷键配置
+				const shortcut = item.shortcut as ShortcutType
+				//如果定义了define方法
+				if (typeof shortcut.define == 'function') {
+					//获取define方法执行结果
+					const res = shortcut.define(e) as boolean | { [code: string]: boolean }
+					//如果执行结果是true，则表示该快捷键按下
+					if (res === true) {
+						//阻止默认行为
+						e.preventDefault()
+						//没有被禁用则执行对应的操作
+						if (!item.disabled) {
+							shortcut.operation?.(editor.value!, dataRangeCaches.value, isSourceView, isFullScreen)
+						}
+					}
+					//如果是对象，则表示有多个快捷键操作
+					else if (res && DapCommon.isObject(res)) {
+						//遍历
+						Object.keys(res).forEach(code => {
+							//如果是true，则执行对应的操作
+							if (!!res[code]) {
+								//阻止默认行为
+								e.preventDefault()
+								//没有被禁用则执行对应的操作
+								if (!item.disabled) {
+									shortcut.operation?.(editor.value!, dataRangeCaches.value, isSourceView, isFullScreen, code)
+								}
+							}
+						})
+					}
+				}
+			}
+		}
+	}
+	//代码块和表格中单独按下tab键，插入4个空格
+	if (e.key.toLocaleLowerCase() == 'tab' && !e.metaKey && !e.shiftKey && !e.ctrlKey && !e.altKey && (hasTableInRange(editor.value!, dataRangeCaches.value) || hasPreInRange(editor.value!, dataRangeCaches.value))) {
 		e.preventDefault()
 		editor.value!.insertText('    ')
 		editor.value!.domRender()
@@ -862,27 +994,25 @@ const handleAfterRender = () => {
 	//设定视频高度
 	setVideoHeight()
 	//附件元素下载事件设置
-	AlexElement.flatElements(editor.value!.stack).forEach(el => {
-		if (elementIsAttachment(el)) {
-			DapEvent.off(el.elm as HTMLElement, 'click')
-			//单击下载
-			DapEvent.on(el.elm as HTMLElement, 'click', async () => {
-				//获取文件地址
-				const url = el.marks!['data-editify-attachment']
-				//使用fetch读取文件地址
-				const res = await fetch(url, {
-					method: 'GET'
-				})
-				//获取blob数据
-				const blob = await res.blob()
-				//创建a标签进行下载
-				const a = document.createElement('a')
-				a.setAttribute('target', '_blank')
-				a.setAttribute('href', URL.createObjectURL(blob))
-				a.setAttribute('download', el.marks!['data-editify-attachment-name'])
-				a.click()
+	contentRef.value!.querySelectorAll('span[data-editify-attachment]').forEach(dom => {
+		DapEvent.off(dom as HTMLElement, 'click')
+		//单击下载
+		DapEvent.on(dom as HTMLElement, 'click', async () => {
+			//获取文件地址
+			const url = dom.getAttribute('data-editify-attachment')!
+			//使用fetch读取文件地址
+			const res = await fetch(url, {
+				method: 'GET'
 			})
-		}
+			//获取blob数据
+			const blob = await res.blob()
+			//创建a标签进行下载
+			const a = document.createElement('a')
+			a.setAttribute('target', '_blank')
+			a.setAttribute('href', URL.createObjectURL(blob))
+			a.setAttribute('download', dom.getAttribute('data-editify-attachment-name')!)
+			a.click()
+		})
 	})
 	emits('updateview')
 }
@@ -919,28 +1049,14 @@ const undo = () => {
 	if (isDisabled.value) {
 		return
 	}
-	const historyRecord = editor.value!.history.get(-1)
-	if (historyRecord) {
-		editor.value!.history.current = historyRecord.current
-		editor.value!.stack = historyRecord.stack
-		editor.value!.range = historyRecord.range
-		editor.value!.domRender(true)
-		editor.value!.rangeRender()
-	}
+	editor.value!.undo()
 }
 //api：重做
 const redo = () => {
 	if (isDisabled.value) {
 		return
 	}
-	const historyRecord = editor.value!.history.get(1)
-	if (historyRecord) {
-		editor.value!.history.current = historyRecord.current
-		editor.value!.stack = historyRecord.stack
-		editor.value!.range = historyRecord.range
-		editor.value!.domRender(true)
-		editor.value!.rangeRender()
-	}
+	editor.value!.redo()
 }
 
 //监听编辑的值变更

package/src/editify/menu/menu.vue

@@ -46,7 +46,6 @@ import { SourceViewMenuButton } from '@/feature/sourceView'
 import { FullScreenMenuButton } from '@/feature/fullScreen'
 import { AttachmentMenuButton } from '@/feature/attachment'
 import { MathformulaMenuButton } from '@/feature/mathformula'
-import { PanelMenuButton } from '@/feature/panel'
 import { InfoBlockMenuButton } from '@/feature/infoBlock'
 
 defineOptions({
@@ -84,7 +83,7 @@ const menuNames = computed<string[]>(() => {
 	})
 })
 //内置菜单组件的数组
-const defaultMenus = shallowRef([UndoMenuButton, RedoMenuButton, HeadingMenuButton, IndentMenuButton, QuoteMenuButton, SeparatorMenuButton, AlignMenuButton, OrderListMenuButton, UnorderListMenuButton, TaskMenuButton, BoldMenuButton, UnderlineMenuButton, ItalicMenuButton, StrikethroughMenuButton, CodeMenuButton, SuperMenuButton, SubMenuButton, FormatClearMenuButton, FontSizeMenuButton, FontFamilyMenuButton, LineHeightMenuButton, ForeColorMenuButton, BackColorMenuButton, LinkMenuButton, ImageMenuButton, VideoMenuButton, TableMenuButton, CodeBlockMenuButton, SourceViewMenuButton, FullScreenMenuButton, AttachmentMenuButton, MathformulaMenuButton, PanelMenuButton, InfoBlockMenuButton])
+const defaultMenus = shallowRef([UndoMenuButton, RedoMenuButton, HeadingMenuButton, IndentMenuButton, QuoteMenuButton, SeparatorMenuButton, AlignMenuButton, OrderListMenuButton, UnorderListMenuButton, TaskMenuButton, BoldMenuButton, UnderlineMenuButton, ItalicMenuButton, StrikethroughMenuButton, CodeMenuButton, SuperMenuButton, SubMenuButton, FormatClearMenuButton, FontSizeMenuButton, FontFamilyMenuButton, LineHeightMenuButton, ForeColorMenuButton, BackColorMenuButton, LinkMenuButton, ImageMenuButton, VideoMenuButton, TableMenuButton, CodeBlockMenuButton, SourceViewMenuButton, FullScreenMenuButton, AttachmentMenuButton, MathformulaMenuButton, InfoBlockMenuButton])
 //根据菜单名称获取对应的内置菜单组件
 const currentDefaultMenu = computed(() => {
 	return (name: string) => defaultMenus.value.find(item => item.name == `_${name}`)
@@ -128,7 +127,7 @@ const ExtendMenuButton = defineComponent(
 							zIndex: props.zIndex + 1,
 							ref: btnRef,
 							type: configuration.type || 'default',
-							title: configuration.title || '',
+							title: `${configuration.title || ''}${configuration.shortcut?.title ? `【${configuration.shortcut?.title}】` : ''}`,
 							leftBorder: configuration.leftBorder || false,
 							rightBorder: configuration.rightBorder || false,
 							hideScroll: configuration.hideScroll || false,

package/src/editify/props.ts

@@ -12,7 +12,7 @@ export type EditifyResizeParamsType = {
 export type EditifyToolbarOptionsType = {
 	show: boolean
 	node: string | null
-	type: 'text' | 'link' | 'image' | 'video' | 'table' | 'codeBlock'
+	type: 'text' | 'link' | 'image' | 'video' | 'table' | 'codeBlock' | 'orderList' | 'unorderList'
 }
 
 export const EditifyProps = {
@@ -156,11 +156,6 @@ export const EditifyProps = {
 		type: Boolean,
 		default: false
 	},
-	//是否使用tab快捷键
-	tab: {
-		type: Boolean,
-		default: true
-	},
 	//是否使用深色模式
 	dark: {
 		type: Boolean,

package/src/editify/toolbar/props.ts

@@ -19,10 +19,10 @@ export const ToolbarProps = {
 	},
 	//类型
 	type: {
-		type: String as PropType<'text' | 'table' | 'link' | 'codeBlock' | 'image' | 'video'>,
+		type: String as PropType<'text' | 'table' | 'link' | 'codeBlock' | 'image' | 'video' | 'orderList' | 'unorderList'>,
 		default: 'text',
 		validator(value: any) {
-			return ['text', 'table', 'link', 'codeBlock', 'image', 'video'].includes(value)
+			return ['text', 'table', 'link', 'codeBlock', 'image', 'video', 'orderList', 'unorderList'].includes(value)
 		}
 	},
 	//工具条配置