@netang/quasar 0.1.37 → 0.1.39

package/components/tree/index.vue

@@ -86,11 +86,23 @@
                     :ticked="item.m.indeterminate === true ? null : item.m.ticked"
                     :key="item.key"
                     :dark="isDark"
-                    v-if="hasSlotDefault"
+                    v-if="hasSlots.defaultHeader"
                 />
                 <!-- 否则为文字 -->
                 <span v-else>{{ item.label }}</span>
             </div>
+
+            <!-- 节点插槽 -->
+            <slot
+                name="node"
+                :node="item.node"
+                :expanded="item.m.expanded"
+                :ticked="item.m.indeterminate === true ? null : item.m.ticked"
+                :key="item.key"
+                :dark="isDark"
+                v-if="hasSlots.node"
+            />
+
         </div>
     </q-virtual-scroll>
 </template>
@@ -183,6 +195,9 @@ export default {
 
         // 【覆盖声明】-------------------------------------------------------
 
+        // 是否选择的是树节点数据(false:节点键值, true:节点数据)
+        selectedNode: Boolean,
+
         // 是否开启拖拽
         draggable: Boolean,
         // 是否禁止上下推拽
@@ -303,6 +318,13 @@ export default {
          */
         const computedControlColor = computed(() => props.controlColor || props.color)
 
+        /**
+         * 当前已选数据键值
+         */
+        const currentSelectedKey = computed(function () {
+            return props.selectedNode ? props.selected[props.nodeKey] : props.selected
+        })
+
         /**
          * 文本颜色类名
          */
@@ -374,7 +396,7 @@ export default {
                     children: [],
                     matchesFilter: props.filter ? computedFilterMethod.value(node, props.filter) : true,
 
-                    selected: key === props.selected && selectable === true,
+                    selected: key === currentSelectedKey.value && selectable === true,
                     selectable,
                     expanded: isParent === true ? innerExpanded.value.includes(key) : false,
                     expandable,
@@ -879,10 +901,14 @@ export default {
             if (hasSelection.value && meta.selectable) {
 
                 if (props.noSelectionUnset === false) {
-                    emit('update:selected', meta.key !== props.selected ? meta.key : null)
-
-                } else if (meta.key !== props.selected) {
-                    emit('update:selected', meta.key === void 0 ? null : meta.key)
+                    emit('update:selected', meta.key !== currentSelectedKey.value ? (
+                        props.selectedNode ? node : meta.key
+                    ) : null)
+
+                } else if (meta.key !== currentSelectedKey.value) {
+                    emit('update:selected', meta.key === void 0 ? null : (
+                        props.selectedNode ? node : meta.key
+                    ))
                 }
 
             } else {
@@ -1063,10 +1089,13 @@ export default {
         // ==========【覆盖部分】=========================================================================================
 
         /**
-         * 是否有默认头部插槽
+         * 是否有默认插槽
          */
-        const hasSlotDefault = computed(function () {
-            return $n_has(slots, 'default-header')
+        const hasSlots = computed(function () {
+            return {
+                defaultHeader: $n_has(slots, 'default-header'),
+                node: $n_has(slots, 'node'),
+            }
         })
 
         /**
@@ -1508,7 +1537,7 @@ export default {
             collapseAll,
             stopAndPrevent,
 
-            hasSlotDefault,
+            hasSlots,
             currentChildren,
 
             onNode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netang/quasar",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "description": "netang-quasar",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"