vxe-pc-ui 4.14.23 → 4.14.25

package/packages/tree/src/tree.ts

@@ -1301,19 +1301,20 @@ export default defineVxeComponent({
       evnt.preventDefault()
       evnt.stopPropagation()
       const { transform } = props
-      const { selectCheckboxMaps } = internalData
+      const { selectCheckboxMaps, nodeMaps } = internalData
       const childrenField = computeChildrenField.value
       const mapChildrenField = computeMapChildrenField.value
       const checkboxOpts = computeCheckboxOpts.value
-      const { checkStrictly, checkMethod } = checkboxOpts
-      let isDisabled = !!checkMethod
-      if (checkMethod) {
-        isDisabled = !checkMethod({ $tree: $xeTree, node })
-      }
+      const { checkStrictly, checkMode, checkMethod } = checkboxOpts
+      const nodeid = 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 = getNodeId(node)
       let isChecked = false
       if (selectCheckboxMaps[nodeid]) {
         delete selectCheckboxMaps[nodeid]
@@ -1374,17 +1375,20 @@ export default defineVxeComponent({
     const changeRadioEvent = (evnt: MouseEvent, node: any) => {
       evnt.preventDefault()
       evnt.stopPropagation()
+      const { nodeMaps } = internalData
       const radioOpts = computeRadioOpts.value
-      const { checkMethod } = radioOpts
-      let isDisabled = !!checkMethod
-      if (checkMethod) {
-        isDisabled = !checkMethod({ $tree: $xeTree, node })
-      }
+      const childrenField = computeChildrenField.value
+      const { checkMode, checkMethod } = radioOpts
+      const nodeid = 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 = getNodeId(node)
       const value = deNodeValue(nodeid)
       reactData.selectRadioKey = nodeid
       emitRadioMode(value)

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

@@ -284,9 +284,10 @@ export default defineVxeComponent({
       return propsOpts.children || 'children'
     })
 
-    const computeParentField = computed(() => {
+    const computeNodeParentField = computed(() => {
       const propsOpts = computePropsOpts.value
-      return propsOpts.parent || 'parentField'
+      const treeOpts = computeTreeOpts.value
+      return propsOpts.parent || treeOpts.parentField || 'parentId'
     })
 
     const computeHasChildField = computed(() => {
@@ -390,6 +391,7 @@ export default defineVxeComponent({
       const { separator } = props
       const treeOpts = computeTreeOpts.value
       const nodeKeyField = computeNodeKeyField.value
+      const nodeParentField = computeNodeParentField.value
       const childrenField = computeChildrenField.value
       const valueField = computeValueField.value
       const labelField = computeLabelField.value
@@ -420,9 +422,20 @@ export default 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 })
         }
@@ -771,7 +784,7 @@ export default defineVxeComponent({
       const labelField = computeLabelField.value
       const valueField = computeValueField.value
       const childrenField = computeChildrenField.value
-      const parentField = computeParentField.value
+      const nodeParentField = computeNodeParentField.value
       const hasChildField = computeHasChildField.value
       const virtualYOpts = computeVirtualYOpts.value
       const filterOpts = computeFilterOpts.value
@@ -941,7 +954,7 @@ export default 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

@@ -152,7 +152,8 @@ export type VxeDatePanelEmits = [
   'date-prev',
   'date-today',
   'date-next',
-  'confirm'
+  'confirm',
+  'revert'
 ]
 
 export namespace VxeDatePanelDefines {
@@ -251,21 +252,32 @@ export namespace VxeDatePanelDefines {
   }
 
   export interface ChangeEventParams extends DatePanelEventParams, DatePanelParams { }
+
+  export interface ConfirmEventParams extends DatePanelEventParams {}
+  export interface RevertEventParams extends DatePanelEventParams {
+    label: string
+  }
 }
 
 export type VxeDatePanelEventProps = {
   'onUpdate:modelValue'?: VxeDatePanelEvents.UpdateModelValue
   onChange?: VxeDatePanelEvents.Change
+  onConfirm?: VxeDatePanelEvents.Confirm
+  onRevert?: VxeDatePanelEvents.Revert
 }
 
 export interface VxeDatePanelListeners {
   'update:modelValue'?: VxeDatePanelEvents.UpdateModelValue
   change?: VxeDatePanelEvents.Change
+  confirm?: VxeDatePanelEvents.Confirm
+  revert?: VxeDatePanelEvents.Revert
 }
 
 export namespace VxeDatePanelEvents {
   export type UpdateModelValue = (modelValue: VxeDatePanelPropTypes.ModelValue) => void
   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

@@ -4124,6 +4124,7 @@ export interface TableInternalData<D = any> {
   // 数据集（仅可视）
   visibleDataRowIdData: Record<string, D>
 
+  headerFullDataColData: Record<string, VxeTableDefines.HeaderColCacheItem>
   footerFullDataRowData: Record<string, VxeTableDefines.FooterRowCacheItem>
 
   keepUpdateFieldMaps: Record<string, number>
@@ -4431,6 +4432,18 @@ export interface TableMethods<DT = any> {
    * 清除单元格格式化缓存
    */
   clearFormatterCache(isUpdate?: boolean): Promise<void>
+  /**
+   * 获取表头单元格显示值
+   */
+  getHeaderCellLabel(fieldOrColumn: VxeColumnPropTypes.Field | VxeTableDefines.ColumnInfo<any> | null): string
+  /**
+   * 更新表头单元格显示值
+   */
+  updateHeaderCellLabel(fieldOrColumn: VxeColumnPropTypes.Field | VxeTableDefines.ColumnInfo<any> | null): string
+  /**
+   * 清除表头单元格格式化缓存
+   */
+  clearHeaderFormatterCache(isUpdate?: boolean): Promise<void>
   /**
    * 获取表尾单元格显示值
    */
@@ -6071,6 +6084,9 @@ export namespace VxeTableDefines {
     formatData?: Record<string, RowCacheFormatObj>
   }
 
+  export interface HeaderColCacheItem {
+    formatObj?: RowCacheFormatObj
+  }
   export interface FooterRowCacheItem {
     formatData?: Record<string, RowCacheFormatObj>
   }