vxe-pc-ui 4.14.20 → 4.14.21

package/es/tree/src/tree.js

@@ -2276,16 +2276,24 @@ export default defineVxeComponent({
             }
             return renderEmptyElement($xeTree);
         };
-        const renderRadio = (node, nodeid, isChecked) => {
+        const handleVisibleOrCheckMode = (mode, isExistChild, nLevel) => {
+            if (mode) {
+                if (mode === 'first') {
+                    return !nLevel;
+                }
+                if (mode === 'last') {
+                    return !isExistChild;
+                }
+            }
+            return true;
+        };
+        const renderRadio = (node, nodeid, isExistChild, nLevel, isChecked) => {
             const { showRadio } = props;
             const radioOpts = computeRadioOpts.value;
-            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,
@@ -2304,16 +2312,13 @@ export default defineVxeComponent({
             }
             return renderEmptyElement($xeTree);
         };
-        const renderCheckbox = (node, nodeid, isChecked, isIndeterminate) => {
+        const renderCheckbox = (node, nodeid, isExistChild, nLevel, isChecked, isIndeterminate) => {
             const { showCheckbox } = props;
             const checkboxOpts = computeCheckboxOpts.value;
-            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,
@@ -2341,12 +2346,12 @@ export default defineVxeComponent({
             const titleField = computeTitleField.value;
             const hasChildField = computeHasChildField.value;
             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;
@@ -2413,7 +2418,7 @@ export default defineVxeComponent({
                         : 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',
@@ -2430,8 +2435,8 @@ export default defineVxeComponent({
                         ]
                         : []),
                     renderDragIcon(node, nodeid),
-                    renderRadio(node, nodeid, isRadioChecked),
-                    renderCheckbox(node, nodeid, isCheckboxChecked, isIndeterminate),
+                    renderRadio(node, nodeid, isExistChild, nLevel, isRadioChecked),
+                    renderCheckbox(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 = "4.14.20";
+export const version = "4.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${"4.14.20"}`;
+const version = `ui v${"4.14.21"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -4646,7 +4646,7 @@ function checkDynamic() {
 }
 ;// ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.14.20"}`;
+const log_version = `ui v${"4.14.21"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// ./packages/ui/index.ts
@@ -4654,7 +4654,7 @@ const errLog = log.create('error', log_version);
 
 
 
-const ui_version = "4.14.20";
+const ui_version = "4.14.21";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -46821,28 +46821,38 @@ function tree_createReactData() {
       }
       return renderEmptyElement($xeTree);
     };
-    const renderRadio = (node, nodeid, isChecked) => {
+    const handleVisibleOrCheckMode = (mode, isExistChild, nLevel) => {
+      if (mode) {
+        if (mode === 'first') {
+          return !nLevel;
+        }
+        if (mode === 'last') {
+          return !isExistChild;
+        }
+      }
+      return true;
+    };
+    const renderRadio = (node, nodeid, isExistChild, nLevel, isChecked) => {
       const {
         showRadio
       } = props;
       const radioOpts = computeRadioOpts.value;
       const {
         showIcon,
+        checkMode,
         checkMethod,
+        visibleMode,
         visibleMethod
       } = radioOpts;
-      const isVisible = !visibleMethod || visibleMethod({
+      const isVisible = visibleMethod ? visibleMethod({
         $tree: $xeTree,
         node
-      });
-      let isDisabled = !!checkMethod;
+      }) : 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 (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           class: ['vxe-tree--radio-option', {
             'is--checked': isChecked,
@@ -46859,28 +46869,27 @@ function tree_createReactData() {
       }
       return renderEmptyElement($xeTree);
     };
-    const renderCheckbox = (node, nodeid, isChecked, isIndeterminate) => {
+    const renderCheckbox = (node, nodeid, isExistChild, nLevel, isChecked, isIndeterminate) => {
       const {
         showCheckbox
       } = props;
       const checkboxOpts = computeCheckboxOpts.value;
       const {
         showIcon,
+        checkMode,
         checkMethod,
+        visibleMode,
         visibleMethod
       } = checkboxOpts;
-      const isVisible = !visibleMethod || visibleMethod({
+      const isVisible = visibleMethod ? visibleMethod({
         $tree: $xeTree,
         node
-      });
-      let isDisabled = !!checkMethod;
+      }) : 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 (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           class: ['vxe-tree--checkbox-option', {
             'is--checked': isChecked,
@@ -46926,12 +46935,12 @@ function tree_createReactData() {
       const titleField = computeTitleField.value;
       const hasChildField = computeHasChildField.value;
       const childList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(node, titleField);
       const nLevel = nodeItem.level;
       let isRadioChecked = false;
@@ -46999,14 +47008,14 @@ function tree_createReactData() {
         }
       })]) : renderEmptyElement($xeTree), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-tree--node-item-switcher'
-      }, showIcon && (lazy ? isLazyLoaded ? hasChild : hasLazyChilds : hasChild) ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, showIcon && (lazy ? isLazyLoaded ? isExistChild : hasLazyChilds : isExistChild) ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-tree--node-item-icon',
         onClick(evnt) {
           toggleExpandEvent(evnt, node);
         }
       }, iconSlot ? vn_getSlotVNs(iconSlot(nParams)) : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
         class: isLazyLoading ? iconLoaded || tree_getIcon().TREE_NODE_LOADED : isExpand ? iconOpen || tree_getIcon().TREE_NODE_OPEN : iconClose || tree_getIcon().TREE_NODE_CLOSE
-      })])] : []), renderDragIcon(node, nodeid), renderRadio(node, nodeid, isRadioChecked), renderCheckbox(node, nodeid, isCheckboxChecked, isIndeterminate), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      })])] : []), renderDragIcon(node, nodeid), renderRadio(node, nodeid, isExistChild, nLevel, isRadioChecked), renderCheckbox(node, nodeid, isExistChild, nLevel, isCheckboxChecked, isIndeterminate), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-tree--node-item-inner'
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-tree--node-item-title'