From c6f8e27d35cd31bb6393a1e7f747b6b2593dbd7a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 六月 2022 13:56:57 +0800
Subject: [PATCH] 2022-06-08
---
src/tabviews/custom/components/form/normal-form/index.jsx | 93 +++++++++++++++++++---------------------------
1 files changed, 39 insertions(+), 54 deletions(-)
diff --git a/src/tabviews/custom/components/form/normal-form/index.jsx b/src/tabviews/custom/components/form/normal-form/index.jsx
index 0a3a142..7fd5624 100644
--- a/src/tabviews/custom/components/form/normal-form/index.jsx
+++ b/src/tabviews/custom/components/form/normal-form/index.jsx
@@ -5,7 +5,6 @@
import { Spin, notification, Button } from 'antd'
import Api from '@/api'
-import Utils from '@/utils/utils.js'
import UtilsDM from '@/utils/utils-datamanage.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
@@ -50,12 +49,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) {
@@ -66,15 +65,13 @@
}
}
- let roleId = sessionStorage.getItem('role_id') || ''
-
- config.subcards = config.subcards.map(group => {
- group.subButton.uuid = group.uuid
- group.subButton.$menuId = group.uuid
- group.subButton.Ot = 'requiredSgl'
- group.subButton.$forbid = true
- group.subButton.OpenType = 'formSubmit'
- group.subButton.execError = 'never'
+ config.subcards = config.subcards.map((group, i) => {
+ if (i === 0) {
+ group.prevButton.enable = 'false'
+ }
+ if (i + 1 === config.subcards.length) {
+ group.nextButton.enable = 'false'
+ }
if (group.subButton.enable === 'false') {
group.subButton.style.display = 'none'
@@ -83,25 +80,6 @@
if (group.prevButton.enable === 'false' && group.subButton.enable === 'false' && group.nextButton.enable === 'false') {
group.$button = 'no-button'
}
-
- group.fields = group.fields.map(cell => {
- // 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗�
- if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(cell.type) && cell.resourceType === '1') {
- let _option = Utils.getSelectQueryOptions(cell)
-
- cell.data_sql = Utils.formatOptions(_option.sql)
- cell.base_sql = window.btoa(window.encodeURIComponent(_option.sql))
- cell.arr_field = _option.field
- }
-
- // 瀛楁鏉冮檺榛戝悕鍗�
- if (!cell.blacklist || !roleId || cell.blacklist.length === 0) return cell
- if (cell.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
- cell.hidden = 'true'
- }
-
- return cell
- })
return group
})
@@ -125,7 +103,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)
}
})
}
@@ -158,12 +138,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]) {
@@ -195,15 +175,13 @@
* @param {*} btn // 鎵ц鐨勬寜閽�
*/
refreshByButtonResult = (menuId, position, btn, id) => {
- const { config, group } = this.state
+ const { config, group, BID } = this.state
if (group.uuid !== menuId) return
- if (btn.syncComponentId && btn.syncComponentId !== config.uuid && btn.syncComponentId !== config.setting.supModule) {
- MKEmitter.emit('reloadData', btn.syncComponentId) // 鍚岀骇鏍囩鍒锋柊
- }
-
- if (config.wrap.datatype !== 'static' && config.setting) {
+ if (position === 'mainline' && config.setting.supModule && BID) {
+ MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ } else {
this.loadData()
}
@@ -216,8 +194,10 @@
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()
})
@@ -245,25 +225,24 @@
let newtab = {
...menu,
- selected: true,
param: {$BID: id || ''}
}
if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
MKEmitter.emit('modifyTabs', newtab, 'replace')
} else {
- MKEmitter.emit('modifyTabs', newtab, 'plus')
+ MKEmitter.emit('modifyTabs', newtab, 'plus', true)
}
}
}
async loadData (type) {
const { mainSearch, menuType } = this.props
- const { config, arr_field, BID, group } = this.state
+ const { config, arr_field, BID } = this.state
if (config.wrap.datatype === 'static' || (config.setting.supModule && !BID)) {
this.setState({
- data: {}
+ data: {$$empty: true}
})
return
}
@@ -284,8 +263,8 @@
let result = await Api.genericInterface(param)
if (result.status) {
- let _data = result.data && result.data[0] ? result.data[0] : {}
- let _group = group
+ let _data = result.data && result.data[0] ? result.data[0] : {$$empty: true}
+ let _group = this.state.group
if (type === 'refresh') {
_group = config.subcards[0]
@@ -296,10 +275,17 @@
let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
_group = _groups || _group
}
+
+ let step = this.state.step
+
+ if (config.subcards.length !== _group.sort || config.subcards.length !== step) {
+ step = _group.sort - 1
+ }
+
this.setState({
group: null,
- step: _group.sort - 1,
- data: _data || {},
+ step: step,
+ data: _data,
loading: false
}, () => {
this.setState({group: _group})
@@ -350,7 +336,7 @@
const { config, loading, BID, data, group, dict, step } = this.state
return (
- <div className="custom-normal-form-box" style={{...config.style}}>
+ <div className="custom-normal-form-box" id={'anchor' + config.uuid} style={{...config.style}}>
{loading ?
<div className="loading-mask">
<div className="ant-spin-blur"></div>
@@ -376,16 +362,15 @@
wrappedComponentRef={(inst) => this.formRef = inst}
/> : null}
{group && data ? <div className={'mk-form-action ' + (group.$button || '')}>
- {group.sort !== 1 && group.prevButton.enable !== 'false' ? <Button type="link" className="prev" onClick={this.prevStep} style={group.prevButton.style}>{group.prevButton.label}</Button> : null}
+ {group.prevButton.enable === 'true' ? <Button type="link" className="prev" onClick={this.prevStep} style={group.prevButton.style}>{group.prevButton.label}</Button> : null}
<NormalButton
BID={BID}
- position="form"
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}
+ {group.nextButton.enable === 'true' ? <Button type="link" className="skip" onClick={this.nextStep} style={group.nextButton.style}>{group.nextButton.label}</Button> : null}
</div> : null}
</div>
)
--
Gitblit v1.8.0