From cc1a76df575c18f0d0ee96e8658461efdce3a918 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 一月 2023 18:01:01 +0800
Subject: [PATCH] 2023-01-17

---
 src/tabviews/custom/components/form/step-form/index.jsx |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index 7287b76..c5c8315 100644
--- a/src/tabviews/custom/components/form/step-form/index.jsx
+++ b/src/tabviews/custom/components/form/step-form/index.jsx
@@ -56,8 +56,8 @@
     if (config.wrap.datatype !== 'static') {
       _sync = config.setting.sync === 'true'
 
-      if (_sync && data && data[config.dataName]) {
-        _data = data[config.dataName]
+      if (_sync && data) {
+        _data = data[config.dataName] || {$$empty: true}
         if (Array.isArray(_data)) {
           _data = _data[0] || {$$empty: true}
         }
@@ -77,10 +77,10 @@
 
     config.subcards = config.subcards.map((group, i) => {
       group.sort = i + 1
-      if (i === 0) {
+      if (i === 0 && group.prevButton.actionType !== 'close') {
         group.prevButton.enable = 'false'
       }
-      if (i + 1 === config.subcards.length) {
+      if (i + 1 === config.subcards.length && group.nextButton.actionType !== 'close') {
         group.nextButton.enable = 'false'
       }
 
@@ -253,11 +253,7 @@
         param: {$BID: id || ''}
       }
 
-      if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
-        MKEmitter.emit('modifyTabs', newtab, 'replace')
-      } else {
-        MKEmitter.emit('modifyTabs', newtab, 'plus', true)
-      }
+      MKEmitter.emit('modifyTabs', newtab, true)
     }
   }
 
@@ -354,6 +350,11 @@
   prevStep = () => {
     const { config, group } = this.state
 
+    if (group.prevButton.actionType === 'close') {
+      MKEmitter.emit('closeTabView', group.subButton.$MenuID)
+      return
+    }
+
     let _group = config.subcards.filter(item => item.sort === (group.sort - 1))[0]
 
     this.setState({group: null, step: group.sort - 2}, () => {
@@ -363,6 +364,11 @@
 
   nextStep = () => {
     const { config, group } = this.state
+
+    if (group.nextButton.actionType === 'close') {
+      MKEmitter.emit('closeTabView', group.subButton.$MenuID)
+      return
+    }
 
     let _group = config.subcards.filter(item => item.sort === (group.sort + 1))[0]
 
@@ -398,6 +404,7 @@
           dict={dict}
           data={data}
           action={group}
+          unload={config.setting.supModule && !BID}
           inputSubmit={() => this.mkFormSubmit(group.uuid)}
           wrappedComponentRef={(inst) => this.formRef = inst}
         /> : null}

--
Gitblit v1.8.0