Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions public/locale/en/deduplication.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions public/locale/zh_CN/deduplication.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"Empty": "空",
"No_duplication": "无重复项",
"Delete": "删除",
"Close": "关闭",
"Settings": "设置",
"Select_a_column": "选择一个列",
"Add_new_column": "添加新去重列",
Expand Down
9 changes: 5 additions & 4 deletions src/components/deduplication-columns.js
Original file line number Diff line number Diff line change
@@ -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, IconButton } from 'dtable-ui-component';
import styles from '../css/plugin-layout.module.css';

class DeDuplicationColumns extends React.Component {
Expand All @@ -22,11 +22,12 @@ class DeDuplicationColumns extends React.Component {
onChange={(option) => this.onSelectChange(option, index)}
/>
</div>
<button type="button"
aria-label={intl.get('Delete')}
<IconButton
icon='fork-number'
title={intl.get('Delete')}
onClick={() => this.deleteColumn(index)}
className={`border-0 p-0 ml-2 dtable-font dtable-icon-fork-number ${styles['column-delete-icon']}`}></button>
className='border-0 p-0 ml-2 mt-2'
/>
</div>
);
});
Expand Down
4 changes: 2 additions & 2 deletions src/components/delete-component.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 { IconButton } from 'dtable-ui-component';

class DeleteRowDropdownMenu extends React.Component {

Expand All @@ -23,7 +23,7 @@ class DeleteRowDropdownMenu extends React.Component {
return(
<Dropdown isOpen={this.state.isItemMenuShow} toggle={this.onDropdownToggleClick} style={this.props.style || {}} className="align-middle">
<DropdownToggle tag="span" data-toggle="dropdown" aria-expanded={this.state.isItemMenuShow}>
<i className={'dtable-font dtable-icon-more-level delete-row-font ' + styles['more-level-font']}></i>
<IconButton icon='dtable-icon-more-level' title={intl.get('Close')} />
</DropdownToggle>
<DropdownMenu right={true}>
<DropdownItem onClick={this.props.onDeleteRow}>
Expand Down
1 change: 1 addition & 0 deletions src/locale/lang/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const en = {
"Column": "Column",
"Name": "Name",
"Count": "Count",
"Close": "Close",
"Empty": "Empty",
"No_duplication": "No duplication",
"Delete": "Delete",
Expand Down
3 changes: 2 additions & 1 deletion src/locale/lang/zh_CN.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const zh_CN = {
"Column": "列",
"Name": "名称",
"Count": "出现次数",
"Close": "关闭",
"Empty": "空",
"No_duplication": "无重复项",
"Delete": "删除",
Expand All @@ -23,4 +24,4 @@ const zh_CN = {
}
;

export default zh_CN;
export default zh_CN;