From 7bd04b1c21a59e8d79325f247bdb1726507b51fb Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 13 八月 2024 18:51:20 +0800 Subject: [PATCH] 2024-08-13 --- src/tabviews/custom/components/form/simple-form/index.jsx | 234 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 174 insertions(+), 60 deletions(-) diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx index a92f2cf..d6c4abc 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, Button } from 'antd' +import { Spin, Button } from 'antd' import Api from '@/api' import UtilsDM from '@/utils/utils-datamanage.js' @@ -25,8 +25,7 @@ loading: false, data: null, group: null, - BData: '', - step: 0 + BData: '' } UNSAFE_componentWillMount () { @@ -46,7 +45,9 @@ BID = BData.$BID || '' } - if (_config.wrap.datatype !== 'static') { + if (_config.wrap.datatype === 'dynamic') { + _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true' + if (_config.setting.sync === 'true' && window.GLOB.SyncData.has(_config.dataName)) { _data = window.GLOB.SyncData.get(_config.dataName) || [] _data = _data[0] || {$$empty: true} @@ -56,13 +57,24 @@ window.GLOB.SyncData.delete(_config.dataName) } + } else if (_config.wrap.datatype === 'public') { + if (window.GLOB.CacheData.has(_config.wrap.publicId)) { + _data = window.GLOB.CacheData.get(_config.wrap.publicId) + _data = fromJS(_data).toJS() + _data.$$BID = BID || '' + _data.$$BData = BData || '' + } } else { _data = {$$empty: true} } let _group = _config.subcards[0] - if (_group.subButton.enable === 'false' && (!_group.closeButton || _group.closeButton.enable !== 'true')) { + if (_config.wrap.refocus) { + _group.setting.refocus = _config.wrap.refocus + } + + if (_group.subButton.enable === 'false' && (!_group.closeButton || _group.closeButton.enable !== 'true') && (!_group.resetButton || _group.resetButton.enable !== 'true')) { _group.subButton.style.display = 'none' _group.$button = 'no-button' } @@ -72,14 +84,7 @@ group: _group, BID: BID || '', BData: BData || '', - config: _config, - arr_field: _config.columns.map(col => col.field).join(','), - }, () => { - if (config.wrap.datatype !== 'static' && config.setting.sync !== 'true' && config.setting.onload === 'true') { - setTimeout(() => { - this.loadData() - }, config.setting.delay || 0) - } + config: _config }) } @@ -89,15 +94,20 @@ MKEmitter.addListener('reloadData', this.reloadData) MKEmitter.addListener('mkFormSubmit', this.mkFormSubmit) MKEmitter.addListener('resetSelectLine', this.resetParentParam) + MKEmitter.addListener('queryModuleParam', this.queryModuleParam) MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult) - - if (config.setting.useMSearch) { - MKEmitter.addListener('searchRefresh', this.searchRefresh) - } if (config.setting.sync === 'true') { MKEmitter.addListener('transferSyncData', this.transferSyncData) } + + if (config.wrap.datatype === 'public') { + MKEmitter.addListener('mkPublicData', this.mkPublicData) + } else if (config.setting.useMSearch) { + MKEmitter.addListener('searchRefresh', this.searchRefresh) + } + + this.initExec() } shouldComponentUpdate (nextProps, nextState) { @@ -109,11 +119,23 @@ return } MKEmitter.removeListener('reloadData', this.reloadData) + MKEmitter.removeListener('mkPublicData', this.mkPublicData) MKEmitter.removeListener('mkFormSubmit', this.mkFormSubmit) MKEmitter.removeListener('searchRefresh', this.searchRefresh) MKEmitter.removeListener('resetSelectLine', this.resetParentParam) MKEmitter.removeListener('transferSyncData', this.transferSyncData) + MKEmitter.removeListener('queryModuleParam', this.queryModuleParam) MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult) + } + + initExec = () => { + const { config } = this.state + + if (config.wrap.datatype === 'dynamic' && config.setting.onload === 'true') { + setTimeout(() => { + this.loadData() + }, config.setting.delay || 0) + } } transferSyncData = (syncId) => { @@ -132,6 +154,23 @@ MKEmitter.removeListener('transferSyncData', this.transferSyncData) } + mkPublicData = (publicId, data) => { + const { config, BID, BData } = this.state + + if (config.wrap.datatype === 'public' && config.wrap.publicId === publicId) { + let _data = fromJS(data).toJS() + + _data.$$BID = BID || '' + _data.$$BData = BData || '' + + this.setState({ + data: null + }, () => { + this.setState({data: _data}) + }) + } + } + searchRefresh = (searchId) => { const { config } = this.state @@ -142,29 +181,102 @@ }) } - reloadData = (menuId, id) => { + /** + * @description 鑾峰彇缁勪欢鎼滅储 + */ + queryModuleParam = (menuId, callback) => { const { config } = this.state if (config.uuid !== menuId) return - this.loadData() + let searches = [] + if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢 + searches = window.GLOB.SearchBox.get(config.$searchId) || [] + } + + callback({ + search: searches + }) + } + + reloadData = (menuId, id) => { + const { config, group } = this.state + + if (config.uuid !== menuId) return + + if (id === 'focus-refresh' && config.wrap.refocus) { + let _group = fromJS(group).toJS() + _group.setting.focus = config.wrap.refocus + + if (config.wrap.datatype === 'static') { + this.setState({ + data: null, + group: _group + }, () => { + this.setState({data: {$$empty: true}}) + }) + } else { + this.setState({ + group: _group + }, () => { + this.loadData(true) + }) + } + } else if (id === 'focus-nofresh' && config.wrap.refocus) { + let formId = '' + group.fields.forEach(item => { + if (item.field === config.wrap.refocus) { + formId = item.uuid + } + }) + MKEmitter.emit('mkFC', 'focus', formId) + } else { + this.loadData() + } } /** * @description 鎸夐挳鎵ц瀹屾垚鍚庨〉闈㈠埛鏂� - * @param {*} menuId // 鑿滃崟Id - * @param {*} position // 鍒锋柊浣嶇疆 - * @param {*} btn // 鎵ц鐨勬寜閽� */ - refreshByButtonResult = (menuId, position, btn, id) => { + refreshByButtonResult = (menuId, position, btn, id, lines, res) => { const { config, group, BID } = this.state - if (group.uuid !== menuId) return + if (config.uuid !== menuId) return - if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { - MKEmitter.emit('reloadData', config.setting.supModule, BID) + if (position === 'resetData') { + let _data = fromJS(this.state.data || {}).toJS() + + Object.keys(_data).forEach(key => { + let _key = key.toLowerCase() + if (typeof(res[_key]) !== 'undefined') { + _data[key] = res[_key] + } + }) + + this.setState({ + data: _data + }) + return + } + if (position === 'grid' && config.wrap.refocus) { + let _group = fromJS(group).toJS() + _group.setting.focus = config.wrap.refocus + + this.setState({ + group: _group + }) + } + + 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 + }, () => { + this.setState({data: {$$empty: true}}) + }) } else { - this.loadData() + this.loadData(position === 'grid') } if (id) { @@ -201,7 +313,7 @@ execSuccess = (btn, id) => { if (btn.linkmenu && btn.linkmenu.length > 0) { let menu_id = btn.linkmenu[btn.linkmenu.length - 1] - let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || '' + let menu = window.GLOB.mkThdMenus.get(menu_id) || '' if (!menu) return @@ -214,10 +326,22 @@ } } - async loadData () { - const { config, arr_field, BID } = this.state + async loadData (refocus) { + const { config, BID, group } = this.state - if (config.wrap.datatype === 'static') { + if (config.wrap.refocus && !refocus && group.setting.focus === config.wrap.refocus) { + let _group = fromJS(group).toJS() + _group.setting.focus = config.wrap.focus + + this.setState({ + group: _group + }) + } + + if (config.wrap.datatype === 'public') { + MKEmitter.emit('reloadData', config.wrap.publicId) + return + } else if (config.wrap.datatype === 'static') { this.setState({ data: {$$empty: true} }) @@ -246,7 +370,7 @@ }) let _orderBy = config.setting.order || '' - let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 1, BID) + let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, 1, 1, BID) let result = await Api.genericInterface(param) if (result.status) { @@ -263,46 +387,25 @@ MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid, _data) - if (result.message) { - if (result.ErrCode === 'Y') { - Modal.success({ - title: result.message - }) - } else if (result.ErrCode === 'S') { - notification.success({ - top: 92, - message: result.message, - duration: 2 - }) - } - } + UtilsDM.querySuccess(result) } else { this.setState({ loading: false, }) - if (!result.message) return - if (result.ErrCode === 'N') { - Modal.error({ - title: result.message, - }) - } else if (result.ErrCode !== '-2') { - notification.error({ - top: 92, - message: result.message, - duration: 10 - }) - } + UtilsDM.queryFail(result) } } - mkFormSubmit = (btnId) => { + mkFormSubmit = (btnId, callback, formId) => { const { group } = this.state if (group.uuid !== btnId) return - this.formRef.handleConfirm().then(res => { + this.formRef.handleConfirm(formId).then(res => { MKEmitter.emit('triggerFormSubmit', {menuId: btnId, form: res}) + }, () => { + callback && callback() }) } @@ -310,6 +413,16 @@ const { group } = this.state MKEmitter.emit('closeTabView', group.subButton.$MenuID) + } + + resetTab = () => { + const { data } = this.state + + this.setState({ + data: null + }, () => { + this.setState({data: data}) + }) } render() { @@ -333,7 +446,7 @@ data={data} action={group} unload={config.setting.supModule && !BID} - inputSubmit={() => this.mkFormSubmit(group.uuid)} + inputSubmit={(id) => this.mkFormSubmit(group.uuid, null, id)} wrappedComponentRef={(inst) => this.formRef = inst} /> : null} {data ? <div className={'mk-form-action ' + (group.$button || '')}> @@ -344,6 +457,7 @@ columns={config.columns} selectedData={data.$$empty ? [] : [data]} /> + {group.resetButton && group.resetButton.enable === 'true' ? <Button type="link" onClick={this.resetTab} style={group.resetButton.style}>{group.resetButton.label}</Button> : null} {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