+ if(isGroup){//分组模式
+ if(item.__tmp){
+ return
+ }
+ return (
+
)
@@ -388,6 +446,7 @@ class General extends Component{
input.addEventListener('compositionupdate', this.handleComposition.bind(this));
input.addEventListener('compositionend', this.handleComposition.bind(this));
input.addEventListener('input', this.searchInput.bind(this));
+ input.addEventListener('keydown', this.keydown.bind(this));
this.searchInputRef = input;
}
}
diff --git a/src/components/plugin/tree.js b/src/components/plugin/tree.js
index 4e2ae7e..8922554 100644
--- a/src/components/plugin/tree.js
+++ b/src/components/plugin/tree.js
@@ -1,4 +1,5 @@
import { h, Component, render } from 'preact'
+import { deepMerge, isFunction } from '@/common/util'
class Tree extends Component{
@@ -242,11 +243,46 @@ class Tree extends Component{
}
let arr = data.map(item => renderGroup(item, 10 - tree.indent)).filter(a => a);
+ let safetyArr = deepMerge([], arr);
+ let safetySels = deepMerge([], sels);
- if(!arr.length){
- //查看无数据情况下是否显示分页
- arr.push(
{ empty }
)
- }
+ //工具条操作
+ const toolbar = (
+
+ )
const search = (
@@ -255,8 +291,14 @@ class Tree extends Component{
);
+ if(!arr.length){
+ //查看无数据情况下是否显示分页
+ arr.push(
{ empty }
)
+ }
+
return (
+ { config.toolbar.show && toolbar }
{ filterable && search }
{ arr }
diff --git a/src/style/index.less b/src/style/index.less
index 47ca340..a023855 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -475,6 +475,12 @@ xm-select{
background-color: #FFF;
}
+ .item--divided{
+ border-top: 1px solid #ebeef5;
+ width: calc(100% - 20px);
+ cursor: initial;
+ }
+
}
//不同尺寸下的数据调整
@@ -519,6 +525,9 @@ xm-select{
top: @size / 2 - 1px;
}
}
+ .item--divided{
+ margin: @size / 4;
+ }
}
xm-select[size='large']{
.mixin(40px)