From 87ed491bdfabb5d871b9aaa482735db468028409 Mon Sep 17 00:00:00 2001
From: ssc <273702440@qq.com>
Date: Mon, 8 May 2023 16:03:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B1=87=E6=80=BB=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=E8=8A=82=E7=82=B9=E4=B8=8D=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=97=B6=E9=94=99=E8=AF=AF=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/pages/external/Leave/detail.vue | 2 +-
 src/views/plugin/workflow/pages/process/form/detail.vue   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/plugin/workflow/pages/external/Leave/detail.vue b/src/views/plugin/workflow/pages/external/Leave/detail.vue
index 5fa7a97..9699ab9 100644
--- a/src/views/plugin/workflow/pages/external/Leave/detail.vue
+++ b/src/views/plugin/workflow/pages/external/Leave/detail.vue
@@ -235,7 +235,7 @@ export default {
         const option = this.option
         option.menuBtn = false
         let { column, group } = option
-        if (taskForm) {
+        if (taskForm && taskForm.length > 0) {
           const columnFilter = this.filterAvueColumn(column, taskForm, true)
           column = columnFilter.column
           let vars = columnFilter.vars || []
diff --git a/src/views/plugin/workflow/pages/process/form/detail.vue b/src/views/plugin/workflow/pages/process/form/detail.vue
index bb92922..360e65a 100644
--- a/src/views/plugin/workflow/pages/process/form/detail.vue
+++ b/src/views/plugin/workflow/pages/process/form/detail.vue
@@ -193,7 +193,7 @@ export default {
     handleResolveOption(option, taskForm, status) {
       let { column, group } = option
       let vars = []
-      if (taskForm) {
+      if (taskForm && taskForm.length > 0) {
         const columnFilter = this.filterAvueColumn(column, taskForm)
         column = columnFilter.column
         vars = columnFilter.vars || []
@@ -231,7 +231,7 @@ export default {
     handleResolveEvent(col, taskForm) {
       const _this = this
       delete col.value
-      if (!taskForm) {
+      if (!taskForm || taskForm.length == 0) {
         let event = ['change', 'blur', 'click', 'focus']
         event.forEach(e => {
           if (col[e]) col[e] = eval((col[e] + '').replace(/this/g, '_this'))