From 81e1787aaee9d03da52ab8938d1961c4333ee5b5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 02 三月 2023 11:27:51 +0800
Subject: [PATCH] 2023-03-02

---
 src/tabviews/custom/components/form/step-form/index.jsx |   41 ++++++++++++++++++++++++++++++-----------
 1 files changed, 30 insertions(+), 11 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..f3711b3 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'
       }
 
@@ -102,6 +102,16 @@
 
       let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
       _group = _groups || _group
+    }
+
+    config.titleStyle = {}
+    config.sortStyle = {}
+
+    if (config.style.fontSize) {
+      let size = parseInt(config.style.fontSize)
+      config.titleStyle = {fontSize: size}
+      let s = size * 1.5 + 'px'
+      config.sortStyle = {width: s, height: s, lineHeight: s, borderRadius: s}
     }
 
     this.setState({
@@ -253,11 +263,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 +360,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 +374,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]
 
@@ -374,6 +390,8 @@
   render() {
     const { config, loading, BID, BData, data, group, dict, step } = this.state
 
+    if (config.wrap.empty === 'hidden' && (!data || data.$$empty)) return null
+    
     return (
       <div className="custom-normal-form-box" id={'anchor' + config.uuid} style={{...config.style}}>
         {loading ?
@@ -384,8 +402,8 @@
         }
         {config.wrap.groupLabel !== 'hidden' ? <div className="mk-normal-form-title">
           {config.subcards.map(card => (
-            <div key={card.uuid} className={'form-title' + (card.sort <= step ? ' active' : '')}>
-              <span className="form-sort" style={{background: config.wrap.color}}>{card.sort}</span>
+            <div key={card.uuid} style={config.titleStyle} className={'form-title' + (card.sort <= step ? ' active' : '')}>
+              <span className="form-sort" style={{background: config.wrap.color, ...config.sortStyle}}>{card.sort}</span>
               <span className="before-line" style={{background: config.wrap.color}}></span>
               <span className="after-line" style={{background: config.wrap.color}}></span>
               {card.setting.title}
@@ -398,6 +416,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