From 03a22ec6f9ad7303d10b4c65bb5bc6fa5cbd448a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 22 十月 2022 23:21:42 +0800
Subject: [PATCH] 2022-10-22
---
src/menu/components/share/actioncomponent/index.jsx | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 4a6ebd9..0f29f3c 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -169,15 +169,6 @@
functip = ''
}
- if (config.subtype === 'basetable') {
- this.setState({
- visible: true,
- card: card,
- formlist: getBaseTableActionForm(card, functip, config, usefulFields)
- })
- return
- }
-
let supId = ''
if (config.setting && config.setting.supModule) {
let pid = config.setting.supModule[config.setting.supModule.length - 1]
@@ -188,14 +179,25 @@
}
}
- let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, config.uuid, supId) || []
- let anchors = MenuUtils.getAnchors(window.GLOB.customMenu.components, config.uuid) || []
+ let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, config.uuid, supId)
- this.setState({
- visible: true,
- card: card,
- formlist: getActionForm(card, functip, config, usefulFields, modules, anchors)
- })
+ if (config.subtype === 'basetable') {
+ delete card.eleType // 鍖哄垎鎸夐挳浣嶇疆
+
+ this.setState({
+ visible: true,
+ card: card,
+ formlist: getBaseTableActionForm(card, functip, config, usefulFields, modules)
+ })
+ } else {
+ let anchors = MenuUtils.getAnchors(window.GLOB.customMenu.components, config.uuid) || []
+
+ this.setState({
+ visible: true,
+ card: card,
+ formlist: getActionForm(card, functip, config, usefulFields, modules, anchors)
+ })
+ }
}
/**
@@ -243,9 +245,9 @@
if (config.subtype === 'basetable') {
let _c = btn.class.replace('border-', '')
if (btn.class.indexOf('border') > -1 || btn.class === 'default') {
- btn.style = {color: color[_c], backgroundColor: '#fff', borderColor: color[_c]}
+ btn.style = {color: color[_c], backgroundColor: '#fff', borderColor: color[_c], marginRight: '15px'}
} else {
- btn.style = {color: '#fff', backgroundColor: color[_c], borderColor: color[_c]}
+ btn.style = {color: '#fff', backgroundColor: color[_c], borderColor: color[_c], marginRight: '15px'}
}
} else {
btn.style = item.style || {}
@@ -435,7 +437,7 @@
let btn = null
let _col = null
- if (config.subtype === 'normaltable' || config.subtype === 'editable') {
+ if (config.subtype === 'normaltable' || config.subtype === 'editable' || config.subtype === 'basetable') {
config.cols.forEach(col => {
if (col.type !== 'action') return
--
Gitblit v1.8.0