vue-editify 0.0.46 → 0.0.47

package/src/components/bussiness/Menu.vue

@@ -1194,23 +1194,25 @@ export default {
 				return
 			}
 			//获取选区的元素
-			const result = this.$parent.editor.getElementsByRange(true, false)
+			const result = this.$parent.editor.getElementsByRange(true, false, true)
 			//选区是否含有代码块元素
-			const hasPreStyle = this.$parent.hasPreStyle()
+			const hasPreStyle = this.$parent.hasPreStyle(true)
 			//选区是否含有表格元素
-			const hasTable = this.$parent.hasTable()
+			const hasTable = this.$parent.hasTable(true)
 			//选区是否含有引用元素
-			const hasQuote = this.$parent.hasQuote()
+			const hasQuote = this.$parent.hasQuote(true)
 			//选区是否都在引用元素内
-			const inQuote = this.$parent.inQuote()
+			const inQuote = this.$parent.inQuote(true)
+
 			//选区是否含有链接元素
-			const hasLink = this.$parent.hasLink()
+			const hasLink = this.$parent.hasLink(true)
+
 			//选区是否都在有序列表内
-			const inOrderList = this.$parent.inList(true)
+			const inOrderList = this.$parent.inList(true, true)
 			//选区是否都在无序列表内
-			const inUnorderList = this.$parent.inList(false)
+			const inUnorderList = this.$parent.inList(false, true)
 			//选区是否都在任务列表内
-			const inTask = this.$parent.inTask()
+			const inTask = this.$parent.inTask(true)
 			//额外禁用判定
 			const extraDisabled = name => {
 				if (typeof this.config.extraDisabled == 'function') {
@@ -1272,7 +1274,7 @@ export default {
 			this.taskConfig.disabled = hasPreStyle || hasTable || extraDisabled('task')
 
 			//粗体按钮激活
-			this.boldConfig.active = this.$parent.queryTextStyle('font-weight', 'bold')
+			this.boldConfig.active = this.$parent.queryTextStyle('font-weight', 'bold', true)
 			//粗体按钮禁用
 			this.boldConfig.disabled = hasPreStyle || extraDisabled('bold')
 
@@ -1292,7 +1294,7 @@ export default {
 			this.strikethroughConfig.disabled = hasPreStyle || extraDisabled('strikethrough')
 
 			//行内代码按钮激活
-			this.codeConfig.active = this.$parent.queryTextMark('data-editify-code')
+			this.codeConfig.active = this.$parent.queryTextMark('data-editify-code', null, true)
 			//行内代码按钮禁用
 			this.codeConfig.disabled = hasPreStyle || extraDisabled('code')
 
@@ -1392,7 +1394,7 @@ export default {
 			this.tableConfig.disabled = hasPreStyle || hasTable || hasQuote || extraDisabled('table')
 
 			//代码块按钮激活
-			this.codeBlockConfig.active = !!this.$parent.getCurrentParsedomElement('pre')
+			this.codeBlockConfig.active = !!this.$parent.getCurrentParsedomElement('pre', true)
 			//代码块按钮禁用
 			this.codeBlockConfig.disabled = hasTable || hasQuote || extraDisabled('codeBlock')
 

package/src/components/bussiness/Toolbar.vue

@@ -567,7 +567,7 @@ export default {
 			if (this.$parent.disabled) {
 				return
 			}
-			const element = this.$parent.getCurrentParsedomElement('img') || this.$parent.getCurrentParsedomElement('video')
+			const element = this.$parent.getCurrentParsedomElement('img') || this.$parent.getCurrentParsedomElement('video', true)
 			if (element) {
 				const styles = {
 					width: value
@@ -673,8 +673,8 @@ export default {
 				this.$parent.editor.range.anchor.offset = this.$parent.editor.range.focus.offset
 			}
 			const table = this.$parent.getCurrentParsedomElement('table')
-			const column = this.$parent.getCurrentParsedomElement('td')
-			const tbody = this.$parent.getCurrentParsedomElement('tbody')
+			const column = this.$parent.getCurrentParsedomElement('td', true)
+			const tbody = this.$parent.getCurrentParsedomElement('tbody', true)
 			if (column && table && tbody) {
 				const rows = tbody.children
 				const index = column.parent.children.findIndex(item => {
@@ -726,7 +726,7 @@ export default {
 				this.$parent.editor.range.anchor.offset = this.$parent.editor.range.focus.offset
 			}
 			const table = this.$parent.getCurrentParsedomElement('table')
-			const row = this.$parent.getCurrentParsedomElement('tr')
+			const row = this.$parent.getCurrentParsedomElement('tr', true)
 			if (table && row) {
 				const newRow = row.clone()
 				newRow.children.forEach(column => {
@@ -782,7 +782,7 @@ export default {
 				this.$parent.editor.range.anchor.offset = this.$parent.editor.range.focus.offset
 			}
 			const table = this.$parent.getCurrentParsedomElement('table')
-			const row = this.$parent.getCurrentParsedomElement('tr')
+			const row = this.$parent.getCurrentParsedomElement('tr', true)
 			if (table && row) {
 				const parent = row.parent
 				if (parent.children.length == 1) {
@@ -818,13 +818,13 @@ export default {
 				this.$parent.editor.range.anchor.offset = this.$parent.editor.range.focus.offset
 			}
 			const column = this.$parent.getCurrentParsedomElement('td')
-			const tbody = this.$parent.getCurrentParsedomElement('tbody')
-			const table = this.$parent.getCurrentParsedomElement('table')
+			const tbody = this.$parent.getCurrentParsedomElement('tbody', true)
+			const table = this.$parent.getCurrentParsedomElement('table', true)
 			if (column && table && tbody) {
 				const rows = tbody.children
 				const parent = column.parent
 				if (parent.children.length == 1) {
-					this.$parent.deleteByParsedom('table')
+					this.$parent.deleteByParsedom('table', true)
 					return
 				}
 				const previousColumn = this.$parent.editor.getPreviousElement(column)
@@ -856,16 +856,18 @@ export default {
 		},
 		//浮层显示时
 		layerShow() {
+			//获取选区的元素
+			const result = this.$parent.editor.getElementsByRange(true, false, true)
 			//代码块初始化展示设置
 			if (this.type == 'codeBlock') {
-				const pre = this.$parent.getCurrentParsedomElement('pre')
+				const pre = this.$parent.getCurrentParsedomElement('pre', true)
 				if (pre) {
 					this.languageConfig.displayConfig.value = pre.marks['data-editify-hljs'] || ''
 				}
 			}
 			//链接初始化展示
 			else if (this.type == 'link') {
-				const link = this.$parent.getCurrentParsedomElement('a')
+				const link = this.$parent.getCurrentParsedomElement('a', true)
 				if (link) {
 					this.linkConfig.url = link.marks['href']
 					this.linkConfig.newOpen = link.marks['target'] == '_blank'
@@ -873,7 +875,7 @@ export default {
 			}
 			//视频初始化显示
 			else if (this.type == 'video') {
-				const video = this.$parent.getCurrentParsedomElement('video')
+				const video = this.$parent.getCurrentParsedomElement('video', true)
 				if (video) {
 					this.videoConfig.autoplay = !!video.marks['autoplay']
 					this.videoConfig.loop = !!video.marks['loop']
@@ -890,10 +892,6 @@ export default {
 					}
 					return false
 				}
-
-				//获取选区的元素
-				const result = this.$parent.editor.getElementsByRange(true, false)
-
 				//显示已设置标题
 				const findHeadingItem = this.headingConfig.displayConfig.options.find(item => {
 					let val = item
@@ -915,22 +913,22 @@ export default {
 				this.alignConfig.disabled = extraDisabled('align')
 
 				//有序列表按钮激活
-				this.orderListConfig.active = this.$parent.inList(true)
+				this.orderListConfig.active = this.$parent.inList(true, true)
 				//有序列表按钮禁用
 				this.orderListConfig.disabled = extraDisabled('orderList')
 
 				//无序列表按钮激活
-				this.unorderListConfig.active = this.$parent.inList(false)
+				this.unorderListConfig.active = this.$parent.inList(false, true)
 				//无序列表按钮禁用
 				this.unorderListConfig.disabled = extraDisabled('unorderList')
 
 				//任务列表按钮激活
-				this.taskConfig.active = this.$parent.inTask()
+				this.taskConfig.active = this.$parent.inTask(true, true)
 				//任务列表按钮禁用
 				this.taskConfig.disabled = extraDisabled('task')
 
 				//粗体按钮激活
-				this.boldConfig.active = this.$parent.queryTextStyle('font-weight', 'bold')
+				this.boldConfig.active = this.$parent.queryTextStyle('font-weight', 'bold', true)
 				//粗体按钮禁用
 				this.boldConfig.disabled = extraDisabled('bold')
 
@@ -950,7 +948,7 @@ export default {
 				this.underlineConfig.disabled = extraDisabled('underline')
 
 				//行内代码按钮激活
-				this.codeConfig.active = this.$parent.queryTextMark('data-editify-code')
+				this.codeConfig.active = this.$parent.queryTextMark('data-editify-code', null, true)
 				//行内代码按钮禁用
 				this.codeConfig.disabled = extraDisabled('code')
 

package/src/index.js

@@ -7,7 +7,7 @@ import './icon/iconfont.css'
 //引入国际化
 import i18n from './locale'
 //版本号
-const version = '0.0.46'
+const version = '0.0.47'
 //安装函数
 const install = (app, props) => {
 	const locale = (props ? props.locale : 'zh_CN') || 'zh_CN'