浏览代码

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

魏超 5 年前
父节点
当前提交
7138191c55
共有 2 个文件被更改,包括 6 次插入5 次删除
  1. 5
    5
      package.json
  2. 1
    0
      src/components/Wangedit/Wangedit.jsx

+ 5
- 5
package.json 查看文件

67
     "redux": "^4.0.1",
67
     "redux": "^4.0.1",
68
     "swiper": "^5.3.6",
68
     "swiper": "^5.3.6",
69
     "umi": "^2.13.3",
69
     "umi": "^2.13.3",
70
-    "umi-plugin-pro-block": "^1.3.2",
71
-    "umi-plugin-react": "^1.9.5",
70
+    "umi-plugin-pro-block": "^1.3.6",
71
+    "umi-plugin-react": "^1.15.3",
72
     "umi-request": "^1.0.8",
72
     "umi-request": "^1.0.8",
73
     "wangeditor": "^3.1.1"
73
     "wangeditor": "^3.1.1"
74
   },
74
   },
108
     "pro-download": "1.0.1",
108
     "pro-download": "1.0.1",
109
     "slash2": "^2.0.0",
109
     "slash2": "^2.0.0",
110
     "stylelint": "^10.1.0",
110
     "stylelint": "^10.1.0",
111
-    "umi-plugin-ga": "^1.1.3",
112
-    "umi-plugin-pro": "^1.0.2",
111
+    "umi-plugin-ga": "^1.1.6",
112
+    "umi-plugin-pro": "^1.0.3",
113
     "umi-types": "^0.3.8",
113
     "umi-types": "^0.3.8",
114
-    "webpack-theme-color-replacer": "^1.2.15"
114
+    "webpack-theme-color-replacer": "^1.3.7"
115
   },
115
   },
116
   "optionalDependencies": {
116
   "optionalDependencies": {
117
     "puppeteer": "^1.17.0"
117
     "puppeteer": "^1.17.0"

+ 1
- 0
src/components/Wangedit/Wangedit.jsx 查看文件

70
         /<[a-zA-Z0-9]+\:[^>]+>[^>]*<\/[a-zA-Z0-9]+\:[^>]+>/ig,
70
         /<[a-zA-Z0-9]+\:[^>]+>[^>]*<\/[a-zA-Z0-9]+\:[^>]+>/ig,
71
         /<[a-zA-Z0-9]+\:[^>]+\/>/ig,
71
         /<[a-zA-Z0-9]+\:[^>]+\/>/ig,
72
         /<style>[\s\S]*?<\/style>/ig,
72
         /<style>[\s\S]*?<\/style>/ig,
73
+        new RegExp('\u2029', 'ig'),     // 替换word分隔符 序号 8233
73
       ]
74
       ]
74
 
75
 
75
       return regs.reduce((acc, reg) => {
76
       return regs.reduce((acc, reg) => {