@zat-design/sisyphus-react 3.8.3-beta.6 → 3.8.3-beta.8

package/lib/ProForm/components/combination/ProModalSelect/index.js

@@ -190,11 +190,25 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         value: item[valueKey],
         label: item[labelKey]
       }));
-    })) === null || _data$map === void 0 ? void 0 : _data$map.join('，') : undefined;
+    })) === null || _data$map === void 0 ? void 0 : _data$map.join('，') : '';
   };
   var viewText = (0, _react.useMemo)(function () {
-    return formatValue(labelInValue ? value : _value);
-  }, [value, _value]);
+    var nextValue = labelInValue ? value : _value;
+    if (labelInValue) {
+      nextValue = value;
+    } else {
+      var _options$find;
+      var optionDTO = options === null || options === void 0 ? void 0 : (_options$find = options.find) === null || _options$find === void 0 ? void 0 : _options$find.call(options, function (item) {
+        return item[valueKey] === value;
+      });
+      if (optionDTO) {
+        nextValue = optionDTO;
+      } else {
+        nextValue = _value;
+      }
+    }
+    return formatValue(nextValue);
+  }, [value, _value, options]);
   /**
    * 获取表格的rowKey，支持函数、字符串
    * @date 2023-02-16

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, dataSourceObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, }: {
+export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, }: {
     column: ProTableColumn;
     originalObj: any;
     dataSourceObj: any;
@@ -9,6 +9,7 @@ export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey
     wrapToolTipProps?: any;
     scroll?: any;
     onUpdateMinWidth?: any;
+    isInNewRow?: any;
 }) => void;
 /**
  * 查找最近的父级className

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

@@ -57,7 +57,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     diffToolTip = _ref2.diffToolTip,
     wrapToolTipProps = _ref2.wrapToolTipProps,
     scroll = _ref2.scroll,
-    onUpdateMinWidth = _ref2.onUpdateMinWidth;
+    onUpdateMinWidth = _ref2.onUpdateMinWidth,
+    isInNewRow = _ref2.isInNewRow;
   var title = column.title,
     valueType = column.valueType,
     _column$format = column.format,
@@ -77,7 +78,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
     _column$toolTipProps = column.toolTipProps,
     toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
-    minWidth = column.minWidth;
+    minWidth = column.minWidth,
+    diffTeleport = column.diffTeleport;
   // 仅在 {x: 'max-content', y: 300 } 且 column无指定 width minWidth 情况下 才开启 minWidth的自动计算
   var isMaxContentOverFlow = (0, _lodash.isObject)(scroll) ? (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content' && Reflect.ownKeys(scroll).includes('y') : false;
   calcMinWidth({
@@ -114,7 +116,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     }
   };
   if (column === null || column === void 0 ? void 0 : column.render) {
-    if (!originalObj && Object.keys(originalObj !== null && originalObj !== void 0 ? originalObj : {}).length === 0) {
+    if (!originalObj && Object.keys(originalObj !== null && originalObj !== void 0 ? originalObj : {}).length === 0 && !diffTeleport) {
       return;
     }
     var originalRender = column.render; // 保存原始的 render 方法
@@ -125,6 +127,14 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : undefined;
       var originalValue = (0, _utils2.getOriginalValue)(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
       var originalRenderValue = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(originalValue, (_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 : {}, index) : undefined;
+      var isInNewRowFlag = isInNewRow(record);
+      // 把比对结果告诉我
+      if (diffTeleport) {
+        var isDiff = diffTeleport(value, record, index, originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]);
+        if (!isDiff) {
+          originalValue = undefined;
+        }
+      }
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -135,7 +145,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: _value,
         originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
-        minWidth: minWidth
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
     return;
@@ -177,6 +188,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -187,7 +199,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
-        minWidth: minWidth
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
     // 千分位, 千分位带CNY前缀
@@ -213,6 +226,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           children: "-"
         });
       }
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -223,7 +237,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
-        minWidth: minWidth
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -272,6 +287,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           children: "-"
         });
       }
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -282,7 +298,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
-        minWidth: minWidth
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -311,6 +328,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -321,7 +339,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
-        minWidth: minWidth
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
   } else if (precision || prefix || suffix) {
@@ -344,6 +363,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           children: "-"
         });
       }
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -354,7 +374,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
-        minWidth: minWidth
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
   } else if (valueType === 'address') {
@@ -398,21 +419,24 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         value: realValue,
         tooltip: false
       });
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalRealValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis !== null && ellipsis !== void 0 ? ellipsis : true,
         width: width,
         node: renderNode,
-        value: value,
+        value: renderValue,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
-        minWidth: minWidth
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
   } else if (copyable) {
     column.render = function (value, record, index) {
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, {
@@ -424,7 +448,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           value: value,
           currentValue: value,
           toolTipProps: _toolTipProps,
-          minWidth: minWidth
+          minWidth: minWidth,
+          isInNewRowFlag: isInNewRowFlag
         }), suffixNode(value, record, index)]
       });
     };
@@ -439,6 +464,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           children: "-"
         });
       }
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, {
@@ -451,7 +477,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           currentValue: value || '-',
           originalDiffTip: _originalDiffTip,
           toolTipProps: _toolTipProps,
-          minWidth: minWidth
+          minWidth: minWidth,
+          isInNewRowFlag: isInNewRowFlag
         }), suffixNode(value, record, index)]
       });
     };
@@ -470,6 +497,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           children: "-"
         });
       }
+      var isInNewRowFlag = isInNewRow(record);
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalValue || '-',
@@ -480,7 +508,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: value || '-',
         originalDiffTip: _originalDiffTip,
         toolTipProps: _toolTipProps,
-        minWidth: minWidth
+        minWidth: minWidth,
+        isInNewRowFlag: isInNewRowFlag
       });
     };
   }

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

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

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

@@ -28,14 +28,15 @@ var RenderColumn = function RenderColumn(props) {
     originalDiffTip = props.originalDiffTip,
     _props$toolTipProps = props.toolTipProps,
     toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
-    minWidth = props.minWidth;
+    minWidth = props.minWidth,
+    isInNewRowFlag = props.isInNewRowFlag;
   var _useSetState = (0, _ahooks.useSetState)({
       tooltip: false
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     tooltip = _useSetState2[0].tooltip,
     setState = _useSetState2[1];
-  if (originalValue !== undefined) {
+  if (originalValue !== undefined && !isInNewRowFlag) {
     var renderNode = value ? node : '-';
     if (ellipsis || originalDiffTip) {
       if (ellipsis) {

package/lib/ProTable/index.js

@@ -190,6 +190,11 @@ function ProTable(props) {
       setCurColumns(nextColumns);
     };
   };
+  var _rowClassName = function _rowClassName(record, index) {
+    if (originalDataSource && !originalObj.hasOwnProperty((0, _lodash.get)(record, 'rowKey'))) {
+      return 'new-cell';
+    }
+  };
   var columns = (0, _react.useMemo)(function () {
     var newColumns = curColumns.map(function (item, index) {
       var _propsColumnObj$getCo2;
@@ -222,11 +227,12 @@ function ProTable(props) {
         scroll: _scroll,
         onUpdateMinWidth: function onUpdateMinWidth(w) {
           curColumns[index].minWidth = w;
-        }
+        },
+        isInNewRow: _rowClassName
       });
     });
     return newColumns;
-  }, [curColumns, handleResize, _scroll]);
+  }, [curColumns, handleResize, _scroll, originalDataSource, originalObj, _rowClassName]);
   var _columns = (0, _react.useMemo)(function () {
     return columns === null || columns === void 0 ? void 0 : columns.filter(function (item, index) {
       var show = item.show;
@@ -375,11 +381,6 @@ function ProTable(props) {
       return _ref7.apply(this, arguments);
     };
   }();
-  var _rowClassName = function _rowClassName(record, index) {
-    if (originalDataSource && !originalObj.hasOwnProperty((0, _lodash.get)(record, 'rowKey'))) {
-      return 'new-cell';
-    }
-  };
   var TableComponent = draggable ? _RcTable.DraggableTable : _RcTable.BaseTable;
   // 标记样式
   var tagStyle = {

package/lib/ProTable/propsType.d.ts

@@ -41,6 +41,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
     transform?: (value: any, record?: any) => string[];
     show?: boolean | (() => boolean);
+    diffTeleport?: (value: any, record: any, index: number, originalRecord?: any) => boolean;
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/lib/ProTable/style/index.less

@@ -272,8 +272,22 @@
     .@{ant-prefix}-table-cell .varied-cell {
       margin-left: -8px;
       padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
+
       background: var(--zaui-contract-bg; #fffaa1) !important;
       border-radius: var(--zaui-border-radius, 8px);
+      .pro-form-view-container {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+    }
+
+    .@{ant-prefix}-table-cell .@{ant-prefix}-typography-ellipsis {
+      .pro-form-view-container {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
     }
 
     .varied-cell.empty-cell {

package/package.json

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