From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 21:11:56 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/tabviews/custom/components/form/tab-form/index.jsx | 119 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 80 insertions(+), 39 deletions(-)
diff --git a/src/tabviews/custom/components/form/tab-form/index.jsx b/src/tabviews/custom/components/form/tab-form/index.jsx
index 6286532..5e0c3cf 100644
--- a/src/tabviews/custom/components/form/tab-form/index.jsx
+++ b/src/tabviews/custom/components/form/tab-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 } from 'antd'
import Api from '@/api'
import UtilsDM from '@/utils/utils-datamanage.js'
@@ -45,8 +45,12 @@
}
if (_config.wrap.datatype === 'dynamic') {
- _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
+ _config.setting.onload = _config.setting.sync === 'true' ? 'false' : _config.setting.onload || 'true'
+ if (_config.setting.supModule && !BID) {
+ _config.setting.onload = 'false'
+ }
+
if (_config.setting.sync === 'true' && window.GLOB.SyncData.has(_config.dataName)) {
_data = window.GLOB.SyncData.get(_config.dataName) || []
_data = _data[0] || {$$empty: true}
@@ -55,6 +59,13 @@
_config.setting.sync = 'false'
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}
@@ -98,14 +109,17 @@
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()
@@ -120,10 +134,12 @@
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)
}
@@ -153,6 +169,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
@@ -160,6 +193,24 @@
this.setState({}, () => {
this.loadData()
+ })
+ }
+
+ /**
+ * @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
})
}
@@ -178,12 +229,18 @@
* @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)
+ 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()
}
@@ -212,7 +269,9 @@
})
} else {
this.setState({ BID: id, BData: data }, () => {
- this.loadData()
+ if (config.wrap.datatype !== 'public') {
+ this.loadData()
+ }
})
}
}
@@ -221,7 +280,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
@@ -237,7 +296,10 @@
async loadData () {
const { config, BID } = this.state
- if (config.wrap.datatype === 'static') {
+ if (config.wrap.datatype === 'public') {
+ MKEmitter.emit('reloadData', config.wrap.publicId)
+ return
+ } else if (config.wrap.datatype === 'static') {
this.setState({
data: {$$empty: true}
})
@@ -283,46 +345,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) => {
const { group } = this.state
if (group.uuid !== btnId) return
this.formRef.handleConfirm().then(res => {
MKEmitter.emit('triggerFormSubmit', {menuId: btnId, form: res})
+ }, () => {
+ callback && callback()
})
}
--
Gitblit v1.8.0