From c581ecd0f0aac00005c2442c441257e0b4674f21 Mon Sep 17 00:00:00 2001
From: cdswyda <cdswyda@gmail.com>
Date: Wed, 29 Sep 2021 11:36:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(dataVerificationCtrl):=20=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E6=97=B6=E6=96=87=E6=9C=AC=E9=95=BF=E5=BA=A6=E5=BA=94=E4=B8=BA?=
 =?UTF-8?q?=E5=A4=A7=E4=BA=8E=E7=AD=89=E4=BA=8E0=E7=9A=84=E6=95=B4?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/dataVerificationCtrl.js | 9 +++++++++
 src/locale/en.js                        | 1 +
 src/locale/es.js                        | 1 +
 src/locale/zh.js                        | 1 +
 src/locale/zh_tw.js                     | 1 +
 5 files changed, 13 insertions(+)

diff --git a/src/controllers/dataVerificationCtrl.js b/src/controllers/dataVerificationCtrl.js
index b58680c..a84f12a 100644
--- a/src/controllers/dataVerificationCtrl.js
+++ b/src/controllers/dataVerificationCtrl.js
@@ -713,6 +713,11 @@ const dataVerificationCtrl = {
                     return;
                 }
 
+                if (!Number.isInteger(Number(value1)) || Number(value1) < 0) {
+                    tooltip.info('<i class="fa fa-exclamation-triangle"></i>', dvText.textlengthInteger);
+                    return;
+                }
+
                 if(type2 == 'bw' || type2 == 'nb'){
                     value2 = $("#luckysheet-dataVerification-dialog .show-box-item-textLength .input:visible .data-verification-value2").val().trim();
                 
@@ -720,6 +725,10 @@ const dataVerificationCtrl = {
                         tooltip.info('<i class="fa fa-exclamation-triangle"></i>', dvText.tooltipInfo3);
                         return;
                     }
+                    if (!Number.isInteger(Number(value2)) || Number(value2) < 0) {
+                        tooltip.info('<i class="fa fa-exclamation-triangle"></i>', dvText.textlengthInteger);
+                        return;
+                    }
 
                     if(Number(value2) < Number(value1)){
                         tooltip.info('<i class="fa fa-exclamation-triangle"></i>', dvText.tooltipInfo4);
diff --git a/src/locale/en.js b/src/locale/en.js
index 10509d3..6744a1e 100644
--- a/src/locale/en.js
+++ b/src/locale/en.js
@@ -9792,6 +9792,7 @@ export default {
         tooltipInfo5: 'The text content cannot be empty',
         tooltipInfo6: 'The value entered is not a date type',
         tooltipInfo7: 'Date 2 cannot be less than date 1',
+        textlengthInteger: 'Text length must be an integer greater than or equal to 0',
     },
     formula:{
         sum:"Sum",
diff --git a/src/locale/es.js b/src/locale/es.js
index f5466e2..9074f30 100644
--- a/src/locale/es.js
+++ b/src/locale/es.js
@@ -9760,6 +9760,7 @@ export default {
         tooltipInfo5: 'El contenido del texto no puede estar vacío',
         tooltipInfo6: 'El valor ingresado no es una fecha',
         tooltipInfo7: 'La segunda fecha no puede ser menor que la primera',
+        textlengthInteger: 'La longitud del texto debe ser un entero mayor o igual a 0',
     },
     formula:{
         sum:"Suma",
diff --git a/src/locale/zh.js b/src/locale/zh.js
index c9f21a6..a811804 100644
--- a/src/locale/zh.js
+++ b/src/locale/zh.js
@@ -10020,6 +10020,7 @@ export default {
         tooltipInfo5: '文本内容不能为空',
         tooltipInfo6: '输入的值不是日期类型',
         tooltipInfo7: '日期2不能小于日期1',
+        textlengthInteger: '文本长度必须是大于等于0的整数',
     },
     formula:{
         sum:"求和",
diff --git a/src/locale/zh_tw.js b/src/locale/zh_tw.js
index 9069c0c..27637ae 100644
--- a/src/locale/zh_tw.js
+++ b/src/locale/zh_tw.js
@@ -10013,6 +10013,7 @@ export default {
         tooltipInfo5         : '文字內容不能為空',
         tooltipInfo6         : '輸入的值不是日期類型',
         tooltipInfo7         : '日期2不能小於日期1',
+        textlengthInteger    : '文字長度必須是大於等於0的整數',
     },
     formula: {
         sum       : "求和",