@zat-design/sisyphus-react 3.6.0-beta.1 → 3.6.0-beta.2

package/es/ProForm/utils/index.js

@@ -4,7 +4,8 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState } from 'react';
-import _, { isObject, isFunction, cloneDeep, get, set, omit, isNaN, isPlainObject } from 'lodash';
+import moment from 'moment';
+import _, { isObject, isFunction, cloneDeep, get, set, omit, isNaN } from 'lodash';
 export var getLayout = function getLayout(params) {
   var _params$span = params.span,
     span = _params$span === void 0 ? 8 : _params$span,
@@ -125,18 +126,24 @@ export var filterInternalFields = function filterInternalFields(values, optimize
     return values;
   }
   var nextValues = values;
+  // fix: braft-editor对象不可遍历 Moment不过滤
+  if ((values === null || values === void 0 ? void 0 : values._immutable) || moment.isMoment(values)) {
+    return nextValues;
+  }
+  if (values instanceof File) {
+    return nextValues;
+  }
   if (Array.isArray(nextValues)) {
     return nextValues.map(function (item) {
       return filterInternalFields(item);
     });
   }
-  if (isPlainObject(nextValues)) {
+  if (isObject(nextValues)) {
     var result = {};
-    // eslint-disable-next-line guard-for-in
-    for (var key in nextValues) {
+    Object.keys(nextValues).forEach(function (key) {
       if (key.includes('-')) return;
       result[key] = filterInternalFields(nextValues[key]);
-    }
+    });
     return result;
   }
   return nextValues;

package/lib/ProForm/utils/index.js

@@ -22,6 +22,7 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _moment = _interopRequireDefault(require("moment"));
 var _lodash = _interopRequireWildcard(require("lodash"));
 var getLayout = exports.getLayout = function getLayout(params) {
   var _params$span = params.span,
@@ -143,18 +144,24 @@ var filterInternalFields = exports.filterInternalFields = function filterInterna
     return values;
   }
   var nextValues = values;
+  // fix: braft-editor对象不可遍历 Moment不过滤
+  if ((values === null || values === void 0 ? void 0 : values._immutable) || _moment.default.isMoment(values)) {
+    return nextValues;
+  }
+  if (values instanceof File) {
+    return nextValues;
+  }
   if (Array.isArray(nextValues)) {
     return nextValues.map(function (item) {
       return filterInternalFields(item);
     });
   }
-  if ((0, _lodash.isPlainObject)(nextValues)) {
+  if ((0, _lodash.isObject)(nextValues)) {
     var result = {};
-    // eslint-disable-next-line guard-for-in
-    for (var key in nextValues) {
+    Object.keys(nextValues).forEach(function (key) {
       if (key.includes('-')) return;
       result[key] = filterInternalFields(nextValues[key]);
-    }
+    });
     return result;
   }
   return nextValues;

package/package.json

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