+
{showType === 1 && }
{data}
diff --git a/packages/data-render/src/widgets/FTooltip/index.less b/packages/data-render/src/widgets/FTooltip/index.less
index d8b4de673..764e8818e 100644
--- a/packages/data-render/src/widgets/FTooltip/index.less
+++ b/packages/data-render/src/widgets/FTooltip/index.less
@@ -1,3 +1,3 @@
-.dtv-tooltip {
+.dr-tooltip {
margin-top: 8px;
}
diff --git a/packages/data-render/src/widgets/FTooltip/index.tsx b/packages/data-render/src/widgets/FTooltip/index.tsx
index 033267699..6cfa3b475 100644
--- a/packages/data-render/src/widgets/FTooltip/index.tsx
+++ b/packages/data-render/src/widgets/FTooltip/index.tsx
@@ -9,7 +9,7 @@ const FTooltip = (props: any) => {
return (
<Tooltip
- className={combineClass('dtv-tooltip', className)}
+ className={combineClass('dr-tooltip', className)}
color="#fff"
overlayInnerStyle={{
color: '#141414',
diff --git a/packages/data-render/src/widgets/components/BaseCollapse/index.less b/packages/data-render/src/widgets/components/BaseCollapse/index.less
index 9da99a763..8d997acac 100644
--- a/packages/data-render/src/widgets/components/BaseCollapse/index.less
+++ b/packages/data-render/src/widgets/components/BaseCollapse/index.less
@@ -1,13 +1,11 @@
-.dtv-collapse {
+.dr-collapse {
margin-top: 16px;
background-color: #fff;
- border-radius: 4px;
- box-shadow: 0 2px 4px 2px #dde1e8;
+ border: 1px solid #f0f0f0;
.collapse-title {
height: 24px;
margin-right: 16px;
- color: #141414;
font-weight: bold;
font-size: 16px;
line-height: 24px;
@@ -28,22 +26,27 @@
.expand-icon-box {
position: absolute;
top: 20px;
- right: 10px;
+ right: 12px;
display: flex;
align-items: center;
color: #999;
+ margin-right: 12px;
}
.expand-icon-desc {
margin-left: 4px;
}
- .ant-collapse-header {
+ > .ant-collapse-item .ant-collapse-header {
display: flex;
align-items: center !important;
- padding: 16px !important;
+ padding: 16px 24px !important;
background-color: #fff;
- border-radius: 4px !important;
+ border-radius: 8px !important;
+
+ > .ant-collapse-expand-icon {
+ padding-inline-end: 0 !important;
+ }
}
.ant-collapse-header-text {
diff --git a/packages/data-render/src/widgets/components/BaseCollapse/index.tsx b/packages/data-render/src/widgets/components/BaseCollapse/index.tsx
index 39fe3b2f9..57dde577d 100644
--- a/packages/data-render/src/widgets/components/BaseCollapse/index.tsx
+++ b/packages/data-render/src/widgets/components/BaseCollapse/index.tsx
@@ -24,31 +24,30 @@ const BaseCollapse: FC<IProps> = (props) => {
const collapseHeader = (
<>
- {title && <div className="collapse-title">{title}</div>}
+ {title && <div className='collapse-title'>{title}</div>}
{header && header}
</>
);
const renderExpandIcon = ({ isActive }: any): JSX.Element => {
return (
- <div className="expand-icon-box">
+ <div className='expand-icon-box'>
<DownOutlined rotate={isActive ? 180 : 0} />
- <span className="expand-icon-desc">{isActive ? '收起' : '展开'}</span>
+ <span className='expand-icon-desc'>{isActive ? '收起' : '展开'}</span>
</div>
);
};
return (
<Collapse
- className={combineClass('dtv-collapse', className)}
+ className={combineClass('dr-collapse', className)}
style={style}
- bordered={false}
ghost={true}
activeKey={[activeKey]}
expandIcon={renderExpandIcon}
onChange={() => setActiveKey(activeKey ? '' : 'single')}
>
- <Panel key="single" header={collapseHeader}>
+ <Panel key='single' header={collapseHeader}>
{children}
</Panel>
</Collapse>
diff --git a/packages/data-render/src/widgets/components/Encryption/index.tsx b/packages/data-render/src/widgets/components/Encryption/index.tsx
index d04f7d51a..089771c20 100644
--- a/packages/data-render/src/widgets/components/Encryption/index.tsx
+++ b/packages/data-render/src/widgets/components/Encryption/index.tsx
@@ -1,6 +1,7 @@
import React from 'react';
import classnames from 'classnames';
import createIconFont from '../../utils/createIconFont';
+import { renderString } from '../../utils/common';
import CopyLabel from '../CopyLabel';
import './index.less';
@@ -35,17 +36,17 @@ const Encryption = (props: IProps) => {
return (
<div className={classnames('encryption-view', { [className]: className })}>
- {label && <span className="line-label">{label}</span>}
+ {label && <span className='line-label'>{renderString(label)}</span>}
{data &&
(copy ? (
<CopyLabel data={data} iconFontUrl={iconFontUrl} />
) : (
- <span className="encry-content">{data}</span>
+ <span className='encry-content'>{data}</span>
))}
{!data && (
<span onClick={onClick} className={classnames('line-span', { [iconClass]: iconClass })}>
{type && <Icon type={type} style={{ color: '#1677FF', fontSize: 18, ...iconStyle }} />}
- {showText && <span className="icon-text">{text}</span>}
+ {showText && <span className='icon-text'>{text}</span>}
</span>
)}
</div>
diff --git a/packages/data-render/src/widgets/utils/common.ts b/packages/data-render/src/widgets/utils/common.ts
index f591ee29b..698dfe056 100644
--- a/packages/data-render/src/widgets/utils/common.ts
+++ b/packages/data-render/src/widgets/utils/common.ts
@@ -46,8 +46,8 @@ export const getValueFromKey = (props: {
}): string | boolean => {
const { data, path = '', defaultValue = '', addons, valueType } = props;
- let result = null;
- let negation = null; // 否定标识 ！
+ let result: any = null;
+ let negation: any = null; // 否定标识 ！
let dataPath = path;
if (path.substring(0, 2) === '!!') {
@@ -311,3 +311,11 @@ export const transDataKeyToData = (object: any, { data, addons }: any) => {
}
});
};
+
+
+export const renderString = (str: any) => {
+ if (isObject(str)) {
+ return '';
+ }
+ return str;
+}
\ No newline at end of file