diff --git a/public/locale/en/deduplication.json b/public/locale/en/deduplication.json index a532516..a647cfc 100644 --- a/public/locale/en/deduplication.json +++ b/public/locale/en/deduplication.json @@ -8,6 +8,7 @@ "Empty": "Empty", "No_duplication": "No duplication", "Delete": "Delete", + "Close": "Close", "Settings": "Settings", "Select_a_column": "Select a column", "Add_new_column": "Add new column", diff --git a/public/locale/zh_CN/deduplication.json b/public/locale/zh_CN/deduplication.json index 3888bc6..0bf5612 100644 --- a/public/locale/zh_CN/deduplication.json +++ b/public/locale/zh_CN/deduplication.json @@ -8,6 +8,7 @@ "Empty": "空", "No_duplication": "无重复项", "Delete": "删除", + "Close": "关闭", "Settings": "设置", "Select_a_column": "选择一个列", "Add_new_column": "添加新去重列", diff --git a/src/components/add-new-column.js b/src/components/add-new-column.js index 7245b13..111c2db 100644 --- a/src/components/add-new-column.js +++ b/src/components/add-new-column.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import intl from 'react-intl-universal'; -import styles from '../css/plugin-layout.module.css'; +import { DtableCustomButton } from 'dtable-ui-component'; class AddColumn extends React.Component { @@ -21,10 +21,15 @@ class AddColumn extends React.Component { const {readonly} = this.props; return ( - + + {intl.get('Add_new_column')} + ); } } diff --git a/src/components/deduplication-columns.js b/src/components/deduplication-columns.js index fd52a8a..0934ce6 100644 --- a/src/components/deduplication-columns.js +++ b/src/components/deduplication-columns.js @@ -1,7 +1,7 @@ import React from 'react'; import intl from 'react-intl-universal'; import PropTypes from 'prop-types'; -import { DTableSelect } from 'dtable-ui-component'; +import { DTableSelect,DtableIconButton } from 'dtable-ui-component'; import styles from '../css/plugin-layout.module.css'; class DeDuplicationColumns extends React.Component { @@ -22,11 +22,13 @@ class DeDuplicationColumns extends React.Component { onChange={(option) => this.onSelectChange(option, index)} /> - + className='border-0 p-0 ml-2 mt-2' + /> ); }); diff --git a/src/components/delete-component.js b/src/components/delete-component.js index cf584f5..b218f17 100644 --- a/src/components/delete-component.js +++ b/src/components/delete-component.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap'; import intl from 'react-intl-universal'; -import styles from '../css/plugin-layout.module.css'; +import {DtableIconButton} from 'dtable-ui-component'; class DeleteRowDropdownMenu extends React.Component { @@ -23,7 +23,11 @@ class DeleteRowDropdownMenu extends React.Component { return( - + diff --git a/src/components/tips/delete-tip.js b/src/components/tips/delete-tip.js index 44dfd1c..b93aaad 100644 --- a/src/components/tips/delete-tip.js +++ b/src/components/tips/delete-tip.js @@ -3,6 +3,7 @@ import PropTypes from 'prop-types'; import intl from 'react-intl-universal'; import { FormGroup, Label, Input } from 'reactstrap'; import styles from '../../css/plugin-layout.module.css'; +import { DtableCustomButton } from 'dtable-ui-component'; const propTypes = { onDelete: PropTypes.func.isRequired, @@ -45,8 +46,8 @@ class DeleteTip extends React.Component {
- - + {intl.get('Cancel')} + {intl.get('Delete')}
);