From 2478b81707a2e72a5627b1b1972fd4abfad9db16 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Thu, 3 Aug 2023 10:56:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E5=90=84=E4=B8=AA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=EF=BC=8C=E5=B0=86=E8=84=9A=E6=9C=AC=E7=9A=84?=
 =?UTF-8?q?=E8=A7=A3=E6=9E=90=E5=B9=B6=E8=BF=90=E8=A1=8C=E5=AD=97=E6=A0=B7?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA=E8=BF=90=E8=A1=8C=E5=B9=B6=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/DataSetManagement/src/CustomEditForm.vue         | 4 ++--
 data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue  | 4 ++--
 data-room-ui/packages/DataSetManagement/src/JsEditForm.vue    | 4 ++--
 data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue  | 2 +-
 .../packages/DataSetManagement/src/ScriptEditForm.vue         | 2 +-
 .../DataSetManagement/src/StoredProcedureEditForm.vue         | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
index 6635b7d6..b6f097f9 100644
--- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
@@ -203,7 +203,7 @@
                 type="primary"
                 @click="buildParamsAndRun"
               >
-                解析并运行
+                运行并解析
               </el-button>
             </div>
           </div>
@@ -1094,7 +1094,7 @@ export default {
       })
     },
     /**
-     * 解析并运行数据集
+     * 运行并解析数据集
      */
     buildParamsAndRun () {
       this.isTest = true
diff --git a/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue b/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue
index 4c056068..387cb0a3 100644
--- a/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue
@@ -434,7 +434,7 @@
                   >
                     <strong>响应脚本设置规则： 接口返回数据已经内置到参数responseString(已转为字符串)中，,如果需要处理成JSON格式推荐使用JsonSlurper类。
                       <br> 例如： <br>
-                      <span style="color: red;" >
+                      <span style="color: red;">
                         import com.gccloud.common.utils.JSON <br>
                         def respone = JSON.parseObject(responseString) <br>
                         return respone.data
@@ -454,7 +454,7 @@
                 type="primary"
                 @click="scriptExecute()"
               >
-                解析并运行
+                运行并解析
               </el-button>
             </div>
           </div>
diff --git a/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue b/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue
index d5017daf..c1137d87 100644
--- a/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue
@@ -155,7 +155,7 @@
               />
             </div>
             <div class="bs-codemirror-bottom-text">
-              <strong>请使用 return，将结果返回出来，例如：return [...]</strong>
+              <strong>请使用 return将运行结果返回出来，结果数据需要为数组格式</strong>
               <br>
               <strong>动态参数使用： 使用${}将参数包裹，例如：let name = <span style="color: red;">${name}。</span>
               </strong>
@@ -165,7 +165,7 @@
                 type="primary"
                 @click="scriptExecute()"
               >
-                解析并运行
+                运行并解析
               </el-button>
             </div>
           </div>
diff --git a/data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue b/data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue
index 1dfaec13..76eab563 100644
--- a/data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue
@@ -166,7 +166,7 @@
               type="primary"
               @click="analysisJSON"
             >
-              解析并运行
+              运行并解析
             </el-button>
           </div>
         </el-col>
diff --git a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue
index 8c4a6dab..e4b53e4e 100644
--- a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue
@@ -160,7 +160,7 @@
                 type="primary"
                 @click="toExecute"
               >
-                解析并运行
+                运行并解析
               </el-button>
             </div>
           </div>
diff --git a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
index 3bdf29fa..4d97af6d 100644
--- a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
@@ -190,7 +190,7 @@
                 type="primary"
                 @click="buildParamsAndRun"
               >
-                解析并运行
+                运行并解析
               </el-button>
             </div>
           </div>

From b8fee74909e4cd5125538e0a061b8e833aa2e6db Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Thu, 3 Aug 2023 11:23:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-room-ui/package.json b/data-room-ui/package.json
index a869bc10..a91fe233 100644
--- a/data-room-ui/package.json
+++ b/data-room-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gcpaas/data-room-ui",
-  "version": "1.0.1-2023080205-Alpha",
+  "version": "1.0.1-2023080301-Alpha",
   "description": "自定义大屏",
   "author": "gcpaas",
   "license": "MIT",