Skip to content

Fix exported data #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix exported data #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af884f4
Export innerLabelWidth
oscaralbareda May 16, 2022
c5069af
Remove conflicting exported data with same name prop
oscaralbareda May 16, 2022
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
21 changes: 10 additions & 11 deletions src/components/blocks-tree/blocks-node.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<template>
<div :class="nodeClass">
<div class="org-tree-node-label">
<div :class="innerLabelClass" :style="{width:labelWidth}"
@click="(e)=>$emit('node-click',e,data,nodeContext)"
@mouseout="(e)=>$emit('node-mouseout',e,data,nodeContext)"
@mouseover="(e)=>$emit('node-mouseover',e,data,nodeContext)"
<div :class="innerLabelClass" :style="{width:innerLabelWidth}"
@click="(e)=>$emit('node-click',e,data,nodeContext)"
@mouseout="(e)=>$emit('node-mouseout',e,data,nodeContext)"
@mouseover="(e)=>$emit('node-mouseover',e,data,nodeContext)"
@focus="(e)=>$emit('node-focus',e,data,nodeContext)">
<slot name="node" :data="data" :context="nodeContext">
<span v-if="!renderContent">{{data[props.label]}}</span>
Expand Down Expand Up @@ -73,20 +73,20 @@ export default defineComponent({

setup(props,{ slots, attrs, emit,expose }) {
let isLeaf = computed(()=>Array.isArray(props.data[props.props.children]) && props.data[props.props.children].length > 0 ? false:true);
let labelWidth = computed(()=>props.labelWidth ? (typeof(props.labelWidth)=='number' ? `${props.labelWidth}px` :props.labelWidth) :'auto');
let innerLabelWidth = computed(()=>props.labelWidth ? (typeof(props.labelWidth)=='number' ? `${props.labelWidth}px` :props.labelWidth) :'auto');
let expanded = ref<boolean>(props.data[props.props.expand]&&true);

let nodeClass = computed(()=>{
return {
'org-tree-node':true,
'is-leaf':isLeaf.value,
'collapsed':!isLeaf.value && props.collapsable && !expanded.value
}
});

let innerLabelClass = computed(()=>{
let labelClassName = typeof props.labelClassName == 'function' ? props.labelClassName(props.data) : props.labelClassName;

return {
'org-tree-node-label-inner':true,
[labelClassName]:!!labelClassName,
Expand All @@ -113,7 +113,7 @@ export default defineComponent({
isExpanded:()=>expanded.value,
toggleExpand,
}

const nodeKey = (child)=> {
var key = child[props.props.key];

Expand Down Expand Up @@ -158,9 +158,8 @@ export default defineComponent({
isLeaf,
nodeExpandBtnClass,
onExpandBtnClick,
labelWidth,
innerLabelWidth,
expanded,
data:props.data,
nodeContext,
nodeKey
}
Expand Down