vxe-table 4.11.4 → 4.11.6

package/packages/table/render/index.ts

@@ -92,11 +92,13 @@ function isImmediateCell (renderOpts: VxeColumnPropTypes.EditRender, params: any
   return params.$type === 'cell' || getInputImmediateModel(renderOpts)
 }
 
-function getCellLabelVNs (renderOpts: any, params: any, cellLabel: any) {
+function getCellLabelVNs (renderOpts: any, params: any, cellLabel: any, opts?: {
+  class?: string
+}) {
   const { placeholder } = renderOpts
   return [
     h('span', {
-      class: 'vxe-cell--label'
+      class: ['vxe-cell--label', opts ? opts.class : '']
     }, placeholder && isEmptyValue(cellLabel)
       ? [
           h('span', {
@@ -678,11 +680,12 @@ renderer.mixin({
     tableAutoFocus: 'input',
     renderTableEdit: defaultEditRender,
     renderTableCell (renderOpts, params) {
-      const { props = {} } = renderOpts
+      const { props = {}, showNegativeStatus } = renderOpts
       const { row, column } = params
       const { type } = props
       let cellValue = XEUtils.get(row, column.field)
-      if (cellValue) {
+      let isNegative = false
+      if (!isEmptyValue(cellValue)) {
         const numberInputConfig = getConfig().numberInput || {}
         if (type === 'float') {
           const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true)
@@ -691,11 +694,22 @@ renderer.mixin({
           if (!autoFill) {
             cellValue = XEUtils.toNumber(cellValue)
           }
+          if (showNegativeStatus) {
+            if (cellValue < 0) {
+              isNegative = true
+            }
+          }
         } else if (type === 'amount') {
           const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true)
           const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2)
           const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false)
-          cellValue = XEUtils.commafy(XEUtils.toNumber(cellValue), { digits })
+          cellValue = XEUtils.toNumber(cellValue)
+          if (showNegativeStatus) {
+            if (cellValue < 0) {
+              isNegative = true
+            }
+          }
+          cellValue = XEUtils.commafy(cellValue, { digits })
           if (!autoFill) {
             const [iStr, dStr] = cellValue.split('.')
             if (dStr) {
@@ -706,9 +720,19 @@ renderer.mixin({
           if (showCurrency) {
             cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`
           }
+        } else {
+          if (showNegativeStatus) {
+            if (XEUtils.toNumber(cellValue) < 0) {
+              isNegative = true
+            }
+          }
         }
       }
-      return getCellLabelVNs(renderOpts, params, cellValue)
+      return getCellLabelVNs(renderOpts, params, cellValue, isNegative
+        ? {
+            class: 'is--negative'
+          }
+        : {})
     },
     renderTableFooter (renderOpts, params) {
       const { props = {} } = renderOpts

package/packages/table/src/header.ts

@@ -44,7 +44,7 @@ export default defineComponent({
 
     const renderRows = (isGroup: boolean, isOptimizeMode: boolean, cols: VxeTableDefines.ColumnInfo[], $rowIndex: number) => {
       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 = computeColumnOpts.value
@@ -174,9 +174,7 @@ export default defineComponent({
            */
           !fixedHiddenColumn && showResizable
             ? h('div', {
-              class: ['vxe-cell--col-resizable', {
-                'is--line': !border || border === 'none'
-              }],
+              class: 'vxe-cell--col-resizable',
               onMousedown: (evnt: MouseEvent) => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
               onDblclick: (evnt: MouseEvent) => $xeTable.handleColResizeDblclickEvent(evnt, cellParams)
             })

package/packages/table/src/table.ts

@@ -2789,15 +2789,11 @@ export default defineComponent({
       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) {
@@ -4124,7 +4120,7 @@ export default defineComponent({
        */
       getTreeRowChildren (rowOrRowid) {
         const { treeConfig } = props
-        const { fullDataRowIdData } = internalData
+        const { fullAllDataRowIdData } = internalData
         const treeOpts = computeTreeOpts.value
         const { transform, mapChildrenField } = treeOpts
         const childrenField = treeOpts.children || treeOpts.childrenField
@@ -4136,7 +4132,7 @@ export default defineComponent({
             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] || []
@@ -4150,7 +4146,7 @@ export default defineComponent({
        */
       getTreeParentRow (rowOrRowid) {
         const { treeConfig } = props
-        const { fullDataRowIdData } = internalData
+        const { fullAllDataRowIdData } = internalData
         if (rowOrRowid && treeConfig) {
           let rowid
           if (XEUtils.isString(rowOrRowid)) {
@@ -4159,7 +4155,7 @@ export default defineComponent({
             rowid = getRowid($xeTable, rowOrRowid)
           }
           if (rowid) {
-            const rest = fullDataRowIdData[rowid]
+            const rest = fullAllDataRowIdData[rowid]
             return rest ? rest.parent : null
           }
         }
@@ -4174,9 +4170,9 @@ export default defineComponent({
        * @param {String/Number} rowid 行主键
        */
       getRowById (cellValue) {
-        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
       },
       /**
        * 根据行获取行的唯一主键
@@ -5353,11 +5349,12 @@ export default defineComponent({
         return rowRest && !!rowRest.treeLoaded
       },
       clearTreeExpandLoaded (rows: any) {
-        const tExpandedMaps = { ...reactData.treeExpandedMaps }
         const { fullAllDataRowIdData } = internalData
         const treeOpts = computeTreeOpts.value
         const { transform } = treeOpts
+        let tExpandedMaps: Record<string, any> = {}
         if (rows) {
+          tExpandedMaps = { ...reactData.treeExpandedMaps }
           if (!XEUtils.isArray(rows)) {
             rows = [rows]
           }
@@ -5371,11 +5368,15 @@ export default defineComponent({
               }
             }
           })
+        } else {
+          XEUtils.each(fullAllDataRowIdData, (rowRest) => {
+            rowRest.treeLoaded = false
+          })
         }
-        reactData.treeExpandedMaps = tExpandedMaps
+        reactData.treeExpandedMaps = {}
         if (transform) {
           handleVirtualTreeToList()
-          return tablePrivateMethods.handleTableData()
+          return $xeTable.handleTableData()
         }
         return nextTick()
       },
@@ -6754,7 +6755,7 @@ export default defineComponent({
       /**
        * 更新数据行的 Map
        */
-      cacheRowMap (isReset, isSource) {
+      cacheRowMap () {
         const { treeConfig } = props
         const treeOpts = computeTreeOpts.value
         const { fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData
@@ -6764,7 +6765,7 @@ export default defineComponent({
         const isLazy = treeConfig && treeOpts.lazy
         const fullAllDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = {}
         const fullDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = {}
-        const handleRow = (row: any, index: any, items: any, path?: any[], parentRow?: any, nodes?: any[]) => {
+        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
@@ -6775,23 +6776,19 @@ export default defineComponent({
           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
+          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 }
           }
-          fullAllDataRowIdMaps[rowid] = cacheItem
-        }
-        if (isSource) {
-          internalData.fullDataRowIdData = fullDataRowIdMaps
+          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, handleRow, { children: childrenField })
@@ -9935,7 +9932,7 @@ export default defineComponent({
       if (value && value.length >= 50000) {
         warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)'])
       }
-      loadTableData(value, true).then(() => {
+      loadTableData(value, false).then(() => {
         const { scrollXLoad, scrollYLoad, expandColumn } = reactData
         const expandOpts = computeExpandOpts.value
         internalData.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/index.scss

@@ -1,4 +1,4 @@
 // 该文件已废弃，请使用 vxe-table/style/all.scss
 
 @use './variable.scss';
-@use './default.scss';
+@use './default.scss';

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;

package/styles/variable.scss

@@ -38,3 +38,4 @@ $vxe-ui-table-row-current-background-color: #e6f7ff !default;
 $vxe-ui-table-row-hover-current-background-color: #d7effb !default;
 $vxe-ui-table-fixed-scrolling-box-shadow-color: rgba(0, 0, 0, 0.12) !default;
 $vxe-ui-table-drag-over-background-color:rgba(255,255,200,0.3) !default;
+