From 1bec8d69cf14bd88591eee5b0320c5c8f6c25a08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 三月 2024 21:19:31 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/index.jsx | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 3599e68..4029b06 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -136,7 +136,7 @@
changeBtnStyle = (element) => {
let _style = element.style ? fromJS(element.style).toJS() : {}
- let options = ['font', 'border', 'background', 'margin', 'padding']
+ let options = ['font', 'border', 'background', 'margin', 'padding', 'minHeight']
this.setState({
card: element
@@ -206,8 +206,10 @@
supId = ''
}
}
+
+ let menu = window.GLOB.customMenu
- let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, config.uuid, supId)
+ let modules = MenuUtils.getSubModules(menu.components, config.uuid, supId, menu.interfaces || null)
if (config.subtype === 'basetable') {
delete card.eleType // 鍖哄垎鎸夐挳浣嶇疆
@@ -218,7 +220,7 @@
formlist: getBaseTableActionForm(card, functip, config, usefulFields, modules)
})
} else {
- let anchors = MenuUtils.getAnchors(window.GLOB.customMenu.components, config.uuid) || []
+ let anchors = MenuUtils.getAnchors(menu.components, config.uuid) || []
this.setState({
visible: true,
@@ -283,12 +285,17 @@
output: 'true',
required: 'false',
type: 'text',
+ noValue: 'true',
uuid: Utils.getuuid()
}
if (item.type === 'number') {
cell.type = 'number'
cell.decimal = item.decimal
+
+ if (item.noValue === 'hide') {
+ cell.noValue = 'false'
+ }
}
columns.push(cell)
@@ -407,10 +414,11 @@
btn.style = item.style || {}
if (btn.class) {
if (btn.class !== item.class || btn.show !== item.show || !btn.style.color || (item.focus && !btn.style.color)) {
- if (btn.show === 'icon') {
- btn.style.color = color[btn.class]
- btn.style.backgroundColor = 'transparent'
- } else if (btn.class === 'default') {
+ // if (btn.show === 'icon') {
+ // btn.style.color = color[btn.class]
+ // btn.style.backgroundColor = 'transparent'
+ // }
+ if (btn.class === 'default') {
btn.style.color = 'rgba(0, 0, 0, 0.65)'
btn.style.backgroundColor = '#fff'
btn.style.borderColor = '#d9d9d9'
@@ -419,6 +427,7 @@
btn.style.color = color[_c]
btn.style.backgroundColor = '#fff'
btn.style.borderColor = color[_c]
+ btn.style.borderWidth = '1px'
} else if (btn.class === 'gray') {
btn.style.color = 'rgba(0, 0, 0, 0.65)'
btn.style.backgroundColor = color[btn.class]
--
Gitblit v1.8.0