From f0bf8c399c354c22227f8f1a76ed806098db59c0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:51:02 +0800
Subject: [PATCH] 2024-05-21

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

diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index b22dba9..94fd836 100644
--- a/src/tabviews/custom/components/form/step-form/index.jsx
+++ b/src/tabviews/custom/components/form/step-form/index.jsx
@@ -1,7 +1,7 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import { is, fromJS } from 'immutable'
-import { Spin, notification, Button, Modal } from 'antd'
+import { Spin, Button } from 'antd'
 
 import Api from '@/api'
 import UtilsDM from '@/utils/utils-datamanage.js'
@@ -114,6 +114,8 @@
       let s = size * 1.5 + 'px'
       _config.sortStyle = {width: s, height: s, lineHeight: s, borderRadius: s}
     }
+
+    _config.style['--mk-active-color'] = _config.wrap.color || '#1890ff'
 
     this.setState({
       data: _data,
@@ -263,8 +265,8 @@
 
     if (config.uuid !== menuId) return
 
-    if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) {
-      MKEmitter.emit('reloadData', config.setting.supModule, BID)
+    if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+      MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
     } else if (position === 'grid' && config.wrap.datatype === 'static') {
       this.setState({
         data: null
@@ -405,36 +407,13 @@
 
       MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid, _data)
 
-      if (result.message) {
-        if (result.ErrCode === 'Y') {
-          Modal.success({
-            title: result.message
-          })
-        } else if (result.ErrCode === 'S') {
-          notification.success({
-            top: 92,
-            message: result.message,
-            duration: 2
-          })
-        }
-      }
+      UtilsDM.querySuccess(result)
     } else {
       this.setState({
         loading: false,
       })
       
-      if (!result.message) return
-      if (result.ErrCode === 'N') {
-        Modal.error({
-          title: result.message,
-        })
-      } else if (result.ErrCode !== '-2') {
-        notification.error({
-          top: 92,
-          message: result.message,
-          duration: 10
-        })
-      }
+      UtilsDM.queryFail(result)
     }
   }
 
@@ -480,6 +459,18 @@
     })
   }
 
+  changeGroup = (sort) => {
+    const { config, step } = this.state
+
+    if (config.wrap.labelJump !== 'true' || sort > step) return
+
+    let _group = config.subcards.filter(item => item.sort === sort)[0]
+
+    this.setState({group: null, step: sort - 1}, () => {
+      this.setState({group: _group})
+    })
+  }
+
   render() {
     const { config, loading, BID, BData, data, group, step } = this.state
 
@@ -494,13 +485,14 @@
             <Spin />
           </div> : null
         }
-        {config.wrap.groupLabel !== 'hidden' ? <div className="mk-normal-form-title">
+        {config.wrap.groupLabel !== 'hidden' ? <div className={'mk-normal-form-title' + (config.wrap.labelJump === 'true' ? ' jumpable' : '')}>
           {config.subcards.map(card => (
             <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}
+              <span className="form-sort" onClick={() => this.changeGroup(card.sort)} style={config.sortStyle}>{card.sort}</span>
+              <br/>
+              <span className="form-label" onClick={() => this.changeGroup(card.sort)}>{card.setting.title}</span>
+              <span className="before-line"></span>
+              <span className="after-line"></span>
             </div>))
           }
         </div> : null}

--
Gitblit v1.8.0