@zat-design/sisyphus-react 3.9.5-beta.5 → 3.9.5-beta.6

package/es/ProForm/components/render/Render.js

@@ -409,7 +409,10 @@ var Render = function Render(props) {
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';
-      child = _jsx(_Form.List, _objectSpread(_objectSpread({
+      colProps = _objectSpread(_objectSpread({}, colProps), {}, {
+        span: lessMode ? colProps.span : 24 // 默认占一行
+      });
+      return _jsx(_Form.List, _objectSpread(_objectSpread({
         name: _otherFormItemProps.name
       }, omit(_otherFormItemProps, ['rules'])), {}, {
         children: function children(fields, operation, meta) {
@@ -421,9 +424,6 @@ var Render = function Render(props) {
           }));
         }
       }));
-      colProps = _objectSpread(_objectSpread({}, colProps), {}, {
-        span: lessMode ? colProps.span : 24 // 默认占一行
-      });
     }
     //  默认占据一行
     if (['ProCollapse', 'Container'].includes(type)) {

package/es/ProForm/utils/diffOriginal.js

@@ -31,25 +31,11 @@ export var diffOriginal = function diffOriginal(params) {
   }
   var _value = filterObject(value);
   var _originalValue = filterObject(originalValue);
-  // 如果原始值为空 且当前有值的话 认为变更类型是新增
-  if (isEmpty(_originalValue) && !isEmpty(_value)) {
-    return 'add';
-  }
-  if (Array.isArray(_originalValue)) {
-    if ((_originalValue === null || _originalValue === void 0 ? void 0 : _originalValue.length) === (_value === null || _value === void 0 ? void 0 : _value.length)) {
-      var isSame = _originalValue.every(function (valueItem, index) {
-        // 如果两个值有一个不是空值, 则进行深比较
-        if (!isEmpty(value === null || value === void 0 ? void 0 : value[index]) || !isEmpty(valueItem)) {
-          return isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
-        }
-        return true;
-      });
-      return isSame ? 'same' : 'changed';
-    }
-    return 'changed';
-  }
-  if (!isEmpty(_originalValue) || !isEmpty(_value)) {
-    return isEqual(_value, _originalValue) ? 'same' : 'changed';
-  }
-  return 'same';
+  var isEmptyVal = isEmpty(_value);
+  var isEmptyOrg = isEmpty(_originalValue);
+  // 都为空视为相等
+  if (isEmptyOrg && isEmptyVal) return 'same';
+  // 如果原始值为空 且当前有值的话 视为新增
+  if (isEmptyOrg && !isEmptyVal) return 'add';
+  return isEqual(_value, _originalValue) ? 'same' : 'changed';
 };

package/es/utils/index.d.ts

@@ -1,3 +1,6 @@
-/** 判断一个值是否是空值 */
+/**
+ * 判断一个值是否是空值
+ * 空值 或者 仅包含空值的数组视为空
+ */
 export declare const isEmpty: (value: any, emptyValue?: string) => boolean;
 export declare const useFocus: (element: Element) => boolean;

package/es/utils/index.js

@@ -1,7 +1,10 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useEffect, useState } from 'react';
 var EMPTY_VALUE = [undefined, null, ''];
-/** 判断一个值是否是空值 */
+/**
+ * 判断一个值是否是空值
+ * 空值 或者 仅包含空值的数组视为空
+ */
 export var isEmpty = function isEmpty(value, emptyValue) {
   if (emptyValue) {
     EMPTY_VALUE.push(emptyValue);

package/lib/ProForm/components/render/Render.js

@@ -409,7 +409,10 @@ var Render = function Render(props) {
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';
-      child = (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
+        span: lessMode ? colProps.span : 24 // 默认占一行
+      });
+      return (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         name: _otherFormItemProps.name
       }, (0, _lodash.omit)(_otherFormItemProps, ['rules'])), {}, {
         children: function children(fields, operation, meta) {
@@ -421,9 +424,6 @@ var Render = function Render(props) {
           }));
         }
       }));
-      colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
-        span: lessMode ? colProps.span : 24 // 默认占一行
-      });
     }
     //  默认占据一行
     if (['ProCollapse', 'Container'].includes(type)) {

package/lib/ProForm/utils/diffOriginal.js

@@ -37,25 +37,11 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
   }
   var _value = filterObject(value);
   var _originalValue = filterObject(originalValue);
-  // 如果原始值为空 且当前有值的话 认为变更类型是新增
-  if ((0, _utils.isEmpty)(_originalValue) && !(0, _utils.isEmpty)(_value)) {
-    return 'add';
-  }
-  if (Array.isArray(_originalValue)) {
-    if ((_originalValue === null || _originalValue === void 0 ? void 0 : _originalValue.length) === (_value === null || _value === void 0 ? void 0 : _value.length)) {
-      var isSame = _originalValue.every(function (valueItem, index) {
-        // 如果两个值有一个不是空值, 则进行深比较
-        if (!(0, _utils.isEmpty)(value === null || value === void 0 ? void 0 : value[index]) || !(0, _utils.isEmpty)(valueItem)) {
-          return (0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
-        }
-        return true;
-      });
-      return isSame ? 'same' : 'changed';
-    }
-    return 'changed';
-  }
-  if (!(0, _utils.isEmpty)(_originalValue) || !(0, _utils.isEmpty)(_value)) {
-    return (0, _lodash.isEqual)(_value, _originalValue) ? 'same' : 'changed';
-  }
-  return 'same';
+  var isEmptyVal = (0, _utils.isEmpty)(_value);
+  var isEmptyOrg = (0, _utils.isEmpty)(_originalValue);
+  // 都为空视为相等
+  if (isEmptyOrg && isEmptyVal) return 'same';
+  // 如果原始值为空 且当前有值的话 视为新增
+  if (isEmptyOrg && !isEmptyVal) return 'add';
+  return (0, _lodash.isEqual)(_value, _originalValue) ? 'same' : 'changed';
 };

package/lib/utils/index.d.ts

@@ -1,3 +1,6 @@
-/** 判断一个值是否是空值 */
+/**
+ * 判断一个值是否是空值
+ * 空值 或者 仅包含空值的数组视为空
+ */
 export declare const isEmpty: (value: any, emptyValue?: string) => boolean;
 export declare const useFocus: (element: Element) => boolean;

package/lib/utils/index.js

@@ -8,7 +8,10 @@ exports.useFocus = exports.isEmpty = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var EMPTY_VALUE = [undefined, null, ''];
-/** 判断一个值是否是空值 */
+/**
+ * 判断一个值是否是空值
+ * 空值 或者 仅包含空值的数组视为空
+ */
 var isEmpty = exports.isEmpty = function isEmpty(value, emptyValue) {
   if (emptyValue) {
     EMPTY_VALUE.push(emptyValue);

package/package.json

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