vxe-pc-ui 4.8.16 → 4.8.18

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

@@ -414,12 +414,10 @@ export default defineVxeComponent({
       }, 350)
     }
 
-    const changeEvent = (evnt: Event, selectValue: any) => {
-      const { fullRowMaps } = reactData
+    const changeEvent = (evnt: Event, selectValue: any, row: any) => {
       emitModel(selectValue)
       if (selectValue !== props.modelValue) {
-        const cacheItem = fullRowMaps[selectValue]
-        dispatchEvent('change', { value: selectValue, row: cacheItem ? cacheItem.item : null }, evnt)
+        dispatchEvent('change', { value: selectValue, row, option: row }, evnt)
         // 自动更新校验状态
         if ($xeForm && formItemInfo) {
           $xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, selectValue)
@@ -428,7 +426,7 @@ export default defineVxeComponent({
     }
 
     const clearValueEvent = (evnt: Event, selectValue: any) => {
-      changeEvent(evnt, selectValue)
+      changeEvent(evnt, selectValue, null)
       dispatchEvent('clear', { value: selectValue }, evnt)
     }
 
@@ -530,19 +528,19 @@ export default defineVxeComponent({
       const { $event, row } = params
       const valueField = computeValueField.value
       const value = row[valueField]
-      changeEvent($event, value)
+      changeEvent($event, value, row)
       hideOptionPanel()
     }
 
     const checkboxChangeEvent: VxeGridEvents.CheckboxChange = (params) => {
-      const { $grid, $event } = params
+      const { $grid, $event, row } = params
       const valueField = computeValueField.value
       if ($grid) {
         const checkboxRecords = $grid.getCheckboxRecords()
         const value = checkboxRecords.map(row => {
           return row[valueField]
         })
-        changeEvent($event, value)
+        changeEvent($event, value, row)
       }
     }
 

package/packages/tree/src/tree.ts

@@ -1364,7 +1364,7 @@ export default defineVxeComponent({
         emitCheckboxMode([])
         updateCheckboxStatus()
         return nextTick().then(() => {
-          return { checkNodeKeys: [] }
+          return { checkNodeKeys: [], checkNodes: [] }
         })
       },
       setAllCheckboxNode (checked) {
@@ -1373,10 +1373,12 @@ export default defineVxeComponent({
         const childrenField = computeChildrenField.value
         const mapChildrenField = computeMapChildrenField.value
         const checkKeys: string[] = []
+        const checkNodes: any[] = []
         if (checked) {
           XEUtils.eachTree(internalData.afterTreeList, (node) => {
             const nodeid = getNodeId(node)
             checkKeys.push(nodeid)
+            checkNodes.push(node)
             selectMaps[nodeid] = true
           }, { children: transform ? mapChildrenField : childrenField })
         }
@@ -1385,7 +1387,7 @@ export default defineVxeComponent({
         reactData.updateCheckboxFlag++
         updateCheckboxStatus()
         return nextTick().then(() => {
-          return { checkNodeKeys: checkKeys }
+          return { checkNodeKeys: checkKeys, checkNodes }
         })
       },
       clearExpandNode () {

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

@@ -10,7 +10,7 @@ import VxeInputComponent from '../../input/src/input'
 import VxeButtonComponent from '../../button/src/button'
 import VxeTreeComponent from '../../tree/src/tree'
 
-import type { TreeSelectReactData, VxeTreeSelectEmits, TreeSelectInternalData, VxeButtonEvents, ValueOf, VxeComponentStyleType, TreeSelectPrivateRef, TreeSelectPrivateMethods, TreeSelectMethods, VxeTreeSelectPrivateComputed, VxeTreeSelectPropTypes, VxeTreeSelectConstructor, VxeFormDefines, VxeDrawerConstructor, VxeDrawerMethods, VxeTreeSelectPrivateMethods, VxeFormConstructor, VxeFormPrivateMethods, VxeInputConstructor, VxeModalConstructor, VxeModalMethods, VxeTreeConstructor } from '../../../types'
+import type { TreeSelectReactData, VxeTreeSelectEmits, TreeSelectInternalData, VxeButtonEvents, ValueOf, VxeComponentStyleType, TreeSelectPrivateRef, TreeSelectPrivateMethods, TreeSelectMethods, VxeTreeSelectPrivateComputed, VxeTreeSelectPropTypes, VxeTreeSelectConstructor, VxeFormDefines, VxeDrawerConstructor, VxeDrawerMethods, VxeTreeSelectPrivateMethods, VxeFormConstructor, VxeFormPrivateMethods, VxeInputConstructor, VxeModalConstructor, VxeModalMethods, VxeTreeConstructor, VxeTreeEvents } from '../../../types'
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/components/table'
 
 function getOptUniqueId () {
@@ -415,13 +415,11 @@ export default defineVxeComponent({
       }, 350)
     }
 
-    const changeEvent = (evnt: Event, selectValue: any) => {
-      const { fullNodeMaps } = internalData
+    const changeEvent = (evnt: Event, selectValue: any, node: any) => {
       const value = XEUtils.isArray(selectValue) ? selectValue.map(deNodeValue) : deNodeValue(selectValue)
       emitModel(value)
       if (value !== props.modelValue) {
-        const cacheItem = fullNodeMaps[selectValue]
-        dispatchEvent('change', { value, option: cacheItem ? cacheItem.item : null }, evnt)
+        dispatchEvent('change', { value, node, option: node }, evnt)
         // 自动更新校验状态
         if ($xeForm && formItemInfo) {
           $xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, value)
@@ -430,7 +428,7 @@ export default defineVxeComponent({
     }
 
     const clearValueEvent = (evnt: Event, selectValue: any) => {
-      changeEvent(evnt, selectValue)
+      changeEvent(evnt, selectValue, null)
       dispatchEvent('clear', { value: selectValue }, evnt)
     }
 
@@ -445,8 +443,8 @@ export default defineVxeComponent({
       const $tree = refTree.value
       if (multiple) {
         if ($tree) {
-          $tree.setAllCheckboxNode(true).then(({ checkNodeKeys }) => {
-            changeEvent($event, checkNodeKeys)
+          $tree.setAllCheckboxNode(true).then(({ checkNodeKeys, checkNodes }) => {
+            changeEvent($event, checkNodeKeys, checkNodes[0])
             dispatchEvent('all-change', { value: checkNodeKeys }, $event)
             if (autoClose) {
               hideOptionPanel()
@@ -467,7 +465,7 @@ export default defineVxeComponent({
             hideOptionPanel()
           }
         })
-        changeEvent($event, value)
+        changeEvent($event, value, null)
         dispatchEvent('clear', { value }, $event)
       }
     }
@@ -607,20 +605,20 @@ export default defineVxeComponent({
       }
     }
 
-    const nodeClickEvent = (params: any) => {
+    const nodeClickEvent: VxeTreeEvents.NodeClick = (params) => {
       const { $event } = params
       dispatchEvent('node-click', params, $event)
     }
 
-    const radioChangeEvent = (params: any) => {
-      const { value, $event } = params
-      changeEvent($event, value)
+    const radioChangeEvent: VxeTreeEvents.RadioChange = (params) => {
+      const { value, $event, node } = params
+      changeEvent($event, value, node)
       hideOptionPanel()
     }
 
-    const checkboxChangeEvent = (params: any) => {
-      const { value, $event } = params
-      changeEvent($event, value)
+    const checkboxChangeEvent: VxeTreeEvents.CheckboxChange = (params) => {
+      const { value, $event, node } = params
+      changeEvent($event, value, node)
     }
 
     const loadSuccessEvent = () => {

package/types/components/gantt-module/gantt-view.d.ts

@@ -123,6 +123,14 @@ export interface VxeGanttViewPrivateMethods {
    * @private
    */
   handleUpdateStyle(): void
+  /**
+   * @private
+   */
+  handleUpdateCurrentRow(row?: any): void
+  /**
+   * @private
+   */
+  handleUpdateHoverRow(row?: any): void
   /**
    * @private
    */

package/types/components/gantt.d.ts

@@ -173,8 +173,8 @@ export interface VxeGanttMethods<D = any> extends GanttMethods<D>, Omit<VxeGridM
 export interface GanttPrivateMethods extends GridPrivateMethods {
   handleTaskCellClickEvent(evnt: MouseEvent, params: VxeGanttDefines.TaskCellClickParams): void
   handleTaskCellDblclickEvent(evnt: MouseEvent, params: VxeGanttDefines.TaskCellClickParams): void
-  handleTaskBarClickEvent(evnt: MouseEvent, params: VxeGanttDefines.TaskCellClickParams): void
-  handleTaskBarDblclickEvent(evnt: MouseEvent, params: VxeGanttDefines.TaskCellClickParams): void
+  handleTaskBarClickEvent(evnt: MouseEvent, params: VxeGanttDefines.TaskBarClickParams): void
+  handleTaskBarDblclickEvent(evnt: MouseEvent, params: VxeGanttDefines.TaskBarClickParams): void
 }
 export interface VxeGanttPrivateMethods extends GanttPrivateMethods {}
 
@@ -207,11 +207,15 @@ export namespace VxeGanttDefines {
 
   export interface TaskCellClickParams<D = any> {
     row: D
+    column: VxeGanttPropTypes.Column<D>
+  }
+  export interface TaskBarClickParams<D = any> {
+    row: D
   }
   export interface TaskCellClickEventParams<D = any> extends TaskCellClickParams<D>, GanttEventParams {}
   export interface TaskCellDblClickEventParams<D = any> extends TaskCellClickEventParams<D> {}
-  export interface TaskBarClickEventParams<D = any> extends TaskCellClickEventParams<D> {}
-  export interface TaskBarDblClickEventParams<D = any> extends TaskCellClickEventParams<D> {}
+  export interface TaskBarClickEventParams<D = any> extends TaskBarClickParams<D>, GanttEventParams {}
+  export interface TaskBarDblClickEventParams<D = any> extends TaskBarClickEventParams<D> {}
 }
 
 export interface VxeGanttEventProps<D = any> extends VxeGridEventProps<D> {

package/types/components/table.d.ts

@@ -77,6 +77,7 @@ export namespace VxeTablePropTypes {
   export type ID<D = any> = string | ((params: {
     $table: VxeTableConstructor<D>
     $grid: VxeGridConstructor<D> | null | undefined
+    $gantt: VxeGanttConstructor | null | undefined
   }) => string | number | null)
 
   export interface Row {
@@ -108,6 +109,7 @@ export namespace VxeTablePropTypes {
   export type FooterMethod<D = any> = (params: {
     $table: VxeTableConstructor<D>
     $grid: VxeGridConstructor<D> | null | undefined
+    $gantt: VxeGanttConstructor<D> | null | undefined
     columns: VxeTableDefines.ColumnInfo<D>[]
     data: D[]
   }) => Array<string | number | null>[] | any[]
@@ -2666,6 +2668,7 @@ export namespace VxeTablePropTypes {
     filename?: string | ((params: {
       $table: VxeTableConstructor
       $grid: VxeGridConstructor | null | undefined
+      $gantt: VxeGanttConstructor | null | undefined
       options: ExportOpts
     }) => string)
     /**
@@ -2674,6 +2677,7 @@ export namespace VxeTablePropTypes {
     sheetName?: string | ((params: {
       $table: VxeTableConstructor
       $grid: VxeGridConstructor | null | undefined
+      $gantt: VxeGanttConstructor | null | undefined
       options: ExportOpts
     }) => string)
     /**
@@ -2742,6 +2746,8 @@ export namespace VxeTablePropTypes {
      */
     columnFilterMethod?(params: {
       $table: VxeTableConstructor
+      $grid: VxeGridConstructor | null | undefined
+      $gantt: VxeGanttConstructor | null | undefined
       column: VxeTableDefines.ColumnInfo
       $columnIndex: number
     }): boolean
@@ -2750,6 +2756,8 @@ export namespace VxeTablePropTypes {
      */
     dataFilterMethod?(params: {
       $table: VxeTableConstructor
+      $grid: VxeGridConstructor | null | undefined
+      $gantt: VxeGanttConstructor | null | undefined
       row: any
       $rowIndex: number
     }): boolean
@@ -2758,6 +2766,8 @@ export namespace VxeTablePropTypes {
      */
     footerFilterMethod?(params: {
       $table: VxeTableConstructor
+      $grid: VxeGridConstructor | null | undefined
+      $gantt: VxeGanttConstructor | null | undefined
       items: any[]
       $rowIndex: number
     }): boolean
@@ -2780,16 +2790,19 @@ export namespace VxeTablePropTypes {
     exportMethod?(params: {
       $table: VxeTableConstructor
       $grid: VxeGridConstructor | null | undefined
+      $gantt: VxeGanttConstructor | null | undefined
       options: ExportHandleOptions
     }): Promise<any>
     beforeExportMethod?(params: {
       $table: VxeTableConstructor
       $grid: VxeGridConstructor | null | undefined
+      $gantt: VxeGanttConstructor | null | undefined
       options: ExportHandleOptions
     }): void
     afterExportMethod?(params: {
       $table: VxeTableConstructor
       $grid: VxeGridConstructor | null | undefined
+      $gantt: VxeGanttConstructor | null | undefined
       status: boolean
       options: ExportHandleOptions
     }): void
@@ -2841,6 +2854,7 @@ export namespace VxeTablePropTypes {
     sheetName?: string | ((params: {
       $table: VxeTableConstructor
       $grid: VxeGridConstructor | null | undefined
+      $gantt: VxeGanttConstructor | null | undefined
       options: ExportOpts
     }) => string)
     /**
@@ -2899,6 +2913,8 @@ export namespace VxeTablePropTypes {
      */
     columnFilterMethod?(params: {
       $table: VxeTableConstructor
+      $grid: VxeGridConstructor | null | undefined
+      $gantt: VxeGanttConstructor | null | undefined
       column: VxeTableDefines.ColumnInfo
       $columnIndex: number
     }): boolean
@@ -2907,6 +2923,8 @@ export namespace VxeTablePropTypes {
      */
     dataFilterMethod?(params: {
       $table: VxeTableConstructor
+      $grid: VxeGridConstructor | null | undefined
+      $gantt: VxeGanttConstructor | null | undefined
       row: any
       $rowIndex: number
     }): boolean
@@ -2915,6 +2933,8 @@ export namespace VxeTablePropTypes {
      */
     footerFilterMethod?(params: {
       $table: VxeTableConstructor
+      $grid: VxeGridConstructor | null | undefined
+      $gantt: VxeGanttConstructor | null | undefined
       items: any[]
       $rowIndex: number
     }): boolean
@@ -2922,7 +2942,9 @@ export namespace VxeTablePropTypes {
      * 打印之前的方法，可以通过返回自定义打印的内容
      */
     beforePrintMethod?(params: {
-      $table: VxeTableConstructor | null
+      $table: VxeTableConstructor
+      $grid: VxeGridConstructor | null | undefined
+      $gantt: VxeGanttConstructor | null | undefined
       html: string
       options: PrintHandleOptions
 
@@ -5493,7 +5515,8 @@ export namespace VxeTableDefines {
 
   export interface CellRenderHeaderParams<D = any> {
     $table: VxeTableConstructor<D>
-    $grid: VxeGridConstructor<D> | null | undefined
+    $grid: VxeGridConstructor | null | undefined
+    $gantt: VxeGanttConstructor | null | undefined
     $rowIndex: number
     column: ColumnInfo<D>
     columnIndex: number
@@ -5511,7 +5534,8 @@ export namespace VxeTableDefines {
 
   export interface CellRenderBodyParams<D = any> {
     $table: VxeTableConstructor<D>
-    $grid: VxeGridConstructor<D> | null | undefined
+    $grid: VxeGridConstructor | null | undefined
+    $gantt: VxeGanttConstructor | null | undefined
     seq: string | number
     rowid: string
     row: D
@@ -5552,7 +5576,8 @@ export namespace VxeTableDefines {
 
   export interface CellRenderFooterParams<D = any> {
     $table: VxeTableConstructor<D>
-    $grid: VxeGridConstructor<D> | null | undefined
+    $grid: VxeGridConstructor | null | undefined
+    $gantt: VxeGanttConstructor | null | undefined
     row: D
     rowIndex: number
     _rowIndex: number

package/types/components/tree.d.ts

@@ -342,12 +342,14 @@ export interface TreeMethods<D = any> {
    * 用于 showCheckbox，手动清空复选框的
    */
   clearCheckboxNode(): Promise<{
+    checkNodes: D[]
     checkNodeKeys: (string | number)[]
   }>
   /**
    * 用于 showCheckbox，设置所有节点的选中状态
    */
   setAllCheckboxNode(checked: boolean): Promise<{
+    checkNodes: D[]
     checkNodeKeys: (string | number)[]
   }>
   /**