From 432b788acf901b0720184b8ee8bc81a2e6fa47e0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 28 九月 2021 18:22:02 +0800
Subject: [PATCH] 2021-09-28
---
src/menu/components/share/actioncomponent/dragaction/card.jsx | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/dragaction/card.jsx b/src/menu/components/share/actioncomponent/dragaction/card.jsx
index 8bdf734..4a6e8b5 100644
--- a/src/menu/components/share/actioncomponent/dragaction/card.jsx
+++ b/src/menu/components/share/actioncomponent/dragaction/card.jsx
@@ -1,6 +1,7 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
import { Icon, Button, Popover } from 'antd'
+import { resetStyle } from '@/utils/utils-custom.js'
import './index.scss'
const Card = ({ id, card, moveCard, findCard, editCard, delCard, copyCard, changeStyle, profileCard, doubleClickCard }) => {
@@ -36,12 +37,14 @@
}
let btnElement = null
+ let _style = resetStyle(card.style)
+
if (card.show === 'icon') {
btnElement = (
<Button
type="link"
icon={card.icon}
- style={card.btnstyle}
+ style={_style}
onDoubleClick={() => doubleClickCard(id)}
>{card.icon ? '' : card.label}</Button>
)
@@ -49,7 +52,7 @@
btnElement = (
<Button
type="link"
- style={card.btnstyle}
+ style={_style}
onDoubleClick={() => doubleClickCard(id)}
>{card.label}{card.icon ? <Icon type={card.icon}/> : null}</Button>
)
@@ -57,7 +60,7 @@
btnElement = (
<Button
icon={card.icon}
- style={card.btnstyle}
+ style={_style}
onDoubleClick={() => doubleClickCard(id)}
>
{card.label}
--
Gitblit v1.8.0