From f55f309851c214403c3532372db4fa3331592207 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 09 二月 2023 14:54:12 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils-datamanage.js | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 14883d2..29651eb 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -145,8 +145,8 @@
_customScript = _customScript.replace(/\$sum@/ig, '/*')
_customScript = _customScript.replace(/@sum\$/ig, '*/')
- _dataresource = _dataresource.replace(/@ID@/ig, `''`)
- _customScript = _customScript.replace(/@ID@/ig, `''`)
+ // _dataresource = _dataresource.replace(/@ID@/ig, `''`)
+ // _customScript = _customScript.replace(/@ID@/ig, `''`)
_dataresource = _dataresource.replace(/@BID@/ig, `'${BID || ''}'`)
_customScript = _customScript.replace(/@BID@/ig, `'${BID || ''}'`)
_dataresource = _dataresource.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
@@ -348,8 +348,8 @@
_customScript = _customScript.replace(/\$select@/ig, '/*')
_customScript = _customScript.replace(/@select\$/ig, '*/')
- _dataresource = _dataresource.replace(/@ID@/ig, `''`)
- _customScript = _customScript.replace(/@ID@/ig, `''`)
+ // _dataresource = _dataresource.replace(/@ID@/ig, `''`)
+ // _customScript = _customScript.replace(/@ID@/ig, `''`)
_dataresource = _dataresource.replace(/@BID@/ig, `'${BID || ''}'`)
_customScript = _customScript.replace(/@BID@/ig, `'${BID || ''}'`)
_dataresource = _dataresource.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
--
Gitblit v1.8.0