From 06a670976e2145a10ea05207041d3cf3164cd380 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 18:13:25 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/menu/components/card/cardcellcomponent/index.jsx | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index 5460326..b58ca78 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -245,6 +245,10 @@
} else if (_card.eleType === 'picture') {
_card.style = style
delete _card.style.backgroundImage
+ delete _card.style.paddingTop
+ delete _card.style.paddingBottom
+ delete _card.style.paddingLeft
+ delete _card.style.paddingRight
} else {
_card.style = style
}
@@ -310,8 +314,9 @@
supId = ''
}
}
+ let menu = window.GLOB.customMenu
- let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, cards.uuid, supId, true)
+ let modules = MenuUtils.getSubModules(menu.components, cards.uuid, supId, menu.interfaces || null)
if (cards.subtype === 'basetable') {
this.setState({
@@ -320,7 +325,7 @@
formlist: getBaseTableActionForm(card, functip, cards, usefulFields, modules)
})
} else {
- let anchors = MenuUtils.getAnchors(window.GLOB.customMenu.components, cards.uuid) || []
+ let anchors = MenuUtils.getAnchors(menu.components, cards.uuid) || []
this.setState({
actvisible: true,
@@ -414,6 +419,10 @@
res.innerHeight = res.barHeight + (res.displayValue === 'true' ? fontSize + 2 : 0)
} else if (res.eleType === 'picture') {
delete res.style.backgroundImage
+ delete res.style.paddingTop
+ delete res.style.paddingBottom
+ delete res.style.paddingLeft
+ delete res.style.paddingRight
}
return res
--
Gitblit v1.8.0