From 3370bebad1b42c61ffcea0c17582426e022d67b4 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 11 七月 2024 15:07:37 +0800
Subject: [PATCH] 合并
---
static/js/worker.js | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/static/js/worker.js b/static/js/worker.js
index ff5df25..ef9479a 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -96,7 +96,8 @@
if(res.includes('/')){
return handleMoreParam(res,m.split('=')[1],'=')
}else{
- return res.trim() == str.trim()
+ // console.log(res.trim().replace(/[.,銆傘�侊紱锛�'";?锛熲�滐紝]/g, ''),' == ',str.trim().replace(/[.,銆傘�侊紱锛�'";?锛熲�滐紝]/g, ''))
+ return res.trim().replace(/[.,銆傘�侊紱锛�'";?锛熲�滐紝]/g, '') == str.trim().replace(/[.,銆傘�侊紱锛�'";?锛熲�滐紝]/g, '')
}
}else{
return eval(res) == eval(str)
@@ -192,6 +193,7 @@
}
})
}
+ console.log(tableList)
}
result = {
method:'saveInsContext',
@@ -316,36 +318,36 @@
* @returns 杩斿洖甯冨皵鍊硷紝濡傛灉res涓瘡涓�椤归兘婊¤冻涓巗tr鐨勬瘮杈冩潯浠讹紝鍒欒繑鍥瀟rue锛屽惁鍒欒繑鍥瀎alse
*/
function handleMoreParam(res,str,comp){
- let arr = res.split('/')
- let arr0 = arr.every(item=>{
- switch (comp){
- case '>':
- return item > handleFraction(str)
- case '<':
- return item < handleFraction(str)
- case '=':
- return item == handleFraction(str)
- case '鈮�':
- return item >= handleFraction(str)
- case '鈮�':
- return item <= handleFraction(str)
- case '卤':
- let k = str.split('卤')
- return item >= eval((handleFraction(k[0]) - handleFraction(k[1]))) && item <= eval((handleFraction(k[0]) + handleFraction(k[1])))
- case '~':
- let j = str.split('~')
- return item >= eval(handleFraction((j[0]))) && item <= eval(handleFraction(j[1]))
- case '-':
- let o = str.split('-')
- return item >= eval(handleFraction(o[0])) && item <= eval(handleFraction(o[1]))
+ let arr = res.split('/')
+ let arr0 = arr.every(item=>{
+ switch (comp){
+ case '>':
+ return item > handleFraction(str)
+ case '<':
+ return item < handleFraction(str)
+ case '=':
+ return item == handleFraction(str)
+ case '鈮�':
+ return item >= handleFraction(str)
+ case '鈮�':
+ return item <= handleFraction(str)
+ case '卤':
+ let k = str.split('卤')
+ return item >= eval((handleFraction(k[0]) - handleFraction(k[1]))) && item <= eval((handleFraction(k[0]) + handleFraction(k[1])))
+ case '~':
+ let j = str.split('~')
+ return item >= eval(handleFraction((j[0]))) && item <= eval(handleFraction(j[1]))
+ case '-':
+ let o = str.split('-')
+ return item >= eval(handleFraction(o[0])) && item <= eval(handleFraction(o[1]))
+ }
+ })
+ if(arr0){
+ return true
+ }else{
+ return false
}
- })
- if(arr0){
- return true
- }else{
- return false
}
-}
/**
* 鑾峰彇鍙傛暟
@@ -753,9 +755,7 @@
}
if(str.includes('&"/"&')){
return str.replaceAll('&"/"&', '/').replaceAll('//','')
- }else if(str.includes('/')){
- return str
- }else{
+ }else {
return eval(str)
}
} catch (error) {
--
Gitblit v1.9.3