From 21167ece56edd628e6f6546d1d642947cc3a048f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 八月 2024 22:17:33 +0800
Subject: [PATCH] 2024-08-12
---
src/menu/components/table/base-table/columns/index.jsx | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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..63cf2fa 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'))
@@ -192,14 +193,14 @@
val = '$Index'
} else if (column.type === 'formula') {
val = column.formula
- if (column.eval === 'false') {
- val = val.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
- val = <span style={{fontWeight: 'inherit'}} dangerouslySetInnerHTML={{__html: val}}></span>
- }
+ // if (column.eval === 'false') {
+ // val = val.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
+ // val = <span style={{fontWeight: 'inherit'}} dangerouslySetInnerHTML={{__html: val}}></span>
+ // }
}
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>
@@ -548,7 +549,7 @@
cols: columns.filter(col => !col.origin)
}
- let srcid = localStorage.getItem(window.location.href.split('#')[0] + 'srcId')
+ let srcid = localStorage.getItem(window.GLOB.sysSign + 'srcId')
if (srcid) {
val.$srcId = srcid
}
--
Gitblit v1.8.0