From b6bd7e1744a519b580cb5e6f7e0540874fbb6151 Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Sat, 16 Sep 2023 13:25:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/application/mk/libs/function/form.js | 11 +++++++++--
 src/application/mk/libs/function/funs.js | 22 ++++++++++++++++------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/application/mk/libs/function/form.js b/src/application/mk/libs/function/form.js
index c19297d..2a307ed 100644
--- a/src/application/mk/libs/function/form.js
+++ b/src/application/mk/libs/function/form.js
@@ -24,16 +24,23 @@ export default {
                             saveField = rule.dataRule.saveField;
                         }
                         if (rule.dataRule.type == "integer") { // 如果是整数
-                            if (isNaN(value)) {
+                            if (!value) {
                                 value = 0;
                             }
                             data[saveField] = parseInt(value); // 转换为整数
                         }
                         else if (rule.dataRule.type == "number" || rule.dataRule.type == "float") { // 如果是整数
+                            if (!value) {
+                                value = 0;
+                            }
                             data[saveField] = parseFloat(value); // 转换为整数
                         }
                         else if (rule.dataRule.type == "timestamp") { // 如果是时间戳
-                            data[saveField] = parseInt(new Date(value).getTime() / 1000); // 转换为时间戳
+                            if (!value) {
+                                data[saveField] = 0;
+                            }else{
+                                data[saveField] = parseInt(new Date(value).getTime() / 1000); // 转换为时间戳
+                            } 
                         }
                         else if (rule.dataRule.type == "string") { // 如果是字符串
                             if (data[saveField] === true) {
diff --git a/src/application/mk/libs/function/funs.js b/src/application/mk/libs/function/funs.js
index 83c178c..aabe047 100644
--- a/src/application/mk/libs/function/funs.js
+++ b/src/application/mk/libs/function/funs.js
@@ -124,29 +124,39 @@ export default {
           
       
           if (rule.type == "integer") {
-            if(isNaN(value) ){
+            if(!value ){
               value = 0;
             }
             item[rule.field] = parseInt(value);
+           
 
             
           }
           else if (rule.type == "number" || rule.type == "float") {
+            if(!value ){
+              value = 0;
+            }
             item[rule.field] = parseFloat(value);
           }
           else if (rule.type == "timestamp") {
             if (value) {
-              if (typeof (value) == 'string') {
+              if (typeof (value) == 'string') { 
                 item[rule.field] = parseInt(new Date(value).getTime() / 1000);
-              }
-
+              } 
+            }else{
+              item[rule.field] = 0;
             }
 
           }
           else if (rule.type == "bigint") {
-            if (typeof (item[rule.field]) == 'string') {
-              item[rule.field] = JSONbig.parse(`{"v":${item[rule.field]}}`).v;
+            if(!item[rule.field]){
+              item[rule.field] = 0;
+            }else{
+              if (typeof (item[rule.field]) == 'string') {
+                item[rule.field] = JSONbig.parse(`{"v":${item[rule.field]}}`).v;
+              }
             }
+           
 
           }