vxe-table 4.11.4 → 4.11.6

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.11.4";
+const version = "4.11.6";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3586,7 +3586,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.11.4"}`;
+const log_version = `table v${"4.11.6"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -7134,7 +7134,6 @@ const header_renderType = 'header';
       } = props;
       const {
         resizable: allResizable,
-        border,
         columnKey,
         headerCellClassName,
         headerCellStyle,
@@ -7291,9 +7290,7 @@ const header_renderType = 'header';
          * 列宽拖动
          */
         !fixedHiddenColumn && showResizable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.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)
         }) : header_renderEmptyElement($xeTable)]);
@@ -13432,15 +13429,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       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) {
@@ -14947,7 +14940,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           treeConfig
         } = props;
         const {
-          fullDataRowIdData
+          fullAllDataRowIdData
         } = internalData;
         const treeOpts = computeTreeOpts.value;
         const {
@@ -14963,7 +14956,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             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] || [];
@@ -14980,7 +14973,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           treeConfig
         } = props;
         const {
-          fullDataRowIdData
+          fullAllDataRowIdData
         } = internalData;
         if (rowOrRowid && treeConfig) {
           let rowid;
@@ -14990,7 +14983,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             rowid = getRowid($xeTable, rowOrRowid);
           }
           if (rowid) {
-            const rest = fullDataRowIdData[rowid];
+            const rest = fullAllDataRowIdData[rowid];
             return rest ? rest.parent : null;
           }
         }
@@ -15006,10 +14999,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        */
       getRowById(cellValue) {
         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;
       },
       /**
        * 根据行获取行的唯一主键
@@ -16375,9 +16368,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         return rowRest && !!rowRest.treeLoaded;
       },
       clearTreeExpandLoaded(rows) {
-        const tExpandedMaps = {
-          ...reactData.treeExpandedMaps
-        };
         const {
           fullAllDataRowIdData
         } = internalData;
@@ -16385,7 +16375,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         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];
           }
@@ -16399,11 +16393,15 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               }
             }
           });
+        } 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();
-          return tablePrivateMethods.handleTableData();
+          return $xeTable.handleTableData();
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
@@ -17948,7 +17946,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       /**
        * 更新数据行的 Map
        */
-      cacheRowMap(isReset, isSource) {
+      cacheRowMap() {
         const {
           treeConfig
         } = props;
@@ -17975,9 +17973,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           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,
@@ -17994,19 +17992,15 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               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) {
-          internalData.fullDataRowIdData = fullDataRowIdMaps;
-        }
+        internalData.fullDataRowIdData = fullDataRowIdMaps;
         internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
         if (treeConfig) {
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleRow, {
@@ -21584,7 +21578,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       if (value && value.length >= 50000) {
         warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
       }
-      loadTableData(value, true).then(() => {
+      loadTableData(value, false).then(() => {
         const {
           scrollXLoad,
           scrollYLoad,
@@ -27515,12 +27509,12 @@ 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 [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-    class: 'vxe-cell--label'
+    class: ['vxe-cell--label', opts ? opts.class : '']
   }, placeholder && isEmptyValue(cellLabel) ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
     class: 'vxe-cell--placeholder'
   }, formatText(getFuncText(placeholder), 1))] : formatText(cellLabel, 1))];
@@ -28169,7 +28163,8 @@ render_renderer.mixin({
     renderTableEdit: defaultEditRender,
     renderTableCell(renderOpts, params) {
       const {
-        props = {}
+        props = {},
+        showNegativeStatus
       } = renderOpts;
       const {
         row,
@@ -28179,7 +28174,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);
@@ -28188,11 +28184,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) {
@@ -28205,9 +28212,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(renderOpts, params, cellValue);
+      return getCellLabelVNs(renderOpts, params, cellValue, isNegative ? {
+        class: 'is--negative'
+      } : {});
     },
     renderTableFooter(renderOpts, params) {
       const {
@@ -31203,7 +31218,7 @@ const Grid = VxeGrid;
       }
     },
     numberInput: {
-      currencySymbol: '￥'
+      currencySymbol: '¥'
     },
     imagePreview: {
       popupTitle: '预览',