From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/actioncomponent/dragaction/card.jsx | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/dragaction/card.jsx b/src/menu/components/share/actioncomponent/dragaction/card.jsx
index d9219b1..0059c8d 100644
--- a/src/menu/components/share/actioncomponent/dragaction/card.jsx
+++ b/src/menu/components/share/actioncomponent/dragaction/card.jsx
@@ -1,7 +1,7 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
import { Button, Popover } from 'antd'
-import { CopyOutlined, EditOutlined, FontColorsOutlined, CloseOutlined, ProfileOutlined } from '@ant-design/icons'
+import { CopyOutlined, EditOutlined, FontColorsOutlined, CloseOutlined, ProfileOutlined, WarningOutlined, DisconnectOutlined } from '@ant-design/icons'
import MkIcon from '@/components/mk-icon'
import { resetStyle } from '@/utils/utils-custom.js'
@@ -28,14 +28,23 @@
moveCard(draggedId, overIndex)
},
})
- const opacity = isDragging ? 0 : 1
+ const opacity = isDragging ? 0.5 : 1
let hasProfile = false
+ let forbidSql = false
if (['pop', 'prompt', 'exec'].includes(card.OpenType)) {
hasProfile = true
+ if (card.verify && card.verify.default === 'false') {
+ forbidSql = true
+ }
} else if (card.OpenType === 'excelIn' || card.OpenType === 'excelOut') {
hasProfile = true
+ if (card.verify && card.verify.default === 'false') {
+ forbidSql = true
+ }
} else if (card.funcType === 'print') {
+ hasProfile = true
+ } else if (card.funcType === 'megvii') {
hasProfile = true
}
@@ -48,6 +57,15 @@
_class = 'swiper swiper-' + card.color
show = 'button'
}
+ if (card.hidden === 'true') {
+ _class += ' mk-hidden'
+ }
+ let warning = null
+ if (card.OpenType === 'innerpage' && !card.pageTemplate) {
+ warning = <WarningOutlined style={{color: 'orange', marginLeft: '5px'}}/>
+ } else if (forbidSql) {
+ warning = <DisconnectOutlined className="mk-disconnect"/>
+ }
if (show === 'icon') {
btnElement = (
@@ -56,7 +74,7 @@
style={_style}
className={_class}
onDoubleClick={() => doubleClickCard(id)}
- >{card.icon ? <MkIcon type={card.icon}/> : card.label}</Button>
+ >{card.icon ? <MkIcon type={card.icon}/> : card.label}{warning}</Button>
)
} else if (show === 'link') {
btnElement = (
@@ -65,7 +83,7 @@
style={_style}
className={_class}
onDoubleClick={() => doubleClickCard(id)}
- >{card.label}{card.icon ? <MkIcon type={card.icon}/> : null}</Button>
+ >{card.label}{card.icon ? <MkIcon type={card.icon}/> : null}{warning}</Button>
)
} else {
btnElement = (
@@ -74,7 +92,7 @@
className={_class}
onDoubleClick={() => doubleClickCard(id)}
>
- <MkIcon type={card.icon}/>{card.label}
+ <MkIcon type={card.icon}/>{card.label}{warning}
</Button>
)
}
@@ -85,7 +103,7 @@
<EditOutlined className="edit" onClick={() => editCard(id)} />
<CopyOutlined className="copy" onClick={() => copyCard(id)} />
<CloseOutlined className="close" onClick={() => delCard(id)} />
- {type !== 'datacard' ? <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => changeStyle(id)}/> : ''}
+ {type !== 'datacard' && type !== 'basetable' ? <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => changeStyle(id)}/> : ''}
{hasProfile ? <ProfileOutlined className="profile" title="楠岃瘉" onClick={() => profileCard(id)} /> : null}
</div>
} trigger="hover">
--
Gitblit v1.8.0