From a022f84160e8ba995feee350d9669d9d8675bf0a Mon Sep 17 00:00:00 2001
From: qianlishi <1432731663@qq.com>
Date: Tue, 29 Jun 2021 14:36:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/form/dynamicComponents.vue       |  2 +-
 .../bigscreen/designer/form/dynamicForm.vue   | 36 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/report-ui/src/views/report/bigscreen/designer/form/dynamicComponents.vue b/report-ui/src/views/report/bigscreen/designer/form/dynamicComponents.vue
index 0e06f12d..d901db4e 100644
--- a/report-ui/src/views/report/bigscreen/designer/form/dynamicComponents.vue
+++ b/report-ui/src/views/report/bigscreen/designer/form/dynamicComponents.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form label-width="80px" label-position="left">
+    <el-form label-width="100px" label-position="left">
       <el-form-item label="数据集">
         <el-select
           size="mini"
diff --git a/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue b/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue
index acffc94f..672f6071 100644
--- a/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue
+++ b/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue
@@ -6,7 +6,7 @@
  !-->
 <template>
   <div class="collapse-input-style">
-    <el-form label-width="80px" label-position="left">
+    <el-form label-width="100px" label-position="left">
       <template v-for="(item, index) in options">
         <div v-if="isShowForm(item, '[object Object]')" :key="index">
           <el-form-item
@@ -117,19 +117,21 @@
               width="50%"
               :before-close="handleClose"
             >
-<!--              <codemirror-->
-<!--                v-model.trim="formData[item.name]"-->
-<!--                class="code-mirror"-->
-<!--                :options="optionsJavascript"-->
-<!--                style="height: 190px"-->
-<!--              />-->
-              <vue-json-editor v-model="formData[item.name]"
-                               :show-btns="false"
-                               :mode="'code'"
-                               lang="zh"
-                               class="my-editor"
-                               @json-change="onJsonChange"
-                               @json-save="onJsonSave" />
+              <!--              <codemirror-->
+              <!--                v-model.trim="formData[item.name]"-->
+              <!--                class="code-mirror"-->
+              <!--                :options="optionsJavascript"-->
+              <!--                style="height: 190px"-->
+              <!--              />-->
+              <vue-json-editor
+                v-model="formData[item.name]"
+                :show-btns="false"
+                :mode="'code'"
+                lang="zh"
+                class="my-editor"
+                @json-change="onJsonChange"
+                @json-save="onJsonSave"
+              />
               <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisibleStaticData = false"
                   >取 消</el-button
@@ -263,7 +265,7 @@
 
 <script>
 import ColorPicker from "./colorPicker.vue";
-import vueJsonEditor from 'vue-json-editor'
+import vueJsonEditor from "vue-json-editor";
 import "codemirror/lib/codemirror.css"; // 核心样式
 import "codemirror/theme/cobalt.css"; // 引入主题后还需要在 options 中指定主题才会生效
 // language
@@ -344,8 +346,8 @@ export default {
         }
       }
     },
-    onJsonChange (value) { },
-    onJsonSave (value) { },
+    onJsonChange(value) {},
+    onJsonSave(value) {},
     saveData() {
       this.$emit("onChanged", this.formData);
       this.dialogVisibleStaticData = false;