vxe-table 4.11.4 → 4.11.6

package/es/table/render/index.js

@@ -72,11 +72,11 @@ function getCellEditFilterProps(renderOpts, params, value, defaultProps) {
 function isImmediateCell(renderOpts, params) {
     return params.$type === 'cell' || getInputImmediateModel(renderOpts);
 }
-function getCellLabelVNs(renderOpts, params, cellLabel) {
+function getCellLabelVNs(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', {
@@ -565,11 +565,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);
@@ -578,12 +579,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) {
@@ -595,8 +607,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(renderOpts, params, cellValue);
+            return getCellLabelVNs(renderOpts, params, cellValue, isNegative
+                ? {
+                    class: 'is--negative'
+                }
+                : {});
         },
         renderTableFooter(renderOpts, params) {
             const { props = {} } = renderOpts;

package/es/table/src/header.js

@@ -34,7 +34,7 @@ export default defineComponent({
         };
         const renderRows = (isGroup, isOptimizeMode, cols, $rowIndex) => {
             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;
@@ -154,9 +154,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) => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
                             onDblclick: (evnt) => $xeTable.handleColResizeDblclickEvent(evnt, cellParams)
                         })

package/es/table/src/table.js

@@ -2653,15 +2653,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) {
@@ -3979,7 +3975,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;
@@ -3992,7 +3988,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] || [];
@@ -4006,7 +4002,7 @@ export default defineComponent({
              */
             getTreeParentRow(rowOrRowid) {
                 const { treeConfig } = props;
-                const { fullDataRowIdData } = internalData;
+                const { fullAllDataRowIdData } = internalData;
                 if (rowOrRowid && treeConfig) {
                     let rowid;
                     if (XEUtils.isString(rowOrRowid)) {
@@ -4016,7 +4012,7 @@ export default defineComponent({
                         rowid = getRowid($xeTable, rowOrRowid);
                     }
                     if (rowid) {
-                        const rest = fullDataRowIdData[rowid];
+                        const rest = fullAllDataRowIdData[rowid];
                         return rest ? rest.parent : null;
                     }
                 }
@@ -4031,9 +4027,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;
             },
             /**
              * 根据行获取行的唯一主键
@@ -5216,11 +5212,12 @@ export default defineComponent({
                 return rowRest && !!rowRest.treeLoaded;
             },
             clearTreeExpandLoaded(rows) {
-                const tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
                 const { fullAllDataRowIdData } = internalData;
                 const treeOpts = computeTreeOpts.value;
                 const { transform } = treeOpts;
+                let tExpandedMaps = {};
                 if (rows) {
+                    tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
                     if (!XEUtils.isArray(rows)) {
                         rows = [rows];
                     }
@@ -5235,10 +5232,15 @@ export default defineComponent({
                         }
                     });
                 }
-                reactData.treeExpandedMaps = tExpandedMaps;
+                else {
+                    XEUtils.each(fullAllDataRowIdData, (rowRest) => {
+                        rowRest.treeLoaded = false;
+                    });
+                }
+                reactData.treeExpandedMaps = {};
                 if (transform) {
                     handleVirtualTreeToList();
-                    return tablePrivateMethods.handleTableData();
+                    return $xeTable.handleTableData();
                 }
                 return nextTick();
             },
@@ -6631,7 +6633,7 @@ export default defineComponent({
             /**
              * 更新数据行的 Map
              */
-            cacheRowMap(isReset, isSource) {
+            cacheRowMap() {
                 const { treeConfig } = props;
                 const treeOpts = computeTreeOpts.value;
                 const { fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData;
@@ -6652,23 +6654,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;
-                    }
-                    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) {
-                    internalData.fullDataRowIdData = fullDataRowIdMaps;
-                }
+                internalData.fullDataRowIdData = fullDataRowIdMaps;
                 internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
                 if (treeConfig) {
                     XEUtils.eachTree(tableFullTreeData, handleRow, { children: childrenField });
@@ -9796,7 +9794,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/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);
 }