From defa824eab2350fd6abfd10abd8f4df94749e336 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 31 七月 2024 11:21:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 static/js/worker.js |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/static/js/worker.js b/static/js/worker.js
index e6e931f..28c9c74 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -339,8 +339,13 @@
                   try{
                     if(comResult==0){
                       a[b].v.v = 0
+                    }else if(a[b].v.ct&&a[b].v.ct.fa&&typeof a[b].v.ct.fa == 'string'&&a[b].v.ct.fa.includes('.')){
+                      let num = 0
+                      let str = n.v.ct.fa.split('.')[1]
+                      num = str.length
+                      a[b].v.v = comResult?Number(comResult).toFixed(num):0
                     }else{
-                      let val = parseFloat(comResult.toFixed(3))
+                      let val = parseFloat(Number(comResult).toFixed(3))
                       a[b].v.v = isNaN(val) ? '' : val
                     }
                   }catch(error){
@@ -857,7 +862,7 @@
     } else if (isPoint) {
       return str.replace('ABS', '').replace(/\(|\)/g, '')
     }else {
-      // console.log('str', str,eval(str))
+      // console.log('str', str)
       return eval(str)
     }
   } catch (error) {

--
Gitblit v1.9.3