vxe-table 4.13.54 → 4.13.57

package/packages/table/src/table.ts

@@ -511,11 +511,39 @@ export default defineVxeComponent({
     })
 
     const computeVirtualXOpts = computed(() => {
-      return Object.assign({}, getConfig().table.virtualXConfig || getConfig().table.scrollX, props.virtualXConfig || props.scrollX) as VxeTablePropTypes.VirtualXConfig & { gt: number }
+      const { virtualXConfig, scrollX } = props
+      const globalVirtualXConfig = getConfig().table.virtualXConfig
+      const globalScrollX = getConfig().table.scrollX
+      if (virtualXConfig) {
+        return Object.assign({}, globalVirtualXConfig, virtualXConfig) as VxeTablePropTypes.VirtualXConfig & { gt: number }
+      }
+      if (scrollX) {
+        // 已废弃，保留兼容
+        return Object.assign({}, globalScrollX, scrollX) as VxeTablePropTypes.VirtualXConfig & { gt: number }
+      }
+      if (globalVirtualXConfig) {
+        return Object.assign({}, globalVirtualXConfig, virtualXConfig) as VxeTablePropTypes.VirtualXConfig & { gt: number }
+      }
+      // 已废弃，保留兼容
+      return Object.assign({}, globalScrollX, scrollX) as VxeTablePropTypes.VirtualXConfig & { gt: number }
     })
 
     const computeVirtualYOpts = computed(() => {
-      return Object.assign({}, getConfig().table.virtualYConfig || getConfig().table.scrollY, props.virtualYConfig || props.scrollY) as VxeTablePropTypes.VirtualYConfig & { gt: number }
+      const { virtualYConfig, scrollY } = props
+      const globalVirtualYConfig = getConfig().table.virtualYConfig
+      const globalScrollY = getConfig().table.scrollY
+      if (virtualYConfig) {
+        return Object.assign({}, globalVirtualYConfig, virtualYConfig) as VxeTablePropTypes.VirtualYConfig & { gt: number }
+      }
+      if (scrollY) {
+        // 已废弃，保留兼容
+        return Object.assign({}, globalScrollY, scrollY) as VxeTablePropTypes.VirtualYConfig & { gt: number }
+      }
+      if (globalVirtualYConfig) {
+        return Object.assign({}, globalVirtualYConfig, virtualYConfig) as VxeTablePropTypes.VirtualYConfig & { gt: number }
+      }
+      // 已废弃，保留兼容
+      return Object.assign({}, globalScrollY, scrollY) as VxeTablePropTypes.VirtualYConfig & { gt: number }
     })
 
     const computeScrollbarOpts = computed(() => {
@@ -1420,16 +1448,23 @@ export default defineVxeComponent({
     }
 
     const handleSortEvent = (evnt: Event | null, sortConfs: VxeTableDefines.SortConfs | VxeTableDefines.SortConfs[], isUpdate?: boolean) => {
+      const { tableFullColumn } = internalData
       const sortOpts = computeSortOpts.value
       const { multiple, remote, orders } = sortOpts
       if (!XEUtils.isArray(sortConfs)) {
         sortConfs = [sortConfs]
       }
       if (sortConfs && sortConfs.length) {
+        const orderActiveMaps: Record<string, VxeTableDefines.ColumnInfo> = {}
         if (!multiple) {
           sortConfs = [sortConfs[0]]
-          clearAllSort()
+          tableFullColumn.forEach((column) => {
+            if (column.order) {
+              orderActiveMaps[column.id] = column
+            }
+          })
         }
+        const sortColMpps: Record<string, VxeTableDefines.ColumnInfo> = {}
         let firstColumn: any = null
         sortConfs.forEach((confs: any, index: number) => {
           let { field, order } = confs
@@ -1448,8 +1483,16 @@ export default defineVxeComponent({
               column.order = order
             }
             column.sortTime = Date.now() + index
+            sortColMpps[column.id] = column
           }
         })
+        if (!multiple) {
+          XEUtils.each(orderActiveMaps, (oaCol: VxeTableDefines.ColumnInfo, oaId) => {
+            if (!sortColMpps[oaId]) {
+              oaCol.order = null
+            }
+          })
+        }
         if (isUpdate) {
           if (!remote) {
             $xeTable.handleTableData(true)
@@ -1677,10 +1720,10 @@ export default defineVxeComponent({
 
       if (htmlColumn) {
         if (!columnOpts.useKey) {
-          errLog('vxe.error.reqProp', ['column-config.useKey & column.type=html'])
+          errLog('vxe.error.notSupportProp', ['column.type=html', 'column-config.useKey=false', 'column-config.useKey=true'])
         }
         if (!rowOpts.useKey) {
-          errLog('vxe.error.reqProp', ['row-config.useKey & column.type=html'])
+          errLog('vxe.error.notSupportProp', ['column.type=html', 'row-config.useKey=false', 'row-config.useKey=true'])
         }
       }
 
@@ -5887,8 +5930,8 @@ export default defineVxeComponent({
       setSort (sortConfs, isUpdate) {
         return handleSortEvent(null, sortConfs, isUpdate)
       },
-      setSortByEvent (evnt, sortConfs, isUpdate) {
-        return handleSortEvent(evnt, sortConfs, isUpdate)
+      setSortByEvent (evnt, sortConfs) {
+        return handleSortEvent(evnt, sortConfs, true)
       },
       /**
        * 清空指定列的排序条件
@@ -5916,6 +5959,7 @@ export default defineVxeComponent({
       clearSortByEvent (evnt, fieldOrColumn) {
         const { tableFullColumn } = internalData
         const sortOpts = computeSortOpts.value
+        const { multiple } = sortOpts
         const sortCols: VxeTableDefines.ColumnInfo[] = []
         let column: VxeTableDefines.ColumnInfo<any> | null = null
         if (evnt) {
@@ -5935,11 +5979,18 @@ export default defineVxeComponent({
           if (!sortOpts.remote) {
             $xeTable.handleTableData(true)
           }
-          if (sortCols.length) {
+
+          if (!multiple) {
+            column = sortCols[0]
+          }
+
+          if (column) {
+            $xeTable.handleColumnSortEvent(evnt, column)
+          }
+
+          if (multiple && sortCols.length) {
             const params = { $table: $xeTable, $event: evnt, cols: sortCols, sortList: [] }
             dispatchEvent('clear-all-sort', params, evnt)
-          } else if (column) {
-            $xeTable.handleColumnSortEvent(evnt, column)
           }
         }
         return nextTick().then(() => {
@@ -5970,13 +6021,11 @@ export default defineVxeComponent({
         }
         return sortList
       },
-      setFilterByEvent (evnt, fieldOrColumn, options, isUpdate) {
+      setFilterByEvent (evnt, fieldOrColumn, options) {
         const column = handleFieldOrColumn($xeTable, fieldOrColumn)
         if (column && column.filters) {
           column.filters = toFilters(options || [])
-          if (isUpdate) {
-            return $xeTable.handleColumnConfirmFilter(column, evnt)
-          }
+          return $xeTable.handleColumnConfirmFilter(column, evnt)
         }
         return nextTick()
       },
@@ -6020,6 +6069,7 @@ export default defineVxeComponent({
         const { filterStore } = reactData
         const { tableFullColumn } = internalData
         const filterOpts = computeFilterOpts.value
+        const { multiple } = filterOpts
         const filterCols: VxeTableDefines.ColumnInfo[] = []
         let column: VxeTableDefines.ColumnInfo<any> | null = null
         if (fieldOrColumn) {
@@ -6042,19 +6092,49 @@ export default defineVxeComponent({
             style: null,
             options: [],
             column: null,
-            multiple: false,
+            multiple: false, // 选项是覅多选
             visible: false
           })
         }
+
         if (!filterOpts.remote) {
           $xeTable.updateData()
         }
-        if (filterCols.length) {
+
+        if (!multiple) {
+          column = filterCols[0]
+        }
+
+        if (column) {
+          const filterList = () => $xeTable.getCheckedFilters()
+          const values: any[] = []
+          const datas: any[] = []
+          column.filters.forEach((item: any) => {
+            if (item.checked) {
+              values.push(item.value)
+              datas.push(item.data)
+            }
+          })
+          const params = {
+            $table: $xeTable,
+            $event: evnt as Event,
+            column,
+            field: column.field,
+            property: column.field,
+            values,
+            datas,
+            filters: filterList,
+            filterList
+          }
+          $xeTable.dispatchEvent('filter-change', params, evnt)
+          $xeTable.dispatchEvent('clear-filter', params, evnt)
+        }
+
+        if (multiple && filterCols.length) {
           const params = { $table: $xeTable, $event: evnt, cols: filterCols, filterList: [] }
           dispatchEvent('clear-all-filter', params, evnt)
-        } else if (column) {
-          $xeTable.dispatchEvent('clear-filter', { filterList: () => $xeTable.getCheckedFilters() }, evnt)
         }
+
         return nextTick()
       },
       /**

package/packages/ui/index.ts

@@ -139,6 +139,7 @@ VxeUI.setConfig({
       // filterMethod: null,
       // destroyOnClose: false,
       // isEvery: false,
+      multiple: true,
       showIcon: true
     },
     aggregateConfig: {