From 9fde61cbdb63933fa6f776ed56df32594f306a5b Mon Sep 17 00:00:00 2001
From: ssc <273702440@qq.com>
Date: Mon, 15 Nov 2021 10:23:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=B1=BB=E5=9E=8B=E6=9D=A5=E5=9B=9E=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=89=8D=E7=AB=AF=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plugin/workflow/design/index.vue | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/plugin/workflow/design/index.vue b/src/views/plugin/workflow/design/index.vue
index afee3b9..cd81242 100644
--- a/src/views/plugin/workflow/design/index.vue
+++ b/src/views/plugin/workflow/design/index.vue
@@ -32,7 +32,8 @@
                    @click="$router.push('/plugin/workflow/design/form')">没有想要的表单？点击去设计</el-link>
         </template>
         <template #form>
-          <avue-form ref="form2"
+          <avue-form v-if="option && ((option.column && option.column.length > 0) || (option.group && option.group.length > 0))"
+                     ref="form2"
                      v-model="form"
                      :option="option"></avue-form>
         </template>
@@ -172,19 +173,20 @@ export default {
                     this.findObject(this.step1.option.group[0].column, 'formKey').display = true
                     this.findObject(this.step1.option.group[0].column, 'tip').display = true
                     this.findObject(this.step1.option.group[1].column, 'form').display = true
+                    this.step1.option.group[1].display = true
                   } else if (val == 2) {
                     this.findObject(this.step1.option.group[0].column, 'exFormKey').display = true
                     this.findObject(this.step1.option.group[1].column, 'column').display = true
                     this.findObject(this.step1.option.group[0].column, 'formKey').display = false
                     this.findObject(this.step1.option.group[0].column, 'tip').display = false
-                    this.findObject(this.step1.option.group[1].column, 'form').display = false
+                    this.option = {}
                     this.step1.option.group[1].display = true
                   } else if (val == 3) {
                     this.findObject(this.step1.option.group[0].column, 'exFormKey').display = false
                     this.findObject(this.step1.option.group[1].column, 'column').display = false
                     this.findObject(this.step1.option.group[0].column, 'formKey').display = false
                     this.findObject(this.step1.option.group[0].column, 'tip').display = false
-                    this.findObject(this.step1.option.group[1].column, 'form').display = false
+                    this.option = {}
                     this.step1.option.group[1].display = false
                   }
                 }
@@ -205,19 +207,16 @@ export default {
               dicData: [],
               event: {
                 change: (val) => {
-                  this.option = {}
+                  _this.option = { menuBtn: false, readonly: true }
                   if (val) {
                     getFormByKey({ formKey: val }).then(res => {
                       _this.option = { ...eval('(' + res.data.data.content.replace(/this/g, '_this') + ')'), menuBtn: false, readonly: true }
-                      _this.step1.option.group[1].display = true
-                      setTimeout(() => {
-                        if(_this.$refs.form2) _this.$refs.form2.clearValidate()
-                      })
+                      _this.findObject(this.step1.option.group[1].column, 'form').display = true
                     }).catch(() => {
-                      _this.step1.option.group[1].display = false
+                      _this.findObject(this.step1.option.group[1].column, 'form').display = false
                     })
                   } else {
-                    _this.step1.option.group[1].display = false
+                    _this.findObject(this.step1.option.group[1].column, 'form').display = false
                   }
                 }
               },
@@ -231,13 +230,14 @@ export default {
           }, {
             label: '表单预览',
             icon: 'el-icon-view',
-            display: false,
+            display: true,
             arrow: false,
             column: [{
               prop: 'form',
               labelWidth: 0,
               span: 24,
-              formslot: true
+              formslot: true,
+              display: false
             }, {
               prop: 'column',
               labelWidth: '0',