diff --git a/src/steps/table/index.less b/src/steps/table/index.less index 157b1c1fb2123b914970fc1c5c2d2776bf32fe53..6eb2abab27933a985d5de22128ba508fa5f981de 100644 --- a/src/steps/table/index.less +++ b/src/steps/table/index.less @@ -4,14 +4,20 @@ justify-content: space-between; align-items: center; margin-bottom: 16px; - &>.ccms-antd-table-title { color: #000000d9; font-weight: 500; font-size: 16px; + display: flex; + &>.ccms-antd-table-title-explain { + margin-left: 16px; + font-size: 14px; + color: #abb7c4; + margin-top: 2px; + } } &>.ccms-antd-table-tableOperation { margin-left: 16px; } } - } \ No newline at end of file + } diff --git a/src/steps/table/index.tsx b/src/steps/table/index.tsx index 1ca32dac3b843a443f34ccea550ac6e635e04489..6036507c7198cc976810053d441983772faf36ea 100644 --- a/src/steps/table/index.tsx +++ b/src/steps/table/index.tsx @@ -1,8 +1,8 @@ import React from 'react' import { TableStep } from 'ccms' import { ITable, ITableColumn, ITableStepOperationConfirm, ITableStepOperationModal, ITableStepRowOperation, ITableStepRowOperationButton, ITableStepRowOperationGroup, ITableStepRowOperationGroupItem, ITableStepTableOperation, ITableStepTableOperationButton, ITableStepTableOperationGroup, ITableStepTableOperationGroupItem } from 'ccms/dist/src/steps/table' -import { Table, Button, Dropdown, Menu, Modal, Space } from 'antd' -import { DownOutlined } from '@ant-design/icons' +import { Table, Button, Dropdown, Menu, Modal, Space, Tooltip } from 'antd' +import { DownOutlined, InfoCircleOutlined } from '@ant-design/icons' import getALLComponents from '../../components/tableColumns' import CCMS from '../../main' import InterfaceHelper from '../../util/interface' @@ -32,14 +32,44 @@ export default class TableStepComponent extends TableStep { primary, columns, data, - pagination + pagination, + description } = props return (
- {(title || tableOperations) && ( + {(title || (description && ((description.label !== undefined && description.label !== '') || description.showIcon)) || tableOperations) && (
-
{title}
+
{title} +
+ {(description && description.type === 'text' && ((description.label !== undefined && description.label !== "") || description.showIcon)) && + {(description.showIcon) && ()} + {description.label} + } + {(description && description.type === 'tooltip' && ((description.label !== undefined && description.label !== "") || description.showIcon)) && + ele.parentElement || document.body}> + {(description.showIcon) && ()} + {description.label} + + } + {(description && description.type === 'modal' && ((description.label !== undefined && description.label !== "") || description.showIcon)) && + { + Modal.info({ + getContainer: () => document.getElementById('ccms-antd') || document.body, + content: (
{description.content}
), + okText: '知道了' + }); + }}> + {(description.showIcon) && ()} + {description.label} +
+ } +
+
{tableOperations}
)}