@zat-design/sisyphus-react 3.9.0-beta.10 → 3.9.0-beta.11

package/es/ProEnum/index.js

@@ -44,6 +44,7 @@ var ProEnum = function ProEnum(props) {
   var _ref = otherProps || {},
     viewEmpty = _ref.viewEmpty;
   var _isView = isView !== undefined && isView !== null ? isView : otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView;
+  var _defalutValue = props === null || props === void 0 ? void 0 : props.defaultValue;
   var _ref2 = useProConfig('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -273,16 +274,17 @@ var ProEnum = function ProEnum(props) {
     return isFunction(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join('，');
   };
   if (_isView) {
-    if (Array.isArray(value)) {
+    var __value = value || _defalutValue;
+    if (Array.isArray(__value)) {
       return _jsx(Container, {
         tooltip: true,
         viewEmpty: viewEmpty,
-        children: transToLabel(value)
+        children: transToLabel(__value)
       });
     }
     return _jsx(Container, {
       viewEmpty: viewEmpty,
-      children: value || isNumber(value) ? transToLabel([value]) : null
+      children: __value || isNumber(__value) ? transToLabel([__value]) : null
     });
   }
   return _jsx(_Fragment, {

package/es/ProEnum/propsType.d.ts

@@ -77,6 +77,7 @@ export interface ProEnum {
     otherProps?: ProFormOtherProps;
     allowClear?: boolean;
     id?: string;
+    defaultValue?: any;
 }
 export type PropProSelectsMap = {
     type?: 'ProSelect';

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

@@ -1,10 +1,12 @@
+/**
+ * 调整点：
+ */
 import React from 'react';
 import { ProTableColumn } from '../../propsType';
-export declare const formatColumn: ({ column, originalObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, diffConfig, }: {
+export declare const formatColumn: ({ column, originalObj, rowKey, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, diffConfig, }: {
     column: ProTableColumn;
     originalObj: any;
     rowKey: any;
-    diffToolTip?: boolean;
     wrapToolTipProps?: any;
     scroll?: any;
     onUpdateMinWidth?: any;

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

@@ -2,8 +2,11 @@ import "antd/es/space/style";
 import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["title", "valueType", "format", "precision", "ellipsis", "code", "copyable", "width", "tooltip", "transform", "prefix", "suffix", "dataIndex", "originalDiffTip", "toolTipProps", "minWidth", "onDiff"];
+var _excluded = ["title", "valueType", "format", "precision", "ellipsis", "code", "copyable", "width", "tooltip", "transform", "prefix", "suffix", "dataIndex", "toolTipProps", "minWidth", "onDiff"];
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+/**
+ * 调整点：
+ */
 import { isValidElement } from 'react';
 import moment from 'moment';
 import classnames from 'classnames';
@@ -50,7 +53,6 @@ export var formatColumn = function formatColumn(_ref2) {
   var column = _ref2.column,
     originalObj = _ref2.originalObj,
     rowKey = _ref2.rowKey,
-    diffToolTip = _ref2.diffToolTip,
     wrapToolTipProps = _ref2.wrapToolTipProps,
     scroll = _ref2.scroll,
     onUpdateMinWidth = _ref2.onUpdateMinWidth,
@@ -71,7 +73,6 @@ export var formatColumn = function formatColumn(_ref2) {
     prefix = column.prefix,
     suffix = column.suffix,
     dataIndex = column.dataIndex,
-    originalDiffTip = column.originalDiffTip,
     _column$toolTipProps = column.toolTipProps,
     toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
     minWidth = column.minWidth,
@@ -87,7 +88,6 @@ export var formatColumn = function formatColumn(_ref2) {
     callback: onUpdateMinWidth
   });
   var _toolTipProps = _objectSpread(_objectSpread({}, toolTipProps), wrapToolTipProps);
-  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) {
@@ -121,8 +121,11 @@ export var formatColumn = function formatColumn(_ref2) {
     column.render = function (value, record, index) {
       var isFn = isFunction(originalRender);
       var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : null;
-      var originalValue = getOriginalValue(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
+      var originalResult = getOriginalValue(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
       var isInNewRowFlag = isInNewRow(record);
+      otherProps.isChanged = isChanged;
       // 存在比对
       if (isFunction(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender) && (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource)) {
         var _originalObj$record$r;
@@ -134,7 +137,7 @@ export var formatColumn = function formatColumn(_ref2) {
           index: index
         });
         originalValue = diffResult;
-        otherProps.diffChange = diffResult;
+        otherProps.isChanged = diffResult;
       }
       return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
         valueType: valueType,
@@ -144,7 +147,6 @@ export var formatColumn = function formatColumn(_ref2) {
         value: _value,
         node: _value,
         currentValue: _value,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
@@ -171,7 +173,10 @@ export var formatColumn = function formatColumn(_ref2) {
       var multiple = valueType === 'percentage' ? 100 : 1000;
       var realValue = tools.calc(Number(value !== null && value !== void 0 ? value : 0), '*', multiple);
       var renderValue = getDecimalDigits(value) > valueTypePrecision ? realValue : realValue.toFixed(valueTypePrecision);
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRealValue = tools.calc(Number(originalValue || null), '*', multiple);
       var originalRenderValue = getDecimalDigits(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
       if (isEmpty(originalValue)) {
@@ -198,7 +203,6 @@ export var formatColumn = function formatColumn(_ref2) {
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
@@ -209,7 +213,10 @@ export var formatColumn = function formatColumn(_ref2) {
     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 = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRealValue = valueTypePrecision ? "".concat(Number(originalValue).toFixed(valueTypePrecision)) : "".concat(originalValue);
       var originalRenderValue = originalRealValue.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
       if (isEmpty(originalValue)) {
@@ -236,7 +243,6 @@ export var formatColumn = function formatColumn(_ref2) {
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
@@ -246,7 +252,10 @@ export var formatColumn = function formatColumn(_ref2) {
     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 = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRenderValue = (_moment2 = moment(originalValue)) === null || _moment2 === void 0 ? void 0 : _moment2.format(format);
       switch (valueType) {
         case 'date':
@@ -297,7 +306,6 @@ export var formatColumn = function formatColumn(_ref2) {
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
@@ -307,7 +315,10 @@ export var formatColumn = function formatColumn(_ref2) {
     column.render = function (value, record, index) {
       var realCode = typeof code === 'function' ? code(value, record) : code;
       var renderValue = getEnumLabel(realCode, value, valueType === 'enumCodeName');
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRenderValue = getEnumLabel(realCode, originalValue, valueType === 'enumCodeName');
       if (Array.isArray(column === null || column === void 0 ? void 0 : column.codeValues) && !realCode) {
         var _column$codeValues$fi;
@@ -338,7 +349,6 @@ export var formatColumn = function formatColumn(_ref2) {
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
@@ -347,7 +357,10 @@ export var formatColumn = function formatColumn(_ref2) {
   } else if (precision || prefix || suffix) {
     column.render = function (value, record, index) {
       var renderValue = value === 'number' ? value.toFixed(precision) : value;
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRenderValue = originalValue === 'number' ? originalValue.toFixed(precision) : originalValue;
       var node = _jsxs(_Space, {
         size: 8,
@@ -373,7 +386,6 @@ export var formatColumn = function formatColumn(_ref2) {
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
@@ -383,7 +395,10 @@ export var formatColumn = function formatColumn(_ref2) {
     column.render = function (value, record, index) {
       var _realValue$filter;
       var realValue = transform ? transform(value, record) : value;
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       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;
@@ -396,9 +411,6 @@ export var formatColumn = function formatColumn(_ref2) {
           children: "-"
         });
       }
-      if (originalValue && !isEqual(realValue, originalRealValue)) {
-        otherProps.diffChange = true;
-      }
       var className = classnames({
         'empty-cell': isEmpty
       });
@@ -431,7 +443,6 @@ export var formatColumn = function formatColumn(_ref2) {
         node: renderNode,
         value: renderValue,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
@@ -458,7 +469,10 @@ export var formatColumn = function formatColumn(_ref2) {
     };
   } else if (ellipsis) {
     column.render = function (value, record, index) {
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       if (!value && value !== 0 && value === originalValue) {
         _jsx("div", {
           style: {
@@ -478,7 +492,6 @@ export var formatColumn = function formatColumn(_ref2) {
           node: value,
           value: value,
           currentValue: value || '-',
-          originalDiffTip: _originalDiffTip,
           toolTipProps: _toolTipProps,
           minWidth: minWidth,
           isInNewRowFlag: isInNewRowFlag
@@ -487,7 +500,10 @@ export var formatColumn = function formatColumn(_ref2) {
     };
   } else {
     column.render = function (value, record, index) {
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var node = _jsxs(_Space, {
         size: 8,
         children: [prefixNode(value, record, index), value, suffixNode(value, record, index)]
@@ -509,7 +525,6 @@ export var formatColumn = function formatColumn(_ref2) {
         node: node,
         value: value,
         currentValue: value || '-',
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag

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

@@ -6,14 +6,13 @@ interface Props {
     value?: any;
     currentValue?: any;
     copyable?: boolean;
-    originalDiffTip?: boolean;
     ellipsis?: any;
     width?: number | string;
     originalValue?: any;
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
     minWidth?: number;
     isInNewRowFlag?: boolean;
-    diffChange?: boolean;
+    isChanged?: 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 { isBoolean } from 'lodash';
 import classNames from 'classnames';
 import { CheckOutlined } from '@ant-design/icons';
 import { ReactSVG } from 'react-svg';
@@ -25,7 +26,6 @@ var RenderColumn = function RenderColumn(props) {
     ellipsis = props.ellipsis,
     width = props.width,
     originalValue = props.originalValue,
-    originalDiffTip = props.originalDiffTip,
     _props$toolTipProps = props.toolTipProps,
     toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
     minWidth = props.minWidth,
@@ -37,11 +37,12 @@ var RenderColumn = function RenderColumn(props) {
     tooltip = _useSetState2[0].tooltip,
     setState = _useSetState2[1];
   var cellDiffCls = classNames({
-    'varied-cell': originalDiffTip
+    'varied-cell': props === null || props === void 0 ? void 0 : props.isChanged
   });
-  if (!isEmpty(originalValue, '-') && !isInNewRowFlag) {
+  // 比对场景走的逻辑
+  if (!isInNewRowFlag && isBoolean(props === null || props === void 0 ? void 0 : props.isChanged)) {
     var renderNode = value ? node : '-';
-    if (ellipsis || originalDiffTip) {
+    if (ellipsis || (props === null || props === void 0 ? void 0 : props.isChanged)) {
       renderNode = _jsx(Text, {
         style: {
           width: currentValue === '-' ? 32.5 : width,
@@ -52,12 +53,18 @@ var RenderColumn = function RenderColumn(props) {
         },
         children: ellipsis ? currentValue : renderNode
       });
-      if ((props === null || props === void 0 ? void 0 : props.diffChange) === false) {
+      if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
         return renderNode;
       }
       if (Array.isArray(originalValue)) {
         console.error('Error: When enabled, dataIndex corresponds to an array, which needs to be converted using viewRender');
       }
+      var originalValueCalc = function originalValueCalc() {
+        if (Array.isArray(originalValue)) {
+          return null;
+        }
+        return !isEmpty(originalValue) ? originalValue : '-';
+      };
       return _jsx(_Tooltip, _objectSpread(_objectSpread({
         className: cellDiffCls,
         style: {
@@ -70,11 +77,11 @@ var RenderColumn = function RenderColumn(props) {
         title: _jsx(_Space, {
           direction: "vertical",
           className: "changed-tooltip",
-          children: originalDiffTip ? _jsxs(_Fragment, {
+          children: (props === null || props === void 0 ? void 0 : props.isChanged) ? _jsxs(_Fragment, {
             children: [_jsxs(_Space, {
               align: "start",
               className: "original-value-container",
-              children: ["\u521D\u59CB\u503C\uFF1A", !Array.isArray(originalValue) ? originalValue : null]
+              children: ["\u521D\u59CB\u503C\uFF1A", originalValueCalc()]
             }), _jsx(_Space, {
               className: "current-value-container",
               children: ellipsis ? _jsxs(_Space, {
@@ -90,7 +97,7 @@ var RenderColumn = function RenderColumn(props) {
         children: renderNode
       }));
     }
-    if ((props === null || props === void 0 ? void 0 : props.diffChange) === false) {
+    if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
       return renderNode;
     }
     return _jsx("span", {

package/es/ProTable/index.js

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

package/es/ProTable/propsType.d.ts

@@ -31,7 +31,6 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
         value: string | number;
     }[];
     copyable?: boolean;
-    originalDiffTip?: boolean;
     prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     suffix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     tooltip?: ReactNode | {
@@ -46,7 +45,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
         originValue: any;
     }) => boolean;
     viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => any;
-    diffChange?: boolean;
+    isChanged?: boolean | null;
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/es/ProTable/utils/index.d.ts

@@ -11,9 +11,12 @@ export declare const getDecimalDigits: (num?: number) => number;
  * @param any value
  * @param any originalObj
  * @param {any} dataIndex
- * @return {any}
+ * @return {any} isChanged 返回bool值，表示存在比对
  */
-export declare const getOriginalValue: (value: any, record: any, originalObj: any, rowKey: any, dataIndex: any) => any;
+export declare const getOriginalValue: (value: any, record: any, originalObj: any, rowKey: any, dataIndex: any) => {
+    originalValue: any;
+    isChanged: boolean;
+};
 export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;
 /**
  * 判断数据是否为Response<List<any>>结构

package/es/ProTable/utils/index.js

@@ -16,18 +16,27 @@ export var getDecimalDigits = function getDecimalDigits() {
  * @param any value
  * @param any originalObj
  * @param {any} dataIndex
- * @return {any}
+ * @return {any} isChanged 返回bool值，表示存在比对
  */
 export var getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
   if (!originalObj) {
-    return null;
+    return {
+      originalValue: null,
+      isChanged: null
+    };
   }
   var originalRecord = get(originalObj, get(record, rowKey));
   var originalValue = get(originalRecord, dataIndex);
   if (!isEqual(originalValue, value)) {
-    return originalValue;
+    return {
+      originalValue: originalValue,
+      isChanged: true
+    };
   }
-  return null;
+  return {
+    originalValue: null,
+    isChanged: false
+  };
 };
 export var getColumnDataIndex = function getColumnDataIndex(dataIndex) {
   return typeof dataIndex === 'string' ? dataIndex : dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.join('-');

package/lib/ProEnum/index.js

@@ -45,6 +45,7 @@ var ProEnum = function ProEnum(props) {
   var _ref = otherProps || {},
     viewEmpty = _ref.viewEmpty;
   var _isView = isView !== undefined && isView !== null ? isView : otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView;
+  var _defalutValue = props === null || props === void 0 ? void 0 : props.defaultValue;
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -274,16 +275,17 @@ var ProEnum = function ProEnum(props) {
     return (0, _lodash.isFunction)(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join('，');
   };
   if (_isView) {
-    if (Array.isArray(value)) {
+    var __value = value || _defalutValue;
+    if (Array.isArray(__value)) {
       return (0, _jsxRuntime.jsx)(_Container.default, {
         tooltip: true,
         viewEmpty: viewEmpty,
-        children: transToLabel(value)
+        children: transToLabel(__value)
       });
     }
     return (0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,
-      children: value || (0, _lodash.isNumber)(value) ? transToLabel([value]) : null
+      children: __value || (0, _lodash.isNumber)(__value) ? transToLabel([__value]) : null
     });
   }
   return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {

package/lib/ProEnum/propsType.d.ts

@@ -77,6 +77,7 @@ export interface ProEnum {
     otherProps?: ProFormOtherProps;
     allowClear?: boolean;
     id?: string;
+    defaultValue?: any;
 }
 export type PropProSelectsMap = {
     type?: 'ProSelect';

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

@@ -1,10 +1,12 @@
+/**
+ * 调整点：
+ */
 import React from 'react';
 import { ProTableColumn } from '../../propsType';
-export declare const formatColumn: ({ column, originalObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, diffConfig, }: {
+export declare const formatColumn: ({ column, originalObj, rowKey, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, diffConfig, }: {
     column: ProTableColumn;
     originalObj: any;
     rowKey: any;
-    diffToolTip?: boolean;
     wrapToolTipProps?: any;
     scroll?: any;
     onUpdateMinWidth?: any;

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

@@ -21,7 +21,10 @@ var _utils2 = require("../../utils");
 var _utils3 = require("../../../utils");
 var _getEnumLabel = _interopRequireDefault(require("../../../ProEnum/utils/getEnumLabel"));
 var _ProForm = _interopRequireDefault(require("../../../ProForm"));
-var _excluded = ["title", "valueType", "format", "precision", "ellipsis", "code", "copyable", "width", "tooltip", "transform", "prefix", "suffix", "dataIndex", "originalDiffTip", "toolTipProps", "minWidth", "onDiff"];
+var _excluded = ["title", "valueType", "format", "precision", "ellipsis", "code", "copyable", "width", "tooltip", "transform", "prefix", "suffix", "dataIndex", "toolTipProps", "minWidth", "onDiff"];
+/**
+ * 调整点：
+ */
 var isReactElement = function isReactElement(element) {
   return /*#__PURE__*/(0, _react.isValidElement)(element);
 };
@@ -56,7 +59,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
   var column = _ref2.column,
     originalObj = _ref2.originalObj,
     rowKey = _ref2.rowKey,
-    diffToolTip = _ref2.diffToolTip,
     wrapToolTipProps = _ref2.wrapToolTipProps,
     scroll = _ref2.scroll,
     onUpdateMinWidth = _ref2.onUpdateMinWidth,
@@ -77,7 +79,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     prefix = column.prefix,
     suffix = column.suffix,
     dataIndex = column.dataIndex,
-    originalDiffTip = column.originalDiffTip,
     _column$toolTipProps = column.toolTipProps,
     toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
     minWidth = column.minWidth,
@@ -93,7 +94,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     callback: onUpdateMinWidth
   });
   var _toolTipProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, toolTipProps), wrapToolTipProps);
-  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) {
@@ -127,8 +127,11 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     column.render = function (value, record, index) {
       var isFn = (0, _lodash.isFunction)(originalRender);
       var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : null;
-      var originalValue = (0, _utils2.getOriginalValue)(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
+      var originalResult = (0, _utils2.getOriginalValue)(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
       var isInNewRowFlag = isInNewRow(record);
+      otherProps.isChanged = isChanged;
       // 存在比对
       if ((0, _lodash.isFunction)(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender) && (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource)) {
         var _originalObj$record$r;
@@ -140,7 +143,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           index: index
         });
         originalValue = diffResult;
-        otherProps.diffChange = diffResult;
+        otherProps.isChanged = diffResult;
       }
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         valueType: valueType,
@@ -150,7 +153,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         value: _value,
         node: _value,
         currentValue: _value,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
@@ -177,7 +179,10 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var multiple = valueType === 'percentage' ? 100 : 1000;
       var realValue = _utils.tools.calc(Number(value !== null && value !== void 0 ? value : 0), '*', multiple);
       var renderValue = (0, _utils2.getDecimalDigits)(value) > valueTypePrecision ? realValue : realValue.toFixed(valueTypePrecision);
-      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRealValue = _utils.tools.calc(Number(originalValue || null), '*', multiple);
       var originalRenderValue = (0, _utils2.getDecimalDigits)(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
       if ((0, _utils3.isEmpty)(originalValue)) {
@@ -204,7 +209,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
@@ -215,7 +219,10 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     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 = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRealValue = valueTypePrecision ? "".concat(Number(originalValue).toFixed(valueTypePrecision)) : "".concat(originalValue);
       var originalRenderValue = originalRealValue.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
       if ((0, _utils3.isEmpty)(originalValue)) {
@@ -242,7 +249,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
@@ -252,7 +258,10 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     column.render = function (value, record, index) {
       var _moment, _moment2, _moment3, _moment4, _moment5, _moment6, _moment7, _moment8, _moment9, _moment10, _moment11, _moment12, _moment13, _moment14;
       var renderValue = (_moment = (0, _moment15.default)(value)) === null || _moment === void 0 ? void 0 : _moment.format(format);
-      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRenderValue = (_moment2 = (0, _moment15.default)(originalValue)) === null || _moment2 === void 0 ? void 0 : _moment2.format(format);
       switch (valueType) {
         case 'date':
@@ -303,7 +312,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
@@ -313,7 +321,10 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     column.render = function (value, record, index) {
       var realCode = typeof code === 'function' ? code(value, record) : code;
       var renderValue = (0, _getEnumLabel.default)(realCode, value, valueType === 'enumCodeName');
-      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRenderValue = (0, _getEnumLabel.default)(realCode, originalValue, valueType === 'enumCodeName');
       if (Array.isArray(column === null || column === void 0 ? void 0 : column.codeValues) && !realCode) {
         var _column$codeValues$fi;
@@ -344,7 +355,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
@@ -353,7 +363,10 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
   } else if (precision || prefix || suffix) {
     column.render = function (value, record, index) {
       var renderValue = value === 'number' ? value.toFixed(precision) : value;
-      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var originalRenderValue = originalValue === 'number' ? originalValue.toFixed(precision) : originalValue;
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
@@ -379,7 +392,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
@@ -389,7 +401,10 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     column.render = function (value, record, index) {
       var _realValue$filter;
       var realValue = transform ? transform(value, record) : value;
-      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       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;
@@ -402,9 +417,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           children: "-"
         });
       }
-      if (originalValue && !(0, _lodash.isEqual)(realValue, originalRealValue)) {
-        otherProps.diffChange = true;
-      }
       var className = (0, _classnames.default)({
         'empty-cell': isEmpty
       });
@@ -437,7 +449,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         node: renderNode,
         value: renderValue,
         currentValue: renderValue,
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag
@@ -464,7 +475,10 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     };
   } else if (ellipsis) {
     column.render = function (value, record, index) {
-      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       if (!value && value !== 0 && value === originalValue) {
         (0, _jsxRuntime.jsx)("div", {
           style: {
@@ -484,7 +498,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           node: value,
           value: value,
           currentValue: value || '-',
-          originalDiffTip: _originalDiffTip,
           toolTipProps: _toolTipProps,
           minWidth: minWidth,
           isInNewRowFlag: isInNewRowFlag
@@ -493,7 +506,10 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     };
   } else {
     column.render = function (value, record, index) {
-      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = originalResult.originalValue;
+      var isChanged = originalResult.isChanged;
+      otherProps.isChanged = isChanged;
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), value, suffixNode(value, record, index)]
@@ -515,7 +531,6 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         node: node,
         value: value,
         currentValue: value || '-',
-        originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
         isInNewRowFlag: isInNewRowFlag

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

@@ -6,14 +6,13 @@ interface Props {
     value?: any;
     currentValue?: any;
     copyable?: boolean;
-    originalDiffTip?: boolean;
     ellipsis?: any;
     width?: number | string;
     originalValue?: any;
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
     minWidth?: number;
     isInNewRowFlag?: boolean;
-    diffChange?: boolean;
+    isChanged?: 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 _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _icons = require("@ant-design/icons");
 var _reactSvg = require("react-svg");
@@ -27,7 +28,6 @@ var RenderColumn = function RenderColumn(props) {
     ellipsis = props.ellipsis,
     width = props.width,
     originalValue = props.originalValue,
-    originalDiffTip = props.originalDiffTip,
     _props$toolTipProps = props.toolTipProps,
     toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
     minWidth = props.minWidth,
@@ -39,11 +39,12 @@ var RenderColumn = function RenderColumn(props) {
     tooltip = _useSetState2[0].tooltip,
     setState = _useSetState2[1];
   var cellDiffCls = (0, _classnames.default)({
-    'varied-cell': originalDiffTip
+    'varied-cell': props === null || props === void 0 ? void 0 : props.isChanged
   });
-  if (!(0, _utils.isEmpty)(originalValue, '-') && !isInNewRowFlag) {
+  // 比对场景走的逻辑
+  if (!isInNewRowFlag && (0, _lodash.isBoolean)(props === null || props === void 0 ? void 0 : props.isChanged)) {
     var renderNode = value ? node : '-';
-    if (ellipsis || originalDiffTip) {
+    if (ellipsis || (props === null || props === void 0 ? void 0 : props.isChanged)) {
       renderNode = (0, _jsxRuntime.jsx)(Text, {
         style: {
           width: currentValue === '-' ? 32.5 : width,
@@ -54,12 +55,18 @@ var RenderColumn = function RenderColumn(props) {
         },
         children: ellipsis ? currentValue : renderNode
       });
-      if ((props === null || props === void 0 ? void 0 : props.diffChange) === false) {
+      if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
         return renderNode;
       }
       if (Array.isArray(originalValue)) {
         console.error('Error: When enabled, dataIndex corresponds to an array, which needs to be converted using viewRender');
       }
+      var originalValueCalc = function originalValueCalc() {
+        if (Array.isArray(originalValue)) {
+          return null;
+        }
+        return !(0, _utils.isEmpty)(originalValue) ? originalValue : '-';
+      };
       return (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         className: cellDiffCls,
         style: {
@@ -72,11 +79,11 @@ var RenderColumn = function RenderColumn(props) {
         title: (0, _jsxRuntime.jsx)(_antd.Space, {
           direction: "vertical",
           className: "changed-tooltip",
-          children: originalDiffTip ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+          children: (props === null || props === void 0 ? void 0 : props.isChanged) ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
             children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
               align: "start",
               className: "original-value-container",
-              children: ["\u521D\u59CB\u503C\uFF1A", !Array.isArray(originalValue) ? originalValue : null]
+              children: ["\u521D\u59CB\u503C\uFF1A", originalValueCalc()]
             }), (0, _jsxRuntime.jsx)(_antd.Space, {
               className: "current-value-container",
               children: ellipsis ? (0, _jsxRuntime.jsxs)(_antd.Space, {
@@ -92,7 +99,7 @@ var RenderColumn = function RenderColumn(props) {
         children: renderNode
       }));
     }
-    if ((props === null || props === void 0 ? void 0 : props.diffChange) === false) {
+    if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
       return renderNode;
     }
     return (0, _jsxRuntime.jsx)("span", {

package/lib/ProTable/index.js

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

package/lib/ProTable/propsType.d.ts

@@ -31,7 +31,6 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
         value: string | number;
     }[];
     copyable?: boolean;
-    originalDiffTip?: boolean;
     prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     suffix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     tooltip?: ReactNode | {
@@ -46,7 +45,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
         originValue: any;
     }) => boolean;
     viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => any;
-    diffChange?: boolean;
+    isChanged?: boolean | null;
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/lib/ProTable/utils/index.d.ts

@@ -11,9 +11,12 @@ export declare const getDecimalDigits: (num?: number) => number;
  * @param any value
  * @param any originalObj
  * @param {any} dataIndex
- * @return {any}
+ * @return {any} isChanged 返回bool值，表示存在比对
  */
-export declare const getOriginalValue: (value: any, record: any, originalObj: any, rowKey: any, dataIndex: any) => any;
+export declare const getOriginalValue: (value: any, record: any, originalObj: any, rowKey: any, dataIndex: any) => {
+    originalValue: any;
+    isChanged: boolean;
+};
 export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;
 /**
  * 判断数据是否为Response<List<any>>结构

package/lib/ProTable/utils/index.js

@@ -22,18 +22,27 @@ var getDecimalDigits = exports.getDecimalDigits = function getDecimalDigits() {
  * @param any value
  * @param any originalObj
  * @param {any} dataIndex
- * @return {any}
+ * @return {any} isChanged 返回bool值，表示存在比对
  */
 var getOriginalValue = exports.getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
   if (!originalObj) {
-    return null;
+    return {
+      originalValue: null,
+      isChanged: null
+    };
   }
   var originalRecord = (0, _lodash.get)(originalObj, (0, _lodash.get)(record, rowKey));
   var originalValue = (0, _lodash.get)(originalRecord, dataIndex);
   if (!(0, _lodash.isEqual)(originalValue, value)) {
-    return originalValue;
+    return {
+      originalValue: originalValue,
+      isChanged: true
+    };
   }
-  return null;
+  return {
+    originalValue: null,
+    isChanged: false
+  };
 };
 var getColumnDataIndex = exports.getColumnDataIndex = function getColumnDataIndex(dataIndex) {
   return typeof dataIndex === 'string' ? dataIndex : dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.join('-');

package/package.json

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