From 6055fa01416fc57ee33b291a8103ccc1a8edce44 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 七月 2021 23:21:14 +0800
Subject: [PATCH] 2021-07-20

---
 src/tabviews/custom/components/form/normal-form/index.jsx |   30 +++++++++++++-----------------
 1 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/tabviews/custom/components/form/normal-form/index.jsx b/src/tabviews/custom/components/form/normal-form/index.jsx
index 59b40f1..f8bb190 100644
--- a/src/tabviews/custom/components/form/normal-form/index.jsx
+++ b/src/tabviews/custom/components/form/normal-form/index.jsx
@@ -77,6 +77,14 @@
       group.subButton.OpenType = 'formSubmit'
       group.subButton.execError = 'never'
 
+      if (group.subButton.enable === 'false') {
+        group.subButton.style.display = 'none'
+      }
+
+      if (group.prevButton.enable === 'false' && group.subButton.enable === 'false' && group.nextButton.enable === 'false') {
+        group.$button = 'no-button'
+      }
+
       group.fields = group.fields.map(cell => {
         // 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗�
         if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(cell.type) && cell.resourceType === '1') {
@@ -259,28 +267,16 @@
 
     if (config.wrap.datatype === 'static' || (config.setting.supModule && !BID)) {
       this.setState({
-        data: {},
-        loading: false
+        data: {}
       })
       btn && this.execSuccess(btn)
       return
     }
 
-    let searches = []
-    if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
-      let keys = searches.map(item => item.key)
-      mainSearch.forEach(item => {
-        if (!keys.includes(item.key)) {
-          searches.push(item)
-        }
-      })
-    }
+    let searches = config.setting.useMSearch && mainSearch ? mainSearch : []
 
-    let requireFields = searches.filter(item => item.required && (!item.value || item.value.length === 0))
+    let requireFields = searches.filter(item => item.required && item.value === '')
     if (requireFields.length > 0) {
-      this.setState({
-        loading: false
-      })
       btn && this.execSuccess(btn)
       return
     }
@@ -395,8 +391,8 @@
           inputSubmit={this.handleOk}
           wrappedComponentRef={(inst) => this.formRef = inst}
         /> : null}
-        {group && data ? <div className="mk-form-action">
-          {group.sort !== 1 ? <Button type="link" className="prev" onClick={this.prevStep} style={group.prevButton.style}>{group.prevButton.label}</Button> : null}
+        {group && data ? <div className={'mk-form-action ' + (group.$button || '')}>
+          {group.sort !== 1 && group.prevButton.enable !== 'false' ? <Button type="link" className="prev" onClick={this.prevStep} style={group.prevButton.style}>{group.prevButton.label}</Button> : null}
           <NormalButton
             BID={BID}
             position="form"

--
Gitblit v1.8.0