@zat-design/sisyphus-react 3.4.2 → 3.4.3

package/es/ProUpload/style/index.less

@@ -8,7 +8,7 @@
   .pro-upload-dragger {
     .pro-upload-handle-box {
       background   : #F8F9FA;
-      border-radius: var(--zaui-border-radius, 4px);
+      border-radius: var(--zaui-border-radius, 8px);
       padding      : var(--zaui-space-size-sm, 8px);
 
       .@{ant-prefix}-upload.@{ant-prefix}-upload-drag {
@@ -178,7 +178,7 @@
       text-align   : center;
       line-height  : 32px;
       background   : #FFFFFF;
-      border-radius: var(--zaui-border-radius, 4px);
+      border-radius: var(--zaui-border-radius, 8px);
       border       : 1px solid #DCDCDC;
 
     }

package/es/assets/catalog.svg

@@ -1 +1,30 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1664417328557" class="icon" viewBox="0 0 1075 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18351" xmlns:xlink="http://www.w3.org/1999/xlink" width="25.1953125" height="24"><path d="M1044.4288 758.3232v128.9728H313.7024V758.272h730.7264z m-833.1264 0v128.9728H71.7312V758.272h139.5712z m833.1264-310.784v128.9216H313.7024V447.5392h730.7264z m-833.1264 0v128.9216H71.7312V447.5392h139.5712z m833.1264-310.784v128.9216H313.7024V136.704h730.7264z m-833.1264 0v128.9216H71.7312V136.704h139.5712z" p-id="18352"></path></svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 52@1x</title>
+    <defs>
+        <rect id="path-1" x="0" y="4" width="24" height="18" rx="2"></rect>
+        <filter x="-14.6%" y="-13.9%" width="129.2%" height="138.9%" filterUnits="objectBoundingBox" id="filter-2">
+            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0.653997356   0 0 0 0 0.779247182   0 0 0 0 1  0 0 0 1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="画板备份-17" transform="translate(-1367, -56)">
+            <g id="编组-81" transform="translate(1359, 48)">
+                <g id="编组-52" transform="translate(8, 8)">
+                    <rect id="矩形" x="0" y="0" width="32" height="32"></rect>
+                    <g id="编组-13" transform="translate(4, 5)">
+                        <path d="M5.33152162,0 L15,0 C16.1045695,7.78148667e-16 17,0.8954305 17,2 L17,19 C17,20.1045695 16.1045695,21 15,21 L2,21 C0.8954305,21 6.76353751e-17,20.1045695 0,19 L-4.4408921e-16,5.64678021 C-5.05225217e-16,5.14756683 0.186696218,4.666401 0.523402611,4.29783242 L3.85492423,0.651052206 C4.233839,0.236281109 4.76972854,9.91378134e-16 5.33152162,8.8817842e-16 Z" id="矩形" fill="#87F1FC" transform="translate(8.5, 10.5) scale(-1, 1) translate(-8.5, -10.5)"></path>
+                        <g id="矩形">
+                            <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
+                            <use fill="#4181FF" fill-rule="evenodd" xlink:href="#path-1"></use>
+                        </g>
+                        <circle id="椭圆形" fill="#FFFFFF" cx="7.16666667" cy="12.8333333" r="1.5"></circle>
+                        <circle id="椭圆形" fill="#FFFFFF" cx="16.5" cy="12.8333333" r="1.5"></circle>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

package/es/assets/fold.svg

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="15px" viewBox="0 0 16 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 2</title>
+    <defs>
+        <linearGradient x1="100%" y1="50%" x2="0%" y2="50%" id="linearGradient-1">
+            <stop stop-color="#ADDDFF" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#5FB3D8" stop-opacity="0" offset="13.9259178%"></stop>
+            <stop stop-color="#4181FF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="画板备份-17" transform="translate(-81, -162)" fill="url(#linearGradient-1)">
+            <g id="编组-27" transform="translate(64, 146)">
+                <g id="Card_Tittle/带icon备份-4" transform="translate(1, 0)">
+                    <g id="编组-2" transform="translate(16, 16)">
+                        <g id="编组">
+                            <rect id="矩形" x="0" y="0" width="16" height="6" rx="3"></rect>
+                        </g>
+                        <g id="编组备份" transform="translate(8, 12) scale(-1, 1) translate(-8, -12)translate(0, 9)">
+                            <rect id="矩形" x="0" y="0" width="16" height="6" rx="3"></rect>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

package/es/assets/setting.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="21px" viewBox="0 0 22 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-settings</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="画板备份-17" transform="translate(-1223, -14)" fill="#231F20" fill-rule="nonzero" stroke="#333333" stroke-width="0.3">
+            <g id="编组-2" transform="translate(1209.2372, 0)">
+                <g id="icon-settings" transform="translate(14.4202, 15)">
+                    <path d="M20.3848055,7.53659573 C20.2624144,6.90517801 19.8656126,6.49687157 19.3574341,6.49687157 L19.2693187,6.49687157 C17.8961096,6.49687157 16.7791849,5.40670117 16.7791849,4.0659785 C16.7791849,3.64243545 16.9874064,3.15949962 16.9954426,3.14030349 C17.2488001,2.58384094 17.0543916,1.90192685 16.5418484,1.55193559 L13.9650884,0.151544503 L13.9272182,0.133451014 C13.4117224,-0.0847484644 12.7061572,0.0549122231 12.3217819,0.445776738 C12.0436226,0.725799811 11.0846741,1.52424401 10.3529464,1.52424401 C9.61169334,1.52424401 8.65061387,0.709786336 8.37104252,0.424450467 C7.98733476,0.0307290821 7.28906108,-0.117076194 6.76773716,0.100747395 L4.09924158,1.52780256 L4.05918911,1.55268737 C3.54659457,1.90127525 3.35146717,2.5831643 3.60341257,3.13749673 C3.61211629,3.15777047 3.82110799,3.63677181 3.82110799,4.06600356 C3.82110799,5.40672622 2.70418334,6.49689663 1.33099995,6.49689663 L1.2268892,6.49689663 C0.73468034,6.49689663 0.337852817,6.90517801 0.215538765,7.53662079 C0.206424254,7.58105259 0,8.64957096 0,9.50630527 C0,10.3619369 0.206424254,11.4300794 0.215538765,11.4741603 C0.337852842,12.105979 0.73468034,12.5146363 1.24288452,12.5146363 L1.33099995,12.5146363 C2.70418336,12.5146363 3.82110799,13.6048318 3.82110799,14.9451535 C3.82110799,15.3715534 3.61214195,15.8526849 3.60413145,15.8711543 C3.35149282,16.4286944 3.54518244,17.1095309 4.05628784,17.457768 L6.58426601,18.8421957 L6.62285501,18.8592617 C7.1456424,19.0838515 7.85261977,18.9374246 8.23488975,18.5295191 C8.58799332,18.1570989 9.54475946,17.3838403 10.2473465,17.3838403 C11.0089339,17.3838403 11.9897315,18.249471 12.2722554,18.5536271 C12.5328788,18.8322217 12.9333521,19 13.3432737,19 C13.5347553,19 13.7160441,18.962986 13.8820564,18.8933687 L16.5032593,17.4834046 L16.5418483,17.4591713 C17.0543915,17.109556 17.2495446,16.4287195 16.9969316,15.8740362 C16.9881766,15.8534116 16.7792105,15.3743852 16.7792105,14.9451785 C16.7792105,13.6048568 17.8961352,12.5146614 19.2693442,12.5146614 L19.3720429,12.5146614 C19.8649193,12.5146614 20.26244,12.1060041 20.3848054,11.4741854 C20.3935348,11.4301045 20.6002928,10.361962 20.6002928,9.50633035 C20.6002928,8.64954589 20.3935349,7.58102751 20.3848055,7.53659573 M19.1062589,9.50628019 C19.1062589,10.0598859 18.9933931,10.7712959 18.9416844,11.0683599 C16.8818579,11.2332312 15.2851253,12.9132945 15.2851253,14.9451284 C15.2851253,15.518657 15.471549,16.0680024 15.5705761,16.3206848 L13.3345445,17.5259819 C13.2245799,17.413712 12.8998469,17.0938682 12.457909,16.7726211 C11.6817384,16.2111966 10.9375841,15.9244072 10.2473209,15.9244072 C9.56291156,15.9244072 8.82463676,16.2040795 8.05211198,16.7584119 C7.61233077,17.0711135 7.29198807,17.3823867 7.17984115,17.4975135 L5.0290237,16.3220881 C5.13387902,16.056625 5.31519344,15.5143716 5.31519344,14.9451284 C5.31519344,12.9132945 3.71846079,11.2332312 1.65937889,11.0683599 C1.60695125,10.7712959 1.49408545,10.0599109 1.49408545,9.50628019 C1.49408545,8.95157185 1.60695125,8.23983608 1.65937889,7.94277203 C3.71846079,7.77825158 5.31519344,6.09783742 5.31519344,4.06600356 C5.31519344,3.4956827 5.12879543,2.94455798 5.02976827,2.69225151 L7.32112879,1.46312209 C7.42087485,1.56050617 7.74779025,1.8728319 8.1948374,2.18340342 C8.95645045,2.71392862 9.68168251,2.98257437 10.3529721,2.98257437 C11.0177147,2.98257437 11.7378118,2.71891561 12.4943156,2.19869017 C12.9450086,1.8895471 13.2712051,1.58148161 13.3658419,1.49442234 L15.5712693,2.69012142 C15.4715233,2.94099944 15.2850996,3.4903449 15.2850996,4.06600358 C15.2850996,6.09783744 16.8818322,7.7782516 18.9416587,7.94277205 C18.9933931,8.2405127 19.1062589,8.95513042 19.1062589,9.50628019" id="形状"></path>
+                    <path d="M10.3001356,6.5 C8.59640655,6.5 7.21010249,7.84598945 7.21010249,9.50014713 C7.21010249,11.1545781 8.5964282,12.5 10.3001356,12.5 C12.0038646,12.5 13.3901903,11.1545781 13.3901903,9.50014713 C13.3901903,7.84598945 12.0038646,6.5 10.3001356,6.5 M12.1303626,9.50014713 C12.1303626,10.4798072 11.3095002,11.276765 10.3001356,11.276765 C9.29079259,11.276765 8.47053634,10.4798072 8.47053634,9.50014713 C8.47053634,8.52105462 9.29079259,7.72378156 10.3001356,7.72378156 C11.3095002,7.72378156 12.1303626,8.52105462 12.1303626,9.50014713" id="形状"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

package/es/locale/en_US.d.ts

@@ -154,5 +154,8 @@ declare const _default: {
     ProViewer: {
         preview: string;
     };
+    ProIcon: {
+        language: string;
+    };
 };
 export default _default;

package/es/locale/en_US.js

@@ -153,5 +153,8 @@ export default {
   },
   ProViewer: {
     preview: 'preview'
+  },
+  ProIcon: {
+    language: 'en'
   }
 };

package/es/locale/zh_CN.d.ts

@@ -154,5 +154,8 @@ declare const _default: {
     ProViewer: {
         preview: string;
     };
+    ProIcon: {
+        language: string;
+    };
 };
 export default _default;

package/es/locale/zh_CN.js

@@ -153,5 +153,8 @@ export default {
   },
   ProViewer: {
     preview: '预览'
+  },
+  ProIcon: {
+    language: 'cn'
   }
 };

package/es/style/components.less

@@ -11,7 +11,6 @@
 // 表单
 @import '../ProForm/style/index';
 @import '../ProUpload/style/index';
-@import '../ProTreeSelect/style/index';
 @import '../ProTreeModal/style/index';
 @import '../ProTree/style/index';
 

package/es/style/less.less

@@ -0,0 +1,2 @@
+@import "./components.less";
+@import "./theme/index.less";

package/es/style/theme/antd.less

@@ -24,7 +24,7 @@
     // label 超过130px换行
     .@{ant-prefix}-form-item-label {
       flex: 0 0 @zaui-form-label-width;
-      padding-right: @zaui-space-size-sm;
+      padding-right: @zaui-space-size-md;
       overflow: initial;
       line-height: 1;
       white-space: pre-wrap;
@@ -673,7 +673,6 @@
       width: calc(100% - 18px);
       margin-bottom: 0;
       text-align: right;
-      // background: #fff;
     }
   }
 }

package/es/style/theme/index.less

@@ -56,8 +56,8 @@
   --zaui-table-nested-bg            : #fafcfe;
   --zaui-contract-bg                : #fffaa1; // 对比背景色
   --zaui-form-label-width           : 130px; // 8个全角字符宽度
-  --zaui-border-radius              : 4px;
-  --zaui-border-radius-card         : 2px;
+  --zaui-border-radius              : 8px;
+  --zaui-border-radius-card         : 4px;
   --zaui-font-size-title            : 16px;
   --zaui-font-size-card-title       : var(--zaui-font-size-title);
   --zaui-font-size                  : 14px;

package/es/style/theme/tokens.less

@@ -56,8 +56,8 @@
 @zaui-form-required-after: var(--zaui-form-required-after; inline);
 @zaui-form-required-before: var(--zaui-form-required-before; none);
 @zaui-form-label-width: var(--zaui-form-label-width; 130px);
-@zaui-border-radius: var(--zaui-border-radius; 4px);
-@zaui-border-radius-card: var(--zaui-border-radius-card; 2px);
+@zaui-border-radius: var(--zaui-border-radius; 8px);
+@zaui-border-radius-card: var(--zaui-border-radius-card; 4px);
 @zaui-font-size-title:
   calc(var(--zaui-font-size-title; 16px) + var(--zaui-base-font-size; 0px));
 @zaui-font-size-card-title:

package/es/tokens.js

@@ -53,8 +53,8 @@ var tokens = {
   '@zaui-form-required-after': 'var(--zaui-form-required-after, inline)',
   '@zaui-form-required-before': 'var(--zaui-form-required-before, none)',
   '@zaui-form-label-width': 'var(--zaui-form-label-width, 130px)',
-  '@zaui-border-radius': 'var(--zaui-border-radius, 4px)',
-  '@zaui-border-radius-card': 'var(--zaui-border-radius-card, 2px)',
+  '@zaui-border-radius': 'var(--zaui-border-radius, 8px)',
+  '@zaui-border-radius-card': 'var(--zaui-border-radius-card, 4px)',
   '@zaui-font-size-title': 'calc(var(--zaui-font-size-title, 16px) + var(--zaui-base-font-size, 0px))',
   '@zaui-font-size-card-title': 'calc(var(--zaui-font-size-card-title, 16px) + var(--zaui-base-font-size, 0px))',
   '@zaui-font-size': 'calc(var(--zaui-font-size, 14px) + var(--zaui-base-font-size, 0px))',

package/lib/ProConfigProvider/index.js

@@ -27,7 +27,8 @@ var initialState = {
     mode: 'icon',
     mapList: [{
       type: 'view',
-      text: '查看'
+      'text-cn': '查看',
+      'text-en': 'view'
     }]
   }
 };

package/lib/ProEditLabel/style/index.less

@@ -39,7 +39,7 @@
 
     &:active {
       background   : #E3E8F0;
-      border-radius: var(--zaui-border-radius-card, 2px);
+      border-radius: var(--zaui-border-radius-card, 4px);
     }
   }
 

package/lib/ProEditTable/components/RenderField/index.js

@@ -28,12 +28,11 @@ var _useFieldProps = require("../../../ProForm/utils/useFieldProps");
 var _useListChanged3 = require("../../../ProForm/utils/useListChanged");
 var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
 var _utils = require("../../../ProForm/utils");
-var _locale = _interopRequireDefault(require("../../../locale"));
 var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4;
+  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _TargetComponent4, _componentProps;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -76,7 +75,7 @@ var RenderField = function RenderField(_ref) {
     virtualKey = config.virtualKey,
     viewEmpty = config.viewEmpty,
     originalValues = config.originalValues,
-    originalTip = config.originalTip;
+    originalDiffTip = config.originalDiffTip;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
@@ -144,7 +143,7 @@ var RenderField = function RenderField(_ref) {
   var formItemChildProps = (0, _objectSpread2.default)({}, _fieldProps);
   // 允许formItem的属性放在column最外层
   var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps), internalRule);
-  if (['Switch', 'Checkbox'].includes(type)) {
+  if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     valueType = 'switch';
   }
@@ -214,7 +213,7 @@ var RenderField = function RenderField(_ref) {
     if (valueType) {
       transform = valueTypeTransform();
     }
-    return (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _formItemProps), transform), form, names, namesStr);
+    return (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _formItemProps), transform), form, names, namesStr, type);
   };
   if (!_editRender && typeof type === 'string') {
     var _componentMap$type;
@@ -244,8 +243,6 @@ var RenderField = function RenderField(_ref) {
       TargetComponent = viewRender;
     }
   }
-  var defaultPlaceholder = ['Select', 'EnumSelect', 'DatePicker', 'RangePicker', 'Cascader', 'ProSelect', 'ProEnum', 'ProTimeLimit'].includes(type) ? "".concat(_locale.default.ProEditTable.select).concat((0, _lodash.isString)(label) ? label || title : '') : "".concat(_locale.default.ProEditTable.enter).concat((0, _lodash.isString)(label) ? label || title : '');
-  var _placeholder = (_formItemChildProps$p = formItemChildProps === null || formItemChildProps === void 0 ? void 0 : formItemChildProps.placeholder) !== null && _formItemChildProps$p !== void 0 ? _formItemChildProps$p : defaultPlaceholder;
   var onChange = formItemChildProps === null || formItemChildProps === void 0 ? void 0 : formItemChildProps.onChange;
   var onFieldChange = formItemChildProps === null || formItemChildProps === void 0 ? void 0 : formItemChildProps.onFieldChange;
   var onBlur = formItemChildProps === null || formItemChildProps === void 0 ? void 0 : formItemChildProps.onBlur;
@@ -306,7 +303,7 @@ var RenderField = function RenderField(_ref) {
           }
           _args = [].concat(args);
           rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
-          row = form.getFieldValue(rowPath);
+          row = type === 'Group' ? _args[1] : form.getFieldValue(rowPath, true);
           orgRow = (0, _lodash.cloneDeep)(row);
           if (!onFieldChange) {
             _context.next = 18;
@@ -351,14 +348,16 @@ var RenderField = function RenderField(_ref) {
           return onChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
         case 27:
           // 判断属性是否变动
-          form.setFieldValue(rowPath, row);
+          type !== 'Group' && form.setFieldValue(rowPath, row);
           if (!(0, _lodash.isEqual)(orgRow, row)) {
             diff = (0, _tools.difference)(row, orgRow) || {};
             validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
               return [].concat((0, _toConsumableArray2.default)(rowPath), [key]);
             });
             if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-              form.validateFields(validateFieldKeys);
+              setTimeout(function () {
+                form.validateFields(validateFieldKeys);
+              }, 100);
             }
           }
           setState({
@@ -471,12 +470,13 @@ var RenderField = function RenderField(_ref) {
     originalValue = _useListChanged2[1];
   var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     form: form,
-    name: cellName,
-    placeholder: _placeholder
+    name: cellName
   }, _fieldProps), (_TargetComponent4 = TargetComponent) === null || _TargetComponent4 === void 0 ? void 0 : _TargetComponent4.props), {}, {
+    namePath: [].concat((0, _toConsumableArray2.default)(namePath), [index]),
     disabled: _disabled,
     onChange: _onchange,
     onBlur: _onblur,
+    index: index,
     otherProps: {
       form: form,
       names: names,
@@ -486,11 +486,16 @@ var RenderField = function RenderField(_ref) {
       isView: isView
     }
   });
+  if (type === 'Group') {
+    componentProps.onFieldChange = _onchange;
+  } else {
+    componentProps = (0, _lodash.omit)(componentProps, ['onFieldChange', 'namePath', 'index']);
+  }
   // 单元格编辑时，设置各个单元格disabled属性
   if (isCell) {
     record["".concat(dataIndex, "-Disabled")] = _disabled;
   }
-  if (['Switch', 'Checkbox'].includes(type)) {
+  if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
   }
   (0, _react.useEffect)(function () {
@@ -510,12 +515,12 @@ var RenderField = function RenderField(_ref) {
     delete _formItemProps.rules;
   }
   var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-changed', changed));
-  var originalTitle = originalTip ? (0, _jsxRuntime.jsxs)(_antd.Space, {
-    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
+  var originalTitle = originalDiffTip ? (0, _jsxRuntime.jsxs)(_antd.Space, {
+    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
-    }))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
+    }))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
@@ -526,15 +531,18 @@ var RenderField = function RenderField(_ref) {
   }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
     name: cellName,
-    children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])))
+    children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps))
   })) : (0, _jsxRuntime.jsx)(_Container.default, {
     viewEmpty: viewEmpty
   });
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
-    value: componentProps === null || componentProps === void 0 ? void 0 : componentProps.otherProps,
-    children: !originalTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    value: (_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.otherProps,
+    children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: originalTitle,
       open: changed ? undefined : false,
+      getPopupContainer: function getPopupContainer(target) {
+        return target.parentElement;
+      },
       children: FormItem
     })
   });

package/lib/ProEditTable/index.js

@@ -23,7 +23,7 @@ var _tools = require("./utils/tools");
 var _components = require("./components");
 var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _locale = _interopRequireWildcard(require("../locale"));
-var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalTip", "rowKey"];
+var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey"];
 var ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$2;
   var value = _ref.value,
@@ -52,7 +52,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     headerRender = _ref.headerRender,
     pagination = _ref.pagination,
     originalValues = _ref.originalValues,
-    originalTip = _ref.originalTip,
+    originalDiffTip = _ref.originalDiffTip,
     rowKey = _ref.rowKey,
     resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   // 上下文form
@@ -154,7 +154,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     tableLength: value === null || value === void 0 ? void 0 : value.length,
     page: page,
     originalValues: originalValues,
-    originalTip: originalTip,
+    originalDiffTip: originalDiffTip,
     prefixCls: prefixCls
   };
   // 编辑行设置下样式

package/lib/ProEditTable/propsType.d.ts

@@ -130,7 +130,7 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * @description       原始数据源，是否tooltip显示
      * @default           -
      */
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
     /**
      * @description       可编辑表格的类型，单行、多行、单元格编辑
      * @default           false

package/lib/ProEditTable/style/index.less

@@ -55,7 +55,7 @@
 
     &:hover {
       border       : 1px solid #DEE0E3;
-      border-radius: var(--zaui-border-radius, 4px);
+      border-radius: var(--zaui-border-radius, 8px);
       text-indent  : 5px;
     }
   }

package/lib/ProEditTable/utils/config.js

@@ -196,11 +196,6 @@ var actions = exports.actions = {
               addData.isEditing = true;
             }
             insertType === 'before' ? nextData.unshift(addData) : nextData.push(addData);
-            form.setFieldValue(name, nextData);
-            (_tableRef$current$que = tableRef.current.querySelector(".".concat(prefixCls, "-table-body"))) === null || _tableRef$current$que === void 0 ? void 0 : (_tableRef$current$que2 = _tableRef$current$que.scrollTo) === null || _tableRef$current$que2 === void 0 ? void 0 : _tableRef$current$que2.call(_tableRef$current$que, {
-              top: 10000,
-              behavior: 'smooth'
-            });
             // 当单选情况下，存储正在编辑值
             if (virtualKey) {
               nextEditingKeys = (0, _toConsumableArray2.default)(editingKeys); // 开启编辑状态
@@ -210,6 +205,11 @@ var actions = exports.actions = {
                 editingKeys: nextEditingKeys
               });
             }
+            form.setFieldValue(name, nextData);
+            (_tableRef$current$que = tableRef.current.querySelector(".".concat(prefixCls, "-table-body"))) === null || _tableRef$current$que === void 0 ? void 0 : (_tableRef$current$que2 = _tableRef$current$que.scrollTo) === null || _tableRef$current$que2 === void 0 ? void 0 : _tableRef$current$que2.call(_tableRef$current$que, {
+              top: insertType === 'before' ? -10000 : 10000,
+              behavior: 'smooth'
+            });
             _context2.next = 14;
             return form.validateFields([name]);
           case 14:

package/lib/ProEditTable/utils/index.js

@@ -89,40 +89,77 @@ var getActionColumn = function getActionColumn(config) {
               index = _utils.tools.calc(firstIndex, '+', index);
               rowName = [].concat((0, _toConsumableArray2.default)(virtualRowName), [index]);
               if (!(type === 'save')) {
-                _context.next = 5;
+                _context.next = 12;
                 break;
               }
-              _context.next = 5;
+              _context.prev = 3;
+              _context.next = 6;
               return (0, _tools.customValidate)(validateKeys, form, rowName);
-            case 5:
+            case 6:
+              _context.next = 12;
+              break;
+            case 8:
+              _context.prev = 8;
+              _context.t0 = _context["catch"](3);
+              setTimeout(function () {
+                var errorDom = document.querySelector('.ant-form-item-has-error');
+                if (errorDom) {
+                  var tableBody = errorDom.closest('.ant-table-content') || errorDom.closest('.ant-table-body');
+                  var tableCell = errorDom.closest('.ant-table-cell');
+                  if (tableBody && tableCell) {
+                    var previousSibling = tableCell.previousElementSibling;
+                    var childOffsetLeft = 0;
+                    var childFixedLeft = 0;
+                    while (previousSibling) {
+                      if (previousSibling.nodeType === 1) {
+                        var _previousSibling, _previousSibling$clas, _previousSibling$clas2, _previousSibling$clas3;
+                        var _ref2 = previousSibling.getBoundingClientRect() || {},
+                          _ref2$width = _ref2.width,
+                          width = _ref2$width === void 0 ? 0 : _ref2$width;
+                        childOffsetLeft += width;
+                        if ((_previousSibling = previousSibling) === null || _previousSibling === void 0 ? void 0 : (_previousSibling$clas = _previousSibling.classList) === null || _previousSibling$clas === void 0 ? void 0 : (_previousSibling$clas2 = (_previousSibling$clas3 = _previousSibling$clas).contains) === null || _previousSibling$clas2 === void 0 ? void 0 : _previousSibling$clas2.call(_previousSibling$clas3, 'ant-table-cell-fix-left')) {
+                          childFixedLeft += width;
+                        }
+                      }
+                      previousSibling = previousSibling.previousElementSibling;
+                    }
+                    tableBody.scrollTo({
+                      left: childOffsetLeft - childFixedLeft,
+                      behavior: 'smooth'
+                    });
+                  }
+                }
+              }, 0);
+              return _context.abrupt("return", Promise.reject(_context.t0));
+            case 12:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
               _record = (_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record; // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
-              _context.next = 9;
+              _context.next = 16;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, index, {
                 form: form,
                 namePath: virtualRowName
               });
-            case 9:
-              _context.t1 = _yield$onEvent = _context.sent;
-              _context.t0 = _context.t1 !== null;
-              if (!_context.t0) {
-                _context.next = 13;
+            case 16:
+              _context.t2 = _yield$onEvent = _context.sent;
+              _context.t1 = _context.t2 !== null;
+              if (!_context.t1) {
+                _context.next = 20;
                 break;
               }
-              _context.t0 = _yield$onEvent !== void 0;
-            case 13:
-              if (!_context.t0) {
-                _context.next = 17;
+              _context.t1 = _yield$onEvent !== void 0;
+            case 20:
+              if (!_context.t1) {
+                _context.next = 24;
                 break;
               }
-              _context.t2 = _yield$onEvent;
-              _context.next = 18;
+              _context.t3 = _yield$onEvent;
+              _context.next = 25;
               break;
-            case 17:
-              _context.t2 = true;
-            case 18:
-              result = _context.t2;
+            case 24:
+              _context.t3 = true;
+            case 25:
+              result = _context.t3;
               if (result && type !== 'custom') {
                 _config.actions[type]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
                   rowName: [].concat((0, _toConsumableArray2.default)(name), [index]),
@@ -132,11 +169,11 @@ var getActionColumn = function getActionColumn(config) {
                   validateKeys: validateKeys
                 }));
               }
-            case 20:
+            case 27:
             case "end":
               return _context.stop();
           }
-        }, _callee);
+        }, _callee, null, [[3, 8]]);
       }));
       return function (_x, _x2) {
         return _ref.apply(this, arguments);
@@ -214,10 +251,10 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     if (typeof columnTitle === 'string') {
       item.originTitle = columnTitle;
       if (tooltip) {
-        var _ref2 = tooltip || {},
-          tooltipTitle = _ref2.title,
-          icon = _ref2.icon,
-          resetProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
+        var _ref3 = tooltip || {},
+          tooltipTitle = _ref3.title,
+          icon = _ref3.icon,
+          resetProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
         item.title = (0, _jsxRuntime.jsxs)("span", {
           className: "pro-edit-table-title pro-edit-table-tooltip",
           children: [before, columnTitle, (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
@@ -284,7 +321,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
       (_item$fieldProps3 = item.fieldProps) === null || _item$fieldProps3 === void 0 ? true : delete _item$fieldProps3.useRequest;
     }
     var _render = function _render(text, record, index) {
-      var isEditing = !virtualKey || editingKeys.includes(record.rowKey);
+      var isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record.addFlag;
       var namePath = (0, _lodash.isArray)(name) ? name : [name];
       if (virtualKey && editingKeys.includes(record.rowKey)) {
         namePath = (0, _tools.getNamePath)(name, virtualKey);
@@ -369,13 +406,13 @@ var transformColumns = exports.transformColumns = function transformColumns() {
   // cacheMap 用来存储缓存值，若有值后不再请求
   if (JSON.stringify(cacheMap.current) === '{}') {
     Promise.all(Object.entries(_cacheMap).map( /*#__PURE__*/function () {
-      var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
-        var _item, key, value, _ref4, service, option;
+      var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
+        var _item, key, value, _ref5, service, option;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _item = (0, _slicedToArray2.default)(item, 2), key = _item[0], value = _item[1];
-              _ref4 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref4.service, option = _ref4.option;
+              _ref5 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref5.service, option = _ref5.option;
               if (!service) {
                 _context2.next = 8;
                 break;
@@ -395,7 +432,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
         }, _callee2);
       }));
       return function (_x3) {
-        return _ref3.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }())).then(function (res) {
       res.forEach(function (item) {

package/lib/ProEditTable/utils/tools.js

@@ -12,7 +12,9 @@ var getRandom = exports.getRandom = function getRandom() {
 var difference = exports.difference = function difference(object, base) {
   var changes = function changes(object, base) {
     return (0, _lodash.transform)(object, function (result, value, key) {
-      if (!(0, _lodash.isEqual)(value, base[key])) {
+      if (key.indexOf('-') > -1) {
+        result[key] = true;
+      } else if (!(0, _lodash.isEqual)(value, base[key])) {
         result[key] = (0, _lodash.isObject)(value) && (0, _lodash.isObject)(base[key]) ? changes(value, base[key]) : value;
       }
     });