diff --git a/components/apolloTable/component/base/detail/tag/index.less b/components/apolloTable/component/base/detail/tag/index.less index 50b9d894ace642280c0d94f5a11bbbbf36629bb4..4c6ec16e2daab324d8de21b220c80572538ec5c7 100644 --- a/components/apolloTable/component/base/detail/tag/index.less +++ b/components/apolloTable/component/base/detail/tag/index.less @@ -42,6 +42,15 @@ } } } +.popContainer{ + width: 200px; + :global(.ant-popover-inner-content){ + padding: 0; + } + .popContent{ + padding: @paddingGen; + } +} .popItem { border-radius: @borderRadius; margin-bottom: @marginSm; @@ -54,6 +63,5 @@ padding: 5px 10px; line-height: 1; font-size: 14px; - color: #2e67c5; } } diff --git a/components/apolloTable/component/base/detail/tag/index.tsx b/components/apolloTable/component/base/detail/tag/index.tsx index ae6d6907305d00f91f44ed8695b189541bf651c3..72575826a53abb44d1753c305f14a56a125d3f1e 100644 --- a/components/apolloTable/component/base/detail/tag/index.tsx +++ b/components/apolloTable/component/base/detail/tag/index.tsx @@ -56,10 +56,18 @@ export const Tags = (props: any) => { {dotVisible && ( { + e.stopPropagation(); + }} placement="left" - overlayStyle={{ width: '200px' }} + overlayClassName={s.popContainer} content={ -
+
{ + e.stopPropagation(); + }} + > {value.map((item, index) => { let color = ''; if (options && Array.isArray(options) && options.length > 0) { diff --git a/components/apolloTable/component/base/detail/upload/index.tsx b/components/apolloTable/component/base/detail/upload/index.tsx index 81134bb9d7b0256fba0238380bb8e56a6ca0ccce..3bcf339924432c38ba15a0690ef284d851163ff6 100644 --- a/components/apolloTable/component/base/detail/upload/index.tsx +++ b/components/apolloTable/component/base/detail/upload/index.tsx @@ -21,7 +21,8 @@ export const ApolloUploadDetail = (props: UploadProps) => { }; }); } - const onPreview = (item) => { + const onPreview = (item, e) => { + e.stopPropagation(); if (previewModel && previewModel.current && previewModel.current.onPreview) { previewModel.current.onPreview(item.value, item.name); } diff --git a/components/apolloTable/component/base/detail/upload/styles.less b/components/apolloTable/component/base/detail/upload/styles.less index 90846ddd44b9e7a6f067432c9750d30f73f091f9..437d13d3d3856eaca0dac98c2ec935ed037b9cc6 100644 --- a/components/apolloTable/component/base/detail/upload/styles.less +++ b/components/apolloTable/component/base/detail/upload/styles.less @@ -20,4 +20,6 @@ .img { cursor: pointer; + width: 30px; + max-height: 30px; } diff --git a/components/apolloTable/component/base/edit/upload/index.less b/components/apolloTable/component/base/edit/upload/index.less index 02ad80df79f8c252ceb0cb8be97ca868ef48153f..3add704699642371d782329da54dc58bbbe4131b 100644 --- a/components/apolloTable/component/base/edit/upload/index.less +++ b/components/apolloTable/component/base/edit/upload/index.less @@ -5,6 +5,7 @@ overflow: hidden; display: flex; align-items: center; + border: 1px solid @primaryColor; .add { cursor: pointer; font-size: @textFontGen; diff --git a/components/apolloTable/component/base/edit/upload/index.tsx b/components/apolloTable/component/base/edit/upload/index.tsx index 77b1aa0fe4013271fb7c8320e4bce88abae93a39..920dd20341ee22dea702a1be494b92f3f33b6819 100644 --- a/components/apolloTable/component/base/edit/upload/index.tsx +++ b/components/apolloTable/component/base/edit/upload/index.tsx @@ -71,7 +71,7 @@ export const ApolloUpload = (props: ApolloUploadProps) => { })}
- +
diff --git a/components/apolloTable/component/base/extra/upload/preview.tsx b/components/apolloTable/component/base/extra/upload/preview.tsx index 406b7e6f6c039428e1c4c4f00c7db364adb2df90..be20902d5726ab6411ec381b8b59598d52cd0e3e 100644 --- a/components/apolloTable/component/base/extra/upload/preview.tsx +++ b/components/apolloTable/component/base/extra/upload/preview.tsx @@ -24,7 +24,8 @@ export default class uploadDetail extends React.Component { } }; - handleCancel = () => { + handleCancel = (e) => { + e.stopPropagation(); this.setState({ showDialog: false }); };