From cfa30728a39f472a2dc8600071e4224de3c4d211 Mon Sep 17 00:00:00 2001
From: ssc <273702440@qq.com>
Date: Mon, 21 Feb 2022 15:30:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A8=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plugin/workflow/mixins/ex-form.js   | 21 +++++++++----------
 .../workflow/process/components/detail.vue    | 17 ++-------------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/src/views/plugin/workflow/mixins/ex-form.js b/src/views/plugin/workflow/mixins/ex-form.js
index cb7accd..4d152c3 100644
--- a/src/views/plugin/workflow/mixins/ex-form.js
+++ b/src/views/plugin/workflow/mixins/ex-form.js
@@ -80,18 +80,17 @@ export default {
           //   if ((this.process.isOwner && this.process.status == 'todo') || !this.process.hasOwnProperty('isOwner')) c = { readable: true, writable: true }
           //   else c = { readable: true, writable: false }
           // }
-          let event = ['change', 'blur', 'click', 'focus']
+          if (!isExForm) { // 非外置表单 处理事件
+            let event = ['change', 'blur', 'click', 'focus']
+            event.forEach(e => {
+              if (col[e]) col[e] = eval((col[e] + '').replace(/this/g, '_this'))
+            })
+            if (col.event) Object.keys(col.event).forEach(key => col.event[key] = eval((col.event[key] + '').replace(/this/g, '_this')))
+          }
           if (c.writable) { // 可写，记录需要提交的字段、处理字段默认值
             vars.push(col[props.prop])
             if (col.value) col.value = _this.getDefaultValues(col.value)
-
-            if (!isExForm) { // 非外置表单 处理事件
-              event.forEach(e => {
-                if (col[e]) col[e] = eval((col[e] + '').replace(/this/g, '_this'))
-              })
-              if (col.event) Object.keys(col.event).forEach(key => col.event[key] = eval((col.event[key] + '').replace(/this/g, '_this')))
-            }
-          } else { // 不可写，清除校验、默认值、事件
+          } else { // 不可写，清除校验、默认值
             if (col.type == 'dynamic') {
               col.children.addBtn = false
               col.children.delBtn = false
@@ -101,8 +100,8 @@ export default {
             }
             delete col.rules
             delete col.value
-            delete col.event
-            event.forEach(e => delete col[e])
+            // delete col.event
+            // event.forEach(e => delete col[e])
           }
           if (col.type == 'dynamic') { // 处理子表单
             col.children.column = _this.filterAvueColumn(col.children.column, taskForm).column
diff --git a/src/views/plugin/workflow/process/components/detail.vue b/src/views/plugin/workflow/process/components/detail.vue
index 4a18de2..306efd6 100644
--- a/src/views/plugin/workflow/process/components/detail.vue
+++ b/src/views/plugin/workflow/process/components/detail.vue
@@ -161,20 +161,13 @@ export default {
       const { column, group } = option
       let vars = []
       if (status != 'todo') { // 已办，删除字段默认值
-        let event = ['change', 'blur', 'click', 'focus']
         option.detail = true
         if (column && column.length > 0) { // 处理column
           column.forEach(col => {
             if (col.type == 'dynamic') col.children.column.forEach(cc => {
               delete cc.value
-              delete cc.event
-              event.forEach(e => delete cc[e])
             })
-            else {
-              delete col.value
-              delete col.event
-              event.forEach(e => delete col[e])
-            }
+            delete col.value
           })
         }
 
@@ -184,14 +177,8 @@ export default {
               gro.column.forEach(col => {
                 if (col.type == 'dynamic') col.children.column.forEach(cc => {
                   delete cc.value
-                  delete cc.event
-                  event.forEach(e => delete cc[e])
                 })
-                else {
-                  delete col.value
-                  delete col.event
-                  event.forEach(e => delete col[e])
-                }
+                delete col.value
               })
             }
           })