From a5573315a1d36e3ee643b60d0d88a1b2427c2b55 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 24 Dec 2021 10:14:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DEMAIL=E7=B1=BB=E5=9E=8B?=
=?UTF-8?q?=E5=9B=9E=E9=80=80=E9=94=AE=E8=A2=AB=E7=A6=81=E6=AD=A2=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../static/ajax/libs/bootstrap-fileinput/fileinput.js | 8 ++++----
ruoyi-admin/src/main/resources/static/ruoyi/js/common.js | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.js b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.js
index 06688e54..f52cf3d7 100644
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.js
@@ -46,10 +46,10 @@
}
if (!document.currentScript) {
- document.currentScript = function() {
- var scripts = document.getElementsByTagName('script');
- return scripts[scripts.length - 1];
- }();
+ document.currentScript = function() {
+ var scripts = document.getElementsByTagName('script');
+ return scripts[scripts.length - 1];
+ }();
}
var $h, FileInput, getLoadingUrl = function () {
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
index aa431481..06808472 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
@@ -511,7 +511,7 @@ window.onload = function() {
return _stopIt(event);
}
var type_e = elem.type.toUpperCase();
- if (name == 'INPUT' && (type_e != 'TEXT' && type_e != 'TEXTAREA' && type_e != 'PASSWORD' && type_e != 'FILE' && type_e != 'SEARCH' && type_e != 'NUMBER')) {
+ if (name == 'INPUT' && (type_e != 'TEXT' && type_e != 'TEXTAREA' && type_e != 'PASSWORD' && type_e != 'FILE' && type_e != 'SEARCH' && type_e != 'NUMBER' && type_e != 'EMAIL')) {
return _stopIt(event);
}
if (name == 'INPUT' && (elem.readOnly == true || elem.disabled == true)) {