@zat-design/sisyphus-react 3.9.0-beta.7 → 3.9.0-beta.9

package/es/ProEnum/index.js

@@ -43,7 +43,7 @@ var ProEnum = function ProEnum(props) {
     enumProps = _objectWithoutProperties(props, _excluded);
   var _ref = otherProps || {},
     viewEmpty = _ref.viewEmpty;
-  var _isView = isView || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView);
+  var _isView = isView !== undefined && isView !== null ? isView : otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView;
   var _ref2 = useProConfig('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,

package/es/ProTable/components/FormatColumn/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ProTableColumn } from '../../propsType';
-export declare const formatColumn: ({ column, originalObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, }: {
+export declare const formatColumn: ({ column, originalObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, diffConfig, }: {
     column: ProTableColumn;
     originalObj: any;
     rowKey: any;
@@ -9,6 +9,7 @@ export declare const formatColumn: ({ column, originalObj, rowKey, diffToolTip,
     scroll?: any;
     onUpdateMinWidth?: any;
     isInNewRow?: any;
+    diffConfig: any;
 }) => void;
 /**
  * 查找最近的父级className

package/es/ProTable/components/FormatColumn/index.js

@@ -54,7 +54,8 @@ export var formatColumn = function formatColumn(_ref2) {
     wrapToolTipProps = _ref2.wrapToolTipProps,
     scroll = _ref2.scroll,
     onUpdateMinWidth = _ref2.onUpdateMinWidth,
-    isInNewRow = _ref2.isInNewRow;
+    isInNewRow = _ref2.isInNewRow,
+    diffConfig = _ref2.diffConfig;
   var title = column.title,
     valueType = column.valueType,
     _column$format = column.format,
@@ -70,8 +71,7 @@ export var formatColumn = function formatColumn(_ref2) {
     prefix = column.prefix,
     suffix = column.suffix,
     dataIndex = column.dataIndex,
-    _column$originalDiffT = column.originalDiffTip,
-    originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
+    originalDiffTip = column.originalDiffTip,
     _column$toolTipProps = column.toolTipProps,
     toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
     minWidth = column.minWidth,
@@ -87,7 +87,7 @@ export var formatColumn = function formatColumn(_ref2) {
     callback: onUpdateMinWidth
   });
   var _toolTipProps = _objectSpread(_objectSpread({}, toolTipProps), wrapToolTipProps);
-  var _originalDiffTip = diffToolTip !== null && diffToolTip !== void 0 ? diffToolTip : originalDiffTip;
+  var _originalDiffTip = (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource) || (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.toolTip);
   // 前缀处理
   var prefixNode = function prefixNode(value, record, index) {
     if (!prefix) {
@@ -126,13 +126,15 @@ export var formatColumn = function formatColumn(_ref2) {
       // 存在比对
       if (isFunction(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
         var _originalObj$record$r;
-        originalValue = otherProps.viewRender({
+        var diffResult = otherProps.viewRender({
           originalValue: originalValue,
           originalRecord: (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {},
           value: value,
           record: record,
           index: index
         });
+        originalValue = diffResult;
+        otherProps.diffChange = diffResult;
       }
       return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,

package/es/ProTable/components/RenderColumn/index.d.ts

@@ -13,6 +13,7 @@ interface Props {
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
     minWidth?: number;
     isInNewRowFlag?: boolean;
+    diffChange?: boolean;
 }
 declare const RenderColumn: FC<Props>;
 export default RenderColumn;

package/es/ProTable/components/RenderColumn/index.js

@@ -8,6 +8,7 @@ import "antd/es/typography/style";
 import _Typography from "antd/es/typography";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useSetState } from 'ahooks';
+import classNames from 'classnames';
 import { CheckOutlined } from '@ant-design/icons';
 import { ReactSVG } from 'react-svg';
 import { isEmpty } from '../../../utils';
@@ -35,6 +36,9 @@ var RenderColumn = function RenderColumn(props) {
     _useSetState2 = _slicedToArray(_useSetState, 2),
     tooltip = _useSetState2[0].tooltip,
     setState = _useSetState2[1];
+  var cellDiffCls = classNames({
+    'varied-cell': originalDiffTip
+  });
   if (!isEmpty(originalValue) && !isInNewRowFlag) {
     var renderNode = value ? node : '-';
     if (ellipsis || originalDiffTip) {
@@ -48,8 +52,14 @@ var RenderColumn = function RenderColumn(props) {
         },
         children: ellipsis ? currentValue : renderNode
       });
+      if ((props === null || props === void 0 ? void 0 : props.diffChange) === false) {
+        return renderNode;
+      }
+      if (Array.isArray(originalValue)) {
+        console.error('Error: When enabled, dataIndex corresponds to an array, which needs to be converted using viewRender');
+      }
       return _jsx(_Tooltip, _objectSpread(_objectSpread({
-        className: "varied-cell",
+        className: cellDiffCls,
         style: {
           width: width,
           minWidth: minWidth
@@ -64,7 +74,7 @@ var RenderColumn = function RenderColumn(props) {
             children: [_jsxs(_Space, {
               align: "start",
               className: "original-value-container",
-              children: ["\u521D\u59CB\u503C\uFF1A", originalValue]
+              children: ["\u521D\u59CB\u503C\uFF1A", !Array.isArray(originalValue) ? originalValue : null]
             }), _jsx(_Space, {
               className: "current-value-container",
               children: ellipsis ? _jsxs(_Space, {
@@ -80,8 +90,11 @@ var RenderColumn = function RenderColumn(props) {
         children: renderNode
       }));
     }
+    if ((props === null || props === void 0 ? void 0 : props.diffChange) === false) {
+      return renderNode;
+    }
     return _jsx("span", {
-      className: "varied-cell",
+      className: cellDiffCls,
       style: {
         width: width,
         minWidth: minWidth

package/es/ProTable/index.js

@@ -213,6 +213,7 @@ var ProTable = function ProTable(props) {
         column: item,
         originalObj: originalObj,
         rowKey: props.rowKey,
+        diffConfig: diffConfig,
         diffToolTip: toolTip,
         wrapToolTipProps: wrapToolTipProps,
         scroll: _scroll,

package/es/ProTable/propsType.d.ts

@@ -46,6 +46,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
         originValue: any;
     }) => boolean;
     viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => any;
+    diffChange?: boolean;
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/lib/ProEnum/index.js

@@ -44,7 +44,7 @@ var ProEnum = function ProEnum(props) {
     enumProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = otherProps || {},
     viewEmpty = _ref.viewEmpty;
-  var _isView = isView || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView);
+  var _isView = isView !== undefined && isView !== null ? isView : otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView;
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,

package/lib/ProTable/components/FormatColumn/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ProTableColumn } from '../../propsType';
-export declare const formatColumn: ({ column, originalObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, }: {
+export declare const formatColumn: ({ column, originalObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, diffConfig, }: {
     column: ProTableColumn;
     originalObj: any;
     rowKey: any;
@@ -9,6 +9,7 @@ export declare const formatColumn: ({ column, originalObj, rowKey, diffToolTip,
     scroll?: any;
     onUpdateMinWidth?: any;
     isInNewRow?: any;
+    diffConfig: any;
 }) => void;
 /**
  * 查找最近的父级className

package/lib/ProTable/components/FormatColumn/index.js

@@ -60,7 +60,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     wrapToolTipProps = _ref2.wrapToolTipProps,
     scroll = _ref2.scroll,
     onUpdateMinWidth = _ref2.onUpdateMinWidth,
-    isInNewRow = _ref2.isInNewRow;
+    isInNewRow = _ref2.isInNewRow,
+    diffConfig = _ref2.diffConfig;
   var title = column.title,
     valueType = column.valueType,
     _column$format = column.format,
@@ -76,8 +77,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     prefix = column.prefix,
     suffix = column.suffix,
     dataIndex = column.dataIndex,
-    _column$originalDiffT = column.originalDiffTip,
-    originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
+    originalDiffTip = column.originalDiffTip,
     _column$toolTipProps = column.toolTipProps,
     toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
     minWidth = column.minWidth,
@@ -93,7 +93,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     callback: onUpdateMinWidth
   });
   var _toolTipProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, toolTipProps), wrapToolTipProps);
-  var _originalDiffTip = diffToolTip !== null && diffToolTip !== void 0 ? diffToolTip : originalDiffTip;
+  var _originalDiffTip = (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource) || (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.toolTip);
   // 前缀处理
   var prefixNode = function prefixNode(value, record, index) {
     if (!prefix) {
@@ -132,13 +132,15 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       // 存在比对
       if ((0, _lodash.isFunction)(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
         var _originalObj$record$r;
-        originalValue = otherProps.viewRender({
+        var diffResult = otherProps.viewRender({
           originalValue: originalValue,
           originalRecord: (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {},
           value: value,
           record: record,
           index: index
         });
+        originalValue = diffResult;
+        otherProps.diffChange = diffResult;
       }
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         valueType: valueType,

package/lib/ProTable/components/RenderColumn/index.d.ts

@@ -13,6 +13,7 @@ interface Props {
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
     minWidth?: number;
     isInNewRowFlag?: boolean;
+    diffChange?: boolean;
 }
 declare const RenderColumn: FC<Props>;
 export default RenderColumn;

package/lib/ProTable/components/RenderColumn/index.js

@@ -10,6 +10,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _ahooks = require("ahooks");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _icons = require("@ant-design/icons");
 var _reactSvg = require("react-svg");
 var _utils = require("../../../utils");
@@ -37,6 +38,9 @@ var RenderColumn = function RenderColumn(props) {
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     tooltip = _useSetState2[0].tooltip,
     setState = _useSetState2[1];
+  var cellDiffCls = (0, _classnames.default)({
+    'varied-cell': originalDiffTip
+  });
   if (!(0, _utils.isEmpty)(originalValue) && !isInNewRowFlag) {
     var renderNode = value ? node : '-';
     if (ellipsis || originalDiffTip) {
@@ -50,8 +54,14 @@ var RenderColumn = function RenderColumn(props) {
         },
         children: ellipsis ? currentValue : renderNode
       });
+      if ((props === null || props === void 0 ? void 0 : props.diffChange) === false) {
+        return renderNode;
+      }
+      if (Array.isArray(originalValue)) {
+        console.error('Error: When enabled, dataIndex corresponds to an array, which needs to be converted using viewRender');
+      }
       return (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        className: "varied-cell",
+        className: cellDiffCls,
         style: {
           width: width,
           minWidth: minWidth
@@ -66,7 +76,7 @@ var RenderColumn = function RenderColumn(props) {
             children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
               align: "start",
               className: "original-value-container",
-              children: ["\u521D\u59CB\u503C\uFF1A", originalValue]
+              children: ["\u521D\u59CB\u503C\uFF1A", !Array.isArray(originalValue) ? originalValue : null]
             }), (0, _jsxRuntime.jsx)(_antd.Space, {
               className: "current-value-container",
               children: ellipsis ? (0, _jsxRuntime.jsxs)(_antd.Space, {
@@ -82,8 +92,11 @@ var RenderColumn = function RenderColumn(props) {
         children: renderNode
       }));
     }
+    if ((props === null || props === void 0 ? void 0 : props.diffChange) === false) {
+      return renderNode;
+    }
     return (0, _jsxRuntime.jsx)("span", {
-      className: "varied-cell",
+      className: cellDiffCls,
       style: {
         width: width,
         minWidth: minWidth

package/lib/ProTable/index.js

@@ -220,6 +220,7 @@ var ProTable = function ProTable(props) {
         column: item,
         originalObj: originalObj,
         rowKey: props.rowKey,
+        diffConfig: diffConfig,
         diffToolTip: toolTip,
         wrapToolTipProps: wrapToolTipProps,
         scroll: _scroll,

package/lib/ProTable/propsType.d.ts

@@ -46,6 +46,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
         originValue: any;
     }) => boolean;
     viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => any;
+    diffChange?: boolean;
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.9.0-beta.7",
+  "version": "3.9.0-beta.9",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",