Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager

package.json

@@ -67,8 +67,8 @@
     "redux": "^4.0.1",
     "swiper": "^5.3.6",
     "umi": "^2.13.3",
-    "umi-plugin-pro-block": "^1.3.2",
-    "umi-plugin-react": "^1.9.5",
+    "umi-plugin-pro-block": "^1.3.6",
+    "umi-plugin-react": "^1.15.3",
     "umi-request": "^1.0.8",
     "wangeditor": "^3.1.1"
   },
@@ -108,10 +108,10 @@
     "pro-download": "1.0.1",
     "slash2": "^2.0.0",
     "stylelint": "^10.1.0",
-    "umi-plugin-ga": "^1.1.3",
-    "umi-plugin-pro": "^1.0.2",
+    "umi-plugin-ga": "^1.1.6",
+    "umi-plugin-pro": "^1.0.3",
     "umi-types": "^0.3.8",
-    "webpack-theme-color-replacer": "^1.2.15"
+    "webpack-theme-color-replacer": "^1.3.7"
   },
   "optionalDependencies": {
     "puppeteer": "^1.17.0"

src/components/Wangedit/Wangedit.jsx

@@ -70,6 +70,7 @@ class Wangedit extends React.Component {
         /<[a-zA-Z0-9]+\:[^>]+>[^>]*<\/[a-zA-Z0-9]+\:[^>]+>/ig,
         /<[a-zA-Z0-9]+\:[^>]+\/>/ig,
         /<style>[\s\S]*?<\/style>/ig,
+        new RegExp('\u2029', 'ig'),     // 替换word分隔符 序号 8233
       ]
 
       return regs.reduce((acc, reg) => {