From 912f72d287744822670d1a13926edec549ed90f6 Mon Sep 17 00:00:00 2001
From: qianlishi <1432731663@qq.com>
Date: Mon, 14 Mar 2022 09:47:32 +0800
Subject: [PATCH] =?UTF-8?q?js=20=E8=84=9A=E6=9C=AC=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 report-ui/src/components/Dictionary/index.vue |  1 +
 .../resultset/components/EditDataSet.vue      | 20 ++++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/report-ui/src/components/Dictionary/index.vue b/report-ui/src/components/Dictionary/index.vue
index fd58f97f..a51323fe 100644
--- a/report-ui/src/components/Dictionary/index.vue
+++ b/report-ui/src/components/Dictionary/index.vue
@@ -66,6 +66,7 @@ export default {
     },
     selectChange(val) {
       this.$emit("input", val);
+      this.$emit("change", val);
     }
   }
 };
diff --git a/report-ui/src/views/resultset/components/EditDataSet.vue b/report-ui/src/views/resultset/components/EditDataSet.vue
index 562a78b9..786598b5 100644
--- a/report-ui/src/views/resultset/components/EditDataSet.vue
+++ b/report-ui/src/views/resultset/components/EditDataSet.vue
@@ -219,6 +219,7 @@
                               v-model="item.transformType"
                               :updata-dict="item.transformType"
                               :dict-key="'TRANSFORM_TYPE'"
+                              @change="changeForm"
                             />
                             <el-button
                               type="text"
@@ -252,10 +253,16 @@
                           min-height="400px"
                           append-to-body
                         >
-                          <div v-if="isItemFilterType.transformType == 'js' || isItemFilterType.transformType == 'javaBean'">
+                          <div
+                            v-if="
+                              isItemFilterType.transformType == 'js' ||
+                                isItemFilterType.transformType == 'javaBean'
+                            "
+                          >
                             <div class="codemirror">
                               <!-- //自定义高级规则？ -->
                               <monaco-editor
+                                v-if="jsScriptVisible"
                                 v-model.trim="transformScript"
                                 language="javascript"
                                 style="height: 500px"
@@ -483,6 +490,7 @@ export default {
       dialogFormVisibleTitle: "",
       dialogPermissionVisible: false,
       dialogSwitchVisible: false,
+      jsScriptVisible: false,
       permissionTextarea: "",
       isItemFilterType: "", // 选中的转换类型id
       itemFilterList: [
@@ -663,6 +671,12 @@ export default {
         this.isShowPagination = false;
       }
     },
+    changeForm(val) {
+      if (!val) {
+        this.dialogSwitchVisible = false;
+        this.jsScriptVisible = false
+      }
+    },
     // 关闭模态框
     closeDialog() {
       this.$emit("handleClose");
@@ -744,6 +758,7 @@ export default {
       console.log(item);
       this.isItemFilterType = item;
       this.dialogSwitchVisible = true;
+      this.jsScriptVisible = true
       if (item.transformType == "js") {
         this.itemFilterScriptId = item.itemFilterSort;
         const fnCont = `function dataTransform(data){\n\t//自定义脚本内容\n\treturn data;\n}`;
@@ -751,8 +766,7 @@ export default {
           ? item.transformScript
           : fnCont;
       } else if (item.transformType == "dict") {
-
-      }else if (item.transformType == "javaBean") {
+      } else if (item.transformType == "javaBean") {
         this.itemFilterScriptId = item.itemFilterSort;
         const fnCont = `package com;