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/templates/sharecomponent/columncomponent/dragcolumn/index.jsx | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx b/src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx
index 1fa8a7c..c364c6d 100644
--- a/src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx
@@ -2,12 +2,13 @@
import { useDrop } from 'react-dnd'
import { is, fromJS } from 'immutable'
import update from 'immutability-helper'
-import { Icon, Popover } from 'antd'
+import { Popover } from 'antd'
+import { EditOutlined } from '@ant-design/icons'
import Utils from '@/utils/utils.js'
import Card from './card'
import './index.scss'
-const Container = ({list, setting, gridBtn, showfield, placeholder, handleList, handleMenu, handleGridBtn, deleteMenu, markMenu }) => {
+const Container = ({list, setting, gridBtn, showfield, handleList, handleMenu, handleGridBtn, deleteMenu, markMenu }) => {
const [cards, setCards] = useState(list)
const moveCard = (id, atIndex) => {
const { card, index } = findCard(id)
@@ -63,7 +64,7 @@
newcard.contrastType = 'static'
newcard.IsSort = 'true'
newcard.type = item.subType
- newcard.Width = 120
+ newcard.Width = item.subType === 'number' ? 80 : 120
if (item.subType === 'colspan') {
newcard.sublist = []
newcard.subfield = []
@@ -146,7 +147,7 @@
{i === (columns.length - 1) && gridBtn && gridBtn.display ?
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <Icon className="edit" type="edit" onClick={handleGridBtn}/>
+ <EditOutlined className="edit" onClick={handleGridBtn}/>
</div>
} trigger="hover">
<div className="page-card" style={{flex: gridBtn.Width}}>
@@ -165,7 +166,7 @@
{cards.length === 0 ?
<div className="common-drawarea-placeholder">
- {placeholder}
+ 璇锋坊鍔犳樉绀哄垪
</div> : null
}
</div>
--
Gitblit v1.8.0