vxe-table 4.13.28 → 4.13.30

package/packages/table/src/table.ts

@@ -3539,7 +3539,6 @@ export default defineComponent({
         //     }
         //   }
         // }
-        // if (process.env.VUE_APP_VXE_ENV === 'development') {
         // if (props.showHeader && !props.showHeaderOverflow) {
         //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
         // }
@@ -3552,7 +3551,6 @@ export default defineComponent({
         if (props.footerSpanMethod) {
           warnLog('vxe.error.scrollErrProp', ['footer-span-method'])
         }
-        // }
         if (isReset) {
           const { visibleSize } = handleVirtualXVisible()
           scrollXStore.startIndex = 0
@@ -3916,7 +3914,7 @@ export default defineComponent({
     }
 
     const checkLastSyncScroll = (isRollX: boolean, isRollY: boolean) => {
-      const { scrollXLoad, scrollYLoad } = reactData
+      const { scrollXLoad, scrollYLoad, isAllOverflow } = reactData
       const { lcsTimeout } = internalData
       if (lcsTimeout) {
         clearTimeout(lcsTimeout)
@@ -3932,13 +3930,19 @@ export default defineComponent({
         internalData.inFooterScroll = false
         internalData.scrollRenderType = ''
 
-        calcCellHeight()
+        if (!isAllOverflow) {
+          calcCellHeight()
+          updateRowOffsetTop()
+        }
         if (isRollX && scrollXLoad) {
           $xeTable.updateScrollXData()
         }
         if (isRollY && scrollYLoad) {
           $xeTable.updateScrollYData().then(() => {
-            calcCellHeight()
+            if (!isAllOverflow) {
+              calcCellHeight()
+              updateRowOffsetTop()
+            }
             $xeTable.updateScrollYSpace()
           })
         }
@@ -4258,9 +4262,7 @@ export default defineComponent({
           }
           reactData.tableData = tableData.slice(0)
         } else {
-          if (process.env.VUE_APP_VXE_ENV === 'development') {
-            warnLog('vxe.error.reqProp', ['keep-source'])
-          }
+          errLog('vxe.error.reqProp', ['keep-source'])
         }
         return nextTick()
       },
@@ -4441,9 +4443,7 @@ export default defineComponent({
         const { transform } = treeOpts
         const { handleGetRowId } = createHandleGetRowId($xeTable)
         if (!keepSource) {
-          if (process.env.VUE_APP_VXE_ENV === 'development') {
-            errLog('vxe.error.reqProp', ['keep-source'])
-          }
+          errLog('vxe.error.reqProp', ['keep-source'])
           return nextTick()
         }
         let targetRows = rows
@@ -4969,6 +4969,7 @@ export default defineComponent({
             }
             XEUtils.eachTree([targetColumn], (column) => {
               column.fixed = fixed
+              column.renderFixed = fixed
             })
             tablePrivateMethods.saveCustomStore('update:fixed')
             if (!status) {
@@ -4993,6 +4994,7 @@ export default defineComponent({
           if (targetColumn && targetColumn.fixed) {
             XEUtils.eachTree([targetColumn], (column) => {
               column.fixed = null
+              column.renderFixed = null
             })
             tablePrivateMethods.saveCustomStore('update:fixed')
             if (!status) {
@@ -5982,9 +5984,7 @@ export default defineComponent({
         return nextTick()
       },
       reloadExpandContent (row) {
-        if (process.env.VUE_APP_VXE_ENV === 'development') {
-          warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand'])
-        }
+        warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand'])
         // 即将废弃
         return $xeTable.reloadRowExpand(row)
       },
@@ -6087,9 +6087,7 @@ export default defineComponent({
       },
       isExpandByRow (row) {
         // 已废弃
-        if (process.env.VUE_APP_VXE_ENV === 'development') {
-          warnLog('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow'])
-        }
+        warnLog('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow'])
         return tableMethods.isRowExpandByRow(row)
       },
       /**
@@ -6268,9 +6266,7 @@ export default defineComponent({
         return nextTick()
       },
       reloadTreeChilds (row) {
-        if (process.env.VUE_APP_VXE_ENV === 'development') {
-          warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand'])
-        }
+        warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand'])
         // 即将废弃
         return $xeTable.reloadTreeExpand(row)
       },
@@ -8183,10 +8179,8 @@ export default defineComponent({
         // 兼容老版本
         if (!evntList.length && type === 'event.clearEdit') {
           evntList = interceptor.get('event.clearActived')
-          if (process.env.VUE_APP_VXE_ENV === 'development') {
-            if (evntList.length) {
-              warnLog('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit'])
-            }
+          if (evntList.length) {
+            warnLog('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit'])
           }
         }
         // 兼容老版本
@@ -8578,10 +8572,14 @@ export default defineComponent({
         if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
           const ctEl = tdEl.querySelector<HTMLElement>('.vxe-cell--wrapper')
           let ovEl = null
+          let tipEl = tdEl.querySelector<HTMLElement>(column.type === 'html' ? '.vxe-cell--html' : '.vxe-cell--label')
           if (column.treeNode) {
             ovEl = tdEl.querySelector<HTMLElement>('.vxe-tree-cell')
           }
-          handleTooltip(evnt, tdEl, ovEl || ctEl, tdEl.querySelector<HTMLElement>('.vxe-cell--label') || tdEl.querySelector<HTMLElement>('.vxe-cell--wrapper'), params)
+          if (!tipEl) {
+            tipEl = ctEl
+          }
+          handleTooltip(evnt, tdEl, ovEl || ctEl, tipEl, params)
         }
       },
       /**
@@ -8593,7 +8591,16 @@ export default defineComponent({
         const tdEl = evnt.currentTarget as HTMLTableCellElement
         handleTargetEnterEvent(tooltipStore.column !== column || !!tooltipStore.row)
         if (tooltipStore.column !== column || !tooltipStore.visible) {
-          handleTooltip(evnt, tdEl, tdEl.querySelector<HTMLElement>('.vxe-cell--wrapper'), tdEl.querySelector<HTMLElement>('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper') as HTMLElement, params)
+          const ctEl = tdEl.querySelector<HTMLElement>('.vxe-cell--wrapper')
+          let ovEl = null
+          let tipEl = tdEl.querySelector<HTMLElement>(column.type === 'html' ? '.vxe-cell--html' : '.vxe-cell--label')
+          if (column.type === 'html') {
+            ovEl = tdEl.querySelector<HTMLElement>('.vxe-cell--html')
+          }
+          if (!tipEl) {
+            tipEl = ctEl
+          }
+          handleTooltip(evnt, tdEl, ovEl || ctEl, tipEl, params)
         }
       },
       handleTargetLeaveEvent () {