From 66bdbc1df92e8ec4a5108a4e0323e25a7b9ff8f8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:37:16 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/form/step-form/index.jsx | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index 50e227b..94fd836 100644
--- a/src/tabviews/custom/components/form/step-form/index.jsx
+++ b/src/tabviews/custom/components/form/step-form/index.jsx
@@ -115,6 +115,8 @@
_config.sortStyle = {width: s, height: s, lineHeight: s, borderRadius: s}
}
+ _config.style['--mk-active-color'] = _config.wrap.color || '#1890ff'
+
this.setState({
data: _data,
group: _group,
@@ -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
@@ -457,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
@@ -471,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