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

package/es/ProForm/utils/useShouldUpdate.js

@@ -4,16 +4,16 @@ import { useRef, useState } from 'react';
 import { isFunction, isEqualWith } from 'lodash';
 import { customEqualForFun } from './index';
 // 代理shouldUpdate事件, 执行函数值的[show, disabled], 当[show, disabled]与上一次值不相同时更新状态
-var useShouldUpdate = function useShouldUpdate(_ref) {
-  var show = _ref.show,
-    formItemProps = _ref.formItemProps,
-    form = _ref.form,
-    disabled = _ref.disabled,
-    rules = _ref.rules,
-    required = _ref.required,
-    fieldProps = _ref.fieldProps,
-    component = _ref.component,
-    originComponent = _ref.originComponent;
+var useShouldUpdate = function useShouldUpdate(props) {
+  var show = props.show,
+    formItemProps = props.formItemProps,
+    form = props.form,
+    disabled = props.disabled,
+    rules = props.rules,
+    required = props.required,
+    fieldProps = props.fieldProps,
+    component = props.component,
+    originComponent = props.originComponent;
   var _shouldUpdate = formItemProps.shouldUpdate,
     name = formItemProps.name,
     clearNotShow = formItemProps.clearNotShow,
@@ -32,12 +32,6 @@ var useShouldUpdate = function useShouldUpdate(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     reRender = _useState2[1];
   var values = {};
-  if (namePath) {
-    // formList场景values取当前行数据
-    values = form.getFieldValue(namePath) || {};
-  } else {
-    values = form.getFieldsValue(true);
-  }
   // 不是动态函数直接返回
   if (!isFunction(show) && !isFunction(disabled) && !isFunction(required) && !isFunction(rules) && !isFunction(fieldProps) && !isFunction(originComponent)) {
     return {
@@ -50,6 +44,12 @@ var useShouldUpdate = function useShouldUpdate(_ref) {
       component: newComponent
     };
   }
+  if (namePath) {
+    // formList场景values取当前行数据
+    values = form.getFieldValue(namePath) || {};
+  } else {
+    values = form.getFieldsValue(true);
+  }
   if (isFunction(show)) {
     showRef.current = Boolean(show(values, {
       form: form,

package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js

@@ -122,6 +122,12 @@ var OpenMenu = function OpenMenu(props) {
       });
     }
   }, [sideMenu]);
+  useEffect(function () {
+    // 同步路由，解决进入详情页后router没有变化，点击相同router菜单无效问题
+    setState({
+      router: window.location.pathname
+    });
+  }, [window.location.pathname]);
   useEffect(function () {
     // 路由变更，且不再demo文档中
     if (router && !window.location.href.includes('~demos/prolayout')) {

package/es/ProLayout/components/Layout/Menu/OpenMenu/style/index.less

@@ -24,7 +24,7 @@
     &>.ant-menu-item-only-child {
       min-height    : 48px;
       padding-top   : 12px;
-      padding-bottom: 12px;
+      padding-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1) - var(--zaui-space-size-xs; 4px) * var(--zaui-size; 1));
       margin        : 0;
       height        : auto;
 
@@ -89,13 +89,12 @@
 
   .ant-menu-sub.ant-menu-inline>.ant-menu-item,
   .ant-menu-submenu-title {
-    white-space   : pre-wrap;
-    line-height   : initial !important;
-    height        : auto !important;
-    margin        : 0;
-    padding-top   : 12px;
-    padding-bottom: 12px;
-    min-height    : 48px;
+    white-space: pre-wrap;
+    line-height: initial !important;
+    height     : auto !important;
+    margin     : 0;
+    padding-top: 12px 0;
+    min-height : 48px;
   }
 
   .ant-menu-title-content {

package/es/ProLayout/components/Layout/Notice/index.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import tipMsg from '../../../images/tipMsg.png';
 import close from '../../../images/close.png';
+import locale from '../../../../locale';
 var Notice = function Notice(props) {
   var headerHeight = props.headerHeight,
     notice = props.notice,
@@ -15,13 +16,13 @@ var Notice = function Notice(props) {
     },
     children: [_jsx("img", {
       src: tipMsg,
-      alt: "\u63D0\u793A"
+      alt: "".concat(locale.ProLayout.tipAlt)
     }), " ", notice, _jsx("span", {
       className: "pro-layout-header-notice-close",
       onClick: onCancel,
       children: _jsx("img", {
         src: close,
-        alt: "\u5173\u95ED"
+        alt: "".concat(locale.ProLayout.closeAlt)
       })
     })]
   });

package/es/ProLayout/components/ProCollapse/style/index.less

@@ -9,13 +9,13 @@
 
   &.ant-collapse {
     .pro-collapse-panel {
-      margin-bottom: var(--zaui-space-size-md, 16px);
+      margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
     }
   }
 
   .ant-collapse-header {
     align-items: center !important;
-    padding    : 14px var(--zaui-space-size-md, 16px) !important;
+    padding    : 12px var(--zaui-space-size-md, 16px) !important;
     background : var(--zaui-area, #fafafa);
   }
 
@@ -49,7 +49,7 @@
     background   : var(--zaui-base-bg, #ffffff);
 
     .ant-collapse-header {
-      margin-bottom: var(--zaui-space-size-md, 16px);
+      margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
       padding      : 0 !important;
       background   : var(--zaui-base-bg, #ffffff);
 
@@ -154,7 +154,7 @@
     }
 
     .ant-descriptions {
-      margin-bottom: var(--zaui-space-size-md, 16px);
+      margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
     }
   }
 }

package/es/ProLayout/components/ProHeader/components/Copy/index.js

@@ -4,6 +4,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { ReactSVG } from 'react-svg';
 import { CheckOutlined } from '@ant-design/icons';
 import copySvg from '../../../../../assets/copy.svg';
+import locale from '../../../../../locale';
 var Paragraph = _Typography.Paragraph;
 var Copy = function Copy(_ref) {
   var text = _ref.text;
@@ -15,7 +16,7 @@ var Copy = function Copy(_ref) {
         className: "drag-icon",
         src: copySvg
       }, "copy-icon"), _jsx(CheckOutlined, {}, "copied-icon")],
-      tooltips: ['复制', '复制成功']
+      tooltips: ["".concat(locale.ProHeader.copyTooltips[0]), "".concat(locale.ProHeader.copyTooltips[1])]
     }
   });
 };

package/es/{old → ProLayout/components/ProHeader/components}/ProBackBtn/index.js

@@ -2,6 +2,7 @@ import "antd/es/button/style";
 import _Button from "antd/es/button";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { ArrowLeftOutlined } from '@ant-design/icons';
+import locale from '../../../../../locale';
 /**
  * 页面返回按钮
  * @param onBack 自定义返回方法
@@ -10,7 +11,7 @@ import { ArrowLeftOutlined } from '@ant-design/icons';
 var ProBackBtn = function ProBackBtn(_ref) {
   var onBack = _ref.onBack,
     _ref$text = _ref.text,
-    text = _ref$text === void 0 ? '返回' : _ref$text;
+    text = _ref$text === void 0 ? "".concat(locale.ProHeader.backText) : _ref$text;
   var handleClick = function handleClick() {
     if (onBack) {
       onBack();

package/es/ProLayout/components/ProHeader/components/ProBackBtn/style/index.less

@@ -0,0 +1,21 @@
+.back-button-container {
+  &.ant-btn {
+    color      : var(--zaui-text);
+    font-weight: 400;
+    background : var(--zaui-disabled-bg);
+    border     : none;
+
+    &:hover {
+      color     : var(--zaui-aide-text);
+      background: var(--zaui-disabled-bg);
+      border    : none;
+    }
+
+    &:active,
+    &:focus {
+      color      : var(--zaui-text);
+      font-weight: 400;
+      background : var(--zaui-disabled-bg);
+    }
+  }
+}

package/es/ProLayout/components/ProHeader/components/index.d.ts

@@ -1 +1,2 @@
 export { default as Copy } from './Copy';
+export { default as ProBackBtn } from './ProBackBtn';

package/es/ProLayout/components/ProHeader/components/index.js

@@ -1 +1,2 @@
-export { default as Copy } from './Copy';
+export { default as Copy } from './Copy';
+export { default as ProBackBtn } from './ProBackBtn';

package/es/ProLayout/components/ProHeader/index.js

@@ -22,9 +22,9 @@ import { useToggle } from 'ahooks';
 import { isFunction, isEmpty, isNumber, isString } from 'lodash';
 import { ReactSVG } from 'react-svg';
 import foldSvg from '../../../assets/arrow.svg';
-import { Copy } from './components';
+import { Copy, ProBackBtn } from './components';
 import getEnumLabel from '../../../ProEnum/utils/getEnumLabel';
-import { ProBackBtn } from '../../../index';
+import locale from '../../../locale';
 var formatAmount = tools.formatAmount;
 var ProHeader = function ProHeader(props) {
   var _props$breadcrumbList = props.breadcrumbList,
@@ -319,7 +319,7 @@ var ProHeader = function ProHeader(props) {
         // value为null或者undefined返回'-'
         var val = String(value).includes('undefined') || !value ? '-' : value;
         if (type === 'version' && val) {
-          val = "\u7248\u672C\u53F7".concat(val);
+          val = "".concat(locale.ProHeader.versionTitle).concat(val);
         }
         // 面包屑样式
         var breadcrumbCls = classnames({
@@ -389,12 +389,15 @@ var ProHeader = function ProHeader(props) {
   var onConfirm = function onConfirm() {
     if (!isConfirmBack) {
       onBack && onBack();
+      if (!onBack) {
+        window.history.back();
+      }
       return false;
     }
     _Modal.confirm(_objectSpread({
-      title: '确认返回？',
-      okText: '确定',
-      cancelText: '取消',
+      title: "".concat(locale.ProHeader.confirmTitle),
+      okText: "".concat(locale.ProHeader.confirm),
+      cancelText: "".concat(locale.ProHeader.cancel),
       onOk: function onOk() {
         onBack && onBack();
       }

package/es/ProLayout/components/ProHeader/style/index.less

@@ -1,16 +1,25 @@
+@import '../components/ProBackBtn/style/index';
+
 .pro-header {
   background-color: var(--zaui-base-bg, #ffffff);
-  padding         : var(--zaui-space-size-lg, 32px) 0 0 0;
+  padding         : 24px 0 0 0;
 
   &.pro-header-no-back {
     .pro-header-top {
       padding-left: 0;
     }
+
+    .pro-header-left {
+      &.pro-header-left-space {
+        margin-left: 0 !important;
+      }
+
+    }
   }
 
   &.pro-header-no-describe {
     box-shadow   : none;
-    margin-bottom: var(--zaui-space-size-md, 16px);
+    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
 
     .pro-header-title,
     .pro-header-top {
@@ -21,7 +30,7 @@
 
   &.pro-header-fixed.pro-header-no-describe {
     .pro-header-top {
-      padding-bottom: 12px;
+      padding-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1) - var(--zaui-space-size-xs; 4px) * var(--zaui-size; 1));
     }
   }
 
@@ -111,7 +120,7 @@
     display        : flex;
     justify-content: space-between;
     align-items    : center;
-    margin-bottom  : var(--zaui-space-size-sm, 8px);
+    margin-bottom  : calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
     padding        : 0 var(--zaui-space-size-md, 16px);
 
     .pro-header-left {
@@ -265,7 +274,7 @@
       li {
         margin-right : 52px;
         margin-top   : 4px;
-        margin-bottom: 12px;
+        margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
 
         &:last-child {
           margin-right: 0;
@@ -303,9 +312,9 @@
   .pro-header-describe {
     display       : flex;
     flex-wrap     : wrap;
-    font-size     : 14px;
+    font-size     : var(--zaui-font-size, 14px);
     padding       : 0 var(--zaui-space-size-md, 16px);
-    padding-bottom: 12px;
+    padding-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1) - var(--zaui-space-size-xs; 4px) * var(--zaui-size; 1));
 
     li {
       margin-left: var(--zaui-space-card, 32px);

package/es/ProLayout/utils/index.js

@@ -1,7 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-/* eslint-disable no-mixed-operators */
 /* eslint-disable prefer-destructuring */
+/* eslint-disable no-mixed-operators */
 import { isPlainObject } from 'lodash';
 /**
  * 通过URL获取对应keyIdPath

package/es/ProSelect/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { PropSelectProps } from './propsType';
+import { PropSelectProps, ProSelectAction } from './propsType';
 import './index.less';
-export declare const ProSelect: (props: PropSelectProps, ref: React.Ref<unknown> | undefined) => JSX.Element;
-declare const _default: React.ForwardRefExoticComponent<PropSelectProps & React.RefAttributes<unknown>>;
+export declare const ProSelect: (props: PropSelectProps, ref: React.Ref<ProSelectAction> | undefined) => JSX.Element;
+declare const _default: React.ForwardRefExoticComponent<PropSelectProps & React.RefAttributes<ProSelectAction>>;
 export default _default;

package/es/ProSelect/index.js

@@ -16,10 +16,12 @@ import React, { useImperativeHandle, useState, forwardRef } from 'react';
 import { isFunction, isObject, isString, omit, cloneDeep } from 'lodash';
 import { useProConfig } from '../ProConfigProvider';
 import Container from '../ProForm/components/Container';
-import './index.less';
 import AdaptiveTooltip from './components/AdaptiveTooltip';
+import locale from '../locale';
+import './index.less';
 var Option = _Select.Option;
 export var ProSelect = function ProSelect(props, ref) {
+  var _locale$ProSelect;
   var _ref = useProConfig('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
     proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames;
@@ -261,7 +263,7 @@ export var ProSelect = function ProSelect(props, ref) {
     return value;
   };
   return _jsx(_Select, _objectSpread(_objectSpread({
-    placeholder: "\u8BF7\u9009\u62E9",
+    placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProSelect = locale.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
     allowClear: true,
     showArrow: true,
     loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,

package/es/ProStep/components/Step/index.js

@@ -6,7 +6,9 @@ import { cloneDeep } from 'lodash';
 import { ReactSVG } from 'react-svg';
 import catalogSvg from '../../../assets/catalog.svg';
 import Anchor from '../Anchor';
+import locale from '../../../locale';
 export var Step = function Step(_ref) {
+  var _locale$ProStep;
   var fixedTop = _ref.fixedTop,
     _ref$dataSource = _ref.dataSource,
     dataSource = _ref$dataSource === void 0 ? [] : _ref$dataSource,
@@ -61,7 +63,7 @@ export var Step = function Step(_ref) {
         className: "menu-icon",
         src: catalogSvg
       }), onOff && _jsx("div", {
-        children: "\u76EE\u5F55"
+        children: locale === null || locale === void 0 ? void 0 : (_locale$ProStep = locale.ProStep) === null || _locale$ProStep === void 0 ? void 0 : _locale$ProStep.catalogue
       })]
     }), options.map(function (item) {
       return _jsx(React.Fragment, {

package/es/ProStep/style/index.less

@@ -150,7 +150,6 @@
           color        : #ff5050;
           font-weight  : 600;
           font-size    : var(--aui-font-size-sm, 12px);
-          font-family  : PingFangSC-Semibold, PingFang SC;
           border-radius: 8px;
         }
       }

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

@@ -1,14 +1,14 @@
 import { FC } from 'react';
-import { ProTableValueType } from '../../propsType';
 interface Props {
-    valueType?: ProTableValueType;
-    code?: string | string[] | (() => string);
+    valueType?: string;
+    node?: any;
     value?: any;
-    record?: any;
+    currentValue?: any;
     copyable?: boolean;
+    originalTip?: boolean;
     ellipsis?: any;
     width?: number | string;
-    transform?: (value: any, record?: any) => string[];
+    originalValue?: any;
 }
 declare const RenderColumn: FC<Props>;
 export default RenderColumn;

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

@@ -1,35 +1,55 @@
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
 import "antd/es/typography/style";
 import _Typography from "antd/es/typography";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { CheckOutlined } from '@ant-design/icons';
 import { ReactSVG } from 'react-svg';
-import ProForm from '../../../ProForm';
-import getEnumLabel from '../../../ProEnum/utils/getEnumLabel';
 import copySvg from '../../../assets/copy.svg';
 var Paragraph = _Typography.Paragraph,
   Text = _Typography.Text;
 // @ts-ignore
 var RenderColumn = function RenderColumn(props) {
   var valueType = props.valueType,
-    code = props.code,
     value = props.value,
-    record = props.record,
+    node = props.node,
+    currentValue = props.currentValue,
     copyable = props.copyable,
     ellipsis = props.ellipsis,
     width = props.width,
-    transform = props.transform;
-  if (valueType === 'address') {
-    var _newValue$filter;
-    var newValue = transform ? transform(value, record) : value;
-    if (!newValue || Array.isArray(newValue) && (newValue === null || newValue === void 0 ? void 0 : (_newValue$filter = newValue.filter(function (item) {
-      return !!item;
-    })) === null || _newValue$filter === void 0 ? void 0 : _newValue$filter.length) === 0) {
-      return '-';
+    originalValue = props.originalValue,
+    originalTip = props.originalTip;
+  if (originalValue !== undefined) {
+    var renderNode = value ? node : '-';
+    if (ellipsis || originalTip) {
+      if (ellipsis) {
+        renderNode = _jsx(Text, {
+          style: {
+            width: currentValue === '-' ? 32.5 : width
+          },
+          ellipsis: {
+            tooltip: false
+          },
+          children: ellipsis ? currentValue : renderNode
+        });
+      }
+      return _jsx(_Tooltip, {
+        className: "varied-cell",
+        style: {
+          width: width
+        },
+        title: originalTip ? _jsxs(_Fragment, {
+          children: ["\u521D\u59CB\u503C\uFF1A", originalValue, _jsx("br", {}), ellipsis ? "\u5F53\u524D\u503C\uFF1A".concat(currentValue) : undefined]
+        }) : node,
+        children: renderNode
+      });
     }
-    return _jsx(ProForm.ProAddressBar, {
-      isView: true,
-      code: code,
-      value: newValue
+    return _jsx("span", {
+      className: "varied-cell",
+      style: {
+        width: width
+      },
+      children: renderNode
     });
   }
   if (copyable) {
@@ -40,25 +60,21 @@ var RenderColumn = function RenderColumn(props) {
           width: width
         } : undefined,
         ellipsis: ellipsis ? {
-          tooltip: value
+          tooltip: node
         } : false,
         copyable: {
-          text: value,
+          text: node,
           icon: [_jsx(ReactSVG, {
             className: "drag-icon",
             src: copySvg
           }, "copy-icon"), _jsx(CheckOutlined, {}, "copied-icon")],
           tooltips: ['复制', '复制成功']
         },
-        children: value
+        children: node
       })
     });
   }
   if (ellipsis) {
-    var node = value;
-    if (['enumName', 'enumCodeName'].includes(valueType)) {
-      node = getEnumLabel(typeof code === 'function' ? code() : code, value, valueType === 'enumCodeName');
-    }
     return value ? _jsx(Text, {
       style: {
         width: width
@@ -70,6 +86,6 @@ var RenderColumn = function RenderColumn(props) {
       children: node
     }) : '-';
   }
-  return null;
+  return value ? node : '-';
 };
 export default RenderColumn;

package/es/ProTable/index.js

@@ -8,7 +8,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "summary", "emptyText"],
+var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "summary", "emptyText", "originalDataSource"],
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useMemo, useState, createContext } from 'react';
@@ -25,6 +25,7 @@ import empty from '../assets/empty.png';
 import resetSvg from '../assets/reset.svg';
 import customColumnSvg from '../assets/customColumn.svg';
 import { formatColumn, getColumnDataIndex } from './utils';
+import locale from '../locale';
 var defaultCacheTime = 1; // columns 配置保存时间为一天
 // 全局上下文
 export var TableContext = /*#__PURE__*/createContext({});
@@ -33,7 +34,7 @@ export var defaultPage = {
   pageSize: 10
 };
 function ProTable(props) {
-  var _curTableConfig$pathK;
+  var _locale$ProTable, _curTableConfig$pathK, _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5;
   var _ref = useProConfig('globalConfig') || {},
     configStorage = _ref.storage; // 获取全局缓存位置配置
   var _ref2 = useProConfig('ProTable') || {},
@@ -50,7 +51,8 @@ function ProTable(props) {
     className = props.className,
     summary = props.summary,
     _props$emptyText = props.emptyText,
-    emptyText = _props$emptyText === void 0 ? '暂无数据' : _props$emptyText,
+    emptyText = _props$emptyText === void 0 ? locale === null || locale === void 0 ? void 0 : (_locale$ProTable = locale.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.noData : _props$emptyText,
+    originalDataSource = props.originalDataSource,
     restProps = _objectWithoutProperties(props, _excluded);
   var quickTableConfig = quickConfig ? _objectSpread({
     // resizeColumn: true,
@@ -161,7 +163,7 @@ function ProTable(props) {
       return !(item === null || item === void 0 ? void 0 : item.delete);
     });
     newColumns === null || newColumns === void 0 ? void 0 : newColumns.forEach(function (item) {
-      formatColumn(item);
+      formatColumn(item, originalDataSource);
     });
     return newColumns;
   }, [curColumns, handleResize]);
@@ -280,9 +282,9 @@ function ProTable(props) {
               src: resetSvg
             }),
             onClick: resetColumnWidth,
-            children: "\u91CD\u7F6E\u5217\u5BBD"
+            children: locale === null || locale === void 0 ? void 0 : (_locale$ProTable2 = locale.ProTable) === null || _locale$ProTable2 === void 0 ? void 0 : _locale$ProTable2.resetColumnWidth
           }), columnConfig && _jsx(ProTreeModal, {
-            title: "\u81EA\u5B9A\u4E49\u5217",
+            title: locale === null || locale === void 0 ? void 0 : (_locale$ProTable3 = locale.ProTable) === null || _locale$ProTable3 === void 0 ? void 0 : _locale$ProTable3.customColumns,
             span: 8,
             mode: "list",
             draggable: true,
@@ -297,7 +299,7 @@ function ProTable(props) {
                 wrapper: "span",
                 src: customColumnSvg
               }),
-              children: "\u81EA\u5B9A\u4E49\u5217"
+              children: locale === null || locale === void 0 ? void 0 : (_locale$ProTable4 = locale.ProTable) === null || _locale$ProTable4 === void 0 ? void 0 : _locale$ProTable4.customColumns
             })
           })]
         })]
@@ -314,7 +316,7 @@ function ProTable(props) {
                 className: "ant-empty-image",
                 children: _jsx("img", {
                   src: empty,
-                  alt: "\u6682\u65E0\u6570\u636E"
+                  alt: locale === null || locale === void 0 ? void 0 : (_locale$ProTable5 = locale.ProTable) === null || _locale$ProTable5 === void 0 ? void 0 : _locale$ProTable5.noData
                 })
               }), _jsx("div", {
                 className: "ant-empty-description",

package/es/ProTable/propsType.d.ts

@@ -26,6 +26,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     precision?: number;
     code?: string | string[] | (() => string);
     copyable?: boolean;
+    originalTip?: boolean;
     prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     suffix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     tooltip?: ReactNode | {
@@ -53,6 +54,7 @@ export interface ProTableProps extends Omit<TableProps<any>, 'summary' | 'column
      */
     stripe?: boolean;
     columns: ProTableColumn[];
+    originalDataSource?: any[];
 }
 export type ProTableValueType = 'percentage' | 'permillage' | 'thousandth' | 'datePicker' | 'enumName' | 'enumCodeName' | 'address' | 'thousandthCNY' | 'date' | 'dateTime' | 'dateStartTime' | 'dateEndTime' | 'dateStartEndTime';
 export interface Response<T = any> {

package/es/ProTable/style/index.less

@@ -54,6 +54,19 @@
     }
   }
 
+  .ant-table-body {
+    .ant-table-cell .varied-cell {
+      margin-left: -8px;
+      background: var(--zaui-contract-bg, #fffaa1);
+      padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
+      border-radius: var(--zaui-border-radius, 4px);
+    }
+
+    .varied-cell.empty-cell {
+      width: 24.5px;
+    }
+  }
+
   .copyable-table-cell {
 
 
@@ -140,7 +153,7 @@
   .column-config {
     display        : flex;
     justify-content: space-between;
-    margin-bottom  : var(--zaui-space-size-md, 16px);
+    margin-bottom  : calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
 
     .right-actions {
       display    : flex;