vue-editify 0.2.16 → 0.2.18

package/src/core/tool.ts

@@ -102,11 +102,6 @@ export type CodeBlockToolbarType = {
 }
 
 export type TextToolbarType = {
-	heading?: MenuDisplayButtonType
-	align?: MenuSelectButtonType
-	orderList?: MenuButtonType
-	unorderList?: MenuButtonType
-	task?: MenuButtonType
 	bold?: MenuButtonType
 	italic?: MenuButtonType
 	strikethrough?: MenuButtonType
@@ -116,7 +111,6 @@ export type TextToolbarType = {
 	sub?: MenuButtonType
 	fontSize?: MenuDisplayButtonType
 	fontFamily?: MenuDisplayButtonType
-	lineHeight?: MenuDisplayButtonType
 	foreColor?: MenuSelectButtonType
 	backColor?: MenuSelectButtonType
 	formatClear?: MenuButtonType
@@ -288,18 +282,6 @@ export const queryHasValue = (obj: ObjectType, name: string, value?: string | nu
 	return ownValue == value
 }
 
-/**
- * 深拷贝函数
- * @param data
- * @returns
- */
-export const cloneData = (data: any) => {
-	if (DapCommon.isObject(data) || Array.isArray(data)) {
-		return JSON.parse(JSON.stringify(data))
-	}
-	return data
-}
-
 /**
  * 获取菜单按钮列表数据配置
  * @param editTrans
@@ -506,7 +488,7 @@ export const getButtonOptionsConfig = (editTrans: (key: string) => any): ButtonO
  * @param editLocale
  * @returns
  */
-export const getToolbarConfig = (editTrans: (key: string) => any, editLocale: LocaleType): ToolbarConfigType => {
+export const getToolbarConfig = (editTrans: (key: string) => any): ToolbarConfigType => {
 	return {
 		//是否使用工具条
 		use: true,
@@ -542,75 +524,6 @@ export const getToolbarConfig = (editTrans: (key: string) => any, editLocale: Lo
 		},
 		//文本工具条配置
 		text: {
-			//标题
-			heading: {
-				//是否显示此工具
-				show: false,
-				//是否禁用此工具
-				disabled: false,
-				//列表配置
-				options: getButtonOptionsConfig(editTrans).heading,
-				//按钮默认显示的值
-				defaultValue: 'p',
-				//浮层宽度
-				width: editLocale == 'zh_CN' ? 130 : 150,
-				//浮层最大高度
-				maxHeight: '',
-				//左侧边框是否显示
-				leftBorder: false,
-				//右侧边框是否显示
-				rightBorder: false
-			},
-			//对齐方式
-			align: {
-				//是否显示此工具
-				show: false,
-				//是否禁用此工具
-				disabled: false,
-				//列表配置
-				options: getButtonOptionsConfig(editTrans).align,
-				//浮层宽度
-				width: editLocale == 'zh_CN' ? 110 : 130,
-				//浮层最大高度
-				maxHeight: '',
-				//左侧边框是否显示
-				leftBorder: false,
-				//右侧边框是否显示
-				rightBorder: false
-			},
-			//有序列表
-			orderList: {
-				//是否显示此工具
-				show: false,
-				//是否禁用此工具
-				disabled: false,
-				//左侧边框是否显示
-				leftBorder: false,
-				//右侧边框是否显示
-				rightBorder: false
-			},
-			//无序列表
-			unorderList: {
-				//是否显示此工具
-				show: false,
-				//是否禁用此工具
-				disabled: false,
-				//左侧边框是否显示
-				leftBorder: false,
-				//右侧边框是否显示
-				rightBorder: false
-			},
-			//任务列表
-			task: {
-				//是否显示此工具
-				show: false,
-				//是否禁用此工具
-				disabled: false,
-				//左侧边框是否显示
-				leftBorder: false,
-				//右侧边框是否显示
-				rightBorder: false
-			},
 			//粗体
 			bold: {
 				//是否显示此工具
@@ -726,25 +639,6 @@ export const getToolbarConfig = (editTrans: (key: string) => any, editLocale: Lo
 				//右侧边框是否显示
 				rightBorder: false
 			},
-			//行高
-			lineHeight: {
-				//是否显示此工具
-				show: false,
-				//是否禁用此工具
-				disabled: false,
-				//列表配置
-				options: getButtonOptionsConfig(editTrans).lineHeight,
-				//按钮默认显示的值
-				defaultValue: '',
-				//浮层宽度
-				width: 90,
-				//浮层最大高度
-				maxHeight: '',
-				//左侧边框是否显示
-				leftBorder: false,
-				//右侧边框是否显示
-				rightBorder: false
-			},
 			//前景色
 			foreColor: {
 				//是否显示此工具
@@ -754,7 +648,7 @@ export const getToolbarConfig = (editTrans: (key: string) => any, editLocale: Lo
 				//列表配置
 				options: getButtonOptionsConfig(editTrans).foreColor,
 				//左侧边框是否显示
-				leftBorder: false,
+				leftBorder: true,
 				//右侧边框是否显示
 				rightBorder: false
 			},
@@ -832,12 +726,12 @@ export const getMenuConfig = (editTrans: (key: string) => any, editLocale: Local
 			video: 25,
 			table: 26,
 			codeBlock: 27,
-			sourceView: 28,
-			fullScreen: 29,
-			attachment: 30,
-			mathformula: 31,
-			panel: 32,
-			infoBlock: 33
+			attachment: 28,
+			mathformula: 29,
+			panel: 30,
+			infoBlock: 31,
+			sourceView: 32,
+			fullScreen: 33
 		},
 		//撤销按钮配置
 		undo: {

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;
 				}
 			}
 		}
@@ -428,6 +498,10 @@
 					font-size: 18px;
 					border-bottom: 1px solid var(--editify-border-color);
 					padding-bottom: 8px;
+
+					&:empty {
+						background-color: #000;
+					}
 				}
 			}
 		}

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 } 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, elementIsPanel, elementIsInfoBlock, getMatchElementByElement } 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,7 +627,7 @@ const handleCustomHtmlPaste = async (elements: AlexElement[]) => {
 				}
 				//数学公式内的属性全部保留
 				if (!!getMathformulaByElement(el)) {
-					marks = mergeObject(marks, cloneData(el.marks!))!
+					marks = mergeObject(marks, DapCommon.clone(el.marks!))!
 				}
 				//面板属性保留
 				if (elementIsPanel(el)) {
@@ -621,7 +658,7 @@ const handleCustomHtmlPaste = async (elements: AlexElement[]) => {
 				}
 				//数学公式内的样式全部保留
 				if (!!getMathformulaByElement(el)) {
-					styles = mergeObject(styles, cloneData(el.styles!))!
+					styles = mergeObject(styles, DapCommon.clone(el.styles!))!
 				}
 			}
 			//对外的自定义属性和样式保留
@@ -635,7 +672,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)
@@ -862,27 +916,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')
 }

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 = {

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)
 		}
 	},
 	//工具条配置