@zat-design/sisyphus-react 3.2.1-beta.2 → 3.2.1-beta.3

package/dist/index.esm.css

@@ -1509,7 +1509,7 @@
   width: 48px;
 }
 .pro-tabs .ant-tabs .ant-tabs-nav-list .ant-tabs-tab {
-  padding: 0;
+  padding: 0 !important;
 }
 .pro-tabs .ant-tabs-top > .ant-tabs-nav::before,
 .pro-tabs .ant-tabs-bottom > .ant-tabs-nav::before,

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

@@ -71,7 +71,6 @@ var Render = function Render(props) {
       disabled: componentProps.disabled,
       rules: rules,
       required: required,
-      componentProps: componentProps,
       fieldProps: fieldProps,
       component: component,
       originComponent: originComponent,
@@ -82,7 +81,6 @@ var Render = function Render(props) {
     _disabled = _useShouldUpdate.disabled,
     _rules = _useShouldUpdate.rules,
     _required = _useShouldUpdate.required,
-    _componentProps = _useShouldUpdate.componentProps,
     _fieldProps = _useShouldUpdate.fieldProps,
     AutoComponent = _useShouldUpdate.component;
   otherFormItemProps.shouldUpdate = shouldUpdate;
@@ -100,7 +98,14 @@ var Render = function Render(props) {
     }).join('-');
   }, [otherProps === null || otherProps === void 0 ? void 0 : otherProps.names]);
   // 判断当前字段是否变更
-  var _useChanged = useChanged(formItemProps.name, otherProps.names, namesStr, originalValues, form, equalWith),
+  var _useChanged = useChanged({
+      name: formItemProps.name,
+      names: otherProps.names,
+      namesStr: namesStr,
+      originalValues: originalValues,
+      form: form,
+      equalWith: equalWith
+    }),
     _useChanged2 = _slicedToArray(_useChanged, 2),
     changed = _useChanged2[0],
     originalValue = _useChanged2[1];

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

@@ -120,10 +120,10 @@ var RenderFields = function RenderFields(props) {
       }
     }
     var label = formItemChildProps.label,
-      comDisabled = formItemChildProps.disabled,
       placeholder = formItemChildProps.placeholder,
       dataSource = formItemChildProps.dataSource;
     var formLabel = _formItemProps.label;
+    var comDisabled = formItemChildProps.disabled || fieldProps.disabled || disabled;
     var _disabled = comDisabled === undefined ? formDisabled : comDisabled;
     // 当前组件是不是一个选择组件
     var _isSelect = isSelect({
@@ -132,17 +132,15 @@ var RenderFields = function RenderFields(props) {
     });
     var _placeholder = placeholder || "".concat(_isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(label || formLabel || '');
     // 表单组件Props 兼容2.0版本
-    var _fieldProps = _objectSpread(_objectSpread({
-      disabled: disabled
-    }, formItemChildProps), fieldProps);
+    var _fieldProps = _objectSpread(_objectSpread({}, formItemChildProps), fieldProps);
     if (isBoolean(formDisabled)) {
       _fieldProps.disabled = formDisabled;
     }
-    var componentProps = _objectSpread({
+    var componentProps = _objectSpread(_objectSpread({}, _fieldProps), {}, {
       disabled: _disabled,
       placeholder: _placeholder,
       disabledStrictly: true
-    }, _fieldProps);
+    });
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {
       _formItemProps.valuePropName = 'checked';
@@ -160,7 +158,7 @@ var RenderFields = function RenderFields(props) {
     var otherProps = {
       label: _formItemProps.label,
       name: _formItemProps.name,
-      disabled: formDisabled,
+      disabled: _disabled,
       isView: _isView,
       viewEmpty: viewEmpty,
       valueType: valueType,

package/es/ProForm/utils/contrastOriginal.d.ts

@@ -1 +1,10 @@
-export declare const contrastOriginal: (name: any, names: any, originValues: any, currentValue: any, fun: any) => any;
+import { FormInstance } from 'antd';
+interface Params {
+    originalValues: any;
+    originalValue: any;
+    value: any;
+    form: FormInstance;
+    equalWith?: (originalValue: any, currentValue: any) => boolean;
+}
+export declare const contrastOriginal: (params: Params) => boolean;
+export {};

package/es/ProForm/utils/contrastOriginal.js

@@ -1,28 +1,25 @@
-import { get, isEqual, isFunction } from 'lodash';
+import { isEqual, isFunction } from 'lodash';
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
-export var contrastOriginal = function contrastOriginal(name, names, originValues, currentValue, fun) {
+export var contrastOriginal = function contrastOriginal(params) {
+  var originalValue = params.originalValue,
+    originalValues = params.originalValues,
+    value = params.value,
+    equalWith = params.equalWith;
   // 支持传入自定义比较事件
-  if (isFunction(fun)) {
-    if (names === null || names === void 0 ? void 0 : names.length) {
-      var originVal = names.map(function (key) {
-        return get(originValues, key);
-      });
-      return !fun(originVal, currentValue);
-    }
-    return !fun(get(originValues, name), currentValue);
+  if (isFunction(equalWith)) {
+    return !equalWith(originalValue, value);
   }
-  if (names === null || names === void 0 ? void 0 : names.length) {
-    return names.some(function (nameItem, index) {
-      var originalValue = get(originValues, nameItem);
-      if (!nullValue.includes(currentValue === null || currentValue === void 0 ? void 0 : currentValue[index]) || !nullValue.includes(originalValue)) {
-        return !isEqual(currentValue === null || currentValue === void 0 ? void 0 : currentValue[index], get(originValues, nameItem));
+  if (Array.isArray(originalValue)) {
+    return originalValue.some(function (valueItem, index) {
+      // 如果两个值有一个不是空值, 则进行深比较
+      if (!nullValue.includes(value === null || value === void 0 ? void 0 : value[index]) || !nullValue.includes(valueItem)) {
+        return !isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
       }
       return false;
     });
   }
-  var originalValue = get(originValues, name);
-  if (!nullValue.includes(currentValue) || !nullValue.includes(originalValue)) {
-    return !isEqual(currentValue, get(originValues, name));
+  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
+    return !isEqual(value, originalValue);
   }
   return false;
 };

package/es/ProForm/utils/useChanged.d.ts

@@ -1 +1,15 @@
-export declare const useChanged: (name: any, names: any, nameStr: any, originalValues: any, form: any, fun: any) => any[];
+import { FormInstance } from 'antd';
+import { NamePath } from 'antd/lib/form/interface';
+interface Params {
+    name?: NamePath;
+    names?: NamePath[];
+    namesStr?: NamePath;
+    originalName?: NamePath;
+    originalNames?: NamePath[];
+    originalNameStr?: NamePath;
+    originalValues: any;
+    form: FormInstance;
+    equalWith?: (originalValue: any, currentValue: any) => boolean;
+}
+export declare const useChanged: (params: Params) => any[];
+export {};

package/es/ProForm/utils/useChanged.js

@@ -2,14 +2,32 @@ import "antd/es/form/style";
 import _Form from "antd/es/form";
 import { get } from 'lodash';
 import { contrastOriginal } from './contrastOriginal';
-export var useChanged = function useChanged(name, names, nameStr, originalValues, form, fun) {
-  var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
-    return get(originalValues, name);
-  }) : get(originalValues, name);
+export var useChanged = function useChanged(params) {
+  var name = params.name,
+    names = params.names,
+    namesStr = params.namesStr,
+    _params$originalName = params.originalName,
+    originalName = _params$originalName === void 0 ? name : _params$originalName,
+    _params$originalNames = params.originalNames,
+    originalNames = _params$originalNames === void 0 ? names : _params$originalNames,
+    originalValues = params.originalValues,
+    form = params.form,
+    equalWith = params.equalWith;
+  var _form = form;
+  var originalValue = (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
+    return get(originalValues, originalName);
+  }) : get(originalValues, originalName);
   var notWatch = !originalValues || originalValue === undefined;
-  if (notWatch) form = [];
-  var value = _Form.useWatch(nameStr || name, form);
+  // @ts-ignore
+  if (notWatch) _form = [];
+  var value = _Form.useWatch(namesStr || name, _form);
   if (notWatch) return [false];
-  var changed = contrastOriginal(name, names, originalValues, value, fun);
+  var changed = contrastOriginal({
+    value: value,
+    originalValue: originalValue,
+    originalValues: originalValues,
+    form: form,
+    equalWith: equalWith
+  });
   return [changed, originalValue];
 };

package/es/ProTabs/style/index.less

@@ -1,6 +1,6 @@
 .pro-tabs {
   .ant-tabs .ant-tabs-nav-list .ant-tabs-tab {
-    padding: 0;
+    padding: 0 !important;
   }
 
   .ant-tabs-top>.ant-tabs-nav::before,

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

@@ -68,7 +68,6 @@ var Render = function Render(props) {
       disabled: componentProps.disabled,
       rules: rules,
       required: required,
-      componentProps: componentProps,
       fieldProps: fieldProps,
       component: component,
       originComponent: originComponent,
@@ -79,7 +78,6 @@ var Render = function Render(props) {
     _disabled = _useShouldUpdate.disabled,
     _rules = _useShouldUpdate.rules,
     _required = _useShouldUpdate.required,
-    _componentProps = _useShouldUpdate.componentProps,
     _fieldProps = _useShouldUpdate.fieldProps,
     AutoComponent = _useShouldUpdate.component;
   otherFormItemProps.shouldUpdate = shouldUpdate;
@@ -97,7 +95,14 @@ var Render = function Render(props) {
     }).join('-');
   }, [otherProps === null || otherProps === void 0 ? void 0 : otherProps.names]);
   // 判断当前字段是否变更
-  var _useChanged = (0, _useChanged3.useChanged)(formItemProps.name, otherProps.names, namesStr, originalValues, form, equalWith),
+  var _useChanged = (0, _useChanged3.useChanged)({
+      name: formItemProps.name,
+      names: otherProps.names,
+      namesStr: namesStr,
+      originalValues: originalValues,
+      form: form,
+      equalWith: equalWith
+    }),
     _useChanged2 = (0, _slicedToArray2.default)(_useChanged, 2),
     changed = _useChanged2[0],
     originalValue = _useChanged2[1];

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

@@ -128,10 +128,10 @@ var RenderFields = function RenderFields(props) {
       }
     }
     var label = formItemChildProps.label,
-      comDisabled = formItemChildProps.disabled,
       placeholder = formItemChildProps.placeholder,
       dataSource = formItemChildProps.dataSource;
     var formLabel = _formItemProps.label;
+    var comDisabled = formItemChildProps.disabled || fieldProps.disabled || disabled;
     var _disabled = comDisabled === undefined ? formDisabled : comDisabled;
     // 当前组件是不是一个选择组件
     var _isSelect = (0, _utils.isSelect)({
@@ -140,17 +140,15 @@ var RenderFields = function RenderFields(props) {
     });
     var _placeholder = placeholder || "".concat(_isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(label || formLabel || '');
     // 表单组件Props 兼容2.0版本
-    var _fieldProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      disabled: disabled
-    }, formItemChildProps), fieldProps);
+    var _fieldProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formItemChildProps), fieldProps);
     if ((0, _lodash.isBoolean)(formDisabled)) {
       _fieldProps.disabled = formDisabled;
     }
-    var componentProps = (0, _objectSpread2.default)({
+    var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _fieldProps), {}, {
       disabled: _disabled,
       placeholder: _placeholder,
       disabledStrictly: true
-    }, _fieldProps);
+    });
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {
       _formItemProps.valuePropName = 'checked';
@@ -168,7 +166,7 @@ var RenderFields = function RenderFields(props) {
     var otherProps = {
       label: _formItemProps.label,
       name: _formItemProps.name,
-      disabled: formDisabled,
+      disabled: _disabled,
       isView: _isView,
       viewEmpty: viewEmpty,
       valueType: valueType,

package/lib/ProForm/utils/contrastOriginal.d.ts

@@ -1 +1,10 @@
-export declare const contrastOriginal: (name: any, names: any, originValues: any, currentValue: any, fun: any) => any;
+import { FormInstance } from 'antd';
+interface Params {
+    originalValues: any;
+    originalValue: any;
+    value: any;
+    form: FormInstance;
+    equalWith?: (originalValue: any, currentValue: any) => boolean;
+}
+export declare const contrastOriginal: (params: Params) => boolean;
+export {};

package/lib/ProForm/utils/contrastOriginal.js

@@ -6,29 +6,26 @@ Object.defineProperty(exports, "__esModule", {
 exports.contrastOriginal = void 0;
 var _lodash = require("lodash");
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
-var contrastOriginal = exports.contrastOriginal = function contrastOriginal(name, names, originValues, currentValue, fun) {
+var contrastOriginal = exports.contrastOriginal = function contrastOriginal(params) {
+  var originalValue = params.originalValue,
+    originalValues = params.originalValues,
+    value = params.value,
+    equalWith = params.equalWith;
   // 支持传入自定义比较事件
-  if ((0, _lodash.isFunction)(fun)) {
-    if (names === null || names === void 0 ? void 0 : names.length) {
-      var originVal = names.map(function (key) {
-        return (0, _lodash.get)(originValues, key);
-      });
-      return !fun(originVal, currentValue);
-    }
-    return !fun((0, _lodash.get)(originValues, name), currentValue);
+  if ((0, _lodash.isFunction)(equalWith)) {
+    return !equalWith(originalValue, value);
   }
-  if (names === null || names === void 0 ? void 0 : names.length) {
-    return names.some(function (nameItem, index) {
-      var originalValue = (0, _lodash.get)(originValues, nameItem);
-      if (!nullValue.includes(currentValue === null || currentValue === void 0 ? void 0 : currentValue[index]) || !nullValue.includes(originalValue)) {
-        return !(0, _lodash.isEqual)(currentValue === null || currentValue === void 0 ? void 0 : currentValue[index], (0, _lodash.get)(originValues, nameItem));
+  if (Array.isArray(originalValue)) {
+    return originalValue.some(function (valueItem, index) {
+      // 如果两个值有一个不是空值, 则进行深比较
+      if (!nullValue.includes(value === null || value === void 0 ? void 0 : value[index]) || !nullValue.includes(valueItem)) {
+        return !(0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
       }
       return false;
     });
   }
-  var originalValue = (0, _lodash.get)(originValues, name);
-  if (!nullValue.includes(currentValue) || !nullValue.includes(originalValue)) {
-    return !(0, _lodash.isEqual)(currentValue, (0, _lodash.get)(originValues, name));
+  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
+    return !(0, _lodash.isEqual)(value, originalValue);
   }
   return false;
 };

package/lib/ProForm/utils/useChanged.d.ts

@@ -1 +1,15 @@
-export declare const useChanged: (name: any, names: any, nameStr: any, originalValues: any, form: any, fun: any) => any[];
+import { FormInstance } from 'antd';
+import { NamePath } from 'antd/lib/form/interface';
+interface Params {
+    name?: NamePath;
+    names?: NamePath[];
+    namesStr?: NamePath;
+    originalName?: NamePath;
+    originalNames?: NamePath[];
+    originalNameStr?: NamePath;
+    originalValues: any;
+    form: FormInstance;
+    equalWith?: (originalValue: any, currentValue: any) => boolean;
+}
+export declare const useChanged: (params: Params) => any[];
+export {};

package/lib/ProForm/utils/useChanged.js

@@ -7,14 +7,32 @@ exports.useChanged = void 0;
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _contrastOriginal = require("./contrastOriginal");
-var useChanged = exports.useChanged = function useChanged(name, names, nameStr, originalValues, form, fun) {
-  var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
-    return (0, _lodash.get)(originalValues, name);
-  }) : (0, _lodash.get)(originalValues, name);
+var useChanged = exports.useChanged = function useChanged(params) {
+  var name = params.name,
+    names = params.names,
+    namesStr = params.namesStr,
+    _params$originalName = params.originalName,
+    originalName = _params$originalName === void 0 ? name : _params$originalName,
+    _params$originalNames = params.originalNames,
+    originalNames = _params$originalNames === void 0 ? names : _params$originalNames,
+    originalValues = params.originalValues,
+    form = params.form,
+    equalWith = params.equalWith;
+  var _form = form;
+  var originalValue = (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
+    return (0, _lodash.get)(originalValues, originalName);
+  }) : (0, _lodash.get)(originalValues, originalName);
   var notWatch = !originalValues || originalValue === undefined;
-  if (notWatch) form = [];
-  var value = _antd.Form.useWatch(nameStr || name, form);
+  // @ts-ignore
+  if (notWatch) _form = [];
+  var value = _antd.Form.useWatch(namesStr || name, _form);
   if (notWatch) return [false];
-  var changed = (0, _contrastOriginal.contrastOriginal)(name, names, originalValues, value, fun);
+  var changed = (0, _contrastOriginal.contrastOriginal)({
+    value: value,
+    originalValue: originalValue,
+    originalValues: originalValues,
+    form: form,
+    equalWith: equalWith
+  });
   return [changed, originalValue];
 };

package/lib/ProTabs/style/index.less

@@ -1,6 +1,6 @@
 .pro-tabs {
   .ant-tabs .ant-tabs-nav-list .ant-tabs-tab {
-    padding: 0;
+    padding: 0 !important;
   }
 
   .ant-tabs-top>.ant-tabs-nav::before,

package/package.json

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