From 9738f1b373fa4ed7205d81bb7db54771d3280b06 Mon Sep 17 00:00:00 2001 From: catchonme Date: Wed, 11 Sep 2019 10:07:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80tree=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scss/components/form/_tree.scss | 6 ++++++ src/components/Tree.tsx | 16 ++++++++-------- src/components/icons.tsx | 3 --- src/icons/check.svg | 4 ++-- src/icons/minus.svg | 4 +--- src/icons/pencil.svg | 4 ++-- src/icons/plus.svg | 4 ++-- src/icons/tree-close.svg | 3 --- src/renderers/Form/Tree.tsx | 6 +++--- 9 files changed, 24 insertions(+), 26 deletions(-) delete mode 100644 src/icons/tree-close.svg diff --git a/scss/components/form/_tree.scss b/scss/components/form/_tree.scss index b1af2271..0a03d2c0 100644 --- a/scss/components/form/_tree.scss +++ b/scss/components/form/_tree.scss @@ -4,6 +4,8 @@ cursor: pointer; position: relative; top: 2px; + width: px2rem(16px); + height: px2rem(16px); margin-left: px2rem(5px); } @@ -88,6 +90,8 @@ cursor: pointer; position: relative; top: 2px; + width: px2rem(16px); + height: px2rem(16px); margin-left: px2rem(5px); } } @@ -116,6 +120,8 @@ > svg { position: relative; top: 2px; + width: px2rem(16px); + height: px2rem(16px); } > span { padding-left: px2rem(5px); diff --git a/src/components/Tree.tsx b/src/components/Tree.tsx index da419a6b..a0a12047 100644 --- a/src/components/Tree.tsx +++ b/src/components/Tree.tsx @@ -63,7 +63,7 @@ interface TreeSelectorProps { editable?: boolean; openEditDialog?: Function; deletable?: boolean; - onDelete?: Function; + onRemove?: Function; } interface TreeSelectorState { @@ -343,9 +343,9 @@ export class TreeSelector extends React.Component {addable ? this.handleAdd(item, !isLeaf)}/> : null} - {deletable ? this.handleDelete(item)}/> : null} + {deletable ? this.handleRemove(item)}/> : null} {editable ? this.handleEdit(item)}/> : null} ) : null} @@ -570,7 +570,7 @@ export class TreeSelector extends React.Component this.handleChangeOnEdit(item, e.currentTarget.value)}/> - + )} {/* 有children而且为展开状态 或者 添加child时 */} @@ -582,7 +582,7 @@ export class TreeSelector extends React.Component this.handleChangeOnAdd(e.currentTarget.value)}/> - + ) : null} {childrenItems} @@ -636,7 +636,7 @@ export class TreeSelector extends React.Component this.handleChangeOnAdd(e.currentTarget.value)}/> - + ) : null} diff --git a/src/components/icons.tsx b/src/components/icons.tsx index b4900707..131630f5 100644 --- a/src/components/icons.tsx +++ b/src/components/icons.tsx @@ -33,8 +33,6 @@ import PlusIcon from '../icons/plus.svg'; import MinusIcon from '../icons/minus.svg'; // @ts-ignore import PencilIcon from '../icons/pencil.svg'; -// @ts-ignore -import TreeClose from '../icons/tree-close.svg'; // 兼容原来的用法，后续不直接试用。 // @ts-ignore @@ -84,7 +82,6 @@ registerIcon('check', CheckIcon); registerIcon('plus', PlusIcon); registerIcon('minus', MinusIcon); registerIcon('pencil', PencilIcon); -registerIcon('tree-close', TreeClose); export function Icon({ icon, diff --git a/src/icons/check.svg b/src/icons/check.svg index 0c5a7267..304805e8 100644 --- a/src/icons/check.svg +++ b/src/icons/check.svg @@ -1,3 +1,3 @@ - - + + \ No newline at end of file diff --git a/src/icons/minus.svg b/src/icons/minus.svg index 91005aa6..67a9eb05 100644 --- a/src/icons/minus.svg +++ b/src/icons/minus.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/icons/pencil.svg b/src/icons/pencil.svg index fc07da74..6edc0093 100644 --- a/src/icons/pencil.svg +++ b/src/icons/pencil.svg @@ -1,3 +1,3 @@ - - + + \ No newline at end of file diff --git a/src/icons/plus.svg b/src/icons/plus.svg index d22d6526..c6c27927 100644 --- a/src/icons/plus.svg +++ b/src/icons/plus.svg @@ -1,3 +1,3 @@ - - + + \ No newline at end of file diff --git a/src/icons/tree-close.svg b/src/icons/tree-close.svg deleted file mode 100644 index c2a1fa4f..00000000 --- a/src/icons/tree-close.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/renderers/Form/Tree.tsx b/src/renderers/Form/Tree.tsx index d70d4bbe..37eeec84 100644 --- a/src/renderers/Form/Tree.tsx +++ b/src/renderers/Form/Tree.tsx @@ -72,7 +72,7 @@ export default class TreeControl extends React.Component { @autobind handleEdit(values: PlainObject) { - this.saveRemote(values, 'add'); + this.saveRemote(values, 'edit'); } @autobind @@ -109,7 +109,7 @@ export default class TreeControl extends React.Component { } @autobind - async handleDelete(item: any) { + async handleRemove(item: any) { const {deleteConfirmText, deleteApi, data, env} = this.props; const ctx = createObject(data, item); if (isEffectiveApi(deleteApi, ctx)) { @@ -237,7 +237,7 @@ export default class TreeControl extends React.Component { editable={isEffectiveApi(editApi)} onEdit={this.handleEdit} openEditDialog={this.openEditDialog} - onDelete={this.handleDelete} + onRemove={this.handleRemove} deletable={isEffectiveApi(deleteApi)} /> )}