From 0cf1b2319156b96e65e56e50345716adb99f26bf Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 13 八月 2024 17:40:35 +0800
Subject: [PATCH] 通信初始化提交
---
static/js/worker.js | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/static/js/worker.js b/static/js/worker.js
index f8d2e8d..b5ffbfa 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -12,6 +12,7 @@
}
let param = null
let currentTable = ''
+let getDataTypeId = null
self.onmessage = function(event) {
const data = JSON.parse(event.data);
if(currentTable!=data.currentTable){
@@ -30,6 +31,11 @@
return
}
code = data.code;
+ if(data.getDataTypeId){
+ getDataTypeId = data.getDataTypeId
+ }else{
+ getDataTypeId = null
+ }
if(tableList){
let str = code.split('-')
let r = str[1]
@@ -292,11 +298,17 @@
// console.log(5555,tableList)
}
// console.log('1234567789', tableList,getParam())
+ // console.log('1234567789', item)
+ let getDataType0 = false
+ if(item.i==getDataTypeId){
+ getDataType0 = true
+ }
result = {
method:'saveInsContext',
value:{
tableList,
- param:getParam()
+ param:getParam(),
+ getDataTypeId:getDataType0?getDataTypeId:''
}
}
self.postMessage(JSON.stringify(result))
@@ -313,7 +325,7 @@
isPoint = PROJECT=='瑁呭鐢电紗'&&tell&&tell.length>0&&typeof tell[0] =='string'&&tell[0].includes('/') // 鍒ゆ柇瑕佹眰鍊兼槸鍚︿负鍒嗘暟
comResult = compute(item.v.f.replace(/=/g, ' '),comValue, isPoint)
let list3 = list2.map(item=>item+'')
- isToExponential = list3.some(val => val.includes('e+'))
+ isToExponential = list3.some(val => val.includes('e+')||val.includes('e-'))
// 瑁呭椤圭洰妫�楠屽�艰浆鍖�
if (PROJECT === '瑁呭鐢电紗' && isToExponential) {
let num2 = new Big(comResult)
@@ -356,6 +368,8 @@
let str = a[b].v.ct.fa.split('.')[1]
num = str.length
a[b].v.v = comResult?Number(comResult).toFixed(num):comResult
+ }else if(typeof comResult == 'string' && (comResult.includes('e+')|| comResult.includes('e-'))){
+ a[b].v.v = comResult
}else{
let val = parseFloat(Number(comResult).toFixed(3))
a[b].v.v = isNaN(val) ? comResult : val
--
Gitblit v1.9.3