From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/card/cardcellcomponent/dragaction/action.jsx | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/action.jsx b/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
index 364400e..816abe9 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
@@ -1,7 +1,7 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
import { Popover, Button, Switch, Checkbox } from 'antd'
-import { EditOutlined, CopyOutlined, CloseOutlined, FontColorsOutlined, ProfileOutlined } from '@ant-design/icons'
+import { EditOutlined, CopyOutlined, CloseOutlined, FontColorsOutlined, ProfileOutlined, WarningOutlined } from '@ant-design/icons'
import { resetStyle } from '@/utils/utils-custom.js'
import MkIcon from '@/components/mk-icon'
@@ -30,12 +30,15 @@
})
let hasProfile = false
+ let warning = null
if (['pop', 'prompt', 'exec', 'form'].includes(card.OpenType)) {
hasProfile = true
} else if (card.OpenType === 'excelIn' || card.OpenType === 'excelOut') {
hasProfile = true
} else if (card.funcType === 'print') {
hasProfile = true
+ } else if (card.OpenType === 'innerpage' && !card.pageTemplate) {
+ warning = <WarningOutlined style={{color: 'orange', marginLeft: '5px'}}/>
}
let btnElement = null
@@ -43,16 +46,16 @@
if (card.OpenType === 'form') {
if (card.formType === 'switch') {
- btnElement = (<Switch style={_style} size={card.size} checkedChildren={card.openText || ''} unCheckedChildren={card.closeText || ''}/>)
+ btnElement = (<Switch style={_style} className={card.size === 'large' ? 'ant-switch-large' : ''} size={card.size} checkedChildren={card.openText || ''} unCheckedChildren={card.closeText || ''}/>)
} else {
btnElement = (<Checkbox style={_style}></Checkbox>)
}
} else if (card.show === 'icon') {
- btnElement = (<Button style={_style} type="link"><MkIcon type={card.icon}/></Button>)
+ btnElement = (<Button style={_style} type="link"><MkIcon type={card.icon}/>{warning}</Button>)
} else if (card.show === 'link') {
- btnElement = (<Button style={_style} type="link">{card.label}{card.icon ? <MkIcon type={card.icon}/> : null}</Button>)
+ btnElement = (<Button style={_style} type="link">{card.label}{card.icon ? <MkIcon type={card.icon}/> : null}{warning}</Button>)
} else {
- btnElement = (<Button style={_style}> {card.icon ? <MkIcon type={card.icon}/> : null}{card.label} </Button>)
+ btnElement = (<Button style={_style}>{card.icon ? <MkIcon type={card.icon}/> : null}{card.label}{warning}</Button>)
}
return (
@@ -65,7 +68,7 @@
{hasProfile ? <ProfileOutlined className="profile" title="setting" onClick={() => profileCard(id)} /> : null}
</div>
} trigger="hover">
- <div ref={node => drag(drop(node))} className={'ant-col card-button-cell ant-col-' + card.width} onDoubleClick={(e) => {e.stopPropagation(); doubleClickCard(id)}}>
+ <div ref={node => drag(drop(node))} className={'ant-col card-button-cell ant-col-' + card.width + (card.hidden === 'true' ? ' mk-hidden' : '')} onDoubleClick={(e) => {e.stopPropagation(); doubleClickCard(id)}}>
<div style={{opacity: isDragging ? 0 : 1, ...card.wrapStyle}}>
{btnElement}
</div>
--
Gitblit v1.8.0