@zat-design/sisyphus-react 3.2.2-beta.9 → 3.3.0

package/dist/index.esm.css

@@ -3027,6 +3027,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
       -ms-flex-pack: center;
           justify-content: center;
 }
+.proupload-modal-preview .ant-modal {
+  width: 600px;
+}
 .pro-tree-select .ant-select-selector .check-mark-icon {
   display: none;
 }
@@ -4062,6 +4065,10 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   line-height: 1;
   content: "*";
 }
+.pro-edit-table .ant-table-scroll-horizontal .ant-table-cell-fix-right-first::after {
+  -webkit-box-shadow: inset -10px 0 8px -8px rgba(0, 0, 0, 0.15);
+          box-shadow: inset -10px 0 8px -8px rgba(0, 0, 0, 0.15);
+}
 .pro-edit-table .ant-table-content > table .ant-table-summary {
   background-color: var(--zaui-table-header-bg, #f2f3f5);
   color: var(--zaui-text, #343434);
@@ -4071,10 +4078,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-edit-table .ant-table-content > table .ant-table-summary .ant-table-cell-fix-right {
   background-color: var(--zaui-table-header-bg, #f2f3f5);
 }
-.pro-edit-table .ant-table-content > table .ant-table-cell-fix-right-first::after {
-  -webkit-box-shadow: inset -10px 0 8px -8px rgba(0, 0, 0, 0.15);
-          box-shadow: inset -10px 0 8px -8px rgba(0, 0, 0, 0.15);
-}
 .pro-edit-table .ant-table-content > table th.ant-table-selection-column {
   width: 48px;
 }

package/es/ProDrawerForm/index.js

@@ -2,7 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _locale$ProDrawerForm3;
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import { forwardRef, useEffect, useImperativeHandle, useMemo } from 'react';
+import { forwardRef, useImperativeHandle, useMemo } from 'react';
 import { ProDrawer, ProModal } from './components';
 import ProForm from '../ProForm';
 import { transformBySize } from './utils';
@@ -50,20 +50,6 @@ var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
       Modal: ProModal
     }[showType];
   }, [showType]);
-  var removeStyle = function removeStyle() {
-    var styleTags = document.getElementsByTagName('style');
-    for (var i = 0; i < styleTags.length; i++) {
-      var rcUtilKey = styleTags[i].getAttribute('rc-util-key');
-      if ((rcUtilKey === null || rcUtilKey === void 0 ? void 0 : rcUtilKey.indexOf('rc-util-locker')) === 0) {
-        styleTags[i].remove();
-      }
-    }
-  };
-  useEffect(function () {
-    if (!visible) {
-      removeStyle();
-    }
-  }, [visible]);
   return _jsx(_Fragment, {
     children: visible ? _jsx(Com, _objectSpread(_objectSpread({}, props), {}, {
       isView: isView,

package/es/ProEditTable/style/index.less

@@ -133,6 +133,14 @@
     }
   }
 
+  .@{ant-prefix}-table-scroll-horizontal {
+    .@{ant-prefix}-table-cell-fix-right-first {
+      &::after {
+        box-shadow: inset -10px 0 8px -8px rgba(0, 0, 0, 0.15);
+      }
+    }
+  }
+
   .@{ant-prefix}-table-content {
     >table {
       .@{ant-prefix}-table-summary {
@@ -147,12 +155,6 @@
         }
       }
 
-      .@{ant-prefix}-table-cell-fix-right-first {
-        &::after {
-          box-shadow: inset -10px 0 8px -8px rgba(0, 0, 0, 0.15);
-        }
-      }
-
       th.@{ant-prefix}-table-selection-column {
         width: 48px;
       }

package/es/ProForm/components/base/SwitchCheckbox/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .switch-checkbox-view {
   display    : flex;
   align-items: center;

package/es/ProForm/components/base/TextArea/index.less

@@ -1,5 +1,6 @@
-.pro-textarea {
-}
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 div.pro-textarea-view {
   .@{ant-prefix}-input-disabled {
     background: transparent !important;

package/es/ProForm/components/base/TimePicker/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .@{ant-prefix}-picker {
   display: flex;
 }

package/es/ProForm/components/combination/Container/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-container {
 
   &.pro-container-diy {

package/es/ProForm/components/combination/FormList/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-form-list-block-title {
   height: 14px;
   margin: @zaui-space-size-xs 0;

package/es/ProForm/components/combination/Group/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .border-radius(@start-end: 0, @end-end: 0, @start-start: 0, @end-start: 0) {
   border-start-end-radius  : @start-end;
   border-end-end-radius    : @end-end;

package/es/ProForm/components/combination/ProAddressBar/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-address {
   display: flex;
   width: 100%;

package/es/ProForm/components/combination/ProCombination/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-combination.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact {
   display: flex;
 

package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -5,6 +5,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useDebounceFn, usePrevious, useRequest } from 'ahooks';
 import { isEqual } from 'lodash';
 import { useCallback, useEffect, useMemo, useState } from 'react';
+import locale, { formatMessage } from '../../../../../locale';
 var defaultPage = {
   pageNum: 1,
   pageSize: 10
@@ -128,7 +129,11 @@ export function useRequestList(service, options, useRequestOptions) {
       onShowSizeChange: onChange,
       hideOnSinglePage: page.pageSize === 10,
       showTotal: function showTotal(total) {
-        return "\u5171".concat(total, "\u6761");
+        var _locale$ProEditTable;
+        if (!total) return;
+        return formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
+          total: total
+        });
       }
     } : false
   });

package/es/ProForm/components/combination/ProModalSelect/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-modal-select,
 .pro-tree-modal {
   .@{ant-prefix}-input-group-wrapper {

package/es/ProForm/components/combination/ProNumberRange/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-number-range {
 
   .range-split {

package/es/ProForm/components/combination/ProTimeLimit/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .@{ant-prefix}-form-item-has-error {
   .@{ant-prefix}-picker-status-error
     ~ .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(.@{ant-prefix}-input-borderless).@{ant-prefix}-input {

package/es/ProForm/components/render/RenderFields.js

@@ -66,8 +66,7 @@ var RenderFields = function RenderFields(props) {
       formItemChildProps = _column$formItemChild === void 0 ? {} : _column$formItemChild,
       _column$fieldProps = column.fieldProps,
       fieldProps = _column$fieldProps === void 0 ? {} : _column$fieldProps,
-      _column$disabled = column.disabled,
-      disabled = _column$disabled === void 0 ? false : _column$disabled,
+      disabled = column.disabled,
       equalWith = column.equalWith,
       _column$clearNotShow = column.clearNotShow,
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,

package/es/ProLayout/components/Layout/Menu/FoldMenu/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-layout-menu-fold-list {
   padding-top: 4px;
   overflow-y : auto;

package/es/ProLayout/components/Layout/Menu/OpenMenu/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-layout-open-menu {
   color: #fff;
 

package/es/ProLayout/components/Layout/Menu/SideMenu/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-layout-sider-menu {
   width     : 220px;
   background: #fff;

package/es/ProLayout/components/Layout/Menu/style/index.less

@@ -1,3 +1,5 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
 @import "../FoldMenu/style/index.less";
 @import "../OpenMenu/style/index.less";
 @import "../SideMenu/style/index.less";

package/es/ProLayout/components/Layout/Notice/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
   /** 告知区 */
   .pro-layout-header-notice {
     position       : fixed;

package/es/ProLayout/components/ProCollapse/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-collapse {
   background: #f6f8fc;
 

package/es/ProLayout/components/ProFooter/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-footer {
   position: fixed;
   right: 0;

package/es/ProLayout/components/ProHeader/components/ProBackBtn/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .back-button-container {
   &.@{ant-prefix}-btn {
     color      : var(--zaui-text);

package/es/ProLayout/components/ProHeader/style/index.less

@@ -1,3 +1,5 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
 @import '../components/ProBackBtn/style/index';
 
 .pro-header {

package/es/ProTable/index.js

@@ -12,7 +12,7 @@ var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stri
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useMemo, useState, createContext } from 'react';
-import { cloneDeep, get } from 'lodash';
+import { cloneDeep, get, keyBy } from 'lodash';
 import { useDebounceEffect, useDeepCompareEffect } from 'ahooks';
 import { ReactSVG } from 'react-svg';
 import classnames from 'classnames';
@@ -72,7 +72,10 @@ function ProTable(props) {
     tableProps = _objectWithoutProperties(quickTableConfig, _excluded2);
   var _ref3 = tableProps || {},
     pagination = _ref3.pagination,
-    dataSource = _ref3.dataSource;
+    dataSource = _ref3.dataSource,
+    rowKey = _ref3.rowKey;
+  var originalObj = originalDataSource ? keyBy(originalDataSource, rowKey) : undefined;
+  var dataSourceObj = dataSource ? keyBy(dataSource, rowKey) : {};
   var propsColumnObj = useMemo(function () {
     return propsColumns.reduce(function (acc, cur) {
       // @ts-ignore
@@ -163,7 +166,7 @@ function ProTable(props) {
       return !(item === null || item === void 0 ? void 0 : item.delete);
     });
     newColumns === null || newColumns === void 0 ? void 0 : newColumns.forEach(function (item) {
-      formatColumn(item, originalDataSource);
+      formatColumn(item, originalObj, dataSourceObj, rowKey);
     });
     return newColumns;
   }, [curColumns, handleResize]);
@@ -326,7 +329,12 @@ function ProTable(props) {
           },
           summary: _typeof(summary) === 'object' ? function () {
             return renderSummary();
-          } : summary
+          } : summary,
+          rowClassName: function rowClassName(record, index) {
+            if (originalDataSource && !originalObj.hasOwnProperty(get(record, rowKey))) {
+              return 'new-cell';
+            }
+          }
         }, tableProps)), _jsx(ResizableLine, {})]
       }), footerRender ? _jsx("div", {
         className: "pro-table-footer ".concat(pagination && !!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) ? 'has-page' : 'no-page'),

package/es/ProTable/style/index.less

@@ -64,6 +64,14 @@
   }
 
   .@{ant-prefix}-table-body {
+    // .@{ant-prefix}-table-tbody .@{ant-prefix}-table-row:nth-child(odd).new-cell {
+    //   background: #00ae4d !important;
+
+    //   td {
+    //     background: #00ae4d !important;
+    //   }
+    // }
+
     .@{ant-prefix}-table-cell .varied-cell {
       margin-left: -8px;
       background: var(--zaui-contract-bg, #fffaa1);

package/es/ProTable/utils.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ProTableColumn } from './propsType';
-export declare const formatColumn: (column: ProTableColumn, originalDataSource: any[]) => void;
+export declare const formatColumn: (column: ProTableColumn, originalObj: any, dataSourceObj: any, rowKey: any) => void;
 export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;
 /**
  * 查找最近的父级className

package/es/ProTable/utils.js

@@ -1,6 +1,5 @@
 import "antd/es/space/style";
 import _Space from "antd/es/space";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /* eslint-disable react-hooks/rules-of-hooks */
 import { isValidElement } from 'react';
@@ -22,7 +21,27 @@ var getDecimalDigits = function getDecimalDigits() {
   var match = Number(num).toString().match(/\.(\d+)/);
   return match ? match[1].length : 0;
 };
-export var formatColumn = function formatColumn(column, originalDataSource) {
+/**
+ * @description: 获取初始值
+ * @author: xiangchengli
+ * @param {any} rowKey
+ * @param any value
+ * @param any originalObj
+ * @param {any} dataIndex
+ * @return {any}
+ */
+var getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
+  if (!originalObj) {
+    return undefined;
+  }
+  var originalRecord = get(originalObj, get(record, rowKey));
+  var originalValue = get(originalRecord, dataIndex);
+  if (!isEqual(originalValue, value)) {
+    return originalValue;
+  }
+  return undefined;
+};
+export var formatColumn = function formatColumn(column, originalObj, dataSourceObj, rowKey) {
   var title = column.title,
     valueType = column.valueType,
     _column$format = column.format,
@@ -86,7 +105,7 @@ export var formatColumn = function formatColumn(column, originalDataSource) {
       var multiple = valueType === 'percentage' ? 100 : 1000;
       var realValue = tools.calc(Number(value), '*', multiple);
       var renderValue = getDecimalDigits(value) > valueTypePrecision ? realValue : realValue.toFixed(valueTypePrecision);
-      var originalValue = get(originalDataSource, Array.isArray(dataIndex) ? [index].concat(_toConsumableArray(dataIndex)) : [index, dataIndex]);
+      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRealValue = tools.calc(Number(originalValue || null), '*', multiple);
       var originalRenderValue = getDecimalDigits(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
       if (!originalValue && originalValue !== 0) {
@@ -97,7 +116,7 @@ export var formatColumn = function formatColumn(column, originalDataSource) {
       }
       return _jsx(RenderColumn, {
         valueType: valueType,
-        originalValue: !originalDataSource || renderValue === originalRenderValue ? undefined : originalRenderValue,
+        originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         node: renderValue,
@@ -111,7 +130,7 @@ export var formatColumn = function formatColumn(column, originalDataSource) {
     column.render = function (value, record, index) {
       var valueStr = valueTypePrecision ? "".concat(Number(value).toFixed(valueTypePrecision)) : "".concat(value);
       var renderValue = valueStr.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-      var originalValue = get(originalDataSource, Array.isArray(dataIndex) ? [index].concat(_toConsumableArray(dataIndex)) : [index, dataIndex]);
+      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRealValue = valueTypePrecision ? "".concat(Number(originalValue).toFixed(valueTypePrecision)) : "".concat(originalValue);
       var originalRenderValue = originalRealValue.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
       if (!originalValue && originalValue !== 0) {
@@ -126,7 +145,7 @@ export var formatColumn = function formatColumn(column, originalDataSource) {
       }
       return _jsx(RenderColumn, {
         valueType: valueType,
-        originalValue: !originalDataSource || renderValue === originalRenderValue ? undefined : originalRenderValue,
+        originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         node: node,
@@ -139,7 +158,7 @@ export var formatColumn = function formatColumn(column, originalDataSource) {
     column.render = function (value, record, index) {
       var _moment, _moment2, _moment3, _moment4, _moment5, _moment6, _moment7, _moment8, _moment9, _moment10, _moment11, _moment12, _moment13, _moment14;
       var renderValue = (_moment = moment(value)) === null || _moment === void 0 ? void 0 : _moment.format(format);
-      var originalValue = get(originalDataSource, Array.isArray(dataIndex) ? [index].concat(_toConsumableArray(dataIndex)) : [index, dataIndex]);
+      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRenderValue = (_moment2 = moment(originalValue)) === null || _moment2 === void 0 ? void 0 : _moment2.format(format);
       switch (valueType) {
         case 'date':
@@ -178,7 +197,7 @@ export var formatColumn = function formatColumn(column, originalDataSource) {
       }
       return _jsx(RenderColumn, {
         valueType: valueType,
-        originalValue: !originalDataSource || renderValue === originalRenderValue ? undefined : originalRenderValue,
+        originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         node: node,
@@ -191,7 +210,7 @@ export var formatColumn = function formatColumn(column, originalDataSource) {
     column.render = function (value, record, index) {
       var realCode = typeof code === 'function' ? code() : code;
       var renderValue = getEnumLabel(realCode, value, valueType === 'enumCodeName');
-      var originalValue = get(originalDataSource, Array.isArray(dataIndex) ? [index].concat(_toConsumableArray(dataIndex)) : [index, dataIndex]);
+      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRenderValue = getEnumLabel(realCode, originalValue, valueType === 'enumCodeName');
       var node = _jsxs(_Space, {
         size: 8,
@@ -199,7 +218,7 @@ export var formatColumn = function formatColumn(column, originalDataSource) {
       });
       return _jsx(RenderColumn, {
         valueType: valueType,
-        originalValue: !originalDataSource || value === originalValue ? undefined : originalRenderValue,
+        originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         node: node,
@@ -211,7 +230,7 @@ export var formatColumn = function formatColumn(column, originalDataSource) {
   } else if (precision || prefix || suffix) {
     column.render = function (value, record, index) {
       var renderValue = value === 'number' ? value.toFixed(precision) : value;
-      var originalValue = get(originalDataSource, Array.isArray(dataIndex) ? [index].concat(_toConsumableArray(dataIndex)) : [index, dataIndex]);
+      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRenderValue = originalValue === 'number' ? originalValue.toFixed(precision) : originalValue;
       var node = _jsxs(_Space, {
         size: 8,
@@ -225,7 +244,7 @@ export var formatColumn = function formatColumn(column, originalDataSource) {
       }
       return _jsx(RenderColumn, {
         valueType: valueType,
-        originalValue: !originalDataSource || renderValue === originalRenderValue ? undefined : originalRenderValue,
+        originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         node: node,
@@ -238,7 +257,7 @@ export var formatColumn = function formatColumn(column, originalDataSource) {
     column.render = function (value, record, index) {
       var _realValue$filter;
       var realValue = transform ? transform(value, record) : value;
-      var originalValue = get(originalDataSource, Array.isArray(dataIndex) ? [index].concat(_toConsumableArray(dataIndex)) : [index, dataIndex]);
+      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRealValue = transform ? transform(originalValue, record) : originalValue;
       var isEmpty = !realValue || Array.isArray(realValue) && (realValue === null || realValue === void 0 ? void 0 : (_realValue$filter = realValue.filter(function (item) {
         return !!item;
@@ -247,7 +266,7 @@ export var formatColumn = function formatColumn(column, originalDataSource) {
         return '-';
       }
       var className = classnames({
-        'varied-cell': originalDataSource && !isEqual(value, originalValue),
+        'varied-cell': originalValue !== undefined,
         'empty-cell': isEmpty
       });
       var renderValue = _jsx(ProForm.ProAddressBar, {
@@ -265,7 +284,7 @@ export var formatColumn = function formatColumn(column, originalDataSource) {
         isView: true,
         code: code,
         value: realValue,
-        tooltip: originalDataSource && !isEqual(value, originalValue) ? _jsxs(_Fragment, {
+        tooltip: originalValue !== undefined ? _jsxs(_Fragment, {
           children: ["\u521D\u59CB\u503C\uFF1A", originalRenderValue, _jsx("br", {}), ellipsis ? _jsxs(_Fragment, {
             children: ["\u5F53\u524D\u503C\uFF1A", renderValue]
           }) : undefined]
@@ -289,7 +308,7 @@ export var formatColumn = function formatColumn(column, originalDataSource) {
     };
   } else if (ellipsis) {
     column.render = function (value, record, index) {
-      var originalValue = get(originalDataSource, Array.isArray(dataIndex) ? [index].concat(_toConsumableArray(dataIndex)) : [index, dataIndex]);
+      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       if (!value && value !== 0 && value === originalValue) {
         return '-';
       }
@@ -297,7 +316,7 @@ export var formatColumn = function formatColumn(column, originalDataSource) {
         size: 8,
         children: [prefixNode(value, record, index), _jsx(RenderColumn, {
           valueType: valueType,
-          originalValue: !originalDataSource || value === originalValue ? undefined : originalValue || '-',
+          originalValue: originalValue === undefined ? undefined : originalValue || '-',
           ellipsis: ellipsis,
           width: width,
           node: value,
@@ -309,7 +328,7 @@ export var formatColumn = function formatColumn(column, originalDataSource) {
     };
   } else {
     column.render = function (value, record, index) {
-      var originalValue = get(originalDataSource, Array.isArray(dataIndex) ? [index].concat(_toConsumableArray(dataIndex)) : [index, dataIndex]);
+      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var node = _jsxs(_Space, {
         size: 8,
         children: [prefixNode(value, record, index), value, suffixNode(value, record, index)]
@@ -319,7 +338,7 @@ export var formatColumn = function formatColumn(column, originalDataSource) {
       }
       return _jsx(RenderColumn, {
         valueType: valueType,
-        originalValue: !originalDataSource || value === originalValue ? undefined : originalValue || '-',
+        originalValue: originalValue === undefined ? undefined : originalValue || '-',
         ellipsis: ellipsis,
         width: width,
         node: node,