From 402381884d95f38f233001b300d35f6a364d1409 Mon Sep 17 00:00:00 2001
From: BoBoooooo <17746714@qq.com>
Date: Mon, 7 Dec 2020 13:39:51 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E7=BB=84=E4=BB=B6=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/form-designer/src/FormDesignerDialog.vue |  9 +++++----
 packages/form-designer/src/GenerateForm.vue       | 12 +++++++-----
 packages/form-designer/src/GenerateFormItem.vue   |  6 ++++--
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/packages/form-designer/src/FormDesignerDialog.vue b/packages/form-designer/src/FormDesignerDialog.vue
index d8a8cd6..ed71fde 100644
--- a/packages/form-designer/src/FormDesignerDialog.vue
+++ b/packages/form-designer/src/FormDesignerDialog.vue
@@ -200,10 +200,11 @@
           </td>
         </tbody>
       </table>
-      <el-button type="success"
-                 @click="handleGenerateKey(true)">自动生成表单(根据数据库字段初始化,默认一行两列)</el-button>
-      <!-- <el-button type="primary"
-                   @click="handleGenerateKey()">自动绑定key(已有表单的情况)</el-button> -->
+      <el-tooltip title="根据数据库字段初始化,默认一行两列">
+        <el-button type="success"
+                 style="float: right"
+                 @click="handleGenerateKey(true)">自动生成表单</el-button>
+      </el-tooltip>
     </cus-dialog>
   </el-container>
     </el-dialog>
diff --git a/packages/form-designer/src/GenerateForm.vue b/packages/form-designer/src/GenerateForm.vue
index 6216486..268f017 100644
--- a/packages/form-designer/src/GenerateForm.vue
+++ b/packages/form-designer/src/GenerateForm.vue
@@ -11,11 +11,11 @@
 <template>
   <div class="table-form-wrapper">
     <el-form ref="generateForm"
-             :class='{"table-form":data.config.isTableClass}'
+             :class='{"table-form": data.config && data.config.isTableClass}'
              :model="models"
              :rules="rules"
-             :label-position="data.config.labelPosition"
-             :label-width="data.config.labelWidth?data.config.labelWidth+ 'px':'140px'"
+             :label-position="data.config && data.config.labelPosition"
+             :label-width="data.config && data.config.labelWidth?data.config.labelWidth+ 'px':'140px'"
              size="small">
       <!-- 遍历从父组件传入的data，data下有list和config两个属性，list下的每个对象是表示一行组件的集合 -->
       <template v-for="item in this.data.list">
@@ -226,8 +226,10 @@ export default class GenerateForm extends Vue {
   tableSelections: any = {};
 
   created() {
-    // 根据数据结构生成给子组件的数据源
-    this.generateModle(this.data.list);
+    if (this.data.list) {
+      // 根据数据结构生成给子组件的数据源
+      this.generateModle(this.data.list);
+    }
   }
 
   getTableSelection($event, item) {
diff --git a/packages/form-designer/src/GenerateFormItem.vue b/packages/form-designer/src/GenerateFormItem.vue
index 5e86f79..dee6680 100644
--- a/packages/form-designer/src/GenerateFormItem.vue
+++ b/packages/form-designer/src/GenerateFormItem.vue
@@ -397,7 +397,8 @@ export default class GenerateFormItem extends Vue {
   created() {
     this.initData();
     if (this.widget.type === 'table') {
-      this.$EventBus.$on(`refresh:subTable:${this.widget.model}`, () => {
+      // eslint-disable-next-line no-unused-expressions
+      this.$EventBus && this.$EventBus.$on(`refresh:subTable:${this.widget.model}`, () => {
         this.$refs.table.tableReload();
       });
     }
@@ -690,7 +691,8 @@ export default class GenerateFormItem extends Vue {
   }
 
   beforeDestroy() {
-    this.$EventBus.$off(`refresh:subTable:${this.widget.model}`);
+    // eslint-disable-next-line no-unused-expressions
+    this.$EventBus && this.$EventBus.$off(`refresh:subTable:${this.widget.model}`);
   }
 
   @Watch('dataModel')