From c7aece35a62b6e91fd98a625bf0e53f64bfbd18d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 17 八月 2023 16:22:15 +0800
Subject: [PATCH] 2023-08-17
---
src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx b/src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx
index 1fa8a7c..267c6c4 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 = []
@@ -130,6 +131,23 @@
{i === 0 && column.length > 0 && setting.tableType === 'radio' ?
<div className="page-card" style={{flex: 60}}></div> : null
}
+ {i === 0 && gridBtn && gridBtn.display && gridBtn.position === 'left' ?
+ <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
+ <div className="mk-popover-control">
+ <EditOutlined className="edit" onClick={handleGridBtn}/>
+ </div>
+ } trigger="hover">
+ <div className="page-card" style={{flex: gridBtn.Width}}>
+ <div style={{cursor: 'default'}}>
+ <span className="ant-table-header-column">
+ <div className="ant-table-column-sorters" title={gridBtn.label} style={{textAlign: gridBtn.Align}}>
+ <span className="ant-table-column-title">{gridBtn.label}</span>
+ </div>
+ </span>
+ </div>
+ </div>
+ </Popover> : null
+ }
{column.map(card => (
<Card
key={card.uuid}
@@ -143,10 +161,10 @@
findCard={findCard}
/>
))}
- {i === (columns.length - 1) && gridBtn && gridBtn.display ?
+ {i === (columns.length - 1) && gridBtn && gridBtn.display && gridBtn.position !== 'left' ?
<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 +183,7 @@
{cards.length === 0 ?
<div className="common-drawarea-placeholder">
- {placeholder}
+ 璇锋坊鍔犳樉绀哄垪
</div> : null
}
</div>
--
Gitblit v1.8.0