@zat-design/sisyphus-react 4.2.0-beta.2 → 4.2.0-beta.3

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

@@ -1,11 +1,9 @@
-var _excluded = ["title", "valueType", "format", "precision", "ellipsis", "code", "copyable", "width", "tooltip", "transform", "prefix", "suffix", "dataIndex", "toolTipProps", "minWidth", "onDiff"];
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import _omit from "lodash/omit";
+import _isBoolean from "lodash/isBoolean";
+import _isObject from "lodash/isObject";
+import _isString from "lodash/isString";
+import _isFunction from "lodash/isFunction";
+import _isEqual from "lodash/isEqual";
 /**
  * FormatColumn - 表格列格式化组件
  * 重构优化：提取公共逻辑，修复 key prop 警告
@@ -15,7 +13,6 @@ import dayjs from 'dayjs';
 import classnames from 'classnames';
 import { createRoot } from 'react-dom/client';
 import { Space } from 'antd';
-import { isEqual, isFunction, isString, isObject, isBoolean, omit } from 'lodash';
 import { tools } from '@zat-design/utils';
 import TooltipTitle from "../TooltipTitle";
 import RenderColumn from "../RenderColumn";
@@ -24,38 +21,41 @@ import { isEmpty } from "../../../utils";
 import getEnumLabel from "../../../ProEnum/utils/getEnumLabel";
 import { ProCascader } from "../../../ProForm/components";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-var isReactElement = element => /*#__PURE__*/isValidElement(element);
+const isReactElement = element => /*#__PURE__*/isValidElement(element);
 
 // 需要从 otherProps 中排除的属性（不应传递给 RenderColumn）
-var EXCLUDED_PROPS = ['key', 'render', 'children', 'onCell', 'onHeaderCell'];
+const EXCLUDED_PROPS = ['key', 'render', 'children', 'onCell', 'onHeaderCell'];
 
 /**
  * 获取安全的 props（排除 key 等不应通过 spread 传递的属性）
  */
-var getSafeProps = props => omit(props, EXCLUDED_PROPS);
-var getDiffContext = (value, record, originalObj, rowKey, dataIndex, isInNewRow) => {
-  var result = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
-  return _objectSpread(_objectSpread({}, result), {}, {
+const getSafeProps = props => _omit(props, EXCLUDED_PROPS);
+const getDiffContext = (value, record, originalObj, rowKey, dataIndex, isInNewRow) => {
+  const result = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+  return {
+    ...result,
     isInNewRowFlag: isInNewRow(record)
-  });
+  };
 };
-var createRenderColumn = _ref => {
-  var baseProps = _ref.baseProps,
-    valueType = _ref.valueType,
-    ellipsis = _ref.ellipsis,
-    width = _ref.width,
-    toolTipProps = _ref.toolTipProps,
-    minWidth = _ref.minWidth,
-    node = _ref.node,
-    value = _ref.value,
-    currentValue = _ref.currentValue,
-    originalValue = _ref.originalValue,
-    isChanged = _ref.isChanged,
-    isInNewRowFlag = _ref.isInNewRowFlag,
-    isAddCell = _ref.isAddCell,
-    copyable = _ref.copyable;
-  var safeProps = getSafeProps(baseProps);
-  return /*#__PURE__*/_jsx(RenderColumn, _objectSpread(_objectSpread({}, safeProps), {}, {
+const createRenderColumn = ({
+  baseProps,
+  valueType,
+  ellipsis,
+  width,
+  toolTipProps,
+  minWidth,
+  node,
+  value,
+  currentValue,
+  originalValue,
+  isChanged,
+  isInNewRowFlag,
+  isAddCell,
+  copyable
+}) => {
+  const safeProps = getSafeProps(baseProps);
+  return /*#__PURE__*/_jsx(RenderColumn, {
+    ...safeProps,
     isChanged: isChanged,
     valueType: valueType,
     originalValue: originalValue,
@@ -69,21 +69,22 @@ var createRenderColumn = _ref => {
     isInNewRowFlag: isInNewRowFlag,
     isAddCell: isAddCell,
     copyable: copyable
-  }));
+  });
 };
-var calcMinWidth = _ref2 => {
-  var minWidth = _ref2.minWidth,
-    width = _ref2.width,
-    title = _ref2.title,
-    isMaxContentOverFlow = _ref2.isMaxContentOverFlow,
-    callback = _ref2.callback;
+const calcMinWidth = ({
+  minWidth,
+  width,
+  title,
+  isMaxContentOverFlow,
+  callback
+}) => {
   if (!minWidth && !width && isMaxContentOverFlow) {
-    var tempEl = document.createElement('div');
+    const tempEl = document.createElement('div');
     tempEl.style.display = 'inline-block';
     document.body.appendChild(tempEl);
-    var root = null;
-    if (isFunction(title)) {
-      var component = title();
+    let root = null;
+    if (_isFunction(title)) {
+      const component = title();
       root = createRoot(tempEl);
       root.render(component);
     } else if (isReactElement(title)) {
@@ -93,44 +94,44 @@ var calcMinWidth = _ref2 => {
       tempEl.innerHTML = title;
     }
     requestAnimationFrame(() => {
-      var _root;
-      var _width = tempEl.offsetWidth;
-      (_root = root) === null || _root === void 0 || _root.unmount();
+      const _width = tempEl.offsetWidth;
+      root?.unmount();
       tempEl.remove();
       callback(_width);
     });
   }
 };
-export var formatColumn = _ref3 => {
-  var column = _ref3.column,
-    originalObj = _ref3.originalObj,
-    rowKey = _ref3.rowKey,
-    wrapToolTipProps = _ref3.wrapToolTipProps,
-    scroll = _ref3.scroll,
-    onUpdateMinWidth = _ref3.onUpdateMinWidth,
-    isInNewRow = _ref3.isInNewRow,
-    diffConfig = _ref3.diffConfig;
-  var title = column.title,
-    valueType = column.valueType,
-    _column$format = column.format,
-    format = _column$format === void 0 ? 'YYYY-MM-DD HH:mm:ss' : _column$format,
-    precision = column.precision,
-    ellipsis = column.ellipsis,
-    code = column.code,
-    copyable = column.copyable,
-    width = column.width,
-    tooltip = column.tooltip,
-    transform = column.transform,
-    prefix = column.prefix,
-    suffix = column.suffix,
-    dataIndex = column.dataIndex,
-    _column$toolTipProps = column.toolTipProps,
-    toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
-    minWidth = column.minWidth,
-    onDiff = column.onDiff,
-    otherProps = _objectWithoutProperties(column, _excluded);
+export const formatColumn = ({
+  column,
+  originalObj,
+  rowKey,
+  wrapToolTipProps,
+  scroll,
+  onUpdateMinWidth,
+  isInNewRow,
+  diffConfig
+}) => {
+  const {
+    title,
+    valueType,
+    format = 'YYYY-MM-DD HH:mm:ss',
+    precision,
+    ellipsis,
+    code,
+    copyable,
+    width,
+    tooltip,
+    transform,
+    prefix,
+    suffix,
+    dataIndex,
+    toolTipProps = {},
+    minWidth,
+    onDiff,
+    ...otherProps
+  } = column;
   otherProps.scroll = scroll;
-  var isMaxContentOverFlow = isObject(scroll) ? (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content' && Reflect.ownKeys(scroll).includes('y') : false;
+  const isMaxContentOverFlow = _isObject(scroll) ? scroll?.x === 'max-content' && Reflect.ownKeys(scroll).includes('y') : false;
   calcMinWidth({
     minWidth,
     width,
@@ -138,45 +139,48 @@ export var formatColumn = _ref3 => {
     isMaxContentOverFlow,
     callback: onUpdateMinWidth
   });
-  var _toolTipProps = _objectSpread(_objectSpread({}, toolTipProps), wrapToolTipProps);
+  const _toolTipProps = {
+    ...toolTipProps,
+    ...wrapToolTipProps
+  };
 
   // 前缀处理
-  var prefixNode = (value, record, index) => {
+  const prefixNode = (value, record, index) => {
     if (!prefix) {
       if (valueType === 'thousandthCNY') {
         return 'CNY';
       }
       return '';
     }
-    if (isString(prefix) || /*#__PURE__*/isValidElement(prefix)) {
+    if (_isString(prefix) || /*#__PURE__*/isValidElement(prefix)) {
       return prefix;
     }
-    if (isFunction(prefix)) {
+    if (_isFunction(prefix)) {
       return prefix(value, record, index);
     }
   };
 
   // 后缀处理
-  var suffixNode = (value, record, index) => {
-    if (isString(suffix) || /*#__PURE__*/isValidElement(suffix)) {
+  const suffixNode = (value, record, index) => {
+    if (_isString(suffix) || /*#__PURE__*/isValidElement(suffix)) {
       return suffix;
     }
-    if (isFunction(suffix)) {
+    if (_isFunction(suffix)) {
       return suffix(value, record, index);
     }
   };
 
   // 创建带前后缀的节点
-  var createNodeWithAffixes = (value, renderValue, record, index) => /*#__PURE__*/_jsxs(Space, {
+  const createNodeWithAffixes = (value, renderValue, record, index) => /*#__PURE__*/_jsxs(Space, {
     size: 8,
     children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
   });
 
   // 处理自定义 diff 逻辑
-  var processDiffResult = (diffResult, currentIsAddCell, props) => {
-    var _isAddCell = currentIsAddCell;
-    var _isChanged = props.isChanged;
-    if (isBoolean(diffResult)) {
+  const processDiffResult = (diffResult, currentIsAddCell, props) => {
+    let _isAddCell = currentIsAddCell;
+    let _isChanged = props.isChanged;
+    if (_isBoolean(diffResult)) {
       _isChanged = diffResult;
       _isAddCell = false;
     } else if (typeof diffResult === 'string') {
@@ -202,54 +206,57 @@ export var formatColumn = _ref3 => {
   };
 
   // 自定义 render 处理
-  if (column !== null && column !== void 0 && column.render) {
-    var originalRender = column.render;
+  if (column?.render) {
+    const originalRender = column.render;
     column.render = (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 ctx = getDiffContext(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex, isInNewRow);
-      var originalValue = ctx.originalValue,
-        isAddCell = ctx.isAddCell;
-      var isChanged = ctx.isChanged,
-        isInNewRowFlag = ctx.isInNewRowFlag;
-      var currentIsChanged = isChanged;
-      if (Array.isArray(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource)) {
-        if (isFunction(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
-          var _originalObj$record$r;
-          var diffResult = otherProps.viewRender({
+      const isFn = _isFunction(originalRender);
+      const _value = isFn ? originalRender?.(value, record ?? {}, index) : null;
+      const ctx = getDiffContext(value, record ?? {}, originalObj, rowKey, dataIndex, isInNewRow);
+      let {
+        originalValue,
+        isAddCell
+      } = ctx;
+      const {
+        isChanged,
+        isInNewRowFlag
+      } = ctx;
+      let currentIsChanged = isChanged;
+      if (Array.isArray(diffConfig?.originalDataSource)) {
+        if (_isFunction(otherProps?.viewRender)) {
+          const diffResult = otherProps.viewRender({
             originValue: originalValue,
-            originRecord: (_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 : {},
+            originRecord: originalObj?.[record?.[rowKey]] ?? {},
             value,
             record,
             index
           });
-          var processed = processDiffResult(diffResult, isAddCell, {
+          const processed = processDiffResult(diffResult, isAddCell, {
             isChanged: currentIsChanged
           });
           isAddCell = processed.isAddCell;
           currentIsChanged = processed.isChanged;
           originalValue = diffResult;
         }
-        if (isFunction(onDiff)) {
-          var _originalObj$record$r2;
-          var _diffResult = onDiff({
+        if (_isFunction(onDiff)) {
+          const diffResult = onDiff({
             originValue: originalValue,
-            originRecord: (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {},
+            originRecord: originalObj?.[record?.[rowKey]] ?? {},
             value,
             record,
             index
           });
-          var _processed = processDiffResult(_diffResult, isAddCell, {
+          const processed = processDiffResult(diffResult, isAddCell, {
             isChanged: currentIsChanged
           });
-          isAddCell = _processed.isAddCell;
-          currentIsChanged = _processed.isChanged;
+          isAddCell = processed.isAddCell;
+          currentIsChanged = processed.isChanged;
         }
       }
       return createRenderColumn({
-        baseProps: _objectSpread(_objectSpread({}, otherProps), {}, {
+        baseProps: {
+          ...otherProps,
           isChanged: currentIsChanged
-        }),
+        },
         valueType,
         ellipsis,
         width,
@@ -275,24 +282,26 @@ export var formatColumn = _ref3 => {
   if (ellipsis) {
     column.ellipsis = false;
   }
-  var valueTypePrecision = precision !== null && precision !== void 0 ? precision : 0;
+  let valueTypePrecision = precision ?? 0;
   if (['percentage', 'permillage', 'thousandth', 'thousandthCNY'].includes(valueType)) {
-    valueTypePrecision = precision !== null && precision !== void 0 ? precision : 2;
+    valueTypePrecision = precision ?? 2;
   }
 
   // 百分比、千分比
   if (['percentage', 'permillage'].includes(valueType)) {
     column.render = (value, record, index) => {
-      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 ctx = getDiffContext(value, record, originalObj, rowKey, dataIndex, isInNewRow);
-      var originalValue = ctx.originalValue,
-        isAddCell = ctx.isAddCell,
-        isInNewRowFlag = ctx.isInNewRowFlag,
-        isChanged = ctx.isChanged;
-      var originalRealValue = tools.calc(Number(originalValue || null), '*', multiple);
-      var originalRenderValue = getDecimalDigits(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
+      const multiple = valueType === 'percentage' ? 100 : 1000;
+      const realValue = tools.calc(Number(value ?? 0), '*', multiple);
+      const renderValue = getDecimalDigits(value) > valueTypePrecision ? realValue : realValue.toFixed(valueTypePrecision);
+      const ctx = getDiffContext(value, record, originalObj, rowKey, dataIndex, isInNewRow);
+      const {
+        originalValue,
+        isAddCell,
+        isInNewRowFlag,
+        isChanged
+      } = ctx;
+      const originalRealValue = tools.calc(Number(originalValue || null), '*', multiple);
+      let originalRenderValue = getDecimalDigits(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
       if (isEmpty(originalValue)) {
         originalRenderValue = '-';
       }
@@ -305,9 +314,10 @@ export var formatColumn = _ref3 => {
         });
       }
       return createRenderColumn({
-        baseProps: _objectSpread(_objectSpread({}, otherProps), {}, {
+        baseProps: {
+          ...otherProps,
           isChanged
-        }),
+        },
         valueType,
         ellipsis,
         width,
@@ -325,15 +335,17 @@ export var formatColumn = _ref3 => {
   } else if (['thousandth', 'thousandthCNY'].includes(valueType)) {
     // 千分位, 千分位带CNY前缀
     column.render = (value, record, index) => {
-      var valueStr = valueTypePrecision || valueTypePrecision === 0 ? `${Number(value).toFixed(valueTypePrecision)}` : `${value}`;
-      var renderValue = valueStr.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-      var ctx = getDiffContext(value, record, originalObj, rowKey, dataIndex, isInNewRow);
-      var originalValue = ctx.originalValue,
-        isAddCell = ctx.isAddCell,
-        isInNewRowFlag = ctx.isInNewRowFlag,
-        isChanged = ctx.isChanged;
-      var originalRealValue = valueTypePrecision ? `${Number(originalValue).toFixed(valueTypePrecision)}` : `${originalValue}`;
-      var originalRenderValue = originalRealValue.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+      const valueStr = valueTypePrecision || valueTypePrecision === 0 ? `${Number(value).toFixed(valueTypePrecision)}` : `${value}`;
+      const renderValue = valueStr.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+      const ctx = getDiffContext(value, record, originalObj, rowKey, dataIndex, isInNewRow);
+      const {
+        originalValue,
+        isAddCell,
+        isInNewRowFlag,
+        isChanged
+      } = ctx;
+      const originalRealValue = valueTypePrecision ? `${Number(originalValue).toFixed(valueTypePrecision)}` : `${originalValue}`;
+      let originalRenderValue = originalRealValue.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
       if (isEmpty(originalValue)) {
         originalRenderValue = '-';
       }
@@ -346,9 +358,10 @@ export var formatColumn = _ref3 => {
         });
       }
       return createRenderColumn({
-        baseProps: _objectSpread(_objectSpread({}, otherProps), {}, {
+        baseProps: {
+          ...otherProps,
           isChanged
-        }),
+        },
         valueType,
         ellipsis,
         width,
@@ -366,34 +379,35 @@ export var formatColumn = _ref3 => {
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
     // 日期类型
     column.render = (value, record, index) => {
-      var _dayjs, _dayjs2, _dayjs3, _dayjs4, _dayjs5, _dayjs6, _dayjs7, _dayjs8, _dayjs9, _dayjs10, _dayjs11, _dayjs12, _dayjs13, _dayjs14;
-      var ctx = getDiffContext(value, record, originalObj, rowKey, dataIndex, isInNewRow);
-      var originalValue = ctx.originalValue,
-        isAddCell = ctx.isAddCell,
-        isInNewRowFlag = ctx.isInNewRowFlag,
-        isChanged = ctx.isChanged;
-      var renderValue = (_dayjs = dayjs(value)) === null || _dayjs === void 0 ? void 0 : _dayjs.format(format);
-      var originalRenderValue = (_dayjs2 = dayjs(originalValue)) === null || _dayjs2 === void 0 ? void 0 : _dayjs2.format(format);
+      const ctx = getDiffContext(value, record, originalObj, rowKey, dataIndex, isInNewRow);
+      const {
+        originalValue,
+        isAddCell,
+        isInNewRowFlag,
+        isChanged
+      } = ctx;
+      let renderValue = dayjs(value)?.format(format);
+      let originalRenderValue = dayjs(originalValue)?.format(format);
       switch (valueType) {
         case 'date':
-          renderValue = (_dayjs3 = dayjs(value)) === null || _dayjs3 === void 0 ? void 0 : _dayjs3.format('YYYY-MM-DD');
-          originalRenderValue = (_dayjs4 = dayjs(originalValue)) === null || _dayjs4 === void 0 ? void 0 : _dayjs4.format('YYYY-MM-DD');
+          renderValue = dayjs(value)?.format('YYYY-MM-DD');
+          originalRenderValue = dayjs(originalValue)?.format('YYYY-MM-DD');
           break;
         case 'dateTime':
-          renderValue = (_dayjs5 = dayjs(value)) === null || _dayjs5 === void 0 ? void 0 : _dayjs5.format('YYYY-MM-DD HH:mm:ss');
-          originalRenderValue = (_dayjs6 = dayjs(originalValue)) === null || _dayjs6 === void 0 ? void 0 : _dayjs6.format('YYYY-MM-DD HH:mm:ss');
+          renderValue = dayjs(value)?.format('YYYY-MM-DD HH:mm:ss');
+          originalRenderValue = dayjs(originalValue)?.format('YYYY-MM-DD HH:mm:ss');
           break;
         case 'dateStartTime':
-          renderValue = `${(_dayjs7 = dayjs(value)) === null || _dayjs7 === void 0 ? void 0 : _dayjs7.format('YYYY-MM-DD')} 00:00:00`;
-          originalRenderValue = `${(_dayjs8 = dayjs(originalValue)) === null || _dayjs8 === void 0 ? void 0 : _dayjs8.format('YYYY-MM-DD')} 00:00:00`;
+          renderValue = `${dayjs(value)?.format('YYYY-MM-DD')} 00:00:00`;
+          originalRenderValue = `${dayjs(originalValue)?.format('YYYY-MM-DD')} 00:00:00`;
           break;
         case 'dateEndTime':
-          renderValue = `${(_dayjs9 = dayjs(value)) === null || _dayjs9 === void 0 ? void 0 : _dayjs9.format('YYYY-MM-DD')} 23:59:59`;
-          originalRenderValue = `${(_dayjs10 = dayjs(originalValue)) === null || _dayjs10 === void 0 ? void 0 : _dayjs10.format('YYYY-MM-DD')} 23:59:59`;
+          renderValue = `${dayjs(value)?.format('YYYY-MM-DD')} 23:59:59`;
+          originalRenderValue = `${dayjs(originalValue)?.format('YYYY-MM-DD')} 23:59:59`;
           break;
         case 'dateStartEndTime':
-          renderValue = `${(_dayjs11 = dayjs(value === null || value === void 0 ? void 0 : value[0])) === null || _dayjs11 === void 0 ? void 0 : _dayjs11.format('YYYY-MM-DD')} 00:00:00~${(_dayjs12 = dayjs(value === null || value === void 0 ? void 0 : value[1])) === null || _dayjs12 === void 0 ? void 0 : _dayjs12.format('YYYY-MM-DD')} 23:59:59`;
-          originalRenderValue = `${(_dayjs13 = dayjs(originalValue === null || originalValue === void 0 ? void 0 : originalValue[0])) === null || _dayjs13 === void 0 ? void 0 : _dayjs13.format('YYYY-MM-DD')} 00:00:00~${(_dayjs14 = dayjs(originalValue === null || originalValue === void 0 ? void 0 : originalValue[1])) === null || _dayjs14 === void 0 ? void 0 : _dayjs14.format('YYYY-MM-DD')} 23:59:59`;
+          renderValue = `${dayjs(value?.[0])?.format('YYYY-MM-DD')} 00:00:00~${dayjs(value?.[1])?.format('YYYY-MM-DD')} 23:59:59`;
+          originalRenderValue = `${dayjs(originalValue?.[0])?.format('YYYY-MM-DD')} 00:00:00~${dayjs(originalValue?.[1])?.format('YYYY-MM-DD')} 23:59:59`;
           break;
       }
       if (!value) renderValue = '-';
@@ -407,9 +421,10 @@ export var formatColumn = _ref3 => {
         });
       }
       return createRenderColumn({
-        baseProps: _objectSpread(_objectSpread({}, otherProps), {}, {
+        baseProps: {
+          ...otherProps,
           isChanged
-        }),
+        },
         valueType,
         ellipsis,
         width,
@@ -427,17 +442,18 @@ export var formatColumn = _ref3 => {
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
     // 枚举类型
     column.render = (value, record, index) => {
-      var realCode = typeof code === 'function' ? code(value, record) : code;
-      var renderValue = getEnumLabel(realCode, value, valueType === 'enumCodeName');
-      var ctx = getDiffContext(value, record, originalObj, rowKey, dataIndex, isInNewRow);
-      var originalValue = ctx.originalValue,
-        isAddCell = ctx.isAddCell,
-        isInNewRowFlag = ctx.isInNewRowFlag,
-        isChanged = ctx.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;
-        var labelName = column === null || column === void 0 || (_column$codeValues$fi = column.codeValues.find(item => item.value === value)) === null || _column$codeValues$fi === void 0 ? void 0 : _column$codeValues$fi.label;
+      const realCode = typeof code === 'function' ? code(value, record) : code;
+      let renderValue = getEnumLabel(realCode, value, valueType === 'enumCodeName');
+      const ctx = getDiffContext(value, record, originalObj, rowKey, dataIndex, isInNewRow);
+      const {
+        originalValue,
+        isAddCell,
+        isInNewRowFlag,
+        isChanged
+      } = ctx;
+      const originalRenderValue = getEnumLabel(realCode, originalValue, valueType === 'enumCodeName');
+      if (Array.isArray(column?.codeValues) && !realCode) {
+        const labelName = column?.codeValues.find(item => item.value === value)?.label;
         if (valueType === 'enumName') {
           renderValue = /*#__PURE__*/_jsx(_Fragment, {
             children: labelName || '-'
@@ -450,9 +466,10 @@ export var formatColumn = _ref3 => {
         }
       }
       return createRenderColumn({
-        baseProps: _objectSpread(_objectSpread({}, otherProps), {}, {
+        baseProps: {
+          ...otherProps,
           isChanged
-        }),
+        },
         valueType,
         ellipsis,
         width,
@@ -470,13 +487,15 @@ export var formatColumn = _ref3 => {
   } else if (precision || prefix || suffix) {
     // 精度或前后缀
     column.render = (value, record, index) => {
-      var renderValue = typeof value === 'number' ? value.toFixed(precision) : value;
-      var ctx = getDiffContext(value, record, originalObj, rowKey, dataIndex, isInNewRow);
-      var originalValue = ctx.originalValue,
-        isAddCell = ctx.isAddCell,
-        isInNewRowFlag = ctx.isInNewRowFlag,
-        isChanged = ctx.isChanged;
-      var originalRenderValue = typeof originalValue === 'number' ? originalValue.toFixed(precision) : originalValue;
+      const renderValue = typeof value === 'number' ? value.toFixed(precision) : value;
+      const ctx = getDiffContext(value, record, originalObj, rowKey, dataIndex, isInNewRow);
+      const {
+        originalValue,
+        isAddCell,
+        isInNewRowFlag,
+        isChanged
+      } = ctx;
+      let originalRenderValue = typeof originalValue === 'number' ? originalValue.toFixed(precision) : originalValue;
       if (isEmpty(originalValue)) {
         originalRenderValue = '-';
       }
@@ -489,9 +508,10 @@ export var formatColumn = _ref3 => {
         });
       }
       return createRenderColumn({
-        baseProps: _objectSpread(_objectSpread({}, otherProps), {}, {
+        baseProps: {
+          ...otherProps,
           isChanged
-        }),
+        },
         valueType,
         ellipsis,
         width,
@@ -509,16 +529,17 @@ export var formatColumn = _ref3 => {
   } else if (valueType === 'address') {
     // 地址类型
     column.render = (value, record, index) => {
-      var _realValue$filter;
-      var realValue = transform ? transform(value, record) : value;
-      var ctx = getDiffContext(value, record, originalObj, rowKey, dataIndex, isInNewRow);
-      var originalValue = ctx.originalValue,
-        isAddCell = ctx.isAddCell,
-        isInNewRowFlag = ctx.isInNewRowFlag,
-        isChanged = ctx.isChanged;
-      var originalRealValue = transform ? transform(originalValue, record) : originalValue;
-      var isEmptyValue = !realValue || Array.isArray(realValue) && (realValue === null || realValue === void 0 || (_realValue$filter = realValue.filter(item => !!item)) === null || _realValue$filter === void 0 ? void 0 : _realValue$filter.length) === 0;
-      if (isEqual(value, originalValue) && isEmptyValue) {
+      const realValue = transform ? transform(value, record) : value;
+      const ctx = getDiffContext(value, record, originalObj, rowKey, dataIndex, isInNewRow);
+      const {
+        originalValue,
+        isAddCell,
+        isInNewRowFlag,
+        isChanged
+      } = ctx;
+      const originalRealValue = transform ? transform(originalValue, record) : originalValue;
+      const isEmptyValue = !realValue || Array.isArray(realValue) && realValue?.filter(item => !!item)?.length === 0;
+      if (_isEqual(value, originalValue) && isEmptyValue) {
         return /*#__PURE__*/_jsx("div", {
           style: {
             minWidth
@@ -526,23 +547,23 @@ export var formatColumn = _ref3 => {
           children: "-"
         });
       }
-      var className = classnames({
+      const className = classnames({
         'empty-cell': isEmptyValue
       });
-      var realCode = typeof code === 'function' ? code(value, record) : code;
-      var renderValue = /*#__PURE__*/_jsx(ProCascader, {
+      const realCode = typeof code === 'function' ? code(value, record) : code;
+      const renderValue = /*#__PURE__*/_jsx(ProCascader, {
         isView: true,
         mode: "address",
         code: realCode,
         value: realValue
       });
-      var originalRenderValue = /*#__PURE__*/_jsx(ProCascader, {
+      const originalRenderValue = /*#__PURE__*/_jsx(ProCascader, {
         isView: true,
         mode: "address",
         code: realCode,
         value: originalRealValue
       });
-      var renderNode = /*#__PURE__*/_jsx(ProCascader, {
+      const renderNode = /*#__PURE__*/_jsx(ProCascader, {
         className: className,
         isView: true,
         mode: "address",
@@ -551,9 +572,10 @@ export var formatColumn = _ref3 => {
         tooltip: false
       });
       return createRenderColumn({
-        baseProps: _objectSpread(_objectSpread({}, otherProps), {}, {
+        baseProps: {
+          ...otherProps,
           isChanged
-        }),
+        },
         valueType,
         ellipsis,
         width,
@@ -571,13 +593,14 @@ export var formatColumn = _ref3 => {
   } else if (copyable) {
     // 可复制
     column.render = (value, record, index) => {
-      var isInNewRowFlag = isInNewRow(record);
+      const isInNewRowFlag = isInNewRow(record);
       return /*#__PURE__*/_jsxs(Space, {
         size: 8,
         children: [prefixNode(value, record, index), createRenderColumn({
-          baseProps: _objectSpread(_objectSpread({}, otherProps), {}, {
+          baseProps: {
+            ...otherProps,
             isChanged: false
-          }),
+          },
           valueType,
           ellipsis,
           width,
@@ -597,11 +620,13 @@ export var formatColumn = _ref3 => {
   } else if (ellipsis) {
     // 省略号
     column.render = (value, record, index) => {
-      var ctx = getDiffContext(value, record, originalObj, rowKey, dataIndex, isInNewRow);
-      var originalValue = ctx.originalValue,
-        isAddCell = ctx.isAddCell,
-        isInNewRowFlag = ctx.isInNewRowFlag,
-        isChanged = ctx.isChanged;
+      const ctx = getDiffContext(value, record, originalObj, rowKey, dataIndex, isInNewRow);
+      const {
+        originalValue,
+        isAddCell,
+        isInNewRowFlag,
+        isChanged
+      } = ctx;
       if (!value && value !== 0 && value === originalValue) {
         return /*#__PURE__*/_jsx("div", {
           style: {
@@ -613,9 +638,10 @@ export var formatColumn = _ref3 => {
       return /*#__PURE__*/_jsxs(Space, {
         size: 8,
         children: [prefixNode(value, record, index), createRenderColumn({
-          baseProps: _objectSpread(_objectSpread({}, otherProps), {}, {
+          baseProps: {
+            ...otherProps,
             isChanged
-          }),
+          },
           valueType,
           ellipsis,
           width,
@@ -634,11 +660,13 @@ export var formatColumn = _ref3 => {
   } else {
     // 默认渲染
     column.render = (value, record, index) => {
-      var ctx = getDiffContext(value, record, originalObj, rowKey, dataIndex, isInNewRow);
-      var originalValue = ctx.originalValue,
-        isAddCell = ctx.isAddCell,
-        isInNewRowFlag = ctx.isInNewRowFlag,
-        isChanged = ctx.isChanged;
+      const ctx = getDiffContext(value, record, originalObj, rowKey, dataIndex, isInNewRow);
+      const {
+        originalValue,
+        isAddCell,
+        isInNewRowFlag,
+        isChanged
+      } = ctx;
       if (!value && value !== 0 && value === originalValue) {
         return /*#__PURE__*/_jsx("div", {
           style: {
@@ -648,9 +676,10 @@ export var formatColumn = _ref3 => {
         });
       }
       return createRenderColumn({
-        baseProps: _objectSpread(_objectSpread({}, otherProps), {}, {
+        baseProps: {
+          ...otherProps,
           isChanged
-        }),
+        },
         valueType,
         ellipsis,
         width,
@@ -671,14 +700,12 @@ export var formatColumn = _ref3 => {
 /**
  * 查找最近的父级className
  */
-export var getParentElement = function getParentElement(element, name) {
-  var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'className';
-  var result = /*#__PURE__*/_jsx(_Fragment, {});
+export const getParentElement = (element, name, type = 'className') => {
+  let result = /*#__PURE__*/_jsx(_Fragment, {});
   if (!element || !name) {
     return result;
   }
-  var searchDom = function searchDom(el, searchName) {
-    var searchType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'className';
+  const searchDom = (el, searchName, searchType = 'className') => {
     if (el.parentElement[searchType] === searchName) {
       result = el.parentElement;
       return false;