From 9d6c1ea86d7354f61b8fe31da814deeb029c24f6 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 7 Aug 2020 17:43:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=AB=98=E7=BA=A7=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=89=8D=E7=AB=AF=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/test/components/ApiKeyValue.vue       | 28 ++--------------
 .../api/test/model/ScenarioModel.js           | 33 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/ApiKeyValue.vue b/frontend/src/business/components/api/test/components/ApiKeyValue.vue
index f1760ff972..595dd58185 100644
--- a/frontend/src/business/components/api/test/components/ApiKeyValue.vue
+++ b/frontend/src/business/components/api/test/components/ApiKeyValue.vue
@@ -85,8 +85,7 @@
 <script>
 import {KeyValue} from "../model/ScenarioModel";
 import {MOCKJS_FUNC} from "@/common/js/constants";
-import Mock from "mockjs";
-import {funcFilters} from "@/common/js/func-filter";
+import {calculate} from "@/business/components/api/test/model/ScenarioModel";
 
 export default {
   name: "MsApiKeyValue",
@@ -171,30 +170,7 @@ export default {
       };
     },
     showPreview(itemValue) {
-      if (!itemValue) {
-        return;
-      }
-      try {
-        let funcs = itemValue.split("|");
-        let value = Mock.mock(funcs[0].trim());
-        if (funcs.length === 1) {
-          this.itemValuePreview = value;
-          return value;
-        }
-        for (let i = 1; i < funcs.length; i++) {
-          let func = funcs[i].trim();
-          let args = func.split(":");
-          let strings = [];
-          if (args[1]) {
-            strings = args[1].split(",");
-          }
-          value = funcFilters[args[0].trim()](value, ...strings);
-        }
-        this.itemValuePreview = value;
-        return value;
-      } catch (e) {
-        this.itemValuePreview = itemValue;
-      }
+      this.itemValuePreview = calculate(itemValue);
     },
     appendFunc(func) {
       if (this.itemValue) {
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index 76b03cc935..d4f6f75585 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -1,5 +1,6 @@
 import {
-  Arguments, CookieManager,
+  Arguments,
+  CookieManager,
   DubboSample,
   DurationAssertion,
   Element,
@@ -18,6 +19,8 @@ import {
   ThreadGroup,
   XPath2Extractor,
 } from "./JMX";
+import Mock from "mockjs";
+import {funcFilters} from "@/common/js/func-filter";
 
 export const uuid = function () {
   let d = new Date().getTime()
@@ -35,6 +38,31 @@ export const uuid = function () {
   });
 }
 
+export const calculate = function (itemValue) {
+  if (!itemValue) {
+    return;
+  }
+  try {
+    let funcs = itemValue.split("|");
+    let value = Mock.mock(funcs[0].trim());
+    if (funcs.length === 1) {
+      return value;
+    }
+    for (let i = 1; i < funcs.length; i++) {
+      let func = funcs[i].trim();
+      let args = func.split(":");
+      let strings = [];
+      if (args[1]) {
+        strings = args[1].split(",");
+      }
+      value = funcFilters[args[0].trim()](value, ...strings);
+    }
+    return value;
+  } catch (e) {
+    return itemValue;
+  }
+}
+
 export const BODY_TYPE = {
   KV: "KeyValue",
   FORM_DATA: "Form Data",
@@ -885,6 +913,9 @@ class JMXGenerator {
 
   addRequestArguments(httpSamplerProxy, request) {
     let args = this.filterKV(request.parameters);
+    args.forEach(arg => {
+      arg.value = calculate(arg.value);
+    });
     if (args.length > 0) {
       httpSamplerProxy.add(new HTTPSamplerArguments(args));
     }