Merge remote-tracking branch 'origin/master'

8978c94f · wujj · 0e8d961b · 030b13a0 · 8978c94f
Commit 8978c94f authored Nov 21, 2020 by wujj
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

form.ftl src/main/webapp/WEB-INF/manager/cms/category/form.ftl +1 -1

No files found.
--- a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
@@ -378,7 +378,7 @@
                this.rules.categoryPinyin =  [{
                    "validator": this.validatorCategoryPinyin, trigger: 'blur'
                }, {
-                    "pattern": /^[^[!@#$"'%^&*()_+-/~?！@#￥%…&*（）——+—？》《：“‘’]+$/,
+                    "pattern": /^[^[!@#$"'%^&*()_+-/~?！\\、@#￥%…&*（）——+—？》《：“‘’\s]+$/,
                    "message": "拼音格式不匹配"
                }];
                if (this.regularCheck(regu, n)) {