vxe-table 3.13.3 → 3.13.5

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.13.3";
+const version = "3.13.5";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2843,7 +2843,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.13.3"}`;
+const log_version = `table v${"3.13.5"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -7523,15 +7523,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) {
@@ -7716,22 +7712,27 @@ const Methods = {
   /**
    * 更新数据行的 Map
    */
-  cacheRowMap(isReset, isSource) {
+  cacheRowMap() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const treeOpts = $xeTable.computeTreeOpts;
     const {
-      treeConfig,
-      treeOpts,
-      tableFullData,
       fullAllDataRowIdData,
+      tableFullData,
       tableFullTreeData
-    } = this;
+    } = 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)) {
@@ -7741,9 +7742,9 @@ const Methods = {
       if (isLazy && row[hasChildField] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[childrenField])) {
         row[childrenField] = null;
       }
-      let cacheItem = fullAllDataRowIdData[rowid];
-      if (isReset || !cacheItem) {
-        cacheItem = {
+      let rowRest = fullAllDataRowIdData[rowid];
+      if (!rowRest) {
+        rowRest = {
           row,
           rowid,
           seq,
@@ -7760,26 +7761,22 @@ const Methods = {
           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;
+      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) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleCache, {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleRow, {
         children: childrenField
       });
     } else {
-      tableFullData.forEach(handleCache);
+      tableFullData.forEach(handleRow);
     }
   },
   cacheSourceMap(fullData) {
@@ -8784,7 +8781,7 @@ const Methods = {
       treeConfig
     } = props;
     const {
-      fullDataRowIdData
+      fullAllDataRowIdData
     } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const {
@@ -8800,7 +8797,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] || [];
@@ -8820,7 +8817,7 @@ const Methods = {
       treeConfig
     } = props;
     const {
-      fullDataRowIdData
+      fullAllDataRowIdData
     } = internalData;
     if (rowOrRowid && treeConfig) {
       let rowid;
@@ -8830,7 +8827,7 @@ const Methods = {
         rowid = getRowid($xeTable, rowOrRowid);
       }
       if (rowid) {
-        const rest = fullDataRowIdData[rowid];
+        const rest = fullAllDataRowIdData[rowid];
         return rest ? rest.parent : null;
       }
     }
@@ -8849,10 +8846,10 @@ const Methods = {
     const $xeTable = this;
     const internalData = $xeTable;
     const {
-      fullDataRowIdData
+      fullAllDataRowIdData
     } = internalData;
     const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cellValue) ? '' : encodeURIComponent(cellValue);
-    return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null;
+    return fullAllDataRowIdData[rowid] ? fullAllDataRowIdData[rowid].row : null;
   },
   /**
    * 根据行获取行的唯一主键
@@ -13830,9 +13827,6 @@ const Methods = {
     const $xeTable = this;
     const reactData = $xeTable;
     const internalData = $xeTable;
-    const tExpandedMaps = {
-      ...reactData.treeExpandedMaps
-    };
     const {
       fullAllDataRowIdData
     } = internalData;
@@ -13840,7 +13834,11 @@ const Methods = {
     const {
       transform
     } = treeOpts;
+    let tExpandedMaps = {};
     if (rows) {
+      tExpandedMaps = {
+        ...reactData.treeExpandedMaps
+      };
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
         rows = [rows];
       }
@@ -13854,8 +13852,12 @@ const Methods = {
           }
         }
       });
+    } else {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(fullAllDataRowIdData, rowRest => {
+        rowRest.treeLoaded = false;
+      });
     }
-    reactData.treeExpandedMaps = tExpandedMaps;
+    reactData.treeExpandedMaps = {};
     if (transform) {
       handleVirtualTreeToList($xeTable);
       return $xeTable.handleTableData();
@@ -16342,7 +16344,6 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
   } = props;
   const {
     resizable: allResizable,
-    border,
     columnKey,
     headerCellClassName,
     headerCellStyle,
@@ -16502,9 +16503,7 @@ const header_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)
@@ -26279,7 +26278,7 @@ function renderBody(h, $xeTable) {
       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,
@@ -29513,12 +29512,12 @@ 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', {
     class: 'vxe-cell--placeholder'
   }, formatText(getFuncText(placeholder), 1))] : formatText(cellLabel, 1))];
@@ -30179,7 +30178,8 @@ render_renderer.mixin({
     renderTableEdit: defaultEditRender,
     renderTableCell(h, renderOpts, params) {
       const {
-        props = {}
+        props = {},
+        showNegativeStatus
       } = renderOpts;
       const {
         row,
@@ -30189,7 +30189,8 @@ render_renderer.mixin({
         type
       } = props;
       let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
-      if (cellValue) {
+      let isNegative = false;
+      if (!isEmptyValue(cellValue)) {
         const numberInputConfig = render_getConfig().numberInput || {};
         if (type === 'float') {
           const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
@@ -30198,11 +30199,22 @@ render_renderer.mixin({
           if (!autoFill) {
             cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue), {
+          cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
+          if (showNegativeStatus) {
+            if (cellValue < 0) {
+              isNegative = true;
+            }
+          }
+          cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(cellValue, {
             digits
           });
           if (!autoFill) {
@@ -30215,9 +30227,17 @@ render_renderer.mixin({
           if (showCurrency) {
             cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || render_getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`;
           }
+        } else {
+          if (showNegativeStatus) {
+            if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 {
@@ -30965,7 +30985,7 @@ const Toolbar = VxeToolbar;
       }
     },
     numberInput: {
-      currencySymbol: '￥'
+      currencySymbol: '¥'
     },
     imagePreview: {
       popupTitle: '预览',