From 2eaed7ec027bfd682c7fcb2ae4508ff13ba16375 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 07 十月 2023 17:25:12 +0800
Subject: [PATCH] 2023-10-07
---
src/menu/components/table/base-table/columns/index.scss | 19 +++++++++++++++++++
src/menu/components/table/base-table/columns/index.jsx | 5 +++--
src/tabviews/custom/components/module/account/index.jsx | 5 ++++-
src/menu/components/table/normal-table/columns/index.jsx | 2 +-
4 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/table/base-table/columns/index.jsx b/src/menu/components/table/base-table/columns/index.jsx
index 1205028..aad0434 100644
--- a/src/menu/components/table/base-table/columns/index.jsx
+++ b/src/menu/components/table/base-table/columns/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { DndProvider, DragSource, DropTarget } from 'react-dnd'
-import { Table, Popover, Modal, message, notification } from 'antd'
+import { Table, Popover, Modal, message, notification, Typography } from 'antd'
import { PlusOutlined, PlusSquareOutlined, EditOutlined, CopyOutlined, DeleteOutlined, FontColorsOutlined, CloseCircleOutlined, AntDesignOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
@@ -12,6 +12,7 @@
import './index.scss'
const { confirm } = Modal
+const { Paragraph } = Typography
const EditColumn = asyncComponent(() => import('./editColumn'))
const MarkColumn = asyncIconComponent(() => import('@/menu/components/share/markcomponent'))
const CardCellComponent = asyncComponent(() => import('@/menu/components/card/cardcellcomponent'))
@@ -199,7 +200,7 @@
}
return (
<td style={{...style}} className={className}>
- {val}
+ {column.field ? <Paragraph className="col-copy" copyable={{ text: column.field }}>{val}</Paragraph> : val}
{column.Hide === 'true' ? <CloseCircleOutlined style={{marginLeft: '5px', color: 'orange', fontSize: '12px'}}/> : null}
{column.marks && column.marks.length ? <AntDesignOutlined className="profile"/> : null}
</td>
diff --git a/src/menu/components/table/base-table/columns/index.scss b/src/menu/components/table/base-table/columns/index.scss
index 45da4dc..48aae5d 100644
--- a/src/menu/components/table/base-table/columns/index.scss
+++ b/src/menu/components/table/base-table/columns/index.scss
@@ -23,6 +23,25 @@
tr {
td {
background: #ffffff;
+ .col-copy {
+ margin-bottom: 0;
+ display: inline-block;
+ color: inherit;
+ .ant-typography-copy {
+ position: absolute;
+ left: 2px;
+ top: 0px;
+ margin-left: 0px;
+ font-size: 12px;
+ opacity: 0;
+ transition: opacity 0.2s;
+ }
+ }
+ }
+ td:hover .col-copy {
+ .ant-typography-copy {
+ opacity: 1;
+ }
}
td:not(.ant-table-selection-column) {
position: relative;
diff --git a/src/menu/components/table/normal-table/columns/index.jsx b/src/menu/components/table/normal-table/columns/index.jsx
index 00f61c5..02653b8 100644
--- a/src/menu/components/table/normal-table/columns/index.jsx
+++ b/src/menu/components/table/normal-table/columns/index.jsx
@@ -12,7 +12,7 @@
import './index.scss'
const { confirm } = Modal
-const { Paragraph } = Typography
+const { Paragraph } = Typography
const EditColumn = asyncComponent(() => import('./editColumn'))
const MarkColumn = asyncIconComponent(() => import('@/menu/components/share/markcomponent'))
const CardCellComponent = asyncComponent(() => import('@/menu/components/card/cardcellcomponent'))
diff --git a/src/tabviews/custom/components/module/account/index.jsx b/src/tabviews/custom/components/module/account/index.jsx
index 24d04ca..bdc02be 100644
--- a/src/tabviews/custom/components/module/account/index.jsx
+++ b/src/tabviews/custom/components/module/account/index.jsx
@@ -120,10 +120,12 @@
}
setBook = (item, resolve) => {
+ const { config } = this.props
+
if (!resolve) {
this.setState({activeItem: item})
- MKEmitter.emit('resetSelectLine', this.props.config.uuid, item.id, item)
+ MKEmitter.emit('resetSelectLine', config.uuid, item.id, item)
}
let userid = sessionStorage.getItem('UserID') || ''
@@ -152,6 +154,7 @@
}
if (resolve) {
+ sessionStorage.setItem('ThirdMenu', config.$pageId)
window.location.reload()
}
})
--
Gitblit v1.8.0