From 71a0e75ecb56ae643fe1e86188d45f93f48388c9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 28 八月 2020 14:07:41 +0800
Subject: [PATCH] 2020-08-28
---
src/menu/actioncomponent/index.jsx | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/menu/actioncomponent/index.jsx b/src/menu/actioncomponent/index.jsx
index 5776ff9..b9185b7 100644
--- a/src/menu/actioncomponent/index.jsx
+++ b/src/menu/actioncomponent/index.jsx
@@ -10,7 +10,7 @@
import DevUtils from '@/utils/devutils.js'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
-import { getActionForm } from '@/templates/zshare/formconfig'
+import { getActionForm } from './formconfig'
import ActionForm from './actionform'
import VerifyCard from '@/templates/zshare/verifycard'
@@ -85,7 +85,9 @@
*/
handleAction = (card) => {
const { menu } = this.props
- let ableField = this.props.usefulFields.join(', ')
+ const { config } = this.props
+
+ let ableField = menu.permFuncField ? menu.permFuncField.join(', ') : ''
let functip = <div>
<p style={{marginBottom: '5px'}}>{this.state.dict['model.tooltip.func.innerface'].replace('@ableField', ableField)}</p>
<p>{this.state.dict['model.tooltip.func.outface']}</p>
@@ -149,14 +151,14 @@
this.setState({
visible: true,
card: card,
- formlist: getActionForm(card, functip, this.props.config, this.props.usefulFields, this.props.type, menulist)
+ formlist: getActionForm(card, functip, config.setting, menu.permFuncField, this.props.type, menulist)
})
})
} else {
this.setState({
visible: true,
card: card,
- formlist: getActionForm(card, functip, this.props.config, this.props.usefulFields, this.props.type, menulist)
+ formlist: getActionForm(card, functip, config.setting, menu.permFuncField, this.props.type, menulist)
})
}
}
@@ -875,12 +877,13 @@
}
render() {
- const { config } = this.props
+ const { config, type } = this.props
const { actionlist, visible, card, dict, copying, profVisible } = this.state
return (
<div className="model-custom-chart-action-list">
<DragElement
+ type={type}
list={actionlist}
setting={this.props.config.setting}
handleList={this.handleList}
--
Gitblit v1.8.0