From af89cc791fc928578740a62917e9ee32a8a23d6b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 23:24:23 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/index.jsx | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index de91452..8204e57 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -38,7 +38,8 @@
formlist: null, // 琛ㄥ崟淇℃伅
actionlist: null, // 鎸夐挳缁�
visible: false, // 妯℃�佹鎺у埗
- profVisible: false // 楠岃瘉淇℃伅妯℃�佹
+ profVisible: false, // 楠岃瘉淇℃伅妯℃�佹
+ record: null
}
/**
@@ -185,11 +186,12 @@
}
let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, config.uuid) || []
+ let anchors = MenuUtils.getAnchors(window.GLOB.customMenu.components, config.uuid) || []
this.setState({
visible: true,
card: card,
- formlist: getActionForm(card, functip, config, usefulFields, this.props.type, menulist, modules)
+ formlist: getActionForm(card, functip, config, usefulFields, this.props.type, menulist, modules, anchors)
})
}
@@ -494,7 +496,7 @@
render() {
const { config, type } = this.props
- const { actionlist, visible, appType, card, dict, profVisible } = this.state
+ const { actionlist, visible, appType, card, dict, profVisible, record } = this.state
return (
<div className={'model-menu-action-list'}>
@@ -511,14 +513,13 @@
/>
{/* 缂栬緫鎸夐挳锛氬鍒躲�佺紪杈� */}
<Modal
- // title={dict['model.action'] + '-' + (card && card.copyType === 'action' ? dict['model.copy'] : dict['model.edit'])}
title="鎸夐挳路缂栬緫"
visible={visible}
width={850}
maskClosable={false}
onCancel={this.editModalCancel}
footer={[
- <CreateFunc key="create" dict={dict} ref="btnCreatFunc" trigger={this.creatFunc}/>,
+ record && record.intertype === 'inner' ? <CreateFunc key="create" dict={dict} ref="btnCreatFunc" trigger={this.creatFunc}/> : null,
<Button key="cancel" onClick={this.editModalCancel}>{dict['model.cancel']}</Button>,
<Button key="confirm" type="primary" onClick={this.handleSubmit}>{dict['model.confirm']}</Button>
]}
@@ -530,6 +531,7 @@
formlist={this.state.formlist}
inputSubmit={this.handleSubmit}
setting={config.setting}
+ updRecord={(record) => this.setState({record: fromJS(record).toJS()})}
wrappedComponentRef={(inst) => this.actionFormRef = inst}
/>
</Modal>
--
Gitblit v1.8.0