Merge remote-tracking branch 'amis/master'

This commit is contained in:
rickcole 2020-05-09 16:53:19 +08:00
commit 337f7fd116

View File

@ -97,7 +97,7 @@ interface TreeSelectorState {
export class TreeSelector extends React.Component<
TreeSelectorProps,
TreeSelectorState
> {
> {
static defaultProps = {
showIcon: true,
initiallyOpen: true,
@ -614,6 +614,7 @@ export class TreeSelector extends React.Component<
<a
onClick={this.handleAdd.bind(this, item)}
data-tooltip={createTip}
data-position="left"
>
<Icon icon="plus" className="icon" />
</a>
@ -623,6 +624,7 @@ export class TreeSelector extends React.Component<
<a
onClick={this.handleRemove.bind(this, item)}
data-tooltip={removeTip}
data-position="left"
>
<Icon icon="minus" className="icon" />
</a>
@ -632,6 +634,7 @@ export class TreeSelector extends React.Component<
<a
onClick={this.handleEdit.bind(this, item)}
data-tooltip={editTip}
data-position="left"
>
<Icon icon="pencil" className="icon" />
</a>
@ -728,7 +731,10 @@ export class TreeSelector extends React.Component<
})}
>
<div className={cx('Tree-itemLabel')}>
<span className={cx('Tree-itemText')} onClick={this.clearSelect}>
<span
className={cx('Tree-itemText')}
onClick={this.clearSelect}
>
{showIcon ? (
<i className={cx('Tree-itemIcon Tree-rootIcon')} />
) : null}