vxe-pc-ui 3.14.20 → 3.14.21

package/es/tree/src/tree.js

@@ -450,6 +450,17 @@ function handleNodeDragSwapEvent($xeTree, evnt, dragNode, prevDragNode, prevDrag
     clearCrossTreeDragStatus($xeTree);
     return Promise.resolve(errRest);
 }
+function handleVisibleOrCheckMode(mode, isExistChild, nLevel) {
+    if (mode) {
+        if (mode === 'first') {
+            return !nLevel;
+        }
+        if (mode === 'last') {
+            return !isExistChild;
+        }
+    }
+    return true;
+}
 function createInternalData() {
     return {
         // initialized: false,
@@ -2498,18 +2509,15 @@ export default {
             }
             return renderEmptyElement($xeTree);
         },
-        renderRadio(h, node, nodeid, isChecked) {
+        renderRadio(h, node, nodeid, isExistChild, nLevel, isChecked) {
             const $xeTree = this;
             const props = $xeTree;
             const { showRadio } = props;
             const radioOpts = $xeTree.computeRadioOpts;
-            const { showIcon, checkMethod, visibleMethod } = radioOpts;
-            const isVisible = !visibleMethod || visibleMethod({ $tree: $xeTree, node });
-            let isDisabled = !!checkMethod;
+            const { showIcon, checkMode, checkMethod, visibleMode, visibleMethod } = radioOpts;
+            const isVisible = visibleMethod ? visibleMethod({ $tree: $xeTree, node }) : handleVisibleOrCheckMode(visibleMode, isExistChild, nLevel);
             if (showRadio && showIcon && isVisible) {
-                if (checkMethod) {
-                    isDisabled = !checkMethod({ $tree: $xeTree, node });
-                }
+                const isDisabled = checkMethod ? !checkMethod({ $tree: $xeTree, node }) : !handleVisibleOrCheckMode(checkMode, isExistChild, nLevel);
                 return h('div', {
                     class: ['vxe-tree--radio-option', {
                             'is--checked': isChecked,
@@ -2530,18 +2538,15 @@ export default {
             }
             return renderEmptyElement($xeTree);
         },
-        renderCheckbox(h, node, nodeid, isChecked, isIndeterminate) {
+        renderCheckbox(h, node, nodeid, isExistChild, nLevel, isChecked, isIndeterminate) {
             const $xeTree = this;
             const props = $xeTree;
             const { showCheckbox } = props;
             const checkboxOpts = $xeTree.computeCheckboxOpts;
-            const { showIcon, checkMethod, visibleMethod } = checkboxOpts;
-            const isVisible = !visibleMethod || visibleMethod({ $tree: $xeTree, node });
-            let isDisabled = !!checkMethod;
+            const { showIcon, checkMode, checkMethod, visibleMode, visibleMethod } = checkboxOpts;
+            const isVisible = visibleMethod ? visibleMethod({ $tree: $xeTree, node }) : handleVisibleOrCheckMode(visibleMode, isExistChild, nLevel);
             if (showCheckbox && showIcon && isVisible) {
-                if (checkMethod) {
-                    isDisabled = !checkMethod({ $tree: $xeTree, node });
-                }
+                const isDisabled = checkMethod ? !checkMethod({ $tree: $xeTree, node }) : !handleVisibleOrCheckMode(checkMode, isExistChild, nLevel);
                 return h('div', {
                     class: ['vxe-tree--checkbox-option', {
                             'is--checked': isChecked,
@@ -2576,12 +2581,12 @@ export default {
             const titleField = $xeTree.computeTitleField;
             const hasChildField = $xeTree.computeHasChildField;
             const childList = XEUtils.get(node, childrenField);
-            const hasChild = childList && childList.length;
+            const isExistChild = childList && childList.length > 0;
             const iconSlot = slots.icon;
             const titleSlot = slots.title;
             const extraSlot = slots.extra;
             const isExpand = updateExpandedFlag && treeExpandedMaps[nodeid];
-            const nodeItem = nodeMaps[nodeid];
+            const nodeItem = nodeMaps[nodeid] || {};
             const nodeValue = XEUtils.get(node, titleField);
             const nLevel = nodeItem.level;
             let isRadioChecked = false;
@@ -2655,7 +2660,7 @@ export default {
                         : renderEmptyElement($xeTree),
                     h('div', {
                         class: 'vxe-tree--node-item-switcher'
-                    }, showIcon && (lazy ? (isLazyLoaded ? hasChild : hasLazyChilds) : hasChild)
+                    }, showIcon && (lazy ? (isLazyLoaded ? isExistChild : hasLazyChilds) : isExistChild)
                         ? [
                             h('div', {
                                 class: 'vxe-tree--node-item-icon',
@@ -2674,8 +2679,8 @@ export default {
                         ]
                         : []),
                     $xeTree.renderDragIcon(h, node, nodeid),
-                    $xeTree.renderRadio(h, node, nodeid, isRadioChecked),
-                    $xeTree.renderCheckbox(h, node, nodeid, isCheckboxChecked, isIndeterminate),
+                    $xeTree.renderRadio(h, node, nodeid, isExistChild, nLevel, isRadioChecked),
+                    $xeTree.renderCheckbox(h, node, nodeid, isExistChild, nLevel, isCheckboxChecked, isIndeterminate),
                     h('div', {
                         class: 'vxe-tree--node-item-inner'
                     }, [

package/es/ui/index.js

@@ -1,7 +1,7 @@
 import { VxeUI, setConfig, setIcon } from '@vxe-ui/core';
 import { dynamicApp } from '../dynamics';
 import { warnLog } from './src/log';
-export const version = "3.14.20";
+export const version = "3.14.21";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 export function config(options) {

package/es/ui/src/log.js

@@ -1,4 +1,4 @@
 import { log } from '@vxe-ui/core';
-const version = `ui v${"3.14.20"}`;
+const version = `ui v${"3.14.21"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -13214,7 +13214,7 @@ function checkDynamic() {
 }
 ;// ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.14.20");
+var log_version = "ui v".concat("3.14.21");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// ./packages/ui/index.ts
@@ -13222,7 +13222,7 @@ var errLog = log.create('error', log_version);
 
 
 
-var ui_version = "3.14.20";
+var ui_version = "3.14.21";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -56888,6 +56888,17 @@ function handleNodeDragSwapEvent($xeTree, evnt, dragNode, prevDragNode, prevDrag
   clearCrossTreeDragStatus($xeTree);
   return Promise.resolve(errRest);
 }
+function handleVisibleOrCheckMode(mode, isExistChild, nLevel) {
+  if (mode) {
+    if (mode === 'first') {
+      return !nLevel;
+    }
+    if (mode === 'last') {
+      return !isExistChild;
+    }
+  }
+  return true;
+}
 function tree_createInternalData() {
   return {
     // initialized: false,
@@ -59112,26 +59123,25 @@ function tree_createReactData() {
       }
       return renderEmptyElement($xeTree);
     },
-    renderRadio: function renderRadio(h, node, nodeid, isChecked) {
+    renderRadio: function renderRadio(h, node, nodeid, isExistChild, nLevel, isChecked) {
       var $xeTree = this;
       var props = $xeTree;
       var showRadio = props.showRadio;
       var radioOpts = $xeTree.computeRadioOpts;
       var showIcon = radioOpts.showIcon,
+        checkMode = radioOpts.checkMode,
         checkMethod = radioOpts.checkMethod,
+        visibleMode = radioOpts.visibleMode,
         visibleMethod = radioOpts.visibleMethod;
-      var isVisible = !visibleMethod || visibleMethod({
+      var isVisible = visibleMethod ? visibleMethod({
         $tree: $xeTree,
         node: node
-      });
-      var isDisabled = !!checkMethod;
+      }) : handleVisibleOrCheckMode(visibleMode, isExistChild, nLevel);
       if (showRadio && showIcon && isVisible) {
-        if (checkMethod) {
-          isDisabled = !checkMethod({
-            $tree: $xeTree,
-            node: node
-          });
-        }
+        var isDisabled = checkMethod ? !checkMethod({
+          $tree: $xeTree,
+          node: node
+        }) : !handleVisibleOrCheckMode(checkMode, isExistChild, nLevel);
         return h('div', {
           class: ['vxe-tree--radio-option', {
             'is--checked': isChecked,
@@ -59150,26 +59160,25 @@ function tree_createReactData() {
       }
       return renderEmptyElement($xeTree);
     },
-    renderCheckbox: function renderCheckbox(h, node, nodeid, isChecked, isIndeterminate) {
+    renderCheckbox: function renderCheckbox(h, node, nodeid, isExistChild, nLevel, isChecked, isIndeterminate) {
       var $xeTree = this;
       var props = $xeTree;
       var showCheckbox = props.showCheckbox;
       var checkboxOpts = $xeTree.computeCheckboxOpts;
       var showIcon = checkboxOpts.showIcon,
+        checkMode = checkboxOpts.checkMode,
         checkMethod = checkboxOpts.checkMethod,
+        visibleMode = checkboxOpts.visibleMode,
         visibleMethod = checkboxOpts.visibleMethod;
-      var isVisible = !visibleMethod || visibleMethod({
+      var isVisible = visibleMethod ? visibleMethod({
         $tree: $xeTree,
         node: node
-      });
-      var isDisabled = !!checkMethod;
+      }) : handleVisibleOrCheckMode(visibleMode, isExistChild, nLevel);
       if (showCheckbox && showIcon && isVisible) {
-        if (checkMethod) {
-          isDisabled = !checkMethod({
-            $tree: $xeTree,
-            node: node
-          });
-        }
+        var isDisabled = checkMethod ? !checkMethod({
+          $tree: $xeTree,
+          node: node
+        }) : !handleVisibleOrCheckMode(checkMode, isExistChild, nLevel);
         return h('div', {
           class: ['vxe-tree--checkbox-option', {
             'is--checked': isChecked,
@@ -59216,12 +59225,12 @@ function tree_createReactData() {
       var titleField = $xeTree.computeTitleField;
       var hasChildField = $xeTree.computeHasChildField;
       var childList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(node, childrenField);
-      var hasChild = childList && childList.length;
+      var isExistChild = childList && childList.length > 0;
       var iconSlot = slots.icon;
       var titleSlot = slots.title;
       var extraSlot = slots.extra;
       var isExpand = updateExpandedFlag && treeExpandedMaps[nodeid];
-      var nodeItem = nodeMaps[nodeid];
+      var nodeItem = nodeMaps[nodeid] || {};
       var nodeValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(node, titleField);
       var nLevel = nodeItem.level;
       var isRadioChecked = false;
@@ -59291,7 +59300,7 @@ function tree_createReactData() {
         }
       })]) : renderEmptyElement($xeTree), h('div', {
         class: 'vxe-tree--node-item-switcher'
-      }, showIcon && (lazy ? isLazyLoaded ? hasChild : hasLazyChilds : hasChild) ? [h('div', {
+      }, showIcon && (lazy ? isLazyLoaded ? isExistChild : hasLazyChilds : isExistChild) ? [h('div', {
         class: 'vxe-tree--node-item-icon',
         on: {
           click: function click(evnt) {
@@ -59300,7 +59309,7 @@ function tree_createReactData() {
         }
       }, iconSlot ? vn_getSlotVNs(iconSlot(nParams)) : [h('i', {
         class: isLazyLoading ? iconLoaded || tree_getIcon().TREE_NODE_LOADED : isExpand ? iconOpen || tree_getIcon().TREE_NODE_OPEN : iconClose || tree_getIcon().TREE_NODE_CLOSE
-      })])] : []), $xeTree.renderDragIcon(h, node, nodeid), $xeTree.renderRadio(h, node, nodeid, isRadioChecked), $xeTree.renderCheckbox(h, node, nodeid, isCheckboxChecked, isIndeterminate), h('div', {
+      })])] : []), $xeTree.renderDragIcon(h, node, nodeid), $xeTree.renderRadio(h, node, nodeid, isExistChild, nLevel, isRadioChecked), $xeTree.renderCheckbox(h, node, nodeid, isExistChild, nLevel, isCheckboxChecked, isIndeterminate), h('div', {
         class: 'vxe-tree--node-item-inner'
       }, [h('div', {
         class: 'vxe-tree--node-item-title'