From 8fc7e04272ab222416e2cbfbaa57eb2565a8f87a Mon Sep 17 00:00:00 2001
From: chenlei <791563973@qq.com>
Date: Sun, 30 May 2021 21:00:52 +0800
Subject: [PATCH 01/13] =?UTF-8?q?fix:=20=E8=AE=BE=E7=BD=AE=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E5=A4=A7=E5=B0=8F=E5=92=8C=E9=A2=9C=E8=89=B2=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=85=89=E6=A0=87=E8=B7=B3=E5=88=B0=E8=A1=8C=E9=A6=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/menus.ts           | 14 ++++++--------
 src/lib/simplehtmlparser.js   |  3 +--
 src/menus/font-color/index.ts | 13 -------------
 src/menus/font-size/index.ts  | 14 --------------
 src/menus/lineHeight/index.ts |  4 ++--
 src/utils/const.ts            |  3 +--
 6 files changed, 10 insertions(+), 41 deletions(-)

diff --git a/src/config/menus.ts b/src/config/menus.ts
index c53c6ff5c..820e397f2 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 21eb17a5a..502696297 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/font-color/index.ts b/src/menus/font-color/index.ts
index c98f0603d..5d0b55142 100644
--- a/src/menus/font-color/index.ts
+++ b/src/menus/font-color/index.ts
@@ -46,19 +46,6 @@ class FontColor extends DropListMenu implements MenuActive {
 
         if ($selectionElem == null) return
 
-        const isFont = $selectionElem?.nodeName.toLowerCase() !== 'p'
-        const isSameColor = $selectionElem?.getAttribute('color') === value
-
-        if (isEmptySelection) {
-            if (isFont && !isSameColor) {
-                const $elems = editor.selection.getSelectionRangeTopNodes()
-                editor.selection.createRangeByElem($elems[0])
-                editor.selection.moveCursor($elems[0].elems[0])
-            }
-            editor.selection.setRangeToElem($selectionElem)
-            // 插入空白选区
-            editor.selection.createEmptyRange()
-        }
         // 获取选区范围的文字
         const $selectionText = editor.selection.getSelectionText()
         // 如果设置的是 a 标签就特殊处理一下，避免回车换行设置颜色无效的情况
diff --git a/src/menus/font-size/index.ts b/src/menus/font-size/index.ts
index 897352d69..12d698474 100644
--- a/src/menus/font-size/index.ts
+++ b/src/menus/font-size/index.ts
@@ -43,20 +43,6 @@ class FontSize extends DropListMenu implements MenuActive {
 
         if (selectionElem == null) return
 
-        const isFont = selectionElem?.nodeName.toLowerCase() !== 'p'
-        const isSameSize = selectionElem?.getAttribute('size') === value
-        if (isEmptySelection) {
-            if (isFont && !isSameSize) {
-                const $elems = editor.selection.getSelectionRangeTopNodes()
-                const focusElem = $elems[0].elems[0]
-                editor.selection.createRangeByElem($elems[0])
-                editor.selection.moveCursor(focusElem)
-                selectionElem = focusElem
-            }
-            editor.selection.setRangeToElem(selectionElem)
-            // 插入空白选区
-            editor.selection.createEmptyRange()
-        }
         editor.cmd.do('fontSize', value)
         if (isEmptySelection) {
             // 需要将选区范围折叠起来
diff --git a/src/menus/lineHeight/index.ts b/src/menus/lineHeight/index.ts
index 35e76ffad..8e780112e 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<ChildNode> | undefined =
-                editor.selection.getRange()?.commonAncestorContainer.childNodes
+            const childList: NodeListOf<ChildNode> | 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 2b49406cc..2423d015a 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\-.,@?^=%&amp;:/~+#]*[\w\-@?^=%&amp;/~+#])?/
+export const urlRegex = /^(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-.,@?^=%&amp;:/~+#]*[\w\-@?^=%&amp;/~+#])?/
 
 // 编辑器为了方便继续输入/换行等原因 主动生成的空标签
 export const EMPTY_P = '<p data-we-empty-p=""><br></p>'

From bd464598850a47bcafbac44110a2d28e59797ffc Mon Sep 17 00:00:00 2001
From: luochao <651644100@qq.com>
Date: Thu, 3 Jun 2021 22:42:56 +0800
Subject: [PATCH 02/13] release: v4.7.2

---
 CHANGELOG.md | 11 +++++++++++
 package.json |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3dcf7aed7..e6c93a96a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## [4.7.2](https://github.com/wangeditor-team/wangEditor/compare/v4.7.1...v4.7.2) (2021-06-03)
+
+
+### Bug Fixes
+
+* 禁修复多行插入链接造成页面卡死,止多行插入链链接 ([110b37a](https://github.com/wangeditor-team/wangEditor/commit/110b37a8bb3b6bd5d87e1d831c8dab6f52e2b6df))
+* 设置字体大小和颜色时，光标跳到行首 ([8fc7e04](https://github.com/wangeditor-team/wangEditor/commit/8fc7e04272ab222416e2cbfbaa57eb2565a8f87a))
+* 修复给标题加超链接的问题 ([0d7a05e](https://github.com/wangeditor-team/wangEditor/commit/0d7a05e8c922bc48dc655bee90b8192a816057f9))
+* 修复删除全部内容后EMPTY_P前有个空格 ([1811f8c](https://github.com/wangeditor-team/wangEditor/commit/1811f8c417f8466df5d458a6c215fad1e4b2b7c3))
+* ts 构建错误 ([4603677](https://github.com/wangeditor-team/wangEditor/commit/46036774c73f909dae99c950b0ffcc67f7414b9f))
+
 ## [4.7.1](https://github.com/wangeditor-team/wangEditor/compare/v4.7.0...v4.7.1) (2021-05-20)
 
 
diff --git a/package.json b/package.json
index a9733da21..5128fb2cd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wangeditor",
-  "version": "4.7.1",
+  "version": "4.7.2",
   "description": "wangEditor - 轻量级 web 富文本编辑器，配置方便，使用简单，开源免费",
   "homepage": "http://www.wangeditor.com/",
   "keywords": [

From 0648a9340a7c156dbc16b83e955f684854cb8c76 Mon Sep 17 00:00:00 2001
From: TGuoW <15768620356@163.com>
Date: Sun, 6 Jun 2021 16:53:18 +0800
Subject: [PATCH 03/13] =?UTF-8?q?fix:=20=E7=89=B9=E6=AE=8A=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=B8=8B=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87backspace?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/menus/img/bind-event/index.ts          |  3 ++
 src/menus/img/bind-event/keyboard-event.ts | 63 ++++++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 src/menus/img/bind-event/keyboard-event.ts

diff --git a/src/menus/img/bind-event/index.ts b/src/menus/img/bind-event/index.ts
index bd96c1f85..d2f88ba90 100644
--- a/src/menus/img/bind-event/index.ts
+++ b/src/menus/img/bind-event/index.ts
@@ -8,6 +8,7 @@ import bindPasteImg from './paste-img'
 import bindDropImg from './drop-img'
 import bindDragImgSize from './drag-size'
 import bindTooltipImg from './tooltip-event'
+import bindKeyboardEvent from './keyboard-event'
 
 /**
  * 绑定事件
@@ -26,6 +27,8 @@ function bindEvent(editor: Editor): void {
 
     //Tooltip
     bindTooltipImg(editor)
+
+    bindKeyboardEvent(editor)
 }
 
 export default bindEvent
diff --git a/src/menus/img/bind-event/keyboard-event.ts b/src/menus/img/bind-event/keyboard-event.ts
new file mode 100644
index 000000000..dadc70dac
--- /dev/null
+++ b/src/menus/img/bind-event/keyboard-event.ts
@@ -0,0 +1,63 @@
+import Editor from '../../../editor'
+
+export default function bindEventKeyboardEvent(editor: Editor) {
+    const { txt, selection } = editor
+    const { keydownEvents } = txt.eventHooks
+
+    keydownEvents.push(function (e) {
+        // 删除图片时，有时会因为浏览器bug删不掉。因此这里手动判断光标前面是不是图片，是就删掉
+        const $selectionContainerElem = selection.getSelectionContainerElem()
+        const range = selection.getRange()
+
+        if (
+            !range ||
+            !$selectionContainerElem ||
+            e.keyCode !== 8 ||
+            !selection.isSelectionEmpty()
+        ) {
+            return
+        }
+        let { startContainer, startOffset } = range
+
+        // 同一段落内上一个节点
+        let prevNode: Node | null = null
+        if (startOffset === 0) {
+            // 此时上一个节点需要通过previousSibling去找
+            while (
+                startContainer !== $selectionContainerElem.elems[0] &&
+                $selectionContainerElem.elems[0].contains(startContainer) &&
+                startContainer.parentNode &&
+                !prevNode
+            ) {
+                if (startContainer.previousSibling) {
+                    prevNode = startContainer.previousSibling as Node
+                    break
+                }
+                startContainer = startContainer.parentNode
+            }
+        } else if (startContainer.nodeType !== 3) {
+            // 非文本节点才需要被处理，比如p
+            prevNode = startContainer.childNodes[startOffset - 1]
+        }
+
+        if (!prevNode) {
+            return
+        }
+
+        let lastChildNodeInPrevNode = prevNode
+
+        // 找到最右侧叶子节点
+        while (lastChildNodeInPrevNode.childNodes.length) {
+            lastChildNodeInPrevNode =
+                lastChildNodeInPrevNode.childNodes[lastChildNodeInPrevNode.childNodes.length - 1]
+        }
+
+        if (
+            lastChildNodeInPrevNode instanceof HTMLElement &&
+            lastChildNodeInPrevNode.tagName === 'IMG'
+        ) {
+            lastChildNodeInPrevNode.remove()
+            e.preventDefault()
+        }
+    })
+}

From 313665c5a656314477f8973e0cdff9c4ba125aeb Mon Sep 17 00:00:00 2001
From: lichenabson <1114795127@qq.com>
Date: Mon, 7 Jun 2021 15:07:53 +0800
Subject: [PATCH 04/13] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=B2=98?=
 =?UTF-8?q?=E8=B4=B4=E6=97=B6=E8=BF=87=E6=BB=A4meta=E7=9A=84=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/menus.ts           | 14 ++++++--------
 src/lib/simplehtmlparser.js   |  3 +--
 src/menus/lineHeight/index.ts |  4 ++--
 src/text/paste/paste-event.ts |  2 +-
 src/utils/const.ts            |  3 +--
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/config/menus.ts b/src/config/menus.ts
index c53c6ff5c..820e397f2 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 21eb17a5a..502696297 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 35e76ffad..8e780112e 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<ChildNode> | undefined =
-                editor.selection.getRange()?.commonAncestorContainer.childNodes
+            const childList: NodeListOf<ChildNode> | 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/text/paste/paste-event.ts b/src/text/paste/paste-event.ts
index 1be77b628..f5bdcf50f 100644
--- a/src/text/paste/paste-event.ts
+++ b/src/text/paste/paste-event.ts
@@ -52,7 +52,7 @@ export function getPasteHtml(
     pasteHtml = pasteHtml.replace(/<(\d)/gm, (_, num) => '&lt;' + num)
 
     // pdf复制只会有一个meta标签，parseHtml中的过滤meta标签会导致后面内容丢失
-    pasteHtml = pasteHtml.replace(/<meta.*charset=("|').*("|').*?>/gim, '')
+    pasteHtml = pasteHtml.replace(/<(\/?meta.*?)>/gim, '')
 
     // 剔除多余的标签、属性
     pasteHtml = parseHtml(pasteHtml, filterStyle, ignoreImg)
diff --git a/src/utils/const.ts b/src/utils/const.ts
index 2b49406cc..2423d015a 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\-.,@?^=%&amp;:/~+#]*[\w\-@?^=%&amp;/~+#])?/
+export const urlRegex = /^(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-.,@?^=%&amp;:/~+#]*[\w\-@?^=%&amp;/~+#])?/
 
 // 编辑器为了方便继续输入/换行等原因 主动生成的空标签
 export const EMPTY_P = '<p data-we-empty-p=""><br></p>'

From 4ed9c87bfd84f813c894c73b54b9d8e868dd05d7 Mon Sep 17 00:00:00 2001
From: wangfupeng <wangfupeng1988@163.com>
Date: Thu, 10 Jun 2021 10:26:08 +0800
Subject: [PATCH 05/13] chore: dev deploy config

---
 .github/workflows/dev.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 6f8e55b28..5c532fcdf 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -38,7 +38,7 @@ jobs:
         mkdir -p ~/.ssh/
         echo "${{secrets.WFP_ID_RSA}}" > ~/.ssh/id_rsa
         chmod 600 ~/.ssh/id_rsa
-        ssh-keyscan ${{secrets.TECENT_SERVER}} >> ~/.ssh/known_hosts
+        ssh-keyscan ${{secrets.BAIDU_SERVER}} >> ~/.ssh/known_hosts
     - name: scp test files # 拷贝测试页面，到远程服务器
       run: |
         ## 获取当前分支名称，并创建一个同名的文件夹
@@ -51,7 +51,7 @@ jobs:
 
         ## 将该文件夹，及其所有文件，上传到服务器
         echo current branch name is: $currentBranchName
-        ssh work@${{secrets.TECENT_SERVER}} "rm -rf /home/work/wangEditor-team/example-pages/$currentBranchName"
-        scp -r ./$currentBranchName work@${{secrets.TECENT_SERVER}}:/home/work/wangEditor-team/example-pages/$currentBranchName
+        ssh work@${{secrets.BAIDU_SERVER}} "rm -rf /home/work/wangEditor-team/v4-examples/$currentBranchName"
+        scp -r ./$currentBranchName work@${{secrets.BAIDU_SERVER}}:/home/work/wangEditor-team/v4-examples/$currentBranchName
     - name: delete ssh key # 删除 ssh key
       run: rm -rf ~/.ssh/id_rsa

From a645cdd54284acaffa1d52d10cfc3bd7b5cc3599 Mon Sep 17 00:00:00 2001
From: wangfupeng <wangfupeng1988@163.com>
Date: Thu, 10 Jun 2021 10:40:01 +0800
Subject: [PATCH 06/13] chore: publish deploy

---
 .github/workflows/dev.yml         | 2 +-
 .github/workflows/npm-publish.yml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 5c532fcdf..6215c387d 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -2,7 +2,7 @@
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
 # github actions 中文文档 https://docs.github.com/cn/actions/getting-started-with-github-actions
 
-name: deploy to tecent server - example page
+name: deploy to baidu server - example page
 
 on:
   push:
diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index 783359720..706b28362 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -37,7 +37,7 @@ jobs:
           mkdir -p ~/.ssh/
           echo "${{secrets.WFP_ID_RSA}}" > ~/.ssh/id_rsa
           chmod 600 ~/.ssh/id_rsa
-          ssh-keyscan ${{secrets.TECENT_SERVER}} >> ~/.ssh/known_hosts
+          ssh-keyscan ${{secrets.BAIDU_SERVER}} >> ~/.ssh/known_hosts
       - name: rebuild we-demo and scp
         run: |
           ## 下载 demo ，安装最新的插件，并重新打包
@@ -52,5 +52,5 @@ jobs:
 
           ## 将 dist 文件夹，重命名为 publish-npm-test ，并上传到服务器
           mv dist publish-npm-test
-          ssh work@${{secrets.TECENT_SERVER}} "rm -rf /home/work/wangEditor-team/example-pages/publish-npm-test"
-          scp -r ./publish-npm-test work@${{secrets.TECENT_SERVER}}:/home/work/wangEditor-team/example-pages/publish-npm-test
+          ssh work@${{secrets.BAIDU_SERVER}} "rm -rf /home/work/wangEditor-team/v4-examples/publish-npm-test"
+          scp -r ./publish-npm-test work@${{secrets.BAIDU_SERVER}}:/home/work/wangEditor-team/v4-examples/publish-npm-test

From 23eb557a5dabcdc6201753695a8590dec539fe9e Mon Sep 17 00:00:00 2001
From: WangJolin <1113584801@qq.com>
Date: Thu, 10 Jun 2021 14:54:18 +0800
Subject: [PATCH 07/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Da=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=8C=85=E8=A3=B9img=E7=9A=84=20=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=20=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/link.html                         |  5 ++++-
 src/menus/link/bind-event/tooltip-event.ts | 21 ++++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/examples/link.html b/examples/link.html
index 6fbb29424..7c65df226 100644
--- a/examples/link.html
+++ b/examples/link.html
@@ -13,6 +13,7 @@
     <p>
         wangEditor demo
     </p>
+    <button onclick="insertLinkImg()">插入带有超链接的图片</button>
     <div id="div1">
         <p><br/></p>
         <p><br/></p>
@@ -41,7 +42,9 @@
     <script>
         const E = window.wangEditor
         const editor = new E('#div1')
-
+        function insertLinkImg () {
+            editor.cmd.do( 'insertHTML', '<a href="https://www.baidu.com/"><img src="https://user-images.githubusercontent.com/37204782/119621908-3ebe3c00-be39-11eb-924d-82308460d461.png" style="max-width:100%;"/></a>' )
+        }
         editor.create()
     </script>
 </body>
diff --git a/src/menus/link/bind-event/tooltip-event.ts b/src/menus/link/bind-event/tooltip-event.ts
index 19cd6fbdf..6bcc62492 100644
--- a/src/menus/link/bind-event/tooltip-event.ts
+++ b/src/menus/link/bind-event/tooltip-event.ts
@@ -36,9 +36,24 @@ function createShowHideFn(editor: Editor) {
                     editor.selection.createRangeByElem($link)
                     editor.selection.restoreSelection()
 
-                    // 用文字，替换链接
-                    const selectionText = $link.text()
-                    editor.cmd.do('insertHTML', '<span>' + selectionText + '</span>')
+                    const $childNodes = $link.childNodes()
+                    // 如果链接是图片
+                    if ($childNodes?.getNodeName() === 'IMG') {
+                        // 获取选中的图片
+                        const $selectIMG = editor.selection.getSelectionContainerElem()?.children()
+                            ?.elems[0].children[0]
+                        // 插入图片
+                        editor.cmd.do(
+                            'insertHTML',
+                            `<img 
+                                src=${$selectIMG?.getAttribute('src')} 
+                                style=${$selectIMG?.getAttribute('style')}>`
+                        )
+                    } else {
+                        // 用文字，替换链接
+                        const selectionText = $link.text()
+                        editor.cmd.do('insertHTML', '<span>' + selectionText + '</span>')
+                    }
 
                     // 返回 true，表示执行完之后，隐藏 tooltip。否则不隐藏。
                     return true

From 27aec31aeb04089bf5457fb9275b2916098cbdc2 Mon Sep 17 00:00:00 2001
From: wangfupeng <wangfupeng1988@163.com>
Date: Thu, 10 Jun 2021 15:26:11 +0800
Subject: [PATCH 08/13] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=20upload=20AP?=
 =?UTF-8?q?I=20=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/i18next.html                      |  2 +-
 examples/jq-create-dom.html                |  2 +-
 examples/txt-html-function.html            |  2 +-
 examples/upload-image-alt.html             |  2 +-
 examples/upload-image.html                 | 14 +++++++-------
 examples/upload-img-accept-empty.html      |  2 +-
 examples/upload-video.html                 |  2 +-
 src/config/menus.ts                        | 14 ++++++++------
 src/lib/simplehtmlparser.js                |  3 ++-
 src/menus/lineHeight/index.ts              |  4 ++--
 src/utils/const.ts                         |  3 ++-
 test/unit/editor/upload-core.test.ts       |  2 +-
 test/unit/menus/img/upload-img.test.ts     |  4 ++--
 test/unit/menus/video/upload-video.test.ts |  2 +-
 14 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/examples/i18next.html b/examples/i18next.html
index 2961a0cc3..24fd057e8 100644
--- a/examples/i18next.html
+++ b/examples/i18next.html
@@ -20,7 +20,7 @@
     <script>
         const E = window.wangEditor
         const editor = new E('#div1')
-        editor.config.uploadImgServer = '/api/upload-img'
+        editor.config.uploadImgServer = 'http://106.12.198.214:3000/api/upload-img'
         editor.config.lang = 'en'
         editor.i18next = window.i18next
         // editor.config.languages['en'] = {
diff --git a/examples/jq-create-dom.html b/examples/jq-create-dom.html
index 7b3217e5a..5a208258e 100644
--- a/examples/jq-create-dom.html
+++ b/examples/jq-create-dom.html
@@ -37,7 +37,7 @@ <h1>jq create dom</h1>
             editor = new E(editorToolbar, editorArea);
             editor.config.placeholder = '这里是我加的placeholder';
             editor.config.zIndex = 10;
-            editor.config.uploadVideoServer = '/api/upload-video';
+            editor.config.uploadVideoServer = 'http://106.12.198.214:3000/api/upload-video';
             editor.config.uploadImgServer = '/upload/document/images';
             editor.config.uploadImgParams = {
                 identify: 'online_image'
diff --git a/examples/txt-html-function.html b/examples/txt-html-function.html
index 4740793a6..fe740851d 100644
--- a/examples/txt-html-function.html
+++ b/examples/txt-html-function.html
@@ -26,7 +26,7 @@
         // 改为使用var声明，才能在window对象上获取到编辑器实例，方便e2e测试
         var E = window.wangEditor
         var editor = new E('#div1')
-        editor.config.uploadImgServer = '/api/upload-img'
+        editor.config.uploadImgServer = 'http://106.12.198.214:3000/api/upload-img'
 
         editor.config.onchange = function (newHtml) {
             console.log('onchange', newHtml)
diff --git a/examples/upload-image-alt.html b/examples/upload-image-alt.html
index 836e527d1..5bdf1c34c 100644
--- a/examples/upload-image-alt.html
+++ b/examples/upload-image-alt.html
@@ -20,7 +20,7 @@
         const E = window.wangEditor
         const editor = new E('#div1')
 
-        editor.config.uploadImgServer = '/api/upload-img'
+        editor.config.uploadImgServer = 'http://106.12.198.214:3000/api/upload-img'
         editor.config.showLinkImgAlt = true
         editor.config.showLinkImgHref =  true
         // editor.config.showLinkImg = false
diff --git a/examples/upload-image.html b/examples/upload-image.html
index 16156d3a6..299b37e5e 100644
--- a/examples/upload-image.html
+++ b/examples/upload-image.html
@@ -24,7 +24,7 @@
         // 忽略粘贴内容中的图片
         editor.config.pasteIgnoreImg = true
 
-        // editor.config.uploadImgServer = '/api/upload-img'
+        editor.config.uploadImgServer = 'http://106.12.198.214:3000/api/upload-img'
         // editor.config.showLinkImgAlt = true
         // editor.config.showLinkImgHref =  true
         // editor.config.showLinkImg = false
@@ -73,12 +73,12 @@
         //         insertImgFn(result.data[0].url) // 只插入一个图片，多了忽略
         //     }
         // }
-        editor.config.customUploadImg = function (resultFiles, insertImgFn) {
-            console.log('customUploadImg', resultFiles)
-            Array.from(resultFiles).forEach(file => {
-                insertImgFn(URL.createObjectURL(file))
-            })
-        }
+        // editor.config.customUploadImg = function (resultFiles, insertImgFn) {
+        //     console.log('customUploadImg', resultFiles)
+        //     Array.from(resultFiles).forEach(file => {
+        //         insertImgFn(URL.createObjectURL(file))
+        //     })
+        // }
 
         editor.create()
     </script>
diff --git a/examples/upload-img-accept-empty.html b/examples/upload-img-accept-empty.html
index 4d318ecaa..9365c2461 100644
--- a/examples/upload-img-accept-empty.html
+++ b/examples/upload-img-accept-empty.html
@@ -20,7 +20,7 @@
         const E = window.wangEditor
         const editor = new E('#div1')
         editor.config.uploadImgAccept = []
-        editor.config.uploadImgServer = '/api/upload-img'
+        editor.config.uploadImgServer = 'http://106.12.198.214:3000/api/upload-img'
         // editor.config.showLinkImgAlt = true
         // editor.config.showLinkImgHref =  true
         editor.config.showLinkImg = false
diff --git a/examples/upload-video.html b/examples/upload-video.html
index 0792dda89..399db89e1 100644
--- a/examples/upload-video.html
+++ b/examples/upload-video.html
@@ -27,7 +27,7 @@
         var editor = new E('#div1')
 
         // 上传地址
-        editor.config.uploadVideoServer = '/api/upload-video';
+        editor.config.uploadVideoServer = 'http://106.12.198.214:3000/api/upload-video';
 
         // 自定义插入视频
         // editor.config.customInsertVideo = (url) => {
diff --git a/src/config/menus.ts b/src/config/menus.ts
index 820e397f2..c53c6ff5c 100644
--- a/src/config/menus.ts
+++ b/src/config/menus.ts
@@ -182,9 +182,10 @@ export default {
             // type -> 'emoji' / 'image'
             type: 'emoji',
             // content -> 数组
-            content: '😀 😃 😄 😁 😆 😅 😂 🤣 😊 😇 🙂 🙃 😉 😌 😍 😘 😗 😙 😚 😋 😛 😝 😜 🤓 😎 😏 😒 😞 😔 😟 😕 🙁 😣 😖 😫 😩 😢 😭 😤 😠 😡 😳 😱 😨 🤗 🤔 😶 😑 😬 🙄 😯 😴 😷 🤑 😈 🤡 💩 👻 💀 👀 👣'.split(
-                /\s/
-            ),
+            content:
+                '😀 😃 😄 😁 😆 😅 😂 🤣 😊 😇 🙂 🙃 😉 😌 😍 😘 😗 😙 😚 😋 😛 😝 😜 🤓 😎 😏 😒 😞 😔 😟 😕 🙁 😣 😖 😫 😩 😢 😭 😤 😠 😡 😳 😱 😨 🤗 🤔 😶 😑 😬 🙄 😯 😴 😷 🤑 😈 🤡 💩 👻 💀 👀 👣'.split(
+                    /\s/
+                ),
         },
         {
             // tab 的标题
@@ -192,9 +193,10 @@ 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 502696297..21eb17a5a 100644
--- a/src/lib/simplehtmlparser.js
+++ b/src/lib/simplehtmlparser.js
@@ -61,7 +61,8 @@ 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 8e780112e..35e76ffad 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<ChildNode> | undefined = editor.selection.getRange()
-                ?.commonAncestorContainer.childNodes
+            const childList: NodeListOf<ChildNode> | 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 2423d015a..2b49406cc 100644
--- a/src/utils/const.ts
+++ b/src/utils/const.ts
@@ -6,7 +6,8 @@
 export function EMPTY_FN() {}
 
 //用于校验是否为url格式字符串
-export const urlRegex = /^(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-.,@?^=%&amp;:/~+#]*[\w\-@?^=%&amp;/~+#])?/
+export const urlRegex =
+    /^(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-.,@?^=%&amp;:/~+#]*[\w\-@?^=%&amp;/~+#])?/
 
 // 编辑器为了方便继续输入/换行等原因 主动生成的空标签
 export const EMPTY_P = '<p data-we-empty-p=""><br></p>'
diff --git a/test/unit/editor/upload-core.test.ts b/test/unit/editor/upload-core.test.ts
index fd5bfbea2..aafe3aed8 100644
--- a/test/unit/editor/upload-core.test.ts
+++ b/test/unit/editor/upload-core.test.ts
@@ -6,7 +6,7 @@
 import post from '../../../src/editor/upload/upload-core'
 import mockXHR from '../../helpers/mock-xhr'
 
-const API_URL = 'http://localhost:8881/api/upload-img'
+const API_URL = 'http://106.12.198.214:3000/api/upload-img'
 
 const origilaXHR = window.XMLHttpRequest
 const deaultResponse = { status: 200, res: JSON.stringify({ data: ['url1'], errno: 0 }) }
diff --git a/test/unit/menus/img/upload-img.test.ts b/test/unit/menus/img/upload-img.test.ts
index 624d33c20..339770e29 100644
--- a/test/unit/menus/img/upload-img.test.ts
+++ b/test/unit/menus/img/upload-img.test.ts
@@ -13,8 +13,8 @@ let id = 1
 
 const imgUrl = 'http://www.wangeditor.com/imgs/logo.jpeg'
 const errorUrl = 'error.jpeg'
-const uploadImgServer = 'http://localhost:8881/api/upload-img'
-const uploadImgServerWithHash = 'http://localhost:8881/api/upload-img#/123'
+const uploadImgServer = 'http://106.12.198.214:3000/api/upload-img'
+const uploadImgServerWithHash = 'http://106.12.198.214:3000/api/upload-img#/123'
 
 const defaultRes = {
     status: 200,
diff --git a/test/unit/menus/video/upload-video.test.ts b/test/unit/menus/video/upload-video.test.ts
index 2c1d896e3..aec379660 100644
--- a/test/unit/menus/video/upload-video.test.ts
+++ b/test/unit/menus/video/upload-video.test.ts
@@ -16,7 +16,7 @@ let id = 1
 
 const videoUrl =
     'https://stream7.iqilu.com/10339/upload_transcode/202002/18/20200218114723HDu3hhxqIT.mp4'
-const uploadVideoServer = 'http://localhost:8881/api/upload-video'
+const uploadVideoServer = 'http://106.12.198.214:3000/api/upload-video'
 
 const defaultRes = {
     status: 200,

From 9b5fb5e4908ca51193ed2e0f4af1286706365d4c Mon Sep 17 00:00:00 2001
From: wangfupeng <wangfupeng1988@163.com>
Date: Thu, 10 Jun 2021 15:34:16 +0800
Subject: [PATCH 09/13] =?UTF-8?q?chore:=20=E5=88=A0=E9=99=A4=20server=20?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/server.yml        |  34 ----------
 docs/dev.md                         |   1 -
 package.json                        |   4 --
 server/README.md                    |  22 +-----
 server/controller/save-file.js      |  97 --------------------------
 server/controller/saveVideo-file.js | 102 ----------------------------
 server/index.js                     |  14 ----
 server/pm2.conf.json                |  13 ----
 server/rm.sh                        |   6 --
 server/router.js                    |  29 --------
 server/util.js                      |  14 ----
 11 files changed, 1 insertion(+), 335 deletions(-)
 delete mode 100644 .github/workflows/server.yml
 delete mode 100644 server/controller/save-file.js
 delete mode 100644 server/controller/saveVideo-file.js
 delete mode 100644 server/pm2.conf.json
 delete mode 100644 server/rm.sh
 delete mode 100644 server/router.js
 delete mode 100644 server/util.js

diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
deleted file mode 100644
index 0904c8497..000000000
--- a/.github/workflows/server.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# 测试机安装 git node pm2
-
-name: deploy to tecent server - server
-
-on:
-    push:
-      branches:
-        - 'server'
-      paths:
-        - '.github/workflows/*'
-        - 'server/**'
-jobs:
-    deploy:
-        runs-on: ubuntu-latest
-        steps:
-        - name: set ssh key # 临时设置 ssh key
-          run: |
-            mkdir -p ~/.ssh/
-            echo "${{secrets.WFP_ID_RSA}}" > ~/.ssh/id_rsa
-            chmod 600 ~/.ssh/id_rsa
-            ssh-keyscan ${{secrets.TECENT_SERVER}} >> ~/.ssh/known_hosts
-        - name: deploy
-          run: |
-            ssh work@${{secrets.TECENT_SERVER}} "
-                cd /home/work/wangEditor-team/wangEditor; # 事先 git clone ** server 分支**
-                git checkout . ; # 清空所有改动
-                git checkout server; # 切换到 server 分支
-                git pull origin server;
-                npm i;
-                npm run server; # 启动或重启，保证服务器安装了 pm2
-                echo ========= wangEditor server start success =========
-            "
-        - name: delete ssh key # 删除 ssh key
-          run: rm -rf ~/.ssh/id_rsa
diff --git a/docs/dev.md b/docs/dev.md
index 97eb18290..972819415 100644
--- a/docs/dev.md
+++ b/docs/dev.md
@@ -40,7 +40,6 @@ npm run start
 
 - `master` 主干分支，当前正在运行的代码。**不可**直接往 `master` 提交代码。
 - `dev` 开发分支，当前正在开发、但尚未发布的代码。**不可**直接往 `dev` 提交代码，但可以合并其他分支。
-- `server` 开发分支，用于部署 server 端功能，**不可**直接往 `server` 提交代码，但可以合并其他分支。
 - `feature-xxx` 开发新功能
 - `fix-xxx` bug 修复
 - `hotfix-xxx` 高优紧急 bug 修复，修复完需紧急上线
diff --git a/package.json b/package.json
index 5128fb2cd..80ab8bcdb 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
   "scripts": {
     "dev": "cross-env NODE_ENV=development webpack --watch --config build/webpack.dev.js",
     "example": "cross-env PORT=8881 nodemon server/www.js",
-    "server": "cross-env NODE_ENV=prd_dev pm2 start server/pm2.conf.json",
     "build": "cross-env NODE_ENV=production webpack --config build/webpack.prod.js",
     "build:dev": "cross-env NODE_ENV=development webpack --config build/webpack.dev.js",
     "build:un-min": "cross-env NODE_ENV=production webpack --config build/webpack.un-min.prod.js",
@@ -81,11 +80,8 @@
     "jest": "^26.0.1",
     "jquery": "^3.5.1",
     "koa": "^2.13.0",
-    "koa-bodyparser": "^4.3.0",
-    "koa-json": "^2.0.2",
     "koa-logger": "^3.2.1",
     "koa-onerror": "^4.1.0",
-    "koa-router": "^9.0.1",
     "koa-static": "^5.0.0",
     "less": "^3.11.1",
     "less-loader": "^6.0.0",
diff --git a/server/README.md b/server/README.md
index a0e056c09..e82c59510 100644
--- a/server/README.md
+++ b/server/README.md
@@ -1,23 +1,3 @@
 # 服务端
 
-提供文件上传接口，用于测试。
-
-## 开发环境
-
-`npm start` 时会启动 server ，并且依赖于 koa2-static 来启动 examples 页面的静态服务。
-
-## 测试环境
-
-### 发布到测试机
-
-代码 push 到 `server` 分支，即可自动发布到测试机。
-
-具体可参考 `.github/workflows/server.yml` 。
-
-### 测试机配置
-
-nginx 需要配置，做反向代理，参考测试机 `/etc/nginx/nginx.conf`
-- 代理接口 `/api/`
-- 代理图片 url `/server/upload-files/`
-
-定时删除文件，配置 crontab 定时执行 `server/rm.sh`
+`npm start` 时会启动 server ，依赖于 koa2-static 来启动 examples 页面的静态服务。
diff --git a/server/controller/save-file.js b/server/controller/save-file.js
deleted file mode 100644
index 780e50e47..000000000
--- a/server/controller/save-file.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * @description 保存上传的文件
- * @author wangfupeng
- */
-
-const os = require('os')
-const fs = require('fs')
-const path = require('path')
-const formidable = require('formidable')
-const { objForEach } = require('../util')
-const FILE_FOLDER = 'upload-files'
-const isWindows = os.type().toLowerCase().indexOf('windows') >= 0
-const TMP_FOLDER = 'upload-files-tmp'
-
-/**
- * 获取随机数
- */
-function getRandom() {
-    return Math.random().toString(36).slice(-3)
-}
-
-/**
- * 给文件名加后缀，如 a.png 转换为 a-123123.png
- * @param {string} fileName 文件名
- */
-function genRandomFileName(fileName = '') {
-    // 如 fileName === 'a.123.png'
-
-    const r = getRandom()
-    if (!fileName) return r
-
-    const length = fileName.length // 9
-    const pointLastIndexOf = fileName.lastIndexOf('.') // 5
-    if (pointLastIndexOf < 0) return `${fileName}-${r}`
-
-    const fileNameWithOutExt = fileName.slice(0, pointLastIndexOf) // "a.123"
-    const ext = fileName.slice(pointLastIndexOf + 1, length) // "png"
-    return `${fileNameWithOutExt}-${r}.${ext}`
-}
-
-/**
- * 保存上传的文件
- * @param {Object} req request
- */
-function saveFiles(req) {
-    return new Promise((resolve, reject) => {
-        const imgLinks = []
-        const form = formidable({ multiples: true })
-
-        // windows 系统，处理 rename 报错
-        if (isWindows) {
-            const tmpPath = path.resolve(__dirname, '..', '..', TMP_FOLDER) // 在根目录下
-            if (!fs.existsSync(tmpPath)) {
-                fs.mkdirSync(tmpPath)
-            }
-            form.uploadDir = TMP_FOLDER
-        }
-
-        form.parse(req, function (err, fields, files) {
-            if (err) {
-                reject('formidable, form.parse err', err.stack)
-            }
-            // 存储图片的文件夹
-            const storePath = path.resolve(__dirname, '..', FILE_FOLDER)
-            if (!fs.existsSync(storePath)) {
-                fs.mkdirSync(storePath)
-            }
-
-            // 遍历所有上传来的图片
-            objForEach(files, (name, file) => {
-                console.log('name...', name)
-
-                // 图片临时位置
-                const tempFilePath = file.path
-                // 图片名称和路径
-                const fileName = genRandomFileName(name) // 为文件名增加一个随机数，防止同名文件覆盖
-                console.log('fileName...', fileName)
-                const fullFileName = path.join(storePath, fileName)
-                console.log('fullFileName...', fullFileName)
-                // 将临时文件保存为正式文件
-                fs.renameSync(tempFilePath, fullFileName)
-                // 存储链接
-                const url = `/server/${FILE_FOLDER}/` + fileName
-                imgLinks.push({ url, alt: fileName, href: url })
-            })
-            console.log('imgLinks...', imgLinks)
-
-            // 返回结果
-            resolve({
-                errno: 0,
-                data: imgLinks,
-            })
-        })
-    })
-}
-
-module.exports = saveFiles
diff --git a/server/controller/saveVideo-file.js b/server/controller/saveVideo-file.js
deleted file mode 100644
index ba72bd2bc..000000000
--- a/server/controller/saveVideo-file.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * @description 保存上传的文件
- * @author wangfupeng
- */
-
-const os = require('os')
-const fs = require('fs')
-const path = require('path')
-const multiparty = require('multiparty')
-const { objForEach } = require('../util')
-const FILE_FOLDER = 'upload-files'
-const isWindows = os.type().toLowerCase().indexOf('windows') >= 0
-const TMP_FOLDER = 'upload-files-tmp'
-const fse = require('fs-extra');
-
-/**
- * 获取随机数
- */
-function getRandom() {
-    return Math.random().toString(36).slice(-3)
-}
-
-/**
- * 给文件名加后缀，如 a.png 转换为 a-123123.png
- * @param {string} fileName 文件名
- */
-function genRandomFileName(fileName = '') {
-    // 如 fileName === 'a.123.png'
-
-    const r = getRandom()
-    if (!fileName) return r
-
-    const length = fileName.length // 9
-    const pointLastIndexOf = fileName.lastIndexOf('.') // 5
-    if (pointLastIndexOf < 0) return `${fileName}-${r}`
-
-    const fileNameWithOutExt = fileName.slice(0, pointLastIndexOf) // "a.123"
-    const ext = fileName.slice(pointLastIndexOf + 1, length) // "png"
-    return `${fileNameWithOutExt}-${r}.${ext}`
-}
-
-/**
- * 保存上传的文件
- * @param {Object} req request
- */
-function saveFiles(req) {
-    return new Promise((resolve, reject) => {
-        const videoLinks = []
-        const multipart = new multiparty.Form();
-
-        // windows 系统，处理 rename 报错
-        if (isWindows) {
-            const tmpPath = path.resolve(__dirname, '..', '..', TMP_FOLDER) // 在根目录下
-            if (!fs.existsSync(tmpPath)) {
-                fs.mkdirSync(tmpPath)
-            }
-
-        }
-
-        multipart.parse(req, function (err, fields, files) {
-            if (err) {
-                reject('formidable, form.parse err', err.stack)
-            }
-            // 存储视频的文件夹
-            const storePath = path.resolve(__dirname, '..', FILE_FOLDER)
-            if (!fs.existsSync(storePath)) {
-                fs.mkdirSync(storePath)
-            }
-
-            // 遍历所有上传来的视频
-            objForEach(files, async (name, file) => {
-                console.log('name...', name)
-                console.log('file.path...', file)
-                // 视频临时位置
-                const tempFilePath = file[0].path
-                console.log('tempFilePath...', tempFilePath)
-                // 视频名称和路径
-                const fileName = genRandomFileName(name) // 为文件名增加一个随机数，防止同名文件覆盖
-                console.log('fileName...', fileName)
-                const fullFileName = path.join(storePath, fileName)
-                console.log('fullFileName...', fullFileName)
-                // 将临时文件保存为正式文件
-                fse.moveSync(tempFilePath, fullFileName);
-                // 存储链接
-                const url = `/server/${FILE_FOLDER}/` + fileName
-                console.log('url...', url)
-                videoLinks.push(url)
-            })
-            console.log('videoLinks...', videoLinks)
-
-            // 返回结果
-            resolve({
-                errno: 0,
-                data: {
-                    url: videoLinks[0]
-                },
-            })
-        })
-    })
-}
-
-module.exports = saveFiles
diff --git a/server/index.js b/server/index.js
index c5d6c39cf..0b67667f1 100644
--- a/server/index.js
+++ b/server/index.js
@@ -6,24 +6,13 @@
 const path = require('path')
 const Koa = require('koa')
 const app = new Koa()
-const json = require('koa-json')
 const onerror = require('koa-onerror')
-const bodyparser = require('koa-bodyparser')
 const logger = require('koa-logger')
 const koaStatic = require('koa-static')
 
-const router = require('./router')
-
 // error handler
 onerror(app)
 
-// middlewares
-app.use(
-    bodyparser({
-        enableTypes: ['json', 'form', 'text'],
-    })
-)
-app.use(json())
 app.use(logger())
 const staticPath = path.join(__dirname, '..')
 app.use(koaStatic(staticPath))
@@ -36,9 +25,6 @@ app.use(async (ctx, next) => {
     console.log(`${ctx.method} ${ctx.url} - ${ms}ms`)
 })
 
-// routes
-app.use(router.routes(), router.allowedMethods())
-
 // error-handling
 app.on('error', (err, ctx) => {
     console.error('server error', err, ctx)
diff --git a/server/pm2.conf.json b/server/pm2.conf.json
deleted file mode 100644
index 1af1a7ec7..000000000
--- a/server/pm2.conf.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "apps": [
-        {
-            "name": "wangEditor-server",
-            "script": "server/www.js",
-            "watch": false,
-            "instances": 1,
-            "error_file": "./logs/err.log",
-            "out_file": "./logs/out.log",
-            "log_date_format": "YYYY-MM-DD HH:mm:ss Z"
-        }
-    ]
-}
diff --git a/server/rm.sh b/server/rm.sh
deleted file mode 100644
index d65f6e046..000000000
--- a/server/rm.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# 删除上传的文件，用于 crontab 调用
-# 每天凌晨 4 点调用：`0 4 * * * /home/work/wangEditor-team/wangEditor/server/rm.sh`
-
-cd /home/work/wangEditor-team/wangEditor/server/upload-files # 测试机的 path
-rm -rf *
diff --git a/server/router.js b/server/router.js
deleted file mode 100644
index c9fe31399..000000000
--- a/server/router.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @description 服务端路由
- * @author wangfupeng
- */
-
-const router = require('koa-router')()
-const saveFiles = require('./controller/save-file')
-const saveVideoFile = require('./controller/saveVideo-file')
-
-router.prefix('/api')
-
-// 测试用
-router.get('/test', async function (ctx, next) {
-    ctx.body = 'hello test'
-})
-
-// 上传图片
-router.post('/upload-img', async function (ctx, next) {
-    const data = await saveFiles(ctx.req)
-    ctx.body = data
-})
-
-// 上传视频
-router.post('/upload-video', async function (ctx, next) {
-    const data = await saveVideoFile(ctx.req)
-    ctx.body = data
-})
-
-module.exports = router
diff --git a/server/util.js b/server/util.js
deleted file mode 100644
index bdc0237ed..000000000
--- a/server/util.js
+++ /dev/null
@@ -1,14 +0,0 @@
-module.exports = {
-    // 遍历对象
-    objForEach: function (obj, fn) {
-        let key, result
-        for (key in obj) {
-            if (Object.prototype.hasOwnProperty.call(obj, key)) {
-                result = fn.call(obj, key, obj[key])
-                if (result === false) {
-                    break
-                }
-            }
-        }
-    },
-}

From e7edde0698873ed7e728d85e1bdda69294735372 Mon Sep 17 00:00:00 2001
From: wangfupeng <wangfupeng1988@163.com>
Date: Thu, 10 Jun 2021 15:39:52 +0800
Subject: [PATCH 10/13] =?UTF-8?q?docs:=20=E4=BF=AE=E6=94=B9=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=9C=BA=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/dev.md | 2 +-
 docs/pub.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/dev.md b/docs/dev.md
index 972819415..a257a64a7 100644
--- a/docs/dev.md
+++ b/docs/dev.md
@@ -105,7 +105,7 @@ npm run start
 
 当提交完自己的分支之后，github actions 会自动触发部署到腾讯云测试机。
 查看 [actions 列表](https://github.com/wangeditor-team/wangEditor/actions)，待所有任务运行完成之后。
-打开浏览器访问 `http://106.55.153.217:8881/<你的分支名>/examples/index.html` ，这就是你本次分支代码的远程测试环境。
+打开浏览器访问 `http://106.12.198.214:8881/<你的分支名>/examples/index.html` ，这就是你本次分支代码的远程测试环境。
 
 要保证这一步成功，再进行下一步。
 
diff --git a/docs/pub.md b/docs/pub.md
index 8cd4c95de..b00c694f6 100644
--- a/docs/pub.md
+++ b/docs/pub.md
@@ -66,7 +66,7 @@
 
 ## 回归测试
 
-发布完成之后，访问 http://106.55.153.217:8881/publish-npm-test/ 即可得到最新版本的 demo 。
+发布完成之后，访问 http://106.12.198.214:8881/publish-npm-test/ 即可得到最新版本的 demo 。
 
 ## 修改任务状态
 

From 392433727a14b153bf9219a20030a3d03fa70965 Mon Sep 17 00:00:00 2001
From: luochao <651644100@qq.com>
Date: Thu, 10 Jun 2021 21:21:58 +0800
Subject: [PATCH 11/13] release: v4.7.3

---
 CHANGELOG.md                  |  8 ++++++++
 package.json                  |  2 +-
 src/config/menus.ts           | 14 ++++++--------
 src/lib/simplehtmlparser.js   |  3 +--
 src/menus/lineHeight/index.ts |  4 ++--
 src/utils/const.ts            |  3 +--
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6c93a96a..46b887926 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [4.7.3](https://github.com/wangeditor-team/wangEditor/compare/v4.7.2...v4.7.3) (2021-06-10)
+
+
+### Bug Fixes
+
+* 特殊情况下无法通过backspace删除图片 ([0648a93](https://github.com/wangeditor-team/wangEditor/commit/0648a9340a7c156dbc16b83e955f684854cb8c76))
+* 优化粘贴时过滤meta的行为 ([313665c](https://github.com/wangeditor-team/wangEditor/commit/313665c5a656314477f8973e0cdff9c4ba125aeb))
+
 ## [4.7.2](https://github.com/wangeditor-team/wangEditor/compare/v4.7.1...v4.7.2) (2021-06-03)
 
 
diff --git a/package.json b/package.json
index 80ab8bcdb..222118643 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wangeditor",
-  "version": "4.7.2",
+  "version": "4.7.3",
   "description": "wangEditor - 轻量级 web 富文本编辑器，配置方便，使用简单，开源免费",
   "homepage": "http://www.wangeditor.com/",
   "keywords": [
diff --git a/src/config/menus.ts b/src/config/menus.ts
index c53c6ff5c..820e397f2 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 21eb17a5a..502696297 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 35e76ffad..8e780112e 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<ChildNode> | undefined =
-                editor.selection.getRange()?.commonAncestorContainer.childNodes
+            const childList: NodeListOf<ChildNode> | 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 2b49406cc..2423d015a 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\-.,@?^=%&amp;:/~+#]*[\w\-@?^=%&amp;/~+#])?/
+export const urlRegex = /^(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-.,@?^=%&amp;:/~+#]*[\w\-@?^=%&amp;/~+#])?/
 
 // 编辑器为了方便继续输入/换行等原因 主动生成的空标签
 export const EMPTY_P = '<p data-we-empty-p=""><br></p>'

From cebf20a79df1f979376f27eee128ae3c95a4a4eb Mon Sep 17 00:00:00 2001
From: shi-lai-mu <478889187@qq.com>
Date: Sat, 5 Jun 2021 00:30:46 +0800
Subject: [PATCH 12/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A1=8C?=
 =?UTF-8?q?=E5=86=85code=E5=9B=9E=E8=BD=A6=E5=90=8E=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=8F=8A=E6=8F=92=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/menus.ts                               | 14 ++++++++------
 src/lib/simplehtmlparser.js                       |  3 ++-
 src/menus/code/bind-event/jump-code-block-down.ts |  5 +++--
 src/menus/code/create-panel-conf.ts               |  9 +++++----
 src/menus/lineHeight/index.ts                     |  4 ++--
 src/text/event-hooks/enter-to-create-p.ts         | 15 +++++++++++++--
 src/utils/const.ts                                |  3 ++-
 src/utils/dom-core.ts                             |  2 +-
 test/unit/text/enter-to-create-p.test.ts          |  2 +-
 9 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/src/config/menus.ts b/src/config/menus.ts
index 820e397f2..c53c6ff5c 100644
--- a/src/config/menus.ts
+++ b/src/config/menus.ts
@@ -182,9 +182,10 @@ export default {
             // type -> 'emoji' / 'image'
             type: 'emoji',
             // content -> 数组
-            content: '😀 😃 😄 😁 😆 😅 😂 🤣 😊 😇 🙂 🙃 😉 😌 😍 😘 😗 😙 😚 😋 😛 😝 😜 🤓 😎 😏 😒 😞 😔 😟 😕 🙁 😣 😖 😫 😩 😢 😭 😤 😠 😡 😳 😱 😨 🤗 🤔 😶 😑 😬 🙄 😯 😴 😷 🤑 😈 🤡 💩 👻 💀 👀 👣'.split(
-                /\s/
-            ),
+            content:
+                '😀 😃 😄 😁 😆 😅 😂 🤣 😊 😇 🙂 🙃 😉 😌 😍 😘 😗 😙 😚 😋 😛 😝 😜 🤓 😎 😏 😒 😞 😔 😟 😕 🙁 😣 😖 😫 😩 😢 😭 😤 😠 😡 😳 😱 😨 🤗 🤔 😶 😑 😬 🙄 😯 😴 😷 🤑 😈 🤡 💩 👻 💀 👀 👣'.split(
+                    /\s/
+                ),
         },
         {
             // tab 的标题
@@ -192,9 +193,10 @@ 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 502696297..21eb17a5a 100644
--- a/src/lib/simplehtmlparser.js
+++ b/src/lib/simplehtmlparser.js
@@ -61,7 +61,8 @@ 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/code/bind-event/jump-code-block-down.ts b/src/menus/code/bind-event/jump-code-block-down.ts
index a1845bddd..dbb5b9ade 100644
--- a/src/menus/code/bind-event/jump-code-block-down.ts
+++ b/src/menus/code/bind-event/jump-code-block-down.ts
@@ -41,9 +41,10 @@ export default function bindEventJumpCodeBlock(editor: Editor) {
             if ($preElem.length && $preElem?.getNodeName() === 'PRE' && $nextElem.length === 0) {
                 // 光标处于选区开头
                 if (selection.getCursorPos() === 0) {
-                    // 按下delete键阻止默认行为
+                    // 按下delete键时末尾追加空行
                     if (e.keyCode === 8) {
-                        e.preventDefault()
+                        const $emptyP = $(EMPTY_P)
+                        $textElem.append($emptyP)
                     }
                 }
             }
diff --git a/src/menus/code/create-panel-conf.ts b/src/menus/code/create-panel-conf.ts
index e531ef32a..4f1b57bf0 100644
--- a/src/menus/code/create-panel-conf.ts
+++ b/src/menus/code/create-panel-conf.ts
@@ -17,9 +17,8 @@ export default function (editor: Editor, text: string, languageType: string): Pa
     const btnOkId = getRandom('btn-ok')
 
     /**
-     * 插入链接
+     * 插入代码块
      * @param text 文字
-     * @param code 链接
      */
     function insertCode(text: string): void {
         // 选区处于链接中，则选中整个菜单，再执行 insertHTML
@@ -39,8 +38,10 @@ export default function (editor: Editor, text: string, languageType: string): Pa
         const $codeElem = $code?.getNodeTop(editor)
 
         // 通过dom操作添加换行标签
-        // @ts-ignore
-        $(EMPTY_P).insertAfter($codeElem)
+        if ($codeElem?.getNextSibling().elems.length === 0) {
+            // @ts-ignore
+            $(EMPTY_P).insertAfter($codeElem)
+        }
     }
 
     /**
diff --git a/src/menus/lineHeight/index.ts b/src/menus/lineHeight/index.ts
index 8e780112e..35e76ffad 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<ChildNode> | undefined = editor.selection.getRange()
-                ?.commonAncestorContainer.childNodes
+            const childList: NodeListOf<ChildNode> | 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/text/event-hooks/enter-to-create-p.ts b/src/text/event-hooks/enter-to-create-p.ts
index b4a79223d..6173886bc 100644
--- a/src/text/event-hooks/enter-to-create-p.ts
+++ b/src/text/event-hooks/enter-to-create-p.ts
@@ -4,6 +4,7 @@
  */
 
 import Editor from '../../editor/index'
+import { EMPTY_P } from '../../utils/const'
 import $, { DomElement } from '../../utils/dom-core'
 
 /**
@@ -14,7 +15,7 @@ import $, { DomElement } from '../../utils/dom-core'
  */
 function enterToCreateP(editor: Editor, enterUpEvents: Function[], enterDownEvents: Function[]) {
     function insertEmptyP($selectionElem: DomElement) {
-        const $p = $('<p><br></p>')
+        const $p = $(EMPTY_P)
         $p.insertBefore($selectionElem)
         if ($selectionElem.html().indexOf('<img') >= 0) {
             // 有图片的回车键弹起时
@@ -36,7 +37,17 @@ function enterToCreateP(editor: Editor, enterUpEvents: Function[], enterDownEven
         if ($parentElem.html() === '<code><br></code>') {
             // 回车之前光标所在一个 <p><code>.....</code></p> ，忽然回车生成一个空的 <p><code><br></code></p>
             // 而且继续回车跳不出去，因此只能特殊处理
-            insertEmptyP($selectionElem)
+            insertEmptyP($parentElem)
+            return
+        }
+
+        if (
+            $selectionElem.getNodeName() === 'FONT' &&
+            $selectionElem.text() === '' &&
+            $selectionElem.attr('face') === 'monospace'
+        ) {
+            // 行内code回车时会产生一个<font face="monospace"><br></font>，导致样式问题
+            insertEmptyP($parentElem)
             return
         }
 
diff --git a/src/utils/const.ts b/src/utils/const.ts
index 2423d015a..2b49406cc 100644
--- a/src/utils/const.ts
+++ b/src/utils/const.ts
@@ -6,7 +6,8 @@
 export function EMPTY_FN() {}
 
 //用于校验是否为url格式字符串
-export const urlRegex = /^(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-.,@?^=%&amp;:/~+#]*[\w\-@?^=%&amp;/~+#])?/
+export const urlRegex =
+    /^(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-.,@?^=%&amp;:/~+#]*[\w\-@?^=%&amp;/~+#])?/
 
 // 编辑器为了方便继续输入/换行等原因 主动生成的空标签
 export const EMPTY_P = '<p data-we-empty-p=""><br></p>'
diff --git a/src/utils/dom-core.ts b/src/utils/dom-core.ts
index 1176c2810..a8411f780 100644
--- a/src/utils/dom-core.ts
+++ b/src/utils/dom-core.ts
@@ -748,7 +748,7 @@ export class DomElement<T extends DomElementSelector = DomElementSelector> {
         }
         return this.forEach(elem => {
             const parent = referenceNode.parentNode as Node
-            parent.insertBefore(elem, referenceNode)
+            parent?.insertBefore(elem, referenceNode)
         })
     }
 
diff --git a/test/unit/text/enter-to-create-p.test.ts b/test/unit/text/enter-to-create-p.test.ts
index c462c6897..27b7356bb 100644
--- a/test/unit/text/enter-to-create-p.test.ts
+++ b/test/unit/text/enter-to-create-p.test.ts
@@ -143,7 +143,7 @@ describe('editor.text event-hooks tab-to-space test', () => {
             fn()
         })
 
-        expect(editor.$textElem.elems[0].innerHTML.indexOf('<p><br></p>')).toBeGreaterThanOrEqual(0)
+        expect(editor.$textElem.elems[0].innerHTML.indexOf(EMPTY_P)).toBeGreaterThanOrEqual(0)
     })
 
     test('当编辑器选区内容 $textElm，执行enter down，插入 <p><br></p>', () => {

From 371d7dd45cee907b47f40ca7db9582c9f36f2fc7 Mon Sep 17 00:00:00 2001
From: luochao <651644100@qq.com>
Date: Thu, 17 Jun 2021 22:13:23 +0800
Subject: [PATCH 13/13] release: v4.7.4

---
 CHANGELOG.md                  |  8 ++++++++
 package.json                  |  2 +-
 src/config/menus.ts           | 14 ++++++--------
 src/lib/simplehtmlparser.js   |  3 +--
 src/menus/lineHeight/index.ts |  4 ++--
 src/utils/const.ts            |  3 +--
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46b887926..246be5711 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [4.7.4](https://github.com/wangeditor-team/wangEditor/compare/v4.7.3...v4.7.4) (2021-06-17)
+
+
+### Bug Fixes
+
+* 修复行内code回车后导致样式及插入问题 ([cebf20a](https://github.com/wangeditor-team/wangEditor/commit/cebf20a79df1f979376f27eee128ae3c95a4a4eb))
+* 修复a标签包裹img的 取消链接 问题 ([23eb557](https://github.com/wangeditor-team/wangEditor/commit/23eb557a5dabcdc6201753695a8590dec539fe9e))
+
 ## [4.7.3](https://github.com/wangeditor-team/wangEditor/compare/v4.7.2...v4.7.3) (2021-06-10)
 
 
diff --git a/package.json b/package.json
index 222118643..30e097cc7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wangeditor",
-  "version": "4.7.3",
+  "version": "4.7.4",
   "description": "wangEditor - 轻量级 web 富文本编辑器，配置方便，使用简单，开源免费",
   "homepage": "http://www.wangeditor.com/",
   "keywords": [
diff --git a/src/config/menus.ts b/src/config/menus.ts
index c53c6ff5c..820e397f2 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 21eb17a5a..502696297 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 35e76ffad..8e780112e 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<ChildNode> | undefined =
-                editor.selection.getRange()?.commonAncestorContainer.childNodes
+            const childList: NodeListOf<ChildNode> | 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 2b49406cc..2423d015a 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\-.,@?^=%&amp;:/~+#]*[\w\-@?^=%&amp;/~+#])?/
+export const urlRegex = /^(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-.,@?^=%&amp;:/~+#]*[\w\-@?^=%&amp;/~+#])?/
 
 // 编辑器为了方便继续输入/换行等原因 主动生成的空标签
 export const EMPTY_P = '<p data-we-empty-p=""><br></p>'