From c98e45bfac25e9110ad0383faac54a54d98ea9d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 18 十一月 2021 20:47:04 +0800
Subject: [PATCH] 2021-11-18

---
 src/tabviews/custom/components/form/normal-form/index.jsx |   81 ++++++++++++++--------------------------
 1 files changed, 28 insertions(+), 53 deletions(-)

diff --git a/src/tabviews/custom/components/form/normal-form/index.jsx b/src/tabviews/custom/components/form/normal-form/index.jsx
index dfc65f7..3d7cd2b 100644
--- a/src/tabviews/custom/components/form/normal-form/index.jsx
+++ b/src/tabviews/custom/components/form/normal-form/index.jsx
@@ -12,7 +12,6 @@
 import MKEmitter from '@/utils/events.js'
 import zhCN from '@/locales/zh-CN/main.js'
 import enUS from '@/locales/en-US/main.js'
-import { modifyTabview } from '@/store/action'
 import './index.scss'
 
 const MutilForm = asyncSpinComponent(() => import('@/tabviews/zshare/mutilform'))
@@ -186,7 +185,7 @@
 
     if (config.uuid !== menuId) return
 
-    this.loadData(null, 'refresh')
+    this.loadData('refresh')
   }
 
   /**
@@ -205,7 +204,7 @@
     }
 
     if (config.wrap.datatype !== 'static' && config.setting) {
-      this.loadData(btn)
+      this.loadData()
     }
 
     if (id) {
@@ -218,7 +217,7 @@
   resetParentParam = (MenuID, id) => {
     const { config } = this.state
     if (config.wrap.datatype === 'static' || !config.setting.supModule || config.setting.supModule !== MenuID) return
-    if (id !== this.state.BID) {
+    if (id !== this.state.BID || id !== '') {
       this.setState({ BID: id }, () => {
         this.loadData()
       })
@@ -246,27 +245,18 @@
 
       let newtab = {
         ...menu,
-        selected: true,
         param: {$BID: id || ''}
       }
 
-      let tabs = this.props.tabviews.filter((tab, i) => {
-        tab.selected = false
-        return tab.MenuID !== newtab.MenuID
-      })
-
-      if (this.props.tabviews.length > tabs.length) {
-        this.props.modifyTabview(fromJS(tabs).toJS())
+      if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
+        MKEmitter.emit('modifyTabs', newtab, 'replace')
+      } else {
+        MKEmitter.emit('modifyTabs', newtab, 'plus', true)
       }
-
-      this.setState({}, () => {
-        tabs.push(newtab)
-        this.props.modifyTabview(tabs)
-      })
     }
   }
 
-  async loadData (btn, type) {
+  async loadData (type) {
     const { mainSearch, menuType } = this.props
     const { config, arr_field, BID, group } = this.state
 
@@ -274,7 +264,6 @@
       this.setState({
         data: {}
       })
-      btn && this.execSuccess(btn)
       return
     }
 
@@ -282,7 +271,6 @@
 
     let requireFields = searches.filter(item => item.required && item.value === '')
     if (requireFields.length > 0) {
-      btn && this.execSuccess(btn)
       return
     }
 
@@ -296,34 +284,25 @@
     let result = await Api.genericInterface(param)
     if (result.status) {
       let _data = result.data && result.data[0] ? result.data[0] : {}
+      let _group = group
 
-      if (btn) {
-        this.setState({
-          data: _data || {},
-          loading: false
-        })
-        this.execSuccess(btn)
-      } else {
-        let _group = group
-
-        if (type === 'refresh') {
-          _group = config.subcards[0]
-        }
-
-        if (config.wrap.statusControl && _data[config.wrap.statusControl]) {
-          let _status = _data[config.wrap.statusControl]
-          let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
-          _group = _groups || _group
-        }
-        this.setState({
-          group: null,
-          step: _group.sort - 1,
-          data: _data || {},
-          loading: false
-        }, () => {
-          this.setState({group: _group})
-        })
+      if (type === 'refresh') {
+        _group = config.subcards[0]
       }
+
+      if (config.wrap.statusControl && _data[config.wrap.statusControl]) {
+        let _status = _data[config.wrap.statusControl]
+        let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
+        _group = _groups || _group
+      }
+      this.setState({
+        group: null,
+        step: _group.sort - 1,
+        data: _data || {},
+        loading: false
+      }, () => {
+        this.setState({group: _group})
+      })
     } else {
       this.setState({
         loading: false,
@@ -333,7 +312,6 @@
         message: result.message,
         duration: 10
       })
-      btn && this.execSuccess(btn)
     }
   }
 
@@ -393,7 +371,7 @@
           dict={dict}
           data={data}
           action={group}
-          inputSubmit={this.handleOk}
+          inputSubmit={() => this.mkFormSubmit(group.uuid)}
           wrappedComponentRef={(inst) => this.formRef = inst}
         /> : null}
         {group && data ? <div className={'mk-form-action ' + (group.$button || '')}>
@@ -416,14 +394,11 @@
 const mapStateToProps = (state) => {
   return {
     permMenus: state.permMenus,
-    tabviews: state.tabviews,
   }
 }
 
-const mapDispatchToProps = (dispatch) => {
-  return {
-    modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews))
-  }
+const mapDispatchToProps = () => {
+  return {}
 }
 
 export default connect(mapStateToProps, mapDispatchToProps)(NormalForm)
\ No newline at end of file

--
Gitblit v1.8.0