From 26d0fa42ea8c63a87e8ef93d0915f75f46fb1f9c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 三月 2022 11:09:53 +0800
Subject: [PATCH] 2022-03-24
---
src/tabviews/custom/components/form/normal-form/index.jsx | 99 +++++++++++++++++++------------------------------
1 files changed, 38 insertions(+), 61 deletions(-)
diff --git a/src/tabviews/custom/components/form/normal-form/index.jsx b/src/tabviews/custom/components/form/normal-form/index.jsx
index dfc65f7..6876ca4 100644
--- a/src/tabviews/custom/components/form/normal-form/index.jsx
+++ b/src/tabviews/custom/components/form/normal-form/index.jsx
@@ -12,7 +12,6 @@
import MKEmitter from '@/utils/events.js'
import zhCN from '@/locales/zh-CN/main.js'
import enUS from '@/locales/en-US/main.js'
-import { modifyTabview } from '@/store/action'
import './index.scss'
const MutilForm = asyncSpinComponent(() => import('@/tabviews/zshare/mutilform'))
@@ -51,12 +50,12 @@
if (_sync && data && data[config.dataName]) {
_data = data[config.dataName]
if (Array.isArray(_data)) {
- _data = _data[0] || {}
+ _data = _data[0] || {$$empty: true}
}
_sync = false
}
} else {
- _data = {}
+ _data = {$$empty: true}
}
if (!config.wrap.groupLabel) {
@@ -126,7 +125,9 @@
arr_field: config.columns.map(col => col.field).join(','),
}, () => {
if (config.wrap.datatype !== 'static' && config.setting && config.setting.sync !== 'true' && config.setting.onload === 'true') {
- this.loadData()
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
}
})
}
@@ -159,12 +160,12 @@
const { sync, config, group } = this.state
if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
- let _data = {}
+ let _data = {$$empty: true}
let _group = group
if (nextProps.data && nextProps.data[config.dataName]) {
_data = nextProps.data[config.dataName]
if (Array.isArray(_data)) {
- _data = _data[0] || {}
+ _data = _data[0] || {$$empty: true}
}
}
if (config.wrap.statusControl && _data[config.wrap.statusControl]) {
@@ -186,7 +187,7 @@
if (config.uuid !== menuId) return
- this.loadData(null, 'refresh')
+ this.loadData('refresh')
}
/**
@@ -205,7 +206,7 @@
}
if (config.wrap.datatype !== 'static' && config.setting) {
- this.loadData(btn)
+ this.loadData()
}
if (id) {
@@ -218,7 +219,7 @@
resetParentParam = (MenuID, id) => {
const { config } = this.state
if (config.wrap.datatype === 'static' || !config.setting.supModule || config.setting.supModule !== MenuID) return
- if (id !== this.state.BID) {
+ if (id !== this.state.BID || id !== '') {
this.setState({ BID: id }, () => {
this.loadData()
})
@@ -246,35 +247,25 @@
let newtab = {
...menu,
- selected: true,
param: {$BID: id || ''}
}
- let tabs = this.props.tabviews.filter((tab, i) => {
- tab.selected = false
- return tab.MenuID !== newtab.MenuID
- })
-
- if (this.props.tabviews.length > tabs.length) {
- this.props.modifyTabview(fromJS(tabs).toJS())
+ if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
+ MKEmitter.emit('modifyTabs', newtab, 'replace')
+ } else {
+ MKEmitter.emit('modifyTabs', newtab, 'plus', true)
}
-
- this.setState({}, () => {
- tabs.push(newtab)
- this.props.modifyTabview(tabs)
- })
}
}
- async loadData (btn, type) {
+ async loadData (type) {
const { mainSearch, menuType } = this.props
const { config, arr_field, BID, group } = this.state
if (config.wrap.datatype === 'static' || (config.setting.supModule && !BID)) {
this.setState({
- data: {}
+ data: {$$empty: true}
})
- btn && this.execSuccess(btn)
return
}
@@ -282,7 +273,6 @@
let requireFields = searches.filter(item => item.required && item.value === '')
if (requireFields.length > 0) {
- btn && this.execSuccess(btn)
return
}
@@ -295,35 +285,26 @@
let result = await Api.genericInterface(param)
if (result.status) {
- let _data = result.data && result.data[0] ? result.data[0] : {}
+ let _data = result.data && result.data[0] ? result.data[0] : {$$empty: true}
+ let _group = group
- if (btn) {
- this.setState({
- data: _data || {},
- loading: false
- })
- this.execSuccess(btn)
- } else {
- let _group = group
-
- if (type === 'refresh') {
- _group = config.subcards[0]
- }
-
- 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]
- _group = _groups || _group
- }
- this.setState({
- group: null,
- step: _group.sort - 1,
- data: _data || {},
- loading: false
- }, () => {
- this.setState({group: _group})
- })
+ if (type === 'refresh') {
+ _group = config.subcards[0]
}
+
+ 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]
+ _group = _groups || _group
+ }
+ this.setState({
+ group: null,
+ step: _group.sort - 1,
+ data: _data || {$$empty: true},
+ loading: false
+ }, () => {
+ this.setState({group: _group})
+ })
} else {
this.setState({
loading: false,
@@ -333,7 +314,6 @@
message: result.message,
duration: 10
})
- btn && this.execSuccess(btn)
}
}
@@ -393,7 +373,7 @@
dict={dict}
data={data}
action={group}
- inputSubmit={this.handleOk}
+ inputSubmit={() => this.mkFormSubmit(group.uuid)}
wrappedComponentRef={(inst) => this.formRef = inst}
/> : null}
{group && data ? <div className={'mk-form-action ' + (group.$button || '')}>
@@ -404,7 +384,7 @@
btn={group.subButton}
setting={config.setting}
columns={config.columns}
- selectedData={[data]}
+ selectedData={data.$$empty ? [] : [data]}
/>
{group.nextButton.enable === 'true' && group.sort !== config.subcards.length ? <Button type="link" className="skip" onClick={this.nextStep} style={group.nextButton.style}>{group.nextButton.label}</Button> : null}
</div> : null}
@@ -416,14 +396,11 @@
const mapStateToProps = (state) => {
return {
permMenus: state.permMenus,
- tabviews: state.tabviews,
}
}
-const mapDispatchToProps = (dispatch) => {
- return {
- modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews))
- }
+const mapDispatchToProps = () => {
+ return {}
}
export default connect(mapStateToProps, mapDispatchToProps)(NormalForm)
\ No newline at end of file
--
Gitblit v1.8.0