From da226cf76e95df26821f3a3e568a719f0397a53d Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 10 Aug 2020 14:59:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=98=BE=E7=A4=BAJmeter=E7=9A=84?=
 =?UTF-8?q?=E5=86=85=E7=BD=AE=E5=87=BD=E6=95=B0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/test/components/ApiKeyValue.vue       |  5 ++-
 .../api/test/model/ScenarioModel.js           |  4 ++
 frontend/src/common/js/constants.js           | 38 +++++++++++++++++++
 frontend/src/i18n/en-US.js                    |  7 ++--
 frontend/src/i18n/zh-CN.js                    |  1 +
 frontend/src/i18n/zh-TW.js                    |  7 ++--
 6 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/ApiKeyValue.vue b/frontend/src/business/components/api/test/components/ApiKeyValue.vue
index 4767c331d7..d3632a17d2 100644
--- a/frontend/src/business/components/api/test/components/ApiKeyValue.vue
+++ b/frontend/src/business/components/api/test/components/ApiKeyValue.vue
@@ -76,6 +76,7 @@
           </span>
           <p>{{ $t('api_test.request.parameters_filter_example') }}：@string(10) | md5 | substr: 1, 3</p>
           <p>{{ $t('api_test.request.parameters_filter_example') }}：@integer(1, 5) | concat:_metersphere</p>
+          <p><strong>{{ $t('api_test.request.parameters_filter_tips') }}</strong></p>
         </div>
       </div>
     </el-dialog>
@@ -84,7 +85,7 @@
 
 <script>
 import {KeyValue} from "../model/ScenarioModel";
-import {MOCKJS_FUNC} from "@/common/js/constants";
+import {JMETER_FUNC, MOCKJS_FUNC} from "@/common/js/constants";
 import {calculate} from "@/business/components/api/test/model/ScenarioModel";
 
 export default {
@@ -159,7 +160,7 @@ export default {
       };
     },
     funcSearch(queryString, cb) {
-      let funcs = MOCKJS_FUNC;
+      let funcs = MOCKJS_FUNC.concat(JMETER_FUNC);
       let results = queryString ? funcs.filter(this.funcFilter(queryString)) : funcs;
       // 调用 callback 返回建议列表的数据
       cb(results);
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index d4f6f75585..b67de06704 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -43,6 +43,10 @@ export const calculate = function (itemValue) {
     return;
   }
   try {
+    if (itemValue.trim().startsWith("${")) {
+      // jmeter 内置函数不做处理
+      return itemValue;
+    }
     let funcs = itemValue.split("|");
     let value = Mock.mock(funcs[0].trim());
     if (funcs.length === 1) {
diff --git a/frontend/src/common/js/constants.js b/frontend/src/common/js/constants.js
index 349daa7119..302477cd60 100644
--- a/frontend/src/common/js/constants.js
+++ b/frontend/src/common/js/constants.js
@@ -111,3 +111,41 @@ export const MOCKJS_FUNC = [
   {name: '@id'},
   {name: '@increment'}
 ]
+
+export const JMETER_FUNC = [
+  {name: "${__threadNum}"},
+  {name: "${__samplerName}"},
+  {name: "${__machineIP}"},
+  {name: "${__machineName}"},
+  {name: "${__time}"},
+  {name: "${__log}"},
+  {name: "${__logn}"},
+  {name: "${__StringFromFile}"},
+  {name: "${__FileToString}"},
+  {name: "${__CSVRead}"},
+  {name: "${__XPath}"},
+  {name: "${__counter}"},
+  {name: "${__intSum}"},
+  {name: "${__longSum}"},
+  {name: "${__Random}"},
+  {name: "${__RandomString}"},
+  {name: "${__UUID}"},
+  {name: "${__BeanShell}"},
+  {name: "${__javaScript}"},
+  {name: "${__jexl}"},
+  {name: "${__jexl2}"},
+  {name: "${__property}"},
+  {name: "${__P}"},
+  {name: "${__setProperty}"},
+  {name: "${__split}"},
+  {name: "${__V}"},
+  {name: "${__eval}"},
+  {name: "${__evalVar}"},
+  {name: "${__regexFunction}"},
+  {name: "${__escapeOroRegexpChars}"},
+  {name: "${__char}"},
+  {name: "${__unescape}"},
+  {name: "${__unescapeHtml}"},
+  {name: "${__escapeHtml}"},
+  {name: "${__TestPlanName}"},
+]
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 8bd5db7518..535d5572e8 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -387,6 +387,7 @@ export default {
       path_description: "etc：/login",
       parameters: "Query parameters",
       parameters_filter_example: "Example",
+      parameters_filter_tips: "Only support MockJs function result preview",
       parameters_advance: "Advanced parameter settings",
       parameters_preview: "Preview",
       parameters_preview_warning: "Please enter the template first",
@@ -497,9 +498,9 @@ export default {
     execution_result: ": Please select the execution result",
     actual_result: ": The actual result is empty",
     case: {
-      input_test_case:'Please enter the associated case name',
-      test_name:'TestName',
-      other:'--Other--',
+      input_test_case: 'Please enter the associated case name',
+      test_name: 'TestName',
+      other: '--Other--',
       test_case: "Case",
       move: "Move case",
       case_list: "Test case list",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 094949637a..6bce5031ee 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -387,6 +387,7 @@ export default {
       parameters_filter: "内置函数",
       parameters_filter_desc: "使用方法",
       parameters_filter_example: "示例",
+      parameters_filter_tips: "只支持 MockJs 函数结果预览",
       parameters_advance: "高级参数设置",
       parameters_preview: "预览",
       parameters_preview_warning: "请先输入模版",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 211873c9f7..eac1411442 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -386,6 +386,7 @@ export default {
       url_invalid: "URL無效",
       parameters: "請求參數",
       parameters_filter_example: "示例",
+      parameters_filter_tips: "只支持MockJs函數結果預覽",
       parameters_advance: "高級參數設置",
       parameters_preview: "預覽",
       parameters_preview_warning: "請先輸入模版",
@@ -496,9 +497,9 @@ export default {
     execution_result: ": 請選擇執行結果",
     actual_result: ": 實際結果為空",
     case: {
-      input_test_case:'請輸入關聯用例名稱',
-      test_name:'測試名稱',
-      other:'--其他--',
+      input_test_case: '請輸入關聯用例名稱',
+      test_name: '測試名稱',
+      other: '--其他--',
       test_case: "測試用例",
       move: "移動用例",
       case_list: "用例列表",