vxe-pc-ui 3.14.22 → 3.14.24

package/packages/tree/src/tree.ts

@@ -1942,19 +1942,20 @@ export default /* define-vxe-component start */ defineVxeComponent({
       evnt.preventDefault()
       evnt.stopPropagation()
       const { transform } = props
-      const { selectCheckboxMaps } = internalData
+      const { selectCheckboxMaps, nodeMaps } = internalData
       const childrenField = $xeTree.computeChildrenField
       const mapChildrenField = $xeTree.computeMapChildrenField
       const checkboxOpts = $xeTree.computeCheckboxOpts
-      const { checkStrictly, checkMethod } = checkboxOpts
-      let isDisabled = !!checkMethod
-      if (checkMethod) {
-        isDisabled = !checkMethod({ $tree: $xeTree, node })
-      }
+      const { checkStrictly, checkMode, checkMethod } = checkboxOpts
+      const nodeid = $xeTree.getNodeId(node)
+      const childList: any[] = XEUtils.get(node, childrenField)
+      const isExistChild = childList && childList.length > 0
+      const nodeItem = nodeMaps[nodeid] || {}
+      const nLevel = nodeItem.level
+      const isDisabled = checkMethod ? !checkMethod({ $tree: $xeTree, node }) : !handleVisibleOrCheckMode(checkMode, isExistChild, nLevel)
       if (isDisabled) {
         return
       }
-      const nodeid = $xeTree.getNodeId(node)
       let isChecked = false
       if (selectCheckboxMaps[nodeid]) {
         delete selectCheckboxMaps[nodeid]
@@ -2016,20 +2017,24 @@ export default /* define-vxe-component start */ defineVxeComponent({
     changeRadioEvent (evnt: MouseEvent, node: any) {
       const $xeTree = this
       const reactData = $xeTree.reactData
+      const internalData = $xeTree.internalData
 
       evnt.preventDefault()
       evnt.stopPropagation()
+      const { nodeMaps } = internalData
       const radioOpts = $xeTree.computeRadioOpts
-      const { checkMethod } = radioOpts
-      let isDisabled = !!checkMethod
-      if (checkMethod) {
-        isDisabled = !checkMethod({ $tree: $xeTree, node })
-      }
+      const childrenField = $xeTree.computeChildrenField
+      const { checkMode, checkMethod } = radioOpts
+      const nodeid = $xeTree.getNodeId(node)
+      const childList: any[] = XEUtils.get(node, childrenField)
+      const isExistChild = childList && childList.length > 0
+      const nodeItem = nodeMaps[nodeid] || {}
+      const nLevel = nodeItem.level
+      const isDisabled = checkMethod ? !checkMethod({ $tree: $xeTree, node }) : !handleVisibleOrCheckMode(checkMode, isExistChild, nLevel)
       if (isDisabled) {
         return
       }
       const isChecked = true
-      const nodeid = $xeTree.getNodeId(node)
       const value = deNodeValue(nodeid)
       reactData.selectRadioKey = nodeid
       $xeTree.emitRadioMode(value)

package/packages/tree-select/src/tree-select.ts

@@ -322,11 +322,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const propsOpts = $xeTreeSelect.computePropsOpts as VxeTreeSelectPropTypes.OptionProps
       return propsOpts.children || 'children'
     },
-    computeParentField () {
+    computeNodeParentField () {
       const $xeTreeSelect = this
 
       const propsOpts = $xeTreeSelect.computePropsOpts as VxeTreeSelectPropTypes.OptionProps
-      return propsOpts.parent || 'parentField'
+      const treeOpts = $xeTreeSelect.computeTreeOpts as VxeTreeSelectPropTypes.TreeConfig
+      return propsOpts.parent || treeOpts.parentField || 'parentId'
     },
     computeHasChildField () {
       const $xeTreeSelect = this
@@ -440,6 +441,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const { separator } = props
       const treeOpts = $xeTreeSelect.computeTreeOpts
       const nodeKeyField = $xeTreeSelect.computeNodeKeyField
+      const nodeParentField = $xeTreeSelect.computeNodeParentField
       const childrenField = $xeTreeSelect.computeChildrenField
       const valueField = $xeTreeSelect.computeValueField
       const labelField = $xeTreeSelect.computeLabelField
@@ -470,9 +472,20 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }
       if (optList) {
         if (transform) {
-          optList.forEach((item, index, items) => {
-            handleOptNode(item, index, items, [], null, [])
+          // if (showFullLabel) {
+          const treeList = XEUtils.toArrayTree(optList, {
+            key: nodeKeyField,
+            parentKey: nodeParentField,
+            mapChildren: childrenField,
+            rootParentValue: treeOpts.rootParentValue,
+            rootValues: treeOpts.rootValues
           })
+          XEUtils.eachTree(treeList, handleOptNode, { children: childrenField })
+          // } else {
+          //   optList.forEach((item, index, items) => {
+          //     handleOptNode(item, index, items, [], null, [])
+          //   })
+          // }
         } else {
           XEUtils.eachTree(optList, handleOptNode, { children: childrenField })
         }
@@ -893,7 +906,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const labelField = $xeTreeSelect.computeLabelField
       const valueField = $xeTreeSelect.computeValueField
       const childrenField = $xeTreeSelect.computeChildrenField
-      const parentField = $xeTreeSelect.computeParentField
+      const nodeParentField = $xeTreeSelect.computeNodeParentField
       const hasChildField = $xeTreeSelect.computeHasChildField
       const virtualYOpts = $xeTreeSelect.computeVirtualYOpts
       const filterOpts = $xeTreeSelect.computeFilterOpts
@@ -1088,7 +1101,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
                         valueField: valueField,
                         keyField: nodeKeyField,
                         childrenField: treeOpts.childrenField || childrenField,
-                        parentField: treeOpts.parentField || parentField,
+                        parentField: nodeParentField,
                         hasChildField: treeOpts.hasChildField || hasChildField,
                         accordion: treeOpts.accordion,
                         expandAll: treeOpts.expandAll,

package/types/components/date-panel.d.ts

@@ -137,14 +137,16 @@ export interface DatePanelPrivateMethods { }
 export interface VxeDatePanelPrivateMethods extends DatePanelPrivateMethods { }
 
 export type VxeDatePanelEmits = [
-  'update:modelValue',
+  'model-value',
+  'modelValue',
   'change',
   'click',
   'clear',
   'date-prev',
   'date-today',
   'date-next',
-  'confirm'
+  'confirm',
+  'revert'
 ]
 
 export namespace VxeDatePanelDefines {
@@ -243,18 +245,29 @@ export namespace VxeDatePanelDefines {
   }
 
   export interface ChangeEventParams extends DatePanelEventParams, DatePanelParams { }
+
+  export interface ConfirmEventParams extends DatePanelEventParams {}
+  export interface RevertEventParams extends DatePanelEventParams {
+    label: string
+  }
 }
 
 export type VxeDatePanelEventProps = {
   onChange?: VxeDatePanelEvents.Change
+  onConfirm?: VxeDatePanelEvents.Confirm
+  onRevert?: VxeDatePanelEvents.Revert
 }
 
 export interface VxeDatePanelListeners {
   change?: VxeDatePanelEvents.Change
+  confirm?: VxeDatePanelEvents.Confirm
+  revert?: VxeDatePanelEvents.Revert
 }
 
 export namespace VxeDatePanelEvents {
   export type Change = (params: VxeDatePanelDefines.ChangeEventParams) => void
+  export type Confirm = (params: VxeDatePanelDefines.ConfirmEventParams) => void
+  export type Revert = (params: VxeDatePanelDefines.RevertEventParams) => void
 }
 
 export namespace VxeDatePanelSlotTypes {

package/types/components/table.d.ts

@@ -405,13 +405,17 @@ export namespace VxeTablePropTypes {
    */
   export interface AggregateConfig<D = any> {
     /**
-     * 分组列展示方式
+     * 分组列展示方式，column独立列展示，combined 将多个分组字段合并为一组进行展示
      */
-    mode?: 'column' | 'default' | '' | null
+    mode?: 'column' | 'combined' | 'default' | '' | null
     /**
      * 显示位置
      */
     placement?: 'left' | 'right' | 'top' | 'bottom' | 'default' | '' | null
+    /**
+     * 用于 mode=combined 有效，分组字段合并内容的分隔符
+     */
+    separator?: string
     /**
      * 按指定字段对数据进行分组
      */
@@ -2998,6 +3002,14 @@ export namespace VxeTablePropTypes {
     isFooter?: boolean
     isMerge?: boolean
     isColgroup?: boolean
+    /**
+     * 是否展开所有树层级
+     */
+    isTreeAllExpanded?: boolean
+    /**
+     * 是否展开所有分组层级
+     */
+    isRowGroupAllExpanded?: boolean
     /**
      * 是否马上下载，如果设置为 false 则通过返回结果为内容的 Promise
      */
@@ -3102,11 +3114,6 @@ export namespace VxeTablePropTypes {
     data: any[]
     columns: VxeTableDefines.ColumnInfo[]
     colgroups: VxeTableDefines.ColumnInfo[][]
-
-    /**
-     * @private
-     */
-    isAllExpand?: boolean
     /**
      * @private
      */
@@ -5959,6 +5966,7 @@ export namespace VxeTableDefines {
     hasFooter: boolean
     hasMerge: boolean
     hasTree: boolean
+    hasRowGroup: boolean
     hasColgroup: boolean
     visible: boolean
   }
@@ -5970,7 +5978,19 @@ export namespace VxeTableDefines {
     type: any
     isColgroup: boolean
     isMerge: boolean
-    isAllExpand: boolean
+    /**
+     * 已废弃，被 isTreeAllExpanded 替换
+     * @deprecated
+     */
+    isAllExpand?: boolean
+    /**
+     * 是否展开所有树层级
+     */
+    isTreeAllExpanded: boolean
+    /**
+     * 是否展开所有分组层级
+     */
+    isRowGroupAllExpanded: boolean
     useStyle: boolean
     original: boolean
     message: boolean
@@ -6126,6 +6146,7 @@ export namespace VxeTableDefines {
       label: any
     }>
     groupContent: string
+    groupCombineds: string[]
     groupField: string
     childCount: number