From 8f78c97ffcde201e2a4d1ffa7ccb97a13f0f045d Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 18 四月 2024 15:34:15 +0800 Subject: [PATCH] 2024-04-18 --- src/tabviews/custom/components/form/step-form/index.jsx | 61 ++++++++++++++---------------- 1 files changed, 28 insertions(+), 33 deletions(-) diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx index dca74c9..50e227b 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, Modal } from 'antd' +import { Spin, Button } from 'antd' import Api from '@/api' import UtilsDM from '@/utils/utils-datamanage.js' @@ -131,11 +131,8 @@ 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) @@ -143,6 +140,8 @@ if (config.wrap.datatype === 'public') { MKEmitter.addListener('mkPublicData', this.mkPublicData) + } else if (config.setting.useMSearch) { + MKEmitter.addListener('searchRefresh', this.searchRefresh) } this.initExec() @@ -162,6 +161,7 @@ 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) } @@ -226,6 +226,24 @@ }) } + /** + * @description 鑾峰彇缁勪欢鎼滅储 + */ + queryModuleParam = (menuId, callback) => { + const { config } = this.state + + if (config.uuid !== menuId) return + + let searches = [] + if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢 + searches = window.GLOB.SearchBox.get(config.$searchId) || [] + } + + callback({ + search: searches + }) + } + reloadData = (menuId, id) => { const { config } = this.state @@ -241,9 +259,9 @@ * @param {*} btn // 鎵ц鐨勬寜閽� */ refreshByButtonResult = (menuId, position, btn, id) => { - const { config, group, BID } = this.state + const { config, 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) @@ -387,36 +405,13 @@ 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) } } @@ -495,7 +490,7 @@ inputSubmit={() => this.mkFormSubmit(group.uuid)} wrappedComponentRef={(inst) => this.formRef = inst} /> : null} - {group && data ? <div className={'mk-form-action ' + (group.$button || '')}> + {group && data ? <div className={'mk-form-action ' + (group.$button || '') + (group.nextButton.enable === 'true' ? ' has-skip' : '')}> {group.prevButton.enable === 'true' ? <Button type="link" className="prev" onClick={this.prevStep} style={group.prevButton.style}>{group.prevButton.label}</Button> : null} <NormalButton BID={BID} -- Gitblit v1.8.0