From 46f79b491173d284a4900d19e7aecf7509481438 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 一月 2022 17:21:25 +0800
Subject: [PATCH] 2022-01-21
---
src/menu/components/share/searchcomponent/dragsearch/card.jsx | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/menu/components/share/searchcomponent/dragsearch/card.jsx b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
index 7ba8496..19b27ed 100644
--- a/src/menu/components/share/searchcomponent/dragsearch/card.jsx
+++ b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
@@ -1,6 +1,7 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
-import { Icon, Select, DatePicker, Input, Popover, Form } from 'antd'
+import { Select, DatePicker, Input, Popover, Form } from 'antd'
+import { EditOutlined, CopyOutlined, CloseOutlined } from '@ant-design/icons'
import moment from 'moment'
import DateGroup from '@/menu/components/search/main-search/dategroup'
@@ -35,15 +36,11 @@
let _defaultValue = '' // 涓嬫媺鎼滅储銆佹椂闂磋寖鍥寸被鍨嬶紝鍒濆鍊奸渶瑕侀澶勭悊
if (card.type === 'multiselect' || card.type === 'select' || card.type === 'link') {
- if (card.initval) {
- let _option = card.options.filter(option => option.Value === card.initval)[0]
- if (_option) {
- _defaultValue = _option.Text || ''
- } else {
- _defaultValue = ''
- }
- } else if (card.setAll === 'true') {
- _defaultValue = '鍏ㄩ儴'
+ let _option = card.options.filter(option => option.Value === card.initval)[0]
+ if (_option) {
+ _defaultValue = _option.Text || ''
+ } else {
+ _defaultValue = ''
}
} else if (card.type === 'daterange') {
_defaultValue = [null, null]
@@ -64,9 +61,9 @@
return (
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <Icon className="edit" title="缂栬緫" type="edit" onClick={() => editCard(id)} />
- <Icon className="copy" title="澶嶅埗" type="copy" onClick={() => copyCard(id)} />
- <Icon className="close" title="鍒犻櫎" type="close" onClick={() => delCard(id)} />
+ <EditOutlined className="edit" title="缂栬緫" onClick={() => editCard(id)} />
+ <CopyOutlined className="copy" title="澶嶅埗" onClick={() => copyCard(id)} />
+ <CloseOutlined className="close" title="鍒犻櫎" onClick={() => delCard(id)} />
</div>
} trigger="hover">
<div className={'page-card ' + (card.labelShow || '')} style={{ opacity: opacity}}>
--
Gitblit v1.8.0