vxe-table 4.9.8 → 4.9.10

package/packages/table/src/table.ts

@@ -9,7 +9,7 @@ import TableHeaderComponent from './header'
 import TableFooterComponent from './footer'
 import tableProps from './props'
 import tableEmits from './emits'
-import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, XEBodyScrollElement, getRootColumn, getRefElem } from './util'
+import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem } from './util'
 import { getSlotVNs } from '../../ui/src/vn'
 import { warnLog, errLog } from '../../ui/src/log'
 import TableCustomPanelComponent from '../module/custom/panel'
@@ -2491,7 +2491,7 @@ export default defineComponent({
      * @param {Array} datas 数据
      */
     const loadTableData = (datas: any[]) => {
-      const { keepSource, treeConfig } = props
+      const { keepSource, treeConfig, showOverflow } = props
       const { editStore, scrollYLoad: oldScrollYLoad } = reactData
       const { scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop } = internalData
       const treeOpts = computeTreeOpts.value
@@ -2556,8 +2556,15 @@ export default defineComponent({
       if (keepSource) {
         tablePrivateMethods.cacheSourceMap(fullData)
       }
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        if (sYLoad) {
+      if (sYLoad) {
+        if (showOverflow) {
+          const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
+          if (errColumn) {
+            errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
+          }
+        }
+
+        if (process.env.VUE_APP_VXE_ENV === 'development') {
           if (!(props.height || props.maxHeight)) {
             errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}'])
           }
@@ -3594,7 +3601,7 @@ export default defineComponent({
       isInsertByRow (row) {
         const { editStore } = reactData
         const rowid = getRowid($xeTable, row)
-        return editStore.insertMaps[rowid]
+        return !!editStore.insertMaps[rowid]
       },
       /**
        * 删除所有新增的临时数据
@@ -4721,7 +4728,7 @@ export default defineComponent({
         const { transform, lazy } = treeOpts
         const rowid = getRowid($xeTable, row)
         if (lazy && row[hasChildField] && !treeExpandLazyLoadedMaps[rowid]) {
-          tableMethods.clearTreeExpandLoaded(row).then(() => {
+          return tableMethods.clearTreeExpandLoaded(row).then(() => {
             return handleAsyncTreeExpandChilds(row)
           }).then(() => {
             if (transform) {
@@ -4933,8 +4940,8 @@ export default defineComponent({
         const leftBody = refTableLeftBody.value
         const rightBody = refTableRightBody.value
         const leftBodyElem = leftBody ? leftBody.$el as HTMLDivElement : null
-        const tableBodyElem = tableBody ? tableBody.$el as XEBodyScrollElement : null
-        const rightBodyElem = rightBody ? rightBody.$el as XEBodyScrollElement : null
+        const tableBodyElem = tableBody ? tableBody.$el as HTMLDivElement : null
+        const rightBodyElem = rightBody ? rightBody.$el as HTMLDivElement : null
         const tableHeaderElem = tableHeader ? tableHeader.$el as HTMLDivElement : null
         const tableFooterElem = tableFooter ? tableFooter.$el as HTMLDivElement : null
         const xHandleEl = refScrollXHandleElem.value
@@ -7026,6 +7033,7 @@ export default defineComponent({
         const trEl = evnt.currentTarget as HTMLElement
         const rowid = trEl.getAttribute('rowid')
         const row = $xeTable.getRowById(rowid)
+        console.log(rowid)
         if (row) {
           evnt.preventDefault()
           evnt.preventDefault()
@@ -7154,6 +7162,8 @@ export default defineComponent({
                   oldIndex: oafIndex
                 }
               }, evnt)
+
+              $xeTable.saveCustomStore('update:sort')
             }).catch(() => {
             })
           }

package/packages/table/src/util.ts

@@ -68,10 +68,6 @@ export const convertHeaderColumnToRows = (originColumns: any): any[][] => {
   return rows
 }
 
-export interface XEBodyScrollElement extends HTMLDivElement {
-  _onscroll: ((evnt: Event) => void) | null;
-}
-
 export function restoreScrollLocation ($xeTable: VxeTableConstructor, scrollLeft: number, scrollTop: number) {
   const { internalData } = $xeTable
   return $xeTable.clearScroll().then(() => {
@@ -85,18 +81,6 @@ export function restoreScrollLocation ($xeTable: VxeTableConstructor, scrollLeft
   })
 }
 
-// export function removeScrollListener (scrollElem: XEBodyScrollElement | null) {
-//   if (scrollElem && scrollElem._onscroll) {
-//     scrollElem.onscroll = null
-//   }
-// }
-
-// export function restoreScrollListener (scrollElem: XEBodyScrollElement | null) {
-//   if (scrollElem && scrollElem._onscroll) {
-//     scrollElem.onscroll = scrollElem._onscroll
-//   }
-// }
-
 /**
  * 生成行的唯一主键
  */

package/styles/components/table.scss

@@ -1288,7 +1288,7 @@
     position: absolute;
     top: 0;
     left: 0;
-    z-index: 9;
+    z-index: 11;
     pointer-events: none;
   }
   .vxe-cell--drag-handle {