clay
/
workflow-engine-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: clay:2cf99940125fb11fd47a21dd864b22c91099a13a
Branches Tags
clay:master
clay:pro
clay:DJ
clay:chatGPT
clay:master-back
clay:clay
..
compare: clay:6a9d2a45e210abdfde498787949d2e70a5fa2b2c
Branches Tags
clay:pro
clay:master
clay:DJ
clay:chatGPT
clay:master-back
clay:clay

No commits in common. "2cf99940125fb11fd47a21dd864b22c91099a13a" and "6a9d2a45e210abdfde498787949d2e70a5fa2b2c" have entirely different histories.
2cf9994012 ... 6a9d2a45e2

1 changed files with 14 additions and 10 deletions
Show Stats Expand all files Collapse all files

24
flowable-engine-web/src/components/common/UserPicker.vue
View File

@ -20,16 +20,17 @@
:default-expanded-keys="expandedKeys" lazy accordion :default-expanded-keys="expandedKeys" lazy accordion
@node-click="handleChange" @node-click="handleChange"
> >
<div class="tree-node" slot-scope="{ node,data }" > <!-- :style="data.avatar!==null ? {'height':'50px'}:''"-->
<div class="tree-node" slot-scope="{ node,data }">
<div v-if="data.type === 0" style="display: flex;align-items: center;"> <div v-if="data.type === 0" style="display: flex;align-items: center;">
<el-avatar :src="data.avatar"></el-avatar> <el-avatar :src="data.avatar"></el-avatar>
{{ node.label }} {{ node.label }}
</div> </div>
<div v-else-if="data.type === 1" > <div v-else-if="data.type === 1">
<el-icon class="el-icon-user-solid"/> <el-icon class="el-icon-user-solid"/>
{{ node.label }} {{ node.label }}
</div> </div>
<div v-else > <div v-else>
<el-icon class="el-icon-folder-opened"/> <el-icon class="el-icon-folder-opened"/>
{{ node.label }} {{ node.label }}
</div> </div>
@ -105,7 +106,7 @@ export default {
label: 'name', label: 'name',
children: 'children', children: 'children',
isLeaf: function (data, node) { isLeaf: function (data, node) {
return data.type === 0; return !!data.avatar
} }
} }
} }
@ -237,16 +238,19 @@ export default {
.el-tree-node__children { .el-tree-node__children {
.el-tree-node { .el-tree-node {
.el-tree-node__content { .el-tree-node__content {
height: auto; height: 42px;
.tree-node{
.el-avatar{
}
}
} }
} }
} }
} }
///deep/.el-tree-node__children{
// .is-current{
// .el-tree-node__content{
// height: 42px;
// }
// }
//}
.tree-node { .tree-node {
div { div {
.el-avatar { .el-avatar {