From 01cf4b01233e5a752ce64d703a73c09ab2610858 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Tue, 8 Aug 2023 15:03:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DJS=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=EF=BC=8C=E5=8A=A8=E6=80=81=E5=8F=82=E6=95=B0=E4=B8=BA?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=BE=AA=E7=8E=AF=E6=AC=A1=E6=95=B0=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=EF=BC=8C=E5=80=BC=E8=BD=AC=E4=B8=BA=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=97=A0=E9=99=90?=
 =?UTF-8?q?=E5=BE=AA=E7=8E=AF=EF=BC=8C=E5=87=BA=E7=8E=B0=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E5=86=85=E5=AD=98=E6=BA=A2=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataSetManagement/src/JsEditForm.vue        |  7 ++++++-
 data-room-ui/packages/js/mixins/commonMixins.js | 17 +++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue b/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue
index 6f7f5d26..808bea88 100644
--- a/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue
@@ -641,7 +641,12 @@ export default {
         let scriptMethod = null
         try {
           const scriptAfterReplacement = javascript.replace(/\${(.*?)}/g, (match, p) => {
-            return `'${this.dataForm.config.paramsList.find(param => param.name === p).value}'`
+            const value = this.dataForm.config.paramsList.find(param => param.name === p).value
+            if (!isNaN(value)) {
+              return value
+            } else {
+              return `'${value}'`
+            }
           })
           // eslint-disable-next-line no-new-func
           scriptMethod = new Function(scriptAfterReplacement)
diff --git a/data-room-ui/packages/js/mixins/commonMixins.js b/data-room-ui/packages/js/mixins/commonMixins.js
index 26ddc205..e4112247 100644
--- a/data-room-ui/packages/js/mixins/commonMixins.js
+++ b/data-room-ui/packages/js/mixins/commonMixins.js
@@ -82,8 +82,13 @@ export default {
             if (res.data.datasetType === 'js') {
               try {
                 const scriptAfterReplacement = res.data.script.replace(/\${(.*?)}/g, (match, p) => {
-                // 根据parmas的key获取value
-                  return `'${this.config.dataSource?.params[p]}' || '${p}'`
+                  const value = this.config.dataSource?.params[p]
+
+                  if (!isNaN(value)) {
+                    return value || p
+                  } else {
+                    return `'${value}' || '${p}'`
+                  }
                 })
                 // eslint-disable-next-line no-new-func
                 const scriptMethod = new Function(scriptAfterReplacement)
@@ -129,8 +134,12 @@ export default {
             if (res.data.datasetType === 'js') {
               try {
                 const scriptAfterReplacement = res.data.script.replace(/\${(.*?)}/g, (match, p) => {
-                // 根据parmas的key获取value
-                  return `'${this.config.dataSource?.params[p]}' || '${p}'`
+                  const value = this.config.dataSource?.params[p]
+                  if (!isNaN(value)) {
+                    return value || p
+                  } else {
+                    return `'${value}' || '${p}'`
+                  }
                 })
                 // eslint-disable-next-line no-new-func
                 const scriptMethod = new Function(scriptAfterReplacement)