vxe-table 3.13.3 → 3.13.5

package/packages/table/src/header.ts

@@ -19,7 +19,7 @@ const renderRows = (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode
   const tableInternalData = $xeTable as unknown as TableInternalData
 
   const { fixedType } = props
-  const { resizable: allResizable, border, columnKey, headerCellClassName, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, mouseConfig } = tableProps
+  const { resizable: allResizable, columnKey, headerCellClassName, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, mouseConfig } = tableProps
   const { currentColumn, scrollXLoad, scrollYLoad, overflowX } = tableReactData
   const { scrollXStore } = tableInternalData
   const columnOpts = $xeTable.computeColumnOpts
@@ -147,9 +147,7 @@ const renderRows = (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode
      */
       !fixedHiddenColumn && showResizable
         ? h('div', {
-          class: ['vxe-cell--col-resizable', {
-            'is--line': !border || border === 'none'
-          }],
+          class: 'vxe-cell--col-resizable',
           on: {
             mousedown: (evnt: MouseEvent) => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
             dblclick: (evnt: MouseEvent) => $xeTable.handleColResizeDblclickEvent(evnt, cellParams)

package/packages/table/src/methods.ts

@@ -2210,15 +2210,11 @@ const Methods = {
     internalData.tableFullData = fullData
     internalData.tableFullTreeData = treeData
     // 缓存数据
-    $xeTable.cacheRowMap(true, isReset)
+    $xeTable.cacheRowMap(true)
     // 原始数据
     internalData.tableSynchData = datas
     if (isReset) {
       internalData.isResizeCellHeight = false
-      reactData.rowExpandedMaps = {}
-      reactData.rowExpandLazyLoadedMaps = {}
-      reactData.treeExpandedMaps = {}
-      reactData.treeExpandLazyLoadedMaps = {}
     }
     // 克隆原数据，用于显示编辑状态，与编辑值做对比
     if (keepSource) {
@@ -2404,16 +2400,22 @@ const Methods = {
   /**
    * 更新数据行的 Map
    */
-  cacheRowMap (isReset: boolean, isSource?: boolean) {
-    const { treeConfig, treeOpts, tableFullData, fullAllDataRowIdData, tableFullTreeData } = this
+  cacheRowMap () {
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const props = $xeTable
+    const internalData = $xeTable as unknown as TableInternalData
+
+    const { treeConfig } = props
+    const treeOpts = $xeTable.computeTreeOpts
+    const { fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData
     const childrenField = treeOpts.children || treeOpts.childrenField
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
-    const rowkey = getRowkey(this)
+    const rowkey = getRowkey($xeTable)
     const isLazy = treeConfig && treeOpts.lazy
     const fullAllDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = {}
     const fullDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = {}
-    const handleCache = (row: any, index: any, items: any, path: any, parentRow: any, nodes: any) => {
-      let rowid = getRowid(this, row)
+    const handleRow = (row: any, index: number, items: any, path?: any[], parentRow?: any, nodes?: any[]) => {
+      let rowid = getRowid($xeTable, row)
       const seq = treeConfig && path ? toTreePathSeq(path) : index + 1
       const level = nodes ? nodes.length - 1 : 0
       if (eqEmptyValue(rowid)) {
@@ -2423,31 +2425,27 @@ const Methods = {
       if (isLazy && row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
         row[childrenField] = null
       }
-      let cacheItem = fullAllDataRowIdData[rowid]
-      if (isReset || !cacheItem) {
-        cacheItem = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
-      }
-      cacheItem.row = row
-      cacheItem.items = items
-      cacheItem.parent = parentRow
-      cacheItem.level = level
-      cacheItem.index = treeConfig && parentRow ? -1 : index
-      if (isSource) {
-        fullDataRowIdMaps[rowid] = cacheItem
-      }
-      fullAllDataRowIdMaps[rowid] = cacheItem
-    }
-    if (isSource) {
-      this.fullDataRowIdData = fullDataRowIdMaps
-    }
-    this.fullAllDataRowIdData = fullAllDataRowIdMaps
+      let rowRest = fullAllDataRowIdData[rowid]
+      if (!rowRest) {
+        rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
+      }
+      rowRest.row = row
+      rowRest.items = items
+      rowRest.parent = parentRow
+      rowRest.level = level
+      rowRest.index = treeConfig && parentRow ? -1 : index
+      fullDataRowIdMaps[rowid] = rowRest
+      fullAllDataRowIdMaps[rowid] = rowRest
+    }
+    internalData.fullDataRowIdData = fullDataRowIdMaps
+    internalData.fullAllDataRowIdData = fullAllDataRowIdMaps
     if (treeConfig) {
-      XEUtils.eachTree(tableFullTreeData, handleCache, { children: childrenField })
+      XEUtils.eachTree(tableFullTreeData, handleRow, { children: childrenField })
     } else {
-      tableFullData.forEach(handleCache)
+      tableFullData.forEach(handleRow)
     }
   },
-  cacheSourceMap (fullData: any) {
+  cacheSourceMap (fullData: any[]) {
     let { treeConfig, treeOpts, sourceDataRowIdData } = this
     const sourceData = XEUtils.clone(fullData, true)
     const rowkey = getRowkey(this)
@@ -3260,7 +3258,7 @@ const Methods = {
     const internalData = $xeTable
 
     const { treeConfig } = props
-    const { fullDataRowIdData } = internalData
+    const { fullAllDataRowIdData } = internalData
     const treeOpts = $xeTable.computeTreeOpts
     const { transform, mapChildrenField } = treeOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
@@ -3272,7 +3270,7 @@ const Methods = {
         rowid = getRowid($xeTable, rowOrRowid)
       }
       if (rowid) {
-        const rest = fullDataRowIdData[rowid]
+        const rest = fullAllDataRowIdData[rowid]
         const row = rest ? rest.row : null
         if (row) {
           return row[transform ? mapChildrenField : childrenField] || []
@@ -3290,7 +3288,7 @@ const Methods = {
     const internalData = $xeTable as unknown as TableInternalData
 
     const { treeConfig } = props
-    const { fullDataRowIdData } = internalData
+    const { fullAllDataRowIdData } = internalData
     if (rowOrRowid && treeConfig) {
       let rowid
       if (XEUtils.isString(rowOrRowid)) {
@@ -3299,7 +3297,7 @@ const Methods = {
         rowid = getRowid($xeTable, rowOrRowid)
       }
       if (rowid) {
-        const rest = fullDataRowIdData[rowid]
+        const rest = fullAllDataRowIdData[rowid]
         return rest ? rest.parent : null
       }
     }
@@ -3319,9 +3317,9 @@ const Methods = {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const internalData = $xeTable as unknown as TableInternalData
 
-    const { fullDataRowIdData } = internalData
+    const { fullAllDataRowIdData } = internalData
     const rowid = XEUtils.eqNull(cellValue) ? '' : encodeURIComponent(cellValue)
-    return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null
+    return fullAllDataRowIdData[rowid] ? fullAllDataRowIdData[rowid].row : null
   },
   /**
    * 根据行获取行的唯一主键
@@ -7602,11 +7600,12 @@ const Methods = {
     const reactData = $xeTable as unknown as TableReactData
     const internalData = $xeTable as unknown as TableInternalData
 
-    const tExpandedMaps = { ...reactData.treeExpandedMaps }
     const { fullAllDataRowIdData } = internalData
     const treeOpts = $xeTable.computeTreeOpts
     const { transform } = treeOpts
+    let tExpandedMaps: Record<string, any> = {}
     if (rows) {
+      tExpandedMaps = { ...reactData.treeExpandedMaps }
       if (!XEUtils.isArray(rows)) {
         rows = [rows]
       }
@@ -7620,8 +7619,12 @@ const Methods = {
           }
         }
       })
+    } else {
+      XEUtils.each(fullAllDataRowIdData, (rowRest) => {
+        rowRest.treeLoaded = false
+      })
     }
-    reactData.treeExpandedMaps = tExpandedMaps
+    reactData.treeExpandedMaps = {}
     if (transform) {
       handleVirtualTreeToList($xeTable)
       return $xeTable.handleTableData()

package/packages/table/src/table.ts

@@ -1179,7 +1179,7 @@ export default {
       if (value && value.length >= 50000) {
         warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)'])
       }
-      this.loadTableData(value || [], true).then(() => {
+      this.loadTableData(value || [], false).then(() => {
         const { scrollXLoad, scrollYLoad, expandColumn } = reactData
         const expandOpts = $xeTable.computeExpandOpts
         this.inited = true

package/styles/components/table.scss

@@ -263,6 +263,13 @@
   }
 }
 
+/*负数显示红色*/
+.vxe-cell--label {
+  &.is--negative {
+    color: var(--vxe-ui-table-cell-negative-color);
+  }
+}
+
 .vxe-table--checkbox-range,
 .vxe-table--cell-main-area,
 .vxe-table--cell-extend-area,
@@ -1119,6 +1126,28 @@
     }
   }
   &.border--default,
+  &.border--none,
+  &.border--outer,
+  &.border--inner {
+    .vxe-cell--col-resizable {
+      &:before,
+      &:after {
+        content: "";
+        display: inline-block;
+        vertical-align: middle;
+      }
+      &:before {
+        width: 1px;
+        height: 50%;
+        background-color: var(--vxe-ui-table-resizable-line-color);
+      }
+      &:after {
+        width: 0;
+        height: 100%;
+      }
+    }
+  }
+  &.border--default,
   &.border--full,
   &.border--outer {
     .vxe-table--header-wrapper {

package/styles/theme/base.scss

@@ -22,7 +22,7 @@
   --vxe-ui-table-header-font-color: var(--vxe-ui-font-color);
   --vxe-ui-table-footer-font-color: var(--vxe-ui-font-color);
   --vxe-ui-table-border-radius: var(--vxe-ui-border-radius);
-  --vxe-ui-table-border-width: 1px;
+  --vxe-ui-table-border-width: 1.05px;
   --vxe-ui-table-resizable-line-color: #D9DDDF;
   --vxe-ui-table-resizable-drag-line-color: var(--vxe-ui-font-primary-color);
   --vxe-ui-table-footer-background-color: var(--vxe-ui-layout-background-color);
@@ -46,6 +46,7 @@
   --vxe-ui-table-cell-padding-small: 6px;
   --vxe-ui-table-cell-padding-mini: 4px;
   --vxe-ui-table-cell-placeholder-color: #C0C4CC;
+  --vxe-ui-table-cell-negative-color: #f56c6c;
   --vxe-ui-table-cell-input-height-default: var(--vxe-ui-table-row-height-default) - 6;
   --vxe-ui-table-cell-input-height-medium: var(--vxe-ui-table-row-height-medium) - 6;
   --vxe-ui-table-cell-input-height-small: var(--vxe-ui-table-row-height-small) - 6;