From 1d6729f347857b47e03eadc5989aff76fbd3c7ad Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 四月 2023 10:25:35 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/card/cardcellcomponent/index.jsx | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index 109dc08..f752e5a 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -361,6 +361,13 @@
const { elements } = this.state
this.elementFormRef.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.style = cell.style || {}
@@ -458,6 +465,14 @@
if (res.show === 'link' || res.show === 'icon') {
style.color = color[cl]
style.backgroundColor = 'transparent'
+ } else if (res.class === 'default') {
+ style.color = 'rgba(0, 0, 0, 0.65)'
+ style.backgroundColor = '#fff'
+ style.borderColor = '#d9d9d9'
+ } else if (res.class.indexOf('border') > -1) {
+ style.color = color[cl]
+ style.backgroundColor = '#fff'
+ style.borderColor = color[cl]
} else {
style.color = '#ffffff'
style.backgroundColor = color[cl]
@@ -736,7 +751,7 @@
const { elements, visible, actvisible, profVisible, card, record } = this.state
return (
- <div className="model-menu-card-cell-list">
+ <div className={'model-menu-card-cell-list ' + (cardCell && cardCell.setting && cardCell.setting.layout === 'flex' ? 'mk-flex' : '') }>
<DragElement
list={elements}
parent={cardCell}
--
Gitblit v1.8.0