From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 21:11:56 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx b/src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx
index 1dcabb0..bb981ed 100644
--- a/src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx
@@ -2,7 +2,8 @@
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'
@@ -61,7 +62,7 @@
newcard.field = ''
newcard.Hide = 'false'
newcard.contrastType = 'static'
- newcard.IsSort = 'true'
+ newcard.IsSort = 'false'
newcard.type = item.subType
newcard.Width = item.subType === 'number' ? 80 : 120
if (item.subType === 'colspan') {
@@ -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}}>
--
Gitblit v1.8.0