@zat-design/sisyphus-react 3.1.5 → 3.2.0-beta.1

package/es/ProTable/useAntdTable.d.ts

@@ -14,11 +14,15 @@ declare function useAntdTable<I, R extends Record<string, any>, S extends Servic
         getCheckboxProps: () => {
             className: string;
         };
-        selections: boolean | {
+        selections: boolean | ({
             key: string;
             text: string;
             onSelect: (changeableRowKeys: Key[]) => void;
-        }[];
+        } | {
+            key: string;
+            text: any;
+            onSelect: () => Promise<void>;
+        })[];
     };
     searchValues: I;
     allSelected: boolean;
@@ -56,11 +60,15 @@ declare function useAntdTable<I, R extends Record<string, any>, S extends Servic
             getCheckboxProps: () => {
                 className: string;
             };
-            selections: boolean | {
+            selections: boolean | ({
                 key: string;
                 text: string;
                 onSelect: (changeableRowKeys: Key[]) => void;
-            }[];
+            } | {
+                key: string;
+                text: any;
+                onSelect: () => Promise<void>;
+            })[];
         };
         pagination: {
             current: number;

package/es/ProTable/useAntdTable.js

@@ -12,6 +12,7 @@ import { useRequest, useSetState, useDeepCompareEffect } from 'ahooks';
 import { pickBy } from 'lodash';
 import { defaultPage } from './index';
 import { isListResult } from './utils';
+import locale, { formatMessage } from '../locale';
 var useDefaultOptions = function useDefaultOptions(options) {
   var _useState = useState((options === null || options === void 0 ? void 0 : options.page) || defaultPage),
     _useState2 = _slicedToArray(_useState, 2),
@@ -24,6 +25,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
   });
 };
 function useAntdTable(service, options, useRequestOptions) {
+  var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5;
   var _useSetState = useSetState({
       data: [],
       total: 0,
@@ -104,7 +106,8 @@ function useAntdTable(service, options, useRequestOptions) {
         _ref2$total = _ref2.total,
         total = _ref2$total === void 0 ? 0 : _ref2$total;
       if (list !== null && !Array.isArray(list)) {
-        return _message.error('请返回正确的数据类型');
+        var _locale$ProTable;
+        return _message.error(locale === null || locale === void 0 ? void 0 : (_locale$ProTable = locale.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.transformResponseMsg);
       }
       setState({
         total: total,
@@ -340,7 +343,9 @@ function useAntdTable(service, options, useRequestOptions) {
     },
     selections: rowSelections ? [{
       key: 'currentPage',
-      text: "\u9009\u62E9\u5F53\u524D\u9875(".concat((data === null || data === void 0 ? void 0 : data.length) || 0, "\u6761)"),
+      text: formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTable2 = locale.ProTable) === null || _locale$ProTable2 === void 0 ? void 0 : _locale$ProTable2.selectCurPage, {
+        total: (data === null || data === void 0 ? void 0 : data.length) || 0
+      }),
       onSelect: function onSelect(changeableRowKeys) {
         setState({
           allSelected: false,
@@ -350,7 +355,9 @@ function useAntdTable(service, options, useRequestOptions) {
       }
     }, {
       key: 'all',
-      text: "\u9009\u62E9\u5168\u90E8(".concat(total, "\u6761)"),
+      text: formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTable3 = locale.ProTable) === null || _locale$ProTable3 === void 0 ? void 0 : _locale$ProTable3.selectAll, {
+        total: total
+      }),
       onSelect: function () {
         var _onSelect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(changeableRowKeys) {
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -374,7 +381,7 @@ function useAntdTable(service, options, useRequestOptions) {
       }()
     }, {
       key: 'uncheckAll',
-      text: '取消选择',
+      text: locale === null || locale === void 0 ? void 0 : (_locale$ProTable4 = locale.ProTable) === null || _locale$ProTable4 === void 0 ? void 0 : _locale$ProTable4.deselect,
       onSelect: function () {
         var _onSelect2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
@@ -398,7 +405,9 @@ function useAntdTable(service, options, useRequestOptions) {
       }()
     }] : false
   };
-  var selectedTip = allSelected || selectedRowKeys.length ? "\u5DF2\u9009 ".concat(allSelected ? total : selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length, " \u6761\u6570\u636E") : null;
+  var selectedTip = allSelected || selectedRowKeys.length ? formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTable5 = locale.ProTable) === null || _locale$ProTable5 === void 0 ? void 0 : _locale$ProTable5.selectAll, {
+    selectedNum: allSelected ? total : selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length
+  }) : null;
   var pagination = {
     current: page.pageNum,
     pageSize: page.pageSize,
@@ -407,8 +416,11 @@ function useAntdTable(service, options, useRequestOptions) {
     onPaginationChange: true,
     total: total,
     showTotal: function showTotal(total) {
+      var _locale$ProTable6;
       if (!total) return;
-      return "\u5171".concat(total, "\u6761");
+      return formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTable6 = locale.ProTable) === null || _locale$ProTable6 === void 0 ? void 0 : _locale$ProTable6.total, {
+        total: total
+      });
     },
     onShowSizeChange: handlePageChange,
     onChange: handlePageChange

package/es/ProTable/utils.d.ts

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

package/es/ProTable/utils.js

@@ -1,24 +1,28 @@
 import "antd/es/space/style";
 import _Space from "antd/es/space";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /* eslint-disable react-hooks/rules-of-hooks */
 import { isValidElement } from 'react';
 import moment from 'moment';
-import { isFunction, isString } from 'lodash';
+import { get, isEqual, isFunction, isString } from 'lodash';
 import { tools } from '@zat-design/utils';
+import classnames from 'classnames';
 import getEnumLabel from '../ProEnum/utils/getEnumLabel';
 import TooltipTitle from './components/TooltipTitle';
 import RenderColumn from './components/RenderColumn';
+import ProForm from '../ProForm';
 /**
  * 获取小数点后的位数
  * @param num 数字
  * @returns 位数
  */
-var getDecimalDigits = function getDecimalDigits(num) {
-  var match = num.toString().match(/\.(\d+)/);
+var getDecimalDigits = function getDecimalDigits() {
+  var num = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  var match = Number(num).toString().match(/\.(\d+)/);
   return match ? match[1].length : 0;
 };
-export var formatColumn = function formatColumn(column) {
+export var formatColumn = function formatColumn(column, originalDataSource) {
   var title = column.title,
     valueType = column.valueType,
     _column$format = column.format,
@@ -32,16 +36,10 @@ export var formatColumn = function formatColumn(column) {
     tooltip = column.tooltip,
     transform = column.transform,
     prefix = column.prefix,
-    suffix = column.suffix;
-  if (column === null || column === void 0 ? void 0 : column.render) {
-    return;
-  }
-  if (tooltip) {
-    column.title = _jsx(TooltipTitle, {
-      title: title,
-      tooltip: tooltip
-    });
-  }
+    suffix = column.suffix,
+    dataIndex = column.dataIndex,
+    _column$originalTip = column.originalTip,
+    originalTip = _column$originalTip === void 0 ? true : _column$originalTip;
   // 前缀处理
   var prefixNode = function prefixNode(value, record, index) {
     if (!prefix) {
@@ -66,211 +64,270 @@ export var formatColumn = function formatColumn(column) {
       return suffix(value, record, index);
     }
   };
+  if (column === null || column === void 0 ? void 0 : column.render) {
+    return;
+  }
+  if (tooltip) {
+    column.title = _jsx(TooltipTitle, {
+      title: title,
+      tooltip: tooltip
+    });
+  }
+  if (ellipsis) {
+    column.ellipsis = false;
+  }
   var valueTypePrecision = precision;
   if (['percentage', 'permillage', 'thousandth', 'thousandthCNY'].includes(valueType)) {
     valueTypePrecision = precision || 2;
   }
-  switch (valueType) {
-    case 'percentage':
-      // 百分比
-      column.render = function (value) {
-        if (!value && value !== 0) {
-          return '-';
-        }
-        var renderValue = tools.calc(Number(value), '*', 100);
-        // 获取真实数据的小数位数
-        var decimalDigits = getDecimalDigits(value);
-        if (decimalDigits > valueTypePrecision) {
-          return renderValue;
-        }
-        return renderValue.toFixed(valueTypePrecision);
-      };
-      break;
-    case 'permillage':
-      // 千分比
-      column.render = function (value) {
-        if (!value && value !== 0) {
-          return '-';
-        }
-        var renderValue = tools.calc(Number(value), '*', 1000);
-        // 获取真实数据的小数位数
-        var decimalDigits = getDecimalDigits(value);
-        if (decimalDigits > valueTypePrecision) {
-          return renderValue;
-        }
-        return renderValue.toFixed(valueTypePrecision);
-      };
-      break;
-    case 'thousandth':
-      // 千分位
-      column.render = function (value, record, index) {
-        if (!value && value !== 0) {
-          return '-';
-        }
-        if (valueTypePrecision) {
-          return _jsxs(_Space, {
-            size: 8,
-            children: [prefixNode(value, record, index), "".concat(Number(value).toFixed(valueTypePrecision)).replace(/\B(?=(\d{3})+(?!\d))/g, ','), suffixNode(value, record, index)]
-          });
-        }
-        return _jsxs(_Space, {
-          size: 8,
-          children: [prefixNode(value, record, index), "".concat(value).replace(/\B(?=(\d{3})+(?!\d))/g, ','), suffixNode(value, record, index)]
-        });
-      };
-      break;
-    case 'thousandthCNY':
-      // 千分位
-      column.render = function (value, record, index) {
-        if (!value && value !== 0) {
-          return '-';
-        }
-        if (valueTypePrecision) {
-          return _jsxs(_Space, {
-            size: 8,
-            children: [prefixNode(value, record, index), "".concat(Number(value).toFixed(valueTypePrecision), "\n              ").replace(/\B(?=(\d{3})+(?!\d))/g, ','), suffixNode(value, record, index)]
-          });
-        }
-        return _jsxs(_Space, {
-          size: 8,
-          children: [prefixNode(value, record, index), "".concat(prefixNode(value, record, index), " ").concat(value).replace(/\B(?=(\d{3})+(?!\d))/g, ','), suffixNode(value, record, index)]
-        });
-      };
-      break;
-    case 'datePicker':
-      // 日期
-      column.render = function (value, record, index) {
-        var _moment;
-        if (!value) {
-          return '-';
-        }
-        return _jsxs(_Space, {
-          size: 8,
-          children: [prefixNode(value, record, index), (_moment = moment(value)) === null || _moment === void 0 ? void 0 : _moment.format(format), suffixNode(value, record, index)]
-        });
-      };
-      break;
-    case 'date':
-      // 日期：YYYY-MM-DD
-      column.render = function (value, record, index) {
-        var _moment2;
-        if (!value) {
-          return '-';
-        }
-        return _jsxs(_Space, {
-          size: 8,
-          children: [prefixNode(value, record, index), (_moment2 = moment(value)) === null || _moment2 === void 0 ? void 0 : _moment2.format('YYYY-MM-DD'), suffixNode(value, record, index)]
-        });
-      };
-      break;
-    case 'dateTime':
-      // 日期：YYYY-MM-DD HH:mm:ss
-      column.render = function (value, record, index) {
-        var _moment3;
-        if (!value) {
-          return '-';
-        }
-        return _jsxs(_Space, {
-          size: 8,
-          children: [prefixNode(value, record, index), (_moment3 = moment(value)) === null || _moment3 === void 0 ? void 0 : _moment3.format('YYYY-MM-DD HH:mm:ss'), suffixNode(value, record, index)]
-        });
-      };
-      break;
-    case 'dateStartTime':
-      // 日期：YYYY-MM-DD 00:00:00
-      column.render = function (value, record, index) {
-        var _moment4;
-        if (!value) {
-          return '-';
-        }
-        return _jsxs(_Space, {
-          size: 8,
-          children: [prefixNode(value, record, index), "".concat((_moment4 = moment(value)) === null || _moment4 === void 0 ? void 0 : _moment4.format('YYYY-MM-DD'), " 00:00:00"), suffixNode(value, record, index)]
-        });
-      };
-      break;
-    case 'dateEndTime':
-      // 日期：YYYY-MM-DD 23:59:59
-      column.render = function (value, record, index) {
-        var _moment5;
-        if (!value) {
-          return '-';
-        }
-        return _jsxs(_Space, {
-          size: 8,
-          children: [prefixNode(value, record, index), "".concat((_moment5 = moment(value)) === null || _moment5 === void 0 ? void 0 : _moment5.format('YYYY-MM-DD'), " 23:59:59"), suffixNode(value, record, index)]
-        });
-      };
-      break;
-    case 'dateStartEndTime':
-      // 日期：YYYY-MM-DD 00:00:00~YYYY-MM-DD 23:59:59
-      column.render = function (value, record, index) {
-        var _moment6, _moment7;
-        if (!Array.isArray(value)) {
-          return '-';
-        }
-        return _jsxs(_Space, {
-          size: 8,
-          children: [prefixNode(value, record, index), "".concat((_moment6 = moment(value === null || value === void 0 ? void 0 : value[0])) === null || _moment6 === void 0 ? void 0 : _moment6.format('YYYY-MM-DD'), " 00:00:00~").concat((_moment7 = moment(value === null || value === void 0 ? void 0 : value[1])) === null || _moment7 === void 0 ? void 0 : _moment7.format('YYYY-MM-DD'), " 23:59:59"), suffixNode(value, record, index)]
-        });
-      };
-      break;
-    case 'enumName':
-      // 枚举-展示name
-      column.render = function (value, record, index) {
-        return _jsxs(_Space, {
-          size: 8,
-          children: [prefixNode(value, record, index), getEnumLabel(typeof code === 'function' ? code() : code, value), suffixNode(value, record, index)]
-        });
-      };
-      break;
-    case 'enumCodeName':
-      // 枚举-展示code-name
-      column.render = function (value, record, index) {
-        return _jsxs(_Space, {
-          size: 8,
-          children: [prefixNode(value, record, index), getEnumLabel(typeof code === 'function' ? code() : code, value, true), suffixNode(value, record, index)]
-        });
-      };
-      break;
-    default:
-      if (precision) {
-        column.render = function (value, record, index) {
-          return _jsxs(_Space, {
-            size: 8,
-            children: [prefixNode(value, record, index), typeof value === 'number' ? value.toFixed(precision) : value, suffixNode(value, record, index)]
-          });
-        };
+  // 百分比、千分比
+  if (['percentage', 'permillage'].includes(valueType)) {
+    column.render = function (value, record, index) {
+      var multiple = valueType === 'percentage' ? 100 : 1000;
+      var realValue = tools.calc(Number(value), '*', multiple);
+      var renderValue = getDecimalDigits(value) > valueTypePrecision ? realValue : realValue.toFixed(valueTypePrecision);
+      var originalValue = get(originalDataSource, Array.isArray(dataIndex) ? [index].concat(_toConsumableArray(dataIndex)) : [index, dataIndex]);
+      var originalRealValue = tools.calc(Number(originalValue || null), '*', multiple);
+      var originalRenderValue = getDecimalDigits(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
+      if (!originalValue && originalValue !== 0) {
+        originalRenderValue = '-';
       }
-      if (prefix || suffix) {
-        column.render = function (value, record, index) {
-          return value ? _jsxs(_Space, {
-            size: 8,
-            children: [prefixNode(value, record, index), value, suffixNode(value, record, index)]
-          }) : '-';
-        };
+      if (!value && value !== 0 && renderValue === originalRenderValue) {
+        return '-';
       }
-      break;
-  }
-  if (ellipsis) {
-    column.ellipsis = false;
-  }
-  if (valueType === 'address' || copyable || ellipsis) {
+      return _jsx(RenderColumn, {
+        valueType: valueType,
+        originalValue: !originalDataSource || renderValue === originalRenderValue ? undefined : originalRenderValue,
+        ellipsis: ellipsis,
+        width: width,
+        node: renderValue,
+        value: value,
+        currentValue: renderValue,
+        originalTip: originalTip
+      });
+    };
+    // 千分位, 千分位带CNY前缀
+  } else if (['thousandth', 'thousandthCNY'].includes(valueType)) {
+    column.render = function (value, record, index) {
+      var valueStr = valueTypePrecision ? "".concat(Number(value).toFixed(valueTypePrecision)) : "".concat(value);
+      var renderValue = valueStr.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+      var originalValue = get(originalDataSource, Array.isArray(dataIndex) ? [index].concat(_toConsumableArray(dataIndex)) : [index, dataIndex]);
+      var originalRealValue = valueTypePrecision ? "".concat(Number(originalValue).toFixed(valueTypePrecision)) : "".concat(originalValue);
+      var originalRenderValue = originalRealValue.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+      if (!originalValue && originalValue !== 0) {
+        originalRenderValue = '-';
+      }
+      var node = _jsxs(_Space, {
+        size: 8,
+        children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
+      });
+      if (!value && value !== 0 && renderValue === originalRenderValue) {
+        return '-';
+      }
+      return _jsx(RenderColumn, {
+        valueType: valueType,
+        originalValue: !originalDataSource || renderValue === originalRenderValue ? undefined : originalRenderValue,
+        ellipsis: ellipsis,
+        width: width,
+        node: node,
+        value: value,
+        currentValue: renderValue,
+        originalTip: originalTip
+      });
+    };
+  } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
+    column.render = function (value, record, index) {
+      var _moment, _moment2, _moment3, _moment4, _moment5, _moment6, _moment7, _moment8, _moment9, _moment10, _moment11, _moment12, _moment13, _moment14;
+      var renderValue = (_moment = moment(value)) === null || _moment === void 0 ? void 0 : _moment.format(format);
+      var originalValue = get(originalDataSource, Array.isArray(dataIndex) ? [index].concat(_toConsumableArray(dataIndex)) : [index, dataIndex]);
+      var originalRenderValue = (_moment2 = moment(originalValue)) === null || _moment2 === void 0 ? void 0 : _moment2.format(format);
+      switch (valueType) {
+        case 'date':
+          renderValue = (_moment3 = moment(value)) === null || _moment3 === void 0 ? void 0 : _moment3.format('YYYY-MM-DD');
+          originalRenderValue = (_moment4 = moment(originalValue)) === null || _moment4 === void 0 ? void 0 : _moment4.format('YYYY-MM-DD');
+          break;
+        case 'dateTime':
+          renderValue = (_moment5 = moment(value)) === null || _moment5 === void 0 ? void 0 : _moment5.format('YYYY-MM-DD HH:mm:ss');
+          originalRenderValue = (_moment6 = moment(originalValue)) === null || _moment6 === void 0 ? void 0 : _moment6.format('YYYY-MM-DD HH:mm:ss');
+          break;
+        case 'dateStartTime':
+          renderValue = "".concat((_moment7 = moment(value)) === null || _moment7 === void 0 ? void 0 : _moment7.format('YYYY-MM-DD'), " 00:00:00");
+          originalRenderValue = "".concat((_moment8 = moment(originalValue)) === null || _moment8 === void 0 ? void 0 : _moment8.format('YYYY-MM-DD'), " 00:00:00");
+          break;
+        case 'dateEndTime':
+          renderValue = "".concat((_moment9 = moment(value)) === null || _moment9 === void 0 ? void 0 : _moment9.format('YYYY-MM-DD'), " 23:59:59");
+          originalRenderValue = "".concat((_moment10 = moment(originalValue)) === null || _moment10 === void 0 ? void 0 : _moment10.format('YYYY-MM-DD'), " 23:59:59");
+          break;
+        case 'dateStartEndTime':
+          renderValue = "".concat((_moment11 = moment(value === null || value === void 0 ? void 0 : value[0])) === null || _moment11 === void 0 ? void 0 : _moment11.format('YYYY-MM-DD'), " 00:00:00~").concat((_moment12 = moment(value === null || value === void 0 ? void 0 : value[1])) === null || _moment12 === void 0 ? void 0 : _moment12.format('YYYY-MM-DD'), " 23:59:59");
+          originalRenderValue = "".concat((_moment13 = moment(originalValue === null || originalValue === void 0 ? void 0 : originalValue[0])) === null || _moment13 === void 0 ? void 0 : _moment13.format('YYYY-MM-DD'), " 00:00:00~").concat((_moment14 = moment(originalValue === null || originalValue === void 0 ? void 0 : originalValue[1])) === null || _moment14 === void 0 ? void 0 : _moment14.format('YYYY-MM-DD'), " 23:59:59");
+          break;
+      }
+      if (!value) {
+        renderValue = '-';
+      }
+      if (!originalValue) {
+        originalRenderValue = '-';
+      }
+      var node = _jsxs(_Space, {
+        size: 8,
+        children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
+      });
+      if (!value && renderValue === originalRenderValue) {
+        return '-';
+      }
+      return _jsx(RenderColumn, {
+        valueType: valueType,
+        originalValue: !originalDataSource || renderValue === originalRenderValue ? undefined : originalRenderValue,
+        ellipsis: ellipsis,
+        width: width,
+        node: node,
+        value: value,
+        currentValue: renderValue,
+        originalTip: originalTip
+      });
+    };
+  } else if (['enumName', 'enumCodeName'].includes(valueType)) {
+    column.render = function (value, record, index) {
+      var realCode = typeof code === 'function' ? code() : code;
+      var renderValue = getEnumLabel(realCode, value, valueType === 'enumCodeName');
+      var originalValue = get(originalDataSource, Array.isArray(dataIndex) ? [index].concat(_toConsumableArray(dataIndex)) : [index, dataIndex]);
+      var originalRenderValue = getEnumLabel(realCode, originalValue, valueType === 'enumCodeName');
+      var node = _jsxs(_Space, {
+        size: 8,
+        children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
+      });
+      return _jsx(RenderColumn, {
+        valueType: valueType,
+        originalValue: !originalDataSource || value === originalValue ? undefined : originalRenderValue,
+        ellipsis: ellipsis,
+        width: width,
+        node: node,
+        value: value,
+        currentValue: renderValue,
+        originalTip: originalTip
+      });
+    };
+  } else if (precision || prefix || suffix) {
+    column.render = function (value, record, index) {
+      var renderValue = value === 'number' ? value.toFixed(precision) : value;
+      var originalValue = get(originalDataSource, Array.isArray(dataIndex) ? [index].concat(_toConsumableArray(dataIndex)) : [index, dataIndex]);
+      var originalRenderValue = originalValue === 'number' ? originalValue.toFixed(precision) : originalValue;
+      var node = _jsxs(_Space, {
+        size: 8,
+        children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
+      });
+      if (!originalValue && originalValue !== 0) {
+        originalRenderValue = '-';
+      }
+      if (!value && value !== 0 && renderValue === originalRenderValue) {
+        return '-';
+      }
+      return _jsx(RenderColumn, {
+        valueType: valueType,
+        originalValue: !originalDataSource || renderValue === originalRenderValue ? undefined : originalRenderValue,
+        ellipsis: ellipsis,
+        width: width,
+        node: node,
+        value: value,
+        currentValue: renderValue,
+        originalTip: originalTip
+      });
+    };
+  } else if (valueType === 'address') {
+    column.render = function (value, record, index) {
+      var _realValue$filter;
+      var realValue = transform ? transform(value, record) : value;
+      var originalValue = get(originalDataSource, Array.isArray(dataIndex) ? [index].concat(_toConsumableArray(dataIndex)) : [index, dataIndex]);
+      var 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;
+      })) === null || _realValue$filter === void 0 ? void 0 : _realValue$filter.length) === 0;
+      if (isEqual(value, originalValue) && isEmpty) {
+        return '-';
+      }
+      var className = classnames({
+        'varied-cell': originalDataSource && !isEqual(value, originalValue),
+        'empty-cell': isEmpty
+      });
+      var renderValue = _jsx(ProForm.ProAddressBar, {
+        isView: true,
+        code: code,
+        value: realValue
+      });
+      var originalRenderValue = _jsx(ProForm.ProAddressBar, {
+        isView: true,
+        code: code,
+        value: originalRealValue
+      });
+      return _jsx(ProForm.ProAddressBar, {
+        className: className,
+        isView: true,
+        code: code,
+        value: realValue,
+        tooltip: originalDataSource && !isEqual(value, originalValue) ? _jsxs(_Fragment, {
+          children: ["\u521D\u59CB\u503C\uFF1A", originalRenderValue, _jsx("br", {}), ellipsis ? _jsxs(_Fragment, {
+            children: ["\u5F53\u524D\u503C\uFF1A", renderValue]
+          }) : undefined]
+        }) : ellipsis
+      });
+    };
+  } else if (copyable) {
     column.render = function (value, record, index) {
       return _jsxs(_Space, {
         size: 8,
         children: [prefixNode(value, record, index), _jsx(RenderColumn, {
           valueType: valueType,
-          code: code,
           copyable: copyable,
           ellipsis: ellipsis,
           width: width,
-          transform: transform,
+          node: value,
+          value: value,
+          currentValue: value
+        }), suffixNode(value, record, index)]
+      });
+    };
+  } else if (ellipsis) {
+    column.render = function (value, record, index) {
+      var originalValue = get(originalDataSource, Array.isArray(dataIndex) ? [index].concat(_toConsumableArray(dataIndex)) : [index, dataIndex]);
+      if (!value && value !== 0 && value === originalValue) {
+        return '-';
+      }
+      return _jsxs(_Space, {
+        size: 8,
+        children: [prefixNode(value, record, index), _jsx(RenderColumn, {
+          valueType: valueType,
+          originalValue: !originalDataSource || value === originalValue ? undefined : originalValue || '-',
+          ellipsis: ellipsis,
+          width: width,
+          node: value,
           value: value,
-          record: record
+          currentValue: value || '-',
+          originalTip: originalTip
         }), suffixNode(value, record, index)]
       });
     };
+  } else {
+    column.render = function (value, record, index) {
+      var originalValue = get(originalDataSource, Array.isArray(dataIndex) ? [index].concat(_toConsumableArray(dataIndex)) : [index, dataIndex]);
+      var node = _jsxs(_Space, {
+        size: 8,
+        children: [prefixNode(value, record, index), value, suffixNode(value, record, index)]
+      });
+      if (!value && value !== 0 && value === originalValue) {
+        return '-';
+      }
+      return _jsx(RenderColumn, {
+        valueType: valueType,
+        originalValue: !originalDataSource || value === originalValue ? undefined : originalValue || '-',
+        ellipsis: ellipsis,
+        width: width,
+        node: node,
+        value: value,
+        currentValue: value || '-',
+        originalTip: originalTip
+      });
+    };
   }
 };
 export var getColumnDataIndex = function getColumnDataIndex(dataIndex) {

package/es/ProTabs/style/index.less

@@ -43,7 +43,7 @@
       text-shadow: none;
 
       .pro-tabs-card-left-total {
-        font-size  : 26px;
+        font-size  : var(--zaui-font-size-lg-title, 24px);
         font-weight: 600;
         color      : var(--zaui-text, #343434);
       }

package/es/ProThemeTools/component/PrdTools/index.js

@@ -54,7 +54,7 @@ var PrdTools = function PrdTools(_ref) {
         activeItem.active = false;
         return {
           color: activeItem.color,
-          active: activeItem.color === zauiBrand
+          active: activeItem.color === zauiBrand.toLocaleUpperCase()
         };
       });
       setActive(newArray);