@zat-design/sisyphus-react 3.4.3-beta.7 → 3.4.3-beta.8

package/es/ProForm/components/base/DatePicker/index.js

@@ -56,7 +56,9 @@ var DatePicker = function DatePicker(props) {
       disabled: true
     };
   }
-  return _jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), _rest), {}, {
+  return _jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), {}, {
+    format: format
+  }, _rest), {}, {
     className: _className
   }));
 };

package/es/ProForm/utils/diffOriginal.js

@@ -1,46 +1,31 @@
-import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
-import { isEqual, isFunction } from 'lodash';
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import { isEqual, isFunction, isString } from 'lodash';
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
-var extractValue = function extractValue(obj, path) {
-  var value = obj || {};
-  if (!Object.keys(obj)) {
-    return [];
-  }
-  var _iterator = _createForOfIteratorHelper(path),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var key = _step.value;
-      if (value && value.hasOwnProperty(key)) {
-        value = value[key];
-      } else {
-        return undefined;
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  return Object.values(value);
-};
 /** 将解构后的name值，反向转回names,例如 formData {a:1, b:2} names ['a', 'b'] 返回 [1,2] */
-var extractValues = function extractValues(data, pathString) {
-  if (pathString.includes('_')) {
-    var namePrefixes = pathString.split('-')[0].split('_').slice(0, -1);
-    return extractValue(data, namePrefixes);
+var extractValues = function extractValues(form, pathString) {
+  var _pathString;
+  var result = [];
+  var PrefixesName = isString(pathString) ? [] : pathString.slice(0, -1);
+  if (isString(pathString)) {
+    pathString.split('-').forEach(function (item) {
+      result.push(form.getFieldValue([].concat(_toConsumableArray(PrefixesName), [item])));
+    });
+    return result;
   }
-  return pathString.split('-').map(function (item) {
-    return data[item];
+  (_pathString = pathString[pathString.length - 1]) === null || _pathString === void 0 ? void 0 : _pathString.split('-').forEach(function (item) {
+    result.push(form.getFieldValue([].concat(_toConsumableArray(PrefixesName), [item])));
   });
+  return result;
 };
 export var diffOriginal = function diffOriginal(params) {
+  var _name$join;
   var originalValue = params.originalValue,
     _value = params.value,
     equalWith = params.equalWith,
     form = params.form,
     name = params.name;
-  var value = !(name === null || name === void 0 ? void 0 : name.includes('-')) ? _value : extractValues(form.getFieldsValue(), name);
+  var isNames = Array.isArray(name) && ((_name$join = name.join(',')) === null || _name$join === void 0 ? void 0 : _name$join.includes('-')) || (name === null || name === void 0 ? void 0 : name.includes('-'));
+  var value = !isNames ? _value : extractValues(form, name);
   // 支持传入自定义比较事件
   if (isFunction(equalWith)) {
     return !equalWith(originalValue, value);

package/es/ProForm/utils/index.js

@@ -5,6 +5,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useState } from 'react';
 import _, { isObject, isFunction, cloneDeep, get, set, omit, isNaN } from 'lodash';
+import moment from 'moment';
 export var getLayout = function getLayout(params) {
   var _params$span = params.span,
     span = _params$span === void 0 ? 8 : _params$span,
@@ -122,8 +123,8 @@ export var splitNameStr = function splitNameStr(name) {
 // 过滤掉字段名中包含 '-' 的字段
 export var filterInternalFields = function filterInternalFields(values) {
   var nextValues = values;
-  // fix: braft-editor对象不可遍历
-  if (values === null || values === void 0 ? void 0 : values._immutable) {
+  // fix: braft-editor对象不可遍历 Moment不过滤
+  if ((values === null || values === void 0 ? void 0 : values._immutable) || moment.isMoment(values)) {
     return nextValues;
   }
   if (Array.isArray(nextValues)) {
@@ -134,7 +135,7 @@ export var filterInternalFields = function filterInternalFields(values) {
   if (isObject(nextValues)) {
     var result = {};
     Object.keys(nextValues).forEach(function (key) {
-      if (key.includes('-')) return;
+      // if (key.includes('-')) return;
       result[key] = filterInternalFields(nextValues[key]);
     });
     return result;

package/lib/ProForm/components/base/DatePicker/index.js

@@ -62,7 +62,9 @@ var DatePicker = function DatePicker(props) {
       disabled: true
     };
   }
-  return (0, _jsxRuntime.jsx)(_antd.DatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), _rest), {}, {
+  return (0, _jsxRuntime.jsx)(_antd.DatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), {}, {
+    format: format
+  }, _rest), {}, {
     className: _className
   }));
 };

package/lib/ProForm/utils/diffOriginal.js

@@ -5,49 +5,34 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.diffOriginal = void 0;
-var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _lodash = require("lodash");
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
-var extractValue = function extractValue(obj, path) {
-  var value = obj || {};
-  if (!Object.keys(obj)) {
-    return [];
-  }
-  var _iterator = (0, _createForOfIteratorHelper2.default)(path),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var key = _step.value;
-      if (value && value.hasOwnProperty(key)) {
-        value = value[key];
-      } else {
-        return undefined;
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  return Object.values(value);
-};
 /** 将解构后的name值，反向转回names,例如 formData {a:1, b:2} names ['a', 'b'] 返回 [1,2] */
-var extractValues = function extractValues(data, pathString) {
-  if (pathString.includes('_')) {
-    var namePrefixes = pathString.split('-')[0].split('_').slice(0, -1);
-    return extractValue(data, namePrefixes);
+var extractValues = function extractValues(form, pathString) {
+  var _pathString;
+  var result = [];
+  var PrefixesName = (0, _lodash.isString)(pathString) ? [] : pathString.slice(0, -1);
+  if ((0, _lodash.isString)(pathString)) {
+    pathString.split('-').forEach(function (item) {
+      result.push(form.getFieldValue([].concat((0, _toConsumableArray2.default)(PrefixesName), [item])));
+    });
+    return result;
   }
-  return pathString.split('-').map(function (item) {
-    return data[item];
+  (_pathString = pathString[pathString.length - 1]) === null || _pathString === void 0 ? void 0 : _pathString.split('-').forEach(function (item) {
+    result.push(form.getFieldValue([].concat((0, _toConsumableArray2.default)(PrefixesName), [item])));
   });
+  return result;
 };
 var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
+  var _name$join;
   var originalValue = params.originalValue,
     _value = params.value,
     equalWith = params.equalWith,
     form = params.form,
     name = params.name;
-  var value = !(name === null || name === void 0 ? void 0 : name.includes('-')) ? _value : extractValues(form.getFieldsValue(), name);
+  var isNames = Array.isArray(name) && ((_name$join = name.join(',')) === null || _name$join === void 0 ? void 0 : _name$join.includes('-')) || (name === null || name === void 0 ? void 0 : name.includes('-'));
+  var value = !isNames ? _value : extractValues(form, name);
   // 支持传入自定义比较事件
   if ((0, _lodash.isFunction)(equalWith)) {
     return !equalWith(originalValue, value);

package/lib/ProForm/utils/index.js

@@ -21,6 +21,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _lodash = _interopRequireWildcard(require("lodash"));
+var _moment = _interopRequireDefault(require("moment"));
 var getLayout = exports.getLayout = function getLayout(params) {
   var _params$span = params.span,
     span = _params$span === void 0 ? 8 : _params$span,
@@ -138,8 +139,8 @@ var splitNameStr = exports.splitNameStr = function splitNameStr(name) {
 // 过滤掉字段名中包含 '-' 的字段
 var filterInternalFields = exports.filterInternalFields = function filterInternalFields(values) {
   var nextValues = values;
-  // fix: braft-editor对象不可遍历
-  if (values === null || values === void 0 ? void 0 : values._immutable) {
+  // fix: braft-editor对象不可遍历 Moment不过滤
+  if ((values === null || values === void 0 ? void 0 : values._immutable) || _moment.default.isMoment(values)) {
     return nextValues;
   }
   if (Array.isArray(nextValues)) {
@@ -150,7 +151,7 @@ var filterInternalFields = exports.filterInternalFields = function filterInterna
   if ((0, _lodash.isObject)(nextValues)) {
     var result = {};
     Object.keys(nextValues).forEach(function (key) {
-      if (key.includes('-')) return;
+      // if (key.includes('-')) return;
       result[key] = filterInternalFields(nextValues[key]);
     });
     return result;

package/package.json

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