diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ecebd8..12ffc86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## [4.7.6](https://github.com/wangeditor-team/wangEditor/compare/v4.7.5...v4.7.6) (2021-07-30) + + +### Bug Fixes + +* 解决全选删除后,设置引用,全屏的问题 ([514d563](https://github.com/wangeditor-team/wangEditor/commit/514d56323442685ce1a80faf911208c635daf5ab)) +* 修复列表下无法设置超链接的问题 ([00bfdb5](https://github.com/wangeditor-team/wangEditor/commit/00bfdb5bc20e00cd2d632de45a6d9c7b3a2cea67)) + ## [4.7.5](https://github.com/wangeditor-team/wangEditor/compare/v4.7.4...v4.7.5) (2021-07-02) diff --git a/package.json b/package.json index af4fa5d..399f82b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wangeditor", - "version": "4.7.5", + "version": "4.7.6", "description": "wangEditor - 轻量级 web 富文本编辑器,配置方便,使用简单,开源免费", "homepage": "http://www.wangeditor.com/", "keywords": [ diff --git a/src/config/menus.ts b/src/config/menus.ts index c53c6ff..820e397 100644 --- a/src/config/menus.ts +++ b/src/config/menus.ts @@ -182,10 +182,9 @@ export default { // type -> 'emoji' / 'image' type: 'emoji', // content -> 数组 - content: - '😀 😃 😄 😁 😆 😅 😂 🤣 😊 😇 🙂 🙃 😉 😌 😍 😘 😗 😙 😚 😋 😛 😝 😜 🤓 😎 😏 😒 😞 😔 😟 😕 🙁 😣 😖 😫 😩 😢 😭 😤 😠 😡 😳 😱 😨 🤗 🤔 😶 😑 😬 🙄 😯 😴 😷 🤑 😈 🤡 💩 👻 💀 👀 👣'.split( - /\s/ - ), + content: '😀 😃 😄 😁 😆 😅 😂 🤣 😊 😇 🙂 🙃 😉 😌 😍 😘 😗 😙 😚 😋 😛 😝 😜 🤓 😎 😏 😒 😞 😔 😟 😕 🙁 😣 😖 😫 😩 😢 😭 😤 😠 😡 😳 😱 😨 🤗 🤔 😶 😑 😬 🙄 😯 😴 😷 🤑 😈 🤡 💩 👻 💀 👀 👣'.split( + /\s/ + ), }, { // tab 的标题 @@ -193,10 +192,9 @@ export default { // type -> 'emoji' / 'image' type: 'emoji', // content -> 数组 - content: - '👐 🙌 👏 🤝 👍 👎 👊 ✊ 🤛 🤜 🤞 ✌️ 🤘 👌 👈 👉 👆 👇 ☝️ ✋ 🤚 🖐 🖖 👋 🤙 💪 🖕 ✍️ 🙏'.split( - /\s/ - ), + content: '👐 🙌 👏 🤝 👍 👎 👊 ✊ 🤛 🤜 🤞 ✌️ 🤘 👌 👈 👉 👆 👇 ☝️ ✋ 🤚 🖐 🖖 👋 🤙 💪 🖕 ✍️ 🙏'.split( + /\s/ + ), }, ], diff --git a/src/lib/simplehtmlparser.js b/src/lib/simplehtmlparser.js index 21eb17a..5026962 100644 --- a/src/lib/simplehtmlparser.js +++ b/src/lib/simplehtmlparser.js @@ -61,8 +61,7 @@ SimpleHtmlParser.prototype = { // regexps - startTagRe: - /^<([^>\s\/]+)((\s+[^=>\s]+(\s*=\s*((\"[^"]*\")|(\'[^']*\')|[^>\s]+))?)*)\s*\/?\s*>/m, + startTagRe: /^<([^>\s\/]+)((\s+[^=>\s]+(\s*=\s*((\"[^"]*\")|(\'[^']*\')|[^>\s]+))?)*)\s*\/?\s*>/m, endTagRe: /^<\/([^>\s]+)[^>]*>/m, attrRe: /([^=\s]+)(\s*=\s*((\"([^"]*)\")|(\'([^']*)\')|[^>\s]+))?/gm, diff --git a/src/menus/lineHeight/index.ts b/src/menus/lineHeight/index.ts index 35e76ff..8e78011 100644 --- a/src/menus/lineHeight/index.ts +++ b/src/menus/lineHeight/index.ts @@ -69,8 +69,8 @@ class LineHeight extends DropListMenu implements MenuActive { //获取range 开头结束的dom const StartElem: DomElement = $(editor.selection.getSelectionStartElem()) const EndElem: DomElement = $(editor.selection.getSelectionEndElem()) - const childList: NodeListOf | undefined = - editor.selection.getRange()?.commonAncestorContainer.childNodes + const childList: NodeListOf | undefined = editor.selection.getRange() + ?.commonAncestorContainer.childNodes arrayDom_a.push(this.getDom(StartElem.elems[0])) childList?.forEach((item, index) => { if (item === this.getDom(StartElem.elems[0])) { diff --git a/src/utils/const.ts b/src/utils/const.ts index 2b49406..2423d01 100644 --- a/src/utils/const.ts +++ b/src/utils/const.ts @@ -6,8 +6,7 @@ export function EMPTY_FN() {} //用于校验是否为url格式字符串 -export const urlRegex = - /^(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-.,@?^=%&:/~+#]*[\w\-@?^=%&/~+#])?/ +export const urlRegex = /^(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-.,@?^=%&:/~+#]*[\w\-@?^=%&/~+#])?/ // 编辑器为了方便继续输入/换行等原因 主动生成的空标签 export const EMPTY_P = '


'