vxe-table 4.11.4 → 4.11.5

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.5";
 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.5"}`;
 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)]);
@@ -27515,12 +27512,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 +28166,8 @@ render_renderer.mixin({
     renderTableEdit: defaultEditRender,
     renderTableCell(renderOpts, params) {
       const {
-        props = {}
+        props = {},
+        showNegativeStatus
       } = renderOpts;
       const {
         row,
@@ -28179,7 +28177,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 +28187,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 +28215,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 +31221,7 @@ const Grid = VxeGrid;
       }
     },
     numberInput: {
-      currencySymbol: '￥'
+      currencySymbol: '¥'
     },
     imagePreview: {
       popupTitle: '预览',