vue-editify 0.0.51 → 0.1.1

package/src/components/{bussiness/Toolbar.vue → Toolbar.vue}

@@ -5,11 +5,11 @@
 			<template v-if="type == 'link'">
 				<div class="editify-toolbar-link">
 					<div class="editify-toolbar-link-label">{{ $editTrans('linkAddress') }}</div>
-					<input @input="modifyLink" @focus="handleInputFocus" @blur="handleInputBlur" :placeholder="$editTrans('linkUrlEnterPlaceholder')" v-model.trim="linkConfig.url" type="url" />
+					<input @change="modifyLink" @focus="handleInputFocus" @blur="handleInputBlur" :placeholder="$editTrans('linkUrlEnterPlaceholder')" v-model.trim="linkConfig.url" type="url" />
 					<div class="editify-toolbar-link-footer">
 						<Checkbox @change="modifyLink" v-model="linkConfig.newOpen" :label="$editTrans('newWindowOpen')" :color="$parent.color" :size="10"></Checkbox>
 						<div class="editify-toolbar-link-operations">
-							<span @click="$parent.removeLink">{{ $editTrans('removeLink') }}</span>
+							<span @click="removeLink">{{ $editTrans('removeLink') }}</span>
 							<a :href="linkConfig.url" target="_blank" :style="{ color: $parent.color }">{{ $editTrans('viewLink') }}</a>
 						</div>
 					</div>
@@ -28,7 +28,7 @@
 					<Icon value="auto-width"></Icon>
 				</Button>
 				<!-- 删除图片 -->
-				<Button @operate="$parent.deleteByParsedom('img')" name="deleteImage" :title="$editTrans('deleteImage')" :tooltip="config.tooltip" :color="$parent.color">
+				<Button @operate="deleteElement('img')" name="deleteImage" :title="$editTrans('deleteImage')" :tooltip="config.tooltip" :color="$parent.color">
 					<Icon value="delete"></Icon>
 				</Button>
 			</template>
@@ -61,7 +61,7 @@
 					<Icon value="controls"></Icon>
 				</Button>
 				<!-- 删除视频 -->
-				<Button @operate="$parent.deleteByParsedom('video')" name="deleteVideo" :title="$editTrans('deleteVideo')" :tooltip="config.tooltip" :color="$parent.color">
+				<Button @operate="deleteElement('video')" name="deleteVideo" :title="$editTrans('deleteVideo')" :tooltip="config.tooltip" :color="$parent.color">
 					<Icon value="delete"></Icon>
 				</Button>
 			</template>
@@ -100,7 +100,7 @@
 					<Icon value="delete-column"></Icon>
 				</Button>
 				<!-- 删除表格 -->
-				<Button @operate="$parent.deleteByParsedom('table')" name="deleteTable" :title="$editTrans('deleteTable')" :tooltip="config.tooltip" :color="$parent.color">
+				<Button @operate="deleteElement('table')" name="deleteTable" :title="$editTrans('deleteTable')" :tooltip="config.tooltip" :color="$parent.color">
 					<Icon value="delete-table"></Icon>
 				</Button>
 			</template>
@@ -194,14 +194,15 @@
 	</Layer>
 </template>
 <script>
-import Layer from '../base/Layer'
-import Tooltip from '../base/Tooltip'
-import Button from '../base/Button'
-import Icon from '../base/Icon'
-import Checkbox from '../base/Checkbox'
-import Colors from './Colors'
+import Layer from './base/Layer'
+import Tooltip from './base/Tooltip'
+import Button from './base/Button'
+import Icon from './base/Icon'
+import Checkbox from './base/Checkbox'
+import Colors from './common/Colors'
 import { AlexElement } from 'alex-editor'
-import Dap from 'dap-util'
+import { common as DapCommon } from 'dap-util'
+import { getCurrentParsedomElement, removeTextStyle, removeTextMark, setTextStyle, setLineHeight, setTextMark, setList, setTask, setHeading, setAlign, isRangeInList, isRangeInTask, queryTextStyle, queryTextMark } from '../core/function'
 export default {
 	name: 'Toolbar',
 	emits: ['update:modelValue'],
@@ -472,102 +473,207 @@ export default {
 	},
 	inject: ['$editTrans'],
 	methods: {
+		//输入框获取焦点
+		handleInputFocus(e) {
+			if (this.$parent.color) {
+				e.currentTarget.style.borderColor = this.$parent.color
+			}
+		},
+		//输入框失去焦点
+		handleInputBlur(e) {
+			e.currentTarget.style.borderColor = ''
+		},
 		//清除格式
 		clearFormat() {
-			this.$parent.formatText(true, true)
+			removeTextStyle(this.$parent)
+			removeTextMark(this.$parent)
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
 		//设置背景色
 		setBackColor(value) {
-			this.$parent.setTextStyle('background-color', value, true, true)
+			setTextStyle(this.$parent, {
+				'background-color': value
+			})
 			this.$refs.backColor.hideLayer()
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
 		//设置前景色
 		setForeColor(value) {
-			this.$parent.setTextStyle('color', value, true, true)
+			setTextStyle(this.$parent, {
+				color: value
+			})
 			this.$refs.foreColor.hideLayer()
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
 		//设置行高
 		setLineHeight(name, value) {
-			this.$parent.setLineHeight(value, true, true)
+			setLineHeight(this.$parent, value)
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
 		//设置字体
 		setFontFamily(name, value) {
-			this.$parent.setTextStyle('font-family', value, true, true)
+			setTextStyle(this.$parent, {
+				'font-family': value
+			})
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
 		//设置字号
 		setFontSize(name, value) {
-			this.$parent.setTextStyle('font-size', value, true, true)
+			setTextStyle(this.$parent, {
+				'font-size': value
+			})
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
 		//设置上标
 		setSuperscript() {
-			this.$parent.setTextStyle('vertical-align', 'super', true, true)
+			if (queryTextStyle(this.$parent, 'vertical-align', 'super')) {
+				removeTextStyle(this.$parent, ['vertical-align'])
+			} else {
+				setTextStyle(this.$parent, {
+					'vertical-align': 'super'
+				})
+			}
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
 		//设置下标
 		setSubscript() {
-			this.$parent.setTextStyle('vertical-align', 'sub', true, true)
+			if (queryTextStyle(this.$parent, 'vertical-align', 'sub')) {
+				removeTextStyle(this.$parent, ['vertical-align'])
+			} else {
+				setTextStyle(this.$parent, {
+					'vertical-align': 'sub'
+				})
+			}
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
 		//设置行内代码样式
 		setCodeStyle() {
-			this.$parent.setTextMark('data-editify-code', true, true, true)
+			if (queryTextMark(this.$parent, 'data-editify-code')) {
+				removeTextMark(this.$parent, ['data-editify-code'])
+			} else {
+				setTextMark(this.$parent, {
+					'data-editify-code': true
+				})
+			}
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
 		//设置下划线
 		setUnderline() {
-			this.$parent.setTextStyle('text-decoration', 'underline', true, true)
+			if (queryTextStyle(this.$parent, 'text-decoration', 'underline') || queryTextStyle(this.$parent, 'text-decoration-line', 'underline')) {
+				removeTextStyle(this.$parent, ['text-decoration', 'text-decoration-line'])
+			} else {
+				setTextStyle(this.$parent, {
+					'text-decoration': 'underline'
+				})
+			}
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
 		//设置删除线
 		setStrikethrough() {
-			this.$parent.setTextStyle('text-decoration', 'line-through', true, true)
+			if (queryTextStyle(this.$parent, 'text-decoration', 'line-through') || queryTextStyle(this.$parent, 'text-decoration-line', 'line-through')) {
+				removeTextStyle(this.$parent, ['text-decoration', 'text-decoration-line'])
+			} else {
+				setTextStyle(this.$parent, {
+					'text-decoration': 'line-through'
+				})
+			}
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
 		//设置列表
 		setList(name) {
-			this.$parent.setList(name == 'orderList', true, true)
+			setList(this.$parent, name == 'orderList')
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
 		//设置任务列表
 		setTask() {
-			this.$parent.setTask(true, true)
+			setTask(this.$parent)
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
 		//斜体
 		setItalic() {
-			this.$parent.setTextStyle('font-style', 'italic', true, true)
+			if (queryTextStyle(this.$parent, 'font-style', 'italic')) {
+				removeTextStyle(this.$parent, ['font-style'])
+			} else {
+				setTextStyle(this.$parent, {
+					'font-style': 'italic'
+				})
+			}
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
 		//加粗
 		setBold() {
-			this.$parent.setTextStyle('font-weight', 'bold', true, true)
+			if (queryTextStyle(this.$parent, 'font-weight', 'bold') || queryTextStyle(this.$parent, 'font-weight', '700')) {
+				removeTextStyle(this.$parent, ['font-weight'])
+			} else {
+				setTextStyle(this.$parent, {
+					'font-weight': 'bold'
+				})
+			}
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
 		//设置标题
 		setHeading(name, value) {
-			this.$parent.setHeading(value, true, true)
+			setHeading(this.$parent, value)
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
 		//设置对齐方式
 		setAlign(name, value) {
-			this.$parent.setAlign(value, true, true)
+			setAlign(this.$parent, value)
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
-		//设置视频
+		//设置视频属性
 		setVideo(prop) {
-			if (this.$parent.disabled) {
-				return
+			const element = this.$parent.editor.range.anchor.element
+			//当前是拥有该属性
+			if (this.videoConfig[prop]) {
+				delete element.marks[prop]
 			}
-			const video = this.$parent.getCurrentParsedomElement('video', true)
-			if (video) {
-				//当前是拥有该属性
-				if (this.videoConfig[prop]) {
-					delete video.marks[prop]
-				}
-				//当前无该属性
-				else {
-					video.marks[prop] = true
-				}
-				this.videoConfig[prop] = !this.videoConfig[prop]
-				this.$parent.editor.domRender()
-				this.$parent.editor.rangeRender()
+			//当前无该属性
+			else {
+				element.marks[prop] = true
 			}
+			this.videoConfig[prop] = !this.videoConfig[prop]
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
-		//设置宽度
+		//设置图片或者视频宽度
 		setWidth(value) {
-			if (this.$parent.disabled) {
-				return
-			}
-			const element = this.$parent.getCurrentParsedomElement('img', true) || this.$parent.getCurrentParsedomElement('video', true)
+			const element = this.$parent.editor.range.anchor.element
 			if (element) {
 				const styles = {
 					width: value
@@ -588,13 +694,10 @@ export default {
 		},
 		//修改链接
 		modifyLink() {
-			if (this.$parent.disabled) {
-				return
-			}
 			if (!this.linkConfig.url) {
 				return
 			}
-			const link = this.$parent.getCurrentParsedomElement('a', true)
+			const link = getCurrentParsedomElement(this.$parent, 'a')
 			if (link) {
 				link.marks.href = this.linkConfig.url
 				if (this.linkConfig.newOpen) {
@@ -606,28 +709,21 @@ export default {
 			this.$parent.editor.formatElementStack()
 			this.$parent.editor.domRender()
 		},
-		//输入框获取焦点
-		handleInputFocus(e) {
-			if (this.$parent.disabled) {
-				return
-			}
-			if (this.$parent.color) {
-				e.currentTarget.style.borderColor = this.$parent.color
-			}
-		},
-		//输入框失去焦点
-		handleInputBlur(e) {
-			if (this.$parent.disabled) {
-				return
+		//移除链接
+		removeLink() {
+			const link = getCurrentParsedomElement(this.$parent, 'a')
+			if (link) {
+				link.parsedom = AlexElement.TEXT_NODE
+				delete link.marks.target
+				delete link.marks.href
 			}
-			e.currentTarget.style.borderColor = ''
+			this.$parent.editor.formatElementStack()
+			this.$parent.editor.domRender()
+			this.$parent.editor.rangeRender()
 		},
 		//选择代码语言
 		selectLanguage(name, value) {
-			if (this.$parent.disabled) {
-				return
-			}
-			const pre = this.$parent.getCurrentParsedomElement('pre', true)
+			const pre = getCurrentParsedomElement(this.$parent, 'pre')
 			if (pre) {
 				Object.assign(pre.marks, {
 					'data-editify-hljs': value
@@ -639,14 +735,11 @@ export default {
 		},
 		//代码块前后插入段落
 		insertParagraphWithPre(type = 'up') {
-			if (this.$parent.disabled) {
-				return
-			}
 			if (!this.$parent.editor.range.anchor.isEqual(this.$parent.editor.range.focus)) {
 				this.$parent.editor.range.anchor.element = this.$parent.editor.range.focus.element
 				this.$parent.editor.range.anchor.offset = this.$parent.editor.range.focus.offset
 			}
-			const pre = this.$parent.getCurrentParsedomElement('pre', true)
+			const pre = getCurrentParsedomElement(this.$parent, 'pre')
 			if (pre) {
 				const paragraph = new AlexElement('block', AlexElement.BLOCK_NODE, null, null, null)
 				const breakEl = new AlexElement('closed', 'br', null, null, null)
@@ -665,16 +758,13 @@ export default {
 		},
 		//表格前后插入列
 		insertTableColumn(type = 'left') {
-			if (this.$parent.disabled) {
-				return
-			}
 			if (!this.$parent.editor.range.anchor.isEqual(this.$parent.editor.range.focus)) {
 				this.$parent.editor.range.anchor.element = this.$parent.editor.range.focus.element
 				this.$parent.editor.range.anchor.offset = this.$parent.editor.range.focus.offset
 			}
-			const table = this.$parent.getCurrentParsedomElement('table', true)
-			const column = this.$parent.getCurrentParsedomElement('td', true)
-			const tbody = this.$parent.getCurrentParsedomElement('tbody', true)
+			const table = getCurrentParsedomElement(this.$parent, 'table')
+			const column = getCurrentParsedomElement(this.$parent, 'td')
+			const tbody = getCurrentParsedomElement(this.$parent, 'tbody')
 			if (column && table && tbody) {
 				const rows = tbody.children
 				const index = column.parent.children.findIndex(item => {
@@ -718,15 +808,12 @@ export default {
 		},
 		//表格前后插入行
 		insertTableRow(type = 'up') {
-			if (this.$parent.disabled) {
-				return
-			}
 			if (!this.$parent.editor.range.anchor.isEqual(this.$parent.editor.range.focus)) {
 				this.$parent.editor.range.anchor.element = this.$parent.editor.range.focus.element
 				this.$parent.editor.range.anchor.offset = this.$parent.editor.range.focus.offset
 			}
-			const table = this.$parent.getCurrentParsedomElement('table', true)
-			const row = this.$parent.getCurrentParsedomElement('tr', true)
+			const table = getCurrentParsedomElement(this.$parent, 'table')
+			const row = getCurrentParsedomElement(this.$parent, 'tr')
 			if (table && row) {
 				const newRow = row.clone()
 				newRow.children.forEach(column => {
@@ -752,10 +839,7 @@ export default {
 		},
 		//表格前后插入段落
 		insertParagraphWithTable(type = 'up') {
-			if (this.$parent.disabled) {
-				return
-			}
-			const table = this.$parent.getCurrentParsedomElement('table', true)
+			const table = getCurrentParsedomElement(this.$parent, 'table')
 			if (table) {
 				const paragraph = new AlexElement('block', AlexElement.BLOCK_NODE, null, null, null)
 				const breakEl = new AlexElement('closed', 'br', null, null, null)
@@ -774,19 +858,16 @@ export default {
 		},
 		//删除表格行
 		deleteTableRow() {
-			if (this.$parent.disabled) {
-				return
-			}
 			if (!this.$parent.editor.range.anchor.isEqual(this.$parent.editor.range.focus)) {
 				this.$parent.editor.range.anchor.element = this.$parent.editor.range.focus.element
 				this.$parent.editor.range.anchor.offset = this.$parent.editor.range.focus.offset
 			}
-			const table = this.$parent.getCurrentParsedomElement('table', true)
-			const row = this.$parent.getCurrentParsedomElement('tr', true)
+			const table = getCurrentParsedomElement(this.$parent, 'table')
+			const row = getCurrentParsedomElement(this.$parent, 'tr')
 			if (table && row) {
 				const parent = row.parent
 				if (parent.children.length == 1) {
-					this.$parent.deleteByParsedom('table', true, true)
+					this.deleteElement('table')
 					return
 				}
 				const previousRow = this.$parent.editor.getPreviousElement(row)
@@ -810,21 +891,18 @@ export default {
 		},
 		//删除表格列
 		deleteTableColumn() {
-			if (this.$parent.disabled) {
-				return
-			}
 			if (!this.$parent.editor.range.anchor.isEqual(this.$parent.editor.range.focus)) {
 				this.$parent.editor.range.anchor.element = this.$parent.editor.range.focus.element
 				this.$parent.editor.range.anchor.offset = this.$parent.editor.range.focus.offset
 			}
-			const column = this.$parent.getCurrentParsedomElement('td', true)
-			const tbody = this.$parent.getCurrentParsedomElement('tbody', true)
-			const table = this.$parent.getCurrentParsedomElement('table', true)
+			const column = getCurrentParsedomElement(this.$parent, 'td')
+			const tbody = getCurrentParsedomElement(this.$parent, 'tbody')
+			const table = getCurrentParsedomElement(this.$parent, 'table')
 			if (column && table && tbody) {
 				const rows = tbody.children
 				const parent = column.parent
 				if (parent.children.length == 1) {
-					this.$parent.deleteByParsedom('table', true, true)
+					this.deleteElement('table')
 					return
 				}
 				const previousColumn = this.$parent.editor.getPreviousElement(column)
@@ -854,20 +932,28 @@ export default {
 				this.$parent.editor.rangeRender()
 			}
 		},
+		//删除元素
+		deleteElement(parsedom) {
+			const element = getCurrentParsedomElement(this.$parent, parsedom)
+			if (element) {
+				element.toEmpty()
+				this.$parent.editor.formatElementStack()
+				this.$parent.editor.domRender()
+				this.$parent.editor.rangeRender()
+			}
+		},
 		//浮层显示时
 		layerShow() {
-			//获取选区的元素
-			const result = this.$parent.editor.getElementsByRange(true).includes
 			//代码块初始化展示设置
 			if (this.type == 'codeBlock') {
-				const pre = this.$parent.getCurrentParsedomElement('pre', true)
+				const pre = getCurrentParsedomElement(this.$parent, 'pre')
 				if (pre) {
 					this.languageConfig.displayConfig.value = pre.marks['data-editify-hljs'] || ''
 				}
 			}
 			//链接初始化展示
 			else if (this.type == 'link') {
-				const link = this.$parent.getCurrentParsedomElement('a', true)
+				const link = getCurrentParsedomElement(this.$parent, 'a')
 				if (link) {
 					this.linkConfig.url = link.marks['href']
 					this.linkConfig.newOpen = link.marks['target'] == '_blank'
@@ -875,7 +961,7 @@ export default {
 			}
 			//视频初始化显示
 			else if (this.type == 'video') {
-				const video = this.$parent.getCurrentParsedomElement('video', true)
+				const video = getCurrentParsedomElement(this.$parent, 'video')
 				if (video) {
 					this.videoConfig.autoplay = !!video.marks['autoplay']
 					this.videoConfig.loop = !!video.marks['loop']
@@ -895,17 +981,17 @@ export default {
 				//显示已设置标题
 				const findHeadingItem = this.headingConfig.displayConfig.options.find(item => {
 					let val = item
-					if (Dap.common.isObject(item)) {
+					if (DapCommon.isObject(item)) {
 						val = item.value
 					}
-					return result.every(el => {
+					return this.$parent.dataRangeCaches.list.every(el => {
 						if (el.element.isBlock()) {
 							return el.element.parsedom == val
 						}
 						return el.element.getBlock().parsedom == val
 					})
 				})
-				this.headingConfig.displayConfig.value = findHeadingItem ? (Dap.common.isObject(findHeadingItem) ? findHeadingItem.value : findHeadingItem) : this.headingConfig.defaultValue
+				this.headingConfig.displayConfig.value = findHeadingItem ? (DapCommon.isObject(findHeadingItem) ? findHeadingItem.value : findHeadingItem) : this.headingConfig.defaultValue
 				//标题禁用
 				this.headingConfig.disabled = extraDisabled('heading')
 
@@ -913,84 +999,84 @@ export default {
 				this.alignConfig.disabled = extraDisabled('align')
 
 				//有序列表按钮激活
-				this.orderListConfig.active = this.$parent.inList(true, true)
+				this.orderListConfig.active = isRangeInList(this.$parent, true)
 				//有序列表按钮禁用
 				this.orderListConfig.disabled = extraDisabled('orderList')
 
 				//无序列表按钮激活
-				this.unorderListConfig.active = this.$parent.inList(false, true)
+				this.unorderListConfig.active = isRangeInList(this.$parent, false)
 				//无序列表按钮禁用
 				this.unorderListConfig.disabled = extraDisabled('unorderList')
 
 				//任务列表按钮激活
-				this.taskConfig.active = this.$parent.inTask(true, true)
+				this.taskConfig.active = isRangeInTask(this.$parent)
 				//任务列表按钮禁用
 				this.taskConfig.disabled = extraDisabled('task')
 
 				//粗体按钮激活
-				this.boldConfig.active = this.$parent.queryTextStyle('font-weight', 'bold', true)
+				this.boldConfig.active = queryTextStyle(this.$parent, 'font-weight', 'bold') || queryTextStyle(this.$parent, 'font-weight', '700')
 				//粗体按钮禁用
 				this.boldConfig.disabled = extraDisabled('bold')
 
 				//斜体按钮激活
-				this.italicConfig.active = this.$parent.queryTextStyle('font-style', 'italic', true)
+				this.italicConfig.active = queryTextStyle(this.$parent, 'font-style', 'italic')
 				//斜体按钮禁用
 				this.italicConfig.disabled = extraDisabled('italic')
 
 				//删除线按钮激活
-				this.strikethroughConfig.active = this.$parent.queryTextStyle('text-decoration', 'line-through', true)
+				this.strikethroughConfig.active = queryTextStyle(this.$parent, 'text-decoration', 'line-through') || queryTextStyle(this.$parent, 'text-decoration-line', 'line-through')
 				//删除线按钮禁用
 				this.strikethroughConfig.disabled = extraDisabled('strikethrough')
 
 				//下划线按钮激活
-				this.underlineConfig.active = this.$parent.queryTextStyle('text-decoration', 'underline', true)
+				this.underlineConfig.active = queryTextStyle(this.$parent, 'text-decoration', 'underline') || queryTextStyle(this.$parent, 'text-decoration-line', 'underline')
 				//下划线按钮禁用
 				this.underlineConfig.disabled = extraDisabled('underline')
 
 				//行内代码按钮激活
-				this.codeConfig.active = this.$parent.queryTextMark('data-editify-code', null, true)
+				this.codeConfig.active = queryTextMark(this.$parent, 'data-editify-code')
 				//行内代码按钮禁用
 				this.codeConfig.disabled = extraDisabled('code')
 
 				//上标按钮激活
-				this.superConfig.active = this.$parent.queryTextStyle('vertical-align', 'super', true)
+				this.superConfig.active = queryTextStyle(this.$parent, 'vertical-align', 'super')
 				//上标按钮禁用
 				this.superConfig.disabled = extraDisabled('super')
 
 				//下标按钮激活
-				this.subConfig.active = this.$parent.queryTextStyle('vertical-align', 'sub', true)
+				this.subConfig.active = queryTextStyle(this.$parent, 'vertical-align', 'sub')
 				//下标按钮禁用
 				this.subConfig.disabled = extraDisabled('sub')
 
 				//显示已选择字号
 				const findFontItem = this.fontSizeConfig.displayConfig.options.find(item => {
-					if (Dap.common.isObject(item)) {
-						return this.$parent.queryTextStyle('font-size', item.value, true)
+					if (DapCommon.isObject(item)) {
+						return queryTextStyle(this.$parent, 'font-size', item.value)
 					}
-					return this.$parent.queryTextStyle('font-size', item, true)
+					return queryTextStyle(this.$parent, 'font-size', item)
 				})
-				this.fontSizeConfig.displayConfig.value = findFontItem ? (Dap.common.isObject(findFontItem) ? findFontItem.value : findFontItem) : this.fontSizeConfig.defaultValue
+				this.fontSizeConfig.displayConfig.value = findFontItem ? (DapCommon.isObject(findFontItem) ? findFontItem.value : findFontItem) : this.fontSizeConfig.defaultValue
 				//字号按钮禁用
 				this.fontSizeConfig.disabled = extraDisabled('fontSize')
 
 				//显示已选择字体
 				const findFamilyItem = this.fontFamilyConfig.displayConfig.options.find(item => {
-					if (Dap.common.isObject(item)) {
-						return this.$parent.queryTextStyle('font-family', item.value, true)
+					if (DapCommon.isObject(item)) {
+						return queryTextStyle(this.$parent, 'font-family', item.value)
 					}
-					return this.$parent.queryTextStyle('font-family', item, true)
+					return queryTextStyle(this.$parent, 'font-family', item)
 				})
-				this.fontFamilyConfig.displayConfig.value = findFamilyItem ? (Dap.common.isObject(findFamilyItem) ? findFamilyItem.value : findFamilyItem) : this.fontFamilyConfig.defaultValue
+				this.fontFamilyConfig.displayConfig.value = findFamilyItem ? (DapCommon.isObject(findFamilyItem) ? findFamilyItem.value : findFamilyItem) : this.fontFamilyConfig.defaultValue
 				//字体按钮禁用
 				this.fontFamilyConfig.disabled = extraDisabled('fontFamily')
 
 				//显示已设置行高
 				const findHeightItem = this.lineHeightConfig.displayConfig.options.find(item => {
 					let val = item
-					if (Dap.common.isObject(item)) {
+					if (DapCommon.isObject(item)) {
 						val = item.value
 					}
-					return result.every(el => {
+					return this.$parent.dataRangeCaches.list.every(el => {
 						if (el.element.isBlock() || el.element.isInblock()) {
 							return el.element.hasStyles() && el.element.styles['line-height'] == val
 						}
@@ -1002,29 +1088,29 @@ export default {
 						return block.hasStyles() && block.styles['line-height'] == val
 					})
 				})
-				this.lineHeightConfig.displayConfig.value = findHeightItem ? (Dap.common.isObject(findHeightItem) ? findHeightItem.value : findHeightItem) : this.lineHeightConfig.defaultValue
+				this.lineHeightConfig.displayConfig.value = findHeightItem ? (DapCommon.isObject(findHeightItem) ? findHeightItem.value : findHeightItem) : this.lineHeightConfig.defaultValue
 				//行高按钮禁用
 				this.lineHeightConfig.disabled = extraDisabled('lineHeight')
 
 				//显示已选择的前景色
 				const findForeColorItem = this.foreColorConfig.selectConfig.options.find(item => {
-					if (Dap.common.isObject(item)) {
-						return this.$parent.queryTextStyle('color', item.value, true)
+					if (DapCommon.isObject(item)) {
+						return queryTextStyle(this.$parent, 'color', item.value)
 					}
-					return this.$parent.queryTextStyle('color', item, true)
+					return queryTextStyle(this.$parent, 'color', item)
 				})
-				this.foreColorConfig.value = findForeColorItem ? (Dap.common.isObject(findForeColorItem) ? findForeColorItem.value : findForeColorItem) : ''
+				this.foreColorConfig.value = findForeColorItem ? (DapCommon.isObject(findForeColorItem) ? findForeColorItem.value : findForeColorItem) : ''
 				//前景色按钮禁用
 				this.foreColorConfig.disabled = extraDisabled('foreColor')
 
 				//显示已选择的背景色
 				const findBackColorItem = this.backColorConfig.selectConfig.options.find(item => {
-					if (Dap.common.isObject(item)) {
-						return this.$parent.queryTextStyle('background-color', item.value, true)
+					if (DapCommon.isObject(item)) {
+						return queryTextStyle(this.$parent, 'background-color', item.value)
 					}
-					return this.$parent.queryTextStyle('background-color', item, true)
+					return queryTextStyle(this.$parent, 'background-color', item)
 				})
-				this.backColorConfig.value = findBackColorItem ? (Dap.common.isObject(findBackColorItem) ? findBackColorItem.value : findBackColorItem) : ''
+				this.backColorConfig.value = findBackColorItem ? (DapCommon.isObject(findBackColorItem) ? findBackColorItem.value : findBackColorItem) : ''
 				//背景色按钮禁用
 				this.backColorConfig.disabled = extraDisabled('backColor')