vxe-table 4.14.1 → 4.14.3

package/packages/table/module/custom/panel.ts

@@ -6,7 +6,7 @@ import { getTpImg, addClass, removeClass, hasControlKey } from '../../../ui/src/
 import { errLog } from '../../../ui/src/log'
 import XEUtils from 'xe-utils'
 
-import type { VxeModalComponent, VxeDrawerComponent, VxeButtonComponent, VxeRadioGroupComponent, VxeInputComponent, VxeButtonEvents } from 'vxe-pc-ui'
+import type { VxeButtonEvents } from 'vxe-pc-ui'
 import type { VxeTableDefines, VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods, VxeColumnPropTypes, VxeTableCustomPanelConstructor, TableCustomPanelReactData, TableCustomPanelInternalData, TableCustomPanelPrivateRef, TableCustomPanelPrivateComputed } from '../../../../types'
 
 const { getI18n, getIcon, renderEmptyElement } = VxeUI
@@ -22,11 +22,11 @@ export default defineVxeComponent({
   setup (props, context) {
     const xID = XEUtils.uniqueId()
 
-    const VxeUIModalComponent = VxeUI.getComponent<VxeModalComponent>('VxeModal')
-    const VxeUIDrawerComponent = VxeUI.getComponent<VxeDrawerComponent>('VxeDrawer')
-    const VxeUIButtonComponent = VxeUI.getComponent<VxeButtonComponent>('VxeButton')
-    const VxeUINumberInputComponent = VxeUI.getComponent<VxeInputComponent>('VxeNumberInput')
-    const VxeUIRadioGroupComponent = VxeUI.getComponent<VxeRadioGroupComponent>('VxeRadioGroup')
+    const VxeUIModalComponent = VxeUI.getComponent('VxeModal')
+    const VxeUIDrawerComponent = VxeUI.getComponent('VxeDrawer')
+    const VxeUIButtonComponent = VxeUI.getComponent('VxeButton')
+    const VxeUINumberInputComponent = VxeUI.getComponent('VxeNumberInput')
+    const VxeUIRadioGroupComponent = VxeUI.getComponent('VxeRadioGroup')
 
     const $xeTable = inject('$xeTable', {} as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods)
 

package/packages/table/module/export/export-panel.ts

@@ -5,7 +5,6 @@ import XEUtils from 'xe-utils'
 import { formatText } from '../../../ui/src/utils'
 import { errLog } from '../../../ui/src/log'
 
-import type { VxeModalComponent, VxeInputComponent, VxeCheckboxComponent, VxeSelectComponent, VxeButtonComponent } from 'vxe-pc-ui'
 import type { VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods } from '../../../../types'
 
 const { getI18n, getIcon } = VxeUI
@@ -17,11 +16,11 @@ export default defineVxeComponent({
     storeData: Object as any
   },
   setup (props) {
-    const VxeUIModalComponent = VxeUI.getComponent<VxeModalComponent>('VxeModal')
-    const VxeUIButtonComponent = VxeUI.getComponent<VxeButtonComponent>('VxeButton')
-    const VxeUISelectComponent = VxeUI.getComponent<VxeSelectComponent>('VxeSelect')
-    const VxeUIInputComponent = VxeUI.getComponent<VxeInputComponent>('VxeInput')
-    const VxeUICheckboxComponent = VxeUI.getComponent<VxeCheckboxComponent>('VxeCheckbox')
+    const VxeUIModalComponent = VxeUI.getComponent('VxeModal')
+    const VxeUIButtonComponent = VxeUI.getComponent('VxeButton')
+    const VxeUISelectComponent = VxeUI.getComponent('VxeSelect')
+    const VxeUIInputComponent = VxeUI.getComponent('VxeInput')
+    const VxeUICheckboxComponent = VxeUI.getComponent('VxeCheckbox')
 
     const $xeTable = inject('$xeTable', {} as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods)
     const { computeExportOpts, computePrintOpts } = $xeTable.getComputeMaps()

package/packages/table/module/export/import-panel.ts

@@ -5,7 +5,6 @@ import XEUtils from 'xe-utils'
 import { parseFile } from '../../../ui/src/utils'
 import { errLog } from '../../../ui/src/log'
 
-import type { VxeButtonComponent, VxeModalComponent, VxeSelectComponent } from 'vxe-pc-ui'
 import type { VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods } from '../../../../types'
 
 const { getI18n, getIcon } = VxeUI
@@ -17,9 +16,9 @@ export default defineVxeComponent({
     storeData: Object as any
   },
   setup (props) {
-    const VxeUIModalComponent = VxeUI.getComponent<VxeModalComponent>('VxeModal')
-    const VxeUIButtonComponent = VxeUI.getComponent<VxeButtonComponent>('VxeButton')
-    const VxeUISelectComponent = VxeUI.getComponent<VxeSelectComponent>('VxeSelect')
+    const VxeUIModalComponent = VxeUI.getComponent('VxeModal')
+    const VxeUIButtonComponent = VxeUI.getComponent('VxeButton')
+    const VxeUISelectComponent = VxeUI.getComponent('VxeSelect')
 
     const $xeTable = inject('$xeTable', {} as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods)
     const { computeImportOpts } = $xeTable.getComputeMaps()

package/packages/table/module/filter/panel.ts

@@ -4,6 +4,7 @@ import { VxeUI } from '../../../ui'
 import { formatText, isEnableConf } from '../../../ui/src/utils'
 import { getPropClass } from '../../../ui/src/dom'
 import { getSlotVNs } from '../../../ui/src/vn'
+import { warnLog } from '../../../ui/src/log'
 import XEUtils from 'xe-utils'
 
 import type { VxeTableConstructor, VxeTableMethods, VxeTablePrivateMethods } from '../../../../types'
@@ -56,7 +57,10 @@ export default defineVxeComponent({
      *************************/
     // 确认筛选
     const confirmFilter = (evnt: Event) => {
-      $xeTable.handleFilterConfirmFilter(evnt)
+      if (!evnt) {
+        warnLog('vxe.error.delFunc', ['confirmFilter', 'saveFilterPanelByEvent'])
+      }
+      $xeTable.handleFilterConfirmFilter(evnt || new Event('click'))
     }
 
     // （单选）筛选发生改变

package/packages/table/src/body.ts

@@ -243,7 +243,7 @@ export default defineVxeComponent({
         if (spanRest) {
           const { rowspan, colspan } = spanRest
           if (!rowspan || !colspan) {
-            return null
+            return renderEmptyElement($xeTable)
           }
           if (rowspan > 1) {
             isMergeCell = true
@@ -260,7 +260,7 @@ export default defineVxeComponent({
         // 自定义合并行或列的方法
         const { rowspan = 1, colspan = 1 } = spanMethod(cellParams) || {}
         if (!rowspan || !colspan) {
-          return null
+          return renderEmptyElement($xeTable)
         }
         if (rowspan > 1) {
           isMergeCell = true
@@ -401,13 +401,8 @@ export default defineVxeComponent({
       }
 
       let showAreaRowStatus = false
-      if (mouseConfig && mouseOpts.area && selectCellToRow) {
-        if (
-          (!_columnIndex && selectCellToRow === true) ||
-          (selectCellToRow === column.field)
-        ) {
-          showAreaRowStatus = true
-        }
+      if (mouseConfig && mouseOpts.area && !_columnIndex && selectCellToRow) {
+        showAreaRowStatus = true
       }
 
       if (!fixedHiddenColumn && showResizable && isAllColumnDrag) {

package/packages/table/src/table.ts

@@ -20,7 +20,7 @@ import TableImportPanelComponent from '../module/export/import-panel'
 import TableExportPanelComponent from '../module/export/export-panel'
 import TableMenuPanelComponent from '../module/menu/panel'
 
-import type { VxeLoadingComponent, VxeTooltipInstance, VxeTooltipComponent, VxeTabsConstructor, VxeTabsPrivateMethods, ValueOf, VxeComponentSlotType } from 'vxe-pc-ui'
+import type { VxeTooltipInstance, VxeTabsConstructor, VxeTabsPrivateMethods, ValueOf, VxeComponentSlotType } from 'vxe-pc-ui'
 import type { VxeGridConstructor, VxeGridPrivateMethods, VxeTableConstructor, TableReactData, TableInternalData, VxeTablePropTypes, VxeToolbarConstructor, TablePrivateMethods, VxeTablePrivateRef, VxeTablePrivateComputed, VxeTablePrivateMethods, TableMethods, VxeTableMethods, VxeTableDefines, VxeTableEmits, VxeTableProps, VxeColumnPropTypes, VxeTableCustomPanelConstructor } from '../../../types'
 
 const { getConfig, getIcon, getI18n, renderer, formats, createEvent, globalResize, interceptor, hooks, globalEvents, GLOBAL_EVENT_KEYS, useFns, renderEmptyElement } = VxeUI
@@ -42,8 +42,8 @@ export default defineVxeComponent({
     const browseObj = XEUtils.browse()
 
     // 使用已安装的组件，如果未安装则不渲染
-    const VxeUILoadingComponent = VxeUI.getComponent<VxeLoadingComponent>('VxeLoading')
-    const VxeUITooltipComponent = VxeUI.getComponent<VxeTooltipComponent>('VxeTooltip')
+    const VxeUILoadingComponent = VxeUI.getComponent('VxeLoading')
+    const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip')
 
     const $xeTabs = inject<(VxeTabsConstructor & VxeTabsPrivateMethods) | null>('$xeTabs', null)
 
@@ -6248,15 +6248,17 @@ export default defineVxeComponent({
        * 手动清空展开行状态，数据会恢复成未展开的状态
        */
       clearRowExpand () {
-        const { tableFullData } = internalData
+        const { tableFullData, scrollYStore } = internalData
         const expandOpts = computeExpandOpts.value
         const { reserve } = expandOpts
         const expList = $xeTable.getRowExpandRecords()
         internalData.rowExpandedMaps = {}
-        reactData.rowExpandedFlag++
         if (reserve) {
           tableFullData.forEach((row) => handleRowExpandReserve(row, false))
         }
+        reactData.rowExpandedFlag++
+        scrollYStore.startIndex = 0
+        scrollYStore.endIndex = 1
         return nextTick().then(() => {
           if (expList.length) {
             return handleLazyRecalculate(true, true, true)
@@ -8423,7 +8425,7 @@ export default defineVxeComponent({
         const treeOpts = computeTreeOpts.value
         const childrenField = treeOpts.children || treeOpts.childrenField
         const checkboxOpts = computeCheckboxOpts.value
-        const { checkField, checkStrictly, checkMethod } = checkboxOpts
+        const { checkField, indeterminateField, checkStrictly, checkMethod } = checkboxOpts
         if (checkStrictly) {
           return
         }
@@ -8454,6 +8456,10 @@ export default defineVxeComponent({
               if (childList && childList.length && !childRowMaps[rowid]) {
                 childRowMaps[rowid] = 1
                 childRowList.unshift([row, rowid, childList])
+              } else {
+                if (indeterminateField) {
+                  XEUtils.set(row, indeterminateField, false)
+                }
               }
             }, { children: transform ? mapChildrenField : childrenField })
           }
@@ -8465,7 +8471,7 @@ export default defineVxeComponent({
             let sLen = 0 // 已选
             let hLen = 0 // 半选
             let vLen = 0 // 有效子行
-            const cLen = childList.length // 有效子行
+            const cLen = childList.length // 子行
             childList.forEach(
               checkMethod
                 ? (item) => {
@@ -8521,6 +8527,9 @@ export default defineVxeComponent({
             if (checkField) {
               XEUtils.set(row, checkField, isSelected)
             }
+            if (indeterminateField) {
+              XEUtils.set(row, indeterminateField, halfSelect)
+            }
             if (isSelected) {
               if (!checkField) {
                 selectCheckboxMaps[rowid] = row

package/packages/toolbar/src/toolbar.ts

@@ -1,11 +1,11 @@
-import { h, ref, Ref, computed, inject, createCommentVNode, VNode, reactive, nextTick, PropType } from 'vue'
+import { h, ref, computed, inject, createCommentVNode, VNode, reactive, nextTick, PropType } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { getSlotVNs } from '../../ui/src/vn'
 import { warnLog, errLog } from '../../ui/src/log'
 
-import type { ValueOf, VxeButtonComponent, VxeButtonEvents, VxeComponentSlotType, VxeButtonDefines } from 'vxe-pc-ui'
+import type { ValueOf, VxeButtonEvents, VxeComponentSlotType, VxeButtonDefines } from 'vxe-pc-ui'
 import type { VxeGridConstructor, GridPrivateMethods, ToolbarMethods, ToolbarInternalData, VxeToolbarConstructor, VxeToolbarEmits, VxeToolbarPropTypes, ToolbarPrivateRef, ToolbarReactData, VxeTableConstructor, VxeTablePrivateMethods } from '../../../types'
 
 const { getConfig, getIcon, getI18n, renderer, commands, createEvent, useFns } = VxeUI
@@ -54,7 +54,7 @@ export default defineVxeComponent({
     const xID = XEUtils.uniqueId()
 
     // 使用已安装的组件，如果未安装则不渲染
-    const VxeUIButtonComponent = VxeUI.getComponent<VxeButtonComponent>('VxeButton')
+    const VxeUIButtonComponent = VxeUI.getComponent('VxeButton')
 
     const { computeSize } = useFns.useSize(props)
 
@@ -68,7 +68,7 @@ export default defineVxeComponent({
       connectTable: null
     }
 
-    const refElem = ref() as Ref<HTMLDivElement>
+    const refElem = ref<HTMLDivElement>()
 
     const refMaps: ToolbarPrivateRef = {
       refElem

package/packages/ui/index.ts

@@ -264,7 +264,7 @@ VxeUI.setConfig({
       autoLoad: true,
       showLoading: true,
       showResponseMsg: true,
-      showActiveMsg: true,
+      showActionMsg: true,
       response: {
         list: null,
         result: 'result',

package/styles/components/table.scss

@@ -401,7 +401,13 @@ $btnThemeList: (
   }
   .vxe-table--cell-col-status-area,
   .vxe-table--cell-row-status-area {
-    background-color: var(--vxe-ui-table-checkbox-range-background-color);
+    background-color: var(--vxe-ui-table-cell-area-status-background-color);
+  }
+  .vxe-table--cell-col-status-area {
+    border-bottom: var(--vxe-ui-table-cell-area-border-width) solid var(--vxe-ui-table-cell-area-border-color);
+  }
+  .vxe-table--cell-row-status-area {
+    border-right: var(--vxe-ui-table-cell-area-border-width) solid var(--vxe-ui-table-cell-area-border-color);
   }
 }
 

package/styles/theme/base.scss

@@ -65,7 +65,7 @@
   --vxe-ui-table-cell-extend-area-border-color: var(--vxe-ui-table-cell-area-border-color);
   --vxe-ui-table-cell-active-area-border-color: var(--vxe-ui-table-cell-area-border-color);
   --vxe-ui-table-cell-area-background-color: rgba(64,158,255,0.2);
-  --vxe-ui-table-header-active-area-background-color: rgba(64,158,255,0.05);
+  --vxe-ui-table-cell-area-status-background-color: rgba(64,158,255,0.1);
 
   --vxe-ui-table-expand-padding-default: 16px;