From 8881f69f5d7127a4090184b3ea7c9cbf9574100e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 18 三月 2024 18:01:51 +0800
Subject: [PATCH] 2024-03-18
---
src/menu/components/card/cardcellcomponent/index.jsx | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index b58ca78..de0ed1c 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -322,7 +322,7 @@
this.setState({
actvisible: true,
card: card,
- formlist: getBaseTableActionForm(card, functip, cards, usefulFields, modules)
+ formlist: getBaseTableActionForm(card, functip, cards, usefulFields, modules, 'line')
})
} else {
let anchors = MenuUtils.getAnchors(menu.components, cards.uuid) || []
@@ -330,7 +330,7 @@
this.setState({
actvisible: true,
card: card,
- formlist: getActionForm(card, functip, cards, usefulFields, modules, anchors, side)
+ formlist: getActionForm(card, functip, cards, usefulFields, modules, anchors, side, 'line')
})
}
}
@@ -447,6 +447,13 @@
let color = { primary: '#1890ff', yellow: '#c49f47', orange: 'orange', danger: '#ff4d4f', green: '#26C281', dgreen: '#32c5d2', purple: '#8E44AD', cyan: '#13c2c2', gray: '#666666', default: 'rgba(0, 0, 0, 0.65)' }
this.actionFormRef.handleConfirm().then(res => {
+ if (res.width % 0.5) {
+ res.width = parseInt(res.width / 0.5) * 0.5
+ }
+ if (res.width % 1) {
+ res.width = (res.width + '').replace(/.5/, 'x')
+ }
+
let _elements = elements.map(cell => {
if (cell.uuid === res.uuid) {
res.eleType = cell.eleType || null
@@ -457,7 +464,8 @@
if (cell.OpenType !== 'form') {
res.style = {}
}
- } else if (res.class !== cell.class || res.show !== cell.show || !res.style) {
+ // } else if (res.class !== cell.class || res.show !== cell.show || !res.style) {
+ } else if (res.class !== cell.class || !res.style) {
if (res.class) {
let cl = res.class.replace('border-', '')
let style = {}
--
Gitblit v1.8.0