vxe-table 3.16.0-beta.4 → 3.16.0-beta.6

package/packages/locale/lang/uz-UZ.ts

@@ -355,7 +355,8 @@ export default {
     colorPicker: {
       clear: 'Aniq',
       confirm: 'tasdiqlamoq',
-      copySuccess: "Clipboardga nusxa ko'chirish: {0}"
+      copySuccess: "Clipboardga nusxa ko'chirish: {0}",
+      hex: 'HEX'
     },
     formDesign: {
       formName: 'Forma nomi',

package/packages/locale/lang/vi-VN.ts

@@ -355,7 +355,8 @@ export default {
     colorPicker: {
       clear: 'Thông thoáng',
       confirm: 'xác nhận',
-      copySuccess: 'Được sao chép vào bảng tạm: {0}'
+      copySuccess: 'Được sao chép vào bảng tạm: {0}',
+      hex: 'HEX'
     },
     formDesign: {
       formName: 'Tên hình thức',

package/packages/locale/lang/zh-CHT.ts

@@ -355,7 +355,8 @@ export default {
     colorPicker: {
       clear: '清除',
       confirm: '確認',
-      copySuccess: '已復製到剪貼板：{0}'
+      copySuccess: '已復製到剪貼板：{0}',
+      hex: '十六进制'
     },
     formDesign: {
       formName: '表單名稱',

package/packages/locale/lang/zh-CN.ts

@@ -355,7 +355,8 @@ export default {
     colorPicker: {
       clear: '清除',
       confirm: '确认',
-      copySuccess: '已复制到剪贴板：{0}'
+      copySuccess: '已复制到剪贴板：{0}',
+      hex: '十六进制'
     },
     formDesign: {
       formName: '表单名称',

package/packages/table/src/body.ts

@@ -26,7 +26,7 @@ function renderLine (h: CreateElement, $xeTable : VxeTableConstructor & VxeTable
   const tableProps = $xeTable
   const tableInternalData = $xeTable as unknown as TableInternalData
 
-  const { row, column } = params
+  const { column } = params
   const { afterFullData } = tableInternalData
   const { treeConfig } = tableProps
   const treeOpts = $xeTable.computeTreeOpts
@@ -51,7 +51,7 @@ function renderLine (h: CreateElement, $xeTable : VxeTableConstructor & VxeTable
         h('div', {
           class: 'vxe-tree--line',
           style: {
-            height: `${$xeTable.eqRow(afterFullData[0], row) ? 1 : calcTreeLine(params, prevRow)}px`,
+            height: `${getRowid($xeTable, afterFullData[0]) === rowid ? 1 : calcTreeLine(params, prevRow)}px`,
             bottom: `-${Math.floor(cellHeight / 2)}px`,
             left: `${(rLevel * treeOpts.indent) + (rLevel ? 2 - getOffsetSize($xeTable) : 0) + 16}px`
           }

package/packages/table/src/methods.ts

@@ -2740,7 +2740,7 @@ function handleLazyRecalculate ($xeTable: VxeTableConstructor & VxeTablePrivateM
       clearTimeout(rceTimeout)
       if (rceRunTime && rceRunTime + (refreshDelay - 5) < Date.now()) {
         resolve(
-          handleRecalculateStyle($xeTable, !!reFull, reWidth, reHeight)
+          handleRecalculateStyle($xeTable, reFull, reWidth, reHeight)
         )
       } else {
         $xeTable.$nextTick(() => {
@@ -2749,12 +2749,12 @@ function handleLazyRecalculate ($xeTable: VxeTableConstructor & VxeTablePrivateM
       }
     } else {
       resolve(
-        handleRecalculateStyle($xeTable, !!reFull, reWidth, reHeight)
+        handleRecalculateStyle($xeTable, reFull, reWidth, reHeight)
       )
     }
     internalData.rceTimeout = setTimeout(() => {
       internalData.rceTimeout = undefined
-      handleRecalculateStyle($xeTable, !!reFull, reWidth, reHeight)
+      handleRecalculateStyle($xeTable, reFull, reWidth, reHeight)
     }, refreshDelay)
   })
 }
@@ -3052,9 +3052,8 @@ function loadTableData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
       $xeTable.$nextTick()
         .then(() => handleRecalculateStyle($xeTable, false, false, false))
         .then(() => {
-          calcCellHeight($xeTable)
+          handleRecalculateStyle($xeTable, false, true, true)
           updateRowOffsetTop($xeTable)
-          return handleRecalculateStyle($xeTable, false, false, false)
         })
         .then(() => {
           let targetScrollLeft = lastScrollLeft
@@ -3074,7 +3073,7 @@ function loadTableData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
           if (oldScrollYLoad === sYLoad) {
             restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop)
               .then(() => {
-                calcCellHeight($xeTable)
+                handleRecalculateStyle($xeTable, false, true, true)
                 updateRowOffsetTop($xeTable)
                 resolve()
               })
@@ -3082,7 +3081,7 @@ function loadTableData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
             setTimeout(() => {
               restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop)
                 .then(() => {
-                  calcCellHeight($xeTable)
+                  handleRecalculateStyle($xeTable, false, true, true)
                   updateRowOffsetTop($xeTable)
                   resolve()
                 })
@@ -3355,7 +3354,7 @@ function handleColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, c
         $xeTable.handleUpdateCustomColumn()
       }
       reactData.isColLoading = false
-      return $xeTable.recalculate()
+      return handleLazyRecalculate($xeTable, false, true, true)
     })
   })
 }

package/packages/table/src/table.ts

@@ -1828,6 +1828,7 @@ export default {
       this.handleInitDefaults()
       this.updateStyle()
     })
+
     globalEvents.on($xeTable, 'paste', this.handleGlobalPasteEvent)
     globalEvents.on($xeTable, 'copy', this.handleGlobalCopyEvent)
     globalEvents.on($xeTable, 'cut', this.handleGlobalCutEvent)
@@ -1897,17 +1898,18 @@ export default {
           errLog('vxe.error.reqComp', ['vxe-tooltip'])
         }
       }
+
+      if (this.autoResize) {
+        const resizeObserver = globalResize.create(() => {
+          if (this.autoResize) {
+            this.recalculate(true)
+          }
+        })
+        resizeObserver.observe(this.$el)
+        resizeObserver.observe(this.getParentElem())
+        this.$resize = resizeObserver
+      }
     })
-    if (this.autoResize) {
-      const resizeObserver = globalResize.create(() => {
-        if (this.autoResize) {
-          this.recalculate(true)
-        }
-      })
-      resizeObserver.observe(this.$el)
-      resizeObserver.observe(this.getParentElem())
-      this.$resize = resizeObserver
-    }
 
     if (virtualYOpts.mode !== 'scroll') {
       const tableViewportEl = $xeTable.$refs.refTableViewportElem as HTMLDivElement
@@ -1916,7 +1918,7 @@ export default {
       }
     }
 
-    this.preventEvent(null, 'mounted')
+    $xeTable.preventEvent(null, 'mounted')
   },
   activated () {
     this.recalculate().then(() => this.refreshScroll())

package/packages/table/src/util.ts

@@ -342,11 +342,15 @@ function countTreeExpand (prevRow: any, params: VxeTableDefines.CellRenderBodyPa
     return count
   }
   const { $table } = params
+  const reactData = $table as unknown as TableReactData
+  const { treeExpandedFlag } = reactData
+  const internalData = $table as unknown as TableInternalData
+  const { treeExpandedMaps } = internalData
   const treeOpts = $table.computeTreeOpts
   const { transform, mapChildrenField } = treeOpts
   const childrenField = treeOpts.children || treeOpts.childrenField
   const rowChildren = prevRow[transform ? mapChildrenField : childrenField]
-  if (rowChildren && $table.isTreeExpandByRow(prevRow)) {
+  if (rowChildren && treeExpandedFlag && treeExpandedMaps[getRowid($table, prevRow)]) {
     for (let index = 0; index < rowChildren.length; index++) {
       count += countTreeExpand(rowChildren[index], params)
     }