From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/form/tab-form/index.jsx | 98 ++++++++++++++++++------------------------------
1 files changed, 37 insertions(+), 61 deletions(-)
diff --git a/src/tabviews/custom/components/form/tab-form/index.jsx b/src/tabviews/custom/components/form/tab-form/index.jsx
index de65619..fc90e76 100644
--- a/src/tabviews/custom/components/form/tab-form/index.jsx
+++ b/src/tabviews/custom/components/form/tab-form/index.jsx
@@ -5,7 +5,6 @@
import { Spin, notification } 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'
@@ -23,7 +22,6 @@
data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
- menuType: PropTypes.any, // 鑿滃崟绫诲瀷
}
state = {
@@ -32,12 +30,13 @@
config: null, // 鍥捐〃閰嶇疆淇℃伅
loading: false, // 鏁版嵁鍔犺浇鐘舵��
sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
- data: null, // 鏁版嵁
+ data: null,
+ BData: '',
group: null,
}
UNSAFE_componentWillMount () {
- const { data, BID } = this.props
+ const { data, BID, BData } = this.props
let config = fromJS(this.props.config).toJS()
let _data = null
@@ -65,45 +64,11 @@
}
}
- 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 = config.wrap.datatype === 'static' ? 'notRequired' : 'requiredSgl'
- group.subButton.$forbid = true
- group.subButton.OpenType = 'formSubmit'
- group.subButton.execError = 'never'
-
- group.subButton.syncComponentId = group.subButton.syncComponent ? group.subButton.syncComponent.pop() : ''
-
- if (group.subButton.syncComponentId === config.uuid) {
- group.subButton.syncComponentId = ''
- }
-
if (group.subButton.enable === 'false') {
group.subButton.style.display = 'none'
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
})
@@ -113,6 +78,7 @@
data: _data,
group: config.subcards[0],
BID: BID || '',
+ BData: BData || '',
config: config,
arr_field: config.columns.map(col => col.field).join(','),
}, () => {
@@ -186,16 +152,14 @@
* @param {*} btn // 鎵ц鐨勬寜閽�
*/
refreshByButtonResult = (menuId, position, btn, id) => {
- const { config, group } = this.state
+ const { config, group, BID } = this.state
if (group.uuid !== menuId) return
- btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
-
- if (!btn.syncComponentId || btn.syncComponentId !== config.setting.supModule) {
- if (config.wrap.datatype !== 'static' && config.setting) {
- this.loadData()
- }
+ if (position === 'mainline' && config.setting.supModule && BID) {
+ MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ } else {
+ this.loadData()
}
if (id) {
@@ -205,13 +169,26 @@
this.execSuccess(btn, id)
}
- resetParentParam = (MenuID, id) => {
+ resetParentParam = (MenuID, id, data) => {
const { config } = this.state
- if (config.wrap.datatype === 'static' || !config.setting.supModule || config.setting.supModule !== MenuID) return
+ if (!config.setting.supModule || config.setting.supModule !== MenuID) return
+
if (id !== this.state.BID || id !== '') {
- this.setState({ BID: id }, () => {
- this.loadData()
- })
+ if (config.wrap.datatype === 'static' || (config.setting.supModule && !id)) {
+ this.setState({
+ data: null,
+ BID: id,
+ BData: data
+ }, () => {
+ this.setState({
+ data: {$$empty: true}
+ })
+ })
+ } else {
+ this.setState({ BID: id, BData: data }, () => {
+ this.loadData()
+ })
+ }
}
}
@@ -236,12 +213,14 @@
}
async loadData () {
- const { mainSearch, menuType } = this.props
- const { config, arr_field, BID, group } = this.state
+ const { mainSearch } = this.props
+ const { config, arr_field, BID } = this.state
if (config.wrap.datatype === 'static' || (config.setting.supModule && !BID)) {
this.setState({
- data: {$$empty: true}
+ data: null
+ }, () => {
+ this.setState({data: {$$empty: true}})
})
return
}
@@ -258,20 +237,17 @@
})
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 1, BID, menuType)
+ let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 1, BID)
let result = await Api.genericInterface(param)
if (result.status) {
let _data = result.data && result.data[0] ? result.data[0] : {$$empty: true}
- let _group = group
-
this.setState({
- group: null,
- data: _data || {$$empty: true},
+ data: null,
loading: false
}, () => {
- this.setState({group: _group})
+ this.setState({data: _data})
})
} else {
this.setState({
@@ -304,7 +280,7 @@
}
render() {
- const { config, loading, BID, data, group, dict } = this.state
+ const { config, loading, BID, BData, data, group, dict } = this.state
return (
<div className="custom-tab-form-box" id={'anchor' + config.uuid} style={{...config.style}}>
@@ -323,6 +299,7 @@
</div> : null}
{group && data ? <MutilForm
BID={BID}
+ BData={BData}
dict={dict}
data={data}
action={group}
@@ -332,7 +309,6 @@
{group && data ? <div className={'mk-form-action ' + (group.$button || '')}>
<NormalButton
BID={BID}
- position="form"
btn={group.subButton}
setting={config.setting}
columns={config.columns}
--
Gitblit v1.8.0