From ab744f965257e832d17869418bd96233bd63a756 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 03 一月 2022 14:31:56 +0800
Subject: [PATCH] 2022-01-03

---
 src/components/normalform/modalform/index.jsx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/normalform/modalform/index.jsx b/src/components/normalform/modalform/index.jsx
index 72df176..bc471f7 100644
--- a/src/components/normalform/modalform/index.jsx
+++ b/src/components/normalform/modalform/index.jsx
@@ -110,7 +110,7 @@
             cell.hidden = true
           }
         } else if (item.notNull) {
-          cell.hidden = !supItem.initval
+          cell.hidden = !supItem.initval || JSON.stringify(supItem.initval) === '[]'
         } else if (!item.values.includes(supItem.initval)) {
           cell.hidden = true
         }
@@ -180,7 +180,7 @@
               m.hidden = true
             }
           } else if (cell.notNull) {
-            m.hidden = !val
+            m.hidden = !val || JSON.stringify(val) === '[]'
           } else {
             m.hidden = !cell.values.includes(val)
           }
@@ -246,7 +246,7 @@
       } else if (item.type === 'fileupload') {
         content = (<MKFileUpload config={item} onChange={(val) => this.recordChange({[item.field]: val})} />)
       } else if (item.type === 'cascader') {
-        content = (<Cascader allowClear={!!item.allowClear} options={item.options} expandTrigger="hover" placeholder="" />)
+        content = (<Cascader allowClear={!!item.allowClear} onChange={(val) => this.recordChange({[item.field]: val}, item)} options={item.options} expandTrigger="hover" placeholder="" />)
       } else if (item.type === 'textarea') {
         content = (<TextArea rows={item.rows || 2} placeholder=""/>)
       } else if (item.type === 'mkicon') {

--
Gitblit v1.8.0