From da34633b25d16359cd91a656acad5e811f9972b7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 14 三月 2023 18:09:54 +0800
Subject: [PATCH] 2023-03-14
---
src/tabviews/custom/components/form/simple-form/index.jsx | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx
index 31331d5..96156c2 100644
--- a/src/tabviews/custom/components/form/simple-form/index.jsx
+++ b/src/tabviews/custom/components/form/simple-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, Modal } from 'antd'
+import { Spin, notification, Modal, Button } from 'antd'
import Api from '@/api'
import UtilsDM from '@/utils/utils-datamanage.js'
@@ -57,12 +57,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}
@@ -70,7 +71,7 @@
let _group = config.subcards[0]
- if (_group.subButton.enable === 'false') {
+ if (_group.subButton.enable === 'false' && (!_group.closeButton || _group.closeButton.enable !== 'true')) {
_group.subButton.style.display = 'none'
_group.$button = 'no-button'
}
@@ -127,6 +128,8 @@
_data = _data[0] || {$$empty: true}
}
}
+
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
this.setState({sync: false, data: _data})
} else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
@@ -204,11 +207,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)
}
}
@@ -248,6 +247,8 @@
if (result.status) {
let _data = result.data && result.data[0] ? result.data[0] : {$$empty: true}
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
+
this.setState({
data: null,
loading: false
@@ -283,9 +284,18 @@
})
}
+ closeTab = () => {
+ const { group } = this.state
+
+ MKEmitter.emit('closeTabView', group.subButton.$MenuID)
+ }
+
render() {
const { config, loading, BID, BData, data, group, dict } = this.state
+ if (config.wrap.empty === 'hidden' && (!data || data.$$empty)) return null
+ if (config.idCtrl && (!data || data.$$empty)) return null
+
return (
<div className="custom-simple-form-box" id={'anchor' + config.uuid} style={{...config.style}}>
{loading ?
@@ -301,6 +311,7 @@
dict={dict}
data={data}
action={group}
+ unload={config.setting.supModule && !BID}
inputSubmit={() => this.mkFormSubmit(group.uuid)}
wrappedComponentRef={(inst) => this.formRef = inst}
/> : null}
@@ -312,6 +323,7 @@
columns={config.columns}
selectedData={data.$$empty ? [] : [data]}
/>
+ {group.closeButton && group.closeButton.enable === 'true' ? <Button type="link" onClick={this.closeTab} style={group.closeButton.style}>{group.closeButton.label}</Button> : null}
</div> : null}
</div>
)
--
Gitblit v1.8.0