@zat-design/sisyphus-react 3.1.4 → 3.1.5-beta.10

package/lib/ProTable/utils.js

@@ -5,15 +5,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isListResult = exports.getParentElement = exports.getColumnDataIndex = exports.formatColumn = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
-var _moment8 = _interopRequireDefault(require("moment"));
+var _moment15 = _interopRequireDefault(require("moment"));
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _utils = require("@zat-design/utils");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _getEnumLabel = _interopRequireDefault(require("../ProEnum/utils/getEnumLabel"));
 var _TooltipTitle = _interopRequireDefault(require("./components/TooltipTitle"));
 var _RenderColumn = _interopRequireDefault(require("./components/RenderColumn"));
+var _ProForm = _interopRequireDefault(require("../ProForm"));
 /* eslint-disable react-hooks/rules-of-hooks */
 
 /**
@@ -21,11 +24,12 @@ var _RenderColumn = _interopRequireDefault(require("./components/RenderColumn"))
  * @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;
 };
-var formatColumn = exports.formatColumn = function formatColumn(column) {
+var formatColumn = exports.formatColumn = function formatColumn(column, originalDataSource) {
   var title = column.title,
     valueType = column.valueType,
     _column$format = column.format,
@@ -39,16 +43,10 @@ var formatColumn = exports.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 = (0, _jsxRuntime.jsx)(_TooltipTitle.default, {
-      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) {
@@ -73,211 +71,270 @@ var formatColumn = exports.formatColumn = function formatColumn(column) {
       return suffix(value, record, index);
     }
   };
+  if (column === null || column === void 0 ? void 0 : column.render) {
+    return;
+  }
+  if (tooltip) {
+    column.title = (0, _jsxRuntime.jsx)(_TooltipTitle.default, {
+      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 = _utils.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 = _utils.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 (0, _jsxRuntime.jsxs)(_antd.Space, {
-            size: 8,
-            children: [prefixNode(value, record, index), "".concat(Number(value).toFixed(valueTypePrecision)).replace(/\B(?=(\d{3})+(?!\d))/g, ','), suffixNode(value, record, index)]
-          });
-        }
-        return (0, _jsxRuntime.jsxs)(_antd.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 (0, _jsxRuntime.jsxs)(_antd.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 (0, _jsxRuntime.jsxs)(_antd.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 (0, _jsxRuntime.jsxs)(_antd.Space, {
-          size: 8,
-          children: [prefixNode(value, record, index), (_moment = (0, _moment8.default)(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 (0, _jsxRuntime.jsxs)(_antd.Space, {
-          size: 8,
-          children: [prefixNode(value, record, index), (_moment2 = (0, _moment8.default)(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 (0, _jsxRuntime.jsxs)(_antd.Space, {
-          size: 8,
-          children: [prefixNode(value, record, index), (_moment3 = (0, _moment8.default)(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 (0, _jsxRuntime.jsxs)(_antd.Space, {
-          size: 8,
-          children: [prefixNode(value, record, index), "".concat((_moment4 = (0, _moment8.default)(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 (0, _jsxRuntime.jsxs)(_antd.Space, {
-          size: 8,
-          children: [prefixNode(value, record, index), "".concat((_moment5 = (0, _moment8.default)(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 (0, _jsxRuntime.jsxs)(_antd.Space, {
-          size: 8,
-          children: [prefixNode(value, record, index), "".concat((_moment6 = (0, _moment8.default)(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 = (0, _moment8.default)(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 (0, _jsxRuntime.jsxs)(_antd.Space, {
-          size: 8,
-          children: [prefixNode(value, record, index), (0, _getEnumLabel.default)(typeof code === 'function' ? code() : code, value), suffixNode(value, record, index)]
-        });
-      };
-      break;
-    case 'enumCodeName':
-      // 枚举-展示code-name
-      column.render = function (value, record, index) {
-        return (0, _jsxRuntime.jsxs)(_antd.Space, {
-          size: 8,
-          children: [prefixNode(value, record, index), (0, _getEnumLabel.default)(typeof code === 'function' ? code() : code, value, true), suffixNode(value, record, index)]
-        });
-      };
-      break;
-    default:
-      if (precision) {
-        column.render = function (value, record, index) {
-          return (0, _jsxRuntime.jsxs)(_antd.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 = _utils.tools.calc(Number(value), '*', multiple);
+      var renderValue = getDecimalDigits(value) > valueTypePrecision ? realValue : realValue.toFixed(valueTypePrecision);
+      var originalValue = (0, _lodash.get)(originalDataSource, Array.isArray(dataIndex) ? [index].concat((0, _toConsumableArray2.default)(dataIndex)) : [index, dataIndex]);
+      var originalRealValue = _utils.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 ? (0, _jsxRuntime.jsxs)(_antd.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 (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+        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 = (0, _lodash.get)(originalDataSource, Array.isArray(dataIndex) ? [index].concat((0, _toConsumableArray2.default)(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 = (0, _jsxRuntime.jsxs)(_antd.Space, {
+        size: 8,
+        children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
+      });
+      if (!value && value !== 0 && renderValue === originalRenderValue) {
+        return '-';
+      }
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+        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 = (0, _moment15.default)(value)) === null || _moment === void 0 ? void 0 : _moment.format(format);
+      var originalValue = (0, _lodash.get)(originalDataSource, Array.isArray(dataIndex) ? [index].concat((0, _toConsumableArray2.default)(dataIndex)) : [index, dataIndex]);
+      var originalRenderValue = (_moment2 = (0, _moment15.default)(originalValue)) === null || _moment2 === void 0 ? void 0 : _moment2.format(format);
+      switch (valueType) {
+        case 'date':
+          renderValue = (_moment3 = (0, _moment15.default)(value)) === null || _moment3 === void 0 ? void 0 : _moment3.format('YYYY-MM-DD');
+          originalRenderValue = (_moment4 = (0, _moment15.default)(originalValue)) === null || _moment4 === void 0 ? void 0 : _moment4.format('YYYY-MM-DD');
+          break;
+        case 'dateTime':
+          renderValue = (_moment5 = (0, _moment15.default)(value)) === null || _moment5 === void 0 ? void 0 : _moment5.format('YYYY-MM-DD HH:mm:ss');
+          originalRenderValue = (_moment6 = (0, _moment15.default)(originalValue)) === null || _moment6 === void 0 ? void 0 : _moment6.format('YYYY-MM-DD HH:mm:ss');
+          break;
+        case 'dateStartTime':
+          renderValue = "".concat((_moment7 = (0, _moment15.default)(value)) === null || _moment7 === void 0 ? void 0 : _moment7.format('YYYY-MM-DD'), " 00:00:00");
+          originalRenderValue = "".concat((_moment8 = (0, _moment15.default)(originalValue)) === null || _moment8 === void 0 ? void 0 : _moment8.format('YYYY-MM-DD'), " 00:00:00");
+          break;
+        case 'dateEndTime':
+          renderValue = "".concat((_moment9 = (0, _moment15.default)(value)) === null || _moment9 === void 0 ? void 0 : _moment9.format('YYYY-MM-DD'), " 23:59:59");
+          originalRenderValue = "".concat((_moment10 = (0, _moment15.default)(originalValue)) === null || _moment10 === void 0 ? void 0 : _moment10.format('YYYY-MM-DD'), " 23:59:59");
+          break;
+        case 'dateStartEndTime':
+          renderValue = "".concat((_moment11 = (0, _moment15.default)(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 = (0, _moment15.default)(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 = (0, _moment15.default)(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 = (0, _moment15.default)(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 = (0, _jsxRuntime.jsxs)(_antd.Space, {
+        size: 8,
+        children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
+      });
+      if (!value && renderValue === originalRenderValue) {
+        return '-';
+      }
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+        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 = (0, _getEnumLabel.default)(realCode, value, valueType === 'enumCodeName');
+      var originalValue = (0, _lodash.get)(originalDataSource, Array.isArray(dataIndex) ? [index].concat((0, _toConsumableArray2.default)(dataIndex)) : [index, dataIndex]);
+      var originalRenderValue = (0, _getEnumLabel.default)(realCode, originalValue, valueType === 'enumCodeName');
+      var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
+        size: 8,
+        children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
+      });
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+        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 = (0, _lodash.get)(originalDataSource, Array.isArray(dataIndex) ? [index].concat((0, _toConsumableArray2.default)(dataIndex)) : [index, dataIndex]);
+      var originalRenderValue = originalValue === 'number' ? originalValue.toFixed(precision) : originalValue;
+      var node = (0, _jsxRuntime.jsxs)(_antd.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 (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+        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 = (0, _lodash.get)(originalDataSource, Array.isArray(dataIndex) ? [index].concat((0, _toConsumableArray2.default)(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 ((0, _lodash.isEqual)(value, originalValue) && isEmpty) {
+        return '-';
+      }
+      var className = (0, _classnames.default)({
+        'varied-cell': originalDataSource && !(0, _lodash.isEqual)(value, originalValue),
+        'empty-cell': isEmpty
+      });
+      var renderValue = (0, _jsxRuntime.jsx)(_ProForm.default.ProAddressBar, {
+        isView: true,
+        code: code,
+        value: realValue
+      });
+      var originalRenderValue = (0, _jsxRuntime.jsx)(_ProForm.default.ProAddressBar, {
+        isView: true,
+        code: code,
+        value: originalRealValue
+      });
+      return (0, _jsxRuntime.jsx)(_ProForm.default.ProAddressBar, {
+        className: className,
+        isView: true,
+        code: code,
+        value: realValue,
+        tooltip: originalDataSource && !(0, _lodash.isEqual)(value, originalValue) ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+          children: ["\u521D\u59CB\u503C\uFF1A", originalRenderValue, (0, _jsxRuntime.jsx)("br", {}), ellipsis ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+            children: ["\u5F53\u524D\u503C\uFF1A", renderValue]
+          }) : undefined]
+        }) : ellipsis
+      });
+    };
+  } else if (copyable) {
     column.render = function (value, record, index) {
       return (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, {
           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 = (0, _lodash.get)(originalDataSource, Array.isArray(dataIndex) ? [index].concat((0, _toConsumableArray2.default)(dataIndex)) : [index, dataIndex]);
+      if (!value && value !== 0 && value === originalValue) {
+        return '-';
+      }
+      return (0, _jsxRuntime.jsxs)(_antd.Space, {
+        size: 8,
+        children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+          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 = (0, _lodash.get)(originalDataSource, Array.isArray(dataIndex) ? [index].concat((0, _toConsumableArray2.default)(dataIndex)) : [index, dataIndex]);
+      var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
+        size: 8,
+        children: [prefixNode(value, record, index), value, suffixNode(value, record, index)]
+      });
+      if (!value && value !== 0 && value === originalValue) {
+        return '-';
+      }
+      return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
+        valueType: valueType,
+        originalValue: !originalDataSource || value === originalValue ? undefined : originalValue || '-',
+        ellipsis: ellipsis,
+        width: width,
+        node: node,
+        value: value,
+        currentValue: value || '-',
+        originalTip: originalTip
+      });
+    };
   }
 };
 var getColumnDataIndex = exports.getColumnDataIndex = function getColumnDataIndex(dataIndex) {

package/lib/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/lib/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);

package/lib/ProThemeTools/component/PrdTools/style/index.less

@@ -29,7 +29,7 @@
       width        : 4px;
       height       : 14px;
       background   : var(--zaui-brand, #006aff);
-      border-radius: 2px;
+      border-radius: var(zaui-border-radius-card, 2px);
     }
   }
 
@@ -49,7 +49,7 @@
       margin-right   : 34px;
 
       span {
-        font-size     : 14px;
+        font-size     : var(--zaui-font-size, 14px);
         vertical-align: -7px;
       }
 
@@ -145,7 +145,7 @@
       left     : 4px;
       z-index  : 1;
       color    : var(--zaui-text, #343434);
-      font-size: 16px;
+      font-size: var(--zaui-font-size-lg, 16px);
       transform: translateZ(100px);
 
       &:hover {

package/lib/ProThemeTools/index.d.ts

@@ -1,11 +1,11 @@
 import type { ProThemeToolsProps } from './propsType';
 declare const ProThemeTools: {
-    ({ size, className, cacheTime, color, mode, theme, tableBorder, tableStripe, ...props }: ProThemeToolsProps): JSX.Element;
+    ({ size, className, cacheTime, color, mode, iconFollowTheme, tableBorder, tableStripe, theme, ...props }: ProThemeToolsProps): JSX.Element;
     defaultProps: {
         size: number;
         mode: string;
         color: string;
-        theme: boolean;
+        iconFollowTheme: boolean;
         cacheTime: boolean;
     };
     setThemes: (themes: import("./utils/index").ThemesProps, themeMapping?: import("./utils/index").ThemesProps) => boolean;