From 66cc7818cf5e13c44f4372e7d47fb72df7d2f752 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 16 九月 2022 10:30:14 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/index.jsx | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 937d2f3..550fc4f 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -25,7 +25,6 @@
class ActionComponent extends Component {
static propTpyes = {
- type: PropTypes.string, // 鑿滃崟绫诲瀷锛屼富琛ㄦ垨瀛愯〃
config: PropTypes.object, // 鑿滃崟閰嶇疆淇℃伅
setSubConfig: PropTypes.func, // 璁剧疆瀛愰厤缃俊鎭�
updateaction: PropTypes.func // 鑿滃崟閰嶇疆鏇存柊
@@ -199,7 +198,7 @@
this.setState({
visible: true,
card: card,
- formlist: getActionForm(card, functip, config, usefulFields, this.props.type, menulist, modules, anchors)
+ formlist: getActionForm(card, functip, config, usefulFields, menulist, modules, anchors)
})
}
@@ -246,9 +245,8 @@
if (item.uuid === btn.uuid) {
btn.style = item.style || {}
-
- if (btn.class !== item.class || btn.show !== item.show || !btn.style.color) {
- if (btn.show === 'link' || btn.show === 'icon') {
+ if (btn.class !== item.class || btn.show !== item.show || !btn.style.color || item.focus) {
+ if (btn.show === 'icon') {
btn.style.color = color[btn.class]
btn.style.backgroundColor = 'transparent'
} else {
@@ -436,13 +434,15 @@
let config = fromJS(this.props.config).toJS()
let btn = null
- if (config.subtype === 'normaltable') {
+ let _col = null
+ if (config.subtype === 'normaltable' || config.subtype === 'editable') {
config.cols.forEach(col => {
if (col.type !== 'action') return
col.elements = col.elements.filter(item => {
if (item.uuid === id) {
btn = item
+ _col = col
}
return item.uuid !== id
})
@@ -451,8 +451,9 @@
if (!btn) return
- btn.Ot = 'requiredSgl'
config.action.push(btn)
+
+ MKEmitter.emit('cardDelElement', _col.uuid, btn.uuid)
this.setState({
actionlist: config.action
@@ -507,14 +508,14 @@
}
render() {
- const { config, type } = this.props
+ const { config } = this.props
const { actionlist, visible, appType, card, dict, profVisible, record } = this.state
return (
<div className={'model-menu-action-list length' + actionlist.length}>
<DragElement
list={actionlist}
- type={appType === 'mob' ? (type || '') : ''}
+ type={appType === 'mob' ? config.subtype : ''}
handleList={this.handleList}
dropButton={this.dropButton}
handleMenu={this.handleAction}
--
Gitblit v1.8.0