vxe-pc-ui 3.14.20 → 3.14.22

package/packages/tree/src/tree.ts

@@ -484,6 +484,18 @@ function handleNodeDragSwapEvent ($xeTree: VxeTreeConstructor & VxeTreePrivateMe
   return Promise.resolve(errRest)
 }
 
+function handleVisibleOrCheckMode (mode: '' | 'all' | 'first' | 'last' | null | undefined, isExistChild: boolean, nLevel: number) {
+  if (mode) {
+    if (mode === 'first') {
+      return !nLevel
+    }
+    if (mode === 'last') {
+      return !isExistChild
+    }
+  }
+  return true
+}
+
 function createInternalData (): TreeInternalData {
   return {
     // initialized: false,
@@ -2632,19 +2644,16 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }
       return renderEmptyElement($xeTree)
     },
-    renderRadio (h: CreateElement, node: any, nodeid: string, isChecked: boolean) {
+    renderRadio (h: CreateElement, node: any, nodeid: string, isExistChild: boolean, nLevel: number, isChecked: boolean) {
       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,
@@ -2665,19 +2674,16 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }
       return renderEmptyElement($xeTree)
     },
-    renderCheckbox  (h: CreateElement, node: any, nodeid: string, isChecked: boolean, isIndeterminate: boolean) {
+    renderCheckbox  (h: CreateElement, node: any, nodeid: string, isExistChild: boolean, nLevel: number, isChecked: boolean, isIndeterminate: boolean) {
       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,
@@ -2713,12 +2719,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const titleField = $xeTree.computeTitleField
       const hasChildField = $xeTree.computeHasChildField
       const childList: any[] = 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
 
@@ -2805,7 +2811,7 @@ export default /* define-vxe-component start */ 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',
@@ -2824,8 +2830,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
               ]
             : []),
           $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/types/components/colgroup.d.ts

@@ -1,5 +1,5 @@
 import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentEventParams, ValueOf } from '@vxe-ui/core'
-import { VxeColumnPropTypes, VxeColumnSlotTypes } from './column'
+import { VxeColumnProps, VxeColumnSlots } from './column'
 
 /* eslint-disable @typescript-eslint/no-empty-interface,no-use-before-define,@typescript-eslint/ban-types */
 
@@ -20,67 +20,7 @@ export interface VxeColgroupPrivateRef extends ColgroupPrivateRef { }
 export namespace VxeColgroupPropTypes {
 }
 
-export interface VxeColgroupProps {
-  /**
-   * 渲染类型
-   */
-  type?: VxeColumnPropTypes.Type
-  /**
-   * 列字段名
-   */
-  field?: VxeColumnPropTypes.Field
-  /**
-   * 列标题
-   */
-  title?: VxeColumnPropTypes.Title
-  /**
-   * 列宽度
-   */
-  width?: VxeColumnPropTypes.Width
-  /**
-   * 列最小宽度，把剩余宽度按比例分配
-   */
-  minWidth?: VxeColumnPropTypes.MinWidth
-  /**
-   * 是否允许拖动列宽调整大小
-   */
-  resizable?: VxeColumnPropTypes.Resizable
-  /**
-   * 将列固定在左侧或者右侧
-   */
-  fixed?: VxeColumnPropTypes.Fixed
-  /**
-   * 列对齐方式
-   */
-  align?: VxeColumnPropTypes.Align
-  /**
-   * 表头对齐方式
-   */
-  headerAlign?: VxeColumnPropTypes.HeaderAlign
-  /**
-   * 当内容过长时显示为省略号
-   */
-  showOverflow?: VxeColumnPropTypes.ShowOverflow
-  /**
-   * 当表头内容过长时显示为省略号
-   */
-  showHeaderOverflow?: VxeColumnPropTypes.ShowHeaderOverflow
-  /**
-   * 给单元格附加 className
-   */
-  className?: VxeColumnPropTypes.ClassName
-  /**
-   * 给表头单元格附加 className
-   */
-  headerClassName?: VxeColumnPropTypes.HeaderClassName
-  /**
-   * 是否可视
-   */
-  visible?: VxeColumnPropTypes.Visible
-  /**
-   * 额外的参数
-   */
-  params?: VxeColumnPropTypes.Params
+export interface VxeColgroupProps extends VxeColumnProps {
 }
 
 export interface ColgroupPrivateComputed {
@@ -116,15 +56,7 @@ export namespace VxeColgroupSlotTypes {
   export interface DefaultSlotParams {}
 }
 
-export interface VxeColgroupSlots<D = any> {
-  /**
-   * 自定义表头内容的模板
-   */
-  header?: (params: VxeColumnSlotTypes.HeaderSlotParams<D>) => any
-  /**
-   * 只对 type=checkbox,radio 有效，自定义标题模板
-   */
-  title?: (params: VxeColumnSlotTypes.HeaderSlotParams<D>) => any
+export interface VxeColgroupSlots<D = any> extends VxeColumnSlots<D> {
 }
 
 export const Colgroup: typeof VxeColgroup

package/types/components/column.d.ts

@@ -42,6 +42,8 @@ export namespace VxeColumnPropTypes {
   export type Padding = boolean
   export type VerticalAlign = '' | 'top' | 'center' | null
 
+  export type Rules<D = any> = VxeTableDefines.ValidatorRule<D>[]
+
   export type Formatter<D = any> = ((params: VxeColumnDefines.CellFormatterParams<D>) => string | number) | any[] | string
 
   export type HeaderFormatter = ((params: {
@@ -551,6 +553,10 @@ export interface VxeColumnProps<D = any> {
    * 是否启用浮动筛选
    */
   floatingFilters?: VxeColumnPropTypes.FloatingFilters
+  /**
+   * 列的校验规则
+   */
+  rules?: VxeColumnPropTypes.Rules<D>
   /**
    * 设置为分组节点
    */

package/types/components/form-item.d.ts

@@ -271,7 +271,7 @@ export interface VxeFormItemProps<D = any> {
    * 项渲染配置项
    */
   itemRender?: VxeFormItemPropTypes.ItemRender
-  Rules?: VxeFormItemPropTypes.Rules<D>
+  rules?: VxeFormItemPropTypes.Rules<D>
   slots?: VxeFormItemPropTypes.Slots
   children?: VxeFormItemProps<D>[]
 

package/types/components/table.d.ts

@@ -6197,6 +6197,7 @@ export namespace VxeTableDefines {
     filterRecoverMethod: VxeColumnPropTypes.FilterRecoverMethod<D>
     filterRender: VxeColumnPropTypes.FilterRender
     floatingFilters: VxeColumnPropTypes.FloatingFilters
+    rules: VxeColumnPropTypes.Rules<D>
     rowGroupNode: VxeColumnPropTypes.RowGroupNode
     treeNode: VxeColumnPropTypes.TreeNode
     dragSort: VxeColumnPropTypes.DragSort

package/types/components/tree.d.ts

@@ -64,10 +64,12 @@ export namespace VxeTreePropTypes {
   export type CheckNodeKey = string | number | null
   export interface RadioConfig<D = any> {
     strict?: boolean
+    visibleMode?: 'all' | 'first' | 'last' | '' | null
     visibleMethod?: (params: {
       $tree: VxeTreeConstructor
       node: D
      }) => boolean
+    checkMode?: 'all' | 'first' | 'last' | '' | null
     checkMethod?: (params: {
       $tree: VxeTreeConstructor
       node: D
@@ -82,10 +84,12 @@ export namespace VxeTreePropTypes {
     showHeader?: boolean
     checkStrictly?: boolean
     highlight?: boolean
+    visibleMode?: 'all' | 'first' | 'last' | '' | null
     visibleMethod?: (params: {
       $tree: VxeTreeConstructor
       node: D
      }) => boolean
+    checkMode?: 'all' | 'first' | 'last' | '' | null
     checkMethod?: (params: {
       $tree: VxeTreeConstructor
       node: D