From afb39f8ab004b2607bb718edab02e99c7a010114 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 22 三月 2023 14:36:44 +0800
Subject: [PATCH] 2023-03-22
---
src/tabviews/custom/components/form/step-form/index.jsx | 68 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index d942371..83349ad 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 } from 'antd'
+import { Spin, notification, Button, Modal } from 'antd'
import Api from '@/api'
import UtilsDM from '@/utils/utils-datamanage.js'
@@ -56,12 +56,13 @@
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}
}
_sync = false
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
}
} else {
_data = {$$empty: true}
@@ -77,10 +78,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 +103,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({
@@ -159,6 +170,8 @@
}
}
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
+
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]
@@ -166,7 +179,7 @@
}
this.setState({sync: false, data: _data, group: _group, step: _group.sort - 1,})
- } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({}, () => {
this.loadData()
})
@@ -253,11 +266,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)
}
}
@@ -298,6 +307,8 @@
let _data = result.data && result.data[0] ? result.data[0] : {$$empty: true}
let _group = this.state.group
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
+
if (type === 'refresh') {
_group = config.subcards[0]
}
@@ -326,11 +337,18 @@
this.setState({
loading: false,
})
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
+
+ if (result.ErrCode === 'N') {
+ Modal.error({
+ title: result.message,
+ })
+ } else {
+ notification.error({
+ top: 92,
+ message: result.message,
+ duration: 10
+ })
+ }
}
}
@@ -347,6 +365,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}, () => {
@@ -356,6 +379,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]
@@ -367,6 +395,9 @@
render() {
const { config, loading, BID, BData, data, group, dict, step } = this.state
+ if (config.wrap.empty === 'hidden' && (!data || data.$$empty)) return null
+ if (config.idCtrl && (!data || data.$$empty)) return null
+
return (
<div className="custom-normal-form-box" id={'anchor' + config.uuid} style={{...config.style}}>
{loading ?
@@ -377,8 +408,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}
@@ -391,6 +422,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