From 06da7e32f2fac939ecb69fb590a52eb85fece252 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Fri, 4 Aug 2023 11:17:06 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=B0=86=E5=90=84=E4=B8=AA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E4=B8=AD=E7=9A=84=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E3=80=81=E6=89=A7=E8=A1=8C=E7=AD=89=E8=84=9A=E6=9C=AC=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E6=8C=89=E9=92=AE=E7=BB=9F=E4=B8=80=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=BA'=E8=A7=A3=E6=9E=90=E5=B9=B6=E8=BF=90=E8=A1=8C'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/data-room-ui/package.json b/data-room-ui/package.json
index 49d88101..c12f85a7 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-2023080304-Alpha",
+  "version": "1.0.1-2023080401-Alpha",
   "description": "自定义大屏",
   "author": "gcpaas",
   "license": "MIT",
diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
index b6f097f9..6635b7d6 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 3c646cbf..945cde00 100644
--- a/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue
@@ -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 1a801f5b..1b93a6d6 100644
--- a/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue
@@ -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 76eab563..1dfaec13 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 e4b53e4e..8c4a6dab 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 4d97af6d..3bdf29fa 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>
diff --git a/data-room-ui/packages/SourceList/index.vue b/data-room-ui/packages/SourceList/index.vue
index 6e1f16d6..8dd680ce 100644
--- a/data-room-ui/packages/SourceList/index.vue
+++ b/data-room-ui/packages/SourceList/index.vue
@@ -280,7 +280,7 @@ export default {
       window.open(screen.url, '_blank')
     },
     downLoad (screen) {
-      this.$dataRoomAxios.download(`/bigScreen/file/download/${screen.id}`)
+      this.$dataRoomAxios.download(`/bigScreen/file/download/${screen.id}`, true)
     },
     del (screen) {
       this.$confirm('确定删除该资源？', '提示', {