From 31dc2e48e8f9b198b602d661e577e78db4e3d86a Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 27 Sep 2022 17:12:04 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=99=BB=E5=BD=95=E9=99=90=E5=88=B6):=20?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E7=99=BB=E5=BD=95=E6=AC=A1=E6=95=B0=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=E4=BF=9D=E5=AD=98=E5=90=8E=E5=86=8D=E6=AC=A1=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=87=BA=E7=8E=B0=E9=AA=8C=E8=AF=81=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/system/SysParam/BasicSetting.vue    | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/frontend/src/views/system/SysParam/BasicSetting.vue b/frontend/src/views/system/SysParam/BasicSetting.vue
index 82897bb59d..369608b71b 100644
--- a/frontend/src/views/system/SysParam/BasicSetting.vue
+++ b/frontend/src/views/system/SysParam/BasicSetting.vue
@@ -152,18 +152,11 @@ export default {
           }
         ],
         limitTimes: [
-          {
-            pattern: '^([1-9]|[1-9]\\d|100)$',
-            message: this.$t('system_parameter_setting.limit_times_error'),
-            trigger: 'blur'
-          }
+
+          { validator: this.validateNumber, trigger: 'blur' }
         ],
         relieveTimes: [
-          {
-            pattern: '^([1-9]|[1-9]\\d|100)$',
-            message: this.$t('system_parameter_setting.relieve_times_error'),
-            trigger: 'blur'
-          }
+          { validator: this.validateNumber, trigger: 'blur' }
         ]
       },
       originLoginType: null
@@ -193,6 +186,17 @@ export default {
     this.query()
   },
   methods: {
+    validateNumber(rule, value, callback) {
+      if (value != null && value !== '') {
+        const reg = new RegExp('^([1-9]|[1-9]\\d|100)$')
+        if (!reg.test(value)) {
+          const msg = this.$t('system_parameter_setting.relieve_times_error')
+          callback(new Error(msg))
+          return
+        }
+      }
+      callback()
+    },
     query() {
       basicInfo().then((response) => {
         this.formInline = response.data