@zat-design/sisyphus-react 3.4.5-beta.21 → 3.4.5-beta.23

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

@@ -384,13 +384,13 @@ var RenderField = function RenderField(_ref) {
   var _onblur = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _TargetComponent3, _TargetComponent3$pro, _TargetComponent$prop4;
-      var rowPath,
-        row,
-        orgRow,
-        _len3,
+      var _len3,
         args,
         _key3,
         _args,
+        rowPath,
+        row,
+        orgRow,
         _Object$keys2,
         _Object$keys2$map,
         diff,
@@ -399,13 +399,13 @@ var RenderField = function RenderField(_ref) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            rowPath = [].concat(_toConsumableArray(namePath), [index]);
-            row = form.getFieldValue(rowPath);
-            orgRow = cloneDeep(row);
             for (_len3 = _args3.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
               args[_key3] = _args3[_key3];
             }
-            _args = formatArgs(args);
+            _args = formatArgs([].concat(args));
+            rowPath = [].concat(_toConsumableArray(namePath), [index]);
+            row = type === 'Group' ? _args[1] : form.getFieldValue(rowPath, true);
+            orgRow = cloneDeep(row);
             _args[1] = row;
             _context2.t0 = (_TargetComponent3 = TargetComponent) === null || _TargetComponent3 === void 0 ? void 0 : (_TargetComponent3$pro = _TargetComponent3.props) === null || _TargetComponent3$pro === void 0 ? void 0 : _TargetComponent3$pro.onBlur;
             if (!_context2.t0) {
@@ -445,14 +445,12 @@ var RenderField = function RenderField(_ref) {
               cellNamePath: []
             });
           case 20:
-            if (virtualKey) {
-              // 单行编辑时需要 强制更新视图
-              setState({
-                forceUpdate: {
-                  d: Date.now()
-                }
-              });
-            }
+            // 单行编辑时需要 强制更新视图
+            setState({
+              forceUpdate: {
+                d: Date.now()
+              }
+            });
           case 21:
           case "end":
             return _context2.stop();

package/es/ProEditTable/utils/tools.js

@@ -7,7 +7,8 @@ export var getRandom = function getRandom() {
 export var difference = function difference(object, base) {
   var changes = function changes(object, base) {
     return transform(object, function (result, value, key) {
-      if (key.indexOf('-') > -1) {
+      var _key$indexOf;
+      if ((key === null || key === void 0 ? void 0 : (_key$indexOf = key.indexOf) === null || _key$indexOf === void 0 ? void 0 : _key$indexOf.call(key, '-')) > -1) {
         result[key] = true;
       } else if (!isEqual(value, base[key])) {
         result[key] = isObject(value) && isObject(base[key]) ? changes(value, base[key]) : value;

package/es/ProUpload/index.js

@@ -175,6 +175,9 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
    * @return {*}
    */
   var handleBeforeUpload = function handleBeforeUpload(file, fileList) {
+    if (!isFunction(beforeUpload)) {
+      return false;
+    }
     // TODO
     if (!validateFileExt(extExt, file)) {
       var _locale$ProUpload2;
@@ -186,9 +189,7 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
       _message.error("".concat(locale === null || locale === void 0 ? void 0 : (_locale$ProUpload3 = locale.ProUpload) === null || _locale$ProUpload3 === void 0 ? void 0 : _locale$ProUpload3.errorInfoSize).concat(size, "M"));
       return false;
     }
-    if (beforeUpload) {
-      return beforeUpload(file, fileList);
-    }
+    return beforeUpload(file, fileList);
   };
   var handleRemove = function handleRemove(file) {
     var nextList = _fileList.slice();

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

@@ -387,13 +387,13 @@ var RenderField = function RenderField(_ref) {
   var _onblur = /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
       var _TargetComponent3, _TargetComponent3$pro, _TargetComponent$prop4;
-      var rowPath,
-        row,
-        orgRow,
-        _len3,
+      var _len3,
         args,
         _key3,
         _args,
+        rowPath,
+        row,
+        orgRow,
         _Object$keys2,
         _Object$keys2$map,
         diff,
@@ -402,13 +402,13 @@ var RenderField = function RenderField(_ref) {
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
-            row = form.getFieldValue(rowPath);
-            orgRow = (0, _lodash.cloneDeep)(row);
             for (_len3 = _args3.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
               args[_key3] = _args3[_key3];
             }
-            _args = formatArgs(args);
+            _args = formatArgs([].concat(args));
+            rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
+            row = type === 'Group' ? _args[1] : form.getFieldValue(rowPath, true);
+            orgRow = (0, _lodash.cloneDeep)(row);
             _args[1] = row;
             _context2.t0 = (_TargetComponent3 = TargetComponent) === null || _TargetComponent3 === void 0 ? void 0 : (_TargetComponent3$pro = _TargetComponent3.props) === null || _TargetComponent3$pro === void 0 ? void 0 : _TargetComponent3$pro.onBlur;
             if (!_context2.t0) {
@@ -448,14 +448,12 @@ var RenderField = function RenderField(_ref) {
               cellNamePath: []
             });
           case 20:
-            if (virtualKey) {
-              // 单行编辑时需要 强制更新视图
-              setState({
-                forceUpdate: {
-                  d: Date.now()
-                }
-              });
-            }
+            // 单行编辑时需要 强制更新视图
+            setState({
+              forceUpdate: {
+                d: Date.now()
+              }
+            });
           case 21:
           case "end":
             return _context2.stop();

package/lib/ProEditTable/utils/tools.js

@@ -14,7 +14,8 @@ 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 (key.indexOf('-') > -1) {
+      var _key$indexOf;
+      if ((key === null || key === void 0 ? void 0 : (_key$indexOf = key.indexOf) === null || _key$indexOf === void 0 ? void 0 : _key$indexOf.call(key, '-')) > -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;

package/lib/ProUpload/index.js

@@ -182,6 +182,9 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
    * @return {*}
    */
   var handleBeforeUpload = function handleBeforeUpload(file, fileList) {
+    if (!(0, _lodash.isFunction)(beforeUpload)) {
+      return false;
+    }
     // TODO
     if (!(0, _uitls.validateFileExt)(extExt, file)) {
       var _locale$ProUpload2;
@@ -193,9 +196,7 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       _antd.message.error("".concat(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProUpload3 = _locale.default.ProUpload) === null || _locale$ProUpload3 === void 0 ? void 0 : _locale$ProUpload3.errorInfoSize).concat(size, "M"));
       return false;
     }
-    if (beforeUpload) {
-      return beforeUpload(file, fileList);
-    }
+    return beforeUpload(file, fileList);
   };
   var handleRemove = function handleRemove(file) {
     var nextList = _fileList.slice();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.5-beta.21",
+  "version": "3.4.5-beta.23",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",