vxe-table 3.13.3 → 3.13.5

package/es/table/render/index.js

@@ -71,11 +71,11 @@ function getCellEditFilterProps(renderOpts, params, value, defaultProps) {
 function isImmediateCell(renderOpts, params) {
     return params.$type === 'cell' || getInputImmediateModel(renderOpts);
 }
-function getCellLabelVNs(h, renderOpts, params, cellLabel) {
+function getCellLabelVNs(h, renderOpts, params, cellLabel, opts) {
     const { placeholder } = renderOpts;
     return [
         h('span', {
-            class: 'vxe-cell--label'
+            class: ['vxe-cell--label', opts ? opts.class : '']
         }, placeholder && isEmptyValue(cellLabel)
             ? [
                 h('span', {
@@ -626,11 +626,12 @@ renderer.mixin({
         tableAutoFocus: 'input',
         renderTableEdit: defaultEditRender,
         renderTableCell(h, 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);
@@ -639,12 +640,23 @@ 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) {
@@ -656,8 +668,19 @@ renderer.mixin({
                         cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`;
                     }
                 }
+                else {
+                    if (showNegativeStatus) {
+                        if (XEUtils.toNumber(cellValue) < 0) {
+                            isNegative = true;
+                        }
+                    }
+                }
             }
-            return getCellLabelVNs(h, renderOpts, params, cellValue);
+            return getCellLabelVNs(h, renderOpts, params, cellValue, isNegative
+                ? {
+                    class: 'is--negative'
+                }
+                : {});
         },
         renderTableFooter(h, renderOpts, params) {
             const { props = {} } = renderOpts;

package/es/table/src/header.js

@@ -12,7 +12,7 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
     const tableReactData = $xeTable;
     const tableInternalData = $xeTable;
     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;
@@ -138,9 +138,7 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
            */
             !fixedHiddenColumn && showResizable
                 ? h('div', {
-                    class: ['vxe-cell--col-resizable', {
-                            'is--line': !border || border === 'none'
-                        }],
+                    class: 'vxe-cell--col-resizable',
                     on: {
                         mousedown: (evnt) => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
                         dblclick: (evnt) => $xeTable.handleColResizeDblclickEvent(evnt, cellParams)

package/es/table/src/methods.js

@@ -2113,15 +2113,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) {
@@ -2305,16 +2301,21 @@ const Methods = {
     /**
      * 更新数据行的 Map
      */
-    cacheRowMap(isReset, isSource) {
-        const { treeConfig, treeOpts, tableFullData, fullAllDataRowIdData, tableFullTreeData } = this;
+    cacheRowMap() {
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        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 = {};
         const fullDataRowIdMaps = {};
-        const handleCache = (row, index, items, path, parentRow, nodes) => {
-            let rowid = getRowid(this, row);
+        const handleRow = (row, index, items, path, parentRow, nodes) => {
+            let rowid = getRowid($xeTable, row);
             const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
             const level = nodes ? nodes.length - 1 : 0;
             if (eqEmptyValue(rowid)) {
@@ -2324,29 +2325,25 @@ 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;
+            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;
         };
-        if (isSource) {
-            this.fullDataRowIdData = fullDataRowIdMaps;
-        }
-        this.fullAllDataRowIdData = fullAllDataRowIdMaps;
+        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) {
@@ -3168,7 +3165,7 @@ const Methods = {
         const props = $xeTable;
         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;
@@ -3181,7 +3178,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] || [];
@@ -3198,7 +3195,7 @@ const Methods = {
         const props = $xeTable;
         const internalData = $xeTable;
         const { treeConfig } = props;
-        const { fullDataRowIdData } = internalData;
+        const { fullAllDataRowIdData } = internalData;
         if (rowOrRowid && treeConfig) {
             let rowid;
             if (XEUtils.isString(rowOrRowid)) {
@@ -3208,7 +3205,7 @@ const Methods = {
                 rowid = getRowid($xeTable, rowOrRowid);
             }
             if (rowid) {
-                const rest = fullDataRowIdData[rowid];
+                const rest = fullAllDataRowIdData[rowid];
                 return rest ? rest.parent : null;
             }
         }
@@ -3226,9 +3223,9 @@ const Methods = {
     getRowById(cellValue) {
         const $xeTable = this;
         const internalData = $xeTable;
-        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;
     },
     /**
      * 根据行获取行的唯一主键
@@ -7459,11 +7456,12 @@ const Methods = {
         const $xeTable = this;
         const reactData = $xeTable;
         const internalData = $xeTable;
-        const tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
         const { fullAllDataRowIdData } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
         const { transform } = treeOpts;
+        let tExpandedMaps = {};
         if (rows) {
+            tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
             if (!XEUtils.isArray(rows)) {
                 rows = [rows];
             }
@@ -7478,7 +7476,12 @@ const Methods = {
                 }
             });
         }
-        reactData.treeExpandedMaps = tExpandedMaps;
+        else {
+            XEUtils.each(fullAllDataRowIdData, (rowRest) => {
+                rowRest.treeLoaded = false;
+            });
+        }
+        reactData.treeExpandedMaps = {};
         if (transform) {
             handleVirtualTreeToList($xeTable);
             return $xeTable.handleTableData();

package/es/table/src/table.js

@@ -1113,7 +1113,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/es/table/style.css

@@ -1932,6 +1932,11 @@
   min-height: 100%;
 }
 
+/*负数显示红色*/
+.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,
@@ -2566,6 +2571,20 @@
 .vxe-table--render-default.border--default.sx-pos--bottom .vxe-table--scroll-x-wrapper::before, .vxe-table--render-default.border--full.sx-pos--bottom .vxe-table--scroll-x-wrapper::before, .vxe-table--render-default.border--outer.sx-pos--bottom .vxe-table--scroll-x-wrapper::before, .vxe-table--render-default.border--inner.sx-pos--bottom .vxe-table--scroll-x-wrapper::before {
   top: -1px;
 }
+.vxe-table--render-default.border--default .vxe-cell--col-resizable:before, .vxe-table--render-default.border--default .vxe-cell--col-resizable:after, .vxe-table--render-default.border--none .vxe-cell--col-resizable:before, .vxe-table--render-default.border--none .vxe-cell--col-resizable:after, .vxe-table--render-default.border--outer .vxe-cell--col-resizable:before, .vxe-table--render-default.border--outer .vxe-cell--col-resizable:after, .vxe-table--render-default.border--inner .vxe-cell--col-resizable:before, .vxe-table--render-default.border--inner .vxe-cell--col-resizable:after {
+  content: "";
+  display: inline-block;
+  vertical-align: middle;
+}
+.vxe-table--render-default.border--default .vxe-cell--col-resizable:before, .vxe-table--render-default.border--none .vxe-cell--col-resizable:before, .vxe-table--render-default.border--outer .vxe-cell--col-resizable:before, .vxe-table--render-default.border--inner .vxe-cell--col-resizable:before {
+  width: 1px;
+  height: 50%;
+  background-color: var(--vxe-ui-table-resizable-line-color);
+}
+.vxe-table--render-default.border--default .vxe-cell--col-resizable:after, .vxe-table--render-default.border--none .vxe-cell--col-resizable:after, .vxe-table--render-default.border--outer .vxe-cell--col-resizable:after, .vxe-table--render-default.border--inner .vxe-cell--col-resizable:after {
+  width: 0;
+  height: 100%;
+}
 .vxe-table--render-default.border--default .vxe-table--header-wrapper, .vxe-table--render-default.border--full .vxe-table--header-wrapper, .vxe-table--render-default.border--outer .vxe-table--header-wrapper {
   background-color: var(--vxe-ui-table-header-background-color);
 }