From 61d54a15b3f0d9c311390d36ad6ddc823ad424fc Mon Sep 17 00:00:00 2001
From: qianlishi <1432731663@qq.com>
Date: Mon, 26 Jul 2021 12:06:04 +0800
Subject: [PATCH] update

---
 .../designer/form/dynamicAddTable.vue         | 48 ++-----------------
 .../designer/form/dynamicComponents.vue       |  2 +-
 .../bigscreen/designer/form/dynamicForm.vue   | 11 +----
 3 files changed, 5 insertions(+), 56 deletions(-)

diff --git a/report-ui/src/views/report/bigscreen/designer/form/dynamicAddTable.vue b/report-ui/src/views/report/bigscreen/designer/form/dynamicAddTable.vue
index 992852de..0c1735b1 100644
--- a/report-ui/src/views/report/bigscreen/designer/form/dynamicAddTable.vue
+++ b/report-ui/src/views/report/bigscreen/designer/form/dynamicAddTable.vue
@@ -11,7 +11,6 @@
     <el-table :data="formData" style="width: 100%">
       <el-table-column prop="name" label="名称" width="80" />
       <el-table-column prop="key" label="key值" width="80" />
-      <!-- <el-table-column prop="width" label="宽度" width="80" /> -->
       <el-table-column label="操作" width="100">
         <template slot-scope="scope">
           <el-button
@@ -39,7 +38,7 @@
       <el-form :model="rowFormData" label-width="50px">
         <el-form-item label="名称:">
           <el-input
-            v-model="rowFormData['name']"
+            v-model.trim="rowFormData['name']"
             placeholder="请输入名称"
             size="mini"
           >
@@ -47,20 +46,12 @@
         </el-form-item>
         <el-form-item label="key值:">
           <el-input
-            v-model="rowFormData['key']"
+            v-model.trim="rowFormData['key']"
             placeholder="请输入key值"
             size="mini"
           >
           </el-input>
         </el-form-item>
-        <!-- <el-form-item label="宽度:">
-          <el-input
-            v-model="rowFormData['width']"
-            placeholder="请输入宽度"
-            size="mini"
-          >
-          </el-input>
-        </el-form-item> -->
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
@@ -90,40 +81,7 @@ export default {
       },
       flag: true, // true 新增， false 编辑
       indexEditor: -1, // 编辑第几个数据
-      tableData: [
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1517 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1519 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1516 弄",
-          zip: 200333
-        }
-      ]
+      tableData: []
     };
   },
   methods: {
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 d901db4e..3ef49c2b 100644
--- a/report-ui/src/views/report/bigscreen/designer/form/dynamicComponents.vue
+++ b/report-ui/src/views/report/bigscreen/designer/form/dynamicComponents.vue
@@ -22,7 +22,7 @@
         :key="index"
         :label="item.paramName"
       >
-        <el-input v-model="item.sampleItem" size="mini" />
+        <el-input v-model.trim="item.sampleItem" size="mini" />
       </el-form-item>
       <el-form-item v-for="item in setParamList" :key="item" :label="item">
         <Dictionary
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 951c3266..32c7c00e 100644
--- a/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue
+++ b/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue
@@ -23,7 +23,7 @@
               v-if="item.type == 'el-input-number'"
               size="mini"
               style="width:100%"
-              v-model="formData[item.name]"
+              v-model.trim="formData[item.name]"
               controls-position="right"
               :placeholder="item.placeholder"
               @change="changed($event, item.name)"
@@ -118,12 +118,6 @@
               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"
@@ -314,7 +308,6 @@ export default {
       optionsJavascript: {
         mode: "text/javascript",
         tabSize: 2, // 缩进格式
-        // theme: 'cobalt', // monokai主题，对应主题库 JS 需要提前引入
         lineNumbers: true, // 显示行号
         line: true,
         styleActiveLine: true, // 高亮选中行
@@ -357,8 +350,6 @@ export default {
         }
       }
     },
-    onJsonChange(value) {},
-    onJsonSave(value) {},
     saveData() {
       this.$emit("onChanged", this.formData);
       this.dialogVisibleStaticData = false;